diff --git a/Cargo.lock b/Cargo.lock
index baebf4d06f..a7f5c6d00e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -40,19 +40,6 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "ahash"
-version = "0.8.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
-dependencies = [
- "cfg-if",
- "const-random",
- "once_cell",
- "version_check",
- "zerocopy",
-]
-
 [[package]]
 name = "aho-corasick"
 version = "1.1.3"
@@ -99,6 +86,7 @@ dependencies = [
  "anyhow",
  "gpui",
  "gpui-component",
+ "gpui_platform",
  "rust-embed",
 ]
 
@@ -137,37 +125,11 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
-[[package]]
-name = "as-raw-xcb-connection"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b"
-
-[[package]]
-name = "ash"
-version = "0.38.0+1.3.281"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f"
-dependencies = [
- "libloading",
-]
-
-[[package]]
-name = "ash-window"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52bca67b61cb81e5553babde81b8211f713cb6db79766f80168f3e5f40ea6c82"
-dependencies = [
- "ash",
- "raw-window-handle",
- "raw-window-metal",
-]
-
 [[package]]
 name = "ashpd"
-version = "0.12.1"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "618a409b91d5265798a99e3d1d0b226911605e581c4e7255e83c1e397b172bce"
+checksum = "522dc9bec59923af17c43c5911cdabbacdb32ed4f955e83ecf592855618b20b5"
 dependencies = [
  "async-fs",
  "async-net",
@@ -178,9 +140,6 @@ dependencies = [
  "serde",
  "serde_repr",
  "url",
- "wayland-backend",
- "wayland-client",
- "wayland-protocols",
  "zbus",
 ]
 
@@ -698,61 +657,6 @@ dependencies = [
  "wyz",
 ]
 
-[[package]]
-name = "blade-graphics"
-version = "0.7.0"
-source = "git+https://github.com/kvark/blade?rev=e3cf011ca18a6dfd907d1dedd93e85e21f005fe3#e3cf011ca18a6dfd907d1dedd93e85e21f005fe3"
-dependencies = [
- "ash",
- "ash-window",
- "bitflags 2.10.0",
- "bytemuck",
- "codespan-reporting",
- "glow",
- "gpu-alloc",
- "gpu-alloc-ash",
- "hidden-trait",
- "js-sys",
- "khronos-egl",
- "libloading",
- "log",
- "mint",
- "naga",
- "objc2",
- "objc2-app-kit",
- "objc2-core-foundation",
- "objc2-foundation",
- "objc2-metal",
- "objc2-quartz-core",
- "objc2-ui-kit",
- "once_cell",
- "raw-window-handle",
- "slab",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "blade-macros"
-version = "0.3.0"
-source = "git+https://github.com/kvark/blade?rev=e3cf011ca18a6dfd907d1dedd93e85e21f005fe3#e3cf011ca18a6dfd907d1dedd93e85e21f005fe3"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.105",
-]
-
-[[package]]
-name = "blade-util"
-version = "0.3.0"
-source = "git+https://github.com/kvark/blade?rev=e3cf011ca18a6dfd907d1dedd93e85e21f005fe3#e3cf011ca18a6dfd907d1dedd93e85e21f005fe3"
-dependencies = [
- "blade-graphics",
- "bytemuck",
- "log",
- "profiling",
-]
-
 [[package]]
 name = "block"
 version = "0.1.6"
@@ -877,9 +781,9 @@ dependencies = [
 
 [[package]]
 name = "bytemuck_derive"
-version = "1.10.1"
+version = "1.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f154e572231cb6ba2bd1176980827e3d5dc04cc183a75dea38109fbdd672d29"
+checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -931,9 +835,9 @@ dependencies = [
 
 [[package]]
 name = "calloop"
-version = "0.14.3"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb9f6e1368bd4621d2c86baa7e37de77a938adf5221e5dd3d6133340101b309e"
+checksum = "4dbf9978365bac10f54d1d4b04f7ce4427e51f71d61f2fe15e3fed5166474df7"
 dependencies = [
  "bitflags 2.10.0",
  "polling",
@@ -942,18 +846,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "calloop-wayland-source"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "138efcf0940a02ebf0cc8d1eff41a1682a46b431630f4c52450d6265876021fa"
-dependencies = [
- "calloop",
- "rustix 1.0.8",
- "wayland-backend",
- "wayland-client",
-]
-
 [[package]]
 name = "cbc"
 version = "0.1.2"
@@ -1157,15 +1049,13 @@ version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fe6d2e5af09e8c8ad56c969f2157a3d4238cebc7c55f0a517728c38f7b200f81"
 dependencies = [
- "serde",
- "termcolor",
  "unicode-width",
 ]
 
 [[package]]
 name = "collections"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#8b5328cad3d9ca3576296be574a1c7bfbcaf3557"
+source = "git+https://github.com/zed-industries/zed#d08d98f6c1c1aefb342de072d9beac25eaf6130f"
 dependencies = [
  "indexmap",
  "rustc-hash 2.1.1",
@@ -1218,26 +1108,6 @@ dependencies = [
  "crossbeam-utils",
 ]
 
-[[package]]
-name = "const-random"
-version = "0.1.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359"
-dependencies = [
- "const-random-macro",
-]
-
-[[package]]
-name = "const-random-macro"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"
-dependencies = [
- "getrandom 0.2.16",
- "once_cell",
- "tiny-keccak",
-]
-
 [[package]]
 name = "convert_case"
 version = "0.4.0"
@@ -1405,30 +1275,6 @@ dependencies = [
  "libm",
 ]
 
-[[package]]
-name = "cosmic-text"
-version = "0.17.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c5c9868e64aa6c5410629a83450e142c80e721c727a5bc0fb18107af6c2d66b"
-dependencies = [
- "bitflags 2.10.0",
- "fontdb",
- "harfrust",
- "linebender_resource_handle",
- "log",
- "rangemap",
- "rustc-hash 2.1.1",
- "self_cell",
- "skrifa 0.40.0",
- "smol_str",
- "swash",
- "sys-locale",
- "unicode-bidi",
- "unicode-linebreak",
- "unicode-script",
- "unicode-segmentation",
-]
-
 [[package]]
 name = "cpufeatures"
 version = "0.2.17"
@@ -1664,7 +1510,7 @@ dependencies = [
 [[package]]
 name = "derive_refineable"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#8b5328cad3d9ca3576296be574a1c7bfbcaf3557"
+source = "git+https://github.com/zed-industries/zed#d08d98f6c1c1aefb342de072d9beac25eaf6130f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1685,6 +1531,7 @@ dependencies = [
  "gpui",
  "gpui-component",
  "gpui-component-assets",
+ "gpui_platform",
 ]
 
 [[package]]
@@ -1802,12 +1649,6 @@ dependencies = [
  "libloading",
 ]
 
-[[package]]
-name = "downcast-rs"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
-
 [[package]]
 name = "dpi"
 version = "0.1.2"
@@ -1911,9 +1752,9 @@ dependencies = [
 
 [[package]]
 name = "endi"
-version = "1.1.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf"
+checksum = "66b7e2430c6dff6a955451e2cfc438f09cea1965a9d6f87f7e3b90decc014099"
 
 [[package]]
 name = "enum-iterator"
@@ -2109,17 +1950,6 @@ dependencies = [
  "rustc_version",
 ]
 
-[[package]]
-name = "filedescriptor"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e40758ed24c9b2eeb76c35fb0aebc66c626084edd827e07e1552279814c6682d"
-dependencies = [
- "libc",
- "thiserror 1.0.69",
- "winapi",
-]
-
 [[package]]
 name = "filetime"
 version = "0.2.25"
@@ -2200,28 +2030,20 @@ dependencies = [
  "anyhow",
  "gpui",
  "gpui-component",
+ "gpui_platform",
 ]
 
 [[package]]
 name = "foldhash"
-version = "0.1.5"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
+checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
 
 [[package]]
 name = "font-types"
-version = "0.9.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02a596f5713680923a2080d86de50fe472fb290693cf0f701187a1c8b36996b7"
-dependencies = [
- "bytemuck",
-]
-
-[[package]]
-name = "font-types"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1e4d2d0cf79d38430cc9dc9aadec84774bff2e1ba30ae2bf6c16cfce9385a23"
+checksum = "39a654f404bbcbd48ea58c617c2993ee91d1cb63727a37bf2323a4edeed1b8c5"
 dependencies = [
  "bytemuck",
 ]
@@ -2548,16 +2370,6 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "gethostname"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818"
-dependencies = [
- "libc",
- "windows-targets 0.48.5",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.1.16"
@@ -2746,18 +2558,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "glow"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5e5ea60d70410161c8bf5da3fdfeaa1c72ed2c15f8bbb9d19fe3a4fad085f08"
-dependencies = [
- "js-sys",
- "slotmap",
- "wasm-bindgen",
- "web-sys",
-]
-
 [[package]]
 name = "gobject-sys"
 version = "0.18.0"
@@ -2769,55 +2569,17 @@ dependencies = [
  "system-deps",
 ]
 
-[[package]]
-name = "gpu-alloc"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171"
-dependencies = [
- "bitflags 2.10.0",
- "gpu-alloc-types",
-]
-
-[[package]]
-name = "gpu-alloc-ash"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbda7a18a29bc98c2e0de0435c347df935bf59489935d0cbd0b73f1679b6f79a"
-dependencies = [
- "ash",
- "gpu-alloc-types",
- "tinyvec",
-]
-
-[[package]]
-name = "gpu-alloc-types"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4"
-dependencies = [
- "bitflags 2.10.0",
-]
-
 [[package]]
 name = "gpui"
 version = "0.2.2"
-source = "git+https://github.com/zed-industries/zed#8b5328cad3d9ca3576296be574a1c7bfbcaf3557"
+source = "git+https://github.com/zed-industries/zed#d08d98f6c1c1aefb342de072d9beac25eaf6130f"
 dependencies = [
  "anyhow",
- "as-raw-xcb-connection",
- "ashpd",
  "async-task",
  "backtrace",
  "bindgen 0.71.1",
  "bitflags 2.10.0",
- "blade-graphics",
- "blade-macros",
- "blade-util",
  "block",
- "bytemuck",
- "calloop",
- "calloop-wayland-source",
  "cbindgen",
  "chrono",
  "circular-buffer",
@@ -2829,12 +2591,10 @@ dependencies = [
  "core-graphics 0.24.0",
  "core-text",
  "core-video",
- "cosmic-text",
  "ctor",
  "derive_more",
  "embed-resource",
  "etagere",
- "filedescriptor",
  "foreign-types",
  "futures",
  "gpui_macros",
@@ -2842,7 +2602,6 @@ dependencies = [
  "image",
  "inventory",
  "itertools 0.14.0",
- "libc",
  "log",
  "lyon",
  "mach2",
@@ -2851,8 +2610,6 @@ dependencies = [
  "naga",
  "num_cpus",
  "objc",
- "oo7",
- "open",
  "parking",
  "parking_lot",
  "pathfinder_geometry",
@@ -2866,7 +2623,6 @@ dependencies = [
  "scheduler",
  "schemars",
  "seahash",
- "semver",
  "serde",
  "serde_json",
  "slotmap",
@@ -2874,9 +2630,8 @@ dependencies = [
  "smol",
  "spin 0.10.0",
  "stacksafe",
- "strum 0.27.2",
+ "strum",
  "sum_tree",
- "swash",
  "taffy",
  "thiserror 2.0.14",
  "usvg",
@@ -2884,22 +2639,9 @@ dependencies = [
  "util_macros",
  "uuid",
  "waker-fn",
- "wayland-backend",
- "wayland-client",
- "wayland-cursor",
- "wayland-protocols",
- "wayland-protocols-plasma",
- "wayland-protocols-wlr",
  "windows 0.61.3",
- "windows-core 0.61.2",
- "windows-numerics 0.2.0",
- "windows-registry 0.5.3",
- "x11-clipboard",
- "x11rb",
- "xkbcommon",
  "zed-font-kit",
  "zed-scap",
- "zed-xim",
 ]
 
 [[package]]
@@ -2913,7 +2655,7 @@ dependencies = [
  "enum-iterator",
  "gpui",
  "gpui-component-macros",
- "gpui-macros",
+ "gpui_macros",
  "html5ever 0.27.0",
  "indoc",
  "itertools 0.13.0",
@@ -3007,6 +2749,7 @@ dependencies = [
  "gpui",
  "gpui-component",
  "gpui-component-assets",
+ "gpui_platform",
  "gtk",
  "itertools 0.14.0",
  "lsp-types 0.97.0",
@@ -3024,30 +2767,88 @@ dependencies = [
 ]
 
 [[package]]
-name = "gpui-macros"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcb02dd63a2859714ac7b6b476937617c3c744157af1b49f7c904023a79039be"
+name = "gpui-wry"
+version = "0.5.0"
 dependencies = [
- "heck 0.5.0",
- "proc-macro2",
- "quote",
- "syn 2.0.105",
+ "anyhow",
+ "gpui",
+ "lb-wry",
 ]
 
 [[package]]
-name = "gpui-wry"
-version = "0.5.0"
+name = "gpui_linux"
+version = "0.1.0"
+source = "git+https://github.com/zed-industries/zed#d08d98f6c1c1aefb342de072d9beac25eaf6130f"
 dependencies = [
  "anyhow",
+ "bytemuck",
+ "calloop",
+ "collections",
+ "futures",
  "gpui",
- "lb-wry",
+ "http_client",
+ "itertools 0.14.0",
+ "libc",
+ "log",
+ "oo7",
+ "parking_lot",
+ "pathfinder_geometry",
+ "profiling",
+ "raw-window-handle",
+ "smallvec",
+ "smol",
+ "strum",
+ "swash",
+ "util",
+ "uuid",
+]
+
+[[package]]
+name = "gpui_macos"
+version = "0.1.0"
+source = "git+https://github.com/zed-industries/zed#d08d98f6c1c1aefb342de072d9beac25eaf6130f"
+dependencies = [
+ "anyhow",
+ "async-task",
+ "bindgen 0.71.1",
+ "block",
+ "cbindgen",
+ "cocoa 0.26.0",
+ "collections",
+ "core-foundation 0.10.0",
+ "core-foundation-sys 0.8.7",
+ "core-graphics 0.24.0",
+ "core-text",
+ "core-video",
+ "ctor",
+ "derive_more",
+ "etagere",
+ "foreign-types",
+ "futures",
+ "gpui",
+ "image",
+ "itertools 0.14.0",
+ "libc",
+ "log",
+ "mach2",
+ "media",
+ "metal 0.29.0",
+ "objc",
+ "parking_lot",
+ "pathfinder_geometry",
+ "raw-window-handle",
+ "semver",
+ "smallvec",
+ "strum",
+ "util",
+ "uuid",
+ "zed-font-kit",
 ]
 
 [[package]]
 name = "gpui_macros"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#8b5328cad3d9ca3576296be574a1c7bfbcaf3557"
+source = "git+https://github.com/zed-industries/zed#d08d98f6c1c1aefb342de072d9beac25eaf6130f"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
@@ -3055,6 +2856,42 @@ dependencies = [
  "syn 2.0.105",
 ]
 
+[[package]]
+name = "gpui_platform"
+version = "0.1.0"
+source = "git+https://github.com/zed-industries/zed#d08d98f6c1c1aefb342de072d9beac25eaf6130f"
+dependencies = [
+ "gpui",
+ "gpui_linux",
+ "gpui_macos",
+ "gpui_windows",
+]
+
+[[package]]
+name = "gpui_windows"
+version = "0.1.0"
+source = "git+https://github.com/zed-industries/zed#d08d98f6c1c1aefb342de072d9beac25eaf6130f"
+dependencies = [
+ "anyhow",
+ "collections",
+ "etagere",
+ "futures",
+ "gpui",
+ "image",
+ "itertools 0.14.0",
+ "log",
+ "parking_lot",
+ "rand 0.9.2",
+ "raw-window-handle",
+ "smallvec",
+ "util",
+ "uuid",
+ "windows 0.61.3",
+ "windows-core 0.61.2",
+ "windows-numerics 0.2.0",
+ "windows-registry 0.5.3",
+]
+
 [[package]]
 name = "grid"
 version = "0.18.0"
@@ -3143,26 +2980,13 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "harfrust"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f9f40651a03bc0f7316bd75267ff5767e93017ef3cfffe76c6aa7252cc5a31c"
-dependencies = [
- "bitflags 2.10.0",
- "bytemuck",
- "core_maths",
- "read-fonts 0.37.0",
- "smallvec",
-]
-
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 dependencies = [
- "ahash 0.7.8",
+ "ahash",
 ]
 
 [[package]]
@@ -3176,6 +3000,12 @@ name = "hashbrown"
 version = "0.15.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
+
+[[package]]
+name = "hashbrown"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
 dependencies = [
  "foldhash",
 ]
@@ -3199,6 +3029,7 @@ dependencies = [
  "anyhow",
  "gpui",
  "gpui-component",
+ "gpui_platform",
 ]
 
 [[package]]
@@ -3219,17 +3050,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
 
-[[package]]
-name = "hidden-trait"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68ed9e850438ac849bec07e7d09fbe9309cbd396a5988c30b010580ce08860df"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "hkdf"
 version = "0.12.4"
@@ -3320,7 +3140,7 @@ dependencies = [
 [[package]]
 name = "http_client"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#8b5328cad3d9ca3576296be574a1c7bfbcaf3557"
+source = "git+https://github.com/zed-industries/zed#d08d98f6c1c1aefb342de072d9beac25eaf6130f"
 dependencies = [
  "anyhow",
  "async-compression",
@@ -3659,6 +3479,7 @@ dependencies = [
  "gpui",
  "gpui-component",
  "gpui-component-assets",
+ "gpui_platform",
 ]
 
 [[package]]
@@ -3719,25 +3540,6 @@ version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
 
-[[package]]
-name = "is-docker"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3"
-dependencies = [
- "once_cell",
-]
-
-[[package]]
-name = "is-wsl"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5"
-dependencies = [
- "is-docker",
- "once_cell",
-]
-
 [[package]]
 name = "itertools"
 version = "0.11.0"
@@ -3851,16 +3653,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "khronos-egl"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76"
-dependencies = [
- "libc",
- "libloading",
-]
-
 [[package]]
 name = "kqueue"
 version = "1.1.1"
@@ -4062,12 +3854,6 @@ dependencies = [
  "vcpkg",
 ]
 
-[[package]]
-name = "linebender_resource_handle"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4a5ff6bcca6c4867b1c4fd4ef63e4db7436ef363e0ad7531d1558856bae64f4"
-
 [[package]]
 name = "linux-raw-sys"
 version = "0.4.15"
@@ -4331,7 +4117,7 @@ dependencies = [
 [[package]]
 name = "media"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#8b5328cad3d9ca3576296be574a1c7bfbcaf3557"
+source = "git+https://github.com/zed-industries/zed#d08d98f6c1c1aefb342de072d9beac25eaf6130f"
 dependencies = [
  "anyhow",
  "bindgen 0.71.1",
@@ -4429,12 +4215,6 @@ dependencies = [
  "simd-adler32",
 ]
 
-[[package]]
-name = "mint"
-version = "0.5.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff"
-
 [[package]]
 name = "mio"
 version = "1.0.4"
@@ -4449,25 +4229,25 @@ dependencies = [
 
 [[package]]
 name = "naga"
-version = "25.0.1"
+version = "28.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b977c445f26e49757f9aca3631c3b8b836942cb278d69a92e7b80d3b24da632"
+checksum = "618f667225063219ddfc61251087db8a9aec3c3f0950c916b614e403486f1135"
 dependencies = [
  "arrayvec",
  "bit-set",
  "bitflags 2.10.0",
+ "cfg-if",
  "cfg_aliases",
  "codespan-reporting",
  "half",
- "hashbrown 0.15.5",
+ "hashbrown 0.16.1",
  "hexf-parse",
  "indexmap",
+ "libm",
  "log",
  "num-traits",
  "once_cell",
  "rustc-hash 1.1.0",
- "spirv",
- "strum 0.26.3",
  "thiserror 2.0.14",
  "unicode-ident",
 ]
@@ -4651,11 +4431,10 @@ dependencies = [
 
 [[package]]
 name = "num-bigint-dig"
-version = "0.8.4"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151"
+checksum = "e661dda6640fad38e827a6d4a310ff4763082116fe217f279885c97f511bb0b7"
 dependencies = [
- "byteorder",
  "lazy_static",
  "libm",
  "num-integer",
@@ -4760,7 +4539,7 @@ version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77e878c846a8abae00dd069496dbe8751b16ac1c3d6bd2a7283a938e8228f90d"
 dependencies = [
- "proc-macro-crate 3.3.0",
+ "proc-macro-crate 1.3.1",
  "proc-macro2",
  "quote",
  "syn 2.0.105",
@@ -4807,7 +4586,6 @@ dependencies = [
  "objc2",
  "objc2-core-foundation",
  "objc2-foundation",
- "objc2-quartz-core",
 ]
 
 [[package]]
@@ -4857,31 +4635,6 @@ dependencies = [
  "objc2-core-foundation",
 ]
 
-[[package]]
-name = "objc2-metal"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f246c183239540aab1782457b35ab2040d4259175bd1d0c58e46ada7b47a874"
-dependencies = [
- "bitflags 2.10.0",
- "block2",
- "objc2",
- "objc2-foundation",
-]
-
-[[package]]
-name = "objc2-quartz-core"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ffb6a0cd5f182dc964334388560b12a57f7b74b3e2dec5e2722aa2dfb2ccd5"
-dependencies = [
- "bitflags 2.10.0",
- "objc2",
- "objc2-core-foundation",
- "objc2-foundation",
- "objc2-metal",
-]
-
 [[package]]
 name = "objc2-ui-kit"
 version = "0.3.1"
@@ -4892,7 +4645,6 @@ dependencies = [
  "objc2",
  "objc2-core-foundation",
  "objc2-foundation",
- "objc2-quartz-core",
 ]
 
 [[package]]
@@ -4977,17 +4729,6 @@ dependencies = [
  "zvariant",
 ]
 
-[[package]]
-name = "open"
-version = "5.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2483562e62ea94312f3576a7aca397306df7990b8d89033e18766744377ef95"
-dependencies = [
- "is-wsl",
- "libc",
- "pathdiff",
-]
-
 [[package]]
 name = "openssl-probe"
 version = "0.1.6"
@@ -5076,12 +4817,6 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
-[[package]]
-name = "pathdiff"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3"
-
 [[package]]
 name = "pathfinder_geometry"
 version = "0.5.1"
@@ -5120,7 +4855,7 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 [[package]]
 name = "perf"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#8b5328cad3d9ca3576296be574a1c7bfbcaf3557"
+source = "git+https://github.com/zed-industries/zed#d08d98f6c1c1aefb342de072d9beac25eaf6130f"
 dependencies = [
  "collections",
  "serde",
@@ -5583,15 +5318,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "quick-xml"
-version = "0.37.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "quinn"
 version = "0.11.8"
@@ -5778,12 +5504,6 @@ dependencies = [
  "rand_core 0.5.1",
 ]
 
-[[package]]
-name = "rangemap"
-version = "1.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "973443cf09a9c8656b574a866ab68dfa19f0867d0340648c7d2f6a71b8a8ea68"
-
 [[package]]
 name = "rav1e"
 version = "0.7.1"
@@ -5840,18 +5560,6 @@ version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539"
 
-[[package]]
-name = "raw-window-metal"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76e8caa82e31bb98fee12fa8f051c94a6aa36b07cddb03f0d4fc558988360ff1"
-dependencies = [
- "cocoa 0.25.0",
- "core-graphics 0.23.2",
- "objc",
- "raw-window-handle",
-]
-
 [[package]]
 name = "rayon"
 version = "1.11.0"
@@ -5874,23 +5582,12 @@ dependencies = [
 
 [[package]]
 name = "read-fonts"
-version = "0.29.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04ca636dac446b5664bd16c069c00a9621806895b8bb02c2dc68542b23b8f25d"
-dependencies = [
- "bytemuck",
- "font-types 0.9.0",
-]
-
-[[package]]
-name = "read-fonts"
-version = "0.37.0"
+version = "0.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b634fabf032fab15307ffd272149b622260f55974d9fad689292a5d33df02e5"
+checksum = "6717cf23b488adf64b9d711329542ba34de147df262370221940dfabc2c91358"
 dependencies = [
  "bytemuck",
- "core_maths",
- "font-types 0.11.0",
+ "font-types",
 ]
 
 [[package]]
@@ -5956,7 +5653,7 @@ dependencies = [
 [[package]]
 name = "refineable"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#8b5328cad3d9ca3576296be574a1c7bfbcaf3557"
+source = "git+https://github.com/zed-industries/zed#d08d98f6c1c1aefb342de072d9beac25eaf6130f"
 dependencies = [
  "derive_refineable",
 ]
@@ -6392,7 +6089,7 @@ dependencies = [
 [[package]]
 name = "scheduler"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#8b5328cad3d9ca3576296be574a1c7bfbcaf3557"
+source = "git+https://github.com/zed-industries/zed#d08d98f6c1c1aefb342de072d9beac25eaf6130f"
 dependencies = [
  "async-task",
  "backtrace",
@@ -6429,12 +6126,6 @@ dependencies = [
  "syn 2.0.105",
 ]
 
-[[package]]
-name = "scoped-tls"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
-
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -6511,12 +6202,6 @@ dependencies = [
  "smallvec",
 ]
 
-[[package]]
-name = "self_cell"
-version = "1.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b12e76d157a900eb52e81bc6e9f3069344290341720e9178cde2407113ac8d89"
-
 [[package]]
 name = "semver"
 version = "1.0.26"
@@ -6761,22 +6446,12 @@ checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
 
 [[package]]
 name = "skrifa"
-version = "0.31.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbeb4ca4399663735553a09dd17ce7e49a0a0203f03b706b39628c4d913a8607"
-dependencies = [
- "bytemuck",
- "read-fonts 0.29.3",
-]
-
-[[package]]
-name = "skrifa"
-version = "0.40.0"
+version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fbdfe3d2475fbd7ddd1f3e5cf8288a30eb3e5f95832829570cd88115a7434ac"
+checksum = "8c31071dedf532758ecf3fed987cdb4bd9509f900e026ab684b4ecb81ea49841"
 dependencies = [
  "bytemuck",
- "read-fonts 0.37.0",
+ "read-fonts",
 ]
 
 [[package]]
@@ -6817,12 +6492,6 @@ dependencies = [
  "futures-lite 2.6.1",
 ]
 
-[[package]]
-name = "smol_str"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f7a918bd2a9951d18ee6e48f076843e8e73a9a5d22cf05bcd4b7a81bdd04e17"
-
 [[package]]
 name = "socket2"
 version = "0.5.10"
@@ -6887,15 +6556,6 @@ dependencies = [
  "lock_api",
 ]
 
-[[package]]
-name = "spirv"
-version = "0.3.0+sdk-1.3.268.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844"
-dependencies = [
- "bitflags 2.10.0",
-]
-
 [[package]]
 name = "stable_deref_trait"
 version = "1.2.0"
@@ -6988,35 +6648,13 @@ dependencies = [
  "quote",
 ]
 
-[[package]]
-name = "strum"
-version = "0.26.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
-dependencies = [
- "strum_macros 0.26.4",
-]
-
 [[package]]
 name = "strum"
 version = "0.27.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf"
 dependencies = [
- "strum_macros 0.27.2",
-]
-
-[[package]]
-name = "strum_macros"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
-dependencies = [
- "heck 0.5.0",
- "proc-macro2",
- "quote",
- "rustversion",
- "syn 2.0.105",
+ "strum_macros",
 ]
 
 [[package]]
@@ -7040,7 +6678,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 [[package]]
 name = "sum_tree"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#8b5328cad3d9ca3576296be574a1c7bfbcaf3557"
+source = "git+https://github.com/zed-industries/zed#d08d98f6c1c1aefb342de072d9beac25eaf6130f"
 dependencies = [
  "arrayvec",
  "log",
@@ -7149,7 +6787,7 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "47846491253e976bdd07d0f9cc24b7daf24720d11309302ccbbc6e6b6e53550a"
 dependencies = [
- "skrifa 0.31.3",
+ "skrifa",
  "yazi",
  "zeno",
 ]
@@ -7196,15 +6834,6 @@ dependencies = [
  "syn 2.0.105",
 ]
 
-[[package]]
-name = "sys-locale"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eab9a99a024a169fe8a903cf9d4a3b3601109bcc13bd9e3c6fff259138626c4"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "sysinfo"
 version = "0.31.4"
@@ -7277,6 +6906,7 @@ dependencies = [
  "gpui",
  "gpui-component",
  "gpui-component-assets",
+ "gpui_platform",
  "metal 0.33.0",
  "smol",
  "sysinfo 0.37.2",
@@ -7360,15 +6990,6 @@ dependencies = [
  "utf-8",
 ]
 
-[[package]]
-name = "termcolor"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
-dependencies = [
- "winapi-util",
-]
-
 [[package]]
 name = "thiserror"
 version = "1.0.69"
@@ -7460,15 +7081,6 @@ dependencies = [
  "time-core",
 ]
 
-[[package]]
-name = "tiny-keccak"
-version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
-dependencies = [
- "crunchy",
-]
-
 [[package]]
 name = "tiny-skia"
 version = "0.11.4"
@@ -8285,12 +7897,6 @@ version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
 
-[[package]]
-name = "unicode-linebreak"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
-
 [[package]]
 name = "unicode-properties"
 version = "0.1.3"
@@ -8403,7 +8009,7 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
 [[package]]
 name = "util"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#8b5328cad3d9ca3576296be574a1c7bfbcaf3557"
+source = "git+https://github.com/zed-industries/zed#d08d98f6c1c1aefb342de072d9beac25eaf6130f"
 dependencies = [
  "anyhow",
  "async-fs",
@@ -8444,7 +8050,7 @@ dependencies = [
 [[package]]
 name = "util_macros"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#8b5328cad3d9ca3576296be574a1c7bfbcaf3557"
+source = "git+https://github.com/zed-industries/zed#d08d98f6c1c1aefb342de072d9beac25eaf6130f"
 dependencies = [
  "perf",
  "quote",
@@ -8685,104 +8291,6 @@ dependencies = [
  "web-sys",
 ]
 
-[[package]]
-name = "wayland-backend"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "673a33c33048a5ade91a6b139580fa174e19fb0d23f396dca9fa15f2e1e49b35"
-dependencies = [
- "cc",
- "downcast-rs",
- "rustix 1.0.8",
- "scoped-tls",
- "smallvec",
- "wayland-sys",
-]
-
-[[package]]
-name = "wayland-client"
-version = "0.31.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c66a47e840dc20793f2264eb4b3e4ecb4b75d91c0dd4af04b456128e0bdd449d"
-dependencies = [
- "bitflags 2.10.0",
- "rustix 1.0.8",
- "wayland-backend",
- "wayland-scanner",
-]
-
-[[package]]
-name = "wayland-cursor"
-version = "0.31.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "447ccc440a881271b19e9989f75726d60faa09b95b0200a9b7eb5cc47c3eeb29"
-dependencies = [
- "rustix 1.0.8",
- "wayland-client",
- "xcursor",
-]
-
-[[package]]
-name = "wayland-protocols"
-version = "0.32.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efa790ed75fbfd71283bd2521a1cfdc022aabcc28bdcff00851f9e4ae88d9901"
-dependencies = [
- "bitflags 2.10.0",
- "wayland-backend",
- "wayland-client",
- "wayland-scanner",
-]
-
-[[package]]
-name = "wayland-protocols-plasma"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a07a14257c077ab3279987c4f8bb987851bf57081b93710381daea94f2c2c032"
-dependencies = [
- "bitflags 2.10.0",
- "wayland-backend",
- "wayland-client",
- "wayland-protocols",
- "wayland-scanner",
-]
-
-[[package]]
-name = "wayland-protocols-wlr"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efd94963ed43cf9938a090ca4f7da58eb55325ec8200c3848963e98dc25b78ec"
-dependencies = [
- "bitflags 2.10.0",
- "wayland-backend",
- "wayland-client",
- "wayland-protocols",
- "wayland-scanner",
-]
-
-[[package]]
-name = "wayland-scanner"
-version = "0.31.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54cb1e9dc49da91950bdfd8b848c49330536d9d1fb03d4bfec8cae50caa50ae3"
-dependencies = [
- "proc-macro2",
- "quick-xml 0.37.5",
- "quote",
-]
-
-[[package]]
-name = "wayland-sys"
-version = "0.31.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34949b42822155826b41db8e5d0c1be3a2bd296c747577a43a3e6daefc296142"
-dependencies = [
- "dlib",
- "log",
- "once_cell",
- "pkg-config",
-]
-
 [[package]]
 name = "web-sys"
 version = "0.3.77"
@@ -8873,6 +8381,7 @@ dependencies = [
  "gpui",
  "gpui-component",
  "gpui-wry",
+ "gpui_platform",
  "gtk",
  "lb-wry",
  "raw-window-handle",
@@ -8971,6 +8480,7 @@ dependencies = [
  "gpui",
  "gpui-component",
  "gpui-component-assets",
+ "gpui_platform",
 ]
 
 [[package]]
@@ -9296,6 +8806,15 @@ dependencies = [
  "windows-targets 0.53.3",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+dependencies = [
+ "windows-link 0.2.1",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.42.2"
@@ -9649,16 +9168,6 @@ dependencies = [
  "pkg-config",
 ]
 
-[[package]]
-name = "x11-clipboard"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "662d74b3d77e396b8e5beb00b9cad6a9eccf40b2ef68cc858784b14c41d535a3"
-dependencies = [
- "libc",
- "x11rb",
-]
-
 [[package]]
 name = "x11-dl"
 version = "2.21.0"
@@ -9670,25 +9179,6 @@ dependencies = [
  "pkg-config",
 ]
 
-[[package]]
-name = "x11rb"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12"
-dependencies = [
- "as-raw-xcb-connection",
- "gethostname",
- "libc",
- "rustix 0.38.44",
- "x11rb-protocol",
-]
-
-[[package]]
-name = "x11rb-protocol"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d"
-
 [[package]]
 name = "xattr"
 version = "0.2.3"
@@ -9706,50 +9196,10 @@ checksum = "f1e2f212bb1a92cd8caac8051b829a6582ede155ccb60b5d5908b81b100952be"
 dependencies = [
  "bitflags 1.3.2",
  "libc",
- "quick-xml 0.30.0",
+ "quick-xml",
  "x11",
 ]
 
-[[package]]
-name = "xcursor"
-version = "0.3.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bec9e4a500ca8864c5b47b8b482a73d62e4237670e5b5f1d6b9e3cae50f28f2b"
-
-[[package]]
-name = "xim-ctext"
-version = "0.3.0"
-source = "git+https://github.com/zed-industries/xim-rs.git?rev=16f35a2c881b815a2b6cdfd6687988e84f8447d8#16f35a2c881b815a2b6cdfd6687988e84f8447d8"
-dependencies = [
- "encoding_rs",
-]
-
-[[package]]
-name = "xim-parser"
-version = "0.2.1"
-source = "git+https://github.com/zed-industries/xim-rs.git?rev=16f35a2c881b815a2b6cdfd6687988e84f8447d8#16f35a2c881b815a2b6cdfd6687988e84f8447d8"
-dependencies = [
- "bitflags 2.10.0",
-]
-
-[[package]]
-name = "xkbcommon"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d66ca9352cbd4eecbbc40871d8a11b4ac8107cfc528a6e14d7c19c69d0e1ac9"
-dependencies = [
- "as-raw-xcb-connection",
- "libc",
- "memmap2",
- "xkeysym",
-]
-
-[[package]]
-name = "xkeysym"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56"
-
 [[package]]
 name = "xml5ever"
 version = "0.18.1"
@@ -9810,9 +9260,9 @@ dependencies = [
 
 [[package]]
 name = "zbus"
-version = "5.9.0"
+version = "5.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bb4f9a464286d42851d18a605f7193b8febaf5b0919d71c6399b7b26e5b0aad"
+checksum = "b622b18155f7a93d1cd2dc8c01d2d6a44e08fb9ebb7b3f9e6ed101488bad6c91"
 dependencies = [
  "async-broadcast",
  "async-executor",
@@ -9834,7 +9284,8 @@ dependencies = [
  "serde_repr",
  "tracing",
  "uds_windows",
- "windows-sys 0.59.0",
+ "uuid",
+ "windows-sys 0.61.2",
  "winnow 0.7.12",
  "zbus_macros",
  "zbus_names",
@@ -9843,9 +9294,9 @@ dependencies = [
 
 [[package]]
 name = "zbus_macros"
-version = "5.9.0"
+version = "5.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef9859f68ee0c4ee2e8cde84737c78e3f4c54f946f2a38645d0d4c7a95327659"
+checksum = "0bbd5a90dbe8feee5b13def448427ae314ccd26a49cac47905cafefb9ff846f1"
 dependencies = [
  "proc-macro-crate 3.3.0",
  "proc-macro2",
@@ -9858,12 +9309,11 @@ dependencies = [
 
 [[package]]
 name = "zbus_names"
-version = "4.2.0"
+version = "4.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7be68e64bf6ce8db94f63e72f0c7eb9a60d733f7e0499e628dfab0f84d6bcb97"
+checksum = "ffd8af6d5b78619bab301ff3c560a5bd22426150253db278f164d6cf3b72c50f"
 dependencies = [
  "serde",
- "static_assertions",
  "winnow 0.7.12",
  "zvariant",
 ]
@@ -9974,19 +9424,6 @@ dependencies = [
  "workspace-hack",
 ]
 
-[[package]]
-name = "zed-xim"
-version = "0.4.0-zed"
-source = "git+https://github.com/zed-industries/xim-rs.git?rev=16f35a2c881b815a2b6cdfd6687988e84f8447d8#16f35a2c881b815a2b6cdfd6687988e84f8447d8"
-dependencies = [
- "ahash 0.8.12",
- "hashbrown 0.14.5",
- "log",
- "x11rb",
- "xim-ctext",
- "xim-parser",
-]
-
 [[package]]
 name = "zeno"
 version = "0.3.3"
@@ -10045,9 +9482,9 @@ dependencies = [
 
 [[package]]
 name = "zeroize_derive"
-version = "1.4.2"
+version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
+checksum = "85a5b4158499876c763cb03bc4e49185d3cccbabb15b33c627f7884f43db852e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -10090,7 +9527,7 @@ dependencies = [
 [[package]]
 name = "zlog"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#8b5328cad3d9ca3576296be574a1c7bfbcaf3557"
+source = "git+https://github.com/zed-industries/zed#d08d98f6c1c1aefb342de072d9beac25eaf6130f"
 dependencies = [
  "anyhow",
  "chrono",
@@ -10101,7 +9538,7 @@ dependencies = [
 [[package]]
 name = "ztracing"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#8b5328cad3d9ca3576296be574a1c7bfbcaf3557"
+source = "git+https://github.com/zed-industries/zed#d08d98f6c1c1aefb342de072d9beac25eaf6130f"
 dependencies = [
  "tracing",
  "tracing-subscriber",
@@ -10112,7 +9549,7 @@ dependencies = [
 [[package]]
 name = "ztracing_macro"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#8b5328cad3d9ca3576296be574a1c7bfbcaf3557"
+source = "git+https://github.com/zed-industries/zed#d08d98f6c1c1aefb342de072d9beac25eaf6130f"
 
 [[package]]
 name = "zune-core"
@@ -10140,9 +9577,9 @@ dependencies = [
 
 [[package]]
 name = "zvariant"
-version = "5.6.0"
+version = "5.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d91b3680bb339216abd84714172b5138a4edac677e641ef17e1d8cb1b3ca6e6f"
+checksum = "68b64ef4f40c7951337ddc7023dd03528a57a3ce3408ee9da5e948bd29b232c4"
 dependencies = [
  "endi",
  "enumflags2",
@@ -10155,9 +9592,9 @@ dependencies = [
 
 [[package]]
 name = "zvariant_derive"
-version = "5.6.0"
+version = "5.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a8c68501be459a8dbfffbe5d792acdd23b4959940fc87785fb013b32edbc208"
+checksum = "484d5d975eb7afb52cc6b929c13d3719a20ad650fea4120e6310de3fc55e415c"
 dependencies = [
  "proc-macro-crate 3.3.0",
  "proc-macro2",
@@ -10168,14 +9605,13 @@ dependencies = [
 
 [[package]]
 name = "zvariant_utils"
-version = "3.2.0"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e16edfee43e5d7b553b77872d99bc36afdda75c223ca7ad5e3fbecd82ca5fc34"
+checksum = "f75c23a64ef8f40f13a6989991e643554d9bef1d682a281160cf0c1bc389c5e9"
 dependencies = [
  "proc-macro2",
  "quote",
  "serde",
- "static_assertions",
  "syn 2.0.105",
  "winnow 0.7.12",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 73b30a3378..af5b7d7ecc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -28,7 +28,8 @@ gpui-component-assets = { path = "crates/assets", version = "0.5.1" }
 story = { path = "crates/story" }
 
 gpui = { git = "https://github.com/zed-industries/zed" }
-gpui-macros = "0.2.2"
+gpui_platform = { git = "https://github.com/zed-industries/zed", features = ["font-kit"] }
+gpui_macros = { git = "https://github.com/zed-industries/zed" }
 sum-tree = { version = "0.2.0", package = "zed-sum-tree" }
 # reqwest = { version = "0.12.15-zed", package = "zed-reqwest" }
 reqwest = { git = "https://github.com/zed-industries/reqwest.git", rev = "c15662463bda39148ba154100dd44d3fba5873a4", default-features = false, features = [
@@ -91,7 +92,8 @@ taffy = { opt-level = 3 }
 ttf-parser = { opt-level = 3 }
 smol = { opt-level = 3 }
 gpui = { opt-level = 3 }
-gpui-macros = { opt-level = 3 }
+gpui_platform = { opt-level = 3 }
+gpui_macros = { opt-level = 3 }
 tree-sitter = { opt-level = 3 }
 sum_tree = { opt-level = 3 }
 ropey = { opt-level = 3 }
diff --git a/crates/assets/src/lib.rs b/crates/assets/src/lib.rs
index f3a0bf5cbc..83e6c2703d 100644
--- a/crates/assets/src/lib.rs
+++ b/crates/assets/src/lib.rs
@@ -11,7 +11,7 @@ use std::borrow::Cow;
 /// use gpui::*;
 /// use gpui_component_assets::Assets;
 ///
-/// let app = Application::new().with_assets(Assets);
+/// let app = gpui_platform::application().with_assets(Assets);
 /// ```
 #[derive(RustEmbed)]
 #[folder = "assets"]
diff --git a/crates/story/Cargo.toml b/crates/story/Cargo.toml
index 27cc9c33e6..02078ed59f 100644
--- a/crates/story/Cargo.toml
+++ b/crates/story/Cargo.toml
@@ -10,6 +10,7 @@ inspector = ["gpui-component/inspector"]
 [dependencies]
 anyhow.workspace = true
 gpui.workspace = true
+gpui_platform.workspace = true
 gpui-component = { workspace = true, features = [
   "tree-sitter-languages",
 ] }
diff --git a/crates/story/examples/brush.rs b/crates/story/examples/brush.rs
index 2c141e7724..6d47602bd9 100644
--- a/crates/story/examples/brush.rs
+++ b/crates/story/examples/brush.rs
@@ -448,7 +448,7 @@ impl Render for Example {
 }
 
 fn main() {
-    let app = Application::new().with_assets(Assets);
+    let app = gpui_platform::application().with_assets(Assets);
 
     app.run(move |cx| {
         gpui_component_story::init(cx);
diff --git a/crates/story/examples/dock.rs b/crates/story/examples/dock.rs
index 94b901f82b..cc49139370 100644
--- a/crates/story/examples/dock.rs
+++ b/crates/story/examples/dock.rs
@@ -521,7 +521,7 @@ impl Render for StoryWorkspace {
 }
 
 fn main() {
-    let app = Application::new().with_assets(Assets);
+    let app = gpui_platform::application().with_assets(Assets);
 
     app.run(move |cx| {
         init(cx);
diff --git a/crates/story/examples/editor.rs b/crates/story/examples/editor.rs
index 8d8178cef2..7daf4f98ee 100644
--- a/crates/story/examples/editor.rs
+++ b/crates/story/examples/editor.rs
@@ -1110,7 +1110,7 @@ impl Render for Example {
 }
 
 fn main() {
-    let app = Application::new().with_assets(Assets);
+    let app = gpui_platform::application().with_assets(Assets);
 
     app.run(move |cx| {
         gpui_component_story::init(cx);
diff --git a/crates/story/examples/html.rs b/crates/story/examples/html.rs
index 559597e4de..ca267c53de 100644
--- a/crates/story/examples/html.rs
+++ b/crates/story/examples/html.rs
@@ -74,7 +74,7 @@ impl Render for Example {
 }
 
 fn main() {
-    let app = Application::new().with_assets(Assets);
+    let app = gpui_platform::application().with_assets(Assets);
 
     app.run(move |cx| {
         gpui_component_story::init(cx);
diff --git a/crates/story/examples/large-text.rs b/crates/story/examples/large-text.rs
index 9cfb87144b..9ed936c54a 100644
--- a/crates/story/examples/large-text.rs
+++ b/crates/story/examples/large-text.rs
@@ -154,7 +154,7 @@ impl Render for Example {
 }
 
 fn main() {
-    let app = Application::new().with_assets(Assets);
+    let app = gpui_platform::application().with_assets(Assets);
 
     app.run(move |cx| {
         gpui_component_story::init(cx);
diff --git a/crates/story/examples/markdown.rs b/crates/story/examples/markdown.rs
index 4e955d1645..e1d19c8aed 100644
--- a/crates/story/examples/markdown.rs
+++ b/crates/story/examples/markdown.rs
@@ -140,7 +140,7 @@ impl Render for Example {
 }
 
 fn main() {
-    let app = Application::new().with_assets(Assets);
+    let app = gpui_platform::application().with_assets(Assets);
 
     app.run(move |cx| {
         gpui_component_story::init(cx);
diff --git a/crates/story/examples/stream_markdown.rs b/crates/story/examples/stream_markdown.rs
index eb70bf508d..29a00aff3b 100644
--- a/crates/story/examples/stream_markdown.rs
+++ b/crates/story/examples/stream_markdown.rs
@@ -108,7 +108,7 @@ impl Render for Example {
 }
 
 fn main() {
-    let app = Application::new().with_assets(Assets);
+    let app = gpui_platform::application().with_assets(Assets);
 
     app.run(move |cx| {
         gpui_component_story::init(cx);
diff --git a/crates/story/examples/tiles.rs b/crates/story/examples/tiles.rs
index 77ffc29414..b64515a2fb 100644
--- a/crates/story/examples/tiles.rs
+++ b/crates/story/examples/tiles.rs
@@ -434,7 +434,7 @@ impl Render for StoryTiles {
 }
 
 fn main() {
-    let app = Application::new().with_assets(Assets);
+    let app = gpui_platform::application().with_assets(Assets);
 
     app.run(move |cx| {
         gpui_component::init(cx);
diff --git a/crates/story/src/main.rs b/crates/story/src/main.rs
index 1503bd9d9d..dab3a6df0e 100644
--- a/crates/story/src/main.rs
+++ b/crates/story/src/main.rs
@@ -301,7 +301,7 @@ impl Render for Gallery {
 }
 
 fn main() {
-    let app = Application::new().with_assets(Assets);
+    let app = gpui_platform::application().with_assets(Assets);
 
     // Parse `cargo run -- <story_name>`
     let name = std::env::args().nth(1);
diff --git a/crates/story/src/stories/chart_story/stacked_bar_chart.rs b/crates/story/src/stories/chart_story/stacked_bar_chart.rs
index 7d1b65bd55..5624671b05 100644
--- a/crates/story/src/stories/chart_story/stacked_bar_chart.rs
+++ b/crates/story/src/stories/chart_story/stacked_bar_chart.rs
@@ -2,7 +2,7 @@
 
 use gpui::{App, Bounds, Pixels, TextAlign, Window, px};
 use gpui_component::{
-    ActiveTheme, PixelsExt,
+    ActiveTheme,
     plot::{
         AXIS_GAP, AxisText, Grid, IntoPlot, Plot, PlotAxis,
         scale::{Scale, ScaleBand, ScaleLinear, ScaleOrdinal},
diff --git a/crates/story/src/title_bar.rs b/crates/story/src/title_bar.rs
index 02fa53cf55..15beae22b9 100644
--- a/crates/story/src/title_bar.rs
+++ b/crates/story/src/title_bar.rs
@@ -6,7 +6,7 @@ use gpui::{
     Window, div, px,
 };
 use gpui_component::{
-    ActiveTheme as _, IconName, PixelsExt, Side, Sizable as _, Theme, TitleBar, WindowExt as _,
+    ActiveTheme as _, IconName, Side, Sizable as _, Theme, TitleBar, WindowExt as _,
     badge::Badge,
     button::{Button, ButtonVariants as _},
     label::Label,
diff --git a/crates/ui/Cargo.toml b/crates/ui/Cargo.toml
index 9d1eca71c5..118a16275e 100644
--- a/crates/ui/Cargo.toml
+++ b/crates/ui/Cargo.toml
@@ -16,7 +16,7 @@ doctest = false
 
 [features]
 decimal = ["dep:rust_decimal"]
-inspector = ["gpui-macros/inspector", "gpui/inspector"]
+inspector = ["gpui_macros/inspector", "gpui/inspector"]
 
 # For syntax highlighting in Markdown and CodeEditor.
 tree-sitter-languages = [
@@ -58,8 +58,8 @@ tree-sitter-languages = [
 [dependencies]
 anyhow.workspace = true
 gpui = { workspace = true }
+gpui_macros.workspace = true
 gpui-component-macros = { workspace = true }
-gpui-macros.workspace = true
 notify.workspace = true
 ropey.workspace = true
 rust-i18n.workspace = true
diff --git a/crates/ui/src/chart/area_chart.rs b/crates/ui/src/chart/area_chart.rs
index 78398c8cc2..9e5726bf5c 100644
--- a/crates/ui/src/chart/area_chart.rs
+++ b/crates/ui/src/chart/area_chart.rs
@@ -1,16 +1,16 @@
 use std::rc::Rc;
 
-use gpui::{px, App, Background, Bounds, Hsla, Pixels, SharedString, TextAlign, Window};
+use gpui::{App, Background, Bounds, Hsla, Pixels, SharedString, TextAlign, Window, px};
 use gpui_component_macros::IntoPlot;
 use num_traits::{Num, ToPrimitive};
 
 use crate::{
+    ActiveTheme,
     plot::{
+        AXIS_GAP, AxisText, Grid, Plot, PlotAxis, StrokeStyle,
         scale::{Scale, ScaleLinear, ScalePoint, Sealed},
         shape::Area,
-        AxisText, Grid, Plot, PlotAxis, StrokeStyle, AXIS_GAP,
     },
-    ActiveTheme, PixelsExt,
 };
 
 #[derive(IntoPlot)]
diff --git a/crates/ui/src/chart/bar_chart.rs b/crates/ui/src/chart/bar_chart.rs
index 8f53499a91..2d2c6ffcf8 100644
--- a/crates/ui/src/chart/bar_chart.rs
+++ b/crates/ui/src/chart/bar_chart.rs
@@ -5,7 +5,7 @@ use gpui_component_macros::IntoPlot;
 use num_traits::{Num, ToPrimitive};
 
 use crate::{
-    ActiveTheme, PixelsExt,
+    ActiveTheme,
     plot::{
         AXIS_GAP, AxisText, Grid, Plot, PlotAxis,
         label::Text,
diff --git a/crates/ui/src/chart/candlestick_chart.rs b/crates/ui/src/chart/candlestick_chart.rs
index 7e36201642..fbdc6a051e 100644
--- a/crates/ui/src/chart/candlestick_chart.rs
+++ b/crates/ui/src/chart/candlestick_chart.rs
@@ -5,7 +5,7 @@ use gpui_component_macros::IntoPlot;
 use num_traits::{Num, ToPrimitive};
 
 use crate::{
-    ActiveTheme, PixelsExt,
+    ActiveTheme,
     plot::{
         AXIS_GAP, AxisText, Grid, Plot, PlotAxis, origin_point,
         scale::{Scale, ScaleBand, ScaleLinear, Sealed},
diff --git a/crates/ui/src/chart/line_chart.rs b/crates/ui/src/chart/line_chart.rs
index 15de4c4a2e..6d0bdc7608 100644
--- a/crates/ui/src/chart/line_chart.rs
+++ b/crates/ui/src/chart/line_chart.rs
@@ -1,16 +1,16 @@
 use std::rc::Rc;
 
-use gpui::{px, App, Bounds, Hsla, Pixels, SharedString, TextAlign, Window};
+use gpui::{App, Bounds, Hsla, Pixels, SharedString, TextAlign, Window, px};
 use gpui_component_macros::IntoPlot;
 use num_traits::{Num, ToPrimitive};
 
 use crate::{
+    ActiveTheme,
     plot::{
+        AXIS_GAP, AxisText, Grid, Plot, PlotAxis, StrokeStyle,
         scale::{Scale, ScaleLinear, ScalePoint, Sealed},
         shape::Line,
-        AxisText, Grid, Plot, PlotAxis, StrokeStyle, AXIS_GAP,
     },
-    ActiveTheme, PixelsExt,
 };
 
 #[derive(IntoPlot)]
diff --git a/crates/ui/src/chart/pie_chart.rs b/crates/ui/src/chart/pie_chart.rs
index 1694f15593..05e915effe 100644
--- a/crates/ui/src/chart/pie_chart.rs
+++ b/crates/ui/src/chart/pie_chart.rs
@@ -5,11 +5,11 @@ use gpui_component_macros::IntoPlot;
 use num_traits::Zero;
 
 use crate::{
+    ActiveTheme,
     plot::{
-        shape::{Arc, ArcData, Pie},
         Plot,
+        shape::{Arc, ArcData, Pie},
     },
-    ActiveTheme, PixelsExt,
 };
 
 #[derive(IntoPlot)]
diff --git a/crates/ui/src/geometry.rs b/crates/ui/src/geometry.rs
index 772a932ac0..87389234b5 100644
--- a/crates/ui/src/geometry.rs
+++ b/crates/ui/src/geometry.rs
@@ -234,21 +234,6 @@ impl AxisExt for Axis {
     }
 }
 
-/// A trait for converting [`Pixels`] to `f32` and `f64`.
-pub trait PixelsExt {
-    fn as_f32(&self) -> f32;
-    fn as_f64(self) -> f64;
-}
-impl PixelsExt for Pixels {
-    fn as_f32(&self) -> f32 {
-        f32::from(self)
-    }
-
-    fn as_f64(self) -> f64 {
-        f64::from(self)
-    }
-}
-
 /// A trait to extend the [`Length`] enum with utility methods.
 pub trait LengthExt {
     /// Converts the [`Length`] to [`Pixels`] based on a given `base_size` and `rem_size`.
diff --git a/crates/ui/src/input/element.rs b/crates/ui/src/input/element.rs
index cbd0eb3e3e..3c362b107a 100644
--- a/crates/ui/src/input/element.rs
+++ b/crates/ui/src/input/element.rs
@@ -10,7 +10,7 @@ use ropey::Rope;
 use smallvec::SmallVec;
 
 use crate::{
-    ActiveTheme as _, Colorize, PixelsExt, Root,
+    ActiveTheme as _, Colorize, Root,
     input::{RopeExt as _, blink_cursor::CURSOR_WIDTH, text_wrapper::LineLayout},
 };
 
diff --git a/crates/ui/src/plot/mod.rs b/crates/ui/src/plot/mod.rs
index 806e41eb09..e7d8d70b80 100644
--- a/crates/ui/src/plot/mod.rs
+++ b/crates/ui/src/plot/mod.rs
@@ -9,11 +9,9 @@ pub use gpui_component_macros::IntoPlot;
 
 use std::{fmt::Debug, ops::Add};
 
-use gpui::{point, px, App, Bounds, IntoElement, Path, PathBuilder, Pixels, Point, Window};
+use gpui::{App, Bounds, IntoElement, Path, PathBuilder, Pixels, Point, Window, point, px};
 
-use crate::PixelsExt;
-
-pub use axis::{AxisText, PlotAxis, AXIS_GAP};
+pub use axis::{AXIS_GAP, AxisText, PlotAxis};
 pub use grid::Grid;
 pub use label::PlotLabel;
 
diff --git a/crates/ui/src/plot/shape/arc.rs b/crates/ui/src/plot/shape/arc.rs
index b52508c4e6..66eb469b2b 100644
--- a/crates/ui/src/plot/shape/arc.rs
+++ b/crates/ui/src/plot/shape/arc.rs
@@ -2,9 +2,7 @@
 
 use std::{f32::consts::PI, fmt::Debug};
 
-use gpui::{point, px, Bounds, Hsla, Path, PathBuilder, Pixels, Point, Window};
-
-use crate::PixelsExt;
+use gpui::{Bounds, Hsla, Path, PathBuilder, Pixels, Point, Window, point, px};
 
 const EPSILON: f32 = 1e-12;
 const HALF_PI: f32 = PI / 2.;
diff --git a/crates/ui/src/plot/shape/line.rs b/crates/ui/src/plot/shape/line.rs
index 019de398df..b8a0f396f4 100644
--- a/crates/ui/src/plot/shape/line.rs
+++ b/crates/ui/src/plot/shape/line.rs
@@ -5,10 +5,7 @@ use gpui::{
     quad, size,
 };
 
-use crate::{
-    PixelsExt,
-    plot::{StrokeStyle, origin_point},
-};
+use crate::plot::{StrokeStyle, origin_point};
 
 #[allow(clippy::type_complexity)]
 pub struct Line<T> {
diff --git a/crates/ui/src/progress/progress_circle.rs b/crates/ui/src/progress/progress_circle.rs
index fab8733ef7..c9deceb1da 100644
--- a/crates/ui/src/progress/progress_circle.rs
+++ b/crates/ui/src/progress/progress_circle.rs
@@ -1,4 +1,4 @@
-use crate::{ActiveTheme, PixelsExt, Sizable, Size, StyledExt};
+use crate::{ActiveTheme, Sizable, Size, StyledExt};
 use gpui::prelude::FluentBuilder as _;
 use gpui::{
     Animation, AnimationExt as _, AnyElement, App, ElementId, Hsla, InteractiveElement as _,
diff --git a/crates/ui/src/resizable/mod.rs b/crates/ui/src/resizable/mod.rs
index 7d310fd534..ae5e29c091 100644
--- a/crates/ui/src/resizable/mod.rs
+++ b/crates/ui/src/resizable/mod.rs
@@ -1,11 +1,9 @@
 use std::ops::Range;
 
 use gpui::{
-    px, Along, App, Axis, Bounds, Context, ElementId, EventEmitter, IsZero, Pixels, Window,
+    Along, App, Axis, Bounds, Context, ElementId, EventEmitter, IsZero, Pixels, Window, px,
 };
 
-use crate::PixelsExt;
-
 mod panel;
 mod resize_handle;
 pub use panel::*;
diff --git a/crates/ui/src/sidebar/mod.rs b/crates/ui/src/sidebar/mod.rs
index ee186e5c96..98643b24d7 100644
--- a/crates/ui/src/sidebar/mod.rs
+++ b/crates/ui/src/sidebar/mod.rs
@@ -1,5 +1,5 @@
 use crate::{
-    ActiveTheme, Collapsible, Icon, IconName, PixelsExt, Side, Sizable, StyledExt,
+    ActiveTheme, Collapsible, Icon, IconName, Side, Sizable, StyledExt,
     button::{Button, ButtonVariants},
     h_flex,
     scroll::ScrollableElement,
diff --git a/crates/ui/src/styled.rs b/crates/ui/src/styled.rs
index 93a4b0da0e..95d2ee2933 100644
--- a/crates/ui/src/styled.rs
+++ b/crates/ui/src/styled.rs
@@ -1,4 +1,4 @@
-use crate::{ActiveTheme, PixelsExt as _};
+use crate::ActiveTheme;
 use gpui::{
     App, BoxShadow, Corners, DefiniteLength, Div, Edges, FocusHandle, Hsla, ParentElement, Pixels,
     Refineable, StyleRefinement, Styled, Window, div, point, px,
diff --git a/crates/ui/src/virtual_list.rs b/crates/ui/src/virtual_list.rs
index 5a43157d42..8f2cfffc1c 100644
--- a/crates/ui/src/virtual_list.rs
+++ b/crates/ui/src/virtual_list.rs
@@ -26,7 +26,7 @@ use gpui::{
 };
 use smallvec::SmallVec;
 
-use crate::{AxisExt, PixelsExt, scroll::ScrollbarHandle};
+use crate::{AxisExt, scroll::ScrollbarHandle};
 
 struct VirtualListScrollHandleState {
     axis: Axis,
diff --git a/docs/docs/assets.md b/docs/docs/assets.md
index d77d839016..69bec52e8e 100644
--- a/docs/docs/assets.md
+++ b/docs/docs/assets.md
@@ -29,7 +29,7 @@ Then we need call the `with_assets` method when creating the GPUI application to
 use gpui::*;
 use gpui_component_assets::Assets;
 
-let app = Application::new().with_assets(Assets);
+let app = gpui_platform::application().with_assets(Assets);
 ```
 
 Now, we can use `IconName` and `Icon` in our application as usual, the all icon assets are loaded from the default bundled assets.
@@ -87,7 +87,7 @@ We need call the `with_assets` method when creating the GPUI application to regi
 ```rs
 fn main() {
     // Register Assets to GPUI application.
-    let app = Application::new().with_assets(Assets);
+    let app = gpui_platform::application().with_assets(Assets);
 
     app.run(move |cx| {
         // We must initialize gpui_component before using it.
diff --git a/docs/docs/getting-started.md b/docs/docs/getting-started.md
index 54ac250812..2a61439c36 100644
--- a/docs/docs/getting-started.md
+++ b/docs/docs/getting-started.md
@@ -56,7 +56,7 @@ impl Render for HelloWorld {
 }
 
 fn main() {
-    let app = Application::new().with_assets(gpui_component_assets::Assets);
+    let app = gpui_platform::application().with_assets(gpui_component_assets::Assets);
 
     app.run(move |cx| {
         // This must be called before using any GPUI Component features.
diff --git a/examples/app_assets/Cargo.toml b/examples/app_assets/Cargo.toml
index 211d7129c2..8e344bb228 100644
--- a/examples/app_assets/Cargo.toml
+++ b/examples/app_assets/Cargo.toml
@@ -8,6 +8,7 @@ edition.workspace = true
 [dependencies]
 anyhow.workspace = true
 gpui.workspace = true
+gpui_platform.workspace = true
 gpui-component = { workspace = true }
 rust-embed = { version = "8", features = ["interpolate-folder-path"] }
 
diff --git a/examples/app_assets/README.md b/examples/app_assets/README.md
index b8f617c3b3..f0069c6080 100644
--- a/examples/app_assets/README.md
+++ b/examples/app_assets/README.md
@@ -55,7 +55,7 @@ impl AssetSource for Assets {
 
 fn main() {
     // Call with_assets to register assets
-    let app = Application::new().with_assets(Assets);
+    let app = gpui_platform::application().with_assets(Assets);
 
     // ...
 }
@@ -78,5 +78,5 @@ gpui-component-assets = "*"
 And then use it in your application:
 
 ```rs
-let app = Application::new().with_assets(gpui_component_assets::Assets);
+let app = gpui_platform::application().with_assets(gpui_component_assets::Assets);
 ```
diff --git a/examples/app_assets/src/main.rs b/examples/app_assets/src/main.rs
index 9626c4631c..a207e6aae7 100644
--- a/examples/app_assets/src/main.rs
+++ b/examples/app_assets/src/main.rs
@@ -1,6 +1,6 @@
 use anyhow::anyhow;
 use gpui::*;
-use gpui_component::{v_flex, IconName, Root};
+use gpui_component::{IconName, Root, v_flex};
 use rust_embed::RustEmbed;
 use std::borrow::Cow;
 
@@ -44,7 +44,7 @@ impl Render for Example {
 
 fn main() {
     // Register Assets to GPUI application.
-    let app = Application::new().with_assets(Assets);
+    let app = gpui_platform::application().with_assets(Assets);
 
     app.run(move |cx| {
         // We must initialize gpui_component before using it.
diff --git a/examples/dialog_overlay/Cargo.toml b/examples/dialog_overlay/Cargo.toml
index fb24764a29..635e49ee2b 100644
--- a/examples/dialog_overlay/Cargo.toml
+++ b/examples/dialog_overlay/Cargo.toml
@@ -8,6 +8,7 @@ edition.workspace = true
 [dependencies]
 anyhow.workspace = true
 gpui.workspace = true
+gpui_platform.workspace = true
 gpui-component.workspace = true
 gpui-component-assets.workspace = true
 
diff --git a/examples/dialog_overlay/src/main.rs b/examples/dialog_overlay/src/main.rs
index c8e9c4256b..a2fd8afb71 100644
--- a/examples/dialog_overlay/src/main.rs
+++ b/examples/dialog_overlay/src/main.rs
@@ -79,7 +79,7 @@ impl Render for HelloWorld {
 }
 
 fn main() {
-    let app = Application::new().with_assets(Assets);
+    let app = gpui_platform::application().with_assets(Assets);
 
     app.run(move |cx| {
         gpui_component::init(cx);
diff --git a/examples/focus_trap/Cargo.toml b/examples/focus_trap/Cargo.toml
index d9c786eb7e..593b460498 100644
--- a/examples/focus_trap/Cargo.toml
+++ b/examples/focus_trap/Cargo.toml
@@ -8,6 +8,7 @@ edition.workspace = true
 [dependencies]
 anyhow.workspace = true
 gpui.workspace = true
+gpui_platform.workspace = true
 gpui-component = { workspace = true }
 
 [lints]
diff --git a/examples/focus_trap/src/main.rs b/examples/focus_trap/src/main.rs
index e7f87be5c5..4b947dedba 100644
--- a/examples/focus_trap/src/main.rs
+++ b/examples/focus_trap/src/main.rs
@@ -133,7 +133,7 @@ impl Render for Example {
 }
 
 fn main() {
-    let app = Application::new();
+    let app = gpui_platform::application();
 
     app.run(move |cx| {
         gpui_component::init(cx);
diff --git a/examples/hello_world/Cargo.toml b/examples/hello_world/Cargo.toml
index 9312e3f46b..d810d6d81c 100644
--- a/examples/hello_world/Cargo.toml
+++ b/examples/hello_world/Cargo.toml
@@ -8,6 +8,7 @@ edition.workspace = true
 [dependencies]
 anyhow.workspace = true
 gpui.workspace = true
+gpui_platform.workspace = true
 gpui-component = { workspace = true }
 
 [lints]
diff --git a/examples/hello_world/src/main.rs b/examples/hello_world/src/main.rs
index 80d6d3c540..645c6659bc 100644
--- a/examples/hello_world/src/main.rs
+++ b/examples/hello_world/src/main.rs
@@ -21,9 +21,7 @@ impl Render for Example {
 }
 
 fn main() {
-    let app = Application::new();
-
-    app.run(move |cx| {
+    gpui_platform::application().run(move |cx| {
         // This must be called before using any GPUI Component features.
         gpui_component::init(cx);
 
diff --git a/examples/input/Cargo.toml b/examples/input/Cargo.toml
index 3312cbad7f..d7e9cf2807 100644
--- a/examples/input/Cargo.toml
+++ b/examples/input/Cargo.toml
@@ -7,6 +7,7 @@ edition.workspace = true
 [dependencies]
 anyhow.workspace = true
 gpui.workspace = true
+gpui_platform.workspace = true
 gpui-component.workspace = true
 gpui-component-assets.workspace = true
 
diff --git a/examples/input/src/main.rs b/examples/input/src/main.rs
index f7d5ad9858..c4f229c4c7 100644
--- a/examples/input/src/main.rs
+++ b/examples/input/src/main.rs
@@ -54,7 +54,7 @@ impl Render for Example {
 }
 
 fn main() {
-    let app = Application::new().with_assets(Assets);
+    let app = gpui_platform::application().with_assets(Assets);
 
     app.run(move |cx| {
         // This must be called before using any GPUI Component features.
diff --git a/examples/system_monitor/Cargo.toml b/examples/system_monitor/Cargo.toml
index abf1c9b338..6b2294da8e 100644
--- a/examples/system_monitor/Cargo.toml
+++ b/examples/system_monitor/Cargo.toml
@@ -8,6 +8,7 @@ edition = "2024"
 [dependencies]
 anyhow.workspace = true
 gpui.workspace = true
+gpui_platform.workspace = true
 gpui-component-assets.workspace = true
 gpui-component.workspace = true
 sysinfo = "0.37"
diff --git a/examples/system_monitor/src/main.rs b/examples/system_monitor/src/main.rs
index de18823fe4..7ef724d2a8 100644
--- a/examples/system_monitor/src/main.rs
+++ b/examples/system_monitor/src/main.rs
@@ -599,7 +599,7 @@ impl Render for SystemMonitor {
 }
 
 fn main() {
-    let app = Application::new().with_assets(gpui_component_assets::Assets);
+    let app = gpui_platform::application().with_assets(gpui_component_assets::Assets);
 
     app.run(move |cx| {
         gpui_component::init(cx);
diff --git a/examples/webview/Cargo.toml b/examples/webview/Cargo.toml
index 579076d0b8..eb792facbb 100644
--- a/examples/webview/Cargo.toml
+++ b/examples/webview/Cargo.toml
@@ -11,6 +11,7 @@ inspector = []
 [dependencies]
 anyhow.workspace = true
 gpui.workspace = true
+gpui_platform.workspace = true
 gpui-component = { workspace = true }
 
 # WebView dependencies
diff --git a/examples/webview/src/main.rs b/examples/webview/src/main.rs
index bb0ee87612..a08a757259 100644
--- a/examples/webview/src/main.rs
+++ b/examples/webview/src/main.rs
@@ -135,7 +135,7 @@ fn main() {
         std::env::set_var("GPUI_DISABLE_DIRECT_COMPOSITION", "true");
     }
 
-    Application::new().run(move |cx| {
+    gpui_platform::application().run(move |cx| {
         // This must be called before using any GPUI Component features.
         gpui_component::init(cx);
 
diff --git a/examples/window_title/Cargo.toml b/examples/window_title/Cargo.toml
index 2a084bf771..8b90bd7afa 100644
--- a/examples/window_title/Cargo.toml
+++ b/examples/window_title/Cargo.toml
@@ -8,6 +8,7 @@ edition.workspace = true
 [dependencies]
 anyhow.workspace = true
 gpui.workspace = true
+gpui_platform.workspace = true
 gpui-component.workspace = true
 gpui-component-assets.workspace = true
 
diff --git a/examples/window_title/src/main.rs b/examples/window_title/src/main.rs
index 25bbebf157..38859b51f3 100644
--- a/examples/window_title/src/main.rs
+++ b/examples/window_title/src/main.rs
@@ -1,7 +1,8 @@
 use gpui::*;
 use gpui_component::{
+    Root, TitleBar,
     button::{Button, ButtonVariants},
-    h_flex, v_flex, Root, TitleBar,
+    h_flex, v_flex,
 };
 
 pub struct Example;
@@ -39,7 +40,7 @@ impl Render for Example {
 }
 
 fn main() {
-    let app = Application::new().with_assets(gpui_component_assets::Assets);
+    let app = gpui_platform::application().with_assets(gpui_component_assets::Assets);
 
     app.run(move |cx| {
         gpui_component::init(cx);