diff --git a/Cargo.lock b/Cargo.lock
index 1827f84b..51ee3f1a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1751,7 +1751,7 @@ dependencies = [
 [[package]]
 name = "makepad-derive-live"
 version = "0.4.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#92a3af42107b070b7a52f3cb85112ab14bb57c19"
+source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#a4cbaa1b16853656acfa92cbfa64fce65b4ad585"
 dependencies = [
  "makepad-live-id",
  "makepad-micro-proc-macro",
@@ -1760,7 +1760,7 @@ dependencies = [
 [[package]]
 name = "makepad-derive-wasm-bridge"
 version = "0.4.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#92a3af42107b070b7a52f3cb85112ab14bb57c19"
+source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#a4cbaa1b16853656acfa92cbfa64fce65b4ad585"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -1768,7 +1768,7 @@ dependencies = [
 [[package]]
 name = "makepad-derive-widget"
 version = "0.4.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#92a3af42107b070b7a52f3cb85112ab14bb57c19"
+source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#a4cbaa1b16853656acfa92cbfa64fce65b4ad585"
 dependencies = [
  "makepad-live-id",
  "makepad-micro-proc-macro",
@@ -1777,7 +1777,7 @@ dependencies = [
 [[package]]
 name = "makepad-draw"
 version = "0.6.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#92a3af42107b070b7a52f3cb85112ab14bb57c19"
+source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#a4cbaa1b16853656acfa92cbfa64fce65b4ad585"
 dependencies = [
  "ab_glyph_rasterizer",
  "fxhash",
@@ -1794,17 +1794,17 @@ dependencies = [
 [[package]]
 name = "makepad-futures"
 version = "0.4.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#92a3af42107b070b7a52f3cb85112ab14bb57c19"
+source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#a4cbaa1b16853656acfa92cbfa64fce65b4ad585"
 
 [[package]]
 name = "makepad-futures-legacy"
 version = "0.7.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#92a3af42107b070b7a52f3cb85112ab14bb57c19"
+source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#a4cbaa1b16853656acfa92cbfa64fce65b4ad585"
 
 [[package]]
 name = "makepad-html"
 version = "0.4.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#92a3af42107b070b7a52f3cb85112ab14bb57c19"
+source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#a4cbaa1b16853656acfa92cbfa64fce65b4ad585"
 dependencies = [
  "makepad-live-id",
 ]
@@ -1812,7 +1812,7 @@ dependencies = [
 [[package]]
 name = "makepad-http"
 version = "0.4.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#92a3af42107b070b7a52f3cb85112ab14bb57c19"
+source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#a4cbaa1b16853656acfa92cbfa64fce65b4ad585"
 
 [[package]]
 name = "makepad-jni-sys"
@@ -1823,7 +1823,7 @@ checksum = "9775cbec5fa0647500c3e5de7c850280a88335d1d2d770e5aa2332b801ba7064"
 [[package]]
 name = "makepad-live-compiler"
 version = "0.5.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#92a3af42107b070b7a52f3cb85112ab14bb57c19"
+source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#a4cbaa1b16853656acfa92cbfa64fce65b4ad585"
 dependencies = [
  "makepad-derive-live",
  "makepad-live-tokenizer",
@@ -1833,7 +1833,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-id"
 version = "0.4.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#92a3af42107b070b7a52f3cb85112ab14bb57c19"
+source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#a4cbaa1b16853656acfa92cbfa64fce65b4ad585"
 dependencies = [
  "makepad-live-id-macros",
 ]
@@ -1841,7 +1841,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-id-macros"
 version = "0.4.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#92a3af42107b070b7a52f3cb85112ab14bb57c19"
+source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#a4cbaa1b16853656acfa92cbfa64fce65b4ad585"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -1849,7 +1849,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-tokenizer"
 version = "0.4.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#92a3af42107b070b7a52f3cb85112ab14bb57c19"
+source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#a4cbaa1b16853656acfa92cbfa64fce65b4ad585"
 dependencies = [
  "makepad-live-id",
  "makepad-math",
@@ -1859,7 +1859,7 @@ dependencies = [
 [[package]]
 name = "makepad-markdown"
 version = "0.4.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#92a3af42107b070b7a52f3cb85112ab14bb57c19"
+source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#a4cbaa1b16853656acfa92cbfa64fce65b4ad585"
 dependencies = [
  "makepad-live-id",
 ]
@@ -1867,17 +1867,17 @@ dependencies = [
 [[package]]
 name = "makepad-math"
 version = "0.4.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#92a3af42107b070b7a52f3cb85112ab14bb57c19"
+source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#a4cbaa1b16853656acfa92cbfa64fce65b4ad585"
 
 [[package]]
 name = "makepad-micro-proc-macro"
 version = "0.4.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#92a3af42107b070b7a52f3cb85112ab14bb57c19"
+source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#a4cbaa1b16853656acfa92cbfa64fce65b4ad585"
 
 [[package]]
 name = "makepad-micro-serde"
 version = "0.4.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#92a3af42107b070b7a52f3cb85112ab14bb57c19"
+source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#a4cbaa1b16853656acfa92cbfa64fce65b4ad585"
 dependencies = [
  "makepad-live-id",
  "makepad-micro-serde-derive",
@@ -1886,7 +1886,7 @@ dependencies = [
 [[package]]
 name = "makepad-micro-serde-derive"
 version = "0.4.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#92a3af42107b070b7a52f3cb85112ab14bb57c19"
+source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#a4cbaa1b16853656acfa92cbfa64fce65b4ad585"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -1894,12 +1894,12 @@ dependencies = [
 [[package]]
 name = "makepad-objc-sys"
 version = "0.4.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#92a3af42107b070b7a52f3cb85112ab14bb57c19"
+source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#a4cbaa1b16853656acfa92cbfa64fce65b4ad585"
 
 [[package]]
 name = "makepad-platform"
 version = "0.6.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#92a3af42107b070b7a52f3cb85112ab14bb57c19"
+source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#a4cbaa1b16853656acfa92cbfa64fce65b4ad585"
 dependencies = [
  "hilog-sys",
  "makepad-android-state",
@@ -1922,7 +1922,7 @@ dependencies = [
 [[package]]
 name = "makepad-rustybuzz"
 version = "0.8.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#92a3af42107b070b7a52f3cb85112ab14bb57c19"
+source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#a4cbaa1b16853656acfa92cbfa64fce65b4ad585"
 dependencies = [
  "bitflags 1.3.2",
  "bytemuck",
@@ -1937,7 +1937,7 @@ dependencies = [
 [[package]]
 name = "makepad-shader-compiler"
 version = "0.5.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#92a3af42107b070b7a52f3cb85112ab14bb57c19"
+source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#a4cbaa1b16853656acfa92cbfa64fce65b4ad585"
 dependencies = [
  "makepad-live-compiler",
 ]
@@ -1945,7 +1945,7 @@ dependencies = [
 [[package]]
 name = "makepad-vector"
 version = "0.4.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#92a3af42107b070b7a52f3cb85112ab14bb57c19"
+source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#a4cbaa1b16853656acfa92cbfa64fce65b4ad585"
 dependencies = [
  "resvg",
  "ttf-parser",
@@ -1954,7 +1954,7 @@ dependencies = [
 [[package]]
 name = "makepad-wasm-bridge"
 version = "0.4.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#92a3af42107b070b7a52f3cb85112ab14bb57c19"
+source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#a4cbaa1b16853656acfa92cbfa64fce65b4ad585"
 dependencies = [
  "makepad-derive-wasm-bridge",
  "makepad-live-id",
@@ -1963,7 +1963,7 @@ dependencies = [
 [[package]]
 name = "makepad-widgets"
 version = "0.6.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#92a3af42107b070b7a52f3cb85112ab14bb57c19"
+source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#a4cbaa1b16853656acfa92cbfa64fce65b4ad585"
 dependencies = [
  "makepad-derive-widget",
  "makepad-draw",
@@ -1977,7 +1977,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-core"
 version = "0.2.14"
-source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#92a3af42107b070b7a52f3cb85112ab14bb57c19"
+source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#a4cbaa1b16853656acfa92cbfa64fce65b4ad585"
 dependencies = [
  "bitflags 2.6.0",
 ]
@@ -1985,7 +1985,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-inflate"
 version = "0.2.54"
-source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#92a3af42107b070b7a52f3cb85112ab14bb57c19"
+source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#a4cbaa1b16853656acfa92cbfa64fce65b4ad585"
 dependencies = [
  "simd-adler32",
 ]
@@ -1993,7 +1993,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-jpeg"
 version = "0.3.17"
-source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#92a3af42107b070b7a52f3cb85112ab14bb57c19"
+source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#a4cbaa1b16853656acfa92cbfa64fce65b4ad585"
 dependencies = [
  "makepad-zune-core",
 ]
@@ -2001,7 +2001,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-png"
 version = "0.2.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#92a3af42107b070b7a52f3cb85112ab14bb57c19"
+source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#a4cbaa1b16853656acfa92cbfa64fce65b4ad585"
 dependencies = [
  "makepad-zune-core",
  "makepad-zune-inflate",
@@ -4048,7 +4048,7 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
 [[package]]
 name = "ttf-parser"
 version = "0.21.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#92a3af42107b070b7a52f3cb85112ab14bb57c19"
+source = "git+https://github.com/kevinaboos/makepad?branch=widget_uid_hashable#a4cbaa1b16853656acfa92cbfa64fce65b4ad585"
 
 [[package]]
 name = "typenum"