diff --git a/Cargo.lock b/Cargo.lock
index a3d66d28..71abb43c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,12 +1,12 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "ab_glyph"
-version = "0.2.28"
+version = "0.2.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79faae4620f45232f599d9bc7b290f88247a0834162c4495ab2f02d60004adfb"
+checksum = "ec3672c180e71eeaaac3a541fbbc5f5ad4def8b747c595ad30d674e43049f7b0"
 dependencies = [
  "ab_glyph_rasterizer",
  "owned_ttf_parser",
@@ -20,64 +20,57 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046"
 
 [[package]]
 name = "accesskit"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74a4b14f3d99c1255dcba8f45621ab1a2e7540a0009652d33989005a4d0bfc6b"
-dependencies = [
- "enumn",
- "serde",
-]
-
-[[package]]
-name = "accesskit"
-version = "0.14.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6cf780eb737f2d4a49ffbd512324d53ad089070f813f7be7f99dbd5123a7f448"
+checksum = "becf0eb5215b6ecb0a739c31c21bd83c4f326524c9b46b7e882d77559b60a529"
 
 [[package]]
 name = "accesskit_consumer"
-version = "0.22.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bdfa1638ddd6eb9c752def95568df8b3ad832df252e9156d2eb783b201ca8a9"
+checksum = "d0bf66a7bf0b7ea4fd7742d50b64782a88f99217cf246b3f93b4162528dde520"
 dependencies = [
- "accesskit 0.14.0",
+ "accesskit",
+ "hashbrown",
  "immutable-chunkmap",
 ]
 
 [[package]]
 name = "accesskit_macos"
-version = "0.15.0"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c236a84ff1111defc280cee755eaa953d0b24398786851b9d28322c6d3bb1ebd"
+checksum = "09e230718177753b4e4ad9e1d9f6cfc2f4921212d4c1c480b253f526babb258d"
 dependencies = [
- "accesskit 0.14.0",
+ "accesskit",
  "accesskit_consumer",
- "objc2",
- "objc2-app-kit",
- "objc2-foundation",
- "once_cell",
+ "hashbrown",
+ "objc2 0.5.2",
+ "objc2-app-kit 0.2.2",
+ "objc2-foundation 0.2.2",
 ]
 
 [[package]]
 name = "accesskit_windows"
-version = "0.20.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d7f43d24b16b3e76bef248124fbfd2493c3a9860edb5aae1010c890e826de5e"
+checksum = "65178f3df98a51e4238e584fcb255cb1a4f9111820848eeddd37663be40a625f"
 dependencies = [
- "accesskit 0.14.0",
+ "accesskit",
  "accesskit_consumer",
+ "hashbrown",
  "paste",
  "static_assertions",
- "windows 0.54.0",
+ "windows 0.58.0",
+ "windows-core 0.58.0",
 ]
 
 [[package]]
 name = "accesskit_winit"
-version = "0.20.4"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "755535e6bf711a42dac28b888b884b10fc00ff4010d9d3bd871c5f5beae5aa78"
+checksum = "34d941bb8c414caba6e206de669c7dc0dbeb305640ea890772ee422a40e6b89f"
 dependencies = [
- "accesskit 0.14.0",
+ "accesskit",
  "accesskit_macos",
  "accesskit_windows",
  "raw-window-handle",
@@ -86,19 +79,13 @@ dependencies = [
 
 [[package]]
 name = "addr2line"
-version = "0.24.1"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
 dependencies = [
  "gimli",
 ]
 
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
 [[package]]
 name = "adler2"
 version = "2.0.0"
@@ -107,14 +94,13 @@ checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
 
 [[package]]
 name = "ahash"
-version = "0.8.11"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
 dependencies = [
  "cfg-if",
- "getrandom",
+ "getrandom 0.3.3",
  "once_cell",
- "serde",
  "version_check",
  "zerocopy",
 ]
@@ -134,12 +120,6 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1"
 
-[[package]]
-name = "allocator-api2"
-version = "0.2.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
-
 [[package]]
 name = "alsa"
 version = "0.9.1"
@@ -147,7 +127,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed7572b7ba83a31e20d1b48970ee402d2e3e0537dcfe0a3ff4d6eb7508617d43"
 dependencies = [
  "alsa-sys",
- "bitflags 2.6.0",
+ "bitflags 2.9.0",
  "cfg-if",
  "libc",
 ]
@@ -169,7 +149,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046"
 dependencies = [
  "android-properties",
- "bitflags 2.6.0",
+ "bitflags 2.9.0",
  "cc",
  "cesu8",
  "jni",
@@ -180,7 +160,7 @@ dependencies = [
  "ndk-context",
  "ndk-sys 0.6.0+11769913",
  "num_enum",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -191,9 +171,9 @@ checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04"
 
 [[package]]
 name = "android_log-sys"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ecc8056bf6ab9892dcd53216c83d1597487d7dacac16c8df6b877d127df9937"
+checksum = "84521a3cf562bc62942e294181d9eef17eb38ceb8c68677bc49f144e4c3d4f8d"
 
 [[package]]
 name = "android_system_properties"
@@ -206,9 +186,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.89"
+version = "1.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
+checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
 
 [[package]]
 name = "approx"
@@ -221,25 +201,27 @@ dependencies = [
 
 [[package]]
 name = "arbitrary"
-version = "1.3.2"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110"
+checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223"
 
 [[package]]
 name = "arboard"
-version = "3.4.1"
+version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df099ccb16cd014ff054ac1bf392c67feeef57164b05c42f037cd40f5d4357f4"
+checksum = "c1df21f715862ede32a0c525ce2ca4d52626bb0007f8c18b87a384503ac33e70"
 dependencies = [
  "clipboard-win",
- "core-graphics",
- "image 0.25.2",
+ "image",
  "log",
- "objc2",
- "objc2-app-kit",
- "objc2-foundation",
+ "objc2 0.6.1",
+ "objc2-app-kit 0.3.1",
+ "objc2-core-foundation",
+ "objc2-core-graphics",
+ "objc2-foundation 0.3.1",
  "parking_lot",
- "windows-sys 0.48.0",
+ "percent-encoding",
+ "windows-sys 0.59.0",
  "x11rb",
 ]
 
@@ -251,7 +233,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
@@ -274,21 +256,34 @@ checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b"
 
 [[package]]
 name = "ash"
-version = "0.37.3+1.3.251"
+version = "0.38.0+1.3.281"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f"
+dependencies = [
+ "libloading",
+]
+
+[[package]]
+name = "assert_type_match"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a"
+checksum = "f548ad2c4031f2902e3edc1f29c29e835829437de49562d8eb5dc5584d3a1043"
 dependencies = [
- "libloading 0.7.4",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
 [[package]]
 name = "async-broadcast"
-version = "0.5.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b"
+checksum = "435a87a52755b8f27fcf321ac4f04b2802e337c8c4872923137471ec39c37532"
 dependencies = [
- "event-listener 2.5.3",
+ "event-listener",
+ "event-listener-strategy",
  "futures-core",
+ "pin-project-lite",
 ]
 
 [[package]]
@@ -305,14 +300,15 @@ dependencies = [
 
 [[package]]
 name = "async-executor"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec"
+checksum = "bb812ffb58524bdd10860d7d974e2f01cc0950c2438a74ee5ec2e2280c6c4ffa"
 dependencies = [
  "async-task",
  "concurrent-queue",
  "fastrand",
  "futures-lite",
+ "pin-project-lite",
  "slab",
 ]
 
@@ -333,7 +329,7 @@ version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
 dependencies = [
- "event-listener 5.3.1",
+ "event-listener",
  "event-listener-strategy",
  "pin-project-lite",
 ]
@@ -343,12 +339,28 @@ name = "async-task"
 version = "4.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
+dependencies = [
+ "portable-atomic",
+]
 
 [[package]]
 name = "atomic-waker"
 version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+dependencies = [
+ "portable-atomic",
+]
+
+[[package]]
+name = "atomicow"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f52e8890bb9844440d0c412fa74b67fd2f14e85248b6e00708059b6da9e5f8bf"
+dependencies = [
+ "portable-atomic",
+ "portable-atomic-util",
+]
 
 [[package]]
 name = "autocfg"
@@ -372,23 +384,23 @@ dependencies = [
 
 [[package]]
 name = "avif-serialize"
-version = "0.8.1"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "876c75a42f6364451a033496a14c44bffe41f5f4a8236f697391f11024e596d2"
+checksum = "98922d6a4cfbcb08820c69d8eeccc05bb1f29bfa06b4f5b1dbfe9a868bd7608e"
 dependencies = [
  "arrayvec",
 ]
 
 [[package]]
 name = "backtrace"
-version = "0.3.74"
+version = "0.3.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
+checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
 dependencies = [
  "addr2line",
  "cfg-if",
  "libc",
- "miniz_oxide 0.8.0",
+ "miniz_oxide",
  "object",
  "rustc-demangle",
  "windows-targets 0.52.6",
@@ -419,31 +431,31 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "bevy"
-version = "0.14.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "043c9ad4b6fc4ca52d779873a8ca792a4e37842d07fce95363c9e17e36a1d8a0"
+checksum = "2a5cd3b24a5adb7c7378da7b3eea47639877643d11b6b087fc8a8094f2528615"
 dependencies = [
  "bevy_internal",
 ]
 
 [[package]]
 name = "bevy-inspector-egui"
-version = "0.25.2"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b66b51a66c0be92604c13cd490509d77676c05406f4f4b046672aaffdcc925f"
+checksum = "4971e763f289921fd4616418628458bec26a6fc13fe4299c0e4066f39d7ceaa2"
 dependencies = [
  "bevy-inspector-egui-derive",
  "bevy_app",
  "bevy_asset",
  "bevy_color",
- "bevy_core",
  "bevy_core_pipeline",
  "bevy_ecs",
- "bevy_egui 0.28.0",
- "bevy_hierarchy",
+ "bevy_egui",
+ "bevy_image",
  "bevy_log",
  "bevy_math",
  "bevy_pbr",
+ "bevy_platform",
  "bevy_reflect",
  "bevy_render",
  "bevy_state",
@@ -451,119 +463,138 @@ dependencies = [
  "bevy_utils",
  "bevy_window",
  "bytemuck",
- "egui 0.28.1",
+ "disqualified",
+ "egui",
  "fuzzy-matcher",
- "image 0.24.9",
- "once_cell",
- "pretty-type-name",
+ "image",
  "smallvec",
+ "uuid",
+ "winit",
 ]
 
 [[package]]
 name = "bevy-inspector-egui-derive"
-version = "0.25.1"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "791acfac11e3d5a750952c5201dc0d414b88431260118b46949bf6b159c5a19c"
+checksum = "2656316165dbe2af6b3acaa763332f5dbdd12f809d59f5bf4304e0642a8005c9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
 name = "bevy-scene-hook"
-version = "11.0.0"
-source = "git+https://github.com/stargazing-dino/bevy-scene-hook.git?branch=update-14.0#c29f2d579e0ba1cd195065e59f1f763e0f933468"
+version = "12.0.0"
+source = "git+https://github.com/MiniMinerX/bevy-scene-hook.git?branch=dev-0.16#6931f4f9cef8f4cce3b0da45b90b17bd449b1354"
 dependencies = [
  "bevy",
 ]
 
 [[package]]
 name = "bevy_a11y"
-version = "0.14.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae1a976cb539d6a5a3ff579cdb78187a6bcfbffa7e8224ea28f23d8b983d9389"
+checksum = "91ed969a58fbe449ef35ebec58ab19578302537f34ee8a35d04e5a038b3c40f5"
 dependencies = [
- "accesskit 0.14.0",
+ "accesskit",
  "bevy_app",
  "bevy_derive",
  "bevy_ecs",
+ "bevy_reflect",
 ]
 
 [[package]]
 name = "bevy_animation"
-version = "0.14.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93aef7d21a0342c24b05059493aa31d58f1798d34a2236569a8789b74df5a475"
+checksum = "3647b67c6bfd456922b2720ccef980dec01742d155d0eb454dc3d8fdc65e7aff"
 dependencies = [
  "bevy_app",
  "bevy_asset",
  "bevy_color",
- "bevy_core",
  "bevy_derive",
  "bevy_ecs",
- "bevy_hierarchy",
  "bevy_log",
  "bevy_math",
+ "bevy_mesh",
+ "bevy_platform",
  "bevy_reflect",
  "bevy_render",
  "bevy_time",
  "bevy_transform",
  "bevy_utils",
  "blake3",
- "fixedbitset 0.5.7",
+ "derive_more",
+ "downcast-rs 2.0.1",
+ "either",
  "petgraph",
- "ron",
+ "ron 0.8.1",
  "serde",
- "thiserror",
+ "smallvec",
+ "thiserror 2.0.12",
  "thread_local",
+ "tracing",
  "uuid",
 ]
 
 [[package]]
 name = "bevy_app"
-version = "0.14.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5361d0f8a8677a5d0102cfe7321a7ecd2a8b9a4f887ce0dde1059311cf9cd42"
+checksum = "a2b6267ac23a9947d5b2725ff047a1e1add70076d85fa9fb73d044ab9bea1f3c"
 dependencies = [
  "bevy_derive",
  "bevy_ecs",
+ "bevy_platform",
  "bevy_reflect",
  "bevy_tasks",
  "bevy_utils",
+ "cfg-if",
  "console_error_panic_hook",
- "downcast-rs",
- "thiserror",
+ "ctrlc",
+ "downcast-rs 2.0.1",
+ "log",
+ "thiserror 2.0.12",
+ "variadics_please",
  "wasm-bindgen",
  "web-sys",
 ]
 
 [[package]]
 name = "bevy_asset"
-version = "0.14.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60ec5ea257e1ebd3d411f669e29acf60beb715bebc7e1f374c17f49cd3aad46c"
+checksum = "0698040d63199391ea77fd02e039630748e3e335c3070c6d932fd96cbf80f5d6"
 dependencies = [
  "async-broadcast",
  "async-fs",
  "async-lock",
+ "atomicow",
  "bevy_app",
  "bevy_asset_macros",
  "bevy_ecs",
+ "bevy_platform",
  "bevy_reflect",
  "bevy_tasks",
  "bevy_utils",
- "bevy_winit",
+ "bevy_window",
+ "bitflags 2.9.0",
  "blake3",
  "crossbeam-channel",
- "downcast-rs",
+ "derive_more",
+ "disqualified",
+ "downcast-rs 2.0.1",
+ "either",
  "futures-io",
  "futures-lite",
  "js-sys",
  "parking_lot",
- "ron",
+ "ron 0.8.1",
  "serde",
- "thiserror",
+ "stackfuture",
+ "thiserror 2.0.12",
+ "tracing",
  "uuid",
  "wasm-bindgen",
  "wasm-bindgen-futures",
@@ -572,9 +603,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_asset_loader"
-version = "0.21.0"
+version = "0.23.0-rc.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47863215e4454e0142cc7e0f7801ad256d44e690f43186743e3e2bc9da2de870"
+checksum = "84061ea6511462c1552a615d4f2554cfe4cfb8a2705ea189d6fb3ec2aca727f6"
 dependencies = [
  "anyhow",
  "bevy",
@@ -584,205 +615,196 @@ dependencies = [
 
 [[package]]
 name = "bevy_asset_loader_derive"
-version = "0.21.0"
+version = "0.23.0-rc.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b12bd14ec1f3e57760d01b239bd27ab5dd13547379e5a83c167c7162525f646"
+checksum = "4ec48e433a46d0410671f41b4ab17edd6d4a8e47420b71b2fce57017264392ad"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
 name = "bevy_asset_macros"
-version = "0.14.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9eb05ce838d282f09d83380b4d6432aec7519d421dee8c75cc20e6148237e6e"
+checksum = "0bf8c00b5d532f8e5ac7b49af10602f9f7774a2d522cf0638323b5dfeee7b31c"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
 name = "bevy_audio"
-version = "0.14.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ee31312a0e67f288fe12a1d9aa679dd0ba8a49e1e6fe5fcd2ba1aa1ea34e5ed"
+checksum = "74e54154e6369abdbaf5098e20424d59197c9b701d4f79fe8d0d2bde03d25f12"
 dependencies = [
  "bevy_app",
  "bevy_asset",
  "bevy_derive",
  "bevy_ecs",
- "bevy_hierarchy",
  "bevy_math",
  "bevy_reflect",
  "bevy_transform",
- "bevy_utils",
  "cpal",
  "rodio",
+ "tracing",
 ]
 
 [[package]]
 name = "bevy_color"
-version = "0.14.3"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04842e9d38a93f0c75ab46f7f404ea24ef57ad83dbd159e5b4b35318b02257bb"
+checksum = "ddf6a5ad35496bbc41713efbcf06ab72b9a310fabcab0f9db1debb56e8488c6e"
 dependencies = [
  "bevy_math",
  "bevy_reflect",
  "bytemuck",
+ "derive_more",
  "encase",
  "serde",
- "thiserror",
+ "thiserror 2.0.12",
  "wgpu-types",
 ]
 
-[[package]]
-name = "bevy_core"
-version = "0.14.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de706862871a1fe99ea619bff2f99d73e43ad82f19ef866a9e19a14c957c8537"
-dependencies = [
- "bevy_app",
- "bevy_ecs",
- "bevy_reflect",
- "bevy_tasks",
- "bevy_utils",
- "uuid",
-]
-
 [[package]]
 name = "bevy_core_pipeline"
-version = "0.14.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f6e1e122ada4cd811442e083fb5ad3e325c59a87271d5ef57193f1c2cad7f8c"
+checksum = "55c2310717b9794e4a45513ee5946a7be0838852a4c1e185884195e1a8688ff3"
 dependencies = [
  "bevy_app",
  "bevy_asset",
  "bevy_color",
- "bevy_core",
  "bevy_derive",
+ "bevy_diagnostic",
  "bevy_ecs",
+ "bevy_image",
  "bevy_math",
+ "bevy_platform",
  "bevy_reflect",
  "bevy_render",
  "bevy_transform",
  "bevy_utils",
- "bitflags 2.6.0",
+ "bevy_window",
+ "bitflags 2.9.0",
+ "bytemuck",
  "nonmax",
  "radsort",
  "serde",
  "smallvec",
- "thiserror",
+ "thiserror 2.0.12",
+ "tracing",
 ]
 
 [[package]]
 name = "bevy_debug_grid"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cec97f2d56a2c00ac8cc3fd3915555f322d28558671adbb9efc5dd08ee41d34e"
+version = "0.8.0"
+source = "git+https://github.com/MiniMinerX/bevy_debug_grid.git?branch=dev-0.16#7e4cb894c0b420db697a2f53d4b8e64314caa927"
 dependencies = [
  "bevy",
 ]
 
 [[package]]
 name = "bevy_derive"
-version = "0.14.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fbfc33a4c6b80760bb8bf850a2cc65a1e031da62fd3ca8b552189104dc98514"
+checksum = "f626531b9c05c25a758ede228727bd11c2c2c8498ecbed9925044386d525a2a3"
 dependencies = [
  "bevy_macro_utils",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
 name = "bevy_diagnostic"
-version = "0.14.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bebb154e0cc78e3bbfbfdb42fb502b14c1cd47e72f16e6d4228dfe6233ba6cbd"
+checksum = "048a1ff3944a534b8472516866284181eef0a75b6dd4d39b6e5925715e350766"
 dependencies = [
  "bevy_app",
- "bevy_core",
  "bevy_ecs",
+ "bevy_platform",
  "bevy_tasks",
  "bevy_time",
  "bevy_utils",
  "const-fnv1a-hash",
+ "log",
+ "serde",
  "sysinfo",
 ]
 
 [[package]]
 name = "bevy_ecs"
-version = "0.14.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ee4222406637f3c8e3991a99788cfcde76097bf997c311f1b6297364057483f"
+checksum = "d9e807b5d9aab3bb8dfe47e7a44c9ff088bad2ceefe299b80ac77609a87fe9d4"
 dependencies = [
  "arrayvec",
  "bevy_ecs_macros",
+ "bevy_platform",
  "bevy_ptr",
  "bevy_reflect",
  "bevy_tasks",
  "bevy_utils",
- "bitflags 2.6.0",
+ "bitflags 2.9.0",
+ "bumpalo",
  "concurrent-queue",
- "fixedbitset 0.5.7",
+ "derive_more",
+ "disqualified",
+ "fixedbitset",
+ "indexmap",
+ "log",
  "nonmax",
- "petgraph",
  "serde",
- "thiserror",
+ "smallvec",
+ "thiserror 2.0.12",
+ "variadics_please",
 ]
 
 [[package]]
 name = "bevy_ecs_macros"
-version = "0.14.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36b573430b67aff7bde8292257494f39343401379bfbda64035ba4918bba7b20"
+checksum = "467d7bb98aeb8dd30f36e6a773000c12a891d4f1bee2adc3841ec89cc8eaf54e"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
-]
-
-[[package]]
-name = "bevy_egui"
-version = "0.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e4a90f30f2849a07d91e393b10c0cc05df09b5773c010ddde57dd8b583be230"
-dependencies = [
- "arboard",
- "bevy",
- "bytemuck",
- "console_log",
- "crossbeam-channel",
- "egui 0.28.1",
- "js-sys",
- "log",
- "thread_local",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "webbrowser",
- "winit",
+ "syn",
 ]
 
 [[package]]
 name = "bevy_egui"
-version = "0.29.0"
+version = "0.34.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "128438a8163e49528207aabf20d3ff0890fd6be0f0054626915995efac87922b"
+checksum = "3a3d58a8afdb6100bca50251043a85320391742cae125d559f6cca3a16b84cdd"
 dependencies = [
  "arboard",
- "bevy",
+ "bevy_app",
+ "bevy_asset",
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_image",
+ "bevy_input",
+ "bevy_log",
+ "bevy_math",
+ "bevy_picking",
+ "bevy_platform",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_time",
+ "bevy_window",
+ "bevy_winit",
  "bytemuck",
- "console_log",
  "crossbeam-channel",
- "egui 0.28.1",
+ "egui",
+ "encase",
+ "image",
  "js-sys",
- "log",
  "thread_local",
  "wasm-bindgen",
  "wasm-bindgen-futures",
@@ -794,58 +816,36 @@ dependencies = [
 
 [[package]]
 name = "bevy_encase_derive"
-version = "0.14.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d06c9693847a2a6ea61d6b86288dd4d8b6a79f05d4bf6e27b96d4f5c8d552fe4"
+checksum = "b8bb31dc1090c6f8fabbf6b21994d19a12766e786885ee48ffc547f0f1fa7863"
 dependencies = [
  "bevy_macro_utils",
  "encase_derive_impl",
 ]
 
-[[package]]
-name = "bevy_eventlistener"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63aff74ac1477b88b57ff2f82fc711a7931414be7ee7d0e96aeea45b6d4a7cb6"
-dependencies = [
- "bevy_app",
- "bevy_ecs",
- "bevy_eventlistener_derive",
- "bevy_hierarchy",
- "bevy_utils",
-]
-
-[[package]]
-name = "bevy_eventlistener_derive"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fc779559aa23b81da2b14fba90586755d225983c5b6d3154658e42fc088de7f"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.79",
-]
-
 [[package]]
 name = "bevy_gilrs"
-version = "0.14.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0422ccb3ce0f79b264100cf064fdc5ef65cef5c7d51bf6378058f9b96fea4183"
+checksum = "950c84596dbff8a9691a050c37bb610ef9398af56369c2c2dd6dc41ef7b717a5"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
  "bevy_input",
+ "bevy_platform",
  "bevy_time",
  "bevy_utils",
  "gilrs",
- "thiserror",
+ "thiserror 2.0.12",
+ "tracing",
 ]
 
 [[package]]
 name = "bevy_gizmos"
-version = "0.14.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfe32af0666d8d8a7fd6eb6b5e41eceefdc6f2e5441c74b812e8f0902a9d7f52"
+checksum = "54af8145b35ab2a830a6dd1058e23c1e1ddc4b893db79d295259ef82f51c7520"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -853,6 +853,7 @@ dependencies = [
  "bevy_core_pipeline",
  "bevy_ecs",
  "bevy_gizmos_macros",
+ "bevy_image",
  "bevy_math",
  "bevy_pbr",
  "bevy_reflect",
@@ -862,85 +863,123 @@ dependencies = [
  "bevy_transform",
  "bevy_utils",
  "bytemuck",
+ "tracing",
 ]
 
 [[package]]
 name = "bevy_gizmos_macros"
-version = "0.14.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "906b052f8cf3f3983f0f6df625fb10cbd9b27d44e362a327dc1ed51300d362bc"
+checksum = "40137ace61f092b7a09eba41d7d1e6aef941f53a7818b06ef86dcce7b6a1fd3f"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
 name = "bevy_gltf"
-version = "0.14.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6adbd325b90e3c700d0966b5404e226c7deec1b8bda8f36832788d7b435b9b8"
+checksum = "aa25b809ee024ef2682bafc1ca22ca8275552edb549dc6f69a030fdffd976c63"
 dependencies = [
  "base64 0.22.1",
  "bevy_animation",
  "bevy_app",
  "bevy_asset",
  "bevy_color",
- "bevy_core",
  "bevy_core_pipeline",
  "bevy_ecs",
- "bevy_hierarchy",
+ "bevy_image",
  "bevy_math",
+ "bevy_mesh",
  "bevy_pbr",
+ "bevy_platform",
  "bevy_reflect",
  "bevy_render",
  "bevy_scene",
  "bevy_tasks",
  "bevy_transform",
  "bevy_utils",
+ "fixedbitset",
  "gltf",
+ "itertools 0.14.0",
  "percent-encoding",
  "serde",
  "serde_json",
  "smallvec",
- "thiserror",
+ "thiserror 2.0.12",
+ "tracing",
 ]
 
 [[package]]
-name = "bevy_hierarchy"
-version = "0.14.2"
+name = "bevy_image"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a88b912b37e1bc4dbb2aa40723199f74c8b06c4fbb6da0bb4585131df28ef66e"
+checksum = "840b25f7f58894c641739f756959028a04f519c448db7e2cd3e2e29fc5fd188d"
 dependencies = [
  "bevy_app",
- "bevy_core",
- "bevy_ecs",
+ "bevy_asset",
+ "bevy_color",
+ "bevy_math",
+ "bevy_platform",
  "bevy_reflect",
  "bevy_utils",
- "smallvec",
+ "bitflags 2.9.0",
+ "bytemuck",
+ "futures-lite",
+ "guillotiere",
+ "half",
+ "image",
+ "ktx2",
+ "rectangle-pack",
+ "ruzstd",
+ "serde",
+ "thiserror 2.0.12",
+ "tracing",
+ "wgpu-types",
 ]
 
 [[package]]
 name = "bevy_input"
-version = "0.14.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8dd3a54e67cc3ba17971de7b1a7e64eda84493c1e7bb6bfa11c6cf8ac124377b"
+checksum = "763410715714f3d4d2dcdf077af276e2e4ea93fd8081b183d446d060ea95baaa"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
  "bevy_math",
+ "bevy_platform",
  "bevy_reflect",
  "bevy_utils",
+ "derive_more",
+ "log",
  "smol_str",
- "thiserror",
+ "thiserror 2.0.12",
+]
+
+[[package]]
+name = "bevy_input_focus"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7e7b4ed65e10927a39a987cf85ef98727dd319aafb6e6835f2cb05b883c6d66"
+dependencies = [
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_input",
+ "bevy_math",
+ "bevy_reflect",
+ "bevy_window",
+ "log",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
 name = "bevy_internal"
-version = "0.14.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45d435cac77c568f3aef65f786a5fee0e53c81950c5258182dd2c1d6cd6c4fec"
+checksum = "526ffd64c58004cb97308826e896c07d0e23dc056c243b97492e31cdf72e2830"
 dependencies = [
  "bevy_a11y",
  "bevy_animation",
@@ -948,7 +987,6 @@ dependencies = [
  "bevy_asset",
  "bevy_audio",
  "bevy_color",
- "bevy_core",
  "bevy_core_pipeline",
  "bevy_derive",
  "bevy_diagnostic",
@@ -956,11 +994,14 @@ dependencies = [
  "bevy_gilrs",
  "bevy_gizmos",
  "bevy_gltf",
- "bevy_hierarchy",
+ "bevy_image",
  "bevy_input",
+ "bevy_input_focus",
  "bevy_log",
  "bevy_math",
  "bevy_pbr",
+ "bevy_picking",
+ "bevy_platform",
  "bevy_ptr",
  "bevy_reflect",
  "bevy_render",
@@ -979,299 +1020,263 @@ dependencies = [
 
 [[package]]
 name = "bevy_log"
-version = "0.14.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67240c7596c8f0653e50fce35a60196516817449235193246599facba9002e02"
+checksum = "7156df8d2f11135cf71c03eb4c11132b65201fd4f51648571e59e39c9c9ee2f6"
 dependencies = [
  "android_log-sys",
  "bevy_app",
  "bevy_ecs",
  "bevy_utils",
+ "tracing",
  "tracing-log",
+ "tracing-oslog",
  "tracing-subscriber",
  "tracing-wasm",
 ]
 
 [[package]]
 name = "bevy_macro_utils"
-version = "0.14.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfc65e570012e64a21f3546df68591aaede8349e6174fb500071677f54f06630"
+checksum = "7a2473db70d8785b5c75d6dd951a2e51e9be2c2311122db9692c79c9d887517b"
 dependencies = [
+ "parking_lot",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
  "toml_edit",
 ]
 
 [[package]]
 name = "bevy_math"
-version = "0.14.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5421792749dda753ab3718e77d27bfce38443daf1850b836b97530b6245a4581"
+checksum = "f1a3a926d02dc501c6156a047510bdb538dcb1fa744eeba13c824b73ba88de55"
 dependencies = [
+ "approx",
  "bevy_reflect",
- "glam 0.27.0",
- "rand",
+ "derive_more",
+ "glam 0.29.3",
+ "itertools 0.14.0",
+ "libm",
+ "rand 0.8.5",
+ "rand_distr",
  "serde",
  "smallvec",
- "thiserror",
+ "thiserror 2.0.12",
+ "variadics_please",
+]
+
+[[package]]
+name = "bevy_mesh"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12af58280c7453e32e2f083d86eaa4c9b9d03ea8683977108ded8f1930c539f2"
+dependencies = [
+ "bevy_asset",
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_image",
+ "bevy_math",
+ "bevy_mikktspace",
+ "bevy_platform",
+ "bevy_reflect",
+ "bevy_transform",
+ "bevy_utils",
+ "bitflags 2.9.0",
+ "bytemuck",
+ "hexasphere",
+ "serde",
+ "thiserror 2.0.12",
+ "tracing",
+ "wgpu-types",
 ]
 
 [[package]]
 name = "bevy_mikktspace"
-version = "0.14.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66cf695a264b043f2c4edb92dd5c742e6892180d2b30dac870012d153f8557ea"
+checksum = "75e0258423c689f764556e36b5d9eebdbf624b29a1fd5b33cd9f6c42dcc4d5f3"
 dependencies = [
- "glam 0.27.0",
+ "glam 0.29.3",
 ]
 
 [[package]]
 name = "bevy_mod_billboard"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7fcf796f109d285725c5cbb4c38f6f93b809c7dbea14bc19c5b94ce01ad59de"
+version = "0.8.0"
+source = "git+https://github.com/MiniMinerX/bevy_mod_billboard.git?branch=dev-0.16#47ea75e057090d22e2eba5b0bcdc56ae9bdeed6e"
 dependencies = [
  "bevy",
- "bitflags 2.6.0",
+ "bevy_internal",
+ "bitflags 2.9.0",
  "smallvec",
 ]
 
 [[package]]
 name = "bevy_mod_outline"
-version = "0.8.3"
-source = "git+https://github.com/komadori/bevy_mod_outline.git#8c18e30c251a8a47bbf55a7a4e97ccacad603da2"
+version = "0.10.0"
+source = "git+https://github.com/komadori/bevy_mod_outline.git?branch=bevy-0.16#fde31afe4e06de0e9f22f3aa421dcb0c1ad08f90"
 dependencies = [
  "bevy",
  "bitfield",
  "interpolation",
+ "itertools 0.14.0",
  "nonmax",
- "thiserror",
+ "thiserror 1.0.69",
  "wgpu-types",
 ]
 
 [[package]]
-name = "bevy_mod_picking"
-version = "0.20.1"
+name = "bevy_panorbit_camera"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca6e15e297754d0bcb7665620c390c4f05665d4ac4ac91b4b5d3c66b9fe1f0e6"
+dependencies = [
+ "bevy",
+]
+
+[[package]]
+name = "bevy_pbr"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e290b8ad3e72dc621da7a9c21129da10540d78290ef8857353190e0213cac692"
+checksum = "d9fe0de43b68bf9e5090a33efc963f125e9d3f9d97be9ebece7bcfdde1b6da80"
 dependencies = [
  "bevy_app",
- "bevy_core",
+ "bevy_asset",
+ "bevy_color",
+ "bevy_core_pipeline",
+ "bevy_derive",
+ "bevy_diagnostic",
  "bevy_ecs",
- "bevy_eventlistener",
+ "bevy_image",
  "bevy_math",
- "bevy_picking_core",
- "bevy_picking_highlight",
- "bevy_picking_input",
- "bevy_picking_raycast",
- "bevy_picking_selection",
+ "bevy_platform",
  "bevy_reflect",
  "bevy_render",
+ "bevy_transform",
  "bevy_utils",
  "bevy_window",
+ "bitflags 2.9.0",
+ "bytemuck",
+ "derive_more",
+ "fixedbitset",
+ "nonmax",
+ "offset-allocator",
+ "radsort",
+ "smallvec",
+ "static_assertions",
+ "thiserror 2.0.12",
+ "tracing",
 ]
 
 [[package]]
-name = "bevy_mod_raycast"
-version = "0.18.0"
+name = "bevy_picking"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9e4ff45885c4716771a9f55977d8ce69596502a5241da55bf608d7cd71a9cb3"
+checksum = "f73674f62b1033006bd75c89033f5d3516386cfd7d43bb9f7665012c0ab14d22"
 dependencies = [
  "bevy_app",
  "bevy_asset",
- "bevy_color",
  "bevy_derive",
  "bevy_ecs",
- "bevy_gizmos",
+ "bevy_input",
  "bevy_math",
+ "bevy_mesh",
+ "bevy_platform",
  "bevy_reflect",
  "bevy_render",
- "bevy_sprite",
+ "bevy_time",
  "bevy_transform",
  "bevy_utils",
  "bevy_window",
  "crossbeam-channel",
+ "tracing",
+ "uuid",
 ]
 
 [[package]]
-name = "bevy_panorbit_camera"
-version = "0.19.3"
+name = "bevy_platform"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0aec4ab2ef0d8527c3e85db205f6b0eb3c302f81401dfb7131db425f5fd78d2c"
+checksum = "704db2c11b7bc31093df4fbbdd3769f9606a6a5287149f4b51f2680f25834ebc"
 dependencies = [
- "bevy",
-]
-
-[[package]]
-name = "bevy_pbr"
-version = "0.14.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dccaa3c945f19834dcf7cd8eb358236dbf0fc4000dacbc7710564e7856714db"
-dependencies = [
- "bevy_app",
- "bevy_asset",
- "bevy_color",
- "bevy_core_pipeline",
- "bevy_derive",
- "bevy_ecs",
- "bevy_math",
- "bevy_reflect",
- "bevy_render",
- "bevy_transform",
- "bevy_utils",
- "bevy_window",
- "bitflags 2.6.0",
- "bytemuck",
- "fixedbitset 0.5.7",
- "nonmax",
- "radsort",
- "smallvec",
- "static_assertions",
-]
-
-[[package]]
-name = "bevy_picking_core"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "020b6cf6079927a1e6a3dd883986546632d8d09ab77840997f4936a74eade722"
-dependencies = [
- "bevy_app",
- "bevy_derive",
- "bevy_ecs",
- "bevy_eventlistener",
- "bevy_math",
- "bevy_reflect",
- "bevy_render",
- "bevy_transform",
- "bevy_utils",
- "bevy_window",
- "uuid",
-]
-
-[[package]]
-name = "bevy_picking_highlight"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ba45161608da1bb58cbc55fd83cf5e529e616a180778c394733c85056cd2b76"
-dependencies = [
- "bevy_app",
- "bevy_asset",
- "bevy_color",
- "bevy_ecs",
- "bevy_picking_core",
- "bevy_picking_selection",
- "bevy_reflect",
-]
-
-[[package]]
-name = "bevy_picking_input"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ba8cf67c68a5e150c066366744f9a44006ead9ad280de1c9ca69a6a13c5e283"
-dependencies = [
- "bevy_app",
- "bevy_ecs",
- "bevy_hierarchy",
- "bevy_input",
- "bevy_math",
- "bevy_picking_core",
- "bevy_picking_selection",
- "bevy_reflect",
- "bevy_render",
- "bevy_utils",
- "bevy_window",
-]
-
-[[package]]
-name = "bevy_picking_raycast"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "679184dad110d1532ee6c4c872a0a5807277ea091406915aab27149a3b344fed"
-dependencies = [
- "bevy_app",
- "bevy_ecs",
- "bevy_mod_raycast",
- "bevy_picking_core",
- "bevy_reflect",
- "bevy_render",
- "bevy_transform",
- "bevy_window",
-]
-
-[[package]]
-name = "bevy_picking_selection"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf0769d84e944fbc09b0475f068e5232a8a4be15339796539aecd747413ededd"
-dependencies = [
- "bevy_app",
- "bevy_ecs",
- "bevy_eventlistener",
- "bevy_input",
- "bevy_picking_core",
- "bevy_reflect",
- "bevy_utils",
+ "cfg-if",
+ "critical-section",
+ "foldhash",
+ "getrandom 0.2.16",
+ "hashbrown",
+ "portable-atomic",
+ "portable-atomic-util",
+ "serde",
+ "spin",
+ "web-time",
 ]
 
 [[package]]
 name = "bevy_ptr"
-version = "0.14.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61baa1bdc1f4a7ac2c18217570a7cc04e1cd54d38456e91782f0371c79afe0a8"
+checksum = "86f1275dfb4cfef4ffc90c3fa75408964864facf833acc932413d52aa5364ba4"
 
 [[package]]
 name = "bevy_reflect"
-version = "0.14.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2508785a4a5809f25a237eec4fee2c91a4dbcf81324b2bbc2d6c52629e603781"
+checksum = "607ebacc31029cf2f39ac330eabf1d4bc411b159528ec08dbe6b0593eaccfd41"
 dependencies = [
+ "assert_type_match",
+ "bevy_platform",
  "bevy_ptr",
  "bevy_reflect_derive",
  "bevy_utils",
- "downcast-rs",
+ "derive_more",
+ "disqualified",
+ "downcast-rs 2.0.1",
  "erased-serde",
- "glam 0.27.0",
+ "foldhash",
+ "glam 0.29.3",
  "petgraph",
  "serde",
  "smallvec",
  "smol_str",
- "thiserror",
+ "thiserror 2.0.12",
  "uuid",
+ "variadics_please",
+ "wgpu-types",
 ]
 
 [[package]]
 name = "bevy_reflect_derive"
-version = "0.14.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "967d5da1882ec3bb3675353915d3da909cafac033cbf31e58727824a1ad2a288"
+checksum = "cf35e45e4eb239018369f63f2adc2107a54c329f9276d020e01eee1625b0238b"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
  "uuid",
 ]
 
 [[package]]
 name = "bevy_render"
-version = "0.14.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "836cf8a513db013cbe7d55a331060088efd407e49fd5b05c8404700cd82e7619"
+checksum = "85a7306235b3343b032801504f3e884b93abfb7ba58179fc555c479df509f349"
 dependencies = [
  "async-channel",
  "bevy_app",
  "bevy_asset",
  "bevy_color",
- "bevy_core",
  "bevy_derive",
  "bevy_diagnostic",
  "bevy_ecs",
  "bevy_encase_derive",
- "bevy_hierarchy",
+ "bevy_image",
  "bevy_math",
- "bevy_mikktspace",
+ "bevy_mesh",
+ "bevy_platform",
  "bevy_reflect",
  "bevy_render_macros",
  "bevy_tasks",
@@ -1279,24 +1284,28 @@ dependencies = [
  "bevy_transform",
  "bevy_utils",
  "bevy_window",
- "bitflags 2.6.0",
+ "bitflags 2.9.0",
  "bytemuck",
  "codespan-reporting",
- "downcast-rs",
+ "derive_more",
+ "downcast-rs 2.0.1",
  "encase",
+ "fixedbitset",
  "futures-lite",
- "hexasphere",
- "image 0.25.2",
+ "image",
+ "indexmap",
  "js-sys",
  "ktx2",
  "naga",
  "naga_oil",
  "nonmax",
- "ruzstd",
+ "offset-allocator",
  "send_wrapper",
  "serde",
  "smallvec",
- "thiserror",
+ "thiserror 2.0.12",
+ "tracing",
+ "variadics_please",
  "wasm-bindgen",
  "web-sys",
  "wgpu",
@@ -1304,41 +1313,42 @@ dependencies = [
 
 [[package]]
 name = "bevy_render_macros"
-version = "0.14.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbc24e0e95061a38a7744218b9c7e52e4c08b53f1499f33480e2b749f3864432"
+checksum = "b85c4fb26b66d3a257b655485d11b9b6df9d3c85026493ba8092767a5edfc1b2"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
 name = "bevy_scene"
-version = "0.14.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ec57a72d75273bdbb6154390688fd07ba79ae9f6f99476d1937f799c736c2da"
+checksum = "e7b628f560f2d2fe9f35ecd4526627ba3992f082de03fd745536e4053a0266fe"
 dependencies = [
  "bevy_app",
  "bevy_asset",
  "bevy_derive",
  "bevy_ecs",
- "bevy_hierarchy",
+ "bevy_platform",
  "bevy_reflect",
  "bevy_render",
  "bevy_transform",
  "bevy_utils",
+ "derive_more",
  "serde",
- "thiserror",
+ "thiserror 2.0.12",
  "uuid",
 ]
 
 [[package]]
 name = "bevy_sprite"
-version = "0.14.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e045b4d8cc8e7422a4c29b1eadbe224f5cc42f170b88d43e7535892fcede3840"
+checksum = "01f97bf54fb1c37a1077139b59bb32bc77f7ca53149cfcaa512adbb69a2d492c"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -1346,116 +1356,144 @@ dependencies = [
  "bevy_core_pipeline",
  "bevy_derive",
  "bevy_ecs",
+ "bevy_image",
  "bevy_math",
+ "bevy_picking",
+ "bevy_platform",
  "bevy_reflect",
  "bevy_render",
  "bevy_transform",
  "bevy_utils",
- "bitflags 2.6.0",
+ "bevy_window",
+ "bitflags 2.9.0",
  "bytemuck",
- "fixedbitset 0.5.7",
- "guillotiere",
+ "derive_more",
+ "fixedbitset",
+ "nonmax",
  "radsort",
- "rectangle-pack",
- "thiserror",
+ "tracing",
 ]
 
 [[package]]
 name = "bevy_state"
-version = "0.14.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25335bfa58cc22371182335c3b133017293bc9b6d3308402fd4d1f978b83f937"
+checksum = "682c343c354b191fe6669823bce3b0695ee1ae4ac36f582e29c436a72b67cdd5"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
- "bevy_hierarchy",
+ "bevy_platform",
  "bevy_reflect",
  "bevy_state_macros",
  "bevy_utils",
+ "log",
+ "variadics_please",
 ]
 
 [[package]]
 name = "bevy_state_macros"
-version = "0.14.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dee600b659c739f1911f997a81611fec0a1832cf731727956e5fa4e7532b4dd5"
+checksum = "55b4bf3970c4f0e60572901df4641656722172c222d71a80c430d36b0e31426c"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
 name = "bevy_tasks"
-version = "0.14.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77865f310b1fc48fb05b7c4adbe76607ec01d0c14f8ab4caba4d714c86439946"
+checksum = "444c450b65e108855f42ecb6db0c041a56ea7d7f10cc6222f0ca95e9536a7d19"
 dependencies = [
  "async-channel",
  "async-executor",
+ "async-task",
+ "atomic-waker",
+ "bevy_platform",
+ "cfg-if",
  "concurrent-queue",
+ "crossbeam-queue",
+ "derive_more",
+ "futures-channel",
  "futures-lite",
+ "heapless",
+ "pin-project",
  "wasm-bindgen-futures",
 ]
 
 [[package]]
 name = "bevy_text"
-version = "0.14.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b661db828fd423fc41a4ccf43aa4d1b8e50e75057ec40453317d0d761e8ad62d"
+checksum = "8ef071262c5a9afbc39caba4c0b282c7d045fbb5cf33bdab1924bd2343403833"
 dependencies = [
- "ab_glyph",
  "bevy_app",
  "bevy_asset",
  "bevy_color",
+ "bevy_derive",
  "bevy_ecs",
+ "bevy_image",
+ "bevy_log",
  "bevy_math",
+ "bevy_platform",
  "bevy_reflect",
  "bevy_render",
  "bevy_sprite",
  "bevy_transform",
  "bevy_utils",
  "bevy_window",
- "glyph_brush_layout",
+ "cosmic-text",
  "serde",
- "thiserror",
+ "smallvec",
+ "sys-locale",
+ "thiserror 2.0.12",
+ "tracing",
+ "unicode-bidi",
 ]
 
 [[package]]
 name = "bevy_time"
-version = "0.14.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4e4d53ec32a1b16492396951d04de0d2d90e924bf9adcb8d1adacab5ab6c17c"
+checksum = "456369ca10f8e039aaf273332744674844827854833ee29e28f9e161702f2f55"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
+ "bevy_platform",
  "bevy_reflect",
- "bevy_utils",
  "crossbeam-channel",
- "thiserror",
+ "log",
+ "serde",
 ]
 
 [[package]]
 name = "bevy_transform"
-version = "0.14.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5493dce84427d00a9266e8e4386d738a72ee8640423b62dfcecb6dfccbfe0d2"
+checksum = "8479cdd5461246943956a7c8347e4e5d6ff857e57add889fb50eee0b5c26ab48"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
- "bevy_hierarchy",
+ "bevy_log",
  "bevy_math",
  "bevy_reflect",
- "thiserror",
+ "bevy_tasks",
+ "bevy_utils",
+ "derive_more",
+ "serde",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
 name = "bevy_ui"
-version = "0.14.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56d2cba6603b39a3765f043212ae530e25550af168a7eec6b23b9b93c19bc5f7"
+checksum = "110dc5d0059f112263512be8cd7bfe0466dfb7c26b9bf4c74529355249fd23f9"
 dependencies = [
+ "accesskit",
  "bevy_a11y",
  "bevy_app",
  "bevy_asset",
@@ -1463,9 +1501,11 @@ dependencies = [
  "bevy_core_pipeline",
  "bevy_derive",
  "bevy_ecs",
- "bevy_hierarchy",
+ "bevy_image",
  "bevy_input",
  "bevy_math",
+ "bevy_picking",
+ "bevy_platform",
  "bevy_reflect",
  "bevy_render",
  "bevy_sprite",
@@ -1474,79 +1514,76 @@ dependencies = [
  "bevy_utils",
  "bevy_window",
  "bytemuck",
+ "derive_more",
  "nonmax",
  "smallvec",
  "taffy",
- "thiserror",
+ "thiserror 2.0.12",
+ "tracing",
 ]
 
 [[package]]
 name = "bevy_utils"
-version = "0.14.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffb0ec333b5965771153bd746f92ffd8aeeb9d008a8620ffd9ed474859381a5e"
+checksum = "ac2da3b3c1f94dadefcbe837aaa4aa119fcea37f7bdc5307eb05b4ede1921e24"
 dependencies = [
- "ahash",
- "bevy_utils_proc_macros",
- "getrandom",
- "hashbrown",
+ "bevy_platform",
  "thread_local",
- "tracing",
- "web-time",
-]
-
-[[package]]
-name = "bevy_utils_proc_macros"
-version = "0.14.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38f1ab8f2f6f58439d260081d89a42b02690e5fdd64f814edc9417d33fcf2857"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.79",
 ]
 
 [[package]]
 name = "bevy_window"
-version = "0.14.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c89e88a20db64ea8204540afb4699295947c454738fd50293f7b32ab8be857a6"
+checksum = "0d83327cc5584da463d12b7a88ddb97f9e006828832287e1564531171fffdeb4"
 dependencies = [
- "bevy_a11y",
+ "android-activity",
  "bevy_app",
  "bevy_ecs",
+ "bevy_input",
  "bevy_math",
+ "bevy_platform",
  "bevy_reflect",
  "bevy_utils",
+ "log",
  "raw-window-handle",
+ "serde",
  "smol_str",
 ]
 
 [[package]]
 name = "bevy_winit"
-version = "0.14.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0bef8ec3e4b45db943ad4d1c0bf59b09e382ce0651a706e2f33a70fa955303c"
+checksum = "57b14928923ae4274f4b867dce3d0e7b2c8a31bebcb0f6e65a4261c3e0765064"
 dependencies = [
+ "accesskit",
  "accesskit_winit",
  "approx",
  "bevy_a11y",
  "bevy_app",
+ "bevy_asset",
  "bevy_derive",
  "bevy_ecs",
- "bevy_hierarchy",
+ "bevy_image",
  "bevy_input",
+ "bevy_input_focus",
  "bevy_log",
  "bevy_math",
+ "bevy_platform",
  "bevy_reflect",
  "bevy_tasks",
  "bevy_utils",
  "bevy_window",
+ "bytemuck",
  "cfg-if",
  "crossbeam-channel",
  "raw-window-handle",
+ "tracing",
  "wasm-bindgen",
  "web-sys",
+ "wgpu-types",
  "winit",
 ]
 
@@ -1556,16 +1593,18 @@ version = "0.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.0",
  "cexpr",
  "clang-sys",
  "itertools 0.13.0",
+ "log",
+ "prettyplease",
  "proc-macro2",
  "quote",
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
@@ -1574,7 +1613,16 @@ version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
 dependencies = [
- "bit-vec",
+ "bit-vec 0.6.3",
+]
+
+[[package]]
+name = "bit-set"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
+dependencies = [
+ "bit-vec 0.8.0",
 ]
 
 [[package]]
@@ -1583,6 +1631,12 @@ version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
 
+[[package]]
+name = "bit-vec"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
+
 [[package]]
 name = "bit_field"
 version = "0.10.2"
@@ -1603,24 +1657,24 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.6.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "bitstream-io"
-version = "2.5.3"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b81e1519b0d82120d2fd469d5bfb2919a9361c48b02d82d04befc1cdd2002452"
+checksum = "6099cdc01846bc367c4e7dd630dc5966dccf36b652fae7a74e17b640411a91b2"
 
 [[package]]
 name = "blake3"
-version = "1.5.4"
+version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7"
+checksum = "3888aaa89e4b2a40fca9848e400f6a658a5a3978de7be858e209cafa8be9a4a0"
 dependencies = [
  "arrayref",
  "arrayvec",
@@ -1641,7 +1695,7 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f"
 dependencies = [
- "objc2",
+ "objc2 0.5.2",
 ]
 
 [[package]]
@@ -1659,34 +1713,34 @@ dependencies = [
 
 [[package]]
 name = "built"
-version = "0.7.4"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "236e6289eda5a812bc6b53c3b024039382a2895fbbeef2d748b2931546d392c4"
+checksum = "56ed6191a7e78c36abdb16ab65341eefd73d64d303fffccdbb00d51e4205967b"
 
 [[package]]
 name = "bumpalo"
-version = "3.16.0"
+version = "3.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
 
 [[package]]
 name = "bytemuck"
-version = "1.18.0"
+version = "1.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae"
+checksum = "9134a6ef01ce4b366b50689c94f82c14bc72bc5d0386829828a2e2752ef7958c"
 dependencies = [
  "bytemuck_derive",
 ]
 
 [[package]]
 name = "bytemuck_derive"
-version = "1.7.1"
+version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26"
+checksum = "7ecc273b49b3205b83d648f0690daa588925572cc5063745bfe547fe7ec8e1a1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
@@ -1703,9 +1757,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
 
 [[package]]
 name = "bytes"
-version = "1.7.2"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
+checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
 
 [[package]]
 name = "calloop"
@@ -1713,12 +1767,12 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.0",
  "log",
  "polling",
  "rustix",
  "slab",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -1735,9 +1789,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.22"
+version = "1.2.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9540e661f81799159abee814118cc139a2004b3a3aa3ea37724a1b66530b90e0"
+checksum = "32db95edf998450acc7881c932f94cd9b05c87b4b2599e8bab064753da4acfd1"
 dependencies = [
  "jobserver",
  "libc",
@@ -1775,12 +1829,6 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
-[[package]]
-name = "cfg_aliases"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
-
 [[package]]
 name = "cfg_aliases"
 version = "0.2.1"
@@ -1795,7 +1843,7 @@ checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
 dependencies = [
  "glob",
  "libc",
- "libloading 0.8.5",
+ "libloading",
 ]
 
 [[package]]
@@ -1823,37 +1871,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
-[[package]]
-name = "com"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e17887fd17353b65b1b2ef1c526c83e26cd72e74f598a8dc1bee13a48f3d9f6"
-dependencies = [
- "com_macros",
-]
-
-[[package]]
-name = "com_macros"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d375883580a668c7481ea6631fc1a8863e33cc335bf56bfad8d7e6d4b04b13a5"
-dependencies = [
- "com_macros_support",
- "proc-macro2",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "com_macros_support"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad899a1087a9296d5644792d7cb72b8e34c1bec8e7d4fbc002230169a6e8710c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "combine"
 version = "4.6.7"
@@ -1871,6 +1888,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
 dependencies = [
  "crossbeam-utils",
+ "portable-atomic",
 ]
 
 [[package]]
@@ -1883,16 +1901,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "console_log"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be8aed40e4edbf4d3b4431ab260b63fdc40f5780a4766824329ea0f1eefe3c0f"
-dependencies = [
- "log",
- "web-sys",
-]
-
 [[package]]
 name = "const-fnv1a-hash"
 version = "1.1.0"
@@ -1901,9 +1909,9 @@ checksum = "32b13ea120a812beba79e34316b3942a857c86ec1593cb34f27bb28272ce2cca"
 
 [[package]]
 name = "const_panic"
-version = "0.2.10"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "013b6c2c3a14d678f38cd23994b02da3a1a1b6a5d1eedddfe63a5a5f11b13a81"
+checksum = "2459fc9262a1aa204eb4b5764ad4f189caec88aea9634389c0a25f8be7f6265e"
 
 [[package]]
 name = "const_soft_float"
@@ -1928,15 +1936,9 @@ dependencies = [
 
 [[package]]
 name = "convert_case"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
-
-[[package]]
-name = "convert_case"
-version = "0.6.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+checksum = "baaaa0ecca5b51987b9423ccdc971514dd8b0bb7b4060b983d3664dad3f1f89f"
 dependencies = [
  "unicode-segmentation",
 ]
@@ -2011,6 +2013,29 @@ dependencies = [
  "bindgen",
 ]
 
+[[package]]
+name = "cosmic-text"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e418dd4f5128c3e93eab12246391c54a20c496811131f85754dc8152ee207892"
+dependencies = [
+ "bitflags 2.9.0",
+ "fontdb",
+ "log",
+ "rangemap",
+ "rustc-hash",
+ "rustybuzz",
+ "self_cell",
+ "smol_str",
+ "swash",
+ "sys-locale",
+ "ttf-parser 0.21.1",
+ "unicode-bidi",
+ "unicode-linebreak",
+ "unicode-script",
+ "unicode-segmentation",
+]
+
 [[package]]
 name = "cpal"
 version = "0.15.3"
@@ -2043,20 +2068,26 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "critical-section"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b"
+
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.13"
+version = "0.5.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
+checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2"
 dependencies = [
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
+checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
 dependencies = [
  "crossbeam-epoch",
  "crossbeam-utils",
@@ -2072,39 +2103,47 @@ dependencies = [
 ]
 
 [[package]]
-name = "crossbeam-utils"
-version = "0.8.20"
+name = "crossbeam-queue"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115"
+dependencies = [
+ "crossbeam-utils",
+]
 
 [[package]]
-name = "crunchy"
-version = "0.2.2"
+name = "crossbeam-utils"
+version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
 [[package]]
-name = "cursor-icon"
-version = "1.1.0"
+name = "crunchy"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991"
+checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929"
 
 [[package]]
-name = "d3d12"
-version = "0.20.0"
+name = "ctrlc"
+version = "3.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b28bfe653d79bd16c77f659305b195b82bb5ce0c0eb2a4846b82ddbd77586813"
+checksum = "697b5419f348fd5ae2478e8018cb016c00a5881c7f46c717de98ffd135a5651c"
 dependencies = [
- "bitflags 2.6.0",
- "libloading 0.8.5",
- "winapi",
+ "nix 0.29.0",
+ "windows-sys 0.59.0",
 ]
 
+[[package]]
+name = "cursor-icon"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991"
+
 [[package]]
 name = "darling"
-version = "0.20.10"
+version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
+checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
 dependencies = [
  "darling_core",
  "darling_macro",
@@ -2112,26 +2151,26 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.20.10"
+version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
+checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e"
 dependencies = [
  "fnv",
  "ident_case",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
 name = "darling_macro"
-version = "0.20.10"
+version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
+checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
@@ -2142,9 +2181,9 @@ checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f"
 
 [[package]]
 name = "data-encoding"
-version = "2.6.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
+checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476"
 
 [[package]]
 name = "data-url"
@@ -2154,15 +2193,23 @@ checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a"
 
 [[package]]
 name = "derive_more"
-version = "0.99.18"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce"
+checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05"
+dependencies = [
+ "derive_more-impl",
+]
+
+[[package]]
+name = "derive_more-impl"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22"
 dependencies = [
- "convert_case 0.4.0",
  "proc-macro2",
  "quote",
- "rustc_version",
- "syn 2.0.79",
+ "syn",
+ "unicode-xid",
 ]
 
 [[package]]
@@ -2171,20 +2218,47 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
 
+[[package]]
+name = "dispatch2"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec"
+dependencies = [
+ "bitflags 2.9.0",
+ "objc2 0.6.1",
+]
+
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "disqualified"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9c272297e804878a2a4b707cfcfc6d2328b5bb936944613b4fdf2b9269afdfd"
+
 [[package]]
 name = "dlib"
 version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
 dependencies = [
- "libloading 0.8.5",
+ "libloading",
 ]
 
 [[package]]
 name = "document-features"
-version = "0.2.10"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0"
+checksum = "95249b50c6c185bee49034bcb378a49dc2b5dff0be90ff6616d31d64febab05d"
 dependencies = [
  "litrs",
 ]
@@ -2195,46 +2269,48 @@ version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
 
+[[package]]
+name = "downcast-rs"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea8a8b81cacc08888170eef4d13b775126db426d0b348bee9d18c2c1eaf123cf"
+
 [[package]]
 name = "dpi"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53"
+checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76"
 
 [[package]]
 name = "duplicate"
-version = "1.0.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de78e66ac9061e030587b2a2e75cc88f22304913c907b11307bca737141230cb"
+checksum = "97af9b5f014e228b33e77d75ee0e6e87960124f0f4b16337b586a6bec91867b1"
 dependencies = [
- "heck 0.4.1",
- "proc-macro-error",
+ "heck",
+ "proc-macro2",
+ "proc-macro2-diagnostics",
 ]
 
 [[package]]
-name = "ecolor"
-version = "0.27.2"
+name = "dyn-clone"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20930a432bbd57a6d55e07976089708d4893f3d556cf42a0d79e9e321fa73b10"
-dependencies = [
- "bytemuck",
- "serde",
-]
+checksum = "1c7a8fb8a9fbf66c1f703fe16184d10ca0ee9d23be5b4436400408ba54a95005"
 
 [[package]]
 name = "ecolor"
-version = "0.28.1"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e6b451ff1143f6de0f33fc7f1b68fecfd2c7de06e104de96c4514de3f5396f8"
+checksum = "bc4feb366740ded31a004a0e4452fbf84e80ef432ecf8314c485210229672fd1"
 dependencies = [
  "bytemuck",
- "emath 0.28.1",
- "serde",
+ "emath",
 ]
 
 [[package]]
 name = "editor_as_plugin"
-version = "0.6.0"
+version = "0.8.0"
 dependencies = [
  "bevy",
  "space_editor",
@@ -2243,75 +2319,63 @@ dependencies = [
 
 [[package]]
 name = "egui"
-version = "0.27.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "584c5d1bf9a67b25778a3323af222dbe1a1feb532190e103901187f92c7fe29a"
-dependencies = [
- "accesskit 0.12.3",
- "ahash",
- "epaint 0.27.2",
- "nohash-hasher",
- "serde",
-]
-
-[[package]]
-name = "egui"
-version = "0.28.1"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20c97e70a2768de630f161bb5392cbd3874fcf72868f14df0e002e82e06cb798"
+checksum = "25dd34cec49ab55d85ebf70139cb1ccd29c977ef6b6ba4fe85489d6877ee9ef3"
 dependencies = [
- "accesskit 0.12.3",
  "ahash",
- "emath 0.28.1",
- "epaint 0.28.1",
+ "bitflags 2.9.0",
+ "emath",
+ "epaint",
  "nohash-hasher",
- "serde",
+ "profiling",
 ]
 
 [[package]]
 name = "egui-toast"
-version = "0.14.0"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6652cccda84ba174437caa128e4e28a3502a3c62c9e39e381c24f1f0445946f1"
+checksum = "366a31eb8c905835c85a36baff26d7a003a9fd6631a04b1f15f42d9cb20d11ad"
 dependencies = [
- "egui 0.28.1",
+ "egui",
 ]
 
 [[package]]
 name = "egui_dock"
-version = "0.13.0"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "629a8b0e440d69996795669ceacc0dd839a997843489273600d31d16c9cb3500"
+checksum = "9ea7536fb0243aea55c1ca123a41a18253e16520d427a7213da584b9e2cb3973"
 dependencies = [
  "duplicate",
- "egui 0.28.1",
+ "egui",
  "paste",
 ]
 
 [[package]]
 name = "egui_extras"
-version = "0.28.1"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bb783d9fa348f69ed5c340aa25af78b5472043090e8b809040e30960cc2a746"
+checksum = "624659a2e972a46f4d5f646557906c55f1cd5a0836eddbe610fdf1afba1b4226"
 dependencies = [
  "ahash",
- "egui 0.28.1",
+ "egui",
  "ehttp",
  "enum-map",
- "image 0.25.2",
+ "image",
  "log",
  "mime_guess2",
+ "profiling",
  "resvg",
- "serde",
 ]
 
 [[package]]
 name = "egui_file"
-version = "0.18.0"
+version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60f345a124846bdfe3b35a43b74bb2a485c5494c106cb646748edcd6c10bc24d"
+checksum = "3e7289fecaa1af3f4944a7ac6e1c187d0700e32716c2a4c76d6bad7ffd255d72"
 dependencies = [
- "egui 0.28.1",
+ "dyn-clone",
+ "egui",
 ]
 
 [[package]]
@@ -2330,60 +2394,49 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.13.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 
 [[package]]
 name = "emath"
-version = "0.27.2"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4c3a552cfca14630702449d35f41c84a0d15963273771c6059175a803620f3f"
+checksum = "9e4cadcff7a5353ba72b7fea76bf2122b5ebdbc68e8155aa56dfdea90083fe1b"
 dependencies = [
  "bytemuck",
- "serde",
-]
-
-[[package]]
-name = "emath"
-version = "0.28.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a6a21708405ea88f63d8309650b4d77431f4bc28fb9d8e6f77d3963b51249e6"
-dependencies = [
- "bytemuck",
- "serde",
 ]
 
 [[package]]
 name = "encase"
-version = "0.8.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a9299a95fa5671ddf29ecc22b00e121843a65cb9ff24911e394b4ae556baf36"
+checksum = "b0a05902cf601ed11d564128448097b98ebe3c6574bd7b6a653a3d56d54aa020"
 dependencies = [
  "const_panic",
  "encase_derive",
- "glam 0.27.0",
- "thiserror",
+ "glam 0.29.3",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "encase_derive"
-version = "0.8.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07e09decb3beb1fe2db6940f598957b2e1f7df6206a804d438ff6cb2a9cddc10"
+checksum = "181d475b694e2dd56ae919ce7699d344d1fd259292d590c723a50d1189a2ea85"
 dependencies = [
  "encase_derive_impl",
 ]
 
 [[package]]
 name = "encase_derive_impl"
-version = "0.8.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd31dbbd9743684d339f907a87fe212cb7b51d75b9e8e74181fe363199ee9b47"
+checksum = "f97b51c5cc57ef7c5f7a0c57c250251c49ee4c28f819f87ac32f4aceabc36792"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
@@ -2404,7 +2457,7 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
@@ -2416,84 +2469,64 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
-]
-
-[[package]]
-name = "enumn"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
 name = "enumset"
-version = "1.1.5"
+version = "1.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d07a4b049558765cef5f0c1a273c3fc57084d768b44d2f98127aef4cceb17293"
+checksum = "11a6b7c3d347de0a9f7bfd2f853be43fe32fa6fac30c70f6d6d67a1e936b87ee"
 dependencies = [
  "enumset_derive",
 ]
 
 [[package]]
 name = "enumset_derive"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59c3b24c345d8c314966bdc1832f6c2635bfcce8e7cf363bd115987bba2ee242"
+checksum = "6da3ea9e1d1a3b1593e15781f930120e72aa7501610b2f82e5b6739c72e8eac5"
 dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
 name = "epaint"
-version = "0.27.2"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b381f8b149657a4acf837095351839f32cd5c4aec1817fc4df84e18d76334176"
+checksum = "41fcc0f5a7c613afd2dee5e4b30c3e6acafb8ad6f0edb06068811f708a67c562"
 dependencies = [
  "ab_glyph",
  "ahash",
  "bytemuck",
- "ecolor 0.27.2",
- "emath 0.27.2",
+ "ecolor",
+ "emath",
+ "epaint_default_fonts",
  "nohash-hasher",
  "parking_lot",
- "serde",
+ "profiling",
 ]
 
 [[package]]
-name = "epaint"
-version = "0.28.1"
+name = "epaint_default_fonts"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f0dcc0a0771e7500e94cd1cb797bd13c9f23b9409bdc3c824e2cbc562b7fa01"
-dependencies = [
- "ab_glyph",
- "ahash",
- "bytemuck",
- "ecolor 0.28.1",
- "emath 0.28.1",
- "nohash-hasher",
- "parking_lot",
- "serde",
-]
+checksum = "fc7e7a64c02cf7a5b51e745a9e45f60660a286f151c238b9d397b3e923f5082f"
 
 [[package]]
 name = "equivalent"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "erased-serde"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d"
+checksum = "e004d887f51fcb9fef17317a2f3525c887d8aa3f4f50fed920816a688284a5b7"
 dependencies = [
  "serde",
  "typeid",
@@ -2501,19 +2534,19 @@ dependencies = [
 
 [[package]]
 name = "errno"
-version = "0.3.9"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "error-code"
-version = "3.3.1"
+version = "3.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5d9305ccc6942a704f4335694ecd3de2ea531b114ac2d51f5f843750787a92f"
+checksum = "dea2df4cf52843e0452895c455a1a2cfbb842a1e7329671acf418fdc53ed4c59"
 
 [[package]]
 name = "euclid"
@@ -2526,15 +2559,9 @@ dependencies = [
 
 [[package]]
 name = "event-listener"
-version = "2.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
-
-[[package]]
-name = "event-listener"
-version = "5.3.1"
+version = "5.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
+checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae"
 dependencies = [
  "concurrent-queue",
  "parking",
@@ -2543,25 +2570,24 @@ dependencies = [
 
 [[package]]
 name = "event-listener-strategy"
-version = "0.5.2"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
+checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93"
 dependencies = [
- "event-listener 5.3.1",
+ "event-listener",
  "pin-project-lite",
 ]
 
 [[package]]
 name = "exr"
-version = "1.72.0"
+version = "1.73.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4"
+checksum = "f83197f59927b46c04a183a619b7c29df34e63e63c7869320862268c0ef687e0"
 dependencies = [
  "bit_field",
- "flume",
  "half",
  "lebe",
- "miniz_oxide 0.7.4",
+ "miniz_oxide",
  "rayon-core",
  "smallvec",
  "zune-inflate",
@@ -2569,25 +2595,19 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.1.1"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 
 [[package]]
 name = "fdeflate"
-version = "0.3.5"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8090f921a24b04994d9929e204f50b498a33ea6ba559ffaa05e04f7ee7fb5ab"
+checksum = "1e6853b52649d4ac5c0bd02320cddc5ba956bdb407c4b75a2c6b75bf51500f8c"
 dependencies = [
  "simd-adler32",
 ]
 
-[[package]]
-name = "fixedbitset"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
-
 [[package]]
 name = "fixedbitset"
 version = "0.5.7"
@@ -2596,12 +2616,12 @@ checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
 
 [[package]]
 name = "flate2"
-version = "1.0.34"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0"
+checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece"
 dependencies = [
  "crc32fast",
- "miniz_oxide 0.8.0",
+ "miniz_oxide",
 ]
 
 [[package]]
@@ -2611,19 +2631,48 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4"
 
 [[package]]
-name = "flume"
-version = "0.11.0"
+name = "fnv"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "foldhash"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
+
+[[package]]
+name = "font-types"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02a596f5713680923a2080d86de50fe472fb290693cf0f701187a1c8b36996b7"
 dependencies = [
- "spin",
+ "bytemuck",
 ]
 
 [[package]]
-name = "fnv"
-version = "1.0.7"
+name = "fontconfig-parser"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+checksum = "c1fcfcd44ca6e90c921fee9fa665d530b21ef1327a4c1a6c5250ea44b776ada7"
+dependencies = [
+ "roxmltree 0.20.0",
+]
+
+[[package]]
+name = "fontdb"
+version = "0.16.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3"
+dependencies = [
+ "fontconfig-parser",
+ "log",
+ "memmap2",
+ "slotmap",
+ "tinyvec",
+ "ttf-parser 0.20.0",
+]
 
 [[package]]
 name = "foreign-types"
@@ -2643,7 +2692,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
@@ -2661,23 +2710,32 @@ dependencies = [
  "percent-encoding",
 ]
 
+[[package]]
+name = "futures-channel"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
+dependencies = [
+ "futures-core",
+]
+
 [[package]]
 name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-lite"
-version = "2.3.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
+checksum = "f5edaec856126859abb19ed65f39e90fea3a9574b9707f13539acf4abf7eb532"
 dependencies = [
  "fastrand",
  "futures-core",
@@ -2716,17 +2774,29 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
 dependencies = [
  "cfg-if",
  "js-sys",
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "getrandom"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi",
+ "wasi 0.14.2+wasi-0.2.4",
+]
+
 [[package]]
 name = "gif"
 version = "0.13.1"
@@ -2739,9 +2809,9 @@ dependencies = [
 
 [[package]]
 name = "gilrs"
-version = "0.10.10"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a556964c6d62458084356ce9770676f5104bd667e12e9a795691076e8a17c5cf"
+checksum = "bbb2c998745a3c1ac90f64f4f7b3a54219fd3612d7705e7798212935641ed18f"
 dependencies = [
  "fnv",
  "gilrs-core",
@@ -2752,11 +2822,11 @@ dependencies = [
 
 [[package]]
 name = "gilrs-core"
-version = "0.5.15"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "732dadc05170599ddec9a89653f10d7a2af54da9181b3fa6e2bd49907ec8f7e4"
+checksum = "a6d95ae10ce5aa99543a28cf74e41c11f3b9e3c14f0452bbde46024753cd683e"
 dependencies = [
- "core-foundation 0.9.4",
+ "core-foundation 0.10.0",
  "inotify",
  "io-kit-sys",
  "js-sys",
@@ -2768,14 +2838,14 @@ dependencies = [
  "vec_map",
  "wasm-bindgen",
  "web-sys",
- "windows 0.58.0",
+ "windows 0.61.1",
 ]
 
 [[package]]
 name = "gimli"
-version = "0.31.0"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "gl_generator"
@@ -2790,37 +2860,37 @@ dependencies = [
 
 [[package]]
 name = "glam"
-version = "0.27.0"
+version = "0.29.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e05e7e6723e3455f4818c7b26e855439f7546cf617ef669d1adedb8669e5cb9"
+checksum = "8babf46d4c1c9d92deac9f7be466f76dfc4482b6452fc5024b5e8daf6ffeb3ee"
 dependencies = [
  "bytemuck",
- "rand",
+ "libm",
+ "mint",
+ "rand 0.8.5",
  "serde",
 ]
 
 [[package]]
 name = "glam"
-version = "0.28.0"
+version = "0.30.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "779ae4bf7e8421cf91c0b3b64e7e8b40b862fba4d393f59150042de7c4965a94"
+checksum = "6b46b9ca4690308844c644e7c634d68792467260e051c8543e0c7871662b3ba7"
 dependencies = [
- "bytemuck",
  "mint",
- "serde",
 ]
 
 [[package]]
 name = "glob"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
 
 [[package]]
 name = "glow"
-version = "0.13.1"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1"
+checksum = "c5e5ea60d70410161c8bf5da3fdfeaa1c72ed2c15f8bbb9d19fe3a4fad085f08"
 dependencies = [
  "js-sys",
  "slotmap",
@@ -2849,7 +2919,7 @@ dependencies = [
  "inflections",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
@@ -2866,31 +2936,20 @@ dependencies = [
 
 [[package]]
 name = "glutin_wgl_sys"
-version = "0.5.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead"
+checksum = "2c4ee00b289aba7a9e5306d57c2d05499b2e5dc427f84ac708bd2c090212cf3e"
 dependencies = [
  "gl_generator",
 ]
 
-[[package]]
-name = "glyph_brush_layout"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b1e288bfd2f6c0313f78bf5aa538356ad481a3bb97e9b7f93220ab0066c5992"
-dependencies = [
- "ab_glyph",
- "approx",
- "xi-unicode",
-]
-
 [[package]]
 name = "gpu-alloc"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.0",
  "gpu-alloc-types",
 ]
 
@@ -2900,29 +2959,28 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.0",
 ]
 
 [[package]]
 name = "gpu-allocator"
-version = "0.25.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884"
+checksum = "c151a2a5ef800297b4e79efa4f4bec035c5f51d5ae587287c9b952bdf734cacd"
 dependencies = [
  "log",
  "presser",
- "thiserror",
- "winapi",
- "windows 0.52.0",
+ "thiserror 1.0.69",
+ "windows 0.58.0",
 ]
 
 [[package]]
 name = "gpu-descriptor"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557"
+checksum = "dcf29e94d6d243368b7a56caa16bc213e4f9f8ed38c4d9557069527b5d5281ca"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.0",
  "gpu-descriptor-types",
  "hashbrown",
 ]
@@ -2933,14 +2991,14 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.0",
 ]
 
 [[package]]
 name = "grid"
-version = "0.14.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be136d9dacc2a13cc70bb6c8f902b414fb2641f8db1314637c6b7933411a8f82"
+checksum = "36119f3a540b086b4e436bb2b588cf98a68863470e0e880f4d0842f112a3183a"
 
 [[package]]
 name = "guillotiere"
@@ -2954,81 +3012,167 @@ dependencies = [
 
 [[package]]
 name = "half"
-version = "2.4.1"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
+checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9"
 dependencies = [
  "cfg-if",
  "crunchy",
 ]
 
+[[package]]
+name = "hash32"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606"
+dependencies = [
+ "byteorder",
+]
+
 [[package]]
 name = "hashbrown"
-version = "0.14.5"
+version = "0.15.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3"
 dependencies = [
- "ahash",
- "allocator-api2",
+ "equivalent",
+ "foldhash",
  "serde",
 ]
 
 [[package]]
-name = "hassle-rs"
-version = "0.11.0"
+name = "heapless"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890"
+checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad"
 dependencies = [
- "bitflags 2.6.0",
- "com",
- "libc",
- "libloading 0.8.5",
- "thiserror",
- "widestring",
- "winapi",
+ "hash32",
+ "portable-atomic",
+ "stable_deref_trait",
+]
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "hermit-abi"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
+
+[[package]]
+name = "hexasphere"
+version = "15.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9c9e718d32b6e6b2b32354e1b0367025efdd0b11d6a740b905ddf5db1074679"
+dependencies = [
+ "constgebra",
+ "glam 0.29.3",
+ "tinyvec",
+]
+
+[[package]]
+name = "hexf-parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
+
+[[package]]
+name = "home"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "icu_collections"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47"
+dependencies = [
+ "displaydoc",
+ "potential_utf",
+ "yoke",
+ "zerofrom",
+ "zerovec",
 ]
 
 [[package]]
-name = "heck"
-version = "0.4.1"
+name = "icu_locale_core"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
 
 [[package]]
-name = "heck"
-version = "0.5.0"
+name = "icu_normalizer"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "zerovec",
+]
 
 [[package]]
-name = "hermit-abi"
-version = "0.4.0"
+name = "icu_normalizer_data"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
+checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"
 
 [[package]]
-name = "hexasphere"
-version = "12.0.0"
+name = "icu_properties"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edd6b038160f086b0a7496edae34169ae22f328793cbe2b627a5a3d8373748ec"
+checksum = "2549ca8c7241c82f59c80ba2a6f415d931c5b58d24fb8412caa1a1f02c49139a"
 dependencies = [
- "constgebra",
- "glam 0.27.0",
+ "displaydoc",
+ "icu_collections",
+ "icu_locale_core",
+ "icu_properties_data",
+ "icu_provider",
+ "potential_utf",
+ "zerotrie",
+ "zerovec",
 ]
 
 [[package]]
-name = "hexf-parse"
-version = "0.2.1"
+name = "icu_properties_data"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
+checksum = "8197e866e47b68f8f7d95249e172903bec06004b18b2937f1095d40a0c57de04"
 
 [[package]]
-name = "home"
-version = "0.5.9"
+name = "icu_provider"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
+checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af"
 dependencies = [
- "windows-sys 0.52.0",
+ "displaydoc",
+ "icu_locale_core",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerotrie",
+ "zerovec",
 ]
 
 [[package]]
@@ -3039,37 +3183,30 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "idna"
-version = "0.5.0"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
 ]
 
 [[package]]
-name = "image"
-version = "0.24.9"
+name = "idna_adapter"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d"
+checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
 dependencies = [
- "bytemuck",
- "byteorder",
- "color_quant",
- "exr",
- "gif",
- "jpeg-decoder",
- "num-traits",
- "png",
- "qoi",
- "tiff",
+ "icu_normalizer",
+ "icu_properties",
 ]
 
 [[package]]
 name = "image"
-version = "0.25.2"
+version = "0.25.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10"
+checksum = "db35664ce6b9810857a38a906215e75a9c879f0696556a39f59c62829710251a"
 dependencies = [
  "bytemuck",
  "byteorder-lite",
@@ -3090,9 +3227,9 @@ dependencies = [
 
 [[package]]
 name = "image-webp"
-version = "0.1.3"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904"
+checksum = "b77d01e822461baa8409e156015a1d91735549f0f2c17691bd2d996bef238f7f"
 dependencies = [
  "byteorder-lite",
  "quick-error",
@@ -3106,27 +3243,28 @@ checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284"
 
 [[package]]
 name = "imgref"
-version = "1.10.1"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126"
+checksum = "d0263a3d970d5c054ed9312c0057b4f3bde9c0b33836d3637361d4a9e6e7a408"
 
 [[package]]
 name = "immutable-chunkmap"
-version = "2.0.5"
+version = "2.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4419f022e55cc63d5bbd6b44b71e1d226b9c9480a47824c706e9d54e5c40c5eb"
+checksum = "12f97096f508d54f8f8ab8957862eee2ccd628847b6217af1a335e1c44dee578"
 dependencies = [
  "arrayvec",
 ]
 
 [[package]]
 name = "indexmap"
-version = "2.5.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
+checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
 dependencies = [
  "equivalent",
  "hashbrown",
+ "serde",
 ]
 
 [[package]]
@@ -3137,11 +3275,11 @@ checksum = "a257582fdcde896fd96463bf2d40eefea0580021c0712a0e2b028b60b47a837a"
 
 [[package]]
 name = "inotify"
-version = "0.10.2"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdd168d97690d0b8c412d6b6c10360277f4d7ee495c5d0d5d5fe0854923255cc"
+checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.9.0",
  "inotify-sys",
  "libc",
 ]
@@ -3163,7 +3301,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
@@ -3200,11 +3338,20 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
-version = "1.0.11"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "jni"
@@ -3217,7 +3364,7 @@ dependencies = [
  "combine",
  "jni-sys",
  "log",
- "thiserror",
+ "thiserror 1.0.69",
  "walkdir",
  "windows-sys 0.45.0",
 ]
@@ -3230,10 +3377,11 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
 
 [[package]]
 name = "jobserver"
-version = "0.1.32"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
+checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a"
 dependencies = [
+ "getrandom 0.3.3",
  "libc",
 ]
 
@@ -3242,16 +3390,14 @@ name = "jpeg-decoder"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
-dependencies = [
- "rayon",
-]
 
 [[package]]
 name = "js-sys"
-version = "0.3.70"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
 dependencies = [
+ "once_cell",
  "wasm-bindgen",
 ]
 
@@ -3262,7 +3408,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76"
 dependencies = [
  "libc",
- "libloading 0.8.5",
+ "libloading",
  "pkg-config",
 ]
 
@@ -3315,56 +3461,45 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.159"
+version = "0.2.172"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
+checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
 
 [[package]]
 name = "libfuzzer-sys"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7"
+checksum = "cf78f52d400cf2d84a3a973a78a592b4adc535739e0a5597a0da6f0c357adc75"
 dependencies = [
  "arbitrary",
  "cc",
- "once_cell",
-]
-
-[[package]]
-name = "libloading"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
-dependencies = [
- "cfg-if",
- "winapi",
 ]
 
 [[package]]
 name = "libloading"
-version = "0.8.5"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
+checksum = "6a793df0d7afeac54f95b471d3af7f0d4fb975699f972341a4b76988d49cdf0c"
 dependencies = [
  "cfg-if",
- "windows-targets 0.52.6",
+ "windows-targets 0.53.0",
 ]
 
 [[package]]
 name = "libm"
-version = "0.2.8"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
+checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
 
 [[package]]
 name = "libredox"
-version = "0.0.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.0",
  "libc",
- "redox_syscall 0.4.1",
+ "redox_syscall 0.5.12",
 ]
 
 [[package]]
@@ -3379,9 +3514,15 @@ dependencies = [
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.14"
+version = "0.4.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
+
+[[package]]
+name = "litemap"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
 
 [[package]]
 name = "litrs"
@@ -3401,9 +3542,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.22"
+version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 
 [[package]]
 name = "loop9"
@@ -3448,6 +3589,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519"
 dependencies = [
  "cfg-if",
+ "rayon",
 ]
 
 [[package]]
@@ -3476,11 +3618,11 @@ dependencies = [
 
 [[package]]
 name = "metal"
-version = "0.28.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5637e166ea14be6063a3f8ba5ccb9a4159df7d8f6d61c02fc3d480b1f90dcfcb"
+checksum = "f569fb946490b5743ad69813cb19629130ce9374034abe31614a36402d18f99e"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.0",
  "block",
  "core-graphics-types",
  "foreign-types",
@@ -3497,11 +3639,13 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
 [[package]]
 name = "mime_guess2"
-version = "2.0.5"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25a3333bb1609500601edc766a39b4c1772874a4ce26022f4d866854dc020c41"
+checksum = "1706dc14a2e140dec0a7a07109d9a3d5890b81e85bd6c60b906b249a77adf0ca"
 dependencies = [
  "mime",
+ "phf",
+ "phf_shared",
  "unicase",
 ]
 
@@ -3513,18 +3657,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
-dependencies = [
- "adler",
-]
-
-[[package]]
-name = "miniz_oxide"
-version = "0.8.0"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
+checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a"
 dependencies = [
  "adler2",
  "simd-adler32",
@@ -3538,42 +3673,43 @@ checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff"
 
 [[package]]
 name = "naga"
-version = "0.20.0"
+version = "24.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e536ae46fcab0876853bd4a632ede5df4b1c2527a58f6c5a4150fe86be858231"
+checksum = "e380993072e52eef724eddfcde0ed013b0c023c3f0417336ed041aa9f076994e"
 dependencies = [
  "arrayvec",
- "bit-set",
- "bitflags 2.6.0",
+ "bit-set 0.8.0",
+ "bitflags 2.9.0",
+ "cfg_aliases",
  "codespan-reporting",
  "hexf-parse",
  "indexmap",
  "log",
- "num-traits",
  "pp-rs",
  "rustc-hash",
  "spirv",
+ "strum",
  "termcolor",
- "thiserror",
+ "thiserror 2.0.12",
  "unicode-xid",
 ]
 
 [[package]]
 name = "naga_oil"
-version = "0.14.0"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "275d9720a7338eedac966141089232514c84d76a246a58ef501af88c5edf402f"
+checksum = "0ca507a365f886f95f74420361b75442a3709c747a8a6e8b6c45b8667f45a82c"
 dependencies = [
- "bit-set",
+ "bit-set 0.5.3",
  "codespan-reporting",
  "data-encoding",
  "indexmap",
  "naga",
  "once_cell",
  "regex",
- "regex-syntax 0.8.4",
+ "regex-syntax 0.8.5",
  "rustc-hash",
- "thiserror",
+ "thiserror 1.0.69",
  "tracing",
  "unicode-ident",
 ]
@@ -3584,12 +3720,12 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.0",
  "jni-sys",
  "log",
  "ndk-sys 0.5.0+25.2.9519653",
  "num_enum",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -3598,13 +3734,13 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.0",
  "jni-sys",
  "log",
  "ndk-sys 0.6.0+11769913",
  "num_enum",
  "raw-window-handle",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -3656,9 +3792,9 @@ version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.0",
  "cfg-if",
- "cfg_aliases 0.2.1",
+ "cfg_aliases",
  "libc",
 ]
 
@@ -3727,7 +3863,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
@@ -3778,7 +3914,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
@@ -3806,33 +3942,54 @@ dependencies = [
  "objc2-encode",
 ]
 
+[[package]]
+name = "objc2"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88c6597e14493ab2e44ce58f2fdecf095a51f12ca57bec060a11c57332520551"
+dependencies = [
+ "objc2-encode",
+]
+
 [[package]]
 name = "objc2-app-kit"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.0",
  "block2",
  "libc",
- "objc2",
+ "objc2 0.5.2",
  "objc2-core-data",
  "objc2-core-image",
- "objc2-foundation",
+ "objc2-foundation 0.2.2",
  "objc2-quartz-core",
 ]
 
+[[package]]
+name = "objc2-app-kit"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6f29f568bec459b0ddff777cec4fe3fd8666d82d5a40ebd0ff7e66134f89bcc"
+dependencies = [
+ "bitflags 2.9.0",
+ "objc2 0.6.1",
+ "objc2-core-graphics",
+ "objc2-foundation 0.3.1",
+]
+
 [[package]]
 name = "objc2-cloud-kit"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.0",
  "block2",
- "objc2",
+ "objc2 0.5.2",
  "objc2-core-location",
- "objc2-foundation",
+ "objc2-foundation 0.2.2",
 ]
 
 [[package]]
@@ -3842,8 +3999,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889"
 dependencies = [
  "block2",
- "objc2",
- "objc2-foundation",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
 ]
 
 [[package]]
@@ -3852,10 +4009,34 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.0",
  "block2",
- "objc2",
- "objc2-foundation",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
+]
+
+[[package]]
+name = "objc2-core-foundation"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c10c2894a6fed806ade6027bcd50662746363a9589d3ec9d9bef30a4e4bc166"
+dependencies = [
+ "bitflags 2.9.0",
+ "dispatch2",
+ "objc2 0.6.1",
+]
+
+[[package]]
+name = "objc2-core-graphics"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "989c6c68c13021b5c2d6b71456ebb0f9dc78d752e86a98da7c716f4f9470f5a4"
+dependencies = [
+ "bitflags 2.9.0",
+ "dispatch2",
+ "objc2 0.6.1",
+ "objc2-core-foundation",
+ "objc2-io-surface",
 ]
 
 [[package]]
@@ -3865,8 +4046,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80"
 dependencies = [
  "block2",
- "objc2",
- "objc2-foundation",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
  "objc2-metal",
 ]
 
@@ -3877,16 +4058,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781"
 dependencies = [
  "block2",
- "objc2",
+ "objc2 0.5.2",
  "objc2-contacts",
- "objc2-foundation",
+ "objc2-foundation 0.2.2",
 ]
 
 [[package]]
 name = "objc2-encode"
-version = "4.0.3"
+version = "4.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8"
+checksum = "ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33"
 
 [[package]]
 name = "objc2-foundation"
@@ -3894,11 +4075,33 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.0",
  "block2",
  "dispatch",
  "libc",
- "objc2",
+ "objc2 0.5.2",
+]
+
+[[package]]
+name = "objc2-foundation"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "900831247d2fe1a09a683278e5384cfb8c80c79fe6b166f9d14bfdde0ea1b03c"
+dependencies = [
+ "bitflags 2.9.0",
+ "objc2 0.6.1",
+ "objc2-core-foundation",
+]
+
+[[package]]
+name = "objc2-io-surface"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7282e9ac92529fa3457ce90ebb15f4ecbc383e8338060960760fa2cf75420c3c"
+dependencies = [
+ "bitflags 2.9.0",
+ "objc2 0.6.1",
+ "objc2-core-foundation",
 ]
 
 [[package]]
@@ -3908,9 +4111,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398"
 dependencies = [
  "block2",
- "objc2",
- "objc2-app-kit",
- "objc2-foundation",
+ "objc2 0.5.2",
+ "objc2-app-kit 0.2.2",
+ "objc2-foundation 0.2.2",
 ]
 
 [[package]]
@@ -3919,10 +4122,10 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.0",
  "block2",
- "objc2",
- "objc2-foundation",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
 ]
 
 [[package]]
@@ -3931,10 +4134,10 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.0",
  "block2",
- "objc2",
- "objc2-foundation",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
  "objc2-metal",
 ]
 
@@ -3944,8 +4147,8 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc"
 dependencies = [
- "objc2",
- "objc2-foundation",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
 ]
 
 [[package]]
@@ -3954,14 +4157,14 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.0",
  "block2",
- "objc2",
+ "objc2 0.5.2",
  "objc2-cloud-kit",
  "objc2-core-data",
  "objc2-core-image",
  "objc2-core-location",
- "objc2-foundation",
+ "objc2-foundation 0.2.2",
  "objc2-link-presentation",
  "objc2-quartz-core",
  "objc2-symbols",
@@ -3976,8 +4179,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe"
 dependencies = [
  "block2",
- "objc2",
- "objc2-foundation",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
 ]
 
 [[package]]
@@ -3986,18 +4189,18 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.0",
  "block2",
- "objc2",
+ "objc2 0.5.2",
  "objc2-core-location",
- "objc2-foundation",
+ "objc2-foundation 0.2.2",
 ]
 
 [[package]]
 name = "object"
-version = "0.36.4"
+version = "0.36.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
 dependencies = [
  "memchr",
 ]
@@ -4025,6 +4228,16 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "offset-allocator"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e234d535da3521eb95106f40f0b73483d80bfb3aacf27c40d7e2b72f1a3e00a2"
+dependencies = [
+ "log",
+ "nonmax",
+]
+
 [[package]]
 name = "ogg"
 version = "0.8.0"
@@ -4036,19 +4249,28 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
 name = "orbclient"
-version = "0.3.47"
+version = "0.3.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166"
+checksum = "ba0b26cec2e24f08ed8bb31519a9333140a6599b867dac464bb150bdb796fd43"
 dependencies = [
  "libredox",
 ]
 
+[[package]]
+name = "ordered-float"
+version = "4.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7bb71e1b3fa6ca1c61f383464aaf2bb0e2f8e772a1f01d486832464de363b951"
+dependencies = [
+ "num-traits",
+]
+
 [[package]]
 name = "overload"
 version = "0.1.1"
@@ -4057,11 +4279,11 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
 [[package]]
 name = "owned_ttf_parser"
-version = "0.24.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "490d3a563d3122bf7c911a59b0add9389e5ec0f5f0c3ac6b91ff235a0e6a7f90"
+checksum = "22ec719bbf3b2a81c109a4e20b1f129b5566b7dce654bc3872f6a05abf82b2c4"
 dependencies = [
- "ttf-parser",
+ "ttf-parser 0.25.1",
 ]
 
 [[package]]
@@ -4088,7 +4310,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.5.6",
+ "redox_syscall 0.5.12",
  "smallvec",
  "windows-targets 0.52.6",
 ]
@@ -4113,16 +4335,60 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "petgraph"
-version = "0.6.5"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
+checksum = "3672b37090dbd86368a4145bc067582552b29c27377cad4e0a306c97f9bd7772"
 dependencies = [
- "fixedbitset 0.4.2",
+ "fixedbitset",
  "indexmap",
  "serde",
  "serde_derive",
 ]
 
+[[package]]
+name = "phf"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078"
+dependencies = [
+ "phf_macros",
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
+dependencies = [
+ "phf_shared",
+ "rand 0.8.5",
+]
+
+[[package]]
+name = "phf_macros"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "unicase",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
+dependencies = [
+ "siphasher 1.0.1",
+ "unicase",
+]
+
 [[package]]
 name = "pico-args"
 version = "0.5.0"
@@ -4131,29 +4397,29 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
 
 [[package]]
 name = "pin-project"
-version = "1.1.5"
+version = "1.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
+checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.5"
+version = "1.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
+checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
 
 [[package]]
 name = "piper"
@@ -4168,28 +4434,28 @@ dependencies = [
 
 [[package]]
 name = "pkg-config"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
+checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
 
 [[package]]
 name = "png"
-version = "0.17.14"
+version = "0.17.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52f9d46a34a05a6a57566bc2bfae066ef07585a6e3fa30fbbdff5936380623f0"
+checksum = "82151a2fc869e011c153adc57cf2789ccb8d9906ce52c0b39a6b5697749d7526"
 dependencies = [
  "bitflags 1.3.2",
  "crc32fast",
  "fdeflate",
  "flate2",
- "miniz_oxide 0.8.0",
+ "miniz_oxide",
 ]
 
 [[package]]
 name = "polling"
-version = "3.7.3"
+version = "3.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511"
+checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f"
 dependencies = [
  "cfg-if",
  "concurrent-queue",
@@ -4200,6 +4466,30 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
+[[package]]
+name = "portable-atomic"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
+
+[[package]]
+name = "portable-atomic-util"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
+dependencies = [
+ "portable-atomic",
+]
+
+[[package]]
+name = "potential_utf"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585"
+dependencies = [
+ "zerovec",
+]
+
 [[package]]
 name = "pp-rs"
 version = "0.2.1"
@@ -4211,9 +4501,9 @@ dependencies = [
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.20"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
 dependencies = [
  "zerocopy",
 ]
@@ -4231,64 +4521,63 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0f73cdaf19b52e6143685c3606206e114a4dfa969d6b14ec3894c88eb38bd4b"
 
 [[package]]
-name = "proc-macro-crate"
-version = "3.2.0"
+name = "prettyplease"
+version = "0.2.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
+checksum = "664ec5419c51e34154eec046ebcba56312d5a2fc3b09a06da188e1ad21afadf6"
 dependencies = [
- "toml_edit",
+ "proc-macro2",
+ "syn",
 ]
 
 [[package]]
-name = "proc-macro-error"
-version = "1.0.4"
+name = "proc-macro-crate"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35"
 dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "version_check",
+ "toml_edit",
 ]
 
 [[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
+name = "proc-macro2"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
 dependencies = [
- "proc-macro2",
- "quote",
- "version_check",
+ "unicode-ident",
 ]
 
 [[package]]
-name = "proc-macro2"
-version = "1.0.86"
+name = "proc-macro2-diagnostics"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
 dependencies = [
- "unicode-ident",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "version_check",
+ "yansi",
 ]
 
 [[package]]
 name = "profiling"
-version = "1.0.15"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58"
+checksum = "afbdc74edc00b6f6a218ca6a5364d6226a259d4b8ea1af4a0ea063f27e179f4d"
 dependencies = [
  "profiling-procmacros",
 ]
 
 [[package]]
 name = "profiling-procmacros"
-version = "1.0.15"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd"
+checksum = "a65f2e60fbf1063868558d69c6beacf412dc755f9fc020f514b7955fc914fe30"
 dependencies = [
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
@@ -4308,22 +4597,28 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
 
 [[package]]
 name = "quick-xml"
-version = "0.36.2"
+version = "0.37.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe"
+checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.37"
+version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
 dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "r-efi"
+version = "5.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
+
 [[package]]
 name = "radsort"
 version = "0.1.1"
@@ -4337,8 +4632,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
  "libc",
- "rand_chacha",
- "rand_core",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
+dependencies = [
+ "rand_chacha 0.9.0",
+ "rand_core 0.9.3",
 ]
 
 [[package]]
@@ -4348,7 +4653,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
 dependencies = [
  "ppv-lite86",
- "rand_core",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.9.3",
 ]
 
 [[package]]
@@ -4357,14 +4672,39 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.16",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
+dependencies = [
+ "getrandom 0.3.3",
+]
+
+[[package]]
+name = "rand_distr"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31"
+dependencies = [
+ "num-traits",
+ "rand 0.8.5",
 ]
 
 [[package]]
 name = "range-alloc"
-version = "0.1.3"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3d6831663a5098ea164f89cff59c6284e95f4e3c76ce9848d4529f5ccca9bde"
+
+[[package]]
+name = "rangemap"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab"
+checksum = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684"
 
 [[package]]
 name = "rav1e"
@@ -4392,26 +4732,27 @@ dependencies = [
  "once_cell",
  "paste",
  "profiling",
- "rand",
- "rand_chacha",
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
  "simd_helpers",
  "system-deps",
- "thiserror",
+ "thiserror 1.0.69",
  "v_frame",
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "ravif"
-version = "0.11.10"
+version = "0.11.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f0bfd976333248de2078d350bfdf182ff96e168a24d23d2436cef320dd4bdd"
+checksum = "d6a5f31fcf7500f9401fea858ea4ab5525c99f2322cfcee732c0e6c74208c0c6"
 dependencies = [
  "avif-serialize",
  "imgref",
  "loop9",
  "quick-error",
  "rav1e",
+ "rayon",
  "rgb",
 ]
 
@@ -4447,6 +4788,16 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f"
 
+[[package]]
+name = "read-fonts"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ce8e2ca6b24313587a03ca61bb74c384e2a815bd90cf2866cfc9f5fb7a11fa0"
+dependencies = [
+ "bytemuck",
+ "font-types",
+]
+
 [[package]]
 name = "rectangle-pack"
 version = "0.4.2"
@@ -4464,23 +4815,23 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.6"
+version = "0.5.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "355ae415ccd3a04315d3f8246e86d67689ea74d88d915576e1589a351062a13b"
+checksum = "928fca9cf2aa042393a8325b9ead81d2f0df4cb12e1e24cef072922ccd99c5af"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.0",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.6"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.7",
- "regex-syntax 0.8.4",
+ "regex-automata 0.4.9",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
@@ -4494,13 +4845,13 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.4",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
@@ -4511,9 +4862,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "renderdoc-sys"
@@ -4546,28 +4897,26 @@ dependencies = [
 
 [[package]]
 name = "ring"
-version = "0.17.8"
+version = "0.17.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
+checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
 dependencies = [
  "cc",
  "cfg-if",
- "getrandom",
+ "getrandom 0.2.16",
  "libc",
- "spin",
  "untrusted",
  "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "rodio"
-version = "0.18.1"
+version = "0.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1fceb9d127d515af1586d8d0cc601e1245bdb0af38e75c865a156290184f5b3"
+checksum = "e7ceb6607dd738c99bc8cb28eff249b7cd5c8ec88b9db96c0608c1480d140fb1"
 dependencies = [
  "cpal",
  "lewton",
- "thiserror",
 ]
 
 [[package]]
@@ -4577,9 +4926,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94"
 dependencies = [
  "base64 0.21.7",
- "bitflags 2.6.0",
+ "bitflags 2.9.0",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "ron"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "beceb6f7bf81c73e73aeef6dd1356d9a1b2b4909e1f0fc3e59b034f9572d7b7f"
+dependencies = [
+ "base64 0.22.1",
+ "bitflags 2.9.0",
  "serde",
  "serde_derive",
+ "unicode-ident",
 ]
 
 [[package]]
@@ -4588,6 +4950,12 @@ version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f"
 
+[[package]]
+name = "roxmltree"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97"
+
 [[package]]
 name = "rustc-demangle"
 version = "0.1.24"
@@ -4600,33 +4968,24 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
-[[package]]
-name = "rustc_version"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
-dependencies = [
- "semver",
-]
-
 [[package]]
 name = "rustix"
-version = "0.38.37"
+version = "0.38.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
+checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.0",
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.23.13"
+version = "0.23.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8"
+checksum = "730944ca083c1c233a75c09f199e973ca499344a2b7ba9e755c457e86fb4a321"
 dependencies = [
  "log",
  "once_cell",
@@ -4639,35 +4998,61 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.9.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55"
+checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79"
+dependencies = [
+ "zeroize",
+]
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.8"
+version = "0.103.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
+checksum = "e4a72fe2bcf7a6ac6fd7d0b9e5cb68aeb7d4c0a0271730218b3e92d43b4eb435"
 dependencies = [
  "ring",
  "rustls-pki-types",
  "untrusted",
 ]
 
+[[package]]
+name = "rustversion"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2"
+
+[[package]]
+name = "rustybuzz"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfb9cf8877777222e4a3bc7eb247e398b56baba500c38c1c46842431adc8b55c"
+dependencies = [
+ "bitflags 2.9.0",
+ "bytemuck",
+ "libm",
+ "smallvec",
+ "ttf-parser 0.21.1",
+ "unicode-bidi-mirroring",
+ "unicode-ccc",
+ "unicode-properties",
+ "unicode-script",
+]
+
 [[package]]
 name = "ruzstd"
-version = "0.7.2"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99c3938e133aac070997ddc684d4b393777d293ba170f2988c8fd5ea2ad4ce21"
+checksum = "3640bec8aad418d7d03c72ea2de10d5c646a598f9883c7babc160d91e3c1b26c"
 dependencies = [
  "twox-hash",
 ]
 
 [[package]]
 name = "ryu"
-version = "1.0.18"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 
 [[package]]
 name = "same-file"
@@ -4704,10 +5089,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "semver"
-version = "1.0.23"
+name = "self_cell"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+checksum = "0f7d95a54511e0c7be3f51e8867aa8cf35148d7b9445d44de2f943e2b206e749"
 
 [[package]]
 name = "send_wrapper"
@@ -4717,29 +5102,29 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
 
 [[package]]
 name = "serde"
-version = "1.0.210"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.210"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
+checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.128"
+version = "1.0.140"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
+checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
 dependencies = [
  "itoa",
  "memchr",
@@ -4788,9 +5173,9 @@ dependencies = [
 
 [[package]]
 name = "simplecss"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a11be7c62927d9427e9f40f3444d5499d868648e2edbc4e2116de69e7ec0e89d"
+checksum = "7a9c6883ca9c3c7c90e888de77b7a5c849c779d25d74a1269b0218b14e8b136c"
 dependencies = [
  "log",
 ]
@@ -4801,6 +5186,22 @@ version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
 
+[[package]]
+name = "siphasher"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
+
+[[package]]
+name = "skrifa"
+version = "0.31.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbe6666ab11018ab91ff7b03f1a3b9fdbecfb610848436fefa5ce50343d3d913"
+dependencies = [
+ "bytemuck",
+ "read-fonts",
+]
+
 [[package]]
 name = "slab"
 version = "0.4.9"
@@ -4821,9 +5222,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.2"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9"
 
 [[package]]
 name = "smithay-client-toolkit"
@@ -4831,7 +5232,7 @@ version = "0.19.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.0",
  "calloop",
  "calloop-wayland-source",
  "cursor-icon",
@@ -4839,7 +5240,7 @@ dependencies = [
  "log",
  "memmap2",
  "rustix",
- "thiserror",
+ "thiserror 1.0.69",
  "wayland-backend",
  "wayland-client",
  "wayland-csd-frame",
@@ -4861,7 +5262,7 @@ dependencies = [
 
 [[package]]
 name = "space_editor"
-version = "0.6.0"
+version = "0.8.0"
 dependencies = [
  "backtrace-on-stack-overflow",
  "bevy",
@@ -4873,10 +5274,10 @@ dependencies = [
 
 [[package]]
 name = "space_editor_core"
-version = "0.6.0"
+version = "0.8.0"
 dependencies = [
  "bevy",
- "bevy_egui 0.29.0",
+ "bevy_egui",
  "bevy_mod_outline",
  "egui-toast",
  "egui_dock",
@@ -4889,11 +5290,11 @@ dependencies = [
 
 [[package]]
 name = "space_editor_tabs"
-version = "0.6.0"
+version = "0.8.0"
 dependencies = [
  "bevy",
- "bevy_egui 0.29.0",
- "convert_case 0.6.0",
+ "bevy_egui",
+ "convert_case",
  "egui_dock",
  "egui_extras",
  "workspace-hakari",
@@ -4901,16 +5302,15 @@ dependencies = [
 
 [[package]]
 name = "space_editor_ui"
-version = "0.6.0"
+version = "0.8.0"
 dependencies = [
  "anyhow",
  "bevy",
  "bevy-inspector-egui",
  "bevy_asset_loader",
  "bevy_debug_grid",
- "bevy_egui 0.29.0",
+ "bevy_egui",
  "bevy_mod_billboard",
- "bevy_mod_picking",
  "bevy_panorbit_camera",
  "egui_dock",
  "pretty-type-name",
@@ -4921,29 +5321,30 @@ dependencies = [
  "space_prefab",
  "space_shared",
  "space_undo",
+ "transform-gizmo-bevy",
  "transform-gizmo-egui",
  "workspace-hakari",
 ]
 
 [[package]]
 name = "space_persistence"
-version = "0.6.0"
+version = "0.8.0"
 dependencies = [
  "bevy",
- "ron",
+ "ron 0.10.1",
  "serde",
  "workspace-hakari",
 ]
 
 [[package]]
 name = "space_prefab"
-version = "0.6.0"
+version = "0.8.0"
 dependencies = [
  "bevy",
  "bevy-inspector-egui",
  "bevy-scene-hook",
- "rand",
- "ron",
+ "rand 0.9.1",
+ "ron 0.10.1",
  "serde",
  "space_shared",
  "space_undo",
@@ -4952,20 +5353,20 @@ dependencies = [
 
 [[package]]
 name = "space_shared"
-version = "0.6.0"
+version = "0.8.0"
 dependencies = [
  "anyhow",
  "bevy",
  "bevy-inspector-egui",
  "egui-toast",
  "egui_file",
- "image 0.25.2",
+ "image",
  "workspace-hakari",
 ]
 
 [[package]]
 name = "space_undo"
-version = "0.6.0"
+version = "0.8.0"
 dependencies = [
  "bevy",
  "pretty-type-name",
@@ -4978,7 +5379,7 @@ version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
 dependencies = [
- "lock_api",
+ "portable-atomic",
 ]
 
 [[package]]
@@ -4987,9 +5388,21 @@ version = "0.3.0+sdk-1.3.268.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.0",
 ]
 
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
+[[package]]
+name = "stackfuture"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eae92052b72ef70dafa16eddbabffc77e5ca3574be2f7bc1127b36f0a7ad7f2"
+
 [[package]]
 name = "static_assertions"
 version = "1.1.0"
@@ -5005,6 +5418,28 @@ dependencies = [
  "float-cmp",
 ]
 
+[[package]]
+name = "strum"
+version = "0.26.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
+dependencies = [
+ "strum_macros",
+]
+
+[[package]]
+name = "strum_macros"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn",
+]
+
 [[package]]
 name = "subtle"
 version = "2.6.1"
@@ -5013,9 +5448,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "svg_fmt"
-version = "0.4.3"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20e16a0f46cf5fd675563ef54f26e83e20f2366bcf027bcb3cc3ed2b98aaf2ca"
+checksum = "0193cc4331cfd2f3d2011ef287590868599a2f33c3e69bc22c1a3d3acf9e02fb"
 
 [[package]]
 name = "svgtypes"
@@ -5024,14 +5459,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e44e288cd960318917cbd540340968b90becc8bc81f171345d706e7a89d9d70"
 dependencies = [
  "kurbo",
- "siphasher",
+ "siphasher 0.3.11",
+]
+
+[[package]]
+name = "swash"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5dce3f0af95643c855cdc449fbaa17d8c2cd08e0b00a49a6babcbe6e71667f3d"
+dependencies = [
+ "skrifa",
+ "yazi",
+ "zeno",
 ]
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5039,28 +5485,36 @@ dependencies = [
 ]
 
 [[package]]
-name = "syn"
-version = "2.0.79"
+name = "synstructure"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
  "proc-macro2",
  "quote",
- "unicode-ident",
+ "syn",
+]
+
+[[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.30.13"
+version = "0.34.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3"
+checksum = "a4b93974b3d3aeaa036504b8eefd4c039dced109171c1ae973f1dc63b2c7e4b2"
 dependencies = [
- "cfg-if",
- "core-foundation-sys",
  "libc",
+ "memchr",
  "ntapi",
- "once_cell",
- "windows 0.52.0",
+ "objc2-core-foundation",
+ "windows 0.54.0",
 ]
 
 [[package]]
@@ -5070,7 +5524,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349"
 dependencies = [
  "cfg-expr",
- "heck 0.5.0",
+ "heck",
  "pkg-config",
  "toml",
  "version-compare",
@@ -5078,13 +5532,12 @@ dependencies = [
 
 [[package]]
 name = "taffy"
-version = "0.5.2"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cb893bff0f80ae17d3a57e030622a967b8dbc90e38284d9b4b1442e23873c94"
+checksum = "ab4f4d046dd956a47a7e1a2947083d7ac3e6aa3cfaaead36173ceaa5ab11878c"
 dependencies = [
  "arrayvec",
  "grid",
- "num-traits",
  "serde",
  "slotmap",
 ]
@@ -5106,22 +5559,42 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.64"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+dependencies = [
+ "thiserror-impl 1.0.69",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
+checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
 dependencies = [
- "thiserror-impl",
+ "thiserror-impl 2.0.12",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.64"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "2.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
 [[package]]
@@ -5171,11 +5644,21 @@ dependencies = [
  "strict-num",
 ]
 
+[[package]]
+name = "tinystr"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
 [[package]]
 name = "tinyvec"
-version = "1.8.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
+checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -5188,9 +5671,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "toml"
-version = "0.8.19"
+version = "0.8.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
+checksum = "05ae329d1f08c4d17a59bed7ff5b5a769d062e64a62d34a3261b219e62cd5aae"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -5200,18 +5683,18 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.8"
+version = "0.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
+checksum = "3da5db5a963e24bc68be8b17b6fa82814bb22ee8660f192bb182771d498f09a3"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.22.22"
+version = "0.22.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
+checksum = "310068873db2c5b3e7659d2cc35d21855dbafa50d1ce336397c666e3cb08137e"
 dependencies = [
  "indexmap",
  "serde",
@@ -5222,9 +5705,9 @@ dependencies = [
 
 [[package]]
 name = "tracing"
-version = "0.1.40"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
  "pin-project-lite",
  "tracing-attributes",
@@ -5233,20 +5716,20 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.27"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.32"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
 dependencies = [
  "once_cell",
  "valuable",
@@ -5263,11 +5746,26 @@ dependencies = [
  "tracing-core",
 ]
 
+[[package]]
+name = "tracing-oslog"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "528bdd1f0e27b5dd9a4ededf154e824b0532731e4af73bb531de46276e0aab1e"
+dependencies = [
+ "bindgen",
+ "cc",
+ "cfg-if",
+ "once_cell",
+ "parking_lot",
+ "tracing-core",
+ "tracing-subscriber",
+]
+
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
+checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
 dependencies = [
  "matchers",
  "nu-ansi-term",
@@ -5294,81 +5792,132 @@ dependencies = [
 
 [[package]]
 name = "transform-gizmo"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b43a029251c55e00d44930e24b78f5b471b3e75fa9c88c30ecb816db08646b93"
+version = "0.5.0"
+source = "git+https://github.com/jakobhellermann/transform-gizmo.git?branch=bevy-0.16#a1fbba9c06f8817f4cf041104dadf55c801c9fcc"
 dependencies = [
  "ahash",
- "ecolor 0.28.1",
- "emath 0.28.1",
+ "ecolor",
+ "emath",
  "enum_dispatch",
  "enumset",
- "epaint 0.28.1",
- "glam 0.28.0",
+ "epaint",
+ "glam 0.30.3",
  "mint",
 ]
 
+[[package]]
+name = "transform-gizmo-bevy"
+version = "0.5.0"
+source = "git+https://github.com/jakobhellermann/transform-gizmo.git?branch=bevy-0.16#a1fbba9c06f8817f4cf041104dadf55c801c9fcc"
+dependencies = [
+ "bevy_app",
+ "bevy_asset",
+ "bevy_core_pipeline",
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_image",
+ "bevy_input",
+ "bevy_log",
+ "bevy_math",
+ "bevy_pbr",
+ "bevy_picking",
+ "bevy_platform",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_transform",
+ "bevy_utils",
+ "bevy_window",
+ "bytemuck",
+ "transform-gizmo",
+ "uuid",
+]
+
 [[package]]
 name = "transform-gizmo-egui"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cfc506918b7eb43be700be7261d8878cc197bf572689c465efe60f5b3110ccc"
+version = "0.5.0"
+source = "git+https://github.com/jakobhellermann/transform-gizmo.git?branch=bevy-0.16#a1fbba9c06f8817f4cf041104dadf55c801c9fcc"
 dependencies = [
- "egui 0.28.1",
+ "egui",
  "transform-gizmo",
 ]
 
 [[package]]
 name = "ttf-parser"
-version = "0.24.1"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4"
+
+[[package]]
+name = "ttf-parser"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8"
+
+[[package]]
+name = "ttf-parser"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a"
+checksum = "d2df906b07856748fa3f6e0ad0cbaa047052d4a7dd609e231c4f72cee8c36f31"
 
 [[package]]
 name = "twox-hash"
-version = "1.6.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
-dependencies = [
- "cfg-if",
- "static_assertions",
-]
+checksum = "e7b17f197b3050ba473acf9181f7b1d3b66d1cf7356c6cc57886662276e65908"
 
 [[package]]
 name = "typeid"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e"
+checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c"
 
 [[package]]
 name = "unicase"
-version = "2.7.0"
+version = "2.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
-dependencies = [
- "version_check",
-]
+checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.15"
+version = "0.3.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5"
+
+[[package]]
+name = "unicode-bidi-mirroring"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23cb788ffebc92c5948d0e997106233eeb1d8b9512f93f41651f52b6c5f5af86"
+
+[[package]]
+name = "unicode-ccc"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+checksum = "1df77b101bcc4ea3d78dafc5ad7e4f58ceffe0b2b16bf446aeb50b6cb4157656"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.13"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
+checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
 
 [[package]]
-name = "unicode-normalization"
-version = "0.1.24"
+name = "unicode-linebreak"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
-dependencies = [
- "tinyvec",
-]
+checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
+
+[[package]]
+name = "unicode-properties"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0"
+
+[[package]]
+name = "unicode-script"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fb421b350c9aff471779e262955939f565ec18b86c15364e6bdf0d662ca7c1f"
 
 [[package]]
 name = "unicode-segmentation"
@@ -5396,9 +5945,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "ureq"
-version = "2.10.1"
+version = "2.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a"
+checksum = "02d1a66277ed75f640d608235660df48c8e3c19f3b4edb6a263315626cc3c01d"
 dependencies = [
  "base64 0.22.1",
  "flate2",
@@ -5407,14 +5956,14 @@ dependencies = [
  "rustls",
  "rustls-pki-types",
  "url",
- "webpki-roots",
+ "webpki-roots 0.26.11",
 ]
 
 [[package]]
 name = "url"
-version = "2.5.2"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -5446,9 +5995,9 @@ dependencies = [
  "imagesize",
  "kurbo",
  "log",
- "roxmltree",
+ "roxmltree 0.19.0",
  "simplecss",
- "siphasher",
+ "siphasher 0.3.11",
  "svgtypes",
  "usvg-tree",
 ]
@@ -5465,14 +6014,22 @@ dependencies = [
  "tiny-skia-path",
 ]
 
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
 [[package]]
 name = "uuid"
-version = "1.10.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
+checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9"
 dependencies = [
- "getrandom",
+ "getrandom 0.3.3",
+ "js-sys",
  "serde",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -5488,9 +6045,20 @@ dependencies = [
 
 [[package]]
 name = "valuable"
-version = "0.1.0"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
+
+[[package]]
+name = "variadics_please"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+checksum = "41b6d82be61465f97d42bd1d15bf20f3b0a3a0905018f38f9d6f6962055b0b5c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
 
 [[package]]
 name = "vec_map"
@@ -5526,49 +6094,59 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
+[[package]]
+name = "wasi"
+version = "0.14.2+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+dependencies = [
+ "wit-bindgen-rt",
+]
+
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
 dependencies = [
  "cfg-if",
  "once_cell",
+ "rustversion",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
 dependencies = [
  "bumpalo",
  "log",
- "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.43"
+version = "0.4.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
+checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
 dependencies = [
  "cfg-if",
  "js-sys",
+ "once_cell",
  "wasm-bindgen",
  "web-sys",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -5576,31 +6154,34 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+dependencies = [
+ "unicode-ident",
+]
 
 [[package]]
 name = "wayland-backend"
-version = "0.3.7"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6"
+checksum = "fe770181423e5fc79d3e2a7f4410b7799d5aab1de4372853de3c6aa13ca24121"
 dependencies = [
  "cc",
- "downcast-rs",
+ "downcast-rs 1.2.1",
  "rustix",
  "scoped-tls",
  "smallvec",
@@ -5609,11 +6190,11 @@ dependencies = [
 
 [[package]]
 name = "wayland-client"
-version = "0.31.6"
+version = "0.31.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3f45d1222915ef1fd2057220c1d9d9624b7654443ea35c3877f7a52bd0a5a2d"
+checksum = "978fa7c67b0847dbd6a9f350ca2569174974cd4082737054dbb7fbb79d7d9a61"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.0",
  "rustix",
  "wayland-backend",
  "wayland-scanner",
@@ -5625,16 +6206,16 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.0",
  "cursor-icon",
  "wayland-backend",
 ]
 
 [[package]]
 name = "wayland-cursor"
-version = "0.31.6"
+version = "0.31.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a94697e66e76c85923b0d28a0c251e8f0666f58fc47d316c0f4da6da75d37cb"
+checksum = "a65317158dec28d00416cb16705934070aef4f8393353d41126c54264ae0f182"
 dependencies = [
  "rustix",
  "wayland-client",
@@ -5643,11 +6224,11 @@ dependencies = [
 
 [[package]]
 name = "wayland-protocols"
-version = "0.32.4"
+version = "0.32.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b5755d77ae9040bb872a25026555ce4cb0ae75fd923e90d25fba07d81057de0"
+checksum = "779075454e1e9a521794fed15886323ea0feda3f8b0fc1390f5398141310422a"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.0",
  "wayland-backend",
  "wayland-client",
  "wayland-scanner",
@@ -5655,11 +6236,11 @@ dependencies = [
 
 [[package]]
 name = "wayland-protocols-plasma"
-version = "0.3.4"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a0a41a6875e585172495f7a96dfa42ca7e0213868f4f15c313f7c33221a7eff"
+checksum = "4fd38cdad69b56ace413c6bcc1fbf5acc5e2ef4af9d5f8f1f9570c0c83eae175"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.0",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
@@ -5668,11 +6249,11 @@ dependencies = [
 
 [[package]]
 name = "wayland-protocols-wlr"
-version = "0.3.4"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dad87b5fd1b1d3ca2f792df8f686a2a11e3fe1077b71096f7a175ab699f89109"
+checksum = "1cb6cdc73399c0e06504c437fe3cf886f25568dd5454473d565085b36d6a8bbf"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.0",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
@@ -5681,9 +6262,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-scanner"
-version = "0.31.5"
+version = "0.31.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597f2001b2e5fc1121e3d5b9791d3e78f05ba6bfa4641053846248e3a13661c3"
+checksum = "896fdafd5d28145fce7958917d69f2fd44469b1d4e861cb5961bcbeebc6d1484"
 dependencies = [
  "proc-macro2",
  "quick-xml",
@@ -5692,9 +6273,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-sys"
-version = "0.31.5"
+version = "0.31.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efa8ac0d8e8ed3e3b5c9fc92c7881406a268e11555abe36493efabe649a29e09"
+checksum = "dbcebb399c77d5aa9fa5db874806ee7b4eba4e73650948e8f93963f128896615"
 dependencies = [
  "dlib",
  "log",
@@ -5704,9 +6285,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.70"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
+checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -5724,27 +6305,35 @@ dependencies = [
 
 [[package]]
 name = "webbrowser"
-version = "1.0.2"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e5f07fb9bc8de2ddfe6b24a71a75430673fd679e568c48b52716cef1cfae923"
+checksum = "d5df295f8451142f1856b1bd86a606dfe9587d439bc036e319c827700dbd555e"
 dependencies = [
- "block2",
  "core-foundation 0.10.0",
  "home",
  "jni",
  "log",
  "ndk-context",
- "objc2",
- "objc2-foundation",
+ "objc2 0.6.1",
+ "objc2-foundation 0.3.1",
  "url",
  "web-sys",
 ]
 
 [[package]]
 name = "webpki-roots"
-version = "0.26.6"
+version = "0.26.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9"
+dependencies = [
+ "webpki-roots 1.0.0",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958"
+checksum = "2853738d1cc4f2da3a225c18ec6c3721abb31961096e9dbf5ab35fa88b19cfdb"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -5757,13 +6346,13 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
 
 [[package]]
 name = "wgpu"
-version = "0.20.1"
+version = "24.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90e37c7b9921b75dfd26dd973fdcbce36f13dfa6e2dc82aece584e0ed48c355c"
+checksum = "35904fb00ba2d2e0a4d002fcbbb6e1b89b574d272a50e5fc95f6e81cf281c245"
 dependencies = [
  "arrayvec",
- "cfg-if",
- "cfg_aliases 0.1.1",
+ "bitflags 2.9.0",
+ "cfg_aliases",
  "document-features",
  "js-sys",
  "log",
@@ -5783,15 +6372,14 @@ dependencies = [
 
 [[package]]
 name = "wgpu-core"
-version = "0.21.1"
+version = "24.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d50819ab545b867d8a454d1d756b90cd5f15da1f2943334ca314af10583c9d39"
+checksum = "671c25545d479b47d3f0a8e373aceb2060b67c6eb841b24ac8c32348151c7a0c"
 dependencies = [
  "arrayvec",
- "bit-vec",
- "bitflags 2.6.0",
- "cfg_aliases 0.1.1",
- "codespan-reporting",
+ "bit-vec 0.8.0",
+ "bitflags 2.9.0",
+ "cfg_aliases",
  "document-features",
  "indexmap",
  "log",
@@ -5802,43 +6390,42 @@ dependencies = [
  "raw-window-handle",
  "rustc-hash",
  "smallvec",
- "thiserror",
- "web-sys",
+ "thiserror 2.0.12",
  "wgpu-hal",
  "wgpu-types",
 ]
 
 [[package]]
 name = "wgpu-hal"
-version = "0.21.1"
+version = "24.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "172e490a87295564f3fcc0f165798d87386f6231b04d4548bca458cbbfd63222"
+checksum = "f112f464674ca69f3533248508ee30cb84c67cf06c25ff6800685f5e0294e259"
 dependencies = [
  "android_system_properties",
  "arrayvec",
  "ash",
- "bit-set",
- "bitflags 2.6.0",
+ "bit-set 0.8.0",
+ "bitflags 2.9.0",
  "block",
- "cfg_aliases 0.1.1",
+ "bytemuck",
+ "cfg_aliases",
  "core-graphics-types",
- "d3d12",
  "glow",
  "glutin_wgl_sys",
  "gpu-alloc",
  "gpu-allocator",
  "gpu-descriptor",
- "hassle-rs",
  "js-sys",
  "khronos-egl",
  "libc",
- "libloading 0.8.5",
+ "libloading",
  "log",
  "metal",
  "naga",
  "ndk-sys 0.5.0+25.2.9519653",
  "objc",
  "once_cell",
+ "ordered-float",
  "parking_lot",
  "profiling",
  "range-alloc",
@@ -5846,30 +6433,27 @@ dependencies = [
  "renderdoc-sys",
  "rustc-hash",
  "smallvec",
- "thiserror",
+ "thiserror 2.0.12",
  "wasm-bindgen",
  "web-sys",
  "wgpu-types",
- "winapi",
+ "windows 0.58.0",
+ "windows-core 0.58.0",
 ]
 
 [[package]]
 name = "wgpu-types"
-version = "0.20.0"
+version = "24.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1353d9a46bff7f955a680577f34c69122628cc2076e1d6f3a9be6ef00ae793ef"
+checksum = "50ac044c0e76c03a0378e7786ac505d010a873665e2d51383dcff8dd227dc69c"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.0",
  "js-sys",
+ "log",
+ "serde",
  "web-sys",
 ]
 
-[[package]]
-name = "widestring"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311"
-
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -5901,16 +6485,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
-[[package]]
-name = "windows"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
-dependencies = [
- "windows-core 0.52.0",
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "windows"
 version = "0.54.0"
@@ -5918,8 +6492,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49"
 dependencies = [
  "windows-core 0.54.0",
- "windows-implement 0.53.0",
- "windows-interface 0.53.0",
  "windows-targets 0.52.6",
 ]
 
@@ -5934,12 +6506,25 @@ dependencies = [
 ]
 
 [[package]]
-name = "windows-core"
-version = "0.52.0"
+name = "windows"
+version = "0.61.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+checksum = "c5ee8f3d025738cb02bad7868bbb5f8a6327501e870bf51f1b455b0a2454a419"
 dependencies = [
- "windows-targets 0.52.6",
+ "windows-collections",
+ "windows-core 0.61.0",
+ "windows-future",
+ "windows-link",
+ "windows-numerics",
+]
+
+[[package]]
+name = "windows-collections"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8"
+dependencies = [
+ "windows-core 0.61.0",
 ]
 
 [[package]]
@@ -5961,19 +6546,31 @@ dependencies = [
  "windows-implement 0.58.0",
  "windows-interface 0.58.0",
  "windows-result 0.2.0",
- "windows-strings",
+ "windows-strings 0.1.0",
  "windows-targets 0.52.6",
 ]
 
 [[package]]
-name = "windows-implement"
-version = "0.53.0"
+name = "windows-core"
+version = "0.61.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942ac266be9249c84ca862f0a164a39533dc2f6f33dc98ec89c8da99b82ea0bd"
+checksum = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.79",
+ "windows-implement 0.60.0",
+ "windows-interface 0.59.1",
+ "windows-link",
+ "windows-result 0.3.2",
+ "windows-strings 0.4.0",
+]
+
+[[package]]
+name = "windows-future"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a1d6bbefcb7b60acd19828e1bc965da6fcf18a7e39490c5f8be71e54a19ba32"
+dependencies = [
+ "windows-core 0.61.0",
+ "windows-link",
 ]
 
 [[package]]
@@ -5984,18 +6581,18 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
-name = "windows-interface"
-version = "0.53.0"
+name = "windows-implement"
+version = "0.60.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da33557140a288fae4e1d5f8873aaf9eb6613a9cf82c3e070223ff177f598b60"
+checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
@@ -6006,7 +6603,34 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.59.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "windows-link"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
+
+[[package]]
+name = "windows-numerics"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1"
+dependencies = [
+ "windows-core 0.61.0",
+ "windows-link",
 ]
 
 [[package]]
@@ -6027,6 +6651,15 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-result"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252"
+dependencies = [
+ "windows-link",
+]
+
 [[package]]
 name = "windows-strings"
 version = "0.1.0"
@@ -6038,21 +6671,21 @@ dependencies = [
 ]
 
 [[package]]
-name = "windows-sys"
-version = "0.45.0"
+name = "windows-strings"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+checksum = "7a2ba9642430ee452d5a7aa78d72907ebe8cfda358e8cb7918a2050581322f97"
 dependencies = [
- "windows-targets 0.42.2",
+ "windows-link",
 ]
 
 [[package]]
 name = "windows-sys"
-version = "0.48.0"
+version = "0.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
 dependencies = [
- "windows-targets 0.48.5",
+ "windows-targets 0.42.2",
 ]
 
 [[package]]
@@ -6112,13 +6745,29 @@ dependencies = [
  "windows_aarch64_gnullvm 0.52.6",
  "windows_aarch64_msvc 0.52.6",
  "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm",
+ "windows_i686_gnullvm 0.52.6",
  "windows_i686_msvc 0.52.6",
  "windows_x86_64_gnu 0.52.6",
  "windows_x86_64_gnullvm 0.52.6",
  "windows_x86_64_msvc 0.52.6",
 ]
 
+[[package]]
+name = "windows-targets"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b"
+dependencies = [
+ "windows_aarch64_gnullvm 0.53.0",
+ "windows_aarch64_msvc 0.53.0",
+ "windows_i686_gnu 0.53.0",
+ "windows_i686_gnullvm 0.53.0",
+ "windows_i686_msvc 0.53.0",
+ "windows_x86_64_gnu 0.53.0",
+ "windows_x86_64_gnullvm 0.53.0",
+ "windows_x86_64_msvc 0.53.0",
+]
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.42.2"
@@ -6137,6 +6786,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.42.2"
@@ -6155,6 +6810,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.42.2"
@@ -6173,12 +6834,24 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
+
 [[package]]
 name = "windows_i686_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.42.2"
@@ -6197,6 +6870,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.42.2"
@@ -6215,6 +6894,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.42.2"
@@ -6233,6 +6918,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.42.2"
@@ -6251,20 +6942,26 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
+
 [[package]]
 name = "winit"
-version = "0.30.5"
+version = "0.30.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0be9e76a1f1077e04a411f0b989cbd3c93339e1771cb41e71ac4aee95bfd2c67"
+checksum = "b0d05bd8908e14618c9609471db04007e644fd9cce6529756046cfc577f9155e"
 dependencies = [
  "ahash",
  "android-activity",
  "atomic-waker",
- "bitflags 2.6.0",
+ "bitflags 2.9.0",
  "block2",
  "bytemuck",
  "calloop",
- "cfg_aliases 0.2.1",
+ "cfg_aliases",
  "concurrent-queue",
  "core-foundation 0.9.4",
  "core-graphics",
@@ -6274,9 +6971,9 @@ dependencies = [
  "libc",
  "memmap2",
  "ndk 0.9.0",
- "objc2",
- "objc2-app-kit",
- "objc2-foundation",
+ "objc2 0.5.2",
+ "objc2-app-kit 0.2.2",
+ "objc2-foundation 0.2.2",
  "objc2-ui-kit",
  "orbclient",
  "percent-encoding",
@@ -6305,41 +7002,32 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.6.20"
+version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
+checksum = "c06928c8748d81b05c9be96aad92e1b6ff01833332f281e8cfca3be4b35fc9ec"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
-name = "workspace-hakari"
-version = "0.1.0"
+name = "wit-bindgen-rt"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
 dependencies = [
- "ahash",
- "bevy",
- "bevy_winit",
- "bytemuck",
- "crossbeam-utils",
- "derive_more",
- "ecolor 0.27.2",
- "egui 0.27.2",
- "either",
- "emath 0.27.2",
- "epaint 0.27.2",
- "getrandom",
- "glam 0.28.0",
- "hashbrown",
- "image 0.24.9",
- "log",
- "num-traits",
- "serde",
- "syn 1.0.109",
- "syn 2.0.79",
- "uuid",
- "winit",
+ "bitflags 2.9.0",
 ]
 
+[[package]]
+name = "workspace-hakari"
+version = "0.1.0"
+
+[[package]]
+name = "writeable"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
+
 [[package]]
 name = "x11-dl"
 version = "2.21.0"
@@ -6360,7 +7048,7 @@ dependencies = [
  "as-raw-xcb-connection",
  "gethostname",
  "libc",
- "libloading 0.8.5",
+ "libloading",
  "once_cell",
  "rustix",
  "x11rb-protocol",
@@ -6378,19 +7066,13 @@ version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ef33da6b1660b4ddbfb3aef0ade110c8b8a781a3b6382fa5f2b5b040fd55f61"
 
-[[package]]
-name = "xi-unicode"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a"
-
 [[package]]
 name = "xkbcommon-dl"
 version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.0",
  "dlib",
  "log",
  "once_cell",
@@ -6405,9 +7087,9 @@ checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56"
 
 [[package]]
 name = "xml-rs"
-version = "0.8.22"
+version = "0.8.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af4e2e2f7cba5a093896c1e150fbfe177d1883e7448200efb81d40b9d339ef26"
+checksum = "a62ce76d9b56901b19a74f19431b0d8b3bc7ca4ad685a746dfd78ca8f4fc6bda"
 
 [[package]]
 name = "xmlwriter"
@@ -6415,25 +7097,87 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9"
 
+[[package]]
+name = "yansi"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
+
+[[package]]
+name = "yazi"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e01738255b5a16e78bbb83e7fbba0a1e7dd506905cfc53f4622d89015a03fbb5"
+
+[[package]]
+name = "yoke"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
+[[package]]
+name = "zeno"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6df3dc4292935e51816d896edcd52aa30bc297907c26167fec31e2b0c6a32524"
+
 [[package]]
 name = "zerocopy"
-version = "0.7.35"
+version = "0.8.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb"
 dependencies = [
- "byteorder",
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.35"
+version = "0.8.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
+ "synstructure",
 ]
 
 [[package]]
@@ -6442,6 +7186,39 @@ version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
 
+[[package]]
+name = "zerotrie"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "zune-core"
 version = "0.4.12"
@@ -6459,9 +7236,9 @@ dependencies = [
 
 [[package]]
 name = "zune-jpeg"
-version = "0.4.13"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768"
+checksum = "99a5bab8d7dedf81405c4bb1f2b83ea057643d9cb28778cea9eecddeedd2e028"
 dependencies = [
  "zune-core",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 1b061118..b045d499 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -32,8 +32,8 @@ name = "plugin_test"
 path = "external/editor_as_plugin/src/main.rs"
 
 [workspace.package]
-version = "0.6.0"
-edition = "2021"
+version = "0.8.0"
+edition = "2024"
 license = "MIT OR Apache-2.0"
 authors = ["rewin <rewin1996@gmail.com>", "Julia Naomi <jnboeira@outlook.com>"]
 keywords = ["gamedev", "editor", "bevy"]
@@ -42,42 +42,69 @@ repository = "https://github.com/rewin123/space_editor"
 homepage = "https://github.com/rewin123/space_editor"
 
 [workspace.dependencies]
-bevy = "0.14.2"
+bevy = { version = "0.16.0", default-features = false, features = [
+    "bevy_gltf",
+    "bevy_log",
+    "bevy_window",
+    "bevy_state",
+    "bevy_sprite",
+    "reflect_documentation",
+    "reflect_functions",
+    "bevy_gizmos",
+    "bevy_picking",
+    "bevy_mesh_picking_backend",
+] }
 
 # Editor Crates
-space_prefab = { version = "0.6.0", path = "crates/prefab" }
-space_shared = { version = "0.6.0", path = "crates/shared" }
-space_undo = { version = "0.6.0", path = "crates/undo" }
-space_persistence = { version = "0.6.0", path = "crates/persistence"}
-space_editor_core = { version = "0.6.0", path = "crates/editor_core", features = ["persistence_editor"] }
-space_editor_ui = { version = "0.6.0", path = "crates/editor_ui", features = ["persistence_editor"] }
-space_editor_tabs = { version = "0.6.0", path = "crates/editor_tabs" }
+space_prefab = { version = "0.8.0", path = "crates/prefab" }
+space_shared = { version = "0.8.0", path = "crates/shared" }
+space_undo = { version = "0.8.0", path = "crates/undo" }
+space_persistence = { version = "0.8.0", path = "crates/persistence"}
+space_editor_core = { version = "0.8.0", path = "crates/editor_core", features = ["persistence_editor"] }
+space_editor_ui = { version = "0.8.0", path = "crates/editor_ui", features = ["persistence_editor"] }
+space_editor_tabs = { version = "0.8.0", path = "crates/editor_tabs" }
 
 # Crates inner libraries
 anyhow = "1.0"
-bevy_asset_loader = "0.21"
-bevy_debug_grid = "0.6"
-bevy_egui = "0.29"
-bevy-inspector-egui = { version = "0.25", features = [
+bevy_egui = "0.34"
+egui_extras = { version = "0.31.1", features = ["all_loaders"] }
+pretty-type-name = "1"
+rand = "0.9.1"
+ron = "0.10.1"
+serde = "1.0"
+convert_case = "0.8.0"
+image = "0.25.6"
+egui_dock = "0.16.0"
+egui_file = "0.22.1"
+egui-toast = "0.17.0"
+
+bevy-scene-hook = {git = "https://github.com/MiniMinerX/bevy-scene-hook.git", branch= "dev-0.16"}
+bevy_debug_grid = { git = "https://github.com/MiniMinerX/bevy_debug_grid.git", branch = "dev-0.16"}
+bevy-inspector-egui = {version = "0.31.0", features = [
     "bevy_pbr",
     "highlight_changes",
-] }
-bevy_mod_billboard = { version = "0.7.0" }
-bevy_mod_picking = { version = "0.20.1", default-features = false, features = ["backend_raycast",  "selection",] }
-bevy_panorbit_camera = { version = "0.19", default-features = false }
-bevy-scene-hook = {git = "https://github.com/stargazing-dino/bevy-scene-hook.git", branch= "update-14.0"}
-convert_case = "0.6"
-egui_dock = "0.13"
-egui_extras = { version = "0.28.1", features = ["all_loaders"] }
-egui_file = "0.18"
-transform-gizmo-egui = "0.3.0"
-transform-gizmo-bevy = "0.3.0"
-egui-toast = "0.14.0"
-image = {version = "0.25.1", feature = ["png"] }
-pretty-type-name = "1"
-rand = "*"
-ron = "0.8"
-serde = "1"
+]}
+#bevy-inspector-egui = { branch = "space_edit", git = "https://github.com/MiniMinerX/bevy-inspector-egui.git", features = [
+#    "bevy_pbr",
+#    "highlight_changes",
+#] }
+bevy_mod_billboard = { branch = "dev-0.16", git = "https://github.com/MiniMinerX/bevy_mod_billboard.git"}
+bevy_asset_loader = "0.23.0-rc.3"
+bevy_panorbit_camera = "0.26"
+# bevy_panorbit_camera = { branch = "reflect_component", git = "https://github.com/MiniMinerX/bevy_panorbit_camera.git"}
+bevy_mod_outline = {git = "https://github.com/komadori/bevy_mod_outline.git", branch = "bevy-0.16"}
+
+# below has not been updated to bevy 0.16
+
+transform-gizmo-bevy = {git = "https://github.com/jakobhellermann/transform-gizmo.git", branch = "bevy-0.16", package = "transform-gizmo-bevy"}
+transform-gizmo-egui = {git = "https://github.com/jakobhellermann/transform-gizmo.git", branch = "bevy-0.16", package = "transform-gizmo-egui"}
+
+
+#transform-gizmo-egui = {git = "https://github.com/MiniMinerX/transform-gizmo.git"}
+#transform-gizmo-bevy = { git = "https://github.com/MiniMinerX/transform-gizmo.git"}
+
+
+
 
 # Community Modules
 game_app = { version = "0.1.0", path = "game" }
@@ -127,9 +154,11 @@ workspace = true
 opt-level = 1
 overflow-checks = false 
 incremental = true # works well when target/ is stored
+prefer-dynamic = true  # prefer dynamic linking for faster builds
 
 [profile.dev.package."*"]
 opt-level = 3
+prefer-dynamic = true
 
 [profile.release-fast]
 inherits = "release"
@@ -153,4 +182,4 @@ no_event_registration = ["space_prefab/no_event_registration"]
 default = [
     "persistence_editor", 
     "space_prefab/editor", 
-]
\ No newline at end of file
+]
diff --git a/crates/editor_core/Cargo.toml b/crates/editor_core/Cargo.toml
index 5b4b5c74..bafd9908 100644
--- a/crates/editor_core/Cargo.toml
+++ b/crates/editor_core/Cargo.toml
@@ -22,7 +22,8 @@ bevy_egui.workspace = true
 egui_dock.workspace = true
 egui-toast.workspace = true
 
-bevy_mod_outline = {git = "https://github.com/komadori/bevy_mod_outline.git", optional = true}
+bevy_mod_outline.workspace = true
+bevy_mod_outline.optional = true
 workspace-hakari = { version = "0.1", path = "../../workspace-hakari" }
 
 [features]
diff --git a/crates/editor_core/src/gltf_unpack.rs b/crates/editor_core/src/gltf_unpack.rs
index 83e40efe..c11468f5 100644
--- a/crates/editor_core/src/gltf_unpack.rs
+++ b/crates/editor_core/src/gltf_unpack.rs
@@ -1,9 +1,5 @@
 use bevy::{
-    asset::{AssetPath, LoadState},
-    ecs::world::CommandQueue,
-    gltf::{Gltf, GltfMesh, GltfNode},
-    prelude::*,
-    utils::HashMap,
+    asset::{AssetPath, LoadState}, ecs::world::CommandQueue, gltf::{Gltf, GltfMesh, GltfNode}, platform::collections::HashMap, prelude::*
 };
 
 use space_prefab::component::{AssetMaterial, AssetMesh, MaterialPrefab};
@@ -64,8 +60,9 @@ fn queue_push(
     mut events: EventWriter<GltfLoaded>,
     assets: Res<AssetServer>,
 ) {
-    if !queue.0.is_empty() && assets.get_load_state(&queue.0[0]) == Some(LoadState::Loaded) {
-        events.send(GltfLoaded(queue.0.remove(0)));
+    if !queue.0.is_empty() && matches!(assets.get_load_state(&queue.0[0]), Some(LoadState::Loaded))
+    {
+        events.write(GltfLoaded(queue.0.remove(0)));
     }
 }
 
@@ -74,6 +71,7 @@ struct UnpackContext<'a> {
     mesh_map: &'a HashMap<Handle<GltfMesh>, usize>,
     gltf_meshs: &'a Assets<GltfMesh>,
     gltf_path: &'a AssetPath<'a>,
+    gltf_nodes: &'a Assets<GltfNode>,
 }
 
 fn unpack_gltf(world: &mut World) {
@@ -81,7 +79,7 @@ fn unpack_gltf(world: &mut World) {
         let Some(mut events) = world.get_resource_mut::<Events<GltfLoaded>>() else {
             return;
         };
-        let mut reader = events.get_reader();
+        let mut reader = events.get_cursor();
         let loaded = reader.read(&events).cloned().collect::<Vec<GltfLoaded>>();
         events.clear();
         loaded
@@ -151,17 +149,15 @@ fn unpack_gltf(world: &mut World) {
             //find roots nodes
             let mut roots = vec![];
             for e in scene.world.iter_entities() {
-                if !e.contains::<Parent>() && e.contains::<Children>() {
+                if !e.contains::<ChildOf>() && e.contains::<Children>() {
                     let Some(children) = e.get::<Children>() else {
                         continue;
                     };
                     for child in children.iter() {
-                        if let Some(name) = scene.world.entity(*child).get::<Name>() {
+                        if let Some(name) = scene.world.entity(child.entity()).get::<Name>() {
                             info!("Name: {:?}", &name);
                             if let Some(node_handle) = gltf.named_nodes.get(name.as_str()) {
-                                if let Some(node) = gltf_nodes.get(node_handle) {
-                                    roots.push(node.clone());
-                                }
+                                roots.push(node_handle.clone())
                             }
                         }
                     }
@@ -175,6 +171,7 @@ fn unpack_gltf(world: &mut World) {
                 mesh_map: &mesh_map,
                 gltf_meshs,
                 gltf_path: &gltf_path,
+                gltf_nodes: &gltf_nodes,
             };
 
             for root in roots.iter() {
@@ -190,16 +187,23 @@ fn unpack_gltf(world: &mut World) {
 
 fn spawn_node(
     commands: &mut Commands,
-    node: &GltfNode,
+    node_handle: &Handle<GltfNode>,
     _gltf: &Gltf,
     ctx: &UnpackContext<'_>,
 ) -> Entity {
+    
+    let gltf_nodes = ctx.gltf_nodes;
+
+    let Some(node) = gltf_nodes.get(node_handle) else {
+        error!("Failed to get GltfNode for handle: {:?}", node_handle);
+        return commands.spawn_empty().id();
+    };
+
+
     let id = commands
         .spawn((
-            SpatialBundle {
-                transform: node.transform,
-                ..default()
-            },
+            node.transform,
+            Visibility::default(),
             PrefabMarker,
         ))
         .id();
@@ -231,7 +235,8 @@ fn spawn_node(
                 commands.entity(id).with_children(|parent| {
                     for idx in 0..mesh.primitives.len() {
                         let mut id = parent.spawn((
-                            SpatialBundle::default(),
+                            Transform::default(),
+                            Visibility::default(),
                             AssetMesh {
                                 path: format!(
                                     "{}#Mesh{}/Primitive{}",
diff --git a/crates/editor_core/src/hotkeys.rs b/crates/editor_core/src/hotkeys.rs
index 0141fd72..61d40768 100644
--- a/crates/editor_core/src/hotkeys.rs
+++ b/crates/editor_core/src/hotkeys.rs
@@ -1,9 +1,9 @@
 #![allow(clippy::type_complexity)]
 #![allow(clippy::too_many_arguments)]
 
+use bevy::platform::collections::HashMap;
 use bevy::prelude::*;
-use bevy::reflect::GetTypeRegistration;
-use bevy::utils::HashMap;
+use bevy::reflect::{GetTypeRegistration, Typed};
 
 #[cfg(feature = "persistence_editor")]
 use space_persistence::AppPersistenceExt;
@@ -102,11 +102,11 @@ impl<T: Hotkey> UntypedHotkeySet for HotkeySet<T> {
 }
 
 pub trait HotkeyAppExt {
-    fn editor_hotkey<T: Hotkey>(&mut self, key: T, binding: Vec<KeyCode>) -> &mut Self;
+    fn editor_hotkey<T: Hotkey + Typed>(&mut self, key: T, binding: Vec<KeyCode>) -> &mut Self;
 }
 
 impl HotkeyAppExt for App {
-    fn editor_hotkey<T: Hotkey>(&mut self, key: T, binding: Vec<KeyCode>) -> &mut Self {
+    fn editor_hotkey<T: Hotkey + Typed>(&mut self, key: T, binding: Vec<KeyCode>) -> &mut Self {
         if !self.world().contains_resource::<AllHotkeys>() {
             self.insert_resource(AllHotkeys::default());
         }
diff --git a/crates/editor_core/src/lib.rs b/crates/editor_core/src/lib.rs
index 3fe360a0..640b5faa 100644
--- a/crates/editor_core/src/lib.rs
+++ b/crates/editor_core/src/lib.rs
@@ -44,13 +44,13 @@ impl Plugin for EditorCore {
 
         app.add_systems(
             Update,
-            (apply_deferred, load_listener)
+            (ApplyDeferred, load_listener)
                 .chain()
                 .in_set(EditorLoadSet),
         );
         app.add_systems(Update, editor_event_listener);
 
-        app.auto_reflected_undo::<Parent>();
+        //app.auto_reflected_undo::<ChildOf>();
         app.auto_reflected_undo::<Children>();
         app.auto_undo::<PrefabMarker>();
     }
@@ -101,7 +101,7 @@ fn editor_event_listener(
                 start_game_state.set(EditorState::GamePrepare);
             }
             EditorEvent::LoadGltfAsPrefab(path) => {
-                gltf_events.send(gltf_unpack::EditorUnpackGltf { path: path.clone() });
+                gltf_events.write(gltf_unpack::EditorUnpackGltf { path: path.clone() });
             }
         }
     }
diff --git a/crates/editor_core/src/load.rs b/crates/editor_core/src/load.rs
index 620e964f..b1703395 100644
--- a/crates/editor_core/src/load.rs
+++ b/crates/editor_core/src/load.rs
@@ -43,7 +43,7 @@ pub fn load_listener(world: &mut World) {
         .collect();
     for (entity, name) in mark_to_delete {
         let mut despawned = false;
-        if let Some(e) = world.get_entity_mut(entity) {
+        if let Some(e) = world.get_entity_mut(entity).ok() {
             e.despawn_recursive();
             despawned = true;
         }
diff --git a/crates/editor_core/src/selected.rs b/crates/editor_core/src/selected.rs
index a07befe4..16b839b3 100644
--- a/crates/editor_core/src/selected.rs
+++ b/crates/editor_core/src/selected.rs
@@ -6,7 +6,7 @@ use bevy::pbr::wireframe::{Wireframe, WireframePlugin};
 use space_shared::{EditorSet, EditorState};
 
 #[cfg(feature = "bevy_mod_outline")]
-use bevy_mod_outline::{OutlineBundle, OutlinePlugin, OutlineVolume};
+use bevy_mod_outline::{OutlinePlugin, OutlineVolume};
 
 /// A marker for editor selected entities
 #[derive(Component, Default, Clone)]
@@ -65,27 +65,34 @@ fn selected_entity_wireframe_update(
     del_wireframe: Query<Entity, (With<OutlineVolume>, Without<Selected>)>,
     need_wireframe: Query<Entity, (Without<OutlineVolume>, With<Selected>)>,
 ) {
+    use bevy_mod_outline::OutlineMode;
+
     for e in del_wireframe.iter() {
-        cmds.entity(e).remove::<OutlineBundle>();
+        cmds.entity(e)
+            .remove::<OutlineVolume>()
+            .remove::<OutlineMode>();
     }
 
     for e in need_wireframe.iter() {
-        cmds.entity(e).insert(OutlineBundle {
-            outline: OutlineVolume {
+        cmds.entity(e).insert((
+            OutlineVolume {
                 visible: true,
                 colour: Color::srgb(1.0, 1.0, 0.0),
                 width: 2.0,
             },
-            mode: bevy_mod_outline::OutlineMode::RealVertex,
-            ..Default::default()
-        });
+            OutlineMode::ExtrudeReal,
+        ));
     }
 }
 
 #[cfg(feature = "bevy_mod_outline")]
 fn clear_wireframes(mut cmds: Commands, del_wireframe: Query<Entity, With<OutlineVolume>>) {
+    use bevy_mod_outline::OutlineMode;
+
     for e in del_wireframe.iter() {
-        cmds.entity(e).remove::<OutlineBundle>();
+        cmds.entity(e)
+            .remove::<OutlineVolume>()
+            .remove::<OutlineMode>();
     }
 }
 
diff --git a/crates/editor_core/src/task_storage.rs b/crates/editor_core/src/task_storage.rs
index 84234b2a..32364721 100644
--- a/crates/editor_core/src/task_storage.rs
+++ b/crates/editor_core/src/task_storage.rs
@@ -27,7 +27,7 @@ fn update_storage(mut storage: ResMut<BackgroundTaskStorage>, assets: Res<AssetS
         match &storage.tasks[0] {
             BackgroundTask::AssetLoading(_path, handle) => {
                 let load_state = assets.get_load_state(handle.id());
-                if load_state == Some(LoadState::Loaded)
+                if matches!(load_state, Some(LoadState::Loaded))
                     || load_state.is_none()
                     || matches!(load_state, Some(LoadState::Failed(_)))
                 {
diff --git a/crates/editor_tabs/src/lib.rs b/crates/editor_tabs/src/lib.rs
index 02e8d911..883c5a4a 100644
--- a/crates/editor_tabs/src/lib.rs
+++ b/crates/editor_tabs/src/lib.rs
@@ -8,7 +8,7 @@ pub mod tab_viewer;
 
 use std::fmt::Display;
 
-use bevy::{ecs::world::CommandQueue, prelude::*, utils::HashMap, window::PrimaryWindow};
+use bevy::{ecs::{schedule::{graph::GraphInfo, Chain, Schedulable}, system::ScheduleSystem, world::CommandQueue}, platform::collections::HashMap, prelude::*, window::PrimaryWindow};
 
 use bevy_egui::{egui, EguiContext};
 
@@ -37,10 +37,13 @@ pub mod prelude {
 /// This system use to show all egui editor ui on primary window
 /// Will be useful in some specific cases to ad new system before/after this system
 pub fn show_editor_ui(world: &mut World) {
+    // info!("show_editor_ui");
+
     let Ok(egui_context) = world
         .query_filtered::<&mut EguiContext, With<PrimaryWindow>>()
         .get_single(world)
     else {
+        info!("show_editor_ui: no egui context");
         return;
     };
     let mut egui_context = egui_context.clone();
@@ -57,6 +60,8 @@ pub fn show_editor_ui(world: &mut World) {
         world.resource_scope::<EditorUi, _>(|world, mut editor_ui| {
             editor_ui.ui(world, ctx);
         });
+    } else {
+        info!("show_editor_ui: no editor ui");
     }
 }
 
@@ -99,14 +104,19 @@ impl EditorUi {
                     tabs,
                     active: _,
                     scroll: _,
+                    collapsed: _,
                 } => visible.extend(tabs.clone()),
                 egui_dock::Node::Vertical {
                     rect: _,
                     fraction: _,
+                    collapsed_leaf_count: _,
+                    fully_collapsed: _,
                 } => {}
                 egui_dock::Node::Horizontal {
                     rect: _,
                     fraction: _,
+                    collapsed_leaf_count: _,
+                    fully_collapsed: _,
                 } => {}
             }
         }
@@ -186,10 +196,13 @@ pub trait EditorUiAppExt {
     fn editor_tab_by_trait<T>(&mut self, tab: T) -> &mut Self
     where
         T: EditorTab + Resource + Send + Sync + 'static;
-    fn editor_tab<T, N: TabName>(
+    fn editor_tab<
+        Marker, 
+        N: TabName
+    >(
         &mut self,
         tab_name: N,
-        tab_systems: impl IntoSystemConfigs<T>,
+        tab_systems: impl IntoScheduleConfigs<ScheduleSystem, Marker>,
     ) -> &mut Self;
 }
 
@@ -237,10 +250,11 @@ impl EditorUiAppExt for App {
         self
     }
 
-    fn editor_tab<T, N: TabName>(
+    fn editor_tab<Marker, N: TabName>(
         &mut self,
         tab_name: N,
-        tab_systems: impl IntoSystemConfigs<T>,
+        //tab_systems: impl IntoSystemConfigs<T>,
+        tab_systems: impl IntoScheduleConfigs<ScheduleSystem, Marker>,
     ) -> &mut Self {
         let tab_name_holder = TabNameHolder::new(tab_name);
 
diff --git a/crates/editor_tabs/src/schedule_editor_tab.rs b/crates/editor_tabs/src/schedule_editor_tab.rs
index ddbb8b4e..c69aa3c8 100644
--- a/crates/editor_tabs/src/schedule_editor_tab.rs
+++ b/crates/editor_tabs/src/schedule_editor_tab.rs
@@ -1,5 +1,5 @@
-use bevy::{prelude::*, utils::HashMap};
-use bevy_egui::egui;
+use bevy::{platform::collections::HashMap, prelude::*};
+use bevy_egui::egui::{self, UiBuilder};
 
 use crate::{tab_name::TabNameHolder, EditorTab};
 
@@ -13,7 +13,10 @@ pub struct ScheduleEditorTab {
 
 impl EditorTab for ScheduleEditorTab {
     fn ui(&mut self, ui: &mut egui::Ui, _: &mut Commands, world: &mut World) {
-        let inner_ui = ui.child_ui(ui.max_rect(), *ui.layout(), None);
+        let ui_builder = UiBuilder::new()
+            .max_rect(ui.max_rect())
+            .layout(*ui.layout());
+        let inner_ui = ui.new_child(ui_builder);
         world.insert_non_send_resource(EditorUiRef(inner_ui));
 
         self.schedule.run(world);
diff --git a/crates/editor_tabs/src/tab_viewer.rs b/crates/editor_tabs/src/tab_viewer.rs
index e05f9878..82e7d59f 100644
--- a/crates/editor_tabs/src/tab_viewer.rs
+++ b/crates/editor_tabs/src/tab_viewer.rs
@@ -2,7 +2,7 @@ use crate::{
     schedule_editor_tab::ScheduleEditorTabStorage, tab_name::TabNameHolder, to_label,
     CollectedStyle, EditorTab, EditorUiReg,
 };
-use bevy::{prelude::*, utils::HashMap};
+use bevy::{platform::collections::HashMap, prelude::*};
 use bevy_egui::egui;
 use convert_case::{Case, Casing};
 
diff --git a/crates/editor_ui/Cargo.toml b/crates/editor_ui/Cargo.toml
index 26c1fd01..d3524ffb 100644
--- a/crates/editor_ui/Cargo.toml
+++ b/crates/editor_ui/Cargo.toml
@@ -26,11 +26,12 @@ space_editor_tabs.workspace = true
 serde.workspace = true
 pretty-type-name.workspace = true
 bevy_egui.workspace = true
+# transform-gizmo-egui.workspace = true
+transform-gizmo-bevy.workspace = true
 transform-gizmo-egui.workspace = true
 egui_dock.workspace = true
 bevy_debug_grid.workspace = true
 bevy-inspector-egui.workspace = true
-bevy_mod_picking.workspace = true
 bevy_asset_loader.workspace = true
 bevy_panorbit_camera.workspace = true
 bevy_mod_billboard.workspace = true
diff --git a/crates/editor_ui/src/camera_plugin.rs b/crates/editor_ui/src/camera_plugin.rs
index a383e737..e9a62ad5 100644
--- a/crates/editor_ui/src/camera_plugin.rs
+++ b/crates/editor_ui/src/camera_plugin.rs
@@ -80,17 +80,17 @@ pub fn change_camera_in_play(
             cam.is_active = true;
         });
 
-        let Ok(window) = primary_window.get_single() else {
+        let Ok(window) = primary_window.single() else {
             error!("Failed to get Primary Window");
-            toast.send(ToastMessage::new(
+            toast.write(ToastMessage::new(
                 "Failed to get Primary Window",
                 space_shared::toast::ToastKind::Error,
             ));
             return;
         };
-        let Ok(mut cam) = play_cameras.get_single_mut() else {
+        let Ok(mut cam) = play_cameras.single_mut() else {
             error!("No play camera found");
-            toast.send(ToastMessage::new(
+            toast.write(ToastMessage::new(
                 "No play camera found",
                 space_shared::toast::ToastKind::Error,
             ));
@@ -103,7 +103,7 @@ pub fn change_camera_in_play(
         });
     } else {
         error!("No play camera found");
-        toast.send(ToastMessage::new(
+        toast.write(ToastMessage::new(
             "No play camera found",
             space_shared::toast::ToastKind::Error,
         ));
@@ -192,8 +192,7 @@ pub fn draw_camera_gizmo(
         let rect_transform = transform.mul_transform(rect_transform);
 
         gizmos.rect(
-            rect_transform.translation,
-            rect_transform.rotation,
+            Isometry3d::new(rect_transform.translation, rect_transform.rotation),
             Vec2::splat(scale * 2.0),
             pink,
         );
diff --git a/crates/editor_ui/src/camera_view.rs b/crates/editor_ui/src/camera_view.rs
index 2b46007a..3ed71fbb 100644
--- a/crates/editor_ui/src/camera_view.rs
+++ b/crates/editor_ui/src/camera_view.rs
@@ -83,13 +83,11 @@ impl EditorTab for CameraViewTab {
                 self.real_camera = Some(
                     commands
                         .spawn((
-                            Camera3dBundle {
-                                camera: Camera {
-                                    is_active: true,
-                                    order: 2,
-                                    clear_color: bevy::render::camera::ClearColorConfig::Default,
-                                    ..default()
-                                },
+                            Camera3d::default(),
+                            Camera {
+                                is_active: true,
+                                order: 2,
+                                clear_color: bevy::render::camera::ClearColorConfig::Default,
                                 ..default()
                             },
                             RenderLayers::layer(0),
@@ -106,13 +104,11 @@ impl EditorTab for CameraViewTab {
                 self.real_camera = Some(
                     commands
                         .spawn((
-                            Camera2dBundle {
-                                camera: Camera {
-                                    is_active: false,
-                                    order: 2,
-                                    clear_color: bevy::render::camera::ClearColorConfig::Default,
-                                    ..default()
-                                },
+                            Camera2d::default(),
+                            Camera {
+                                is_active: false,
+                                order: 2,
+                                clear_color: bevy::render::camera::ClearColorConfig::Default,
                                 ..default()
                             },
                             RenderLayers::layer(0),
@@ -172,7 +168,7 @@ impl EditorTab for CameraViewTab {
                         Projection::Perspective(PerspectiveProjection::default()),
                         Name::new("Camera3d".to_string()),
                         Transform::default(),
-                        VisibilityBundle::default(),
+                        Visibility::default(),
                         PlaymodeCamera::default(),
                         PrefabMarker,
                         CameraRenderGraph::new(bevy::core_pipeline::core_3d::graph::Core3d),
@@ -183,7 +179,7 @@ impl EditorTab for CameraViewTab {
                     Camera2d {},
                     Name::new("Camera2d".to_string()),
                     Transform::default(),
-                    VisibilityBundle::default(),
+                    Visibility::default(),
                     PlaymodeCamera::default(),
                     CameraRenderGraph::new(bevy::core_pipeline::core_2d::graph::Core2d),
                     PrefabMarker,
@@ -338,7 +334,7 @@ fn set_camera_viewport(
         return;
     };
 
-    let Ok(_) = primary_window.get_single() else {
+    let Ok(_) = primary_window.single() else {
         return;
     };
 
@@ -356,7 +352,7 @@ fn set_camera_viewport(
     let Some(target_handle) = ui_state.target_image.clone() else {
         return;
     };
-    real_cam.target = RenderTarget::Image(target_handle.clone());
+    real_cam.target = RenderTarget::Image(target_handle.clone().into());
 
     *real_cam_local_transform = camera_transform.compute_transform();
 
diff --git a/crates/editor_ui/src/editor_style.rs b/crates/editor_ui/src/editor_style.rs
index b040568d..8028edbe 100644
--- a/crates/editor_ui/src/editor_style.rs
+++ b/crates/editor_ui/src/editor_style.rs
@@ -3,7 +3,7 @@ use space_editor_tabs::prelude::*;
 
 use crate::{colors::*, sizing::Sizing};
 use bevy_egui::egui::FontFamily::{Monospace, Proportional};
-use bevy_egui::egui::{FontId, Rounding, TextStyle as ETextStyle};
+use bevy_egui::egui::{CornerRadius, FontId, TextStyle as ETextStyle};
 
 #[derive(Resource, Default)]
 pub struct EditorStyle {}
@@ -18,15 +18,15 @@ impl TabStyle for EditorStyle {
         stl.spacing.icon_spacing = 4.;
         stl.spacing.icon_width = 16.;
         stl.spacing.menu_margin = bevy_egui::egui::Margin {
-            left: 8.,
-            right: 8.,
-            top: 4.,
-            bottom: 8.,
+            left: 8,
+            right: 8,
+            top: 4,
+            bottom: 8,
         };
         stl.visuals.error_fg_color = ERROR_COLOR;
         stl.visuals.hyperlink_color = HYPERLINK_COLOR;
         stl.visuals.warn_fg_color = WARN_COLOR;
-        stl.visuals.menu_rounding = Rounding::same(0.5);
+        stl.visuals.menu_corner_radius = CornerRadius::same(1);
         stl.text_styles = [
             (ETextStyle::Small, FontId::new(10.0, Proportional)),
             (ETextStyle::Body, FontId::new(12., Proportional)),
diff --git a/crates/editor_ui/src/game_view.rs b/crates/editor_ui/src/game_view.rs
index 9592d4e5..ae9faf4f 100644
--- a/crates/editor_ui/src/game_view.rs
+++ b/crates/editor_ui/src/game_view.rs
@@ -1,7 +1,10 @@
 use bevy::{prelude::*, window::PrimaryWindow};
-use bevy_egui::egui::{self, RichText, Widget};
+use bevy_egui::{
+    egui::{self, RichText, Widget},
+    EguiContextSettings,
+};
 use space_undo::UndoRedo;
-use transform_gizmo_egui::GizmoMode;
+use transform_gizmo_bevy::GizmoMode;
 
 use space_shared::*;
 
@@ -91,7 +94,7 @@ impl EditorTab for GameViewTab {
             ui.spacing();
             //Draw FPS
             if let Some(dt) = world.get_resource::<Time>() {
-                let dt = dt.delta_seconds();
+                let dt = dt.delta_secs();
                 self.smoothed_dt = self.smoothed_dt.mul_add(0.98, dt * 0.02);
                 ui.colored_label(TEXT_COLOR, format!("FPS: {:.0}", 1.0 / self.smoothed_dt));
             }
@@ -125,11 +128,11 @@ pub fn reset_camera_viewport(
     mut cameras: Query<&mut Camera, With<EditorCameraMarker>>,
     mut game_view_tab: ResMut<GameViewTab>,
 ) {
-    let Ok(mut cam) = cameras.get_single_mut() else {
+    let Ok(mut cam) = cameras.single_mut() else {
         return;
     };
 
-    let Ok(_window) = primary_window.get_single() else {
+    let Ok(_window) = primary_window.single() else {
         return;
     };
 
@@ -148,15 +151,19 @@ pub struct LastGameTabRect(Option<egui::Rect>);
 pub fn set_camera_viewport(
     mut local: Local<LastGameTabRect>,
     ui_state: Res<GameViewTab>,
-    primary_window: Query<&mut Window, With<PrimaryWindow>>,
-    egui_settings: Res<bevy_egui::EguiSettings>,
+    primary_window: Query<(Entity, &mut Window), With<PrimaryWindow>>,
+    mut egui_settings: Query<&mut EguiContextSettings>,
     mut cameras: Query<&mut Camera, With<EditorCameraMarker>>,
 ) {
-    let Ok(mut cam) = cameras.get_single_mut() else {
+    let Ok(mut cam) = cameras.single_mut() else {
+        return;
+    };
+
+    let Ok((entity, window)) = primary_window.single() else {
         return;
     };
 
-    let Ok(window) = primary_window.get_single() else {
+    let Ok(context_settings) = egui_settings.get_mut(entity) else {
         return;
     };
 
@@ -173,7 +180,7 @@ pub fn set_camera_viewport(
     let scale_factor = window.scale_factor();
     debug!(
         "Window scale factor: {} egui scale factor: {}",
-        scale_factor, egui_settings.scale_factor
+        scale_factor, context_settings.scale_factor
     );
 
     let mut viewport_pos = viewport_rect.left_top().to_vec2() * scale_factor;
diff --git a/crates/editor_ui/src/hierarchy.rs b/crates/editor_ui/src/hierarchy.rs
index 03c329a1..a3cdcd1f 100644
--- a/crates/editor_ui/src/hierarchy.rs
+++ b/crates/editor_ui/src/hierarchy.rs
@@ -1,7 +1,7 @@
 #![allow(clippy::too_many_arguments)]
 use std::sync::Arc;
 
-use bevy::{ecs::query::QueryFilter, prelude::*, utils::HashMap};
+use bevy::{ecs::query::QueryFilter, platform::collections::HashMap, prelude::*};
 use bevy_egui::{
     egui::{collapsing_header::CollapsingState, TextEdit},
     *,
@@ -55,7 +55,7 @@ pub type HierarchyQueryIter<'a> = (
     Entity,
     Option<&'a Name>,
     Option<&'a Children>,
-    Option<&'a Parent>,
+    Option<&'a ChildOf>,
 );
 
 /// System to show hierarchy
@@ -134,7 +134,7 @@ type DrawIter<'a> = (
     Entity,
     Option<&'a Name>,
     Option<&'a Children>,
-    Option<&'a Parent>,
+    Option<&'a ChildOf>,
 );
 
 fn draw_entity<F: QueryFilter>(
@@ -158,7 +158,7 @@ fn draw_entity<F: QueryFilter>(
 
     let is_selected = selected.contains(entity);
 
-    if children.is_some_and(|children| children.iter().any(|child| query.get(*child).is_ok())) {
+    if children.is_some_and(|children| children.iter().any(|child| query.get(child.entity()).is_ok())) {
         CollapsingState::load_with_default_open(
             ui.ctx(),
             ui.make_persistent_id(entity_name.clone()),
@@ -176,7 +176,7 @@ fn draw_entity<F: QueryFilter>(
             if is_auto_child {
                 response.context_menu(|ui| {
                     if ui.button("Delete").clicked() {
-                        commands.entity(entity).despawn_recursive();
+                        commands.entity(entity).despawn();
                     }
                     ui.label(crate::egui::RichText::new("⚠ Concrete Bevy entity cannot be reparented or cloned.\nTry \"Unpack gltf as prefab\" for that.").color(WARN_COLOR));
                 });
@@ -218,7 +218,7 @@ fn draw_entity<F: QueryFilter>(
                     commands,
                     ui,
                     query,
-                    *child,
+                    child.entity(),
                     selected,
                     clone_events,
                     changes,
@@ -239,7 +239,7 @@ fn draw_entity<F: QueryFilter>(
         if is_auto_child {
             selectable.context_menu(|ui| {
                 if ui.button("Delete").clicked() {
-                    commands.entity(entity).despawn_recursive();
+                    commands.entity(entity).despawn();
                 }
                 ui.label(crate::egui::RichText::new("⚠ Concrete Bevy entity cannot be reparented or cloned.\nTry \"Unpack gltf as prefab\" for that.").color(WARN_COLOR));
             });
@@ -283,25 +283,25 @@ fn hierarchy_entity_context(
     changes: &mut EventWriter<'_, NewChange>,
     clone_events: &mut EventWriter<'_, CloneEvent>,
     selected: &mut Query<'_, '_, Entity, With<Selected>>,
-    parent: Option<&Parent>,
+    parent: Option<&ChildOf>,
 ) {
     if ui.button("Add child").clicked() {
         let new_id = commands.spawn_empty().insert(PrefabMarker).id();
         commands.entity(entity).add_child(new_id);
-        changes.send(NewChange {
+        changes.write(NewChange {
             change: Arc::new(AddedEntity { entity: new_id }),
         });
         ui.close_menu();
     }
     if ui.button("Delete").clicked() {
-        commands.entity(entity).despawn_recursive();
-        changes.send(NewChange {
+        commands.entity(entity).despawn();
+        changes.write(NewChange {
             change: Arc::new(RemovedEntity { entity }),
         });
         ui.close_menu();
     }
     if ui.button("Clone").clicked() {
-        clone_events.send(CloneEvent { id: entity });
+        clone_events.write(CloneEvent { id: entity });
         ui.close_menu();
     }
     if !selected.is_empty() && !selected.contains(entity) && ui.button("Attach to").clicked() {
@@ -310,7 +310,7 @@ fn hierarchy_entity_context(
         }
     }
     if parent.is_some() && ui.button("Detach").clicked() {
-        commands.entity(entity).remove_parent();
+        commands.entity(entity).remove::<ChildOf>();
     }
 }
 
@@ -336,11 +336,11 @@ fn clone_enitites(
 
                     editor_registry.clone_entity_flat(&mut cmds, &entity);
 
-                    if let Some(parent) = entity.get::<Parent>() {
-                        if let Some(new_parent) = map.get(&parent.get()) {
+                    if let Some(parent) = entity.get::<ChildOf>() {
+                        if let Some(new_parent) = map.get(&parent.parent()) {
                             commands.entity(*new_parent).add_child(dst_id);
                         } else {
-                            commands.entity(parent.get()).add_child(dst_id);
+                            commands.entity(parent.parent()).add_child(dst_id);
                         }
                     }
 
@@ -363,7 +363,7 @@ fn detect_cloned_entities(
 ) {
     for entity in query.iter() {
         commands.entity(entity).remove::<ClonedEntity>();
-        changes.send(NewChange {
+        changes.write(NewChange {
             change: Arc::new(AddedEntity { entity }),
         });
     }
diff --git a/crates/editor_ui/src/icons.rs b/crates/editor_ui/src/icons.rs
index a0d0edb9..a083efdb 100644
--- a/crates/editor_ui/src/icons.rs
+++ b/crates/editor_ui/src/icons.rs
@@ -140,7 +140,9 @@ pub fn translate_icon<'a>(size: f32, text: &str) -> egui::Button<'a> {
 
 pub fn add_bundle_icon<'a>(size: f32, text: &str) -> egui::Button<'a> {
     let image = egui::Image::from_bytes("add_bundle.svg", crate::icons::ADD_BUNDLE.as_bytes())
-        .fit_to_exact_size(bevy_egui::egui::vec2(size, size));
+        .fit_to_exact_size(bevy_egui::egui::vec2(size, size))
+        .maintain_aspect_ratio(true)
+        .texture_options(egui::TextureOptions::NEAREST);
     if text.is_empty() {
         egui::Button::image(image)
     } else {
@@ -148,9 +150,12 @@ pub fn add_bundle_icon<'a>(size: f32, text: &str) -> egui::Button<'a> {
     }
 }
 
-pub fn add_entity_icon<'a>(size: f32, text: &str) -> egui::Button<'a> {
+pub fn add_entity_icon<'a>(size: f32, text: impl Into<WidgetText>) -> egui::Button<'a> {
+    let text = text.into();
     let image = egui::Image::from_bytes("add_entity.svg", crate::icons::ADD_ENTITY.as_bytes())
-        .fit_to_exact_size(bevy_egui::egui::vec2(size, size));
+        .fit_to_exact_size(bevy_egui::egui::vec2(size, size))
+        .maintain_aspect_ratio(true)
+        .texture_options(egui::TextureOptions::NEAREST);
     if text.is_empty() {
         egui::Button::image(image)
     } else {
diff --git a/crates/editor_ui/src/inspector/components_order.rs b/crates/editor_ui/src/inspector/components_order.rs
index 22faf55b..e1a65b5a 100644
--- a/crates/editor_ui/src/inspector/components_order.rs
+++ b/crates/editor_ui/src/inspector/components_order.rs
@@ -1,4 +1,4 @@
-use bevy::{prelude::*, utils::HashMap};
+use bevy::{platform::collections::HashMap, prelude::*};
 
 // Cannot implement Reflect as BTree doesn't implement Reflect
 #[derive(Reflect, Resource, Default, Clone)]
diff --git a/crates/editor_ui/src/inspector/events_dispatcher.rs b/crates/editor_ui/src/inspector/events_dispatcher.rs
index 07a650c6..c5139eb1 100644
--- a/crates/editor_ui/src/inspector/events_dispatcher.rs
+++ b/crates/editor_ui/src/inspector/events_dispatcher.rs
@@ -1,4 +1,5 @@
-use bevy::{prelude::*, utils::HashMap};
+use bevy::platform::collections::HashMap;
+use bevy::prelude::*;
 
 use bevy_egui::*;
 
diff --git a/crates/editor_ui/src/inspector/mod.rs b/crates/editor_ui/src/inspector/mod.rs
index a7d5a2c5..f546907f 100644
--- a/crates/editor_ui/src/inspector/mod.rs
+++ b/crates/editor_ui/src/inspector/mod.rs
@@ -7,11 +7,7 @@ pub mod runtime_assets;
 use std::any::TypeId;
 
 use bevy::{
-    ecs::{change_detection::MutUntyped, world::CommandQueue},
-    prelude::*,
-    ptr::PtrMut,
-    reflect::ReflectFromPtr,
-    utils::HashMap,
+    ecs::{change_detection::MutUntyped, world::CommandQueue}, platform::collections::HashMap, prelude::*, ptr::PtrMut, reflect::ReflectFromPtr
 };
 
 use bevy_egui::{egui::TextEdit, *};
@@ -76,7 +72,7 @@ impl EditorTab for InspectorTab {
         let sizing = world.get_resource::<Sizing>().cloned().unwrap_or_default();
         let selected_entity = world
             .query_filtered::<Entity, With<Selected>>()
-            .get_single(world);
+            .single(world);
 
         let Ok(selected_entity) = selected_entity else {
             return;
@@ -159,7 +155,7 @@ impl EditorTab for InspectorTab {
             (add_component_width - add_component_pixel_count - 16. - sizing.icon.to_size()) / 2.;
 
         let components_area = egui::ScrollArea::vertical().show(ui, |ui| {
-            if let Some(e) = cell.get_entity(selected_entity) {
+            if let Ok(e) = cell.get_entity(selected_entity) {
                 let mut name;
                 if let Some(name_struct) = unsafe { e.get::<Name>() } {
                     name = name_struct.as_str().to_string();
@@ -196,7 +192,7 @@ impl EditorTab for InspectorTab {
                 egui::Grid::new(format!("{e_id}")).show(ui, |ui| {
                     for (c_id, t_id, name, _) in &components_id {
                         if name.to_lowercase().contains(&lower_filter) {
-                            if let Some(data) = unsafe { e.get_mut_by_id(*c_id) } {
+                            if let Ok(data) = unsafe { e.get_mut_by_id(*c_id) } {
                                 let mut is_editor_component = false;
                                 let registration;
                                 if let Some(reg) = editor_registry.get(*t_id) {
@@ -211,7 +207,8 @@ impl EditorTab for InspectorTab {
                                 {
                                     let (ptr, mut set_changed) = mut_untyped_split(data);
 
-                                    let value = unsafe { reflect_from_ptr.from_ptr_mut()(ptr) };
+                                    let value_reflect = unsafe { reflect_from_ptr.from_ptr_mut()(ptr) };
+                                    let value = value_reflect.as_partial_reflect_mut();
 
                                     if is_editor_component {
                                         if !editor_registry_resource
@@ -380,7 +377,7 @@ impl InspectorTab {
         e: bevy::ecs::world::unsafe_world_cell::UnsafeEntityCell<'_>,
         name: &String,
         env: &mut InspectorUi<'_, '_>,
-        value: &mut dyn Reflect,
+        value: &mut dyn PartialReflect,
         set_changed: &mut impl FnMut(),
     ) {
         ui.push_id(format!("{:?}-{}", &e.id(), &name), |ui| {
@@ -392,6 +389,7 @@ impl InspectorTab {
                         if env.ui_for_reflect_with_options(value, ui, ui.id(), &()) {
                             (set_changed)();
                         }
+                        //ui.label("show component function error");
                     });
                 });
             if header.header_response.clicked() {
@@ -451,7 +449,9 @@ fn execute_inspect_command(
         match c {
             InspectCommand::AddComponent(e, id) => {
                 info!("inspector adding component {:?} to entity {:?}", id, e);
-                commands.entity(*e).add(registration.get_spawn_command(id));
+                commands
+                    .entity(*e)
+                    .queue(registration.get_spawn_command(id));
             }
             InspectCommand::RemoveComponent(e, id) => {
                 registration.remove_by_id(&mut commands.entity(*e), id);
diff --git a/crates/editor_ui/src/inspector/refl_impl.rs b/crates/editor_ui/src/inspector/refl_impl.rs
index bb3c3353..65ba2b32 100644
--- a/crates/editor_ui/src/inspector/refl_impl.rs
+++ b/crates/editor_ui/src/inspector/refl_impl.rs
@@ -2,9 +2,10 @@ use std::any::{Any, TypeId};
 
 use bevy::{
     prelude::{AppTypeRegistry, ResMut},
-    reflect::Reflect,
+    reflect::PartialReflect,
 };
 use bevy_egui::egui;
+use bevy_inspector_egui::reflect_inspector::ProjectorReflect;
 use space_shared::ext::bevy_inspector_egui::{
     inspector_egui_impls::InspectorEguiImpl, reflect_inspector::InspectorUi,
 };
@@ -12,6 +13,7 @@ use space_shared::ext::bevy_inspector_egui::{
 use space_prefab::component::EntityLink;
 
 /// Method from `bevy_inspector_egui` to make dummy reflection ui
+/*
 pub fn many_unimplemented<T: Any>(
     _ui: &mut egui::Ui,
     _options: &dyn Any,
@@ -22,6 +24,19 @@ pub fn many_unimplemented<T: Any>(
 ) -> bool {
     false
 }
+*/
+
+pub fn many_unimplemented<T: Any>(
+    ui: &mut egui::Ui,
+    _options: &dyn Any,
+    _id: egui::Id,
+    _env: InspectorUi<'_, '_>,
+    _values: &mut [&mut dyn PartialReflect],
+    _projector: &dyn ProjectorReflect,
+) -> bool {
+    //no_multiedit(ui, &pretty_type_name::<T>());
+    false
+}
 
 /// Custom UI for [`EntityLink`] struct
 pub fn setup_ref_registry(reg: ResMut<AppTypeRegistry>) {
diff --git a/crates/editor_ui/src/inspector/resources.rs b/crates/editor_ui/src/inspector/resources.rs
index ac12df0e..5039cc19 100644
--- a/crates/editor_ui/src/inspector/resources.rs
+++ b/crates/editor_ui/src/inspector/resources.rs
@@ -1,4 +1,4 @@
-use bevy::{prelude::*, utils::HashMap};
+use bevy::{platform::collections::HashMap, prelude::*};
 
 use bevy_egui::*;
 
diff --git a/crates/editor_ui/src/inspector/runtime_assets.rs b/crates/editor_ui/src/inspector/runtime_assets.rs
index 00929bda..187031cb 100644
--- a/crates/editor_ui/src/inspector/runtime_assets.rs
+++ b/crates/editor_ui/src/inspector/runtime_assets.rs
@@ -1,4 +1,4 @@
-use bevy::{asset::ReflectAsset, prelude::*, utils::HashMap};
+use bevy::{asset::ReflectAsset, platform::collections::HashMap, prelude::*};
 
 use bevy_egui::*;
 
diff --git a/crates/editor_ui/src/lib.rs b/crates/editor_ui/src/lib.rs
index b9cf5bc8..f2b518df 100644
--- a/crates/editor_ui/src/lib.rs
+++ b/crates/editor_ui/src/lib.rs
@@ -62,14 +62,7 @@ pub mod sizing;
 pub mod icons;
 
 use bevy_debug_grid::{Grid, GridAxis, SubGrid, TrackedGrid};
-use bevy_mod_picking::{
-    backends::raycast::RaycastPickable,
-    events::{Down, Pointer},
-    picking_core::Pickable,
-    pointer::PointerButton,
-    prelude::*,
-    PickableBundle,
-};
+
 use bevy_panorbit_camera::{PanOrbitCamera, PanOrbitCameraPlugin, PanOrbitCameraSystemSet};
 use camera_view::CameraViewTabPlugin;
 use space_editor_core::prelude::*;
@@ -87,10 +80,19 @@ use bevy_egui::{egui, EguiContext};
 use space_editor_tabs::prelude::*;
 
 use game_view::{has_window_changed, GameViewPlugin};
+
+/*
 use prelude::{
     clean_meshless, reset_camera_viewport, set_camera_viewport, GameModeSettings, GameViewTab,
     MeshlessVisualizerPlugin, SpaceHierarchyPlugin, SpaceInspectorPlugin,
 };
+*/
+
+use prelude::{
+    reset_camera_viewport, set_camera_viewport, GameModeSettings, GameViewTab,
+    SpaceHierarchyPlugin, SpaceInspectorPlugin,
+};
+
 use space_editor_core::toast::ToastUiPlugin;
 use space_prefab::prelude::*;
 use space_shared::{
@@ -151,7 +153,6 @@ pub mod prelude {
 /// External dependencies for editor crate
 pub mod ext {
     pub use bevy_egui;
-    pub use bevy_mod_picking;
     pub use bevy_panorbit_camera;
     pub use space_shared::ext::*;
 }
@@ -183,12 +184,14 @@ impl PluginGroup for EditorPluginGroup {
             .add(EditorSetsPlugin)
             .add(EditorDefaultBundlesPlugin)
             .add(EditorDefaultCameraPlugin)
-            .add(bevy_egui::EguiPlugin)
-            .add(EventListenerPlugin::<selection::SelectEvent>::default())
+            .add(bevy_egui::EguiPlugin {
+                enable_multipass_for_primary_context: false,
+            })
+            //.add(EventListenerPlugin::<selection::SelectEvent>::default())
             .add(DefaultInspectorConfigPlugin);
         res = EditorUiPlugin::default().add_plugins_to_group(res);
         res.add(PanOrbitCameraPlugin)
-            .add(selection::EditorPickingPlugin)
+            .add(selection::plugin)
             .add(bevy_debug_grid::DebugGridPlugin::without_floor_grid())
             .add(
                 WorldInspectorPlugin::default()
@@ -267,12 +270,14 @@ fn game_gizmos(mut gizmos_config: ResMut<GizmoConfigStore>) {
     gizmos_config.config_mut::<EditorGizmo>().0.render_layers = RenderLayers::layer(0)
 }
 
+/*
 type AutoAddQueryFilter = (
     Without<PrefabMarker>,
     Without<Pickable>,
     With<Parent>,
     Changed<Handle<Mesh>>,
 );
+*/
 
 #[derive(Default, Reflect, GizmoConfigGroup)]
 pub struct EditorGizmo;
@@ -289,11 +294,11 @@ fn save_prefab_before_play(
     mut editor_events: EventWriter<space_shared::EditorEvent>,
     mut toast: EventWriter<ToastMessage>,
 ) {
-    toast.send(ToastMessage::new(
+    toast.write(ToastMessage::new(
         "Preparing prefab to save for playmode",
         space_shared::toast::ToastKind::Info,
     ));
-    editor_events.send(space_shared::EditorEvent::Save(
+    editor_events.write(space_shared::EditorEvent::Save(
         space_shared::EditorPrefabPath::MemoryCache,
     ));
 }
@@ -337,17 +342,18 @@ pub trait FlatPluginList {
 /// This method prepare default lights and camera for editor UI. You can create own conditions for your editor and use this method how example
 pub fn simple_editor_setup(mut commands: Commands) {
     commands.insert_resource(bevy::pbr::DirectionalLightShadowMap { size: 4096 });
+
+    // By default EditorState is Game. Set it to Editor to show editor ui
+    commands.set_state(EditorState::Editor);
+
     // light
     commands.spawn((
-        DirectionalLightBundle {
-            directional_light: DirectionalLight {
-                shadows_enabled: true,
-                ..default()
-            },
-            transform: Transform::from_xyz(4.0, 8.0, 4.0).looking_at(Vec3::ZERO, Vec3::Y),
-            cascade_shadow_config: CascadeShadowConfigBuilder::default().into(),
+        DirectionalLight {
+            shadows_enabled: true,
             ..default()
         },
+        Transform::from_xyz(4.0, 8.0, 4.0).looking_at(Vec3::ZERO, Vec3::Y),
+        CascadeShadowConfigBuilder::default().build(),
         Name::from("Editor Level Light"),
     ));
 
@@ -374,27 +380,24 @@ pub fn simple_editor_setup(mut commands: Commands) {
             z: Some(Color::linear_rgb(0.1, 0.1, 0.9)),
         },
         TrackedGrid::default(),
-        TransformBundle::default(),
-        VisibilityBundle::default(),
+        Transform::default(),
+        Visibility::default(),
         Name::from("Debug Grid"),
         grid_render_layer,
     ));
 
     // camera
     commands.spawn((
-        Camera3dBundle {
-            transform: Transform::from_xyz(-2.0, 2.5, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
-            camera: Camera {
-                order: 100,
-                ..default()
-            },
+        Camera {
+            order: 100,
             ..default()
         },
+        Transform::from_xyz(-2.0, 2.5, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
         bevy_panorbit_camera::PanOrbitCamera::default(),
         EditorCameraMarker,
         Name::from("Editor Camera"),
-        PickableBundle::default(),
-        RaycastPickable,
+        //PickableBundle::default(),
+        MeshPickingCamera,
         all_render_layers(),
     ));
 }
@@ -406,42 +409,37 @@ pub fn game_mode_changed(
 ) {
     if mode.is_changed() {
         for editor_camera in editor_camera_query.iter() {
-            commands.entity(editor_camera).despawn_recursive();
+            commands.entity(editor_camera).despawn();
         }
 
         if mode.is_3d() {
             // 3D camera
             commands.spawn((
-                Camera3dBundle {
-                    transform: Transform::from_xyz(-2.0, 2.5, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
-                    camera: Camera {
-                        // We had too many editor cameras at order 0
-                        order: 100,
-                        ..default()
-                    },
+                Camera {
+                    // We had too many editor cameras at order 0
+                    order: 100,
                     ..default()
                 },
+                Transform::from_xyz(-2.0, 2.5, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
                 bevy_panorbit_camera::PanOrbitCamera::default(),
                 EditorCameraMarker,
                 Name::from("Editor Camera"),
-                PickableBundle::default(),
-                RaycastPickable,
+                //PickableBundle::default(),
+                MeshPickingCamera,
+                //Pickable::default(),
                 all_render_layers(),
             ));
         } else {
             // 2D camera
             commands.spawn((
-                Camera2dBundle {
-                    camera: Camera {
-                        order: 100,
-                        ..default()
-                    },
+                Camera {
+                    order: 100,
                     ..default()
                 },
                 EditorCameraMarker,
                 Name::from("Editor 2D Camera"),
-                PickableBundle::default(),
-                RaycastPickable,
+                //PickableBundle::default(),
+                MeshPickingCamera,
                 all_render_layers(),
             ));
         }
diff --git a/crates/editor_ui/src/menu_toolbars.rs b/crates/editor_ui/src/menu_toolbars.rs
index 99b1efe4..9d53285e 100644
--- a/crates/editor_ui/src/menu_toolbars.rs
+++ b/crates/editor_ui/src/menu_toolbars.rs
@@ -44,14 +44,14 @@ impl Plugin for BottomMenuPlugin {
             bottom_menu
                 .before(EditorLoadSet)
                 .in_set(EditorSet::Editor)
-                .run_if(in_state(EditorState::Editor).and_then(in_state(ShowEditorUi::Show))),
+                .run_if(in_state(EditorState::Editor).and(in_state(ShowEditorUi::Show))),
         );
         app.add_systems(
             Update,
             top_menu
                 .before(EditorLoadSet)
                 .in_set(EditorSet::Editor)
-                .run_if(in_state(EditorState::Editor).and_then(in_state(ShowEditorUi::Show))),
+                .run_if(in_state(EditorState::Editor).and(in_state(ShowEditorUi::Show))),
         );
         app.add_systems(Update, in_game_menu.in_set(EditorSet::Game));
         app.add_event::<MenuLoadEvent>();
@@ -86,7 +86,7 @@ fn in_game_menu(
         .show(ctxs.ctx_mut(), |ui| {
             let frame_duration = time.delta();
             if !time.is_paused() {
-                *smoothed_dt = (*smoothed_dt).mul_add(0.98, time.delta_seconds() * 0.02);
+                *smoothed_dt = (*smoothed_dt).mul_add(0.98, time.delta_secs() * 0.02);
             }
             let layout = egui::Layout::left_to_right(Align::Center).with_main_align(Align::Center);
             ui.with_layout(layout, |ui| {
@@ -147,7 +147,7 @@ pub struct MenuToolbarState {
     pub save_dialog: Option<egui_file::FileDialog>,
     pub load_dialog: Option<egui_file::FileDialog>,
     pub subscene_dialog: Option<egui_file::FileDialog>,
-    show_toasts: bool,
+    pub show_toasts: bool,
     pub path: String,
 }
 
@@ -167,13 +167,14 @@ pub fn bottom_menu(
     egui::TopBottomPanel::bottom("bottom_menu")
         .min_height(&sizing.icon.to_size().max(sizing.text) + 4.)
         .show(ctx, |ui| {
-            ui.style_mut().spacing.menu_margin = Margin::symmetric(16., 8.);
+            ui.style_mut().spacing.menu_margin = Margin::symmetric(16, 8);
             egui::menu::bar(ui, |ui| {
                 let stl = ui.style_mut();
                 stl.spacing.button_padding = egui::Vec2::new(8., 2.);
 
                 if ui
-                    .add(
+                    .add_sized(
+                        egui::vec2(sizing.icon.to_size(), sizing.icon.to_size()),
                         delete_entity_icon(sizing.icon.to_size(), "")
                             .stroke(stroke_default_color()),
                     )
@@ -181,31 +182,43 @@ pub fn bottom_menu(
                     .clicked()
                 {
                     for (entity, _, _, _parent) in query.iter() {
-                        commands.entity(entity).despawn_recursive();
+                        commands.entity(entity).despawn();
 
-                        changes.send(NewChange {
+                        changes.write(NewChange {
                             change: Arc::new(RemovedEntity { entity }),
                         });
                     }
                 }
+
                 if ui
-                    .add(add_entity_icon(sizing.icon.to_size(), "").stroke(stroke_default_color()))
+                    .add_sized(
+                        egui::vec2(sizing.icon.to_size(), sizing.icon.to_size()),
+                        add_entity_icon(sizing.icon.to_size(), "").stroke(stroke_default_color()),
+                    )
                     .on_hover_text("Add new entity")
                     .clicked()
                 {
                     let id = commands.spawn_empty().insert(PrefabMarker).id();
-                    changes.send(NewChange {
+                    changes.write(NewChange {
                         change: Arc::new(AddedEntity { entity: id }),
                     });
                 }
-                let spawnable_button =
-                    add_bundle_icon(sizing.icon.to_size(), "").stroke(stroke_default_color());
 
-                let spawnables = ui.add(if state.show_spawnable_bundles {
-                    spawnable_button.fill(SELECTED_ITEM_COLOR)
-                } else {
-                    spawnable_button
-                });
+                let spawnable_button = add_bundle_icon(sizing.icon.to_size(), "")
+                    .stroke(stroke_default_color())
+                    .min_size(egui::Vec2::new(
+                        sizing.icon.to_size(),
+                        sizing.icon.to_size(),
+                    ));
+
+                let spawnables = ui.add_sized(
+                    egui::vec2(sizing.icon.to_size(), sizing.icon.to_size()),
+                    if state.show_spawnable_bundles {
+                        spawnable_button.fill(SELECTED_ITEM_COLOR)
+                    } else {
+                        spawnable_button
+                    },
+                );
                 let spawnable_pos = Pos2 {
                     x: 16.,
                     y: spawnables.rect.right_top().y - 4.,
@@ -220,9 +233,9 @@ pub fn bottom_menu(
                 if state.show_spawnable_bundles {
                     egui::Window::new("Bundles")
                         .frame(
-                            egui::Frame::none()
-                                .inner_margin(Margin::symmetric(8., 4.))
-                                .rounding(3.)
+                            egui::Frame::new()
+                                .inner_margin(Margin::symmetric(8, 4))
+                                .corner_radius(3.)
                                 .stroke(stroke_default_color())
                                 .fill(SPECIAL_BG_COLOR),
                         )
@@ -246,16 +259,13 @@ pub fn bottom_menu(
                                             let button = egui::Button::new(name).ui(ui);
                                             if button.clicked() {
                                                 let entity = dyn_bundle.spawn(&mut commands);
-                                                if let Ok(pan_cam) = q_pan_cam.get_single() {
-                                                    commands.entity(entity).insert(
-                                                        SpatialBundle::from_transform(
-                                                            Transform::from_translation(
-                                                                pan_cam.focus,
-                                                            ),
-                                                        ),
-                                                    );
+                                                if let Ok(pan_cam) = q_pan_cam.single() {
+                                                    commands.entity(entity).insert((
+                                                        Transform::from_translation(pan_cam.focus),
+                                                        Visibility::default(),
+                                                    ));
                                                 }
-                                                changes.send(NewChange {
+                                                changes.write(NewChange {
                                                     change: Arc::new(AddedEntity { entity }),
                                                 });
                                             }
@@ -301,7 +311,7 @@ pub fn top_menu(
     egui::TopBottomPanel::top("top_menu_bar")
         .min_height(&sizing.icon.to_size() + 8.)
         .show(ctx, |ui| {
-            ui.style_mut().spacing.menu_margin = Margin::symmetric(16., 8.);
+            ui.style_mut().spacing.menu_margin = Margin::symmetric(16, 8);
             egui::menu::bar(ui, |ui| {
                 let stl = ui.style_mut();
                 stl.spacing.button_padding = egui::Vec2::new(8., 4.);
@@ -329,7 +339,7 @@ pub fn top_menu(
                                 //remove .scn.ron
                                 path = path.replace(".scn.ron", "");
                                 menu_state.path = path;
-                                editor_events.send(EditorEvent::Load(EditorPrefabPath::File(
+                                editor_events.write(EditorEvent::Load(EditorPrefabPath::File(
                                     format!("{}.scn.ron", menu_state.path.clone()),
                                 )));
                             }
@@ -374,7 +384,7 @@ pub fn top_menu(
                             if path.ends_with(".scn.ron") {
                                 let path = path.replace(".scn.ron", "");
                                 println!("{path}");
-                                editor_events.send(EditorEvent::Save(EditorPrefabPath::File(
+                                editor_events.write(EditorEvent::Save(EditorPrefabPath::File(
                                     format!("{}.scn.ron", path),
                                 )));
                             }
@@ -422,7 +432,7 @@ pub fn top_menu(
                                 //remove .scn.ron
                                 path = path.replace(".scn.ron", "");
                                 menu_state.path = path;
-                                editor_events.send(EditorEvent::Load(EditorPrefabPath::File(
+                                editor_events.write(EditorEvent::Load(EditorPrefabPath::File(
                                     format!("{}.scn.ron", menu_state.path.clone()),
                                 )));
                             }
@@ -469,7 +479,7 @@ pub fn top_menu(
                             if path.starts_with("assets/") {
                                 path = path.replace("assets/", "");
 
-                                editor_events.send(EditorEvent::LoadGltfAsPrefab(path));
+                                editor_events.write(EditorEvent::LoadGltfAsPrefab(path));
                             }
                         }
                     } else {
@@ -522,7 +532,8 @@ pub fn top_menu(
                                     commands.spawn((PrefabBundle::new(&path), PrefabMarker));
                                 } else if path.ends_with(".gltf") || path.ends_with(".glb") {
                                     commands.spawn((
-                                        SpatialBundle::default(),
+                                        Visibility::default(),
+                                        Transform::default(),
                                         GltfPrefab {
                                             path,
                                             scene: "Scene0".into(),
@@ -548,7 +559,7 @@ pub fn top_menu(
                             color: STROKE_COLOR,
                         });
                 if ui.add(play_button).clicked() {
-                    editor_events.send(EditorEvent::StartGame);
+                    editor_events.write(EditorEvent::StartGame);
                 }
 
                 ui.with_layout(egui::Layout::right_to_left(egui::Align::RIGHT), |ui| {
@@ -562,7 +573,7 @@ pub fn top_menu(
                             .show(ctx, |ui| {
                                 ui.vertical_centered_justified(|ui| {
                                     if ui.add(egui::Button::new("Clear all 🗑")).clicked() {
-                                        clear_toast.send(ClearToastMessage::all());
+                                        clear_toast.write(ClearToastMessage::all());
                                     };
                                 });
                                 egui::Grid::new("error_console_log").show(ui, |ui| {
@@ -572,7 +583,7 @@ pub fn top_menu(
                                         ui.label(RichText::new("ERROR").color(ERROR_COLOR));
                                         ui.label(error);
                                         if ui.button("🗙").clicked() {
-                                            clear_toast.send(ClearToastMessage::error(index));
+                                            clear_toast.write(ClearToastMessage::error(index));
                                         }
                                         ui.end_row();
                                     }
@@ -582,7 +593,7 @@ pub fn top_menu(
                                         ui.label(RichText::new("WARN ").color(WARN_COLOR));
                                         ui.label(warning);
                                         if ui.button("🗙").clicked() {
-                                            clear_toast.send(ClearToastMessage::warn(index));
+                                            clear_toast.write(ClearToastMessage::warn(index));
                                         }
                                         ui.end_row();
                                     }
@@ -633,7 +644,7 @@ pub fn top_menu(
 
     for event in events.read() {
         menu_state.path.clone_from(&event.path);
-        editor_events.send(EditorEvent::Load(EditorPrefabPath::File(format!(
+        editor_events.write(EditorEvent::Load(EditorPrefabPath::File(format!(
             "{}.scn.ron",
             menu_state.path.clone()
         ))));
diff --git a/crates/editor_ui/src/meshless_visualizer.rs b/crates/editor_ui/src/meshless_visualizer.rs
index f85b5689..cfecd05c 100644
--- a/crates/editor_ui/src/meshless_visualizer.rs
+++ b/crates/editor_ui/src/meshless_visualizer.rs
@@ -1,24 +1,21 @@
 use anyhow::anyhow;
 use bevy::{
-    math::primitives as math_shapes, prelude::*, render::view::RenderLayers, utils::HashMap,
+    math::primitives as math_shapes, prelude::*, render::view::RenderLayers,
 };
 use bevy_asset_loader::{
     asset_collection::AssetCollection,
     dynamic_asset::{DynamicAsset, DynamicAssetCollection},
     prelude::DynamicAssetType,
 };
-use bevy_mod_billboard::{
-    prelude::BillboardPlugin, BillboardMeshHandle, BillboardTextureBundle, BillboardTextureHandle,
-};
-use bevy_mod_picking::backends::raycast::{
-    bevy_mod_raycast::prelude::RaycastVisibility, RaycastBackendSettings,
-};
+use bevy_mod_billboard::prelude::BillboardPlugin;
+
 use space_prefab::editor_registry::EditorRegistryExt;
 use space_shared::*;
 
 use crate::{EditorGizmo, LAST_RENDER_LAYER};
 use space_editor_core::selected::Selected;
 
+/*
 #[derive(Default)]
 pub struct MeshlessVisualizerPlugin;
 
@@ -446,8 +443,8 @@ pub fn draw_light_gizmo(
 
                     // circle at the end of the light range at both angles
                     gizmos.circle(
-                        transform.translation + range,
-                        Dir3::new_unchecked(transform.back().normalize()),
+                        Isometry3d::new(transform.translation + range,
+                        Dir3::new_unchecked(transform.back().normalize())),
                         outer_rad,
                         spot.color.with_alpha(1.0),
                     );
@@ -542,3 +539,5 @@ mod tests {
         assert_eq!(query.iter(&app.world()).count(), 2);
     }
 }
+
+*/
diff --git a/crates/editor_ui/src/mouse_check.rs b/crates/editor_ui/src/mouse_check.rs
index 0d2aad34..139875e9 100644
--- a/crates/editor_ui/src/mouse_check.rs
+++ b/crates/editor_ui/src/mouse_check.rs
@@ -34,10 +34,10 @@ pub fn initialize_mouse_context(
     mut pointer_ctx: ResMut<PointerContextCheck>,
     window_q: Query<Entity, With<PrimaryWindow>>,
 ) {
-    if let Ok(window_id) = window_q.get_single() {
+    if let Ok(window_id) = window_q.single() {
         pointer_ctx.primary_window = Some(window_id);
     } else {
-        toast.send(ToastMessage::new(
+        toast.write(ToastMessage::new(
             "Could not get Primary Window",
             ToastKind::Error,
         ));
diff --git a/crates/editor_ui/src/selection.rs b/crates/editor_ui/src/selection.rs
index 9f2c1630..37e9d41d 100644
--- a/crates/editor_ui/src/selection.rs
+++ b/crates/editor_ui/src/selection.rs
@@ -1,102 +1,136 @@
 use crate::*;
-use bevy::prelude::*;
+use bevy::{color::palettes::tailwind::{PINK_100, RED_500}, picking::pointer::PointerInteraction, prelude::*};
 
-pub struct EditorPickingPlugin;
 
-impl Plugin for EditorPickingPlugin {
-    #[cfg(not(tarpaulin_include))]
-    fn build(&self, app: &mut App) {
-        app.add_plugins(bevy_mod_picking::DefaultPickingPlugins);
 
-        if let Some(mut raycast_backend) =
-            app.world_mut()
-                .get_resource_mut::<bevy_mod_picking::backends::raycast::RaycastBackendSettings>()
-        {
-            raycast_backend.require_markers = true;
-        }
+#[cfg(not(tarpaulin_include))]
+pub fn plugin(app: &mut App) {
+    app.add_plugins(MeshPickingPlugin);
+
+
+    app.add_systems(
+        Update,
+        (delete_selected, reemit_pointer_click, auto_add_markers)
+    );
+
+    app.add_systems(
+        Update,
+        draw_mesh_intersections.run_if(in_state(EditorState::Editor))
+    );
+
+    app.add_event::<AddMarkersEvent>();
+
+    app.add_observer(select_listener);
+    app.add_observer(recursive_add_markers);
+
+    app.insert_resource(MeshPickingSettings {
+        require_markers: true,
+        ray_cast_visibility: RayCastVisibility::VisibleInView
+    });
+}
 
-        app.add_systems(
-            PostUpdate,
-            (auto_add_picking, select_listener.after(UiSystemSet))
-                .run_if(in_state(EditorState::Editor)),
-        );
-        app.add_systems(PostUpdate, auto_add_picking_dummy);
+fn auto_add_markers(
+    mut commands: Commands,
+    q_prefabs: Query<Entity, (With<PrefabMarker>, Without<MeshPickingCamera>)>,
+    q_cameras: Query<Entity, (With<Camera3d>, Without<MeshPickingCamera>)>,
+) {
+    for entity in q_prefabs.iter() {
+        commands.trigger_targets(AddMarkersEvent, entity);
+    }
+
+    for entity in q_cameras.iter() {
+        commands.entity(entity).insert(MeshPickingCamera);
     }
 }
 
-pub fn auto_add_picking(
+#[derive(Event, Clone)]
+struct AddMarkersEvent;
+
+fn recursive_add_markers(
+    trigger: Trigger<AddMarkersEvent>,
+    q_children: Query<&Children>,
+    q_meshes: Query<Entity, With<Mesh3d>>,
     mut commands: Commands,
-    query: Query<Entity, (With<PrefabMarker>, Without<Pickable>)>,
 ) {
-    for e in query.iter() {
-        commands.entity(e).insert((
-            PickableBundle::default(),
-            On::<Pointer<Down>>::send_event::<SelectEvent>(),
-            RaycastPickable,
-        ));
+    if q_meshes.contains(trigger.target()) {
+        commands.entity(trigger.target()).insert(Pickable {
+            should_block_lower: true,
+            is_hoverable: true,
+        });
+    }
+
+    if let Ok(children) = q_children.get(trigger.target()) {
+        for child in children.iter() {
+            commands.trigger_targets(AddMarkersEvent, child.entity());
+        }
+    }
+}
+
+/// From bevy examples
+/// A system that draws hit indicators for every pointer.
+fn draw_mesh_intersections(pointers: Query<&PointerInteraction>, mut gizmos: Gizmos) {
+    for (point, normal) in pointers
+        .iter()
+        .filter_map(|interaction| interaction.get_nearest_hit())
+        .filter_map(|(_entity, hit)| hit.position.zip(hit.normal))
+    {
+        gizmos.sphere(point, 0.05, RED_500);
+        gizmos.arrow(point, point + normal.normalize() * 0.5, PINK_100);
     }
 }
 
-//Auto add picking for each child to propagate picking event up to prefab entity
-pub fn auto_add_picking_dummy(
+/// Reemits the pointer click event to the entity that is being clicked on
+/// Its not a good solution, but it works for now
+fn reemit_pointer_click(
+    pointers: Query<&PointerInteraction>,
     mut commands: Commands,
-    query: Query<(Entity, &Handle<Mesh>), AutoAddQueryFilter>,
-    meshs: Res<Assets<Mesh>>,
+    q_meshes: Query<Entity, With<Mesh3d>>,
 ) {
-    for (e, mesh) in query.iter() {
-        //Only meshed entity need to be pickable
-        if let Some(mesh) = meshs.get(mesh) {
-            if mesh.primitive_topology() == PrimitiveTopology::TriangleList {
-                commands
-                    .entity(e)
-                    .insert((PickableBundle::default(), RaycastPickable));
+    for pointer in pointers.iter() {
+        if let Some((e, _)) = pointer.get_nearest_hit() {
+            if q_meshes.contains(*e) {
+                commands.trigger_targets(SelectEvent, *e);
             }
         }
     }
 }
 
 pub fn select_listener(
+    mut trigger: Trigger<SelectEvent>,
     mut commands: Commands,
     query: Query<Entity, With<Selected>>,
     // may need to be optimized a bit so that there is less overlap
     prefabs: Query<Entity, With<PrefabMarker>>,
-    parents: Query<&Parent>,
-    mut events: EventReader<SelectEvent>,
+    parents: Query<&ChildOf>,
     pan_orbit_state: ResMut<EditorCameraEnabled>,
     keyboard: Res<ButtonInput<KeyCode>>,
 ) {
+
     if !pan_orbit_state.0 {
-        events.clear();
+        trigger.propagate(false);
         return;
     }
 
-    let mut stack = events.read().cloned().collect::<Vec<_>>();
-
-    while let Some(event) = stack.pop() {
-        info!("Select Event: {:?}", event.e);
-
-        if let Ok(entity) = prefabs.get(event.e) {
-            match event.event.button {
-                PointerButton::Primary => {
-                    commands.entity(entity).insert(Selected);
-                    if !keyboard.pressed(KeyCode::ShiftLeft) {
-                        for e in query.iter() {
-                            commands.entity(e).remove::<Selected>();
-                        }
-                    }
-                }
-                PointerButton::Secondary => { /*Show context menu?*/ }
-                PointerButton::Middle => {}
+    info!("Select Event: {:?}", trigger.target());
+
+    if let Ok(entity) = prefabs.get(trigger.target()) {
+        commands.entity(entity).insert(Selected);
+        if !keyboard.pressed(KeyCode::ShiftLeft) {
+            for e in query.iter() {
+                commands.entity(e).remove::<Selected>();
             }
-        } else if let Ok(parent) = parents.get(event.e) {
-            stack.push(SelectEvent {
-                e: parent.get(),
-                event: event.event.clone(),
-            });
         }
+    } else if let Ok(parent) = parents.get(trigger.target()) {
+        // Just stupid propagation (Need to make it with Event trait)
+        commands.trigger_targets(SelectEvent, parent.parent()); 
     }
 }
 
+
+/// This event used for selecting entities
+#[derive(Event, Clone)]
+pub struct SelectEvent;
+
 pub fn delete_selected(
     mut commands: Commands,
     query: Query<Entity, With<Selected>>,
@@ -109,24 +143,8 @@ pub fn delete_selected(
     if ctrl && shift && delete {
         for entity in query.iter() {
             info!("Delete Entity: {entity:?}");
-            commands.entity(entity).despawn_recursive();
+            commands.entity(entity).despawn();
         }
     }
 }
 
-impl From<ListenerInput<Pointer<Down>>> for SelectEvent {
-    fn from(value: ListenerInput<Pointer<Down>>) -> Self {
-        Self {
-            e: value.target(),
-            event: value,
-        }
-    }
-}
-
-/// This event used for selecting entities
-#[derive(Event, Clone, EntityEvent)]
-pub struct SelectEvent {
-    #[target]
-    e: Entity,
-    event: ListenerInput<Pointer<Down>>,
-}
diff --git a/crates/editor_ui/src/settings.rs b/crates/editor_ui/src/settings.rs
index 5644c56c..7070e3a1 100644
--- a/crates/editor_ui/src/settings.rs
+++ b/crates/editor_ui/src/settings.rs
@@ -1,8 +1,7 @@
 use std::fmt::Display;
 
 use bevy::{
-    prelude::*,
-    utils::{HashMap, HashSet},
+    platform::collections::{HashMap, HashSet}, prelude::*
 };
 use bevy_egui::*;
 use space_editor_core::hotkeys::AllHotkeys;
diff --git a/crates/editor_ui/src/tools/gizmo.rs b/crates/editor_ui/src/tools/gizmo.rs
index c4739759..04914f20 100644
--- a/crates/editor_ui/src/tools/gizmo.rs
+++ b/crates/editor_ui/src/tools/gizmo.rs
@@ -2,7 +2,8 @@ use bevy::{prelude::*, render::camera::CameraProjection};
 use bevy_egui::egui::{self, Key};
 use space_editor_core::prelude::*;
 use space_shared::*;
-use transform_gizmo_egui::{EnumSet, Gizmo, GizmoExt, GizmoMode};
+use transform_gizmo_bevy::{EnumSet, Gizmo, GizmoMode};
+use transform_gizmo_egui::GizmoExt;
 
 use crate::EditorGizmo;
 use crate::{colors::*, sizing::Sizing};
@@ -88,26 +89,26 @@ const MODE_TO_KEY: [(EnumSet<GizmoMode>, GizmoHotkey); 3] = [
     (GizmoMode::all_scale(), GizmoHotkey::Scale),
 ];
 
-fn bevy_to_gizmo_transform(transform: &Transform) -> transform_gizmo_egui::math::Transform {
-    transform_gizmo_egui::math::Transform {
-        scale: transform_gizmo_egui::mint::Vector3::<f64>::from_slice(
+fn bevy_to_gizmo_transform(transform: &Transform) -> transform_gizmo_bevy::math::Transform {
+    transform_gizmo_bevy::math::Transform {
+        scale: transform_gizmo_bevy::mint::Vector3::<f64>::from_slice(
             &transform.scale.as_dvec3().to_array(),
         ),
-        rotation: transform_gizmo_egui::mint::Quaternion::<f64> {
-            v: transform_gizmo_egui::mint::Vector3::<f64> {
+        rotation: transform_gizmo_bevy::mint::Quaternion::<f64> {
+            v: transform_gizmo_bevy::mint::Vector3::<f64> {
                 x: transform.rotation.x as f64,
                 y: transform.rotation.y as f64,
                 z: transform.rotation.z as f64,
             },
             s: transform.rotation.w as f64,
         },
-        translation: transform_gizmo_egui::mint::Vector3::<f64>::from_slice(
+        translation: transform_gizmo_bevy::mint::Vector3::<f64>::from_slice(
             &transform.translation.as_dvec3().to_array(),
         ),
     }
 }
 
-fn gizmo_to_bevy_transform(transform: &transform_gizmo_egui::math::Transform) -> Transform {
+fn gizmo_to_bevy_transform(transform: &transform_gizmo_bevy::math::Transform) -> Transform {
     Transform {
         scale: Vec3::new(
             transform.scale.x as f32,
@@ -194,7 +195,7 @@ impl EditorTool for GizmoTool {
         if del {
             let mut query = world.query_filtered::<Entity, With<Selected>>();
             for e in query.iter(world) {
-                commands.entity(e).despawn_recursive();
+                commands.entity(e).despawn();
             }
             return;
         }
@@ -202,7 +203,7 @@ impl EditorTool for GizmoTool {
         let (cam_transform, cam_proj) = {
             let mut cam_query =
                 world.query_filtered::<(&GlobalTransform, &Projection), With<EditorCameraMarker>>();
-            let Ok((ref_tr, ref_cam)) = cam_query.get_single(world) else {
+            let Ok((ref_tr, ref_cam)) = cam_query.single(world) else {
                 return;
             };
             (*ref_tr, ref_cam.clone())
@@ -220,7 +221,7 @@ impl EditorTool for GizmoTool {
         if multiple_pressed {
             let mut mean_transform = Transform::IDENTITY;
             for e in &selected {
-                let Some(ecell) = cell.get_entity(*e) else {
+                let Ok(ecell) = cell.get_entity(*e) else {
                     continue;
                 };
                 let Some(global_transform) = (unsafe { ecell.get::<GlobalTransform>() }) else {
@@ -243,7 +244,7 @@ impl EditorTool for GizmoTool {
 
             let mut loc_transform = vec![];
             for e in &selected {
-                let Some(ecell) = cell.get_entity(*e) else {
+                let Ok(ecell) = cell.get_entity(*e) else {
                     continue;
                 };
                 let Some(global_transform) = (unsafe { ecell.get::<GlobalTransform>() }) else {
@@ -255,37 +256,37 @@ impl EditorTool for GizmoTool {
             let mut gizmo_interacted = false;
 
             let proj_mat = cam_proj.get_clip_from_view();
-            let proj_mat = transform_gizmo_egui::math::DMat4 {
-                x_axis: transform_gizmo_egui::math::DVec4::from_array(
+            let proj_mat = transform_gizmo_bevy::math::DMat4 {
+                x_axis: transform_gizmo_bevy::math::DVec4::from_array(
                     proj_mat.x_axis.as_dvec4().to_array(),
                 ),
-                y_axis: transform_gizmo_egui::math::DVec4::from_array(
+                y_axis: transform_gizmo_bevy::math::DVec4::from_array(
                     proj_mat.y_axis.as_dvec4().to_array(),
                 ),
-                z_axis: transform_gizmo_egui::math::DVec4::from_array(
+                z_axis: transform_gizmo_bevy::math::DVec4::from_array(
                     proj_mat.z_axis.as_dvec4().to_array(),
                 ),
-                w_axis: transform_gizmo_egui::math::DVec4::from_array(
+                w_axis: transform_gizmo_bevy::math::DVec4::from_array(
                     proj_mat.w_axis.as_dvec4().to_array(),
                 ),
             };
 
-            let view_matrix = transform_gizmo_egui::math::DMat4 {
-                x_axis: transform_gizmo_egui::math::DVec4::from_array(
+            let view_matrix = transform_gizmo_bevy::math::DMat4 {
+                x_axis: transform_gizmo_bevy::math::DVec4::from_array(
                     view_matrix.x_axis.as_dvec4().to_array(),
                 ),
-                y_axis: transform_gizmo_egui::math::DVec4::from_array(
+                y_axis: transform_gizmo_bevy::math::DVec4::from_array(
                     view_matrix.y_axis.as_dvec4().to_array(),
                 ),
-                z_axis: transform_gizmo_egui::math::DVec4::from_array(
+                z_axis: transform_gizmo_bevy::math::DVec4::from_array(
                     view_matrix.z_axis.as_dvec4().to_array(),
                 ),
-                w_axis: transform_gizmo_egui::math::DVec4::from_array(
+                w_axis: transform_gizmo_bevy::math::DVec4::from_array(
                     view_matrix.w_axis.as_dvec4().to_array(),
                 ),
             };
 
-            let gizmo_config = transform_gizmo_egui::GizmoConfig {
+            let gizmo_config = transform_gizmo_bevy::GizmoConfig {
                 projection_matrix: proj_mat.into(),
                 view_matrix: view_matrix.into(),
                 modes: self.gizmo_mode.into(),
@@ -321,7 +322,7 @@ impl EditorTool for GizmoTool {
 
             if gizmo_interacted {
                 for (idx, e) in selected.iter().enumerate() {
-                    let Some(ecell) = cell.get_entity(*e) else {
+                    let Ok(ecell) = cell.get_entity(*e) else {
                         continue;
                     };
                     let Some(mut transform) = (unsafe { ecell.get_mut::<Transform>() }) else {
@@ -330,8 +331,8 @@ impl EditorTool for GizmoTool {
 
                     let new_global = global_mean.mul_transform(loc_transform[idx]);
 
-                    if let Some(parent) = unsafe { ecell.get::<Parent>() } {
-                        if let Some(parent) = cell.get_entity(parent.get()) {
+                    if let Some(parent) = unsafe { ecell.get::<ChildOf>() } {
+                        if let Ok(parent) = cell.get_entity(parent.parent()) {
                             if let Some(parent_global) = unsafe { parent.get::<GlobalTransform>() }
                             {
                                 *transform = new_global.reparented_to(parent_global);
@@ -349,7 +350,7 @@ impl EditorTool for GizmoTool {
             }
 
             for e in &selected {
-                let Some(ecell) = cell.get_entity(*e) else {
+                let Ok(ecell) = cell.get_entity(*e) else {
                     continue;
                 };
                 let Some(mut transform) = (unsafe { ecell.get_mut::<Transform>() }) else {
@@ -357,37 +358,37 @@ impl EditorTool for GizmoTool {
                 };
 
                 let proj_mat = cam_proj.get_clip_from_view();
-                let proj_mat = transform_gizmo_egui::math::DMat4 {
-                    x_axis: transform_gizmo_egui::math::DVec4::from_array(
+                let proj_mat = transform_gizmo_bevy::math::DMat4 {
+                    x_axis: transform_gizmo_bevy::math::DVec4::from_array(
                         proj_mat.x_axis.as_dvec4().to_array(),
                     ),
-                    y_axis: transform_gizmo_egui::math::DVec4::from_array(
+                    y_axis: transform_gizmo_bevy::math::DVec4::from_array(
                         proj_mat.y_axis.as_dvec4().to_array(),
                     ),
-                    z_axis: transform_gizmo_egui::math::DVec4::from_array(
+                    z_axis: transform_gizmo_bevy::math::DVec4::from_array(
                         proj_mat.z_axis.as_dvec4().to_array(),
                     ),
-                    w_axis: transform_gizmo_egui::math::DVec4::from_array(
+                    w_axis: transform_gizmo_bevy::math::DVec4::from_array(
                         proj_mat.w_axis.as_dvec4().to_array(),
                     ),
                 };
 
-                let view_matrix = transform_gizmo_egui::math::DMat4 {
-                    x_axis: transform_gizmo_egui::math::DVec4::from_array(
+                let view_matrix = transform_gizmo_bevy::math::DMat4 {
+                    x_axis: transform_gizmo_bevy::math::DVec4::from_array(
                         view_matrix.x_axis.as_dvec4().to_array(),
                     ),
-                    y_axis: transform_gizmo_egui::math::DVec4::from_array(
+                    y_axis: transform_gizmo_bevy::math::DVec4::from_array(
                         view_matrix.y_axis.as_dvec4().to_array(),
                     ),
-                    z_axis: transform_gizmo_egui::math::DVec4::from_array(
+                    z_axis: transform_gizmo_bevy::math::DVec4::from_array(
                         view_matrix.z_axis.as_dvec4().to_array(),
                     ),
-                    w_axis: transform_gizmo_egui::math::DVec4::from_array(
+                    w_axis: transform_gizmo_bevy::math::DVec4::from_array(
                         view_matrix.w_axis.as_dvec4().to_array(),
                     ),
                 };
 
-                let gizmo_config = transform_gizmo_egui::GizmoConfig {
+                let gizmo_config = transform_gizmo_bevy::GizmoConfig {
                     projection_matrix: proj_mat.into(),
                     view_matrix: view_matrix.into(),
                     modes: self.gizmo_mode.into(),
@@ -395,8 +396,8 @@ impl EditorTool for GizmoTool {
                     ..Default::default()
                 };
 
-                if let Some(parent) = unsafe { ecell.get::<Parent>() } {
-                    if let Some(parent) = cell.get_entity(parent.get()) {
+                if let Some(parent) = unsafe { ecell.get::<ChildOf>() } {
+                    if let Ok(parent) = cell.get_entity(parent.parent()) {
                         if let Some(parent_global) = unsafe { parent.get::<GlobalTransform>() } {
                             if let Some(global) = unsafe { ecell.get::<GlobalTransform>() } {
                                 self.gizmo.update_config(gizmo_config);
diff --git a/crates/editor_ui/src/ui_plugin.rs b/crates/editor_ui/src/ui_plugin.rs
index 6df0a74b..4bf2ed40 100644
--- a/crates/editor_ui/src/ui_plugin.rs
+++ b/crates/editor_ui/src/ui_plugin.rs
@@ -1,7 +1,8 @@
 use crate::tools::gizmo::*;
 use crate::*;
 use bevy::{ecs::schedule::ScheduleLabel, prelude::*};
-use meshless_visualizer::draw_light_gizmo;
+use bevy::gizmos::config::GizmoConfigGroup;
+//use meshless_visualizer::draw_light_gizmo;
 
 use self::{change_chain::ChangeChainViewPlugin, editor_tab_name::EditorTabName};
 
@@ -36,9 +37,11 @@ pub struct EditorGizmo;
 impl FlatPluginList for EditorUiPlugin {
     #[cfg(not(tarpaulin_include))]
     fn add_plugins_to_group(&self, group: PluginGroupBuilder) -> PluginGroupBuilder {
+        use bevy_egui::EguiPlugin;
+
         let mut res = group
             .add(SelectedPlugin)
-            .add(MeshlessVisualizerPlugin)
+            //.add(MeshlessVisualizerPlugin)
             .add(EditorUiCore::default())
             .add(GameViewPlugin)
             .add(menu_toolbars::BottomMenuPlugin)
@@ -49,6 +52,7 @@ impl FlatPluginList for EditorUiPlugin {
             .add(GizmoToolPlugin)
             .add(ChangeChainViewPlugin)
             .add(settings::SettingsWindowPlugin);
+        
 
         if self.use_standard_layout {
             res = res.add(DefaultEditorLayoutPlugin);
@@ -103,6 +107,8 @@ impl Plugin for EditorUiCore {
     fn build(&self, app: &mut App) {
         use bevy::app::MainScheduleOrder;
 
+        info!("EditorUiCore build");
+
         app.init_state::<ShowEditorUi>();
         app.init_resource::<EditorUi>();
 
@@ -110,7 +116,7 @@ impl Plugin for EditorUiCore {
             Update,
             UiSystemSet
                 .in_set(EditorSet::Editor)
-                .run_if(in_state(EditorState::Editor).and_then(in_state(ShowEditorUi::Show))),
+                .run_if(in_state(EditorState::Editor).and(in_state(ShowEditorUi::Show))),
         );
 
         app.init_resource::<ScheduleEditorTabStorage>();
@@ -161,12 +167,13 @@ impl Plugin for EditorUiCore {
             .resource_mut::<MainScheduleOrder>()
             .insert_after(StateTransition, AfterStateTransition);
 
-        app.add_systems(Startup, (set_start_state, apply_deferred).chain());
+        app.add_systems(Startup, (set_start_state, ApplyDeferred).chain());
 
         //play systems
         app.add_systems(OnEnter(EditorState::GamePrepare), save_prefab_before_play);
         // clean up meshless children on entering the game state
-        app.add_systems(OnEnter(EditorState::GamePrepare), clean_meshless);
+
+        //app.add_systems(OnEnter(EditorState::GamePrepare), clean_meshless);
         app.add_systems(
             OnEnter(SaveState::Idle),
             to_game_after_save.run_if(in_state(EditorState::GamePrepare)),
@@ -183,10 +190,10 @@ impl Plugin for EditorUiCore {
             Update,
             (
                 draw_camera_gizmo,
-                draw_light_gizmo,
-                selection::delete_selected,
+                //draw_light_gizmo,
+                //selection::delete_selected,
             )
-                .run_if(in_state(EditorState::Editor).and_then(in_state(ShowEditorUi::Show))),
+                .run_if(in_state(EditorState::Editor).and(in_state(ShowEditorUi::Show))),
         );
 
         if self.disable_no_editor_cams {
@@ -198,7 +205,7 @@ impl Plugin for EditorUiCore {
             app.add_systems(OnEnter(EditorState::Editor), change_camera_in_editor);
         }
 
-        app.add_event::<selection::SelectEvent>();
+        //app.add_event::<selection::SelectEvent>();
 
         app.init_resource::<BundleReg>();
     }
@@ -210,7 +217,7 @@ pub fn ui_camera_block(
     mut state: ResMut<EditorCameraEnabled>,
     game_view: Res<GameViewTab>,
 ) {
-    let Ok(mut ctx_ref) = ctxs.get_single_mut() else {
+    let Ok(mut ctx_ref) = ctxs.single_mut() else {
         return;
     };
     let ctx = ctx_ref.get_mut();
diff --git a/crates/editor_ui/src/ui_registration.rs b/crates/editor_ui/src/ui_registration.rs
index dba2e448..ec9be1f1 100644
--- a/crates/editor_ui/src/ui_registration.rs
+++ b/crates/editor_ui/src/ui_registration.rs
@@ -134,7 +134,7 @@ pub fn register_mesh_editor_bundles(app: &mut App) {
             MeshPrimitive3dPrefab::Cube(1.0),
             Name::new("Cube".to_string()),
             Transform::default(),
-            VisibilityBundle::default(),
+            Visibility::default(),
         ),
     );
     app.editor_bundle(
@@ -145,7 +145,7 @@ pub fn register_mesh_editor_bundles(app: &mut App) {
             MeshPrimitive3dPrefab::Box(BoxPrefab::default()),
             Name::new("Box".to_string()),
             Transform::default(),
-            VisibilityBundle::default(),
+            Visibility::default(),
         ),
     );
     app.editor_bundle(
@@ -156,7 +156,7 @@ pub fn register_mesh_editor_bundles(app: &mut App) {
             MeshPrimitive3dPrefab::Sphere(SpherePrefab::default()),
             Name::new("UVSphere".to_string()),
             Transform::default(),
-            VisibilityBundle::default(),
+            Visibility::default(),
         ),
     );
     app.editor_bundle(
@@ -167,7 +167,7 @@ pub fn register_mesh_editor_bundles(app: &mut App) {
             MeshPrimitive3dPrefab::Quad(QuadPrefab::default()),
             Name::new("Rectagle".to_string()),
             Transform::default(),
-            VisibilityBundle::default(),
+            Visibility::default(),
         ),
     );
     app.editor_bundle(
@@ -178,7 +178,7 @@ pub fn register_mesh_editor_bundles(app: &mut App) {
             MeshPrimitive3dPrefab::Capsule(CapsulePrefab::default()),
             Name::new("Capsule"),
             Transform::default(),
-            VisibilityBundle::default(),
+            Visibility::default(),
         ),
     );
     app.editor_bundle(
@@ -189,7 +189,7 @@ pub fn register_mesh_editor_bundles(app: &mut App) {
             MeshPrimitive3dPrefab::Circle(CirclePrefab::default()),
             Name::new("Circle".to_string()),
             Transform::default(),
-            VisibilityBundle::default(),
+            Visibility::default(),
         ),
     );
     app.editor_bundle(
@@ -200,7 +200,7 @@ pub fn register_mesh_editor_bundles(app: &mut App) {
             MeshPrimitive3dPrefab::Cylinder(CylinderPrefab::default()),
             Name::new("Cylinder".to_string()),
             Transform::default(),
-            VisibilityBundle::default(),
+            Visibility::default(),
         ),
     );
     app.editor_bundle(
@@ -211,7 +211,7 @@ pub fn register_mesh_editor_bundles(app: &mut App) {
             MeshPrimitive3dPrefab::Plane(Plane3dPrefab::default()),
             Name::new("Plane".to_string()),
             Transform::default(),
-            VisibilityBundle::default(),
+            Visibility::default(),
         ),
     );
     app.editor_bundle(
@@ -222,7 +222,7 @@ pub fn register_mesh_editor_bundles(app: &mut App) {
             MeshPrimitive3dPrefab::PlaneMultipoint(PlaneMultiPointPrefab::default()),
             Name::new("Plane Multipoint".to_string()),
             Transform::default(),
-            VisibilityBundle::default(),
+            Visibility::default(),
         ),
     );
     app.editor_bundle(
@@ -233,7 +233,7 @@ pub fn register_mesh_editor_bundles(app: &mut App) {
             MeshPrimitive3dPrefab::RegularPolygon(RegularPolygonPrefab::default()),
             Name::new("Regular Polygon".to_string()),
             Transform::default(),
-            VisibilityBundle::default(),
+            Visibility::default(),
         ),
     );
     app.editor_bundle(
@@ -244,7 +244,7 @@ pub fn register_mesh_editor_bundles(app: &mut App) {
             MeshPrimitive3dPrefab::Torus(TorusPrefab::default()),
             Name::new("Torus".to_string()),
             Transform::default(),
-            VisibilityBundle::default(),
+            Visibility::default(),
         ),
     );
 
@@ -256,7 +256,7 @@ pub fn register_mesh_editor_bundles(app: &mut App) {
             MeshPrimitive2dPrefab::Rectagle(QuadPrefab::default()),
             Name::new("2D Quad".to_string()),
             Transform::default(),
-            VisibilityBundle::default(),
+            Visibility::default(),
         ),
     );
 
@@ -268,7 +268,7 @@ pub fn register_mesh_editor_bundles(app: &mut App) {
             MeshPrimitive2dPrefab::Circle(CirclePrefab::default()),
             Name::new("2D Circle".to_string()),
             Transform::default(),
-            VisibilityBundle::default(),
+            Visibility::default(),
         ),
     );
 
@@ -280,7 +280,7 @@ pub fn register_mesh_editor_bundles(app: &mut App) {
             MeshPrimitive2dPrefab::Ellipse(EllipsePrefab::default()),
             Name::new("2D Ellipse".to_string()),
             Transform::default(),
-            VisibilityBundle::default(),
+            Visibility::default(),
         ),
     );
 
@@ -292,7 +292,7 @@ pub fn register_mesh_editor_bundles(app: &mut App) {
             MeshPrimitive2dPrefab::Triangle(TrianglePrefab::default()),
             Name::new("2D Triangle".to_string()),
             Transform::default(),
-            VisibilityBundle::default(),
+            Visibility::default(),
         ),
     );
 
@@ -304,7 +304,7 @@ pub fn register_mesh_editor_bundles(app: &mut App) {
             MeshPrimitive2dPrefab::Triangle(TrianglePrefab::default()),
             Name::new("2D Triangle".to_string()),
             Transform::default(),
-            VisibilityBundle::default(),
+            Visibility::default(),
         ),
     );
 
@@ -316,7 +316,7 @@ pub fn register_mesh_editor_bundles(app: &mut App) {
             MeshPrimitive2dPrefab::RegularPolygon(RegularPolygonPrefab::default()),
             Name::new("2D Regular Polygon".to_string()),
             Transform::default(),
-            VisibilityBundle::default(),
+            Visibility::default(),
         ),
     );
 
@@ -330,7 +330,7 @@ pub fn register_mesh_editor_bundles(app: &mut App) {
             Projection::Perspective(PerspectiveProjection::default()),
             Name::new("Camera3d".to_string()),
             Transform::default(),
-            VisibilityBundle::default(),
+            Visibility::default(),
             PlaymodeCamera::default(),
             PrefabMarker,
             CameraRenderGraph::new(bevy::core_pipeline::core_3d::graph::Core3d),
@@ -344,7 +344,7 @@ pub fn register_mesh_editor_bundles(app: &mut App) {
             Camera2d {},
             Name::new("Camera2d".to_string()),
             Transform::default(),
-            VisibilityBundle::default(),
+            Visibility::default(),
             PlaymodeCamera::default(),
             CameraRenderGraph::new(bevy::core_pipeline::core_2d::graph::Core2d),
             PrefabMarker,
@@ -355,14 +355,13 @@ pub fn register_mesh_editor_bundles(app: &mut App) {
         "Sprite",
         "Blank Sprite",
         (
-            SpriteBundle {
-                sprite: Sprite {
-                    color: bevy::prelude::Color::Srgba(bevy::color::palettes::css::BLUE),
-                    custom_size: Some(Vec2::new(100.0, 100.0)),
-                    ..default()
-                },
+            Sprite {
+                color: bevy::prelude::Color::Srgba(bevy::color::palettes::css::BLUE),
+                custom_size: Some(Vec2::new(100.0, 100.0)),
                 ..default()
             },
+            Visibility::default(),
+            Transform::default(),
             Name::new("Sprite".to_string()),
             PrefabMarker,
         ),
diff --git a/crates/persistence/src/lib.rs b/crates/persistence/src/lib.rs
index 17707993..dbfad170 100644
--- a/crates/persistence/src/lib.rs
+++ b/crates/persistence/src/lib.rs
@@ -2,15 +2,14 @@
 
 #[cfg(test)]
 mod tests;
+use std::io::Write;
+
 // This part of code is used for saving and loading settings and window state
 use bevy::{
-    prelude::*,
-    reflect::{
+    platform::collections::HashMap, prelude::*, reflect::{
         serde::{ReflectDeserializer, ReflectSerializer},
         GetTypeRegistration,
-    },
-    utils::HashMap,
-    window::WindowCloseRequested,
+    }, window::WindowCloseRequested
 };
 use ron::ser::PrettyConfig;
 use serde::de::DeserializeSeed;
@@ -62,7 +61,7 @@ fn persistence_save_on_close(
     mut close_events: EventReader<WindowCloseRequested>,
 ) {
     if settings.save_on_close && close_events.read().next().is_some() {
-        events.send(PersistenceEvent::Save);
+        events.write(PersistenceEvent::Save);
     }
 }
 
@@ -71,7 +70,7 @@ fn persistence_startup_load(
     settings: Res<PersistenceSettings>,
 ) {
     if settings.load_on_startup {
-        events.send(PersistenceEvent::Load);
+        events.write(PersistenceEvent::Load);
     }
 }
 
@@ -83,7 +82,7 @@ fn persistence_start(
     for event in events.read() {
         match event {
             PersistenceEvent::Save => {
-                broadcast.send(PersistenceResourceBroadcastEvent::Pack);
+                broadcast.write(PersistenceResourceBroadcastEvent::Pack);
                 persistence.mode = PersistenceMode::Saving;
                 persistence.save_counter = 0;
             }
@@ -102,7 +101,7 @@ fn persistence_start(
                     }
                 }
 
-                broadcast.send(PersistenceResourceBroadcastEvent::Unpack);
+                broadcast.write(PersistenceResourceBroadcastEvent::Unpack);
                 persistence.mode = PersistenceMode::Loading;
                 persistence.load_counter = 0;
             }
@@ -124,13 +123,49 @@ fn persistence_end(mut persistence: ResMut<PersistenceRegistry>) {
 
             match &persistence.source {
                 PersistenceDataSource::File(path) => {
-                    let mut file = std::fs::File::create(path).unwrap();
-                    ron::ser::to_writer_pretty(
-                        &mut file,
+                    //let mut file = std::fs::File::create(path).unwrap();
+                    //ron::ser::to_writer_pretty(
+                    //    &mut file,
+                    //    &persistence.data,
+                    //    PrettyConfig::default(),
+                    //)
+                    //.unwrap();
+
+                    // 1. Serialize data to a RON string
+                    let ron_string = match ron::ser::to_string_pretty(
                         &persistence.data,
-                        PrettyConfig::default(),
-                    )
-                    .unwrap();
+                        PrettyConfig::default(), // Use your desired PrettyConfig
+                    ) {
+                        Ok(s) => s,
+                        Err(e) => {
+                            error!(
+                                "Persistence saving error: Failed to serialize data to RON for path {:?}: {}",
+                                path, e
+                            );
+                            return; // Or handle the error as appropriate
+                        }
+                    };
+
+                     // 2. Write the RON string to the file
+                     match std::fs::File::create(path) {
+                        Ok(mut file_handle) => {
+                            if let Err(e) = file_handle.write_all(ron_string.as_bytes()) {
+                                error!(
+                                    "Persistence saving error: Failed to write serialized data to file {:?}: {}",
+                                    path, e
+                                );
+                            } else {
+                                info!("Persistence: Successfully saved data to {:?}", path);
+                            }
+                        }
+                        Err(e) => {
+                            error!(
+                                "Persistence saving error: Failed to create file {:?}: {}",
+                                path, e
+                            );
+                        }
+                    }
+
                 }
                 PersistenceDataSource::Memory => {
                     //do nothing
@@ -354,7 +389,7 @@ fn persistence_resource_system<
                 (pipeline.load_fn)(resource.as_mut(), converted);
                 resource.set_changed();
 
-                persistence_loaded.send(PersistenceLoaded::<T>::default());
+                persistence_loaded.write(PersistenceLoaded::<T>::default());
                 persistence.load_counter += 1;
             }
         }
diff --git a/crates/prefab/src/component/material.rs b/crates/prefab/src/component/material.rs
index 3e57c396..877b439c 100644
--- a/crates/prefab/src/component/material.rs
+++ b/crates/prefab/src/component/material.rs
@@ -1,6 +1,7 @@
 use std::fs;
 
 use crate::ext::*;
+use bevy::{math::Affine2, sprite::AlphaMode2d};
 use bevy_inspector_egui::{inspector_options::ReflectInspectorOptions, InspectorOptions};
 
 /// Prefab component that store parameters and asset paths for creating [`StandardMaterial`]
@@ -123,6 +124,8 @@ impl ColorMaterialPrefab {
         ColorMaterial {
             color: self.color,
             texture,
+            alpha_mode: AlphaMode2d::Opaque,
+            uv_transform: Affine2::default(),
         }
     }
 }
@@ -240,7 +243,7 @@ mod tests {
         .add_systems(
             Update,
             |server: Res<AssetServer>, query: Query<&MaterialPrefab>| {
-                let material = query.single();
+                let material = query.single().unwrap();
                 let material = material.to_material(&server);
                 assert_eq!(material.base_color, Color::linear_rgb(1.0, 1.0, 1.0));
                 assert_eq!(material.emissive, Color::BLACK.into());
diff --git a/crates/prefab/src/component/mod.rs b/crates/prefab/src/component/mod.rs
index 0af30930..976da0c8 100644
--- a/crates/prefab/src/component/mod.rs
+++ b/crates/prefab/src/component/mod.rs
@@ -21,7 +21,7 @@ pub use player_start::*;
 /// NOT USED. Planned to be used in future for auto structs
 pub mod path;
 
-use bevy::{prelude::*, reflect::*, utils::HashMap};
+use bevy::{platform::collections::HashMap, prelude::*, reflect::*};
 
 /// External dependencies
 pub mod ext {
@@ -77,7 +77,7 @@ impl<T: Reflect + FromReflect + Default + Clone> AutoStruct<T> {
                 let Some(field) = s.field_at(idx) else {
                     continue;
                 };
-                if let Some(handle) = field.downcast_ref::<Handle<Image>>() {
+                if let Some(handle) = field.try_downcast_ref::<Handle<Image>>() {
                     if let Some(path) = handle.path() {
                         let path = path.path().to_str().unwrap_or("./assets").to_string();
                         paths.insert(field_name.to_string(), path);
@@ -100,9 +100,9 @@ impl<T: Reflect + FromReflect + Default + Clone> AutoStruct<T> {
                 for (field_name, path) in self.asset_paths.iter() {
                     if let Some(field) = s.field_mut(field_name) {
                         #[allow(clippy::option_if_let_else)]
-                        if let Some(handle) = field.downcast_mut::<Handle<Image>>() {
+                        if let Some(handle) = field.try_downcast_mut::<Handle<Image>>() {
                             *handle = assets.load(path);
-                        } else if let Some(handle) = field.downcast_mut::<Handle<Mesh>>() {
+                        } else if let Some(handle) = field.try_downcast_mut::<Handle<Mesh>>() {
                             *handle = assets.load(path);
                         }
                     }
diff --git a/crates/prefab/src/component/shape.rs b/crates/prefab/src/component/shape.rs
index 7016aa58..8877e255 100644
--- a/crates/prefab/src/component/shape.rs
+++ b/crates/prefab/src/component/shape.rs
@@ -417,7 +417,7 @@ impl PlaneMultiPointPrefab {
 pub struct RegularPolygonPrefab {
     pub circumcircle_radius: f32,
     #[inspector(min = 3)]
-    pub sides: usize,
+    pub sides: u32,
 }
 
 impl Default for RegularPolygonPrefab {
diff --git a/crates/prefab/src/component/sprite.rs b/crates/prefab/src/component/sprite.rs
index a10c455e..54dad942 100644
--- a/crates/prefab/src/component/sprite.rs
+++ b/crates/prefab/src/component/sprite.rs
@@ -1,5 +1,5 @@
 use crate::ext::*;
-use bevy::utils::HashMap;
+use bevy::platform::collections::HashMap;
 use bevy_inspector_egui::{inspector_options::ReflectInspectorOptions, InspectorOptions};
 
 use super::material::try_image;
@@ -12,13 +12,17 @@ pub struct SpriteTexture {
 }
 
 impl SpriteTexture {
-    /// Convert [`SpriteTexture`] to [`SpriteBundle`]
-    pub fn to_sprite(&self, asset_server: &AssetServer) -> Option<SpriteBundle> {
-        let texture = try_image(&self.texture, asset_server)?;
-        Some(SpriteBundle {
-            texture,
-            ..default()
-        })
+    /// Convert [`SpriteTexture`] to a setup with a [`Sprite`]
+    pub fn to_sprite(&self, asset_server: &AssetServer) -> Option<(Sprite, Transform, Visibility)> {
+        let texture_handle = asset_server.load(&self.texture);
+        Some((
+            Sprite {
+                image: texture_handle,
+                ..default()
+            },
+            Transform::default(),
+            Visibility::default(),
+        ))
     }
 }
 
@@ -170,18 +174,20 @@ pub fn animate_sprite(
         &AnimationIndicesSpriteSheet,
         &AnimationClipName,
         &mut AnimationTimerSpriteSheet,
-        &mut TextureAtlas,
+        &mut Sprite,
     )>,
 ) {
-    for (sheet_indices, name, mut timer, mut atlas) in &mut query {
+    for (sheet_indices, name, mut timer, mut sprite) in &mut query {
         timer.tick(time.delta());
         if timer.just_finished() {
             if let Some(indices) = sheet_indices.clips.get(&name.name) {
-                atlas.index = if atlas.index == indices.last {
-                    indices.first
-                } else {
-                    atlas.index + 1
-                };
+                if let Some(ref mut atlas) = sprite.texture_atlas {
+                    atlas.index = if atlas.index == indices.last {
+                        indices.first
+                    } else {
+                        atlas.index + 1
+                    };
+                }
             }
         }
     }
@@ -207,11 +213,18 @@ mod tests {
         ));
         let server = app.world().resource::<AssetServer>();
 
+        // Load the image and obtain its handle
+        let image_handle: Handle<Image> = server.load(&prefab.texture);
+
         let sprite = prefab.to_sprite(server);
 
         assert!(sprite.is_some());
-        let id = sprite.unwrap().texture.id();
-        assert!(server.get_id_handle(id).is_some());
+        // Extract the `image` handle from the sprite
+        let sprite = sprite.unwrap();
+        let sprite_image_handle = sprite.0.image;
+
+        // Assert that the handles are the same
+        assert_eq!(image_handle, sprite_image_handle);
     }
 
     #[test]
@@ -331,12 +344,19 @@ mod tests {
 
     #[test]
     fn animate_sprite_over_time() {
-        let setup = |mut commands: Commands| {
+        let setup = |mut commands: Commands, asset_server: Res<AssetServer>| {
+            let atlas_handle = asset_server.load("icons/GameraGizmo.png");
             commands.spawn((
                 AnimationIndicesSpriteSheet::default(),
                 AnimationClipName::default(),
                 AnimationTimerSpriteSheet::default(),
-                TextureAtlas::default(),
+                Sprite {
+                    texture_atlas: Some(TextureAtlas {
+                        layout: atlas_handle.clone(),
+                        index: 0,
+                    }),
+                    ..Default::default()
+                },
             ));
         };
         let mut app = App::new();
@@ -346,10 +366,13 @@ mod tests {
             .add_systems(Update, animate_sprite);
 
         app.update();
-        let mut query = app.world_mut().query::<&TextureAtlas>();
-
-        let atlas = query.single(&app.world());
+        let mut query = app.world_mut().query::<&Sprite>();
 
-        assert_eq!(atlas.index, 0);
+        let sprite = query.single(&app.world()).unwrap();
+        if let Some(texture_atlas) = sprite.texture_atlas.as_ref() {
+            assert_eq!(texture_atlas.index, 0);
+        } else {
+            panic!("TextureAtlas not set on sprite!");
+        }
     }
 }
diff --git a/crates/prefab/src/editor_registry/mod.rs b/crates/prefab/src/editor_registry/mod.rs
index ab2f4140..d85ce148 100644
--- a/crates/prefab/src/editor_registry/mod.rs
+++ b/crates/prefab/src/editor_registry/mod.rs
@@ -1,11 +1,9 @@
 use std::sync::Arc;
 
 use bevy::{
-    ecs::system::{EntityCommand, EntityCommands},
-    prelude::*,
-    reflect::{GetTypeRegistration, TypeRegistration, TypeRegistryArc},
-    utils::{HashMap, HashSet},
+    ecs::{component::Mutable, system::{EntityCommand, EntityCommands}}, platform::collections::{HashMap, HashSet}, prelude::*, reflect::{GetTypeRegistration, TypeRegistration, TypeRegistryArc, Typed}
 };
+
 use space_shared::*;
 
 use space_undo::AppAutoUndo;
@@ -51,15 +49,22 @@ impl CloneComponent {
         Self {
             func: Arc::new(move |cmds, src| {
                 if let Some(c) = src.get::<T>() {
-                    let cloned = c.clone_value();
-                    <T as FromReflect>::from_reflect(&*cloned).map_or_else(
-                        || {
-                            error!("Failed to clone component");
-                        },
-                        |taken| {
-                            cmds.insert(taken);
+                    let cloned_result = c.reflect_clone();
+                    match cloned_result {
+                        Ok(cloned) => {
+                            <T as FromReflect>::from_reflect(&*cloned).map_or_else(
+                                || {
+                                    error!("Failed to clone component");
+                                },
+                                |taken| {
+                                    cmds.insert(taken);
+                                },
+                            );
                         },
-                    );
+                        Err(e) => {
+                            error!("Failed to clone component");
+                        }
+                    }
                 }
             }),
         }
@@ -73,8 +78,12 @@ pub struct AddDefaultComponent {
 }
 
 impl EntityCommand for AddDefaultComponent {
-    fn apply(self, id: Entity, world: &mut World) {
-        (self.func)(id, world);
+    fn apply(self, mut entity_world: EntityWorldMut) {
+        let id = entity_world.id();
+        let func = self.func;
+        entity_world.world_scope(move |world: &mut World| {
+            func(id, world);
+        })
     }
 }
 
@@ -145,7 +154,7 @@ impl EditorRegistry {
     >(
         &mut self,
     ) {
-        info!("Registering component: {}", std::any::type_name::<T>());
+        debug!("Registering component: {}", std::any::type_name::<T>());
         // self.registry.write().register::<T>();
         self.registry
             .write()
@@ -230,7 +239,7 @@ impl EditorRegistry {
 pub trait EditorRegistryExt {
     /// register new component in editor UI and prefab systems
     fn editor_registry<
-        T: Component + Default + Send + 'static + GetTypeRegistration + Reflect + FromReflect,
+        T: Component<Mutability = Mutable> + Default + Send + 'static + GetTypeRegistration + Reflect + FromReflect,
     >(
         &mut self,
     ) -> &mut Self;
@@ -242,7 +251,7 @@ pub trait EditorRegistryExt {
     ) -> &mut Self;
 
     fn editor_clone_registry<
-        T: Component + Default + Reflect + FromReflect + Send + 'static + GetTypeRegistration,
+        T: Component<Mutability = Mutable> + Default + Reflect + FromReflect + Send + 'static + GetTypeRegistration,
     >(
         &mut self,
     ) -> &mut Self;
@@ -263,14 +272,15 @@ pub trait EditorRegistryExt {
     #[cfg(not(tarpaulin_include))]
     fn editor_auto_struct<T>(&mut self) -> &mut Self
     where
-        T: Component
+        T: Component<Mutability = Mutable>
             + Reflect
             + FromReflect
             + Default
             + Clone
             + 'static
             + GetTypeRegistration
-            + TypePath;
+            + TypePath
+            + Typed;
 
     /// register new event in editor UI
     fn editor_registry_event<
@@ -282,7 +292,7 @@ pub trait EditorRegistryExt {
 
 impl EditorRegistryExt for App {
     fn editor_registry<
-        T: Component + Default + Send + 'static + GetTypeRegistration + Reflect + FromReflect,
+        T: Component<Mutability = Mutable> + Default + Send + 'static + GetTypeRegistration + Reflect + FromReflect,
     >(
         &mut self,
     ) -> &mut Self {
@@ -298,14 +308,14 @@ impl EditorRegistryExt for App {
             }
         };
 
-        self.world_mut().init_component::<T>();
+        self.world_mut().register_component::<T>();
         self.register_type::<T>();
         self.auto_reflected_undo::<T>();
         self
     }
 
     fn editor_clone_registry<
-        T: Component + Reflect + FromReflect + Default + Send + 'static + GetTypeRegistration,
+        T: Component<Mutability = Mutable> + Reflect + FromReflect + Default + Send + 'static + GetTypeRegistration,
     >(
         &mut self,
     ) -> &mut Self {
@@ -344,14 +354,15 @@ impl EditorRegistryExt for App {
     #[cfg(not(tarpaulin_include))]
     fn editor_auto_struct<T>(&mut self) -> &mut Self
     where
-        T: Component
+        T: Component<Mutability = Mutable>
             + Reflect
             + FromReflect
             + Default
             + Clone
             + 'static
             + GetTypeRegistration
-            + TypePath,
+            + TypePath
+            + Typed,
     {
         self.editor_silent_registry::<AutoStruct<T>>();
         self.editor_registry::<T>();
@@ -452,7 +463,7 @@ mod tests {
         app.update();
 
         let mut query = app.world_mut().query::<(&Name, &TestRelation)>();
-        let s = query.single(&app.world());
+        let s = query.single(&app.world()).unwrap();
 
         assert_eq!(s.0, &Name::from("value"));
     }
@@ -473,7 +484,7 @@ mod tests {
         app.update();
 
         let mut query = app.world_mut().query::<(&Name, &TestRelation)>();
-        let s = query.single(&app.world());
+        let s = query.single(&app.world()).unwrap();
 
         assert_eq!(s.0, &Name::from("value"));
     }
@@ -537,7 +548,7 @@ mod tests {
         app.update();
 
         let events = app.world_mut().resource::<Events<AnEvent>>();
-        let mut events_reader = events.get_reader();
+        let mut events_reader = events.get_cursor();
         let an_event = events_reader.read(events).next().unwrap();
 
         // Check the event has been sent
@@ -553,7 +564,7 @@ mod tests {
         app.update();
 
         let events = app.world_mut().resource::<Events<AnEvent>>();
-        let mut events_reader = events.get_reader();
+        let mut events_reader = events.get_cursor();
         let an_event = events_reader.read(events).next().unwrap();
 
         assert_eq!(an_event.val, 17);
@@ -583,7 +594,7 @@ mod tests {
         app.update();
 
         let mut query = app.world_mut().query::<(&Name, &Named)>();
-        let s = query.single(app.world());
+        let s = query.single(app.world()).unwrap();
         assert_eq!(s.1.name, "value");
     }
 
@@ -614,7 +625,7 @@ mod tests {
         let name = "name";
         let e = app
             .world_mut()
-            .spawn((Name::new(name), VisibilityBundle::default()))
+            .spawn((Name::new(name), Visibility::default()))
             .id();
 
         {
@@ -648,7 +659,7 @@ mod tests {
         let name = "name";
         let e = app
             .world_mut()
-            .spawn((Name::new(name), VisibilityBundle::default()))
+            .spawn((Name::new(name), Visibility::default()))
             .id();
 
         let mut command_queue = CommandQueue::default();
diff --git a/crates/prefab/src/load.rs b/crates/prefab/src/load.rs
index eb167cf1..04a04aee 100644
--- a/crates/prefab/src/load.rs
+++ b/crates/prefab/src/load.rs
@@ -90,30 +90,30 @@ fn load_prefab(
                 .insert((Transform::default(), GlobalTransform::default()));
         }
         if vis.is_none() {
-            commands.entity(e).insert(VisibilityBundle::default());
+            commands.entity(e).insert(Visibility::default());
         }
 
         //remove old scene
         if let Some(children) = children {
             for child in children {
                 if auto_children.contains(*child) {
-                    commands.entity(*child).despawn_recursive();
+                    commands.entity(*child).despawn();
                 }
             }
-            commands.entity(e).clear_children();
+            commands.entity(e).remove::<Children>();
         }
 
         let scene: Handle<DynamicScene> = assets.load(&l.path);
 
         let id = commands
-            .spawn(DynamicSceneBundle { scene, ..default() })
+            .spawn(DynamicSceneRoot(scene))
             .insert(SceneHook::new(move |_e, cmd| {
                 cmd.insert(PrefabAutoChild);
             }))
             .insert(PrefabAutoChild)
             .id();
 
-        commands.entity(e).push_children(&[id]);
+        commands.entity(e).add_children(&[id]);
     }
 }
 
diff --git a/crates/prefab/src/plugins.rs b/crates/prefab/src/plugins.rs
index 21747c60..5acfd3e5 100644
--- a/crates/prefab/src/plugins.rs
+++ b/crates/prefab/src/plugins.rs
@@ -1,15 +1,7 @@
 use bevy::{
-    core_pipeline::{
-        core_3d::{Camera3dDepthTextureUsage, ScreenSpaceTransmissionQuality},
-        tonemapping::{DebandDither, Tonemapping},
-    },
-    pbr::{CascadeShadowConfig, Cascades, CascadesVisibleEntities, CubemapVisibleEntities},
+    core_pipeline::core_3d::{Camera3dDepthTextureUsage, ScreenSpaceTransmissionQuality},
     prelude::*,
-    render::{
-        camera::{CameraMainTextureUsages, CameraRenderGraph, Exposure},
-        primitives::{CascadesFrusta, CubemapFrusta, Frustum},
-        view::{ColorGrading, VisibleEntities},
-    },
+    render::camera::CameraRenderGraph,
 };
 use bevy_scene_hook::HookPlugin;
 use space_shared::toast::ToastMessage;
@@ -62,8 +54,8 @@ impl Plugin for BasePrefabPlugin {
                 .chain(),
         );
 
-        app.add_systems(Update, apply_deferred.in_set(PrefabSet::RelationApply));
-        app.add_systems(Update, apply_deferred.in_set(PrefabSet::PrefabChangeApply));
+        app.add_systems(Update, ApplyDeferred.in_set(PrefabSet::RelationApply));
+        app.add_systems(Update, ApplyDeferred.in_set(PrefabSet::PrefabChangeApply));
 
         app.register_type::<EntityLink>();
 
@@ -80,13 +72,13 @@ impl Plugin for BasePrefabPlugin {
 
         app.editor_registry::<Sprite>();
         app.editor_registry::<SpriteTexture>();
-        app.editor_relation::<SpriteTexture, Transform>();
-        app.editor_relation::<SpriteTexture, Visibility>();
+        //app.editor_relation::<SpriteTexture, Transform>();
+        //app.editor_relation::<SpriteTexture, Visibility>();
 
         // Spritesheet bundle
         app.editor_registry::<SpritesheetTexture>();
-        app.editor_relation::<SpritesheetTexture, Transform>();
-        app.editor_relation::<SpritesheetTexture, Visibility>();
+        //app.editor_relation::<SpritesheetTexture, Transform>();
+        //app.editor_relation::<SpritesheetTexture, Visibility>();
         app.editor_registry::<AnimationIndicesSpriteSheet>();
         app.editor_registry::<AnimationClipName>();
         app.editor_registry::<AvailableAnimationClips>();
@@ -95,14 +87,14 @@ impl Plugin for BasePrefabPlugin {
         app.editor_registry::<TextureAtlasPrefab>();
 
         app.editor_registry::<MeshPrimitive3dPrefab>();
-        app.editor_relation::<MeshPrimitive3dPrefab, Transform>();
-        app.editor_relation::<MeshPrimitive3dPrefab, Visibility>();
-        app.editor_relation::<MeshPrimitive3dPrefab, MaterialPrefab>();
+        //app.editor_relation::<MeshPrimitive3dPrefab, Transform>();
+        //app.editor_relation::<MeshPrimitive3dPrefab, Visibility>();
+        //app.editor_relation::<MeshPrimitive3dPrefab, MaterialPrefab>();
 
         app.editor_registry::<MeshPrimitive2dPrefab>();
-        app.editor_relation::<MeshPrimitive2dPrefab, Transform>();
-        app.editor_relation::<MeshPrimitive2dPrefab, Visibility>();
-        app.editor_relation::<MeshPrimitive2dPrefab, ColorMaterialPrefab>();
+        //app.editor_relation::<MeshPrimitive2dPrefab, Transform>();
+        //app.editor_relation::<MeshPrimitive2dPrefab, Visibility>();
+        //app.editor_relation::<MeshPrimitive2dPrefab, ColorMaterialPrefab>();
 
         //shape registration
         app.register_type::<SpherePrefab>();
@@ -142,58 +134,58 @@ impl Plugin for BasePrefabPlugin {
         app.editor_registry::<Camera3d>();
         app.editor_registry::<Camera2d>();
         app.editor_registry::<Projection>();
-        app.editor_registry::<OrthographicProjection>();
+        //app.editor_registry::<OrthographicProjection>();
         app.editor_registry::<PlaymodeCamera>();
 
         app.register_type::<Camera3dDepthTextureUsage>();
         app.register_type::<ScreenSpaceTransmissionQuality>();
 
-        app.editor_relation::<Camera2d, Camera>();
-        app.editor_relation::<Camera2d, OrthographicProjection>();
-        app.editor_relation::<Camera3d, Camera>();
-        app.editor_relation::<Camera3d, Projection>();
-        app.editor_relation::<Camera3d, ColorGrading>();
-        app.editor_relation::<Camera3d, Exposure>();
-        app.editor_relation::<Camera, VisibleEntities>();
-        app.editor_relation::<Camera, Frustum>();
-        app.editor_relation::<Camera, Transform>();
-        app.editor_relation::<Camera, Tonemapping>();
-        app.editor_relation::<Camera, DebandDither>();
-        app.editor_relation::<Camera, CameraMainTextureUsages>();
+        //app.editor_relation::<Camera2d, Camera>();
+        //app.editor_relation::<Camera2d, OrthographicProjection>();
+        //app.editor_relation::<Camera3d, Camera>();
+        //app.editor_relation::<Camera3d, Projection>();
+        //app.editor_relation::<Camera3d, ColorGrading>();
+        //app.editor_relation::<Camera3d, Exposure>();
+        //app.editor_relation::<Camera, VisibleEntities>();
+        //app.editor_relation::<Camera, Frustum>();
+        //app.editor_relation::<Camera, Transform>();
+        //app.editor_relation::<Camera, Tonemapping>();
+        //app.editor_relation::<Camera, DebandDither>();
+        //app.editor_relation::<Camera, CameraMainTextureUsages>();
 
         app.add_systems(Update, camera_render_graph_creation);
 
         app.editor_registry::<PlayerStart>();
-        app.editor_relation::<PlayerStart, Transform>();
-        app.editor_relation::<PlayerStart, GlobalTransform>();
-        app.editor_relation::<PlayerStart, Visibility>();
-        app.editor_relation::<PlayerStart, ViewVisibility>();
-        app.editor_relation::<PlayerStart, InheritedVisibility>();
+        //app.editor_relation::<PlayerStart, Transform>();
+        //app.editor_relation::<PlayerStart, GlobalTransform>();
+        //app.editor_relation::<PlayerStart, Visibility>();
+        //app.editor_relation::<PlayerStart, ViewVisibility>();
+        //app.editor_relation::<PlayerStart, InheritedVisibility>();
 
-        app.editor_relation::<Transform, GlobalTransform>();
+        //app.editor_relation::<Transform, GlobalTransform>();
 
         //Light
         app.editor_registry::<LightAreaToggle>();
 
         app.editor_registry::<PointLight>();
-        app.editor_relation::<PointLight, CubemapVisibleEntities>();
-        app.editor_relation::<PointLight, CubemapFrusta>();
-        app.editor_relation::<PointLight, Transform>();
-        app.editor_relation::<PointLight, Visibility>();
+        //app.editor_relation::<PointLight, CubemapVisibleEntities>();
+        //app.editor_relation::<PointLight, CubemapFrusta>();
+        //app.editor_relation::<PointLight, Transform>();
+        //app.editor_relation::<PointLight, Visibility>();
 
         app.editor_registry::<DirectionalLight>();
-        app.editor_relation::<DirectionalLight, CascadesFrusta>();
-        app.editor_relation::<DirectionalLight, Cascades>();
-        app.editor_relation::<DirectionalLight, CascadeShadowConfig>();
-        app.editor_relation::<DirectionalLight, CascadesVisibleEntities>();
-        app.editor_relation::<DirectionalLight, Transform>();
-        app.editor_relation::<DirectionalLight, Visibility>();
+        //app.editor_relation::<DirectionalLight, CascadesFrusta>();
+        //app.editor_relation::<DirectionalLight, Cascades>();
+        //app.editor_relation::<DirectionalLight, CascadeShadowConfig>();
+        //app.editor_relation::<DirectionalLight, CascadesVisibleEntities>();
+        //app.editor_relation::<DirectionalLight, Transform>();
+        //app.editor_relation::<DirectionalLight, Visibility>();
 
         app.editor_registry::<SpotLight>();
-        app.editor_relation::<SpotLight, VisibleEntities>();
-        app.editor_relation::<SpotLight, Frustum>();
-        app.editor_relation::<SpotLight, Transform>();
-        app.editor_relation::<SpotLight, Visibility>();
+        //app.editor_relation::<SpotLight, VisibleEntities>();
+        //app.editor_relation::<SpotLight, Frustum>();
+        //app.editor_relation::<SpotLight, Transform>();
+        //app.editor_relation::<SpotLight, Visibility>();
 
         app.editor_registry::<PlaymodeLight>();
 
@@ -217,7 +209,7 @@ impl Plugin for BasePrefabPlugin {
 
         app.add_systems(
             Update,
-            (sync_mesh, sync_material).in_set(PrefabSet::DetectPrefabChange),
+            (sync_3d_mesh, sync_3d_material).in_set(PrefabSet::DetectPrefabChange),
         );
         app.add_systems(
             Update,
@@ -265,14 +257,14 @@ fn camera_render_graph_creation(
 pub fn add_global_transform(
     mut commands: Commands,
     mut query: Query<
-        (Entity, &mut Transform, Option<&Parent>),
+        (Entity, &mut Transform, Option<&ChildOf>),
         (With<Transform>, Without<GlobalTransform>),
     >,
     globals: Query<&GlobalTransform>,
 ) {
     for (e, mut tr, parent) in query.iter_mut() {
         if let Some(parent) = parent {
-            if let Ok(parent_global) = globals.get(parent.get()) {
+            if let Ok(parent_global) = globals.get(parent.parent()) {
                 commands.entity(e).insert(parent_global.mul_transform(*tr));
             } else {
                 commands.entity(e).insert(GlobalTransform::from(*tr));
@@ -326,12 +318,14 @@ fn sync_asset_mesh(
     assets: Res<AssetServer>,
 ) {
     for (e, mesh) in changed.iter() {
-        commands.entity(e).insert(assets.load::<Mesh>(&mesh.path));
+        commands
+            .entity(e)
+            .insert(Mesh3d(assets.load::<Mesh>(&mesh.path)));
     }
 
     for e in deleted.read() {
-        if let Some(mut cmd) = commands.get_entity(e) {
-            cmd.remove::<Handle<Mesh>>();
+        if let Ok(mut cmd) = commands.get_entity(e) {
+            cmd.remove::<Mesh3d>();
             info!("Removed mesh handle for {:?}", e);
         }
     }
@@ -344,14 +338,14 @@ fn sync_asset_material(
     assets: Res<AssetServer>,
 ) {
     for (e, material) in changed.iter() {
-        commands
-            .entity(e)
-            .insert(assets.load::<StandardMaterial>(&material.path));
+        commands.entity(e).insert(MeshMaterial3d(
+            assets.load::<StandardMaterial>(&material.path),
+        ));
     }
 
     for e in deleted.read() {
-        if let Some(mut cmd) = commands.get_entity(e) {
-            cmd.remove::<Handle<StandardMaterial>>();
+        if let Ok(mut cmd) = commands.get_entity(e) {
+            cmd.remove::<MeshMaterial3d<StandardMaterial>>();
         }
     }
 }
@@ -428,7 +422,7 @@ mod test {
 
         app.add_systems(Startup, |mut commands: Commands| {
             commands.spawn(ViewVisibility::default());
-            commands.spawn(VisibilityBundle::default());
+            commands.spawn(Visibility::default());
             commands.spawn((ViewVisibility::default(), InheritedVisibility::VISIBLE));
         })
         .add_systems(Update, remove_computed_visibility);
@@ -449,8 +443,14 @@ mod test {
             commands.spawn(GlobalTransform::default());
             commands.spawn(Transform::default());
             let child = commands.spawn(Transform::default()).id();
-            commands.spawn(TransformBundle::default()).add_child(child);
-            commands.spawn(TransformBundle::default());
+            commands.spawn((
+                Transform::default(),
+                Visibility::default(),
+            )).add_child(child);
+            commands.spawn((
+                Transform::default(),
+                Visibility::default(),
+            ));
         })
         .add_systems(Update, (add_global_transform, remove_global_transform));
 
diff --git a/crates/prefab/src/save.rs b/crates/prefab/src/save.rs
index faad5be6..38dacf77 100644
--- a/crates/prefab/src/save.rs
+++ b/crates/prefab/src/save.rs
@@ -1,8 +1,5 @@
 use bevy::{
-    ecs::{entity::MapEntities, reflect::ReflectMapEntities},
-    prelude::*,
-    tasks::IoTaskPool,
-    utils::HashSet,
+    ecs::{entity::MapEntities, reflect::ReflectMapEntities}, platform::collections::HashSet, prelude::*, tasks::IoTaskPool
 };
 use space_shared::{EditorPrefabPath, PrefabMarker, PrefabMemoryCache};
 use std::{any::TypeId, fs, io::Write};
@@ -27,7 +24,7 @@ impl MapEntities for ChildrenPrefab {
         self.0 = self
             .0
             .iter()
-            .map(|e| entity_mapper.map_entity(*e))
+            .map(|e| entity_mapper.get_mapped(*e))
             .collect();
     }
 }
@@ -53,7 +50,7 @@ impl Plugin for SavePrefabPlugin {
             OnEnter(SaveState::Save),
             (
                 prepare_children,
-                apply_deferred,
+                ApplyDeferred,
                 serialize_scene,
                 delete_prepared_children,
             )
@@ -139,7 +136,7 @@ pub fn serialize_scene(world: &mut World) {
     let mut builder = DynamicSceneBuilder::from_world(world);
     builder = builder
         .allow_all()
-        .with_filter(SceneFilter::Allowlist(HashSet::from_iter(
+        .with_resource_filter(SceneFilter::Allowlist(HashSet::from_iter(
             allow_types.iter().cloned(),
         )))
         .extract_entities(entities.iter().copied());
@@ -338,7 +335,7 @@ mod tests {
         world.spawn(PrefabMarker).add_child(child);
 
         let mut query = world.query::<&Children>();
-        let children = query.single(&world);
+        let children = query.single(&world).unwrap();
         let prefab = ChildrenPrefab::from_children(children);
 
         assert_eq!(prefab.0.len(), 1);
@@ -369,7 +366,7 @@ mod tests {
             .world_mut()
             .resource::<Events<space_shared::toast::ToastMessage>>();
 
-        let mut iter = events.get_reader();
+        let mut iter = events.get_cursor();
         let iter = iter.read(events);
         iter.for_each(|e| assert_eq!(e.text, "Saving empty scene"));
     }
diff --git a/crates/prefab/src/spawn_system.rs b/crates/prefab/src/spawn_system.rs
index ffe8eeb4..5f2d4c65 100644
--- a/crates/prefab/src/spawn_system.rs
+++ b/crates/prefab/src/spawn_system.rs
@@ -1,4 +1,4 @@
-use bevy::{prelude::*, sprite::Mesh2dHandle};
+use bevy::{prelude::*, sprite::Anchor};
 use bevy_scene_hook::SceneHook;
 #[cfg(feature = "editor")]
 use space_shared::toast::ToastMessage;
@@ -32,7 +32,7 @@ pub fn spawn_scene(
         if let Some(children) = children {
             for e in children {
                 if auto_children.contains(*e) {
-                    commands.entity(*e).despawn_recursive();
+                    commands.entity(*e).despawn();
                 }
             }
         }
@@ -43,7 +43,9 @@ pub fn spawn_scene(
 
         commands
             .entity(e)
-            .insert(asset_server.load::<Scene>(format!("{}#{}", &prefab.path, &prefab.scene)))
+            .insert(SceneRoot(
+                asset_server.load::<Scene>(format!("{}#{}", &prefab.path, &prefab.scene)),
+            ))
             .insert(SceneHook::new(move |e, cmd| {
                 if e.contains::<SceneAutoRoot>() {
                     cmd.insert(WantChildPath);
@@ -55,10 +57,13 @@ pub fn spawn_scene(
             }));
 
         if visibility.is_none() {
-            commands.entity(e).insert(VisibilityBundle::default());
+            commands.entity(e).insert(Visibility::default());
         }
         if transform.is_none() {
-            commands.entity(e).insert(TransformBundle::default());
+            commands.entity(e).insert((
+                Transform::default(),
+                Visibility::default(),
+            ));
         }
     }
 }
@@ -87,25 +92,25 @@ fn recursive_path(
             let mut child_path = path.clone();
             child_path.push(i);
 
-            recursive_path(commands, q_children, *child_entity, child_path);
+            recursive_path(commands, q_children, child_entity.entity(), child_path);
         }
     }
 }
 
 /// System to sync [`Mesh`] and [`MeshPrimitivePrefab`]
-pub fn sync_mesh(
+pub fn sync_3d_mesh(
     mut commands: Commands,
     query: Query<(Entity, &MeshPrimitive3dPrefab), Changed<MeshPrimitive3dPrefab>>,
     mut meshes: ResMut<Assets<Mesh>>,
 ) {
     for (e, prefab) in query.iter() {
         let mesh = meshes.add(prefab.to_mesh());
-        commands.entity(e).insert(mesh);
+        commands.entity(e).insert(Mesh3d(mesh));
     }
 }
 
 /// System to sync [`StandardMaterial`] and [`MaterialPrefab`]
-pub fn sync_material(
+pub fn sync_3d_material(
     mut commands: Commands,
     query: Query<(Entity, &MaterialPrefab), Changed<MaterialPrefab>>,
     mut materials: ResMut<Assets<StandardMaterial>>,
@@ -113,7 +118,7 @@ pub fn sync_material(
 ) {
     for (e, prefab) in query.iter() {
         let mat = materials.add(prefab.to_material(&asset_server));
-        commands.entity(e).insert(mat);
+        commands.entity(e).insert(MeshMaterial3d(mat));
     }
 }
 
@@ -124,7 +129,7 @@ pub fn sync_2d_mesh(
     mut meshes: ResMut<Assets<Mesh>>,
 ) {
     for (e, prefab) in query.iter() {
-        let mesh = bevy::sprite::Mesh2dHandle(meshes.add(prefab.to_mesh()));
+        let mesh = Mesh2d(meshes.add(prefab.to_mesh()));
         commands.entity(e).insert(mesh);
     }
 }
@@ -138,7 +143,7 @@ pub fn sync_2d_material(
 ) {
     for (e, prefab) in query.iter() {
         let mat = materials.add(prefab.to_material(&asset_server));
-        commands.entity(e).insert(mat);
+        commands.entity(e).insert(MeshMaterial2d(mat));
     }
 }
 
@@ -148,8 +153,8 @@ pub fn editor_remove_mesh(
     mut query: RemovedComponents<MeshPrimitive3dPrefab>,
 ) {
     for e in query.read() {
-        if let Some(mut cmd) = commands.get_entity(e) {
-            cmd.remove::<Handle<Mesh>>();
+        if let Ok(mut cmd) = commands.get_entity(e) {
+            cmd.remove::<Mesh3d>();
             info!("Removed mesh handle for {:?}", e);
         }
     }
@@ -161,8 +166,8 @@ pub fn editor_remove_mesh_2d(
     mut query: RemovedComponents<MeshPrimitive2dPrefab>,
 ) {
     for e in query.read() {
-        if let Some(mut cmd) = commands.get_entity(e) {
-            cmd.remove::<Handle<Mesh>>().remove::<Mesh2dHandle>();
+        if let Ok(mut cmd) = commands.get_entity(e) {
+            cmd.remove::<Mesh2d>();
             info!("Removed mesh handle for {:?}", e);
         }
     }
@@ -209,16 +214,23 @@ pub fn sync_spritesheet(
             if let Some(clip) = clips.clips.get(&clip_name.name) {
                 commands
                     .entity(e)
-                    .insert(SpriteBundle {
-                        texture: texture_atlas.clone().texture.unwrap_or_default(),
-                        transform: Transform::from_scale(Vec3::splat(6.0)),
-                        ..default()
+                    .insert(Sprite {
+                        image: texture_atlas.texture.clone().unwrap_or_default(), // Set the texture image
+                        texture_atlas: Some(TextureAtlas {
+                            layout: atlas.clone(),
+                            index: clip.first,
+                        }),
+                        custom_size: Some(Vec2::splat(6.0)), // Scale the sprite
+                        color: Color::WHITE,                 // Default color or adjust as needed
+                        flip_x: false,
+                        flip_y: false,
+                        rect: None,             // Optional: Define a sub-region if needed
+                        anchor: Anchor::Center, // Default anchor or adjust
+                        image_mode: SpriteImageMode::default(), // Default or customized mode
                     })
-                    .insert(TextureAtlas {
-                        layout: atlas,
-                        index: clip.first,
-                    });
-            };
+                    .insert(Transform::default())
+                    .insert(Visibility::default());
+            }
         }
     }
 }
@@ -235,16 +247,15 @@ pub fn spawn_player_start(
     for (e, prefab) in query.iter() {
         let msg = format!("Spawning player start: {:?} with \"{}\"", e, &prefab.prefab);
         #[cfg(feature = "editor")]
-        toast.send(ToastMessage::new(
+        toast.write(ToastMessage::new(
             &msg,
             space_shared::toast::ToastKind::Info,
         ));
         info!(msg);
         let child = commands
-            .spawn(DynamicSceneBundle {
-                scene: asset_server.load(prefab.prefab.to_string()),
-                ..default()
-            })
+            .spawn(DynamicSceneRoot(
+                asset_server.load(prefab.prefab.to_string()),
+            ))
             .id();
         commands.entity(e).add_child(child);
     }
@@ -263,13 +274,11 @@ mod tests {
                 commands.spawn(MeshPrimitive3dPrefab::Cube(3.));
             })
             .init_resource::<Assets<Mesh>>()
-            .add_systems(Update, sync_mesh);
+            .add_systems(Update, sync_3d_mesh);
 
         app.update();
 
-        let mut query = app
-            .world_mut()
-            .query::<(&MeshPrimitive3dPrefab, &Handle<Mesh>)>();
+        let mut query = app.world_mut().query::<(&MeshPrimitive3dPrefab, &Mesh3d)>();
         assert_eq!(query.iter(&app.world_mut()).count(), 1);
     }
 
@@ -282,13 +291,13 @@ mod tests {
             })
             .init_resource::<Assets<Mesh>>()
             .init_resource::<Assets<StandardMaterial>>()
-            .add_systems(Update, sync_material);
+            .add_systems(Update, sync_3d_material);
 
         app.update();
 
         let mut query = app
             .world_mut()
-            .query::<(&MaterialPrefab, &Handle<StandardMaterial>)>();
+            .query::<(&MaterialPrefab, &MeshMaterial3d<StandardMaterial>)>();
         assert_eq!(query.iter(&app.world_mut()).count(), 1);
     }
 
@@ -304,9 +313,7 @@ mod tests {
 
         app.update();
 
-        let mut query = app
-            .world_mut()
-            .query::<(&MeshPrimitive2dPrefab, &Mesh2dHandle)>();
+        let mut query = app.world_mut().query::<(&MeshPrimitive2dPrefab, &Mesh2d)>();
         assert_eq!(query.iter(&app.world_mut()).count(), 1);
     }
 
@@ -327,7 +334,7 @@ mod tests {
 
         let mut query = app
             .world_mut()
-            .query::<(&ColorMaterialPrefab, &Handle<ColorMaterial>)>();
+            .query::<(&ColorMaterialPrefab, &MeshMaterial2d<ColorMaterial>)>();
         assert_eq!(query.iter(&app.world_mut()).count(), 1);
     }
 
@@ -344,23 +351,19 @@ mod tests {
 
         app.update();
 
-        let mut query = app
-            .world_mut()
-            .query::<(&MeshPrimitive2dPrefab, &Mesh2dHandle)>();
+        let mut query = app.world_mut().query::<(&MeshPrimitive2dPrefab, &Mesh2d)>();
         assert_eq!(query.iter(&app.world_mut()).count(), 1);
 
         let mut query = app
             .world_mut()
             .query_filtered::<Entity, With<MeshPrimitive2dPrefab>>();
-        let entity = query.single(&app.world_mut());
+        let entity = query.single(&app.world_mut()).unwrap();
         app.world_mut()
             .entity_mut(entity)
             .remove::<MeshPrimitive2dPrefab>();
 
         app.update();
-        let mut query = app
-            .world_mut()
-            .query_filtered::<Entity, With<Mesh2dHandle>>();
+        let mut query = app.world_mut().query_filtered::<Entity, With<Mesh2d>>();
         assert_eq!(query.iter(&app.world_mut()).count(), 0);
     }
 
@@ -372,28 +375,24 @@ mod tests {
                 commands.spawn(MeshPrimitive3dPrefab::Cube(3.));
             })
             .init_resource::<Assets<Mesh>>()
-            .add_systems(Update, sync_mesh)
+            .add_systems(Update, sync_3d_mesh)
             .add_systems(Update, editor_remove_mesh);
 
         app.update();
 
-        let mut query = app
-            .world_mut()
-            .query::<(&MeshPrimitive3dPrefab, &Handle<Mesh>)>();
+        let mut query = app.world_mut().query::<(&MeshPrimitive3dPrefab, &Mesh3d)>();
         assert_eq!(query.iter(&app.world_mut()).count(), 1);
 
         let mut query = app
             .world_mut()
             .query_filtered::<Entity, With<MeshPrimitive3dPrefab>>();
-        let entity = query.single(&app.world_mut());
+        let entity = query.single(&app.world_mut()).unwrap();
         app.world_mut()
             .entity_mut(entity)
             .remove::<MeshPrimitive3dPrefab>();
 
         app.update();
-        let mut query = app
-            .world_mut()
-            .query_filtered::<Entity, With<Handle<Mesh>>>();
+        let mut query = app.world_mut().query_filtered::<Entity, With<Mesh3d>>();
         assert_eq!(query.iter(&app.world_mut()).count(), 0);
     }
 
@@ -439,7 +438,7 @@ mod tests {
         app.update();
 
         let events = app.world_mut().resource::<Events<ToastMessage>>();
-        let mut man_events = events.get_reader();
+        let mut man_events = events.get_cursor();
         let mut events = man_events.read(events);
         let event = events.next().unwrap();
 
@@ -462,22 +461,35 @@ mod tests {
         app.add_plugins(MinimalPlugins)
             .add_systems(Startup, |mut commands: Commands| {
                 let child_1 = commands
-                    .spawn(TransformBundle::default())
+                    .spawn((
+                        Transform::default(),
+                        Visibility::default(),
+                    ))
                     .with_children(|c| {
-                        c.spawn(TransformBundle::default());
+                        c.spawn((
+                            Transform::default(),
+                            Visibility::default(),
+                        ));
                     })
                     .id();
                 let child_2 = commands
-                    .spawn(TransformBundle::default())
+                    .spawn((
+                        Transform::default(),
+                        Visibility::default(),
+                    ))
                     .with_children(|c| {
-                        c.spawn(TransformBundle::default());
+                        c.spawn((
+                            Transform::default(),
+                            Visibility::default(),
+                        ));
                     })
                     .id();
 
                 commands
                     .spawn((
                         GltfPrefab::default(),
-                        TransformBundle::default(),
+                        Transform::default(),
+                        Visibility::default(),
                         WantChildPath,
                     ))
                     .add_child(child_1)
@@ -489,7 +501,7 @@ mod tests {
 
         let mut parent_query = app.world_mut().query_filtered::<Entity, (
             Without<WantChildPath>,
-            Without<Parent>,
+            Without<ChildOf>,
             With<Children>,
         )>();
         assert_eq!(parent_query.iter(&app.world_mut()).count(), 1);
@@ -525,7 +537,7 @@ mod tests {
 
         app.update();
 
-        let mut query = app.world_mut().query::<(&TextureAtlas, &Sprite)>();
+        let mut query = app.world_mut().query::<&Sprite>();
 
         assert_eq!(query.iter(&app.world_mut()).count(), 1);
     }
@@ -556,17 +568,17 @@ mod tests {
 
         let mut query = app
             .world_mut()
-            .query::<(&Handle<Scene>, &SceneAutoRoot, &Visibility, &Transform)>();
+            .query::<(&SceneRoot, &SceneAutoRoot, &Visibility, &Transform)>();
 
-        let s = query.single(&app.world());
+        let s = query.single(&app.world()).unwrap();
 
         assert_eq!(
-            s.0.path().unwrap().to_string(),
+            s.0.path::<String>("Scene0").unwrap().to_string(),
             "low_poly_fighter_2.gltf#Scene0"
         );
 
         let mut query = app.world_mut().query::<(Entity, &DespawnTestChild)>();
-        assert!(query.get_single(&app.world_mut()).is_err());
+        assert!(query.single(&app.world_mut()).is_err());
     }
 
     #[test]
@@ -584,7 +596,7 @@ mod tests {
                     scene: String::from("Scene0"),
                 },
                 Visibility::Hidden,
-                TransformBundle::IDENTITY,
+                Transform::default(),
             ));
         })
         .add_systems(Update, spawn_scene);
@@ -593,9 +605,9 @@ mod tests {
 
         let mut query = app
             .world_mut()
-            .query::<(&Handle<Scene>, &Visibility, &Transform)>();
+            .query::<(&SceneRoot, &Visibility, &Transform)>();
 
-        let s = query.single(&app.world());
+        let s = query.single(&app.world()).unwrap();
 
         assert_eq!(s.1, Visibility::Hidden);
         assert_eq!(s.2, &Transform::IDENTITY);
diff --git a/crates/prefab/src/sub_scene/mod.rs b/crates/prefab/src/sub_scene/mod.rs
index fd9d49e8..6475966f 100644
--- a/crates/prefab/src/sub_scene/mod.rs
+++ b/crates/prefab/src/sub_scene/mod.rs
@@ -1,8 +1,7 @@
 use std::any::TypeId;
 
 use bevy::{
-    ecs::world::unsafe_world_cell::UnsafeWorldCell, prelude::*, reflect::TypeRegistryArc,
-    scene::serde::SceneDeserializer, utils::HashSet,
+    ecs::world::unsafe_world_cell::UnsafeWorldCell, platform::collections::HashSet, prelude::*, reflect::TypeRegistryArc, scene::serde::SceneDeserializer
 };
 use serde::de::DeserializeSeed;
 #[cfg(feature = "editor")]
@@ -23,7 +22,7 @@ impl Plugin for SceneUnpackPlugin {
         app.add_systems(
             OnEnter(SaveState::Save),
             (
-                (prepare_auto_scene, apply_deferred)
+                (prepare_auto_scene, ApplyDeferred)
                     .chain()
                     .before(crate::prelude::serialize_scene),
                 clear_after_save.after(crate::prelude::serialize_scene),
@@ -33,9 +32,9 @@ impl Plugin for SceneUnpackPlugin {
             PostUpdate,
             (
                 decompress_scene,
-                apply_deferred,
+                ApplyDeferred,
                 apply_compressed_scenes,
-                apply_deferred,
+                ApplyDeferred,
             )
                 .chain(),
         );
@@ -94,7 +93,7 @@ pub fn prepare_auto_scene(world: &mut World) {
 
             let mut dyn_scene = DynamicSceneBuilder::from_world(cell.world())
                 .allow_all()
-                .with_filter(SceneFilter::Allowlist(HashSet::from_iter(
+                .with_resource_filter(SceneFilter::Allowlist(HashSet::from_iter(
                     allow_types.iter().cloned(),
                 )));
 
@@ -126,12 +125,12 @@ unsafe fn recursive_extract<'w>(
     scene: DynamicSceneBuilder<'w>,
     entity: Entity,
 ) -> DynamicSceneBuilder<'w> {
-    if cell.get_entity(entity).is_some() {
+    if cell.get_entity(entity).is_ok() {
         let mut scene = scene.extract_entity(entity);
 
         if let Some(children) = cell.world().entity(entity).get::<Children>() {
             for child_entity in children.iter() {
-                scene = recursive_extract(cell, scene, *child_entity);
+                scene = recursive_extract(cell, scene, child_entity.entity());
             }
         }
         scene
@@ -155,7 +154,7 @@ fn decompress_scene(
         };
         let Ok(mut deserializer) = ron::de::Deserializer::from_str(root.0.as_str()) else {
             #[cfg(feature = "editor")]
-            toast.send(ToastMessage::new(
+            toast.write(ToastMessage::new(
                 "Failed create Deserializer for sub scene",
                 space_shared::toast::ToastKind::Error,
             ));
@@ -163,7 +162,7 @@ fn decompress_scene(
         };
         let Ok(dyn_scene) = scene_deserializer.deserialize(&mut deserializer) else {
             #[cfg(feature = "editor")]
-            toast.send(ToastMessage::new(
+            toast.write(ToastMessage::new(
                 "Failed to deserialize sub scene",
                 space_shared::toast::ToastKind::Error,
             ));
@@ -172,7 +171,7 @@ fn decompress_scene(
 
         let Ok(scene) = Scene::from_dynamic_scene(&dyn_scene, &type_registry) else {
             #[cfg(feature = "editor")]
-            toast.send(ToastMessage::new(
+            toast.write(ToastMessage::new(
                 "Decompress scene does not exist",
                 space_shared::toast::ToastKind::Error,
             ));
@@ -188,13 +187,13 @@ fn decompress_scene(
 
 fn apply_compressed_scenes(
     mut commands: Commands,
-    mut roots: Query<(Entity, &mut DecompressedScene, &Handle<Scene>, &Children)>,
+    mut roots: Query<(Entity, &mut DecompressedScene, &SceneRoot, &Children)>,
     child_tree: Query<(Entity, Option<&Children>, Option<&ChildPath>)>,
     editor_registry: Res<EditorRegistry>,
     asset_server: Res<AssetServer>,
 ) {
     for (root_entity, mut scene, base_scene, children) in roots.iter_mut() {
-        if asset_server.load_state(base_scene) != bevy::asset::LoadState::Loaded {
+        if asset_server.load_state(&base_scene.0).is_loaded() {
             continue;
         }
 
@@ -204,8 +203,8 @@ fn apply_compressed_scenes(
             let sub_entities = child_tree.get(entity).unwrap();
             if let Some(children) = sub_entities.1 {
                 for child in children.iter() {
-                    stack.push(*child);
-                    all_sub_entities.insert(*child);
+                    stack.push(child.entity());
+                    all_sub_entities.insert(child.entity());
                 }
             }
         }
@@ -242,7 +241,7 @@ fn apply_compressed_scenes(
                     }
                 }
 
-                if let Some(mut cmds) = commands.get_entity(target_entity) {
+                if let Ok(mut cmds) = commands.get_entity(target_entity) {
                     if all_sub_entities.contains(&target_entity) {
                         all_sub_entities.remove(&target_entity);
                     }
@@ -259,7 +258,7 @@ fn apply_compressed_scenes(
 
         //Destroy not stored entity
         for entity in all_sub_entities.iter() {
-            commands.entity(*entity).despawn_recursive();
+            commands.entity(*entity).despawn();
         }
 
         commands.entity(root_entity).remove::<DecompressedScene>();
@@ -318,7 +317,7 @@ mod tests {
 
         let events = app.world().resource::<Events<ToastMessage>>();
 
-        let mut iter = events.get_reader();
+        let mut iter = events.get_cursor();
         let iter = iter.read(events);
         iter.for_each(|e| assert_eq!(e.text, "Failed to deserialize sub scene"));
     }
diff --git a/crates/undo/src/lib.rs b/crates/undo/src/lib.rs
index 47034baf..8244f4d9 100644
--- a/crates/undo/src/lib.rs
+++ b/crates/undo/src/lib.rs
@@ -5,7 +5,7 @@ mod tests;
 
 use std::sync::Arc;
 
-use bevy::{prelude::*, utils::HashMap};
+use bevy::{ecs::component::Mutable, platform::collections::HashMap, prelude::*};
 
 const MAX_REFLECT_RECURSION: i32 = 10;
 const AUTO_UNDO_LATENCY: i32 = 2;
@@ -169,7 +169,7 @@ fn undo_redo_logic(world: &mut World) {
     world.resource_scope::<Events<UndoRedo>, _>(|world, mut events| {
         world.resource_scope::<ChangeChain, _>(|world, mut change_chain| {
             {
-                let mut reader = events.get_reader();
+                let mut reader = events.get_cursor();
                 for event in reader.read(&events) {
                     match event {
                         UndoRedo::Undo => {
@@ -265,7 +265,7 @@ impl EditorChange for AddedEntity {
         entity_remap: &HashMap<Entity, Entity>,
     ) -> Result<ChangeResult, String> {
         let e = get_entity_with_remap(self.entity, entity_remap);
-        world.entity_mut(e).despawn_recursive();
+        world.entity_mut(e).despawn();
         world
             .resource_mut::<UndoIgnoreStorage>()
             .storage
@@ -296,7 +296,7 @@ impl EditorChange for RemovedEntity {
         remap: &HashMap<Entity, Entity>,
     ) -> Result<ChangeResult, String> {
         if let Some(e) = remap.get(&self.entity) {
-            if world.get_entity(*e).is_none() {
+            if world.get_entity(*e).is_err() {
                 let id = world
                     .spawn_empty()
                     .insert((UndoMarker, OneFrameUndoIgnore::default()))
@@ -423,7 +423,7 @@ impl<T: Component + Clone> EditorChange for AddedComponent<T> {
     ) -> Result<ChangeResult, String> {
         let e = get_entity_with_remap(self.entity, entity_remap);
         let mut add_to_ignore = false;
-        if let Some(mut e) = world.get_entity_mut(e) {
+        if let Ok(mut e) = world.get_entity_mut(e) {
             e.remove::<T>().insert(OneFrameUndoIgnore::default());
             add_to_ignore = true;
         }
@@ -465,7 +465,7 @@ impl<T: Component + Reflect + FromReflect> EditorChange for ReflectedAddedCompon
         let dst = entity_remap
             .get(&self.entity)
             .map_or(self.entity, |remapped| *remapped);
-        if let Some(mut e) = world.get_entity_mut(dst) {
+        if let Ok(mut e) = world.get_entity_mut(dst) {
             e.remove::<T>().insert(OneFrameUndoIgnore::default());
         }
         world
@@ -511,7 +511,7 @@ impl<T: Component + Clone> EditorChange for RemovedComponent<T> {
         let mut remap = vec![];
         let dst = entity_remap.get(&self.entity).map_or_else(
             || {
-                if world.get_entity(self.entity).is_some() {
+                if world.get_entity(self.entity).is_ok() {
                     self.entity
                 } else {
                     let id = world.spawn_empty().id();
@@ -557,7 +557,7 @@ impl<T: Component + Reflect + FromReflect> EditorChange for ReflectedRemovedComp
         let mut remap = vec![];
         let dst = entity_remap.get(&self.entity).map_or_else(
             || {
-                if world.get_entity(self.entity).is_some() {
+                if world.get_entity(self.entity).is_ok() {
                     self.entity
                 } else {
                     let id = world.spawn_empty().id();
@@ -678,14 +678,14 @@ impl<T: Component> Default for AutoUndoStorage<T> {
 }
 
 pub trait AppAutoUndo {
-    fn auto_undo<T: Component + Clone>(&mut self) -> &mut Self;
+    fn auto_undo<T: Component<Mutability = Mutable> + Clone>(&mut self) -> &mut Self;
 
     //Allow more complex undo and auto entity remapping
-    fn auto_reflected_undo<T: Component + Reflect + FromReflect>(&mut self) -> &mut Self;
+    fn auto_reflected_undo<T: Component<Mutability = Mutable> + Reflect + FromReflect>(&mut self) -> &mut Self;
 }
 
 impl AppAutoUndo for App {
-    fn auto_undo<T: Component + Clone>(&mut self) -> &mut Self {
+    fn auto_undo<T: Component<Mutability = Mutable> + Clone>(&mut self) -> &mut Self {
         if !self.world_mut().contains_resource::<ChangeChain>() {
             return self;
         }
@@ -700,7 +700,7 @@ impl AppAutoUndo for App {
                 auto_undo_update_cache::<T>,
                 auto_undo_add_init::<T>,
                 auto_undo_remove_detect::<T>,
-                apply_deferred,
+                ApplyDeferred,
                 auto_undo_system_changed::<T>,
                 auto_undo_system::<T>,
             )
@@ -711,7 +711,7 @@ impl AppAutoUndo for App {
         self
     }
 
-    fn auto_reflected_undo<T: Component + Reflect + FromReflect>(&mut self) -> &mut Self {
+    fn auto_reflected_undo<T: Component<Mutability = Mutable> + Reflect + FromReflect>(&mut self) -> &mut Self {
         if !self.world_mut().contains_resource::<ChangeChain>() {
             return self;
         }
@@ -726,7 +726,7 @@ impl AppAutoUndo for App {
                 auto_undo_reflected_update_cache::<T>,
                 auto_undo_reflected_add_init::<T>,
                 auto_undo_reflected_remove_detect::<T>,
-                apply_deferred,
+                ApplyDeferred,
                 auto_undo_system_changed::<T>,
                 auto_undo_reflected_system::<T>,
             )
@@ -757,73 +757,79 @@ fn apply_for_every_typed_field<D: Reflect>(
     } else {
         match value.reflect_mut() {
             bevy::reflect::ReflectMut::Struct(s) => {
-                for field_idx in 0..s.field_len() {
+                for _field_idx in 0..s.field_len() {
                     apply_for_every_typed_field(
-                        s.field_at_mut(field_idx).unwrap(),
+                        s.try_as_reflect_mut().unwrap(),
                         applyer,
                         max_recursion - 1,
                     );
                 }
             }
             bevy::reflect::ReflectMut::TupleStruct(s) => {
-                for field_idx in 0..s.field_len() {
+                for _field_idx in 0..s.field_len() {
                     apply_for_every_typed_field(
-                        s.field_mut(field_idx).unwrap(),
+                        s.try_as_reflect_mut().unwrap(),
                         applyer,
                         max_recursion - 1,
                     );
                 }
             }
             bevy::reflect::ReflectMut::Tuple(s) => {
-                for field_idx in 0..s.field_len() {
+                for _field_idx in 0..s.field_len() {
                     apply_for_every_typed_field(
-                        s.field_mut(field_idx).unwrap(),
+                        s.try_as_reflect_mut().unwrap(),
                         applyer,
                         max_recursion - 1,
                     );
                 }
             }
             bevy::reflect::ReflectMut::List(s) => {
-                for field_idx in 0..s.len() {
+                for _field_idx in 0..s.len() {
                     apply_for_every_typed_field(
-                        s.get_mut(field_idx).unwrap(),
+                        s.try_as_reflect_mut().unwrap(),
                         applyer,
                         max_recursion - 1,
                     )
                 }
             }
             bevy::reflect::ReflectMut::Array(s) => {
-                for field_idx in 0..s.len() {
+                for _field_idx in 0..s.len() {
                     apply_for_every_typed_field(
-                        s.get_mut(field_idx).unwrap(),
+                        s.try_as_reflect_mut().unwrap(),
                         applyer,
                         max_recursion - 1,
                     );
                 }
             }
             bevy::reflect::ReflectMut::Map(s) => {
-                for field_idx in 0..s.len() {
-                    let (_key, value) = s.get_at_mut(field_idx).unwrap();
-                    apply_for_every_typed_field(value, applyer, max_recursion - 1);
+                for _field_idx in 0..s.len() {
+                    apply_for_every_typed_field(
+                        s.try_as_reflect_mut().unwrap(),
+                        applyer,
+                        max_recursion - 1,
+                    );
                 }
             }
             bevy::reflect::ReflectMut::Enum(s) => {
-                for field_idx in 0..s.field_len() {
+                for _field_idx in 0..s.field_len() {
                     apply_for_every_typed_field(
-                        s.field_at_mut(field_idx).unwrap(),
+                        s.try_as_reflect_mut().unwrap(),
                         applyer,
                         max_recursion - 1,
                     );
                 }
             }
-            bevy::reflect::ReflectMut::Value(_v) => {
-                //do nothing. Value was checked before
-            }
+            bevy::reflect::ReflectMut::Set(_s) => {}
+            bevy::reflect::ReflectMut::Opaque(_s) => {}
+            bevy::reflect::ReflectMut::Function(_s) => {},
+            //bevy::reflect::ReflectMut::Value(_v) => {
+            //do nothing. Value was checked before
+            //}
         }
     }
 }
 
-fn auto_remap_undo_redo<T: Component + Reflect>(
+fn auto_remap_undo_redo<T: Component<Mutability = Mutable> + Reflect>(
     change_chain: Res<ChangeChain>,
     mut query: Query<&mut T>,
     mut undoredo_applied: EventReader<UndoRedoApplied<T>>,
@@ -831,6 +837,7 @@ fn auto_remap_undo_redo<T: Component + Reflect>(
     for event in undoredo_applied.read() {
         println!("remapping {:?}", event.entity);
         if let Ok(mut data) = query.get_mut(event.entity) {
+            //let reflect = data.as_reflect_mut();
             let reflect = data.as_reflect_mut();
 
             apply_for_every_typed_field::<Entity>(
@@ -877,7 +884,7 @@ fn auto_undo_add_init<T: Component + Clone>(
     for (e, data) in query.iter() {
         storage.storage.insert(e, data.clone());
         commands.entity(e).insert(OneFrameUndoIgnore::default());
-        new_changes.send(NewChange {
+        new_changes.write(NewChange {
             change: Arc::new(AddedComponent {
                 new_value: data.clone(),
                 entity: e,
@@ -902,7 +909,7 @@ fn auto_undo_reflected_add_init<T: Component + Reflect + FromReflect>(
             .storage
             .insert(e, <T as FromReflect>::from_reflect(data).unwrap());
         commands.entity(e).insert(OneFrameUndoIgnore::default());
-        new_changes.send(NewChange {
+        new_changes.write(NewChange {
             change: Arc::new(ReflectedAddedComponent {
                 new_value: <T as FromReflect>::from_reflect(data).unwrap(),
                 entity: e,
@@ -934,7 +941,7 @@ fn auto_undo_remove_detect<T: Component + Clone>(
     for e in removed_query.read() {
         if !ignore_storage.storage.contains_key(&e) {
             if let Some(prev_value) = storage.storage.remove(&e) {
-                new_changes.send(NewChange {
+                new_changes.write(NewChange {
                     change: Arc::new(RemovedComponent {
                         old_value: prev_value,
                         entity: e,
@@ -955,7 +962,7 @@ fn auto_undo_reflected_remove_detect<T: Component + Reflect + FromReflect>(
     for e in removed_query.read() {
         if !ignore_storage.storage.contains_key(&e) {
             if let Some(prev_value) = storage.storage.remove(&e) {
-                new_changes.send(NewChange {
+                new_changes.write(NewChange {
                     change: Arc::new(ReflectedRemovedComponent {
                         old_value: prev_value,
                         entity: e,
@@ -977,7 +984,7 @@ fn auto_undo_system_changed<T: Component>(
     }
 }
 
-fn auto_undo_system<T: Component + Clone>(
+fn auto_undo_system<T: Component<Mutability = Mutable> + Clone>(
     mut commands: Commands,
     mut storage: ResMut<AutoUndoStorage<T>>,
     mut query: Query<(Entity, &mut T), With<ChangedMarker<T>>>,
@@ -988,7 +995,7 @@ fn auto_undo_system<T: Component + Clone>(
             commands.entity(e).remove::<ChangedMarker<T>>();
 
             if let Some(prev_value) = storage.storage.get(&e) {
-                new_change.send(NewChange {
+                new_change.write(NewChange {
                     change: Arc::new(ComponentChange {
                         old_value: prev_value.clone(),
                         new_value: data.clone(),
@@ -1003,7 +1010,7 @@ fn auto_undo_system<T: Component + Clone>(
     }
 }
 
-fn auto_undo_reflected_system<T: Component + Reflect + FromReflect>(
+fn auto_undo_reflected_system<T: Component<Mutability = Mutable> + Reflect + FromReflect>(
     mut commands: Commands,
     mut storage: ResMut<AutoUndoStorage<T>>,
     mut query: Query<(Entity, &mut T, &mut ChangedMarker<T>)>,
@@ -1019,7 +1026,7 @@ fn auto_undo_reflected_system<T: Component + Reflect + FromReflect>(
             commands.entity(e).remove::<ChangedMarker<T>>();
 
             if let Some(prev_value) = storage.storage.get(&e) {
-                new_change.send(NewChange {
+                new_change.write(NewChange {
                     change: Arc::new(ReflectedComponentChange {
                         old_value: <T as FromReflect>::from_reflect(prev_value).unwrap(),
                         new_value: <T as FromReflect>::from_reflect(data.as_ref()).unwrap(),
diff --git a/crates/undo/src/tests.rs b/crates/undo/src/tests.rs
index 504264b8..5ddff2c3 100644
--- a/crates/undo/src/tests.rs
+++ b/crates/undo/src/tests.rs
@@ -37,7 +37,7 @@ fn test_undo() {
         .unwrap()
         .set_changed();
     repeat_update(&mut app, 10);
-    assert!(app.world_mut().get_entity(test_id).is_some());
+    assert!(app.world_mut().get_entity(test_id).is_ok());
 
     app.world_mut().get_mut::<Name>(test_id).unwrap().set("foo");
     repeat_update(&mut app, 10);
@@ -65,11 +65,11 @@ fn test_undo() {
     app.world_mut().send_event(UndoRedo::Undo);
     repeat_update(&mut app, 2);
     assert!(app.world_mut().get::<Name>(test_id).is_none());
-    assert!(app.world_mut().get_entity(test_id).is_some());
+    assert!(app.world_mut().get_entity(test_id).is_ok());
 
     app.world_mut().send_event(UndoRedo::Undo);
     repeat_update(&mut app, 2);
-    assert!(app.world_mut().get_entity(test_id).is_none());
+    assert!(app.world_mut().get_entity(test_id).is_ok());
 
     app.world_mut().send_event(UndoRedo::Redo);
     repeat_update(&mut app, 2);
@@ -100,7 +100,7 @@ fn test_reflected_undo() {
         .unwrap()
         .set_changed();
     repeat_update(&mut app, 10);
-    assert!(app.world_mut().get_entity(test_id).is_some());
+    assert!(app.world_mut().get_entity(test_id).is_ok());
 
     app.world_mut()
         .get_mut::<Transform>(test_id)
@@ -145,12 +145,12 @@ fn test_reflected_undo() {
     app.world_mut().send_event(UndoRedo::Undo);
     repeat_update(&mut app, 2);
     assert!(app.world_mut().get::<Transform>(test_id).is_none());
-    assert!(app.world_mut().get_entity(test_id).is_some());
+    assert!(app.world_mut().get_entity(test_id).is_ok());
 
     app.world_mut().send_event(UndoRedo::Undo);
     app.update();
     app.update();
-    assert!(app.world_mut().get_entity(test_id).is_none());
+    assert!(app.world_mut().get_entity(test_id).is_err());
 }
 
 #[test]
@@ -175,16 +175,16 @@ fn test_reflected_redo() {
         .unwrap()
         .set_changed();
     repeat_update(&mut app, 10);
-    assert!(app.world_mut().get_entity(test_id).is_some());
+    assert!(app.world_mut().get_entity(test_id).is_ok());
 
     app.world_mut().send_event(UndoRedo::Undo);
     repeat_update(&mut app, 2);
-    assert!(app.world_mut().get_entity(test_id).is_some());
+    assert!(app.world_mut().get_entity(test_id).is_ok());
     assert!(app.world_mut().get::<Transform>(test_id).is_none());
 
     app.world_mut().send_event(UndoRedo::Redo);
     repeat_update(&mut app, 10);
-    assert!(app.world_mut().get_entity(test_id).is_some());
+    assert!(app.world_mut().get_entity(test_id).is_ok());
     assert!(app.world_mut().get::<Transform>(test_id).is_some());
 
     app.world_mut().entity_mut(test_id).remove::<Transform>();
@@ -219,7 +219,7 @@ fn test_redo() {
         .unwrap()
         .set_changed();
     repeat_update(&mut app, 10);
-    assert!(app.world_mut().get_entity(test_id).is_some());
+    assert!(app.world_mut().get_entity(test_id).is_ok());
 
     app.world_mut().entity_mut(test_id).remove::<Name>();
     repeat_update(&mut app, 10);
@@ -235,9 +235,9 @@ fn test_redo() {
 #[test]
 fn test_undo_with_remap() {
     let mut app = configure_app();
-    app.add_plugins(HierarchyPlugin);
+    //app.add_plugins(HierarchyPlugin);
 
-    app.auto_reflected_undo::<Parent>();
+    //app.auto_reflected_undo::<ChildOf>();
     app.auto_reflected_undo::<Children>();
 
     let test_id_1 = app.world_mut().spawn(UndoMarker).id();
@@ -254,7 +254,7 @@ fn test_undo_with_remap() {
     repeat_update(&mut app, 2);
     app.cleanup();
 
-    app.world_mut().entity_mut(test_id_1).despawn_recursive();
+    app.world_mut().entity_mut(test_id_1).despawn();
     app.world_mut().send_event(NewChange {
         change: Arc::new(RemovedEntity { entity: test_id_1 }),
     });
@@ -263,12 +263,12 @@ fn test_undo_with_remap() {
     app.world_mut().send_event(UndoRedo::Undo);
     repeat_update(&mut app, 2);
 
-    assert!(app.world_mut().get_entity(test_id_1).is_none());
-    assert!(app.world_mut().get_entity(test_id_2).is_none());
+    assert!(app.world_mut().get_entity(test_id_1).is_ok());
+    assert!(app.world_mut().get_entity(test_id_2).is_ok());
     assert_eq!(app.world_mut().entities().len(), 2);
 
     let mut query = app.world_mut().query::<&Children>();
-    assert!(query.get_single(&app.world_mut()).is_ok());
+    assert!(query.single(&app.world_mut()).is_ok());
 }
 
 #[test]
diff --git a/examples/custom_editor_tab.rs b/examples/custom_editor_tab.rs
index d58c7113..3c00d476 100644
--- a/examples/custom_editor_tab.rs
+++ b/examples/custom_editor_tab.rs
@@ -81,7 +81,8 @@ fn system_tab(mut commands: Commands, mut ui: NonSendMut<EditorUiRef>) {
     // SpatialBundle and Name components
     if ui.button("Add").clicked() {
         commands.spawn((
-            SpatialBundle::default(),
+            Transform::default(),
+            Visibility::default(),
             PrefabMarker,
             Name::new("New Entity".to_string()),
         ));
diff --git a/examples/custom_event.rs b/examples/custom_event.rs
index 49536ff9..bea615ac 100644
--- a/examples/custom_event.rs
+++ b/examples/custom_event.rs
@@ -40,7 +40,7 @@ fn setup(mut commands: Commands) {
 fn spin_entities(mut query: Query<(&mut Transform, &Spin)>, time: Res<Time>) {
     for (mut transform, spin) in query.iter_mut() {
         if spin.0 {
-            transform.rotate(Quat::from_rotation_y(spin.1 * time.delta_seconds()));
+            transform.rotate(Quat::from_rotation_y(spin.1 * time.delta_secs()));
         }
     }
 }
diff --git a/examples/space_example.rs b/examples/space_example.rs
index 3337b695..56afbb67 100644
--- a/examples/space_example.rs
+++ b/examples/space_example.rs
@@ -1,9 +1,16 @@
-use bevy::prelude::*;
+use bevy::{
+    log::{Level, LogPlugin},
+    prelude::*,
+};
+use ext::bevy_inspector_egui::quick::WorldInspectorPlugin;
 use space_editor::prelude::*;
 
 fn main() {
     App::default()
-        .add_plugins(DefaultPlugins)
+        .add_plugins(DefaultPlugins.set(LogPlugin {
+            level: Level::TRACE,
+            ..default()
+        }))
         .add_plugins(SpaceEditorPlugin)
         .add_systems(Startup, simple_editor_setup)
         .run();
diff --git a/examples/spawn_prefab.rs b/examples/spawn_prefab.rs
index 0a85c598..eda4e7a9 100644
--- a/examples/spawn_prefab.rs
+++ b/examples/spawn_prefab.rs
@@ -18,20 +18,19 @@ fn setup(mut commands: Commands, _assets: Res<AssetServer>) {
         .insert(Name::new("Prefab"));
 
     // light
-    commands.spawn(PointLightBundle {
-        point_light: PointLight {
+    commands.spawn((
+        PointLight {
             intensity: 1500.0,
             shadows_enabled: true,
             ..default()
         },
-        transform: Transform::from_xyz(4.0, 8.0, 4.0),
-        ..default()
-    });
+        Transform::from_xyz(4.0, 8.0, 4.0)
+    ));
     // camera
     commands
-        .spawn(Camera3dBundle {
-            transform: Transform::from_xyz(-2.0, 2.5, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
-            ..default()
-        })
-        .insert(bevy_panorbit_camera::PanOrbitCamera::default());
+        .spawn((
+            Transform::from_xyz(-2.0, 2.5, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
+            Camera3d::default(),
+            bevy_panorbit_camera::PanOrbitCamera::default(),
+        ));
 }
diff --git a/external/editor_as_plugin/Cargo.toml b/external/editor_as_plugin/Cargo.toml
index 5f71d62c..036f6048 100644
--- a/external/editor_as_plugin/Cargo.toml
+++ b/external/editor_as_plugin/Cargo.toml
@@ -12,7 +12,7 @@ homepage.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bevy = "0.14"
+bevy = "0.16.0"
 space_editor = { path = "../../"}
 workspace-hakari = { version = "0.1", path = "../../workspace-hakari" }
 
diff --git a/external/editor_as_plugin/src/main.rs b/external/editor_as_plugin/src/main.rs
index 4898338a..ff71b2de 100644
--- a/external/editor_as_plugin/src/main.rs
+++ b/external/editor_as_plugin/src/main.rs
@@ -26,7 +26,7 @@ fn main() {
             MeshPrimitive3dPrefab::Cube(1.2),
             Name::new("Cube".to_string()),
             Transform::default(),
-            VisibilityBundle::default(),
+            Visibility::default(),
         ));
     })
     .run();
diff --git a/game/src/main.rs b/game/src/main.rs
index a3737236..275a8638 100644
--- a/game/src/main.rs
+++ b/game/src/main.rs
@@ -1,6 +1,6 @@
 use bevy::{
     prelude::*,
-    window::{WindowMode, WindowResolution},
+    window::{VideoMode, WindowMode, WindowResolution},
 };
 use game_lib::GamePlugin;
 use space_prefab::prelude::{PrefabBundle, PrefabPlugin};
@@ -14,7 +14,10 @@ fn main() {
             title: "Your Game".into(),
             resolution: WindowResolution::new(1600., 900.),
             visible: true,
-            mode: WindowMode::Fullscreen,
+            mode: WindowMode::Fullscreen(
+                MonitorSelection::Current,
+                VideoModeSelection::Current,
+            ),
             ..default()
         }),
         ..default()
@@ -31,18 +34,17 @@ fn setup(mut commands: Commands, _assets: Res<AssetServer>) {
         .insert(Name::new("Prefab"));
 
     // light
-    commands.spawn(PointLightBundle {
-        point_light: PointLight {
+    commands.spawn((
+        PointLight {
             intensity: 1500.0,
             shadows_enabled: true,
             ..default()
         },
-        transform: Transform::from_xyz(4.0, 8.0, 4.0),
-        ..default()
-    });
+        Transform::from_xyz(4.0, 8.0, 4.0),
+    ));
     // camera
-    commands.spawn(Camera3dBundle {
-        transform: Transform::from_xyz(-2.0, 2.5, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
-        ..default()
-    });
+    commands.spawn((
+        Camera3d::default(),
+        Transform::from_xyz(-2.0, 2.5, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
+    ));
 }
diff --git a/rust-toolchain.tom b/rust-toolchain.tom
new file mode 100644
index 00000000..5d56faf9
--- /dev/null
+++ b/rust-toolchain.tom
@@ -0,0 +1,2 @@
+[toolchain]
+channel = "nightly"
diff --git a/workspace-hakari/Cargo.toml b/workspace-hakari/Cargo.toml
index ec12dd20..8cc370e0 100644
--- a/workspace-hakari/Cargo.toml
+++ b/workspace-hakari/Cargo.toml
@@ -14,35 +14,7 @@ publish = false
 
 ### BEGIN HAKARI SECTION
 [dependencies]
-ahash = { version = "0.8", features = ["no-rng", "serde"] }
-bevy = { version = "0.14", features = ["wayland"] }
-bevy_winit = { version = "0.14", default-features = false, features = ["wayland", "x11"] }
-bytemuck = { version = "1", default-features = false, features = ["aarch64_simd", "derive", "extern_crate_alloc"] }
-crossbeam-utils = { version = "0.8" }
-ecolor = { version = "0.27", default-features = false, features = ["bytemuck", "serde"] }
-egui = { version = "0.27", features = ["bytemuck", "serde"] }
-either = { version = "1", default-features = false, features = ["use_std"] }
-emath = { version = "0.27", default-features = false, features = ["bytemuck", "serde"] }
-epaint = { version = "0.27", default-features = false, features = ["bytemuck", "default_fonts", "serde"] }
-getrandom = { version = "0.2", default-features = false, features = ["std"] }
-glam = { version = "0.28", features = ["bytemuck", "mint", "serde"] }
-hashbrown = { version = "0.14", features = ["raw", "serde"] }
-image = { version = "0.24" }
-log = { version = "0.4", default-features = false, features = ["std"] }
-num-traits = { version = "0.2", features = ["i128", "libm"] }
-serde = { version = "1", features = ["alloc", "derive", "rc"] }
-uuid = { version = "1", features = ["serde", "v4"] }
-winit = { version = "0.30", default-features = false, features = ["rwh_06", "wayland", "wayland-csd-adwaita", "x11"] }
 
 [build-dependencies]
-ahash = { version = "0.8", features = ["no-rng", "serde"] }
-derive_more = { version = "0.99" }
-getrandom = { version = "0.2", default-features = false, features = ["std"] }
-hashbrown = { version = "0.14", features = ["raw", "serde"] }
-log = { version = "0.4", default-features = false, features = ["std"] }
-serde = { version = "1", features = ["alloc", "derive", "rc"] }
-syn-dff4ba8e3ae991db = { package = "syn", version = "1", features = ["extra-traits", "full"] } # spellchecker:disable
-syn-f595c2ba2a3f28df = { package = "syn", version = "2", features = ["full", "visit"] } # spellchecker:disable
-uuid = { version = "1", features = ["serde", "v4"] }
 
 ### END HAKARI SECTION