From e176a6b7a4cd0a8c9abf5aae009eebfe0360cba4 Mon Sep 17 00:00:00 2001
From: Arena Agent <agent@local>
Date: Mon, 26 Oct 2026 11:28:00 +0000
Subject: [PATCH] Pin nigig workspace to dev-rebased Makepad traffic
 integration

---
 Cargo.lock                 | 640 +++++++++++++++++++------------------
 Cargo.toml                 |  32 +-
 MAKEPAD_DEV_INTEGRATION.md |  51 +++
 3 files changed, 396 insertions(+), 327 deletions(-)
 create mode 100644 MAKEPAD_DEV_INTEGRATION.md

diff --git a/Cargo.lock b/Cargo.lock
index 77b6cc0..095c52d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5,7 +5,7 @@ version = 4
 [[package]]
 name = "ab_glyph_rasterizer"
 version = "0.1.8"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "adler"
@@ -185,21 +185,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b350bfd03649e07aa05c0a81b3e15934374e585c98204a57e20b9d49f49bb9a"
 dependencies = [
  "keyring-core",
- "log 0.4.34",
+ "log",
  "security-framework",
 ]
 
 [[package]]
 name = "arrayvec"
 version = "0.7.6"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "ash"
 version = "0.38.0+1.3.281"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
- "libloading 0.8.9 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
+ "libloading 0.8.9 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
 ]
 
 [[package]]
@@ -264,7 +264,7 @@ dependencies = [
  "chrono",
  "futures",
  "imap-proto",
- "log 0.4.34",
+ "log",
  "nom 7.1.3",
  "once_cell 1.21.4",
  "pin-utils",
@@ -507,9 +507,9 @@ dependencies = [
 [[package]]
 name = "bit-set"
 version = "0.8.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
- "bit-vec 0.8.0 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
+ "bit-vec 0.8.0 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
 ]
 
 [[package]]
@@ -521,12 +521,12 @@ checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
 [[package]]
 name = "bit-vec"
 version = "0.8.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "bitflags"
 version = "2.10.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "bitflags"
@@ -625,7 +625,7 @@ checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649"
 [[package]]
 name = "bytemuck"
 version = "1.25.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "bytemuck"
@@ -656,7 +656,7 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 [[package]]
 name = "byteorder"
 version = "1.5.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "byteorder-lite"
@@ -720,7 +720,7 @@ dependencies = [
  "codepage",
  "encoding_rs",
  "fast-float2",
- "log 0.4.34",
+ "log",
  "quick-xml",
  "serde",
  "zip",
@@ -762,12 +762,12 @@ checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 [[package]]
 name = "cfg-if"
 version = "1.0.4"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "cfg_aliases"
 version = "0.2.1"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "cfg_aliases"
@@ -1046,7 +1046,7 @@ checksum = "a31eee39dddec8330830986fcd7625edb5a24ec90ea038215273bbc3adb08ac6"
 [[package]]
 name = "crunchy"
 version = "0.2.4"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "crypto-bigint"
@@ -1120,17 +1120,6 @@ dependencies = [
  "cipher 0.4.4",
 ]
 
-[[package]]
-name = "ctrlc"
-version = "3.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0b1fab2ae45819af2d0731d60f2afe17227ebb1a1538a236da84c93e9a60162"
-dependencies = [
- "dispatch2",
- "nix",
- "windows-sys 0.61.2",
-]
-
 [[package]]
 name = "ctutils"
 version = "0.4.2"
@@ -1295,7 +1284,7 @@ dependencies = [
 [[package]]
 name = "downcast-rs"
 version = "1.2.1"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "dunce"
@@ -1446,7 +1435,7 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 [[package]]
 name = "equivalent"
 version = "1.0.2"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "errno"
@@ -1455,7 +1444,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1592,7 +1581,7 @@ checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
 [[package]]
 name = "foldhash"
 version = "0.2.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "foreign-types"
@@ -1728,9 +1717,9 @@ dependencies = [
 [[package]]
 name = "fxhash"
 version = "0.2.1"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
- "byteorder 1.5.0 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
+ "byteorder 1.5.0 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
 ]
 
 [[package]]
@@ -1850,9 +1839,9 @@ dependencies = [
 [[package]]
 name = "hashbrown"
 version = "0.16.1"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
- "foldhash 0.2.0 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
+ "foldhash 0.2.0 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
 ]
 
 [[package]]
@@ -1905,7 +1894,7 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 [[package]]
 name = "hexf-parse"
 version = "0.2.1"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "hilog-sys"
@@ -2085,7 +2074,7 @@ dependencies = [
 [[package]]
 name = "i_float"
 version = "3.0.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "i_key_sort"
@@ -2096,7 +2085,7 @@ checksum = "7c6c58d0c60705e66264ce0f788a69a2f21472aeb8188559e7c8c619dbdc10fa"
 [[package]]
 name = "i_key_sort"
 version = "0.11.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "i_overlay"
@@ -2113,12 +2102,12 @@ dependencies = [
 [[package]]
 name = "i_overlay"
 version = "7.0.3"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
- "i_float 3.0.0 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
- "i_key_sort 0.11.0 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
- "i_shape 3.0.0 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
- "i_tree 0.19.0 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
+ "i_float 3.0.0 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
+ "i_key_sort 0.11.0 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
+ "i_shape 3.0.0 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
+ "i_tree 0.19.0 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
 ]
 
 [[package]]
@@ -2142,9 +2131,9 @@ dependencies = [
 [[package]]
 name = "i_shape"
 version = "3.0.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
- "i_float 3.0.0 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
+ "i_float 3.0.0 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
 ]
 
 [[package]]
@@ -2156,7 +2145,7 @@ checksum = "1e9d4a992a9fe83130f41ceacceac3bb116a4355dfc9c8d6ecea4f1e4b4c6caf"
 [[package]]
 name = "i_tree"
 version = "0.19.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "iana-time-zone"
@@ -2168,7 +2157,7 @@ dependencies = [
  "core-foundation-sys",
  "iana-time-zone-haiku",
  "js-sys",
- "log 0.4.34",
+ "log",
  "wasm-bindgen",
  "windows-core 0.62.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -2319,10 +2308,10 @@ checksum = "c8b35f3ad95576ac81603375dfe47a0450b70a368aa34d2b6e5bb0a0d7f02428"
 [[package]]
 name = "indexmap"
 version = "2.13.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
- "equivalent 1.0.2 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
- "hashbrown 0.16.1 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
+ "equivalent 1.0.2 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
+ "hashbrown 0.16.1 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
 ]
 
 [[package]]
@@ -2382,7 +2371,7 @@ dependencies = [
  "cfg-if 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "combine",
  "jni-sys 0.3.1",
- "log 0.4.34",
+ "log",
  "thiserror 1.0.69",
  "walkdir",
  "windows-sys 0.45.0",
@@ -2455,7 +2444,7 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fb1e621458ca9c51aa110bd0339d4751a056b9576bf1253aee1aa560dda0fc9d"
 dependencies = [
- "log 0.4.34",
+ "log",
 ]
 
 [[package]]
@@ -2520,10 +2509,10 @@ dependencies = [
 [[package]]
 name = "libloading"
 version = "0.8.9"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
- "cfg-if 1.0.4 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
- "windows-link 0.2.1 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
+ "cfg-if 1.0.4 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
+ "windows-link 0.2.1 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
 ]
 
 [[package]]
@@ -2579,11 +2568,6 @@ dependencies = [
  "scopeguard",
 ]
 
-[[package]]
-name = "log"
-version = "0.4.29"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
-
 [[package]]
 name = "log"
 version = "0.4.34"
@@ -2600,7 +2584,7 @@ dependencies = [
  "flate2",
  "itoa",
  "linked-hash-map",
- "log 0.4.34",
+ "log",
  "md5",
  "pom",
  "time",
@@ -2625,12 +2609,12 @@ dependencies = [
 [[package]]
 name = "makepad-ai-hub"
 version = "0.3.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
- "makepad-asset-client",
  "makepad-audio-decode",
  "makepad-base64",
- "makepad-micro-serde 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
+ "makepad-core-util",
+ "makepad-micro-serde 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
  "makepad-network",
  "makepad-strict-json",
  "makepad-video-flow",
@@ -2652,42 +2636,25 @@ dependencies = [
 [[package]]
 name = "makepad-apple-sys"
 version = "1.0.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
  "makepad-objc-sys",
 ]
 
-[[package]]
-name = "makepad-asset-client"
-version = "0.1.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
-dependencies = [
- "makepad-asset-data",
- "makepad-live-id 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
- "makepad-network",
- "makepad-platform",
- "makepad-strict-json",
-]
-
-[[package]]
-name = "makepad-asset-data"
-version = "0.1.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
-
 [[package]]
 name = "makepad-audio-decode"
 version = "0.1.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "makepad-base64"
 version = "1.0.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "makepad-box3d"
 version = "0.1.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
  "makepad-platform",
 ]
@@ -2695,20 +2662,34 @@ dependencies = [
 [[package]]
 name = "makepad-byteorder-lite"
 version = "0.1.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "makepad-code-editor"
 version = "2.0.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
+ "makepad-code-language",
  "makepad-widgets",
 ]
 
+[[package]]
+name = "makepad-code-language"
+version = "0.1.0"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
+dependencies = [
+ "pulldown-cmark",
+]
+
+[[package]]
+name = "makepad-core-util"
+version = "0.1.0"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
+
 [[package]]
 name = "makepad-csg"
 version = "0.1.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
  "makepad-csg-boolean",
  "makepad-csg-math",
@@ -2723,7 +2704,7 @@ dependencies = [
 [[package]]
 name = "makepad-csg-boolean"
 version = "0.1.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
  "makepad-csg-exact",
  "makepad-csg-math",
@@ -2733,7 +2714,7 @@ dependencies = [
 [[package]]
 name = "makepad-csg-exact"
 version = "0.1.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
  "makepad-csg-math",
 ]
@@ -2741,12 +2722,12 @@ dependencies = [
 [[package]]
 name = "makepad-csg-math"
 version = "0.1.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "makepad-csg-mesh"
 version = "0.1.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
  "makepad-csg-math",
 ]
@@ -2754,7 +2735,7 @@ dependencies = [
 [[package]]
 name = "makepad-csg-primitives"
 version = "0.1.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
  "makepad-csg-math",
  "makepad-csg-mesh",
@@ -2763,7 +2744,7 @@ dependencies = [
 [[package]]
 name = "makepad-csg-sdf"
 version = "0.1.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
  "makepad-csg-math",
  "makepad-csg-mesh",
@@ -2773,29 +2754,29 @@ dependencies = [
 [[package]]
 name = "makepad-derive-wasm-bridge"
 version = "1.0.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
- "makepad-micro-proc-macro 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
+ "makepad-micro-proc-macro 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
 ]
 
 [[package]]
 name = "makepad-derive-widget"
 version = "2.0.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
- "makepad-live-id 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
- "makepad-micro-proc-macro 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
+ "makepad-live-id 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
+ "makepad-micro-proc-macro 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
 ]
 
 [[package]]
 name = "makepad-draw"
 version = "2.0.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
  "ab_glyph_rasterizer",
  "fxhash",
  "makepad-gif",
- "makepad-live-id 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
+ "makepad-live-id 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
  "makepad-math",
  "makepad-platform",
  "makepad-svg",
@@ -2807,6 +2788,7 @@ dependencies = [
  "rustybuzz",
  "sdfer",
  "serde",
+ "ttf-parser 0.24.1",
  "unicode-bidi",
  "unicode-linebreak",
  "unicode-segmentation 1.12.0",
@@ -2815,40 +2797,43 @@ dependencies = [
 [[package]]
 name = "makepad-error-log"
 version = "1.0.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
- "makepad-micro-serde 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
+ "makepad-micro-serde 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
 ]
 
 [[package]]
 name = "makepad-fast-inflate"
 version = "0.1.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "makepad-filesystem-watcher"
 version = "0.1.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
+dependencies = [
+ "makepad-git",
+]
 
 [[package]]
 name = "makepad-futures"
 version = "1.0.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "makepad-futures-legacy"
 version = "1.0.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "makepad-game-audio"
 version = "0.1.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "makepad-game-blocks"
 version = "0.1.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
  "makepad-box3d",
  "makepad-game-audio",
@@ -2860,12 +2845,12 @@ dependencies = [
 [[package]]
 name = "makepad-game-math"
 version = "0.1.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "makepad-game-render"
 version = "0.1.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
  "makepad-draw",
  "makepad-game-sim",
@@ -2874,26 +2859,26 @@ dependencies = [
 [[package]]
 name = "makepad-game-sim"
 version = "0.1.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
  "makepad-box3d",
  "makepad-game-math",
- "makepad-live-id 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
+ "makepad-live-id 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
  "makepad-math",
 ]
 
 [[package]]
 name = "makepad-gif"
 version = "0.1.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
- "weezl 0.1.12 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
+ "weezl 0.1.12 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
 ]
 
 [[package]]
 name = "makepad-git"
 version = "0.1.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
  "makepad-fast-inflate",
 ]
@@ -2901,19 +2886,20 @@ dependencies = [
 [[package]]
 name = "makepad-gltf"
 version = "1.0.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
  "makepad-base64",
  "makepad-math",
- "makepad-micro-serde 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
+ "makepad-micro-serde 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
+ "makepad-strict-json",
 ]
 
 [[package]]
 name = "makepad-half"
 version = "2.7.1"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
- "cfg-if 1.0.4 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
+ "cfg-if 1.0.4 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
  "crunchy",
  "num-traits 0.2.20",
  "zerocopy 0.8.39",
@@ -2922,9 +2908,9 @@ dependencies = [
 [[package]]
 name = "makepad-html"
 version = "1.0.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
- "makepad-live-id 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
+ "makepad-live-id 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
 ]
 
 [[package]]
@@ -2933,10 +2919,18 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9775cbec5fa0647500c3e5de7c850280a88335d1d2d770e5aa2332b801ba7064"
 
+[[package]]
+name = "makepad-key-code"
+version = "0.1.0"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
+dependencies = [
+ "makepad-micro-serde 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
+]
+
 [[package]]
 name = "makepad-latex-math"
 version = "0.1.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
  "ttf-parser 0.24.1",
 ]
@@ -2944,9 +2938,9 @@ dependencies = [
 [[package]]
 name = "makepad-live-id"
 version = "1.0.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
- "makepad-live-id-macros 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
+ "makepad-live-id-macros 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
  "serde",
 ]
 
@@ -2961,9 +2955,9 @@ dependencies = [
 [[package]]
 name = "makepad-live-id-macros"
 version = "1.0.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
- "makepad-micro-proc-macro 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
+ "makepad-micro-proc-macro 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
 ]
 
 [[package]]
@@ -2977,7 +2971,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-reload-core"
 version = "0.1.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
  "makepad-filesystem-watcher",
 ]
@@ -2985,20 +2979,20 @@ dependencies = [
 [[package]]
 name = "makepad-lz4"
 version = "0.1.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "makepad-math"
 version = "1.0.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
- "makepad-micro-serde 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
+ "makepad-micro-serde 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
 ]
 
 [[package]]
 name = "makepad-mbtile-reader"
 version = "1.0.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
  "brotli",
  "makepad-fast-inflate",
@@ -3008,7 +3002,7 @@ dependencies = [
 [[package]]
 name = "makepad-micro-proc-macro"
 version = "1.0.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "makepad-micro-proc-macro"
@@ -3018,10 +3012,10 @@ source = "git+https://gitdab.com/andodeki/makepad?rev=ecf5a572ab62a1c1598909971f
 [[package]]
 name = "makepad-micro-serde"
 version = "1.0.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
- "makepad-live-id 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
- "makepad-micro-serde-derive 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
+ "makepad-live-id 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
+ "makepad-micro-serde-derive 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
 ]
 
 [[package]]
@@ -3036,9 +3030,9 @@ dependencies = [
 [[package]]
 name = "makepad-micro-serde-derive"
 version = "1.0.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
- "makepad-micro-proc-macro 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
+ "makepad-micro-proc-macro 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
 ]
 
 [[package]]
@@ -3052,13 +3046,13 @@ dependencies = [
 [[package]]
 name = "makepad-network"
 version = "1.0.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
  "makepad-apple-sys",
  "makepad-error-log",
  "makepad-futures-legacy",
- "makepad-live-id 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
- "makepad-micro-serde 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
+ "makepad-live-id 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
+ "makepad-micro-serde 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
  "makepad-script",
  "windows 0.62.2",
 ]
@@ -3066,16 +3060,16 @@ dependencies = [
 [[package]]
 name = "makepad-objc-sys"
 version = "1.0.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "makepad-platform"
 version = "2.0.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
  "ash",
  "bitflags 2.10.0",
- "ctrlc",
+ "foldhash 0.2.0 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
  "hilog-sys",
  "makepad-android-state",
  "makepad-apple-sys",
@@ -3092,6 +3086,7 @@ dependencies = [
  "makepad-studio-protocol",
  "makepad-tsdf",
  "makepad-wasm-bridge",
+ "makepad-zip-file",
  "makepad-zune-png",
  "naga",
  "napi-derive-ohos",
@@ -3102,38 +3097,34 @@ dependencies = [
  "wayland-egl",
  "wayland-protocols",
  "windows 0.62.2",
- "windows-core 0.62.2 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
- "windows-targets 0.52.6",
+ "windows-core 0.62.2 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
+ "windows-link 0.2.1 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
 ]
 
 [[package]]
 name = "makepad-platform-video"
 version = "1.0.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
  "makepad-apple-sys",
  "makepad-objc-sys",
  "windows 0.62.2",
 ]
 
-[[package]]
-name = "makepad-rabin-karp"
-version = "1.0.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
-
 [[package]]
 name = "makepad-regex"
 version = "0.1.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "makepad-script"
 version = "1.0.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
  "makepad-error-log",
  "makepad-html",
- "makepad-live-id 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
+ "makepad-key-code",
+ "makepad-live-id 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
  "makepad-math",
  "makepad-regex",
  "makepad-script-derive",
@@ -3144,15 +3135,15 @@ dependencies = [
 [[package]]
 name = "makepad-script-derive"
 version = "1.0.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
- "makepad-micro-proc-macro 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
+ "makepad-micro-proc-macro 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
 ]
 
 [[package]]
 name = "makepad-script-std"
 version = "1.0.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
  "makepad-network",
  "makepad-script",
@@ -3161,14 +3152,14 @@ dependencies = [
 [[package]]
 name = "makepad-shared-bytes"
 version = "1.0.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "makepad-splat"
 version = "1.0.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
- "makepad-micro-serde 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
+ "makepad-micro-serde 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
  "makepad-webp",
  "makepad-zip-file",
 ]
@@ -3176,72 +3167,45 @@ dependencies = [
 [[package]]
 name = "makepad-sqlite"
 version = "1.0.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "makepad-stitch"
 version = "0.1.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "makepad-strict-json"
 version = "0.1.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
-
-[[package]]
-name = "makepad-studio-hub"
-version = "0.1.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
-dependencies = [
- "makepad-filesystem-watcher",
- "makepad-git",
- "makepad-live-id 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
- "makepad-micro-serde 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
- "makepad-network",
- "makepad-rabin-karp",
- "makepad-regex",
- "makepad-script-std",
- "makepad-studio-protocol",
- "makepad-terminal-core",
-]
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "makepad-studio-protocol"
 version = "0.1.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
  "bitflags 2.10.0",
  "makepad-error-log",
- "makepad-live-id 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
- "makepad-micro-serde 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
- "makepad-script",
+ "makepad-key-code",
+ "makepad-live-id 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
+ "makepad-micro-serde 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
 ]
 
 [[package]]
 name = "makepad-svg"
 version = "1.0.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
  "makepad-html",
- "makepad-live-id 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
-]
-
-[[package]]
-name = "makepad-terminal-core"
-version = "1.0.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
-dependencies = [
- "windows 0.62.2",
+ "makepad-live-id 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
 ]
 
 [[package]]
 name = "makepad-test"
 version = "0.1.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
- "makepad-micro-serde 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
- "makepad-network",
- "makepad-studio-hub",
+ "makepad-micro-serde 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
  "makepad-studio-protocol",
  "makepad-test-macros",
 ]
@@ -3249,7 +3213,7 @@ dependencies = [
 [[package]]
 name = "makepad-test-macros"
 version = "0.1.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3259,30 +3223,30 @@ dependencies = [
 [[package]]
 name = "makepad-tsdf"
 version = "0.1.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
  "makepad-math",
- "makepad-micro-serde 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
+ "makepad-micro-serde 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
 ]
 
 [[package]]
 name = "makepad-video-flow"
 version = "0.1.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "makepad-wasm-bridge"
 version = "1.0.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
  "makepad-derive-wasm-bridge",
- "makepad-live-id 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
+ "makepad-live-id 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
 ]
 
 [[package]]
 name = "makepad-webp"
 version = "0.2.4"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
  "makepad-byteorder-lite",
 ]
@@ -3290,28 +3254,93 @@ dependencies = [
 [[package]]
 name = "makepad-widgets"
 version = "2.0.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
- "i_overlay 7.0.3 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
  "makepad-csg",
+ "makepad-gltf",
+ "makepad-test",
+ "makepad-widgets-core",
+ "makepad-widgets-data",
+ "makepad-widgets-extras",
+ "makepad-widgets-maps",
+ "makepad-widgets-menus",
+ "makepad-widgets-rich-text",
+ "makepad-widgets-tweaker",
+]
+
+[[package]]
+name = "makepad-widgets-core"
+version = "2.0.0"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
+dependencies = [
  "makepad-derive-widget",
  "makepad-draw",
- "makepad-fast-inflate",
- "makepad-gltf",
- "makepad-html",
- "makepad-latex-math",
- "makepad-mbtile-reader",
- "makepad-test",
- "pulldown-cmark",
  "serde",
  "ttf-parser 0.24.1",
  "unicode-segmentation 1.12.0",
 ]
 
+[[package]]
+name = "makepad-widgets-data"
+version = "2.0.0"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
+dependencies = [
+ "makepad-widgets-core",
+ "serde",
+]
+
+[[package]]
+name = "makepad-widgets-extras"
+version = "2.0.0"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
+dependencies = [
+ "makepad-widgets-core",
+]
+
+[[package]]
+name = "makepad-widgets-maps"
+version = "2.0.0"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
+dependencies = [
+ "i_overlay 7.0.3 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
+ "makepad-fast-inflate",
+ "makepad-mbtile-reader",
+ "makepad-widgets-core",
+]
+
+[[package]]
+name = "makepad-widgets-menus"
+version = "2.0.0"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
+dependencies = [
+ "makepad-widgets-core",
+]
+
+[[package]]
+name = "makepad-widgets-rich-text"
+version = "2.0.0"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
+dependencies = [
+ "makepad-html",
+ "makepad-latex-math",
+ "makepad-widgets-core",
+ "pulldown-cmark",
+ "unicode-segmentation 1.12.0",
+]
+
+[[package]]
+name = "makepad-widgets-tweaker"
+version = "2.0.0"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
+dependencies = [
+ "makepad-widgets-core",
+ "makepad-widgets-data",
+]
+
 [[package]]
 name = "makepad-xr"
 version = "1.0.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
  "makepad-box3d",
  "makepad-gltf",
@@ -3323,7 +3352,7 @@ dependencies = [
 [[package]]
 name = "makepad-zip-file"
 version = "1.0.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
  "makepad-fast-inflate",
 ]
@@ -3331,24 +3360,21 @@ dependencies = [
 [[package]]
 name = "makepad-zune-bmp"
 version = "0.5.2"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
- "log 0.4.34",
+ "makepad-error-log",
  "makepad-zune-core",
 ]
 
 [[package]]
 name = "makepad-zune-core"
 version = "0.5.1"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
-dependencies = [
- "log 0.4.34",
-]
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "makepad-zune-inflate"
 version = "0.2.54"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
  "simd-adler32 0.3.9",
 ]
@@ -3356,7 +3382,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-jpeg"
 version = "0.5.15"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
  "makepad-zune-core",
 ]
@@ -3364,7 +3390,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-png"
 version = "0.5.2"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
  "makepad-fast-inflate",
  "makepad-zune-core",
@@ -3374,7 +3400,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-qoi"
 version = "0.5.2"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
  "makepad-zune-core",
 ]
@@ -3414,7 +3440,7 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771"
 [[package]]
 name = "memchr"
 version = "2.7.6"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "memchr"
@@ -3533,14 +3559,14 @@ checksum = "743fb55ba31b18fb1ecef6bdc9aa2743314978ac084044301a7eee33fb99a20d"
 [[package]]
 name = "naga"
 version = "27.0.3"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
  "arrayvec",
- "bit-set 0.8.0 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
- "bitflags 2.13.2",
- "cfg-if 1.0.4 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
+ "bit-set 0.8.0 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
+ "bitflags 2.10.0",
+ "cfg-if 1.0.4 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
  "cfg_aliases 0.2.1",
- "hashbrown 0.16.1 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
+ "hashbrown 0.16.1 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
  "hexf-parse",
  "indexmap 2.13.0",
  "makepad-error-log",
@@ -3550,7 +3576,7 @@ dependencies = [
  "rustc-hash 1.1.0",
  "spirv",
  "thiserror 2.0.18",
- "unicode-ident",
+ "unicode-ident 1.0.22",
 ]
 
 [[package]]
@@ -3609,7 +3635,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "465500e14ea162429d264d44189adc38b199b62b1c21eea9f69e4b73cb03bbf2"
 dependencies = [
  "libc",
- "log 0.4.34",
+ "log",
  "openssl",
  "openssl-probe",
  "openssl-sys",
@@ -4190,18 +4216,6 @@ dependencies = [
  "serde_json",
 ]
 
-[[package]]
-name = "nix"
-version = "0.31.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf20d2fde8ff38632c426f1165ed7436270b44f199fc55284c38276f9db47c3d"
-dependencies = [
- "bitflags 2.13.2",
- "cfg-if 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg_aliases 0.2.2",
- "libc",
-]
-
 [[package]]
 name = "nom"
 version = "7.1.3"
@@ -4319,7 +4333,7 @@ dependencies = [
 [[package]]
 name = "num-traits"
 version = "0.2.20"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "objc2"
@@ -4436,7 +4450,7 @@ checksum = "8d380ab6c951261a0e44306245bc960b3b3367f099a7da7156bd1a3cacaf783c"
 [[package]]
 name = "once_cell"
 version = "1.21.3"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "once_cell"
@@ -4716,7 +4730,7 @@ dependencies = [
 [[package]]
 name = "pkg-config"
 version = "0.3.32"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "pkg-config"
@@ -4858,7 +4872,7 @@ version = "1.0.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "985e7ec9bb745e6ce6535b544d84d6cd6f7ad8bd711c398938ae983b91a766d9"
 dependencies = [
- "unicode-ident",
+ "unicode-ident 1.0.24",
 ]
 
 [[package]]
@@ -4883,11 +4897,11 @@ dependencies = [
 [[package]]
 name = "pulldown-cmark"
 version = "0.12.2"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
  "bitflags 2.10.0",
  "memchr 2.7.6",
- "unicase 2.9.0 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
+ "unicase 2.9.0 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
 ]
 
 [[package]]
@@ -4965,7 +4979,7 @@ dependencies = [
  "once_cell 1.21.4",
  "socket2",
  "tracing",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -5204,7 +5218,7 @@ dependencies = [
  "hyper-rustls",
  "hyper-util",
  "js-sys",
- "log 0.4.34",
+ "log",
  "percent-encoding",
  "pin-project-lite",
  "quinn",
@@ -5248,7 +5262,7 @@ dependencies = [
  "dispatch2",
  "js-sys",
  "libc",
- "log 0.4.34",
+ "log",
  "objc2",
  "objc2-app-kit",
  "objc2-core-foundation",
@@ -5481,7 +5495,7 @@ dependencies = [
 [[package]]
 name = "rustc-hash"
 version = "1.1.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "rustc-hash"
@@ -5508,7 +5522,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -5518,7 +5532,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6725596c3f2c3a0aef021139e145d4eafe314a6623e4680ca83852b2c67ab2ba"
 dependencies = [
  "aws-lc-rs",
- "log 0.4.34",
+ "log",
  "once_cell 1.21.4",
  "ring",
  "rustls-pki-types",
@@ -5570,7 +5584,7 @@ dependencies = [
 [[package]]
 name = "rustybuzz"
 version = "0.18.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
  "bitflags 2.10.0",
  "bytemuck 1.25.0",
@@ -5610,7 +5624,7 @@ dependencies = [
 [[package]]
 name = "scoped-tls"
 version = "1.0.1"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "scopeguard"
@@ -5621,7 +5635,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 [[package]]
 name = "sdfer"
 version = "0.2.1"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "sec1"
@@ -5830,7 +5844,7 @@ dependencies = [
 [[package]]
 name = "simd-adler32"
 version = "0.3.9"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "simd-adler32"
@@ -5853,7 +5867,7 @@ checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
 [[package]]
 name = "smallvec"
 version = "1.15.1"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "smallvec"
@@ -5883,9 +5897,9 @@ dependencies = [
 [[package]]
 name = "spirv"
 version = "0.3.0+sdk-1.3.268.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
- "bitflags 2.13.2",
+ "bitflags 2.10.0",
 ]
 
 [[package]]
@@ -5967,7 +5981,7 @@ checksum = "872831b642d1a07999a962a351ed35b955ea2cfc8f3862091e2a240a84f17297"
 dependencies = [
  "proc-macro2",
  "quote",
- "unicode-ident",
+ "unicode-ident 1.0.24",
 ]
 
 [[package]]
@@ -5978,7 +5992,7 @@ checksum = "12df2e0110f65b775f769bb17ef989067a1d931b2eb822bd4346631eeada89f9"
 dependencies = [
  "proc-macro2",
  "quote",
- "unicode-ident",
+ "unicode-ident 1.0.24",
 ]
 
 [[package]]
@@ -6011,7 +6025,7 @@ dependencies = [
  "getrandom 0.4.3",
  "once_cell 1.21.4",
  "rustix",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -6026,7 +6040,7 @@ dependencies = [
 [[package]]
 name = "thiserror"
 version = "2.0.18"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
  "thiserror-impl 2.0.18",
 ]
@@ -6054,9 +6068,9 @@ dependencies = [
 [[package]]
 name = "thiserror-impl"
 version = "2.0.18"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
- "makepad-micro-proc-macro 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
+ "makepad-micro-proc-macro 1.0.0 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
 ]
 
 [[package]]
@@ -6319,7 +6333,7 @@ checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1"
 [[package]]
 name = "ttf-parser"
 version = "0.24.1"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "typed-path"
@@ -6370,22 +6384,27 @@ checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142"
 [[package]]
 name = "unicase"
 version = "2.9.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "unicode-bidi"
 version = "0.3.18"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "unicode-bidi-mirroring"
 version = "0.3.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "unicode-ccc"
 version = "0.3.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.22"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "unicode-ident"
@@ -6396,7 +6415,7 @@ checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
 [[package]]
 name = "unicode-linebreak"
 version = "0.1.5"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "unicode-normalization"
@@ -6410,17 +6429,17 @@ dependencies = [
 [[package]]
 name = "unicode-properties"
 version = "0.1.4"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "unicode-script"
 version = "0.5.8"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "unicode-segmentation"
 version = "1.12.0"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "unicode-segmentation"
@@ -6737,7 +6756,7 @@ version = "0.2.127"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ef64dbcc55df09c7e5a46182d181c2cfa3e925f3da937ea764728b4bbb9dcbf"
 dependencies = [
- "unicode-ident",
+ "unicode-ident 1.0.24",
 ]
 
 [[package]]
@@ -6756,10 +6775,9 @@ dependencies = [
 [[package]]
 name = "wayland-backend"
 version = "0.3.12"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
  "downcast-rs",
- "libc",
  "scoped-tls",
  "smallvec 1.16.0",
  "wayland-sys",
@@ -6768,17 +6786,17 @@ dependencies = [
 [[package]]
 name = "wayland-client"
 version = "0.31.12"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
- "bitflags 2.13.2",
- "libc",
+ "bitflags 2.10.0",
  "wayland-backend",
+ "wayland-sys",
 ]
 
 [[package]]
 name = "wayland-egl"
 version = "0.32.9"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
  "wayland-backend",
  "wayland-sys",
@@ -6787,9 +6805,9 @@ dependencies = [
 [[package]]
 name = "wayland-protocols"
 version = "0.32.10"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
- "bitflags 2.13.2",
+ "bitflags 2.10.0",
  "wayland-backend",
  "wayland-client",
 ]
@@ -6797,9 +6815,9 @@ dependencies = [
 [[package]]
 name = "wayland-sys"
 version = "0.31.8"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
- "log 0.4.29",
+ "makepad-error-log",
  "pkg-config 0.3.32",
 ]
 
@@ -6841,7 +6859,7 @@ checksum = "a28ac98ddc8b9274cb41bb4d9d4d5c425b6020c50c46f25559911905610b4a88"
 [[package]]
 name = "weezl"
 version = "0.1.12"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "winapi-util"
@@ -6849,7 +6867,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -6865,19 +6883,19 @@ dependencies = [
 [[package]]
 name = "windows"
 version = "0.62.2"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
  "windows-collections",
- "windows-core 0.62.2 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
+ "windows-core 0.62.2 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
  "windows-future",
 ]
 
 [[package]]
 name = "windows-collections"
 version = "0.3.2"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
- "windows-core 0.62.2 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
+ "windows-core 0.62.2 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
 ]
 
 [[package]]
@@ -6908,19 +6926,19 @@ dependencies = [
 [[package]]
 name = "windows-core"
 version = "0.62.2"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
- "windows-link 0.2.1 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
- "windows-result 0.4.1 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
- "windows-strings 0.5.1 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
+ "windows-link 0.2.1 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
+ "windows-result 0.4.1 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
+ "windows-strings 0.5.1 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
 ]
 
 [[package]]
 name = "windows-future"
 version = "0.3.2"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
- "windows-core 0.62.2 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
+ "windows-core 0.62.2 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
 ]
 
 [[package]]
@@ -6976,7 +6994,7 @@ checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
 [[package]]
 name = "windows-link"
 version = "0.2.1"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "windows-native-keyring-store"
@@ -7012,9 +7030,9 @@ dependencies = [
 [[package]]
 name = "windows-result"
 version = "0.4.1"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
- "windows-link 0.2.1 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
+ "windows-link 0.2.1 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
 ]
 
 [[package]]
@@ -7029,9 +7047,9 @@ dependencies = [
 [[package]]
 name = "windows-strings"
 version = "0.5.1"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 dependencies = [
- "windows-link 0.2.1 (git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3)",
+ "windows-link 0.2.1 (git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935)",
 ]
 
 [[package]]
@@ -7341,7 +7359,7 @@ dependencies = [
 [[package]]
 name = "zerocopy"
 version = "0.8.39"
-source = "git+https://gitdab.com/andodeki/makepad?rev=66cc4f15f598c89552b9c67857a62ab33b0b6db3#66cc4f15f598c89552b9c67857a62ab33b0b6db3"
+source = "git+https://gitdab.com/andodeki/makepad?rev=25e742949dada71af6899ea1c32b25f1e82b3935#25e742949dada71af6899ea1c32b25f1e82b3935"
 
 [[package]]
 name = "zerocopy"
@@ -7495,7 +7513,7 @@ checksum = "f05cd8797d63865425ff89b5c4a48804f35ba0ce8d125800027ad6017d2b5249"
 dependencies = [
  "bumpalo",
  "crc32fast",
- "log 0.4.34",
+ "log",
  "simd-adler32 0.3.10",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index 79fd69c..4d119fe 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -119,23 +119,23 @@ strip = true
 # Single source of truth for the makepad fork. Bump the rev here and every
 # crate that declares these deps via `workspace = true` adopts it at once.
 [workspace.dependencies]
-makepad-widgets = { git = "https://gitdab.com/andodeki/makepad", rev = "66cc4f15f598c89552b9c67857a62ab33b0b6db3" }
-makepad-test = { git = "https://gitdab.com/andodeki/makepad", rev = "66cc4f15f598c89552b9c67857a62ab33b0b6db3" }
-makepad-platform = { git = "https://gitdab.com/andodeki/makepad", rev = "66cc4f15f598c89552b9c67857a62ab33b0b6db3" }
-makepad-draw = { git = "https://gitdab.com/andodeki/makepad", rev = "66cc4f15f598c89552b9c67857a62ab33b0b6db3" }
-makepad-derive-widget = { git = "https://gitdab.com/andodeki/makepad", rev = "66cc4f15f598c89552b9c67857a62ab33b0b6db3" }
-makepad-fast-inflate = { git = "https://gitdab.com/andodeki/makepad", rev = "66cc4f15f598c89552b9c67857a62ab33b0b6db3" }
-makepad-mbtile-reader = { git = "https://gitdab.com/andodeki/makepad", rev = "66cc4f15f598c89552b9c67857a62ab33b0b6db3" }
-makepad-script = { git = "https://gitdab.com/andodeki/makepad", rev = "66cc4f15f598c89552b9c67857a62ab33b0b6db3" }
-makepad-code-editor = { git = "https://gitdab.com/andodeki/makepad", rev = "66cc4f15f598c89552b9c67857a62ab33b0b6db3" }
-makepad-xr = { git = "https://gitdab.com/andodeki/makepad", rev = "66cc4f15f598c89552b9c67857a62ab33b0b6db3" }
-makepad-ai-hub = { git = "https://gitdab.com/andodeki/makepad", rev = "66cc4f15f598c89552b9c67857a62ab33b0b6db3", default-features = false }
-makepad-base64 = { git = "https://gitdab.com/andodeki/makepad", rev = "66cc4f15f598c89552b9c67857a62ab33b0b6db3" }
+makepad-widgets = { git = "https://gitdab.com/andodeki/makepad", rev = "25e742949dada71af6899ea1c32b25f1e82b3935" }
+makepad-test = { git = "https://gitdab.com/andodeki/makepad", rev = "25e742949dada71af6899ea1c32b25f1e82b3935" }
+makepad-platform = { git = "https://gitdab.com/andodeki/makepad", rev = "25e742949dada71af6899ea1c32b25f1e82b3935" }
+makepad-draw = { git = "https://gitdab.com/andodeki/makepad", rev = "25e742949dada71af6899ea1c32b25f1e82b3935" }
+makepad-derive-widget = { git = "https://gitdab.com/andodeki/makepad", rev = "25e742949dada71af6899ea1c32b25f1e82b3935" }
+makepad-fast-inflate = { git = "https://gitdab.com/andodeki/makepad", rev = "25e742949dada71af6899ea1c32b25f1e82b3935" }
+makepad-mbtile-reader = { git = "https://gitdab.com/andodeki/makepad", rev = "25e742949dada71af6899ea1c32b25f1e82b3935" }
+makepad-script = { git = "https://gitdab.com/andodeki/makepad", rev = "25e742949dada71af6899ea1c32b25f1e82b3935" }
+makepad-code-editor = { git = "https://gitdab.com/andodeki/makepad", rev = "25e742949dada71af6899ea1c32b25f1e82b3935" }
+makepad-xr = { git = "https://gitdab.com/andodeki/makepad", rev = "25e742949dada71af6899ea1c32b25f1e82b3935" }
+makepad-ai-hub = { git = "https://gitdab.com/andodeki/makepad", rev = "25e742949dada71af6899ea1c32b25f1e82b3935", default-features = false }
+makepad-base64 = { git = "https://gitdab.com/andodeki/makepad", rev = "25e742949dada71af6899ea1c32b25f1e82b3935" }
 # makepad-game-* (libs/game, from the makepad-internal fork). These only
 # resolve once the fork is merged AND the rev above is bumped to the merged
 # commit — the traffic game writes against this API now; see the world/road
 # modules. Leave the rev alone until the fork merge lands.
-makepad-game-sim = { git = "https://gitdab.com/andodeki/makepad", rev = "66cc4f15f598c89552b9c67857a62ab33b0b6db3" }
-makepad-game-math = { git = "https://gitdab.com/andodeki/makepad", rev = "66cc4f15f598c89552b9c67857a62ab33b0b6db3" }
-makepad-game-blocks = { git = "https://gitdab.com/andodeki/makepad", rev = "66cc4f15f598c89552b9c67857a62ab33b0b6db3" }
-makepad-game-render = { git = "https://gitdab.com/andodeki/makepad", rev = "66cc4f15f598c89552b9c67857a62ab33b0b6db3" }
+makepad-game-sim = { git = "https://gitdab.com/andodeki/makepad", rev = "25e742949dada71af6899ea1c32b25f1e82b3935" }
+makepad-game-math = { git = "https://gitdab.com/andodeki/makepad", rev = "25e742949dada71af6899ea1c32b25f1e82b3935" }
+makepad-game-blocks = { git = "https://gitdab.com/andodeki/makepad", rev = "25e742949dada71af6899ea1c32b25f1e82b3935" }
+makepad-game-render = { git = "https://gitdab.com/andodeki/makepad", rev = "25e742949dada71af6899ea1c32b25f1e82b3935" }
diff --git a/MAKEPAD_DEV_INTEGRATION.md b/MAKEPAD_DEV_INTEGRATION.md
new file mode 100644
index 0000000..d071231
--- /dev/null
+++ b/MAKEPAD_DEV_INTEGRATION.md
@@ -0,0 +1,51 @@
+# Makepad dev integration — 2026-10-26
+
+## Pin and branches
+
+The root workspace previously pinned `66cc4f15f598c89552b9c67857a62ab33b0b6db3`. That commit belongs to both `nigig-makepad-test-android` and `nigig-traffic-camera-boom-fix`, not the fork's default branch.
+
+Both integration branches were consolidated onto upstream GitHub `dev` at `44ecb822b48106fa76bde4dfd309e5a8a7ff1932`, as requested:
+
+- Android integration: `d8d5ea8b6af4b3a96cd435fa1816fd9251d56af1`
+- Traffic integration: `25e742949dada71af6899ea1c32b25f1e82b3935`
+
+The traffic branch contains the Android integration plus its two original camera/particle fixes. This workspace now pins the traffic revision to include both sets of fixes. The 16 root Makepad dependency declarations use that revision, and Cargo regenerated `Cargo.lock` rather than mechanically rewriting checksums/dependency lists.
+
+The Makepad remote branches were published atomically with exact force-with-lease checks and remote backups:
+
+- `backup/nigig-android-before-sync-20261026` → `091712f55a7cd65b1d17c8d275b8834b79a3216f`
+- `backup/nigig-traffic-before-sync-20261026` → `a3d8f521a9aaa5052415e7d1de6b329a4a6eba73`
+
+## Integration decisions
+
+- Retained required fork/work applications, game crates, Android packaging, BeforeStartup/test-mode and touch protocol support.
+- Used upstream dev's widget-family architecture and restored nigig's `test`, `gltf` and `csg` optional sibling exports on its facade. Upstream core already implements `enter_isolate`/`leave_isolate`.
+- Kept upstream's widget-core isolation, script host-I/O restrictions, script derive generator, X11 hover/fullscreen handling, Wayland handling and builder fixes rather than carrying obsolete or partially merged implementations.
+- Repaired duplicate WM feature tables and incompatible feature references.
+- Restored files missing from still-required asset/flow/VJ dependencies from the original pinned revision, without overwriting surviving fork files. This repairs incomplete deletions in the previous integration history.
+
+## Validation performed
+
+Using Rust **1.97.1**, the workspace's pinned toolchain:
+
+- Makepad workspace metadata and lockfile resolution succeeded.
+- `cargo check -p makepad-widgets --no-default-features --features data` passed.
+- `cargo check -p makepad-test -p makepad-game-blocks -p makepad-game-render` passed.
+- Game library tests passed: **18 game-blocks + 83 game-render**.
+- Nigig root lockfile regeneration succeeded; `cargo metadata --locked --offline --no-deps` passed.
+- Budget-app compiled against this integration after adapting its palette accessor; its 93 core tests passed.
+
+The root nigig lockfile was initially regenerated using a process-local Git URL rewrite to the prepared local Makepad repository. Its committed source URLs remain the canonical Gitdab URL; there are no local filesystem dependency URLs in the lockfile.
+
+## Limits and rollout
+
+This is **not** a full nigig-org application build, Android APK build, runtime/UI test, or exhaustive check of all retained work applications. Test those before merging this dependency update into the deployment branch.
+
+The excluded/nested `p2p-intel` and `makepad_table` projects, plus standalone map/theming examples, retain their independent Makepad pins. The root lockfile still includes `ecf5a572...` micro-serde dependencies brought in by p2p crates. These separate dependency families were not silently migrated as part of the root pin update.
+
+Use the normal commands with the root toolchain after fetching the published revision:
+
+```sh
+cargo metadata --locked --no-deps --format-version 1
+# Then run the selected nigig application's normal build/test workflow.
+```
-- 
2.34.1