diff --git a/Cargo.lock b/Cargo.lock
index 07312f36..f0e8306e 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://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 
 [[package]]
 name = "accessory"
@@ -610,7 +610,7 @@ dependencies = [
 [[package]]
 name = "bitflags"
 version = "2.10.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 
 [[package]]
 name = "bitmaps"
@@ -728,7 +728,7 @@ checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 [[package]]
 name = "bytemuck"
 version = "1.25.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 
 [[package]]
 name = "byteorder"
@@ -739,7 +739,7 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 [[package]]
 name = "byteorder"
 version = "1.5.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 
 [[package]]
 name = "bytes"
@@ -1941,9 +1941,9 @@ dependencies = [
 [[package]]
 name = "fxhash"
 version = "0.2.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 dependencies = [
- "byteorder 1.5.0 (git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment)",
+ "byteorder 1.5.0 (git+https://github.com/makepad/makepad?branch=dev)",
 ]
 
 [[package]]
@@ -2937,7 +2937,7 @@ dependencies = [
 [[package]]
 name = "makepad-apple-sys"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 dependencies = [
  "makepad-objc-sys",
 ]
@@ -2945,12 +2945,12 @@ dependencies = [
 [[package]]
 name = "makepad-byteorder-lite"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 
 [[package]]
 name = "makepad-code-editor"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 dependencies = [
  "makepad-widgets",
 ]
@@ -2958,7 +2958,7 @@ dependencies = [
 [[package]]
 name = "makepad-derive-wasm-bridge"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -2966,7 +2966,7 @@ dependencies = [
 [[package]]
 name = "makepad-derive-widget"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 dependencies = [
  "makepad-live-id",
  "makepad-micro-proc-macro",
@@ -2975,7 +2975,7 @@ dependencies = [
 [[package]]
 name = "makepad-draw"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 dependencies = [
  "ab_glyph_rasterizer",
  "fxhash",
@@ -2989,15 +2989,15 @@ dependencies = [
  "rustybuzz",
  "sdfer",
  "serde",
- "unicode-bidi 0.3.18 (git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment)",
+ "unicode-bidi 0.3.18 (git+https://github.com/makepad/makepad?branch=dev)",
  "unicode-linebreak",
- "unicode-segmentation 1.12.0 (git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment)",
+ "unicode-segmentation 1.12.0 (git+https://github.com/makepad/makepad?branch=dev)",
 ]
 
 [[package]]
 name = "makepad-error-log"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 dependencies = [
  "makepad-micro-serde",
 ]
@@ -3005,22 +3005,22 @@ dependencies = [
 [[package]]
 name = "makepad-filesystem-watcher"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 
 [[package]]
 name = "makepad-futures"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 
 [[package]]
 name = "makepad-futures-legacy"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 
 [[package]]
 name = "makepad-html"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 dependencies = [
  "makepad-live-id",
 ]
@@ -3034,7 +3034,7 @@ checksum = "9775cbec5fa0647500c3e5de7c850280a88335d1d2d770e5aa2332b801ba7064"
 [[package]]
 name = "makepad-latex-math"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 dependencies = [
  "ttf-parser",
 ]
@@ -3042,7 +3042,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-id"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 dependencies = [
  "makepad-live-id-macros",
  "serde",
@@ -3051,7 +3051,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-id-macros"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -3059,7 +3059,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-reload-core"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 dependencies = [
  "makepad-filesystem-watcher",
 ]
@@ -3067,7 +3067,7 @@ dependencies = [
 [[package]]
 name = "makepad-math"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 dependencies = [
  "makepad-micro-serde",
 ]
@@ -3075,12 +3075,12 @@ dependencies = [
 [[package]]
 name = "makepad-micro-proc-macro"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 
 [[package]]
 name = "makepad-micro-serde"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 dependencies = [
  "makepad-live-id",
  "makepad-micro-serde-derive",
@@ -3089,7 +3089,7 @@ dependencies = [
 [[package]]
 name = "makepad-micro-serde-derive"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -3097,7 +3097,7 @@ dependencies = [
 [[package]]
 name = "makepad-network"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 dependencies = [
  "makepad-apple-sys",
  "makepad-error-log",
@@ -3111,15 +3111,15 @@ dependencies = [
 [[package]]
 name = "makepad-objc-sys"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 
 [[package]]
 name = "makepad-platform"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 dependencies = [
  "ash",
- "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment)",
+ "bitflags 2.10.0 (git+https://github.com/makepad/makepad?branch=dev)",
  "hilog-sys",
  "makepad-android-state",
  "makepad-apple-sys",
@@ -3140,7 +3140,7 @@ dependencies = [
  "napi-derive-ohos",
  "napi-ohos",
  "ohos-sys",
- "smallvec 1.15.1 (git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment)",
+ "smallvec 1.15.1 (git+https://github.com/makepad/makepad?branch=dev)",
  "wayland-client",
  "wayland-egl",
  "wayland-protocols",
@@ -3152,12 +3152,12 @@ dependencies = [
 [[package]]
 name = "makepad-regex"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 
 [[package]]
 name = "makepad-script"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 dependencies = [
  "makepad-error-log",
  "makepad-html",
@@ -3165,13 +3165,13 @@ dependencies = [
  "makepad-math",
  "makepad-regex",
  "makepad-script-derive",
- "smallvec 1.15.1 (git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment)",
+ "smallvec 1.15.1 (git+https://github.com/makepad/makepad?branch=dev)",
 ]
 
 [[package]]
 name = "makepad-script-derive"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -3179,7 +3179,7 @@ dependencies = [
 [[package]]
 name = "makepad-script-std"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 dependencies = [
  "makepad-network",
  "makepad-script",
@@ -3188,14 +3188,14 @@ dependencies = [
 [[package]]
 name = "makepad-shared-bytes"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 
 [[package]]
 name = "makepad-studio-protocol"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 dependencies = [
- "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment)",
+ "bitflags 2.10.0 (git+https://github.com/makepad/makepad?branch=dev)",
  "makepad-error-log",
  "makepad-live-id",
  "makepad-micro-serde",
@@ -3205,7 +3205,7 @@ dependencies = [
 [[package]]
 name = "makepad-svg"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 dependencies = [
  "makepad-html",
  "makepad-live-id",
@@ -3214,7 +3214,7 @@ dependencies = [
 [[package]]
 name = "makepad-tsdf"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 dependencies = [
  "makepad-math",
  "makepad-micro-serde",
@@ -3223,7 +3223,7 @@ dependencies = [
 [[package]]
 name = "makepad-wasm-bridge"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 dependencies = [
  "makepad-derive-wasm-bridge",
  "makepad-live-id",
@@ -3232,7 +3232,7 @@ dependencies = [
 [[package]]
 name = "makepad-webp"
 version = "0.2.4"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 dependencies = [
  "makepad-byteorder-lite",
 ]
@@ -3240,7 +3240,7 @@ dependencies = [
 [[package]]
 name = "makepad-widgets"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 dependencies = [
  "makepad-derive-widget",
  "makepad-draw",
@@ -3249,18 +3249,18 @@ dependencies = [
  "pulldown-cmark 0.12.2",
  "serde",
  "ttf-parser",
- "unicode-segmentation 1.12.0 (git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment)",
+ "unicode-segmentation 1.12.0 (git+https://github.com/makepad/makepad?branch=dev)",
 ]
 
 [[package]]
 name = "makepad-zune-core"
 version = "0.5.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 
 [[package]]
 name = "makepad-zune-inflate"
 version = "0.2.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 dependencies = [
  "simd-adler32",
 ]
@@ -3268,7 +3268,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-jpeg"
 version = "0.5.12"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 dependencies = [
  "makepad-zune-core",
 ]
@@ -3276,7 +3276,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-png"
 version = "0.5.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 dependencies = [
  "makepad-zune-core",
  "makepad-zune-inflate",
@@ -3663,7 +3663,7 @@ checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
 [[package]]
 name = "memchr"
 version = "2.7.6"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 
 [[package]]
 name = "mime"
@@ -4392,10 +4392,10 @@ dependencies = [
 [[package]]
 name = "pulldown-cmark"
 version = "0.12.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 dependencies = [
- "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment)",
- "memchr 2.7.6 (git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment)",
+ "bitflags 2.10.0 (git+https://github.com/makepad/makepad?branch=dev)",
+ "memchr 2.7.6 (git+https://github.com/makepad/makepad?branch=dev)",
  "unicase 2.9.0",
 ]
 
@@ -5203,12 +5203,12 @@ checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
 [[package]]
 name = "rustybuzz"
 version = "0.18.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 dependencies = [
- "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment)",
+ "bitflags 2.10.0 (git+https://github.com/makepad/makepad?branch=dev)",
  "bytemuck",
  "makepad-error-log",
- "smallvec 1.15.1 (git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment)",
+ "smallvec 1.15.1 (git+https://github.com/makepad/makepad?branch=dev)",
  "ttf-parser",
  "unicode-bidi-mirroring",
  "unicode-ccc",
@@ -5303,7 +5303,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 [[package]]
 name = "sdfer"
 version = "0.2.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 
 [[package]]
 name = "sealed"
@@ -5602,7 +5602,7 @@ dependencies = [
 [[package]]
 name = "simd-adler32"
 version = "0.3.8"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 
 [[package]]
 name = "siphasher"
@@ -5628,7 +5628,7 @@ dependencies = [
 [[package]]
 name = "smallvec"
 version = "1.15.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 
 [[package]]
 name = "socket2"
@@ -6409,7 +6409,7 @@ dependencies = [
 [[package]]
 name = "ttf-parser"
 version = "0.24.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 
 [[package]]
 name = "tungstenite"
@@ -6461,7 +6461,7 @@ checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
 [[package]]
 name = "unicase"
 version = "2.9.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 
 [[package]]
 name = "unicode-bidi"
@@ -6472,17 +6472,17 @@ checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5"
 [[package]]
 name = "unicode-bidi"
 version = "0.3.18"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 
 [[package]]
 name = "unicode-bidi-mirroring"
 version = "0.3.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 
 [[package]]
 name = "unicode-ccc"
 version = "0.3.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 
 [[package]]
 name = "unicode-ident"
@@ -6493,7 +6493,7 @@ checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"
 [[package]]
 name = "unicode-linebreak"
 version = "0.1.5"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 
 [[package]]
 name = "unicode-normalization"
@@ -6513,12 +6513,12 @@ checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0"
 [[package]]
 name = "unicode-properties"
 version = "0.1.4"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 
 [[package]]
 name = "unicode-script"
 version = "0.5.8"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 
 [[package]]
 name = "unicode-segmentation"
@@ -6529,7 +6529,7 @@ checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
 [[package]]
 name = "unicode-segmentation"
 version = "1.12.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 
 [[package]]
 name = "unicode-width"
@@ -6861,7 +6861,7 @@ dependencies = [
 [[package]]
 name = "wayland-backend"
 version = "0.3.12"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 dependencies = [
  "downcast-rs",
  "libc",
@@ -6873,7 +6873,7 @@ dependencies = [
 [[package]]
 name = "wayland-client"
 version = "0.31.12"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 dependencies = [
  "bitflags 2.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc",
@@ -6883,7 +6883,7 @@ dependencies = [
 [[package]]
 name = "wayland-egl"
 version = "0.32.9"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 dependencies = [
  "wayland-backend",
  "wayland-sys",
@@ -6892,7 +6892,7 @@ dependencies = [
 [[package]]
 name = "wayland-protocols"
 version = "0.32.10"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 dependencies = [
  "bitflags 2.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "wayland-backend",
@@ -6902,7 +6902,7 @@ dependencies = [
 [[package]]
 name = "wayland-sys"
 version = "0.31.8"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 dependencies = [
  "log",
  "pkg-config",
@@ -7010,7 +7010,7 @@ dependencies = [
 [[package]]
 name = "windows"
 version = "0.62.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 dependencies = [
  "windows-collections 0.3.2",
  "windows-core 0.62.2",
@@ -7029,7 +7029,7 @@ dependencies = [
 [[package]]
 name = "windows-collections"
 version = "0.3.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 dependencies = [
  "windows-core 0.62.2",
 ]
@@ -7062,7 +7062,7 @@ dependencies = [
 [[package]]
 name = "windows-core"
 version = "0.62.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 dependencies = [
  "windows-link 0.2.1",
  "windows-result 0.4.1",
@@ -7083,7 +7083,7 @@ dependencies = [
 [[package]]
 name = "windows-future"
 version = "0.3.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 dependencies = [
  "windows-core 0.62.2",
 ]
@@ -7147,7 +7147,7 @@ checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65"
 [[package]]
 name = "windows-link"
 version = "0.2.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 
 [[package]]
 name = "windows-numerics"
@@ -7191,7 +7191,7 @@ dependencies = [
 [[package]]
 name = "windows-result"
 version = "0.4.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 dependencies = [
  "windows-link 0.2.1",
 ]
@@ -7208,7 +7208,7 @@ dependencies = [
 [[package]]
 name = "windows-strings"
 version = "0.5.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=textFLow_custom_widget_alignment#65b28fe581049e65d659c49bd1a3a8905f81f229"
+source = "git+https://github.com/makepad/makepad?branch=dev#ea993f30c4262d5deb58a60bfd155abbb6ceedce"
 dependencies = [
  "windows-link 0.2.1",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 14d675c4..e8613d10 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,11 +14,8 @@ version = "1.0.0-alpha.1"
 metadata.makepad-auto-version = "zqpv-Yj-K7WNVK2I8h5Okhho46Q="
 
 [dependencies]
-# makepad-widgets = { git = "https://github.com/makepad/makepad", branch = "dev", features = ["serde"] }
-# makepad-code-editor = { git = "https://github.com/makepad/makepad", branch = "dev" }
-
-makepad-widgets = { git = "https://github.com/kevinaboos/makepad", branch = "textFLow_custom_widget_alignment", features = ["serde"] }
-makepad-code-editor = { git = "https://github.com/kevinaboos/makepad", branch = "textFLow_custom_widget_alignment" }
+makepad-widgets = { git = "https://github.com/makepad/makepad", branch = "dev", features = ["serde"] }
+makepad-code-editor = { git = "https://github.com/makepad/makepad", branch = "dev" }
 
 
 ## Including this crate automatically configures all `robius-*` crates to work with Makepad.
diff --git a/README.md b/README.md
index 7136bf59..0330b59a 100644
--- a/README.md
+++ b/README.md
@@ -111,7 +111,7 @@ The following table shows which host systems can currently be used to build Robr
    ```
 
 3. Perform the following one-time setup steps:
-   1. If running on a real iOS device, enable your iPhone's Developer Mode:
+   1. If running on a real iOS device, [enable Developer Mode on your device](https://developer.apple.com/documentation/xcode/enabling-developer-mode-on-a-device):
       Settings → Privacy & Security → Developer Mode → turn on Developer Mode and reboot.
    2. Ensure your Apple Developer account is properly set up on your Mac.
    3. Create an empty "dummy" project in Xcode:
diff --git a/src/login/login_screen.rs b/src/login/login_screen.rs
index 30844bad..40da721b 100644
--- a/src/login/login_screen.rs
+++ b/src/login/login_screen.rs
@@ -116,52 +116,53 @@ script_mod! {
 
                     View {
                         width: 275, height: Fit
-                        flow: Overlay,
+                        flow: Overlay
+                        align: Align{x: 1.0, y: 0.5}
 
                         password_input := RobrixTextInput {
                             width: Fill, height: Fit
                             flow: Right, // do not wrap
-                            padding: Inset{top: 10, bottom: 10, left: 10, right: 40}
+                            padding: Inset{top: 10, bottom: 10, left: 10, right: 38}
                             empty_text: "Password"
                             is_password: true,
                         }
 
                         View {
-                            width: Fill, height: Fill
-                            align: Align{x: 1.0, y: 0.5}
-
-                            show_password_button := Button {
-                                width: 36, height: 36,
-                                padding: 6,
+                            width: 38, height: Fill
+                            align: Align{x: 0.5, y: 0.5}
+
+                            show_password_button := RobrixNeutralIconButton {
+                                width: Fit, height: Fit,
+                                align: Align{x: 0.5, y: 0.5}
+                                padding: 5
+                                spacing: 0
+                                margin: 0
                                 draw_bg +: {
-                                    color: #0000
-                                    color_hover: #0000
-                                    color_down: #0000
-                                    border_size: 0.0
+                                    color: (COLOR_SECONDARY * 1.05)
                                 }
                                 draw_icon +: {
                                     svg: (mod.widgets.ICON_EYE_CLOSED),
                                     color: #8C8C8C,
                                 }
-                                icon_walk: Walk{width: 20, height: 20}
+                                icon_walk: Walk{width: 18, height: 18, margin: 0}
                                 text: ""
                             }
 
-                            hide_password_button := Button {
+                            hide_password_button := RobrixNeutralIconButton {
                                 visible: false,
-                                width: 36, height: 36,
-                                padding: 6,
+                                align: Align{x: 0.5, y: 0.5}
+                                width: Fit, height: Fit,
+                                padding: 5
+                                spacing: 0
+                                margin: 0
                                 draw_bg +: {
-                                    color: #0000
-                                    color_hover: #0000
-                                    color_down: #0000
-                                    border_size: 0.0
+                                    color: (COLOR_SECONDARY * 1.05)
                                 }
                                 draw_icon +: {
                                     svg: (mod.widgets.ICON_EYE_OPEN),
                                     color: #8C8C8C,
                                 }
-                                icon_walk: Walk{width: 20, height: 20}
+                                icon_walk: Walk{width: 18, height: 18, margin: 0}
                                 text: ""
                             }
                         }
diff --git a/src/shared/image_viewer.rs b/src/shared/image_viewer.rs
index 2b6d5aa9..0a4830e0 100644
--- a/src/shared/image_viewer.rs
+++ b/src/shared/image_viewer.rs
@@ -18,7 +18,7 @@ use crate::{
 };
 
 /// The timeout for hiding the UI overlays after no user mouse/tap activity.
-const SHOW_UI_DURATION: f64 = 2.5;
+const SHOW_UI_DURATION: f64 = 3.0;
 
 /// Loads the given image `data` into an `ImageBuffer` as either a PNG or JPEG, using the `imghdr` library to determine which format it is.
 ///
@@ -763,30 +763,24 @@ impl MatchEvent for ImageViewer {
             self.reset(cx);
             cx.action(ImageViewerAction::Hide);
         }
+
+        let mut was_overlay_button_clicked = false;
         if self.view.button(cx, ids!(reset_button)).clicked(actions) {
+            was_overlay_button_clicked = true;
             self.reset(cx);
         }
-        if self
-            .view
-            .button(cx, ids!(zoom_out_button))
-            .clicked(actions)
-        {
+        if self.view.button(cx, ids!(zoom_out_button)).clicked(actions) {
+            was_overlay_button_clicked = true;
             self.adjust_zoom(cx, 1.0 / self.config.zoom_scale_factor);
         }
 
-        if self
-            .view
-            .button(cx, ids!(zoom_in_button))
-            .clicked(actions)
-        {
+        if self.view.button(cx, ids!(zoom_in_button)).clicked(actions) {
+            was_overlay_button_clicked = true;
             self.adjust_zoom(cx, self.config.zoom_scale_factor);
         }
 
-        if self
-            .view
-            .button(cx, ids!(rotate_cw_button))
-            .clicked(actions)
-        {
+        if self.view.button(cx, ids!(rotate_cw_button)).clicked(actions) {
+            was_overlay_button_clicked = true;
             if !self.is_animating_rotation {
                 self.is_animating_rotation = true;
                 if self.rotation_step == 3 {
@@ -797,11 +791,8 @@ impl MatchEvent for ImageViewer {
             }
         }
 
-        if self
-            .view
-            .button(cx, ids!(rotate_ccw_button))
-            .clicked(actions)
-        {
+        if self.view.button(cx, ids!(rotate_ccw_button)).clicked(actions) {
+            was_overlay_button_clicked = true;
             if !self.is_animating_rotation {
                 self.is_animating_rotation = true;
                 if self.rotation_step == 0 {
@@ -813,6 +804,14 @@ impl MatchEvent for ImageViewer {
             }
         }
 
+        // Restart the auto-hide timer if any overlay button was clicked. If the
+        // mouse is still over the overlay the hover handler keeps the timer
+        // stopped anyway.
+        if was_overlay_button_clicked && !self.mouse_over_overlay_ui {
+            cx.stop_timer(self.hide_ui_timer);
+            self.hide_ui_timer = cx.start_timeout(SHOW_UI_DURATION);
+        }
+
         for action in actions.iter() {
             if let Some(ImageViewerAction::Show(state)) = action.downcast_ref() {
                 match state {