diff --git a/Cargo.lock b/Cargo.lock
index 241bb1f..42e8100 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "ab_glyph"
-version = "0.2.26"
+version = "0.2.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e53b0a3d5760cd2ba9b787ae0c6440ad18ee294ff71b05e3381c900a7d16cfd"
+checksum = "79faae4620f45232f599d9bc7b290f88247a0834162c4495ab2f02d60004adfb"
 dependencies = [
  "ab_glyph_rasterizer",
  "owned_ttf_parser",
@@ -20,55 +20,57 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046"
 
 [[package]]
 name = "accesskit"
-version = "0.12.3"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74a4b14f3d99c1255dcba8f45621ab1a2e7540a0009652d33989005a4d0bfc6b"
+checksum = "6cf780eb737f2d4a49ffbd512324d53ad089070f813f7be7f99dbd5123a7f448"
 
 [[package]]
 name = "accesskit_consumer"
-version = "0.16.1"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c17cca53c09fbd7288667b22a201274b9becaa27f0b91bf52a526db95de45e6"
+checksum = "3bdfa1638ddd6eb9c752def95568df8b3ad832df252e9156d2eb783b201ca8a9"
 dependencies = [
  "accesskit",
+ "immutable-chunkmap",
 ]
 
 [[package]]
 name = "accesskit_macos"
-version = "0.10.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd3b6ae1eabbfbced10e840fd3fce8a93ae84f174b3e4ba892ab7bcb42e477a7"
+checksum = "c236a84ff1111defc280cee755eaa953d0b24398786851b9d28322c6d3bb1ebd"
 dependencies = [
  "accesskit",
  "accesskit_consumer",
- "objc2 0.3.0-beta.3.patch-leaks.3",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-foundation",
  "once_cell",
 ]
 
 [[package]]
 name = "accesskit_windows"
-version = "0.15.1"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afcae27ec0974fc7c3b0b318783be89fd1b2e66dd702179fe600166a38ff4a0b"
+checksum = "5d7f43d24b16b3e76bef248124fbfd2493c3a9860edb5aae1010c890e826de5e"
 dependencies = [
  "accesskit",
  "accesskit_consumer",
- "once_cell",
  "paste",
  "static_assertions",
- "windows 0.48.0",
+ "windows 0.54.0",
 ]
 
 [[package]]
 name = "accesskit_winit"
-version = "0.17.0"
+version = "0.20.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45f8f7c9f66d454d5fd8e344c8c8c7324b57194e1041b955519fc58a01e77a25"
+checksum = "755535e6bf711a42dac28b888b884b10fc00ff4010d9d3bd871c5f5beae5aa78"
 dependencies = [
  "accesskit",
  "accesskit_macos",
  "accesskit_windows",
- "raw-window-handle 0.6.2",
+ "raw-window-handle",
  "winit",
 ]
 
@@ -114,12 +116,12 @@ checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
 
 [[package]]
 name = "android-activity"
-version = "0.5.2"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289"
+checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046"
 dependencies = [
  "android-properties",
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "cc",
  "cesu8",
  "jni",
@@ -128,7 +130,7 @@ dependencies = [
  "log",
  "ndk",
  "ndk-context",
- "ndk-sys",
+ "ndk-sys 0.6.0+11769913",
  "num_enum",
  "thiserror",
 ]
@@ -156,9 +158,9 @@ dependencies = [
 
 [[package]]
 name = "any_vec"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e78f17bacc1bc7b91fef7b1885c10772eb2b9e4e989356f6f0f6a972240f97cd"
+checksum = "34cd60c5e3152cef0a592f1b296f1cc93715d89d2551d85315828c3a09575ff4"
 
 [[package]]
 name = "approx"
@@ -177,9 +179,9 @@ checksum = "9fb4009533e8ff8f1450a5bcbc30f4242a1d34442221f72314bea1f5dc9c7f89"
 dependencies = [
  "clipboard-win",
  "core-graphics",
- "image 0.25.1",
+ "image",
  "log",
- "objc2 0.5.2",
+ "objc2",
  "objc2-app-kit",
  "objc2-foundation",
  "parking_lot",
@@ -231,7 +233,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
 dependencies = [
  "concurrent-queue",
- "event-listener-strategy 0.5.2",
+ "event-listener-strategy",
  "futures-core",
  "pin-project-lite",
 ]
@@ -262,12 +264,12 @@ dependencies = [
 
 [[package]]
 name = "async-lock"
-version = "3.3.0"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b"
+checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
 dependencies = [
- "event-listener 4.0.3",
- "event-listener-strategy 0.4.0",
+ "event-listener 5.3.1",
+ "event-listener-strategy",
  "pin-project-lite",
 ]
 
@@ -297,18 +299,18 @@ checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
 [[package]]
 name = "bevy"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65b9eadaacf8fe971331bc3f250f35c18bc9dace3f96b483062f38ac07e3a1b4"
+checksum = "8e938630e9f472b1899c78ef84aa907081b23bad8333140e2295c620485b6ee7"
 dependencies = [
  "bevy_internal",
 ]
 
 [[package]]
 name = "bevy_a11y"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd8ef2795f7f5c816a4eda04834083eb5a92e8fef603bc21d2091c6e3b63621a"
+checksum = "3e613f0e7d5a92637e59744f7185e374c9a59654ecc6d7575adcec9581db1363"
 dependencies = [
  "accesskit",
  "bevy_app",
@@ -318,25 +320,27 @@ dependencies = [
 
 [[package]]
 name = "bevy_app"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab348a32e46d21c5d61794294a92d415a770d26c7ba8951830b127b40b53ccc4"
+checksum = "6f548e9dab7d10c5f99e3b504c758c4bf87aa67df9bcb9cc8b317a0271770e72"
 dependencies = [
  "bevy_derive",
  "bevy_ecs",
  "bevy_reflect",
  "bevy_tasks",
  "bevy_utils",
+ "console_error_panic_hook",
  "downcast-rs",
+ "thiserror",
  "wasm-bindgen",
  "web-sys",
 ]
 
 [[package]]
 name = "bevy_asset"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50028e0d4f28a9f6aab48f61b688ba2793141188f88cdc9aa6c2bca2cc02ad35"
+checksum = "f9d198e4c3419215de2ad981d4e734bbfab46469b7575e3b7150c912b9ec5175"
 dependencies = [
  "async-broadcast",
  "async-fs",
@@ -344,7 +348,6 @@ dependencies = [
  "bevy_app",
  "bevy_asset_macros",
  "bevy_ecs",
- "bevy_log",
  "bevy_reflect",
  "bevy_tasks",
  "bevy_utils",
@@ -359,6 +362,7 @@ dependencies = [
  "ron",
  "serde",
  "thiserror",
+ "uuid",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
@@ -366,21 +370,21 @@ dependencies = [
 
 [[package]]
 name = "bevy_asset_macros"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6617475908368418d815360148fdbb82f879dc255a70d2d7baa3766f0cd4bfd7"
+checksum = "11b2cbeba287a4b44e116c33dbaf37dce80a9d84477b2bb35ff459999d6c9e1b"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
 name = "bevy_atmosphere"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c48ce3e0b86b7034809827d7e6e723f09478f58c1c96024cd91bafbd9ebe247c"
+checksum = "1e6b7ca9c515c3207ed57e99f4242beb84149bb922fe20581bcb2fa9bdf9596d"
 dependencies = [
  "bevy",
  "bevy_atmosphere_macros",
@@ -389,121 +393,138 @@ dependencies = [
 
 [[package]]
 name = "bevy_atmosphere_macros"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "861782a376284786e25ccf67d0bcd39b540a9936da958e68da2e5cfec94e912c"
+checksum = "790a54e66b6cd4feb0216f37f4f5ad3dcedbf120e5b504412d8bad4c462342a1"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "bevy_color"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a933306f5c7dc9568209180f482b28b5f40d2f8d5b361bc1b270c0a588752c0"
+dependencies = [
+ "bevy_math",
+ "bevy_reflect",
+ "bytemuck",
+ "encase",
+ "serde",
+ "thiserror",
+ "wgpu-types",
 ]
 
 [[package]]
 name = "bevy_core"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12b0042f241ba7cd61487aadd8addfb56f7eeb662d713ac1577026704508fc6c"
+checksum = "6ddeed5ebf2fa75a4d4f32e2da9c60f11037e36252695059a151c6685cd3d72b"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
- "bevy_math",
  "bevy_reflect",
  "bevy_tasks",
  "bevy_utils",
- "bytemuck",
+ "uuid",
 ]
 
 [[package]]
 name = "bevy_core_pipeline"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48b7a471cb8ba665f12f7a167faa5566c11386f5bfc77d2e10bfde22b179f7b3"
+checksum = "1b978220b5edc98f2c5cbbd14c118c74b3ec7216e5416d3c187c1097279b009b"
 dependencies = [
  "bevy_app",
  "bevy_asset",
+ "bevy_color",
  "bevy_core",
  "bevy_derive",
  "bevy_ecs",
- "bevy_log",
  "bevy_math",
  "bevy_reflect",
  "bevy_render",
  "bevy_transform",
  "bevy_utils",
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
+ "nonmax",
  "radsort",
  "serde",
+ "smallvec",
+ "thiserror",
 ]
 
 [[package]]
 name = "bevy_derive"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0e01f8343f391e2d6a63b368b82fb5b252ed43c8713fc87f9a8f2d59407dd00"
+checksum = "c8a8173bad3ed53fa158806b1beda147263337d6ef71a093780dd141b74386b1"
 dependencies = [
  "bevy_macro_utils",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
 name = "bevy_diagnostic"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1401cdccec7e49378d013dfb0ff62c251f85b3be19dcdf04cfd827f793d1ee9"
+checksum = "0b7f82011fd70048be282526a99756d54bf00e874edafa9664ba0dc247678f03"
 dependencies = [
  "bevy_app",
  "bevy_core",
  "bevy_ecs",
- "bevy_log",
+ "bevy_tasks",
  "bevy_time",
  "bevy_utils",
  "const-fnv1a-hash",
- "sysinfo",
 ]
 
 [[package]]
 name = "bevy_ecs"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98e612a8e7962ead849e370f3a7e972b88df879ced05cd9dad6a0286d14650cf"
+checksum = "2c77fdc3a7230eff2fcebe4bd17c155bd238c660a0089d0f98c39ba0d461b923"
 dependencies = [
- "async-channel",
  "bevy_ecs_macros",
  "bevy_ptr",
  "bevy_reflect",
  "bevy_tasks",
  "bevy_utils",
- "downcast-rs",
- "fixedbitset",
- "rustc-hash",
+ "bitflags 2.6.0",
+ "concurrent-queue",
+ "fixedbitset 0.5.7",
+ "nonmax",
+ "petgraph",
  "serde",
  "thiserror",
- "thread_local",
 ]
 
 [[package]]
 name = "bevy_ecs_macros"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "807b5106c3410e58f4f523b55ea3c071e2a09e31e9510f3c22021c6a04732b5b"
+checksum = "9272b511958525306cd141726d3ca59740f79fc0707c439b55a007bcc3497308"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
 name = "bevy_egui"
-version = "0.27.0"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac153cb176b04eb0734c60fbc2912aa6fb2539f5b64ba832661c1c4cf9e298a"
+checksum = "5e4a90f30f2849a07d91e393b10c0cc05df09b5773c010ddde57dd8b583be230"
 dependencies = [
  "arboard",
  "bevy",
+ "bytemuck",
  "console_log",
  "crossbeam-channel",
  "egui",
@@ -519,9 +540,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_encase_derive"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "887087a5e522d9f20733a84dd7e6e9ca04cd8fdfac659220ed87d675eebc83a7"
+checksum = "f0452d8254c8bfae4bff6caca2a8be3b0c1b2e1a72b93e9b9f6a21c8dff807e0"
 dependencies = [
  "bevy_macro_utils",
  "encase_derive_impl",
@@ -529,9 +550,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_eventlistener"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9d65c75b4f81818cacdc8a4302c5413910c5fb7727564deaf95e56e0dea4bd0"
+checksum = "1201363657cbfed741b6402067fb2ad116b9616ecce053931dd7465d091b201f"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -542,78 +563,88 @@ dependencies = [
 
 [[package]]
 name = "bevy_eventlistener_derive"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa29be733a02a5d7ca4507ef15f294711c1a0884b9a9a2730640ff4e7d0200ab"
+checksum = "101faac3c5143e6758b1c5e1342b67525bb669d0e688bc5852f02519a572fdfe"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
 name = "bevy_framepace"
-version = "0.15.0"
+version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0848c70deb2c17a4d10f611e7c5f569fa4f8a4d1fc01a3179a77906ff4c111b9"
+checksum = "1fa5f7d858e66d0f4c4fe3e1a678da440037ce383c4c51bff3c1fa06a121ebc0"
 dependencies = [
- "bevy",
+ "bevy_app",
+ "bevy_diagnostic",
+ "bevy_ecs",
+ "bevy_log",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_time",
+ "bevy_utils",
+ "bevy_window",
+ "bevy_winit",
  "spin_sleep",
 ]
 
 [[package]]
 name = "bevy_gizmos"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "054df3550a9d423a961de65b459946ff23304f97f25af8a62c23f4259db8506d"
+checksum = "bdbb0556f0c6e45f4a17aef9c708c06ebf15ae1bed4533d7eddb493409f9f025"
 dependencies = [
  "bevy_app",
  "bevy_asset",
- "bevy_core",
+ "bevy_color",
  "bevy_core_pipeline",
  "bevy_ecs",
  "bevy_gizmos_macros",
- "bevy_log",
  "bevy_math",
  "bevy_pbr",
  "bevy_reflect",
  "bevy_render",
  "bevy_sprite",
+ "bevy_time",
  "bevy_transform",
  "bevy_utils",
+ "bytemuck",
 ]
 
 [[package]]
 name = "bevy_gizmos_macros"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abdcaf74d8cd34aa5c3293527e7a012826840886ad3496c1b963ed8b66b1619f"
+checksum = "8ef351a4b6498c197d1317c62f46ba84b69fbde3dbeb57beb2e744bbe5b7c3e0"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
 name = "bevy_hierarchy"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbb3dfad24866a6713dafa3065a91c5cf5e355f6e1b191c25d704ae54185246c"
+checksum = "802eca6f341d19ade790ccfaba7044be4d823b708087eb5ac4c1f74e4ea0916a"
 dependencies = [
  "bevy_app",
  "bevy_core",
  "bevy_ecs",
- "bevy_log",
  "bevy_reflect",
  "bevy_utils",
+ "smallvec",
 ]
 
 [[package]]
 name = "bevy_input"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47f2b2b3df168c6ef661d25e09abf5bd4fecaacd400f27e5db650df1c3fa3a3b"
+checksum = "2d050f1433f48ca23f1ea078734ebff119a3f76eb7d221725ab0f1fd9f81230b"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -626,13 +657,14 @@ dependencies = [
 
 [[package]]
 name = "bevy_internal"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f58ec0ce77603df9474cde61f429126bfe06eb79094440e9141afb4217751c79"
+checksum = "8ddd2b23e44d3a1f8ae547cbee5b6661f8135cc456c5de206e8648789944e7a1"
 dependencies = [
  "bevy_a11y",
  "bevy_app",
  "bevy_asset",
+ "bevy_color",
  "bevy_core",
  "bevy_core_pipeline",
  "bevy_derive",
@@ -649,6 +681,7 @@ dependencies = [
  "bevy_render",
  "bevy_scene",
  "bevy_sprite",
+ "bevy_state",
  "bevy_tasks",
  "bevy_text",
  "bevy_time",
@@ -661,57 +694,57 @@ dependencies = [
 
 [[package]]
 name = "bevy_log"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5eea6c527fd828b7fef8d0f518167f27f405b904a16f227b644687d3f46a809"
+checksum = "bab641fd0de254915ab746165a07677465b2d89b72f5b49367d73b9197548a35"
 dependencies = [
  "android_log-sys",
  "bevy_app",
  "bevy_ecs",
  "bevy_utils",
- "console_error_panic_hook",
- "tracing-log 0.1.4",
+ "tracing-log",
  "tracing-subscriber",
  "tracing-wasm",
 ]
 
 [[package]]
 name = "bevy_macro_utils"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb270c98a96243b29465139ed10bda2f675d00a11904f6588a5f7fc4774119c7"
+checksum = "c3ad860d35d74b35d4d6ae7f656d163b6f475aa2e64fc293ee86ac901977ddb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "rustc-hash",
- "syn 2.0.66",
- "toml_edit",
+ "syn 2.0.68",
+ "toml_edit 0.22.14",
 ]
 
 [[package]]
 name = "bevy_math"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f06daa26ffb82d90ba772256c0ba286f6c305c392f6976c9822717974805837c"
+checksum = "51bd6ce2174d3237d30e0ab5b2508480cc7593ca4d96ffb3a3095f9fc6bbc34c"
 dependencies = [
+ "bevy_reflect",
  "glam",
- "serde",
+ "rand",
+ "smallvec",
+ "thiserror",
 ]
 
 [[package]]
 name = "bevy_mikktspace"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0d7ef7f2a826d0b19f059035831ce00a5e930435cc53c61e045773d0483f67a"
+checksum = "b7ce4266293629a2d10459cc112dffe3b3e9229a4f2b8a4d20061b8dd53316d0"
 dependencies = [
  "glam",
 ]
 
 [[package]]
 name = "bevy_mod_picking"
-version = "0.18.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d79f17a34025d95e2e3525207ec73090647c6f40c3136fc674f87e167a9ae6be"
+version = "0.20.0"
+source = "git+https://github.com/aevyrie/bevy_mod_picking?branch=v0.20-release#0e784ea2191e0af604defbcb2c7d090a1c3cf49a"
 dependencies = [
  "bevy_app",
  "bevy_core",
@@ -729,12 +762,13 @@ dependencies = [
 
 [[package]]
 name = "bevy_mod_raycast"
-version = "0.17.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ca646aeaab4a170e1f3e8284b925e2f990eb18616e95d7826c873c8e26ee945"
+checksum = "d9e4ff45885c4716771a9f55977d8ce69596502a5241da55bf608d7cd71a9cb3"
 dependencies = [
  "bevy_app",
  "bevy_asset",
+ "bevy_color",
  "bevy_derive",
  "bevy_ecs",
  "bevy_gizmos",
@@ -750,12 +784,13 @@ dependencies = [
 
 [[package]]
 name = "bevy_pbr"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75b29c80269fa6db55c9e33701edd3ecb73d8866ca8cb814d49a9d3fb72531b6"
+checksum = "3effe8ff28899f14d250d0649ca9868dbe68b389d0f2b7af086759b8e16c6e3d"
 dependencies = [
  "bevy_app",
  "bevy_asset",
+ "bevy_color",
  "bevy_core_pipeline",
  "bevy_derive",
  "bevy_ecs",
@@ -765,19 +800,19 @@ dependencies = [
  "bevy_transform",
  "bevy_utils",
  "bevy_window",
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "bytemuck",
- "fixedbitset",
+ "fixedbitset 0.5.7",
+ "nonmax",
  "radsort",
  "smallvec",
- "thread_local",
+ "static_assertions",
 ]
 
 [[package]]
 name = "bevy_picking_core"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41c8cdca408508a7d006bf077c6cbb6660a65895323333f206b7cce7b801a8e2"
+version = "0.20.0"
+source = "git+https://github.com/aevyrie/bevy_mod_picking?branch=v0.20-release#0e784ea2191e0af604defbcb2c7d090a1c3cf49a"
 dependencies = [
  "bevy_app",
  "bevy_derive",
@@ -789,13 +824,13 @@ dependencies = [
  "bevy_transform",
  "bevy_utils",
  "bevy_window",
+ "uuid",
 ]
 
 [[package]]
 name = "bevy_picking_input"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60182209f48943de6c8bc3305a70f52012a18ef26f92f460f9436441b8badf0b"
+version = "0.20.0"
+source = "git+https://github.com/aevyrie/bevy_mod_picking?branch=v0.20-release#0e784ea2191e0af604defbcb2c7d090a1c3cf49a"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -811,9 +846,8 @@ dependencies = [
 
 [[package]]
 name = "bevy_picking_raycast"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2677d0a3402fea3327a216649c104f969685a5c01d969d274c89facba86c164d"
+version = "0.20.0"
+source = "git+https://github.com/aevyrie/bevy_mod_picking?branch=v0.20-release#0e784ea2191e0af604defbcb2c7d090a1c3cf49a"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -827,17 +861,16 @@ dependencies = [
 
 [[package]]
 name = "bevy_ptr"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8050e2869fe341db6874203b5a01ff12673807a2c7c80cb829f6c7bea6997268"
+checksum = "c115c97a5c8a263bd0aa7001b999772c744ac5ba797d07c86f25734ce381ea69"
 
 [[package]]
 name = "bevy_reflect"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccbd7de21d586457a340a0962ad0747dc5098ff925eb6b27a918c4bdd8252f7b"
+checksum = "406ea0fce267169c2320c7302d97d09f605105686346762562c5f65960b5ca2f"
 dependencies = [
- "bevy_math",
  "bevy_ptr",
  "bevy_reflect_derive",
  "bevy_utils",
@@ -845,38 +878,41 @@ dependencies = [
  "erased-serde",
  "glam",
  "serde",
+ "smallvec",
  "smol_str",
  "thiserror",
+ "uuid",
 ]
 
 [[package]]
 name = "bevy_reflect_derive"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ce33051bd49036d4a5a62aa3f2068672ec55f3ebe92aa0d003a341f15cc37ac"
+checksum = "0427fdb4425fc72cc96d45e550df83ace6347f0503840de116c76a40843ba751"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
  "uuid",
 ]
 
 [[package]]
 name = "bevy_render"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88b2c4b644c739c0b474b6f8f7b0bc68ac13d83b59688781e9a7753c52780177"
+checksum = "4c48acf1ff4267c231def4cbf573248d42ac60c9952108822d505019460bf36d"
 dependencies = [
  "async-channel",
  "bevy_app",
  "bevy_asset",
+ "bevy_color",
  "bevy_core",
  "bevy_derive",
+ "bevy_diagnostic",
  "bevy_ecs",
  "bevy_encase_derive",
  "bevy_hierarchy",
- "bevy_log",
  "bevy_math",
  "bevy_mikktspace",
  "bevy_reflect",
@@ -886,22 +922,24 @@ dependencies = [
  "bevy_transform",
  "bevy_utils",
  "bevy_window",
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "bytemuck",
  "codespan-reporting",
  "downcast-rs",
  "encase",
  "futures-lite",
  "hexasphere",
- "image 0.24.9",
+ "image",
  "js-sys",
  "ktx2",
  "naga",
  "naga_oil",
+ "nonmax",
  "ruzstd",
+ "send_wrapper",
  "serde",
+ "smallvec",
  "thiserror",
- "thread_local",
  "wasm-bindgen",
  "web-sys",
  "wgpu",
@@ -909,21 +947,21 @@ dependencies = [
 
 [[package]]
 name = "bevy_render_macros"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "720b88406e786e378829b7d43c1ffb5300186912b99904d0d4d8ec6698a4f210"
+checksum = "72ddf4a96d71519c8eca3d74dabcb89a9c0d50ab5d9230638cb004145f46e9ed"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
 name = "bevy_scene"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f3d2caa1bfe7542dbe2c62e1bcc10791ba181fb744d2fe6711d1d373354da7c"
+checksum = "b7a9f0388612a116f02ab6187aeab66e52c9e91abbc21f919b8b50230c4d83e7"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -941,53 +979,77 @@ dependencies = [
 
 [[package]]
 name = "bevy_sprite"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cad1b555161f50e5d62b7fdf7ebeef1b24338aae7a88e51985da9553cd60ddf"
+checksum = "d837e33ed27b9f2e5212eca4bdd5655a9ee64c52914112e6189c043cb25dd1ec"
 dependencies = [
  "bevy_app",
  "bevy_asset",
+ "bevy_color",
  "bevy_core_pipeline",
  "bevy_derive",
  "bevy_ecs",
- "bevy_log",
  "bevy_math",
  "bevy_reflect",
  "bevy_render",
  "bevy_transform",
  "bevy_utils",
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "bytemuck",
- "fixedbitset",
+ "fixedbitset 0.5.7",
  "guillotiere",
  "radsort",
  "rectangle-pack",
  "thiserror",
 ]
 
+[[package]]
+name = "bevy_state"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0959984092d56885fd3b320ea84fb816821bad6bfa3040b9d4ee850d3273233d"
+dependencies = [
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_hierarchy",
+ "bevy_reflect",
+ "bevy_state_macros",
+ "bevy_utils",
+]
+
+[[package]]
+name = "bevy_state_macros"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "887a98bfa268258377cd073f5bb839518d3a1cd6b96ed81418145485b69378e6"
+dependencies = [
+ "bevy_macro_utils",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
 [[package]]
 name = "bevy_tasks"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f07fcc4969b357de143509925b39c9a2c56eaa8750828d97f319ca9ed41897cb"
+checksum = "5a8bfb8d484bdb1e9bec3789c75202adc5e608c4244347152e50fb31668a54f9"
 dependencies = [
- "async-channel",
  "async-executor",
- "async-task",
- "concurrent-queue",
  "futures-lite",
  "wasm-bindgen-futures",
 ]
 
 [[package]]
 name = "bevy_text"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4e8456ae0bea7d6b7621e42c1c12bf66c0891381e62c948ab23920673ce611c"
+checksum = "454fd29b7828244356b2e0ce782e6d0a6f26b47f521456accde3a7191b121727"
 dependencies = [
  "ab_glyph",
  "bevy_app",
  "bevy_asset",
+ "bevy_color",
  "bevy_ecs",
  "bevy_math",
  "bevy_reflect",
@@ -1003,9 +1065,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_time"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38ea5ae9fe7f56f555dbb05a88d34931907873e3f0c7dc426591839eef72fe3e"
+checksum = "a6c3d3d14ee8b0dbe4819fd516cc75509b61946134d78e0ee89ad3d1835ffe6c"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -1017,9 +1079,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_transform"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0d51a1f332cc00939d2f19ed6b909e5ed7037e39c7e25cc86930d79d432163e"
+checksum = "97e8aa6b16be573277c6ceda30aebf1d78af7c6ede19b448dcb052fb8601d815"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -1031,19 +1093,19 @@ dependencies = [
 
 [[package]]
 name = "bevy_ui"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bbc30be39cfbfa3a073b541d22aea43ab14452dea12d7411ce201df17ff7b1"
+checksum = "38d9f864c646f3742ff77f67bcd89a13a7ab024b68ca2f1bfbab8245bcb1c06c"
 dependencies = [
  "bevy_a11y",
  "bevy_app",
  "bevy_asset",
+ "bevy_color",
  "bevy_core_pipeline",
  "bevy_derive",
  "bevy_ecs",
  "bevy_hierarchy",
  "bevy_input",
- "bevy_log",
  "bevy_math",
  "bevy_reflect",
  "bevy_render",
@@ -1053,76 +1115,74 @@ dependencies = [
  "bevy_utils",
  "bevy_window",
  "bytemuck",
+ "nonmax",
+ "smallvec",
  "taffy",
  "thiserror",
 ]
 
 [[package]]
 name = "bevy_utils"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a9f845a985c00e0ee8dc2d8af3f417be925fb52aad4bda5b96e2e58a2b4d2eb"
+checksum = "7fab364910e8f5839578aba9cfda00a8388e9ebe352ceb8491a742ce6af9ec6e"
 dependencies = [
  "ahash",
  "bevy_utils_proc_macros",
  "getrandom",
  "hashbrown",
- "nonmax",
- "petgraph",
- "smallvec",
- "thiserror",
+ "thread_local",
  "tracing",
- "uuid",
  "web-time",
 ]
 
 [[package]]
 name = "bevy_utils_proc_macros"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef158627f30503d5c18c20c60b444829f698d343516eeaf6eeee078c9a45163"
+checksum = "ad9db261ab33a046e1f54b35f885a44f21fcc80aa2bc9050319466b88fe58fe3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
 name = "bevy_vector_shapes"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9db0755f3ecacdca38e1add345b1838eba81bd21714fbdbc1966ea28a5219ca6"
+checksum = "527ffe75cb327dc755482c26a56cc3338b76f456c9bac18e3733b9e4ec4fd7c2"
 dependencies = [
  "any_vec",
  "bevy",
  "bitfield",
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
+ "nonmax",
  "smallvec",
  "wgpu",
 ]
 
 [[package]]
 name = "bevy_window"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "976202d2ed838176595b550ac654b15ae236e0178a6f19a94ca6d58f2a96ca60"
+checksum = "c9ea5777f933bf7ecaeb3af1a30845720ec730e007972ca7d4aba2d3512abe24"
 dependencies = [
  "bevy_a11y",
  "bevy_app",
  "bevy_ecs",
- "bevy_input",
  "bevy_math",
  "bevy_reflect",
  "bevy_utils",
- "raw-window-handle 0.6.2",
+ "raw-window-handle",
  "smol_str",
 ]
 
 [[package]]
 name = "bevy_winit"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa66539aa93d8522b146bf82de429714ea6370a6061fc1f1ff7bcacd4e64c6c4"
+checksum = "f8c2213bbf14debe819ec8ad4913f233c596002d087bc6f1f20d533e2ebaf8c6"
 dependencies = [
  "accesskit_winit",
  "approx",
@@ -1132,12 +1192,15 @@ dependencies = [
  "bevy_ecs",
  "bevy_hierarchy",
  "bevy_input",
+ "bevy_log",
  "bevy_math",
+ "bevy_reflect",
  "bevy_tasks",
  "bevy_utils",
  "bevy_window",
+ "cfg-if",
  "crossbeam-channel",
- "raw-window-handle 0.6.2",
+ "raw-window-handle",
  "wasm-bindgen",
  "web-sys",
  "winit",
@@ -1160,9 +1223,9 @@ checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
 
 [[package]]
 name = "bitfield"
-version = "0.14.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d7e60934ceec538daadb9d8432424ed043a904d8e0243f3c6446bce549a46ac"
+checksum = "c821a6e124197eb56d907ccc2188eab1038fb919c914f47976e64dd8dbc855d1"
 
 [[package]]
 name = "bitflags"
@@ -1172,9 +1235,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 dependencies = [
  "serde",
 ]
@@ -1198,51 +1261,13 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
 
-[[package]]
-name = "block-sys"
-version = "0.1.0-beta.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa55741ee90902547802152aaf3f8e5248aab7e21468089560d4c8840561146"
-dependencies = [
- "objc-sys 0.2.0-beta.2",
-]
-
-[[package]]
-name = "block-sys"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7"
-dependencies = [
- "objc-sys 0.3.5",
-]
-
-[[package]]
-name = "block2"
-version = "0.2.0-alpha.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42"
-dependencies = [
- "block-sys 0.1.0-beta.1",
- "objc2-encode 2.0.0-pre.2",
-]
-
-[[package]]
-name = "block2"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68"
-dependencies = [
- "block-sys 0.2.1",
- "objc2 0.4.1",
-]
-
 [[package]]
 name = "block2"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f"
 dependencies = [
- "objc2 0.5.2",
+ "objc2",
 ]
 
 [[package]]
@@ -1276,9 +1301,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
 name = "bytemuck"
-version = "1.16.0"
+version = "1.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5"
+checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e"
 dependencies = [
  "bytemuck_derive",
 ]
@@ -1291,7 +1316,7 @@ checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -1312,7 +1337,7 @@ version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "log",
  "polling",
  "rustix",
@@ -1334,9 +1359,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.98"
+version = "1.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f"
+checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490"
 dependencies = [
  "jobserver",
  "libc",
@@ -1361,6 +1386,12 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
 [[package]]
 name = "clipboard-win"
 version = "5.3.1"
@@ -1380,12 +1411,6 @@ dependencies = [
  "unicode-width",
 ]
 
-[[package]]
-name = "color_quant"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
-
 [[package]]
 name = "com"
 version = "0.6.0"
@@ -1589,12 +1614,12 @@ checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991"
 
 [[package]]
 name = "d3d12"
-version = "0.19.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e3d747f100290a1ca24b752186f61f6637e1deffe3bf6320de6fcb29510a307"
+checksum = "b28bfe653d79bd16c77f659305b195b82bb5ce0c0eb2a4846b82ddbd77586813"
 dependencies = [
- "bitflags 2.5.0",
- "libloading 0.8.3",
+ "bitflags 2.6.0",
+ "libloading 0.8.4",
  "winapi",
 ]
 
@@ -1610,17 +1635,6 @@ version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
 
-[[package]]
-name = "derive_more"
-version = "0.99.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "dirs"
 version = "4.0.0"
@@ -1653,7 +1667,16 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
 dependencies = [
- "libloading 0.8.3",
+ "libloading 0.8.4",
+]
+
+[[package]]
+name = "document-features"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef5282ad69563b5fc40319526ba27e0e7363d552a896f0297d54f767717f9b95"
+dependencies = [
+ "litrs",
 ]
 
 [[package]]
@@ -1662,46 +1685,54 @@ version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
 
+[[package]]
+name = "dpi"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53"
+
 [[package]]
 name = "ecolor"
-version = "0.27.2"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20930a432bbd57a6d55e07976089708d4893f3d556cf42a0d79e9e321fa73b10"
+checksum = "2e6b451ff1143f6de0f33fc7f1b68fecfd2c7de06e104de96c4514de3f5396f8"
 dependencies = [
  "bytemuck",
+ "emath",
 ]
 
 [[package]]
 name = "egui"
-version = "0.27.2"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "584c5d1bf9a67b25778a3323af222dbe1a1feb532190e103901187f92c7fe29a"
+checksum = "20c97e70a2768de630f161bb5392cbd3874fcf72868f14df0e002e82e06cb798"
 dependencies = [
  "ahash",
+ "emath",
  "epaint",
  "nohash-hasher",
 ]
 
 [[package]]
 name = "either"
-version = "1.12.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
 [[package]]
 name = "emath"
-version = "0.27.2"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4c3a552cfca14630702449d35f41c84a0d15963273771c6059175a803620f3f"
+checksum = "0a6a21708405ea88f63d8309650b4d77431f4bc28fb9d8e6f77d3963b51249e6"
 dependencies = [
  "bytemuck",
 ]
 
 [[package]]
 name = "encase"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95ed933078d2e659745df651f4c180511cd582e5b9414ff896e7d50d207e3103"
+checksum = "5a9299a95fa5671ddf29ecc22b00e121843a65cb9ff24911e394b4ae556baf36"
 dependencies = [
  "const_panic",
  "encase_derive",
@@ -1711,29 +1742,29 @@ dependencies = [
 
 [[package]]
 name = "encase_derive"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4ce1449c7d19eba6cc0abd231150ad81620a8dce29601d7f8d236e5d431d72a"
+checksum = "07e09decb3beb1fe2db6940f598957b2e1f7df6206a804d438ff6cb2a9cddc10"
 dependencies = [
  "encase_derive_impl",
 ]
 
 [[package]]
 name = "encase_derive_impl"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92959a9e8d13eaa13b8ae8c7b583c3bf1669ca7a8e7708a088d12587ba86effc"
+checksum = "fd31dbbd9743684d339f907a87fe212cb7b51d75b9e8e74181fe363199ee9b47"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
 name = "epaint"
-version = "0.27.2"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b381f8b149657a4acf837095351839f32cd5c4aec1817fc4df84e18d76334176"
+checksum = "3f0dcc0a0771e7500e94cd1cb797bd13c9f23b9409bdc3c824e2cbc562b7fa01"
 dependencies = [
  "ab_glyph",
  "ahash",
@@ -1793,43 +1824,22 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
 [[package]]
 name = "event-listener"
-version = "4.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e"
-dependencies = [
- "concurrent-queue",
- "parking",
- "pin-project-lite",
-]
-
-[[package]]
-name = "event-listener"
-version = "5.3.0"
+version = "5.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24"
+checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
 dependencies = [
  "concurrent-queue",
  "parking",
  "pin-project-lite",
 ]
 
-[[package]]
-name = "event-listener-strategy"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3"
-dependencies = [
- "event-listener 4.0.3",
- "pin-project-lite",
-]
-
 [[package]]
 name = "event-listener-strategy"
 version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
 dependencies = [
- "event-listener 5.3.0",
+ "event-listener 5.3.1",
  "pin-project-lite",
 ]
 
@@ -1854,6 +1864,12 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
+[[package]]
+name = "fixedbitset"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
+
 [[package]]
 name = "flate2"
 version = "1.0.30"
@@ -1882,7 +1898,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -1961,11 +1977,12 @@ dependencies = [
 
 [[package]]
 name = "glam"
-version = "0.25.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3"
+checksum = "9e05e7e6723e3455f4818c7b26e855439f7546cf617ef669d1adedb8669e5cb9"
 dependencies = [
  "bytemuck",
+ "rand",
  "serde",
 ]
 
@@ -1978,8 +1995,8 @@ dependencies = [
  "aho-corasick",
  "bstr",
  "log",
- "regex-automata 0.4.6",
- "regex-syntax 0.8.3",
+ "regex-automata 0.4.7",
+ "regex-syntax 0.8.4",
 ]
 
 [[package]]
@@ -2005,9 +2022,9 @@ dependencies = [
 
 [[package]]
 name = "glyph_brush_layout"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc32c2334f00ca5ac3695c5009ae35da21da8c62d255b5b96d56e2597a637a38"
+checksum = "7b1e288bfd2f6c0313f78bf5aa538356ad481a3bb97e9b7f93220ab0066c5992"
 dependencies = [
  "ab_glyph",
  "approx",
@@ -2020,7 +2037,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "gpu-alloc-types",
 ]
 
@@ -2030,7 +2047,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
@@ -2048,29 +2065,29 @@ dependencies = [
 
 [[package]]
 name = "gpu-descriptor"
-version = "0.2.4"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c"
+checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "gpu-descriptor-types",
  "hashbrown",
 ]
 
 [[package]]
 name = "gpu-descriptor-types"
-version = "0.1.2"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c"
+checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
 name = "grid"
-version = "0.10.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eec1c01eb1de97451ee0d60de7d81cf1e72aabefb021616027f3d1c3ec1c723c"
+checksum = "be136d9dacc2a13cc70bb6c8f902b414fb2641f8db1314637c6b7933411a8f82"
 
 [[package]]
 name = "guillotiere"
@@ -2099,10 +2116,10 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "com",
  "libc",
- "libloading 0.8.3",
+ "libloading 0.8.4",
  "thiserror",
  "widestring",
  "winapi",
@@ -2110,15 +2127,21 @@ dependencies = [
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.9"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+
+[[package]]
+name = "hermit-abi"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
 
 [[package]]
 name = "hexasphere"
-version = "10.0.0"
+version = "12.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f33ddb7f7143d9e703c072e88b98cd8b9719f174137a671429351bd2ee43c02a"
+checksum = "edd6b038160f086b0a7496edae34169ae22f328793cbe2b627a5a3d8373748ec"
 dependencies = [
  "constgebra",
  "glam",
@@ -2139,17 +2162,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "icrate"
-version = "0.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319"
-dependencies = [
- "block2 0.3.0",
- "dispatch",
- "objc2 0.4.1",
-]
-
 [[package]]
 name = "idna"
 version = "0.5.0"
@@ -2170,7 +2182,7 @@ dependencies = [
  "globset",
  "log",
  "memchr",
- "regex-automata 0.4.6",
+ "regex-automata 0.4.7",
  "same-file",
  "walkdir",
  "winapi-util",
@@ -2178,27 +2190,24 @@ dependencies = [
 
 [[package]]
 name = "image"
-version = "0.24.9"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d"
+checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11"
 dependencies = [
  "bytemuck",
  "byteorder",
- "color_quant",
  "num-traits",
+ "png",
+ "tiff",
 ]
 
 [[package]]
-name = "image"
-version = "0.25.1"
+name = "immutable-chunkmap"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11"
+checksum = "4419f022e55cc63d5bbd6b44b71e1d226b9c9480a47824c706e9d54e5c40c5eb"
 dependencies = [
- "bytemuck",
- "byteorder",
- "num-traits",
- "png",
- "tiff",
+ "arrayvec",
 ]
 
 [[package]]
@@ -2221,7 +2230,7 @@ dependencies = [
  "libflate",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -2302,7 +2311,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76"
 dependencies = [
  "libc",
- "libloading 0.8.3",
+ "libloading 0.8.4",
  "pkg-config",
 ]
 
@@ -2323,9 +2332,9 @@ dependencies = [
 
 [[package]]
 name = "lazy_static"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
@@ -2369,12 +2378,12 @@ dependencies = [
 
 [[package]]
 name = "libloading"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
+checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d"
 dependencies = [
  "cfg-if",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -2383,7 +2392,7 @@ version = "0.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "libc",
  "redox_syscall 0.4.1",
 ]
@@ -2394,7 +2403,7 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "libc",
 ]
 
@@ -2404,6 +2413,12 @@ version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
+[[package]]
+name = "litrs"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5"
+
 [[package]]
 name = "lock_api"
 version = "0.4.12"
@@ -2416,9 +2431,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.21"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "malloc_buf"
@@ -2440,9 +2455,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.7.2"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "memmap2"
@@ -2455,11 +2470,11 @@ dependencies = [
 
 [[package]]
 name = "metal"
-version = "0.27.0"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25"
+checksum = "5637e166ea14be6063a3f8ba5ccb9a4159df7d8f6d61c02fc3d480b1f90dcfcb"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "block",
  "core-graphics-types",
  "foreign-types",
@@ -2470,9 +2485,9 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae"
+checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
 dependencies = [
  "adler",
  "simd-adler32",
@@ -2480,12 +2495,13 @@ dependencies = [
 
 [[package]]
 name = "naga"
-version = "0.19.2"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50e3524642f53d9af419ab5e8dd29d3ba155708267667c2f3f06c88c9e130843"
+checksum = "e536ae46fcab0876853bd4a632ede5df4b1c2527a58f6c5a4150fe86be858231"
 dependencies = [
+ "arrayvec",
  "bit-set",
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "codespan-reporting",
  "hexf-parse",
  "indexmap",
@@ -2501,9 +2517,9 @@ dependencies = [
 
 [[package]]
 name = "naga_oil"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0ea62ae0f2787456afca7209ca180522b41f00cbe159ee369eba1e07d365cd1"
+checksum = "275d9720a7338eedac966141089232514c84d76a246a58ef501af88c5edf402f"
 dependencies = [
  "bit-set",
  "codespan-reporting",
@@ -2512,7 +2528,7 @@ dependencies = [
  "naga",
  "once_cell",
  "regex",
- "regex-syntax 0.8.3",
+ "regex-syntax 0.8.4",
  "rustc-hash",
  "thiserror",
  "tracing",
@@ -2521,16 +2537,16 @@ dependencies = [
 
 [[package]]
 name = "ndk"
-version = "0.8.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7"
+checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "jni-sys",
  "log",
- "ndk-sys",
+ "ndk-sys 0.6.0+11769913",
  "num_enum",
- "raw-window-handle 0.6.2",
+ "raw-window-handle",
  "thiserror",
 ]
 
@@ -2549,6 +2565,15 @@ dependencies = [
  "jni-sys",
 ]
 
+[[package]]
+name = "ndk-sys"
+version = "0.6.0+11769913"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873"
+dependencies = [
+ "jni-sys",
+]
+
 [[package]]
 name = "nohash-hasher"
 version = "0.2.0"
@@ -2561,15 +2586,6 @@ version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "610a5acd306ec67f907abe5567859a3c693fb9886eb1f012ab8f2a47bef3db51"
 
-[[package]]
-name = "ntapi"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "nu-ansi-term"
 version = "0.46.0"
@@ -2595,7 +2611,7 @@ version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi",
+ "hermit-abi 0.3.9",
  "libc",
 ]
 
@@ -2617,7 +2633,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -2627,15 +2643,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
 dependencies = [
  "malloc_buf",
- "objc_exception",
 ]
 
-[[package]]
-name = "objc-sys"
-version = "0.2.0-beta.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7"
-
 [[package]]
 name = "objc-sys"
 version = "0.3.5"
@@ -2644,49 +2653,52 @@ checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310"
 
 [[package]]
 name = "objc2"
-version = "0.3.0-beta.3.patch-leaks.3"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e01640f9f2cb1220bbe80325e179e532cb3379ebcd1bf2279d703c19fe3a468"
+checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804"
 dependencies = [
- "block2 0.2.0-alpha.6",
- "objc-sys 0.2.0-beta.2",
- "objc2-encode 2.0.0-pre.2",
+ "objc-sys",
+ "objc2-encode",
 ]
 
 [[package]]
-name = "objc2"
-version = "0.4.1"
+name = "objc2-app-kit"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d"
+checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
 dependencies = [
- "objc-sys 0.3.5",
- "objc2-encode 3.0.0",
+ "bitflags 2.6.0",
+ "block2",
+ "libc",
+ "objc2",
+ "objc2-core-data",
+ "objc2-core-image",
+ "objc2-foundation",
+ "objc2-quartz-core",
 ]
 
 [[package]]
-name = "objc2"
-version = "0.5.2"
+name = "objc2-cloud-kit"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804"
+checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009"
 dependencies = [
- "objc-sys 0.3.5",
- "objc2-encode 4.0.3",
+ "bitflags 2.6.0",
+ "block2",
+ "objc2",
+ "objc2-core-location",
+ "objc2-foundation",
 ]
 
 [[package]]
-name = "objc2-app-kit"
+name = "objc2-contacts"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
+checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889"
 dependencies = [
- "bitflags 2.5.0",
- "block2 0.5.1",
- "libc",
- "objc2 0.5.2",
- "objc2-core-data",
- "objc2-core-image",
+ "block2",
+ "objc2",
  "objc2-foundation",
- "objc2-quartz-core",
 ]
 
 [[package]]
@@ -2695,9 +2707,9 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
 dependencies = [
- "bitflags 2.5.0",
- "block2 0.5.1",
- "objc2 0.5.2",
+ "bitflags 2.6.0",
+ "block2",
+ "objc2",
  "objc2-foundation",
 ]
 
@@ -2707,27 +2719,24 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80"
 dependencies = [
- "block2 0.5.1",
- "objc2 0.5.2",
+ "block2",
+ "objc2",
  "objc2-foundation",
  "objc2-metal",
 ]
 
 [[package]]
-name = "objc2-encode"
-version = "2.0.0-pre.2"
+name = "objc2-core-location"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512"
+checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781"
 dependencies = [
- "objc-sys 0.2.0-beta.2",
+ "block2",
+ "objc2",
+ "objc2-contacts",
+ "objc2-foundation",
 ]
 
-[[package]]
-name = "objc2-encode"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666"
-
 [[package]]
 name = "objc2-encode"
 version = "4.0.3"
@@ -2740,10 +2749,23 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
 dependencies = [
- "bitflags 2.5.0",
- "block2 0.5.1",
+ "bitflags 2.6.0",
+ "block2",
+ "dispatch",
  "libc",
- "objc2 0.5.2",
+ "objc2",
+]
+
+[[package]]
+name = "objc2-link-presentation"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398"
+dependencies = [
+ "block2",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-foundation",
 ]
 
 [[package]]
@@ -2752,9 +2774,9 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
 dependencies = [
- "bitflags 2.5.0",
- "block2 0.5.1",
- "objc2 0.5.2",
+ "bitflags 2.6.0",
+ "block2",
+ "objc2",
  "objc2-foundation",
 ]
 
@@ -2764,20 +2786,66 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
 dependencies = [
- "bitflags 2.5.0",
- "block2 0.5.1",
- "objc2 0.5.2",
+ "bitflags 2.6.0",
+ "block2",
+ "objc2",
  "objc2-foundation",
  "objc2-metal",
 ]
 
 [[package]]
-name = "objc_exception"
-version = "0.1.2"
+name = "objc2-symbols"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4"
+checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc"
 dependencies = [
- "cc",
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-ui-kit"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f"
+dependencies = [
+ "bitflags 2.6.0",
+ "block2",
+ "objc2",
+ "objc2-cloud-kit",
+ "objc2-core-data",
+ "objc2-core-image",
+ "objc2-core-location",
+ "objc2-foundation",
+ "objc2-link-presentation",
+ "objc2-quartz-core",
+ "objc2-symbols",
+ "objc2-uniform-type-identifiers",
+ "objc2-user-notifications",
+]
+
+[[package]]
+name = "objc2-uniform-type-identifiers"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe"
+dependencies = [
+ "block2",
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-user-notifications"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3"
+dependencies = [
+ "bitflags 2.6.0",
+ "block2",
+ "objc2",
+ "objc2-core-location",
+ "objc2-foundation",
 ]
 
 [[package]]
@@ -2803,9 +2871,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
 [[package]]
 name = "owned_ttf_parser"
-version = "0.21.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b41438d2fc63c46c74a2203bf5ccd82c41ba04347b2fcf5754f230b167067d5"
+checksum = "490d3a563d3122bf7c911a59b0add9389e5ec0f5f0c3ac6b91ff235a0e6a7f90"
 dependencies = [
  "ttf-parser",
 ]
@@ -2834,9 +2902,9 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.5.1",
+ "redox_syscall 0.5.2",
  "smallvec",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -2857,10 +2925,30 @@ version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
- "fixedbitset",
+ "fixedbitset 0.4.2",
  "indexmap",
 ]
 
+[[package]]
+name = "pin-project"
+version = "1.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "1.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
 [[package]]
 name = "pin-project-lite"
 version = "0.2.14"
@@ -2869,9 +2957,9 @@ checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
 
 [[package]]
 name = "piper"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "464db0c665917b13ebb5d453ccdec4add5658ee1adc7affc7677615356a8afaf"
+checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391"
 dependencies = [
  "atomic-waker",
  "fastrand",
@@ -2899,13 +2987,13 @@ dependencies = [
 
 [[package]]
 name = "polling"
-version = "3.7.0"
+version = "3.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3"
+checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b"
 dependencies = [
  "cfg-if",
  "concurrent-queue",
- "hermit-abi",
+ "hermit-abi 0.4.0",
  "pin-project-lite",
  "rustix",
  "tracing",
@@ -2933,14 +3021,14 @@ version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
 dependencies = [
- "toml_edit",
+ "toml_edit 0.21.1",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.84"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -2953,9 +3041,9 @@ checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58"
 
 [[package]]
 name = "quick-xml"
-version = "0.31.0"
+version = "0.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33"
+checksum = "6f24d770aeca0eacb81ac29dfbc55ebcc09312fdd1f8bbecdc7e4a84e000e3b4"
 dependencies = [
  "memchr",
 ]
@@ -2976,16 +3064,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "17fd96390ed3feda12e1dfe2645ed587e0bea749e319333f104a33ff62f77a0b"
 
 [[package]]
-name = "range-alloc"
-version = "0.1.3"
+name = "rand"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "rand_core",
+]
 
 [[package]]
-name = "raw-window-handle"
-version = "0.5.2"
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+
+[[package]]
+name = "range-alloc"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9"
+checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab"
 
 [[package]]
 name = "raw-window-handle"
@@ -2999,15 +3096,6 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a0d463f2884048e7153449a55166f91028d5b0ea53c79377099ce4e8cf0cf9bb"
 
-[[package]]
-name = "redox_syscall"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
-dependencies = [
- "bitflags 1.3.2",
-]
-
 [[package]]
 name = "redox_syscall"
 version = "0.4.1"
@@ -3019,11 +3107,11 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
+checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
@@ -3039,14 +3127,14 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.4"
+version = "1.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
+checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.6",
- "regex-syntax 0.8.3",
+ "regex-automata 0.4.7",
+ "regex-syntax 0.8.4",
 ]
 
 [[package]]
@@ -3060,13 +3148,13 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.3",
+ "regex-syntax 0.8.4",
 ]
 
 [[package]]
@@ -3077,9 +3165,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
 
 [[package]]
 name = "renderdoc-sys"
@@ -3095,7 +3183,7 @@ checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422"
 
 [[package]]
 name = "rlviser"
-version = "0.7.10"
+version = "0.7.11"
 dependencies = [
  "ahash",
  "bevy",
@@ -3125,7 +3213,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94"
 dependencies = [
  "base64",
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "serde",
  "serde_derive",
 ]
@@ -3155,7 +3243,7 @@ version = "0.38.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -3164,12 +3252,11 @@ dependencies = [
 
 [[package]]
 name = "ruzstd"
-version = "0.5.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58c4eb8a81997cf040a091d1f7e1938aeab6749d3a0dfa73af43cdc32393483d"
+checksum = "5022b253619b1ba797f243056276bed8ed1a73b0f5a7ce7225d524067644bf8f"
 dependencies = [
  "byteorder",
- "derive_more",
  "twox-hash",
 ]
 
@@ -3202,9 +3289,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "sctk-adwaita"
-version = "0.8.1"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82b2eaf3a5b264a521b988b2e73042e742df700c4f962cde845d1541adb46550"
+checksum = "7555fcb4f753d095d734fdefebb0ad8c98478a21db500492d87c55913d3b0086"
 dependencies = [
  "ab_glyph",
  "log",
@@ -3213,6 +3300,12 @@ dependencies = [
  "tiny-skia",
 ]
 
+[[package]]
+name = "send_wrapper"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
+
 [[package]]
 name = "serde"
 version = "1.0.203"
@@ -3230,14 +3323,14 @@ checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.117"
+version = "1.0.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
+checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5"
 dependencies = [
  "itoa",
  "ryu",
@@ -3282,9 +3375,6 @@ name = "smallvec"
 version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
-dependencies = [
- "serde",
-]
 
 [[package]]
 name = "smithay-client-toolkit"
@@ -3292,7 +3382,7 @@ version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "calloop",
  "calloop-wayland-source",
  "cursor-icon",
@@ -3335,7 +3425,7 @@ version = "0.3.0+sdk-1.3.268.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
@@ -3375,38 +3465,25 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.66"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
  "unicode-ident",
 ]
 
-[[package]]
-name = "sysinfo"
-version = "0.30.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "732ffa00f53e6b2af46208fba5718d9662a421049204e156328b66791ffa15ae"
-dependencies = [
- "cfg-if",
- "core-foundation-sys",
- "libc",
- "ntapi",
- "once_cell",
- "windows 0.52.0",
-]
-
 [[package]]
 name = "taffy"
-version = "0.3.19"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1315457ccd9c3def787a18fae91914e623e4dcff019b64ce39f5268ded53d3d"
+checksum = "e8b61630cba2afd2c851821add2e1bb1b7851a2436e839ab73b56558b009035e"
 dependencies = [
  "arrayvec",
  "grid",
  "num-traits",
+ "serde",
  "slotmap",
 ]
 
@@ -3436,7 +3513,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -3487,9 +3564,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+checksum = "ce6b6a2fb3a985e99cebfaefa9faa3024743da73304ca1c683a36429613d3d22"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -3514,7 +3591,18 @@ checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
 dependencies = [
  "indexmap",
  "toml_datetime",
- "winnow",
+ "winnow 0.5.40",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "winnow 0.6.13",
 ]
 
 [[package]]
@@ -3536,7 +3624,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -3549,17 +3637,6 @@ dependencies = [
  "valuable",
 ]
 
-[[package]]
-name = "tracing-log"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2"
-dependencies = [
- "log",
- "once_cell",
- "tracing-core",
-]
-
 [[package]]
 name = "tracing-log"
 version = "0.2.0"
@@ -3586,7 +3663,7 @@ dependencies = [
  "thread_local",
  "tracing",
  "tracing-core",
- "tracing-log 0.2.0",
+ "tracing-log",
 ]
 
 [[package]]
@@ -3602,9 +3679,9 @@ dependencies = [
 
 [[package]]
 name = "ttf-parser"
-version = "0.21.1"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8"
+checksum = "8686b91785aff82828ed725225925b33b4fde44c4bb15876e5f7c832724c420a"
 
 [[package]]
 name = "twox-hash"
@@ -3651,9 +3728,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.12"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6"
+checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
 
 [[package]]
 name = "unicode-xid"
@@ -3663,9 +3740,9 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
 
 [[package]]
 name = "url"
-version = "2.5.0"
+version = "2.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
+checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -3674,9 +3751,9 @@ dependencies = [
 
 [[package]]
 name = "uuid"
-version = "1.8.0"
+version = "1.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
+checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439"
 dependencies = [
  "getrandom",
  "serde",
@@ -3731,7 +3808,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
  "wasm-bindgen-shared",
 ]
 
@@ -3765,7 +3842,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -3778,9 +3855,9 @@ checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 
 [[package]]
 name = "wayland-backend"
-version = "0.3.3"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40"
+checksum = "269c04f203640d0da2092d1b8d89a2d081714ae3ac2f1b53e99f205740517198"
 dependencies = [
  "cc",
  "downcast-rs",
@@ -3792,11 +3869,11 @@ dependencies = [
 
 [[package]]
 name = "wayland-client"
-version = "0.31.2"
+version = "0.31.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f"
+checksum = "08bd0f46c069d3382a36c8666c1b9ccef32b8b04f41667ca1fef06a1adcc2982"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "rustix",
  "wayland-backend",
  "wayland-scanner",
@@ -3808,16 +3885,16 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "cursor-icon",
  "wayland-backend",
 ]
 
 [[package]]
 name = "wayland-cursor"
-version = "0.31.1"
+version = "0.31.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71ce5fa868dd13d11a0d04c5e2e65726d0897be8de247c0c5a65886e283231ba"
+checksum = "09414bcf0fd8d9577d73e9ac4659ebc45bcc9cff1980a350543ad8e50ee263b2"
 dependencies = [
  "rustix",
  "wayland-client",
@@ -3830,7 +3907,7 @@ version = "0.31.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "wayland-backend",
  "wayland-client",
  "wayland-scanner",
@@ -3842,7 +3919,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
@@ -3855,7 +3932,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
@@ -3864,9 +3941,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-scanner"
-version = "0.31.1"
+version = "0.31.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283"
+checksum = "edf466fc49a4feb65a511ca403fec3601494d0dee85dbf37fff6fa0dd4eec3b6"
 dependencies = [
  "proc-macro2",
  "quick-xml",
@@ -3875,9 +3952,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-sys"
-version = "0.31.1"
+version = "0.31.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af"
+checksum = "4a6754825230fa5b27bafaa28c30b3c9e72c55530581220cef401fa422c0fae7"
 dependencies = [
  "dlib",
  "log",
@@ -3897,9 +3974,9 @@ dependencies = [
 
 [[package]]
 name = "web-time"
-version = "0.2.4"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -3907,17 +3984,18 @@ dependencies = [
 
 [[package]]
 name = "webbrowser"
-version = "0.8.15"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db67ae75a9405634f5882791678772c94ff5f16a66535aae186e26aa0841fc8b"
+checksum = "425ba64c1e13b1c6e8c5d2541c8fac10022ca584f33da781db01b5756aef1f4e"
 dependencies = [
+ "block2",
  "core-foundation",
  "home",
  "jni",
  "log",
  "ndk-context",
- "objc",
- "raw-window-handle 0.5.2",
+ "objc2",
+ "objc2-foundation",
  "url",
  "web-sys",
 ]
@@ -3930,19 +4008,20 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
 
 [[package]]
 name = "wgpu"
-version = "0.19.4"
+version = "0.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbd7311dbd2abcfebaabf1841a2824ed7c8be443a0f29166e5d3c6a53a762c01"
+checksum = "90e37c7b9921b75dfd26dd973fdcbce36f13dfa6e2dc82aece584e0ed48c355c"
 dependencies = [
  "arrayvec",
  "cfg-if",
- "cfg_aliases",
+ "cfg_aliases 0.1.1",
+ "document-features",
  "js-sys",
  "log",
  "naga",
  "parking_lot",
  "profiling",
- "raw-window-handle 0.6.2",
+ "raw-window-handle",
  "smallvec",
  "static_assertions",
  "wasm-bindgen",
@@ -3955,22 +4034,23 @@ dependencies = [
 
 [[package]]
 name = "wgpu-core"
-version = "0.19.4"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28b94525fc99ba9e5c9a9e24764f2bc29bad0911a7446c12f446a8277369bf3a"
+checksum = "d50819ab545b867d8a454d1d756b90cd5f15da1f2943334ca314af10583c9d39"
 dependencies = [
  "arrayvec",
  "bit-vec",
- "bitflags 2.5.0",
- "cfg_aliases",
+ "bitflags 2.6.0",
+ "cfg_aliases 0.1.1",
  "codespan-reporting",
+ "document-features",
  "indexmap",
  "log",
  "naga",
  "once_cell",
  "parking_lot",
  "profiling",
- "raw-window-handle 0.6.2",
+ "raw-window-handle",
  "rustc-hash",
  "smallvec",
  "thiserror",
@@ -3981,17 +4061,17 @@ dependencies = [
 
 [[package]]
 name = "wgpu-hal"
-version = "0.19.4"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc1a4924366df7ab41a5d8546d6534f1f33231aa5b3f72b9930e300f254e39c3"
+checksum = "172e490a87295564f3fcc0f165798d87386f6231b04d4548bca458cbbfd63222"
 dependencies = [
  "android_system_properties",
  "arrayvec",
  "ash",
  "bit-set",
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "block",
- "cfg_aliases",
+ "cfg_aliases 0.1.1",
  "core-graphics-types",
  "d3d12",
  "glow",
@@ -4003,17 +4083,17 @@ dependencies = [
  "js-sys",
  "khronos-egl",
  "libc",
- "libloading 0.8.3",
+ "libloading 0.8.4",
  "log",
  "metal",
  "naga",
- "ndk-sys",
+ "ndk-sys 0.5.0+25.2.9519653",
  "objc",
  "once_cell",
  "parking_lot",
  "profiling",
  "range-alloc",
- "raw-window-handle 0.6.2",
+ "raw-window-handle",
  "renderdoc-sys",
  "rustc-hash",
  "smallvec",
@@ -4026,11 +4106,11 @@ dependencies = [
 
 [[package]]
 name = "wgpu-types"
-version = "0.19.2"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b671ff9fb03f78b46ff176494ee1ebe7d603393f42664be55b64dc8d53969805"
+checksum = "1353d9a46bff7f955a680577f34c69122628cc2076e1d6f3a9be6ef00ae793ef"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "js-sys",
  "web-sys",
 ]
@@ -4074,23 +4154,24 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windows"
-version = "0.48.0"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
 dependencies = [
- "windows-implement",
- "windows-interface",
- "windows-targets 0.48.5",
+ "windows-core 0.52.0",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "windows"
-version = "0.52.0"
+version = "0.54.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
+checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49"
 dependencies = [
- "windows-core",
- "windows-targets 0.52.5",
+ "windows-core 0.54.0",
+ "windows-implement",
+ "windows-interface",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -4099,29 +4180,48 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.54.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65"
+dependencies = [
+ "windows-result",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "windows-implement"
-version = "0.48.0"
+version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c"
+checksum = "942ac266be9249c84ca862f0a164a39533dc2f6f33dc98ec89c8da99b82ea0bd"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.68",
 ]
 
 [[package]]
 name = "windows-interface"
-version = "0.48.0"
+version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7"
+checksum = "da33557140a288fae4e1d5f8873aaf9eb6613a9cf82c3e070223ff177f598b60"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
+dependencies = [
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -4148,7 +4248,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -4183,18 +4283,18 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.5",
- "windows_aarch64_msvc 0.52.5",
- "windows_i686_gnu 0.52.5",
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
  "windows_i686_gnullvm",
- "windows_i686_msvc 0.52.5",
- "windows_x86_64_gnu 0.52.5",
- "windows_x86_64_gnullvm 0.52.5",
- "windows_x86_64_msvc 0.52.5",
+ "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]]
@@ -4211,9 +4311,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -4229,9 +4329,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -4247,15 +4347,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
 [[package]]
 name = "windows_i686_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -4271,9 +4371,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -4289,9 +4389,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -4307,9 +4407,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -4325,43 +4425,47 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winit"
-version = "0.29.15"
+version = "0.30.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d59ad965a635657faf09c8f062badd885748428933dad8e8bdd64064d92e5ca"
+checksum = "49f45a7b7e2de6af35448d7718dab6d95acec466eb3bb7a56f4d31d1af754004"
 dependencies = [
  "ahash",
  "android-activity",
  "atomic-waker",
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
+ "block2",
  "bytemuck",
  "calloop",
- "cfg_aliases",
+ "cfg_aliases 0.2.1",
+ "concurrent-queue",
  "core-foundation",
  "core-graphics",
  "cursor-icon",
- "icrate",
+ "dpi",
  "js-sys",
  "libc",
- "log",
  "memmap2",
  "ndk",
- "ndk-sys",
- "objc2 0.4.1",
- "once_cell",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-foundation",
+ "objc2-ui-kit",
  "orbclient",
  "percent-encoding",
- "raw-window-handle 0.6.2",
- "redox_syscall 0.3.5",
+ "pin-project",
+ "raw-window-handle",
+ "redox_syscall 0.4.1",
  "rustix",
  "sctk-adwaita",
  "smithay-client-toolkit",
  "smol_str",
+ "tracing",
  "unicode-segmentation",
  "wasm-bindgen",
  "wasm-bindgen-futures",
@@ -4371,7 +4475,7 @@ dependencies = [
  "wayland-protocols-plasma",
  "web-sys",
  "web-time",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
  "x11-dl",
  "x11rb",
  "xkbcommon-dl",
@@ -4386,6 +4490,15 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "winnow"
+version = "0.6.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "x11-dl"
 version = "2.21.0"
@@ -4406,7 +4519,7 @@ dependencies = [
  "as-raw-xcb-connection",
  "gethostname",
  "libc",
- "libloading 0.8.3",
+ "libloading 0.8.4",
  "once_cell",
  "rustix",
  "x11rb-protocol",
@@ -4436,7 +4549,7 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "dlib",
  "log",
  "once_cell",
@@ -4445,9 +4558,9 @@ dependencies = [
 
 [[package]]
 name = "xkeysym"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621"
+checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56"
 
 [[package]]
 name = "xml-rs"
@@ -4457,20 +4570,20 @@ checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.34"
+version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.34"
+version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 9a3270a..e9b43aa 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-version = "0.7.10"
+version = "0.7.11"
 name = "rlviser"
 edition = "2021"
 publish = false
@@ -7,12 +7,13 @@ publish = false
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bevy_atmosphere = "0.9.1"
-bevy_egui = "0.27.0"
-bevy_eventlistener = "0.7.0"
-bevy_framepace = { version = "0.15.0", default-features = false }
-bevy_mod_picking = { version = "0.18.0", default-features = false, features = ["backend_raycast"] }
-bevy_vector_shapes = "0.7.0"
+bevy_atmosphere = "0.10"
+bevy_egui = "0.28"
+bevy_eventlistener = "0.8"
+bevy_vector_shapes = "0.8"
+bevy_framepace = { version = "0.17", default-features = false }
+# bevy_mod_picking = { version = "0.20", default-features = false, features = ["backend_raycast"] }
+bevy_mod_picking = { git = "https://github.com/aevyrie/bevy_mod_picking", branch = "v0.20-release", default-features = false, features = ["backend_raycast"] }
 byteorder = "1.4.3"
 include-flate = "0.3.0"
 once_cell = "1.17.1"
@@ -27,11 +28,12 @@ crossbeam-channel = "0.5.12"
 itertools = "0.13.0"
 
 [dependencies.bevy]
-version = "0.13.0"
+version = "0.14"
 default-features = false
-features = ["bevy_core_pipeline", "bevy_pbr", "bevy_ui", "wayland", "x11", "tga", "tonemapping_luts", "default_font", "bevy_gizmos"]
+features = ["bevy_core_pipeline", "bevy_pbr", "bevy_ui", "wayland", "x11", "tga", "default_font", "bevy_gizmos", "bevy_state"]
 
 [features]
+default = []
 full_load = []
 ssao = []
 team_goal_barriers = []
diff --git a/src/assets.rs b/src/assets.rs
index 1e5d579..c6178ad 100644
--- a/src/assets.rs
+++ b/src/assets.rs
@@ -4,7 +4,9 @@ use crate::{
 };
 use bevy::{
     asset::{io::Reader, AssetLoader, AsyncReadExt},
+    color::palettes::css,
     prelude::*,
+    utils::ConditionalSendFuture,
 };
 use byteorder::{LittleEndian, ReadBytesExt};
 use once_cell::sync::Lazy;
@@ -389,7 +391,7 @@ fn retreive_material(
     if let Some(texture_name) = diffuse {
         debug!("Found texture for {name}");
         if texture_name == "ForcefieldHex" {
-            material.base_color = Color::rgba(0.3, 0.3, 0.3, 0.3);
+            material.base_color = Color::srgba(0.3, 0.3, 0.3, 0.3);
         }
         material.base_color_texture = Some(load_texture(texture_name, asset_server));
     }
@@ -416,7 +418,7 @@ fn get_default_material(name: &str, side: Option<Team>) -> Option<StandardMateri
     .contains(&name)
     {
         // primary
-        Color::rgb_u8(45, 49, 66)
+        Color::srgb_u8(45, 49, 66)
     } else if [
         "FutureTech.Materials.Reflective_Floor_V2_Mat",
         "Proto_BBall.SM.BackBoard_Teams_MIC",
@@ -427,12 +429,12 @@ fn get_default_material(name: &str, side: Option<Team>) -> Option<StandardMateri
     {
         // secondary
         match side {
-            Some(Team::Blue) => Color::rgb_u8(86, 136, 199),
-            Some(Team::Orange) => Color::rgb_u8(222, 145, 81),
-            None => Color::rgb_u8(131, 144, 115),
+            Some(Team::Blue) => Color::srgb_u8(86, 136, 199),
+            Some(Team::Orange) => Color::srgb_u8(222, 145, 81),
+            None => Color::srgb_u8(131, 144, 115),
         }
     } else if name == "OOBFloor_MAT_CUSTOM" {
-        Color::rgb_u8(41, 2, 0)
+        Color::srgb_u8(41, 2, 0)
     } else if [
         "FutureTech.Materials.Frame_01_MIC",
         "FutureTech.Materials.Frame_01_V2_Mat",
@@ -448,25 +450,25 @@ fn get_default_material(name: &str, side: Option<Team>) -> Option<StandardMateri
         || name.contains("PaintedLine_MIC")
     {
         // tertiary
-        Color::rgb_u8(55, 30, 48)
+        Color::srgb_u8(55, 30, 48)
     } else if [
         "FutureTech.Materials.Frame_01_White_MIC",
         "Graybox_Assets.Materials.ForceFieldCage_Solid_Mat",
     ]
     .contains(&name)
     {
-        Color::SILVER
+        Color::from(css::SILVER)
     } else if name == "FutureTech.Materials.CrossHatched_Grate_MIC" {
-        Color::TOMATO
+        Color::from(css::TOMATO)
     } else if [
         "Pickup_Boost.Materials.BoostPad_Small_MIC",
         "Pickup_Boost.Materials.BoostPad_Large_MIC",
     ]
     .contains(&name)
     {
-        Color::rgb_u8(152, 29, 23)
+        Color::srgb_u8(152, 29, 23)
     } else if name.contains("Advert") || name.contains("DarkMetal") {
-        Color::rgb_u8(191, 192, 192)
+        Color::srgb_u8(191, 192, 192)
     } else {
         println!("Unknown material {name}");
         return None;
@@ -510,7 +512,7 @@ pub fn get_material(
         return material.clone();
     }
 
-    let base_color = base_color.unwrap_or(Color::rgb(0.3, 0.3, 0.3));
+    let base_color = base_color.unwrap_or(Color::srgb(0.3, 0.3, 0.3));
 
     material_names
         .entry(key)
@@ -679,7 +681,7 @@ impl AssetLoader for PskxLoader {
         reader: &'a mut Reader,
         _settings: &'a Self::Settings,
         load_context: &'a mut bevy::asset::LoadContext,
-    ) -> bevy::utils::BoxedFuture<'a, Result<Self::Asset, Self::Error>> {
+    ) -> impl ConditionalSendFuture<Output = Result<Self::Asset, Self::Error>> {
         Box::pin(async move {
             let mut bytes = Vec::new();
             reader.read_to_end(&mut bytes).await?;
diff --git a/src/bytes.rs b/src/bytes.rs
index 2a50029..580f02c 100644
--- a/src/bytes.rs
+++ b/src/bytes.rs
@@ -257,7 +257,7 @@ impl<const N: usize> ByteWriter<N> {
 
 impl ToBytesExact<{ bool::NUM_BYTES * 4 }> for [bool; 4] {
     fn to_bytes(&self) -> [u8; bool::NUM_BYTES * 4] {
-        let mut writer = ByteWriter::<{ bool::NUM_BYTES * 4 }>::new();
+        let mut writer = const { ByteWriter::<{ bool::NUM_BYTES * 4 }>::new() };
         for item in self {
             writer.write(item);
         }
@@ -293,7 +293,7 @@ macro_rules! impl_to_bytes_exact {
     ($t:ty, $($p:ident),+) => {
         impl ToBytesExact<{ Self::NUM_BYTES }> for $t {
             fn to_bytes(&self) -> [u8; Self::NUM_BYTES] {
-                let mut writer = ByteWriter::<{ Self::NUM_BYTES }>::new();
+                let mut writer = const { ByteWriter::<{ Self::NUM_BYTES }>::new() };
                 $(writer.write(&self.$p);)+
                 writer.inner()
             }
diff --git a/src/camera.rs b/src/camera.rs
index a542e6b..dde226c 100644
--- a/src/camera.rs
+++ b/src/camera.rs
@@ -1,8 +1,13 @@
 use crate::spectator::{Spectator, SpectatorPlugin, SpectatorSettings};
 use bevy::{
-    pbr::{CascadeShadowConfigBuilder, DirectionalLightShadowMap},
+    color::palettes::css,
+    core_pipeline::tonemapping::Tonemapping,
+    pbr::{CascadeShadowConfigBuilder, DirectionalLightShadowMap, ShadowFilteringMethod},
     prelude::*,
 };
+use serde::{Deserialize, Serialize};
+use std::f32::consts::PI;
+
 use bevy_atmosphere::prelude::*;
 use bevy_framepace::{FramepacePlugin, FramepaceSettings};
 use bevy_mod_picking::{
@@ -10,8 +15,7 @@ use bevy_mod_picking::{
     prelude::*,
 };
 use bevy_vector_shapes::prelude::*;
-use serde::{Deserialize, Serialize};
-use std::{f32::consts::PI, time::Duration};
+use std::time::Duration;
 
 #[cfg(feature = "ssao")]
 use bevy::{
@@ -81,8 +85,10 @@ fn setup(mut commands: Commands) {
             .into(),
             transform: Transform::from_translation(Vec3::new(-3000., 1000., 0.)).looking_to(Vec3::X, Vec3::Y),
             camera: Camera { hdr: true, ..default() },
+            tonemapping: Tonemapping::ReinhardLuminance,
             ..default()
         },
+        ShadowFilteringMethod::Gaussian,
         AtmosphereCamera::default(),
         RaycastPickable,
         Spectator,
@@ -111,7 +117,7 @@ fn setup(mut commands: Commands) {
             "",
             TextStyle {
                 font_size: BOOST_INDICATOR_FONT_SIZE,
-                color: Color::SILVER,
+                color: Color::from(css::SILVER),
                 ..default()
             },
         )
@@ -141,7 +147,7 @@ fn setup(mut commands: Commands) {
                     "00m:00s",
                     TextStyle {
                         font_size: 40.0,
-                        color: Color::DARK_GRAY,
+                        color: Color::from(css::DARK_GRAY),
                         ..default()
                     },
                 )
@@ -193,6 +199,7 @@ pub struct EntityName {
 }
 
 #[cfg(debug_assertions)]
+
 impl EntityName {
     #[inline]
     pub const fn new(name: Box<str>) -> Self {
@@ -201,6 +208,7 @@ impl EntityName {
 }
 
 #[cfg(debug_assertions)]
+
 impl From<&str> for EntityName {
     #[inline]
     fn from(name: &str) -> Self {
@@ -209,6 +217,7 @@ impl From<&str> for EntityName {
 }
 
 #[cfg(debug_assertions)]
+
 impl From<String> for EntityName {
     #[inline]
     fn from(name: String) -> Self {
@@ -217,37 +226,43 @@ impl From<String> for EntityName {
 }
 
 #[derive(Component, Clone, Copy)]
+
 pub struct HighlightedEntity;
 
 pub struct CameraPlugin;
 
 impl Plugin for CameraPlugin {
     fn build(&self, app: &mut App) {
-        app.insert_resource(SpectatorSettings::default())
-            .insert_resource(FramepaceSettings {
+        {
+            app.insert_resource(FramepaceSettings {
                 limiter: bevy_framepace::Limiter::from_framerate(60.),
             })
-            .insert_resource(AtmosphereModel::default())
             .insert_resource(CycleTimer(Timer::new(
                 Duration::from_secs_f32(1. / 60.),
                 TimerMode::Repeating,
             )))
-            .insert_resource(DaylightOffset::default())
+            .insert_resource(AtmosphereModel::default())
             .insert_resource(RaycastBackendSettings {
                 require_markers: true,
                 ..default()
             })
-            .insert_resource(DirectionalLightShadowMap::default())
             .add_plugins((
                 FramepacePlugin,
-                SpectatorPlugin,
                 DefaultPickingPlugins,
                 AtmospherePlugin,
                 Shape2dPlugin::default(),
+            ))
+            .add_systems(Update, daylight_cycle);
+        }
+
+        app.insert_resource(SpectatorSettings::default())
+            .insert_resource(DaylightOffset::default())
+            .insert_resource(DirectionalLightShadowMap::default())
+            .add_plugins((
+                SpectatorPlugin,
                 #[cfg(feature = "ssao")]
                 TemporalAntiAliasPlugin,
             ))
-            .add_systems(Update, daylight_cycle)
             .add_systems(Startup, setup);
     }
 }
diff --git a/src/main.rs b/src/main.rs
index 0876c19..f14e075 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -47,29 +47,28 @@ fn main() {
     assets::uncook().unwrap();
 
     App::new()
-        .init_state::<GameLoadState>()
         .insert_resource(ServerPort {
             primary_port,
             secondary_port,
         })
-        .add_plugins((DefaultPlugins
-            .set(ImagePlugin {
-                default_sampler: ImageSamplerDescriptor {
-                    address_mode_u: ImageAddressMode::Repeat,
-                    address_mode_v: ImageAddressMode::Repeat,
-                    address_mode_w: ImageAddressMode::Repeat,
-                    ..default()
-                },
-            })
-            .set(WindowPlugin {
-                primary_window: Some(Window {
-                    title: "RLViser-rs".into(),
-                    present_mode: PresentMode::AutoNoVsync,
+        .add_plugins((
+            DefaultPlugins
+                .set(ImagePlugin {
+                    default_sampler: ImageSamplerDescriptor {
+                        address_mode_u: ImageAddressMode::Repeat,
+                        address_mode_v: ImageAddressMode::Repeat,
+                        address_mode_w: ImageAddressMode::Repeat,
+                        ..default()
+                    },
+                })
+                .set(WindowPlugin {
+                    primary_window: Some(Window {
+                        title: "RLViser-rs".into(),
+                        present_mode: PresentMode::AutoNoVsync,
+                        ..default()
+                    }),
                     ..default()
                 }),
-                ..default()
-            }),))
-        .add_plugins((
             LogDiagnosticsPlugin {
                 debug: cfg!(feature = "debug"),
                 ..default()
@@ -80,5 +79,6 @@ fn main() {
             udp::RocketSimPlugin,
             assets::AssetsLoaderPlugin,
         ))
+        .init_state::<GameLoadState>()
         .run();
 }
diff --git a/src/mesh.rs b/src/mesh.rs
index 33ee17a..58a0d30 100644
--- a/src/mesh.rs
+++ b/src/mesh.rs
@@ -1,16 +1,13 @@
 use crate::{
     assets::*,
-    camera::{HighlightedEntity, PrimaryCamera},
     rocketsim::{GameMode, Team},
-    settings::{
-        default_field::{get_hoops_floor, get_standard_floor, load_hoops, load_standard},
-        state_setting::{EnableBallInfo, EnableCarInfo, EnablePadInfo, UserCarStates, UserPadStates},
-    },
-    udp::{Ball, BoostPadI, Car, Connection, GameStates, SendableUdp, ToBevyVec, ToBevyVecFlat},
+    settings::default_field::{get_hoops_floor, get_standard_floor, load_hoops, load_standard},
+    udp::{Ball, ToBevyVec, ToBevyVecFlat},
     GameLoadState,
 };
 use bevy::{
     asset::LoadState,
+    color::palettes::css,
     math::Vec3A,
     pbr::{NotShadowCaster, NotShadowReceiver},
     prelude::*,
@@ -21,7 +18,6 @@ use bevy::{
     time::Stopwatch,
     window::PrimaryWindow,
 };
-use bevy_mod_picking::{backends::raycast::RaycastPickable, prelude::*};
 use include_flate::flate;
 use serde::Deserialize;
 use std::{
@@ -30,10 +26,17 @@ use std::{
     path::Path,
     rc::Rc,
     str::Utf8Error,
-    time::Duration,
 };
 use thiserror::Error;
 
+use crate::{
+    camera::{HighlightedEntity, PrimaryCamera},
+    settings::state_setting::{EnableBallInfo, EnableCarInfo, EnablePadInfo, UserCarStates, UserPadStates},
+    udp::{BoostPadI, Car, Connection, GameStates, SendableUdp},
+};
+use bevy_mod_picking::{backends::raycast::RaycastPickable, prelude::*};
+use std::time::Duration;
+
 #[cfg(feature = "team_goal_barriers")]
 use crate::udp::{BLUE_COLOR, ORANGE_COLOR};
 
@@ -44,36 +47,43 @@ pub struct FieldLoaderPlugin;
 
 impl Plugin for FieldLoaderPlugin {
     fn build(&self, app: &mut App) {
-        app.insert_resource(LargeBoostPadLocRots::default())
-            .insert_resource(StateSetTime::default())
-            .add_event::<ChangeBallPos>()
-            .add_event::<ChangeCarPos>()
-            .add_event::<BallClicked>()
-            .add_event::<CarClicked>()
-            .add_event::<BoostPadClicked>()
-            .add_systems(
-                Update,
-                (
-                    despawn_old_field.run_if(in_state(GameLoadState::Despawn)),
-                    load_field.run_if(in_state(GameLoadState::Field)),
-                    load_extra_field.run_if(in_state(GameLoadState::FieldExtra)),
-                    handle_ball_clicked.run_if(on_event::<BallClicked>()),
-                    handle_car_clicked.run_if(on_event::<CarClicked>()),
-                    handle_boost_pad_clicked.run_if(on_event::<BoostPadClicked>()),
+        {
+            app.add_event::<ChangeBallPos>()
+                .add_event::<ChangeCarPos>()
+                .add_event::<BallClicked>()
+                .add_event::<CarClicked>()
+                .add_event::<BoostPadClicked>()
+                .insert_resource(StateSetTime::default())
+                .add_systems(
+                    Update,
                     (
-                        advance_stopwatch,
+                        handle_ball_clicked.run_if(on_event::<BallClicked>()),
+                        handle_car_clicked.run_if(on_event::<CarClicked>()),
+                        handle_boost_pad_clicked.run_if(on_event::<BoostPadClicked>()),
                         (
-                            change_ball_pos.run_if(on_event::<ChangeBallPos>()),
-                            change_car_pos.run_if(on_event::<ChangeCarPos>()),
+                            advance_stopwatch,
+                            (
+                                change_ball_pos.run_if(on_event::<ChangeBallPos>()),
+                                change_car_pos.run_if(on_event::<ChangeCarPos>()),
+                            )
+                                .run_if(|last_state_set: Res<StateSetTime>| {
+                                    // Limit state setting to avoid bogging down the simulation with state setting requests
+                                    last_state_set.0.elapsed() >= Duration::from_secs_f32(1. / 60.)
+                                }),
                         )
-                            .run_if(|last_state_set: Res<StateSetTime>| {
-                                // Limit state setting to avoid bogging down the simulation with state setting requests
-                                last_state_set.0.elapsed() >= Duration::from_secs_f32(1. / 60.)
-                            }),
-                    )
-                        .chain(),
-                ),
-            );
+                            .chain(),
+                    ),
+                );
+        }
+
+        app.insert_resource(LargeBoostPadLocRots::default()).add_systems(
+            Update,
+            (
+                despawn_old_field.run_if(in_state(GameLoadState::Despawn)),
+                load_field.run_if(in_state(GameLoadState::Field)),
+                load_extra_field.run_if(in_state(GameLoadState::FieldExtra)),
+            ),
+        );
     }
 }
 
@@ -279,10 +289,10 @@ fn load_extra_field(
     assets: Res<AssetServer>,
 ) {
     // load a glowing ball
-    let initial_ball_color = Color::rgb(0.3, 0.3, 0.3);
+    let initial_ball_color = Color::srgb(0.3, 0.3, 0.3);
 
     let (ball_color, ball_texture) = match assets.get_load_state(&ball_assets.ball_diffuse) {
-        Some(LoadState::Failed) | None => (Color::DARK_GRAY, None),
+        Some(LoadState::Failed(_)) | None => (Color::from(css::DARK_GRAY), None),
         _ => (Color::WHITE, Some(ball_assets.ball_diffuse.clone())),
     };
 
@@ -297,7 +307,7 @@ fn load_extra_field(
     };
 
     let ball_mesh = match assets.get_load_state(&ball_assets.ball) {
-        Some(LoadState::Failed) | None => meshes.add(Sphere::new(91.25)),
+        Some(LoadState::Failed(_)) | None => meshes.add(Sphere::new(91.25)),
         _ => ball_assets.ball.clone(),
     };
 
@@ -475,16 +485,11 @@ fn load_goals(
                     mesh: meshes.add(Rectangle::from_size(Vec2::splat(1000.))),
                     material: materials.add(StandardMaterial {
                         base_color: {
-                            let mut color = BLUE_COLOR;
-                            color.set_b(color.b() * 2.);
-                            color.set_a(0.8);
-                            color
-                        },
-                        emissive: {
-                            let mut color = BLUE_COLOR;
-                            color.set_a(0.5);
-                            color
+                            let mut color = BLUE_COLOR.with_alpha(0.8);
+                            color.blue *= 2.;
+                            Color::Srgba(color)
                         },
+                        emissive: LinearRgba::from(BLUE_COLOR.with_alpha(0.5)),
                         double_sided: true,
                         cull_mode: None,
                         alpha_mode: AlphaMode::Add,
@@ -511,16 +516,8 @@ fn load_goals(
                 PbrBundle {
                     mesh: meshes.add(Rectangle::from_size(Vec2::splat(1000.))),
                     material: materials.add(StandardMaterial {
-                        base_color: {
-                            let mut color = ORANGE_COLOR;
-                            color.set_a(0.8);
-                            color
-                        },
-                        emissive: {
-                            let mut color = ORANGE_COLOR;
-                            color.set_a(0.5);
-                            color
-                        },
+                        base_color: Color::Srgba(ORANGE_COLOR.with_alpha(0.8)),
+                        emissive: LinearRgba::from(ORANGE_COLOR.with_alpha(0.5)),
                         double_sided: true,
                         cull_mode: None,
                         alpha_mode: AlphaMode::Add,
@@ -564,7 +561,7 @@ fn load_default_field(
         PbrBundle {
             mesh: field,
             material: materials.add(StandardMaterial {
-                base_color: Color::rgba_u8(55, 30, 48, 200),
+                base_color: Color::srgba_u8(55, 30, 48, 200),
                 cull_mode: None,
                 double_sided: true,
                 ..default()
@@ -583,7 +580,7 @@ fn load_default_field(
         PbrBundle {
             mesh: floor,
             material: materials.add(StandardMaterial {
-                base_color: Color::rgb_u8(45, 49, 66),
+                base_color: Color::srgb_u8(45, 49, 66),
                 cull_mode: None,
                 double_sided: true,
                 ..default()
@@ -724,7 +721,7 @@ fn process_info_node(
             _ => None,
         };
 
-        let mat_name = if !cfg!(features = "full_load") && node.static_mesh.ends_with("OOBFloor") {
+        let mat_name = if !cfg!(feature = "full_load") && node.static_mesh.ends_with("OOBFloor") {
             "OOBFloor_MAT_CUSTOM"
         } else {
             mat.as_ref()
diff --git a/src/renderer.rs b/src/renderer.rs
index 9f7d33d..16d7951 100644
--- a/src/renderer.rs
+++ b/src/renderer.rs
@@ -11,7 +11,7 @@ pub struct CustomColor {
 
 impl From<CustomColor> for Color {
     fn from(color: CustomColor) -> Self {
-        Self::rgba(color.r, color.g, color.b, color.a)
+        Self::srgba(color.r, color.g, color.b, color.a)
     }
 }
 
@@ -45,13 +45,13 @@ fn render_gizmos(mut renders: ResMut<RenderGroups>, mut gizmos: Gizmos) {
         for render in renders.iter() {
             match render {
                 Render::Line2D { start, end, color } => {
-                    gizmos.line_2d(*start, *end, (*color).into());
+                    gizmos.line_2d(*start, *end, *color);
                 }
                 Render::Line { start, end, color } => {
-                    gizmos.line(start.to_bevy(), end.to_bevy(), (*color).into());
+                    gizmos.line(start.to_bevy(), end.to_bevy(), *color);
                 }
                 Render::LineStrip { positions, color } => {
-                    gizmos.linestrip(positions.iter().copied().map(ToBevyVec::to_bevy), (*color).into());
+                    gizmos.linestrip(positions.iter().copied().map(ToBevyVec::to_bevy), *color);
                 }
             }
         }
diff --git a/src/settings/gui.rs b/src/settings/gui.rs
index 8daa485..589b464 100644
--- a/src/settings/gui.rs
+++ b/src/settings/gui.rs
@@ -1,6 +1,5 @@
-use super::{
-    options::{BallCam, CalcBallRot, GameOptions, GameSpeed, MenuFocused, PacketSmoothing, ShowTime, UiOverlayScale},
-    state_setting::StateSettingInterface,
+use super::options::{
+    BallCam, CalcBallRot, GameOptions, GameSpeed, MenuFocused, Options, PacketSmoothing, ShowTime, UiOverlayScale,
 };
 use crate::{
     camera::{DaylightOffset, PrimaryCamera, Sun},
@@ -14,14 +13,15 @@ use bevy::{
     time::Stopwatch,
     window::{CursorGrabMode, PrimaryWindow},
 };
-use bevy_egui::{egui, EguiContexts, EguiPlugin};
+use std::time::Duration;
+
+use super::state_setting::StateSettingInterface;
+use bevy_egui::{
+    egui::{self, CollapsingHeader},
+    EguiContexts, EguiPlugin,
+};
 use bevy_framepace::{FramepaceSettings, Limiter};
 use bevy_mod_picking::picking_core::PickingPluginsSettings;
-use std::{
-    fs,
-    io::{self, Write},
-    time::Duration,
-};
 
 #[cfg(debug_assertions)]
 use crate::camera::{EntityName, HighlightedEntity};
@@ -30,8 +30,7 @@ pub struct DebugOverlayPlugin;
 
 impl Plugin for DebugOverlayPlugin {
     fn build(&self, app: &mut App) {
-        app.add_plugins((EguiPlugin, GameOptions, StateSettingInterface))
-            .insert_resource(Options::default_read_file())
+        app.add_plugins((GameOptions, EguiPlugin, StateSettingInterface))
             .insert_resource(RenderInfo::default())
             .insert_resource(UpdateRenderInfoTime::default())
             .insert_resource(PacketSendTime::default())
@@ -83,166 +82,6 @@ fn advance_time(mut last_packet_send: ResMut<PacketSendTime>, time: Res<Time>) {
     last_packet_send.0.tick(time.delta());
 }
 
-#[allow(clippy::struct_excessive_bools)]
-#[derive(Clone, Resource)]
-pub struct Options {
-    pub vsync: bool,
-    pub uncap_fps: bool,
-    pub fps_limit: f64,
-    pub fps: (usize, [f32; 120]),
-    pub ball_cam: bool,
-    pub stop_day: bool,
-    pub daytime: f32,
-    pub day_speed: f32,
-    pub msaa: usize,
-    pub camera_state: PrimaryCamera,
-    pub show_time: bool,
-    pub ui_scale: f32,
-    pub shadows: usize,
-    pub game_speed: f32,
-    pub paused: bool,
-    pub mouse_sensitivity: f32,
-    pub allow_rendering: bool,
-    pub packet_smoothing: usize,
-    pub calc_ball_rot: bool,
-}
-
-impl Default for Options {
-    #[inline]
-    fn default() -> Self {
-        Self {
-            vsync: false,
-            uncap_fps: false,
-            fps_limit: 120.,
-            fps: (0, [0.; 120]),
-            ball_cam: true,
-            stop_day: true,
-            daytime: 25.,
-            day_speed: 1.,
-            msaa: 2,
-            camera_state: PrimaryCamera::Spectator,
-            show_time: true,
-            ui_scale: 1.,
-            shadows: 0,
-            game_speed: 1.,
-            paused: false,
-            mouse_sensitivity: 1.,
-            allow_rendering: true,
-            packet_smoothing: 1,
-            calc_ball_rot: true,
-        }
-    }
-}
-
-impl Options {
-    const FILE_NAME: &'static str = "settings.txt";
-
-    #[inline]
-    fn default_read_file() -> Self {
-        Self::read_from_file().unwrap_or_else(|_| Self::create_file_from_defualt())
-    }
-
-    fn read_from_file() -> io::Result<Self> {
-        let mut options = Self::default();
-
-        let file = fs::read_to_string(Self::FILE_NAME)?;
-
-        for line in file.lines() {
-            let mut parts = line.split('=');
-
-            let Some(key) = parts.next() else {
-                continue;
-            };
-
-            let Some(value) = parts.next() else {
-                continue;
-            };
-
-            match key {
-                "vsync" => options.vsync = value.parse().unwrap(),
-                "uncap_fps" => options.uncap_fps = value.parse().unwrap(),
-                "fps_limit" => options.fps_limit = value.parse().unwrap(),
-                "ball_cam" => options.ball_cam = value.parse().unwrap(),
-                "stop_day" => options.stop_day = value.parse().unwrap(),
-                "daytime" => options.daytime = value.parse().unwrap(),
-                "day_speed" => options.day_speed = value.parse().unwrap(),
-                "msaa" => options.msaa = value.parse().unwrap(),
-                "camera_state" => options.camera_state = serde_json::from_str(value).unwrap(),
-                "show_time" => options.show_time = value.parse().unwrap(),
-                "ui_scale" => options.ui_scale = value.parse().unwrap(),
-                "shadows" => options.shadows = value.parse().unwrap(),
-                "game_speed" => options.game_speed = value.parse().unwrap(),
-                "paused" => options.paused = value.parse().unwrap(),
-                "mouse_sensitivity" => options.mouse_sensitivity = value.parse().unwrap(),
-                "allow_rendering" => options.allow_rendering = value.parse().unwrap(),
-                "packet_smoothing" => options.packet_smoothing = serde_json::from_str(value).unwrap(),
-                "calc_ball_rot" => options.calc_ball_rot = value.parse().unwrap(),
-                _ => println!("Unknown key {key} with value {value}"),
-            }
-        }
-
-        Ok(options)
-    }
-
-    fn create_file_from_defualt() -> Self {
-        let options = Self::default();
-
-        if let Err(e) = options.write_options_to_file() {
-            println!("Failed to create {} due to: {e}", Self::FILE_NAME);
-        }
-
-        options
-    }
-
-    fn write_options_to_file(&self) -> io::Result<()> {
-        let mut file = fs::File::create(Self::FILE_NAME)?;
-
-        file.write_fmt(format_args!("vsync={}\n", self.vsync))?;
-        file.write_fmt(format_args!("uncap_fps={}\n", self.uncap_fps))?;
-        file.write_fmt(format_args!("fps_limit={}\n", self.fps_limit))?;
-        file.write_fmt(format_args!("ball_cam={}\n", self.ball_cam))?;
-        file.write_fmt(format_args!("stop_day={}\n", self.stop_day))?;
-        file.write_fmt(format_args!("daytime={}\n", self.daytime))?;
-        file.write_fmt(format_args!("day_speed={}\n", self.day_speed))?;
-        file.write_fmt(format_args!("msaa={}\n", self.msaa))?;
-        file.write_fmt(format_args!("camera_state={}\n", serde_json::to_string(&self.camera_state)?))?;
-        file.write_fmt(format_args!("show_time={}\n", self.show_time))?;
-        file.write_fmt(format_args!("ui_scale={}\n", self.ui_scale))?;
-        file.write_fmt(format_args!("shadows={}\n", self.shadows))?;
-        file.write_fmt(format_args!("game_speed={}\n", self.game_speed))?;
-        file.write_fmt(format_args!("paused={}\n", self.paused))?;
-        file.write_fmt(format_args!("mouse_sensitivity={}\n", self.mouse_sensitivity))?;
-        file.write_fmt(format_args!("allow_rendering={}\n", self.allow_rendering))?;
-        file.write_fmt(format_args!("packet_smoothing={}\n", self.packet_smoothing))?;
-        file.write_fmt(format_args!("calc_ball_rot={}\n", self.calc_ball_rot))?;
-
-        Ok(())
-    }
-
-    #[inline]
-    #[allow(clippy::float_cmp)]
-    fn is_not_similar(&self, other: &Self) -> bool {
-        self.vsync != other.vsync
-            || self.uncap_fps != other.uncap_fps
-            || self.fps_limit != other.fps_limit
-            || self.ball_cam != other.ball_cam
-            || self.stop_day != other.stop_day
-            || self.daytime != other.daytime
-            || self.day_speed != other.day_speed
-            || self.msaa != other.msaa
-            || self.camera_state != other.camera_state
-            || self.show_time != other.show_time
-            || self.ui_scale != other.ui_scale
-            || self.shadows != other.shadows
-            || self.game_speed != other.game_speed
-            || self.paused != other.paused
-            || self.mouse_sensitivity != other.mouse_sensitivity
-            || self.allow_rendering != other.allow_rendering
-            || self.packet_smoothing != other.packet_smoothing
-            || self.calc_ball_rot != other.calc_ball_rot
-    }
-}
-
 #[cfg(debug_assertions)]
 fn debug_ui(
     mut contexts: EguiContexts,
@@ -326,45 +165,66 @@ fn ui_system(
         .open(&mut menu_focused)
         .show(ctx, |ui| {
             ui.label(format!("FPS: {fps:.0}"));
-            ui.horizontal(|ui| {
-                ui.checkbox(&mut options.vsync, "vsync");
-                ui.checkbox(&mut options.uncap_fps, "Uncap FPS");
-                ui.add(egui::DragValue::new(&mut options.fps_limit).speed(5.).clamp_range(30..=600));
-            });
 
-            ui.horizontal(|ui| {
-                egui::ComboBox::from_label("Shadows").width(50.).show_index(
+            ui.collapsing("Graphics", |ui| {
+                ui.horizontal(|ui| {
+                    ui.checkbox(&mut options.vsync, "vsync");
+                    ui.checkbox(&mut options.uncap_fps, "Uncap FPS");
+                    ui.add(egui::DragValue::new(&mut options.fps_limit).speed(5.).range(30..=600));
+                });
+
+                ui.horizontal(|ui| {
+                    egui::ComboBox::from_label("Shadows").width(50.).show_index(
+                        ui,
+                        &mut options.shadows,
+                        SHADOW_NAMES.len(),
+                        |i| SHADOW_NAMES[i],
+                    );
+                    #[cfg(not(feature = "ssao"))]
+                    egui::ComboBox::from_label("MSAA")
+                        .width(40.)
+                        .show_index(ui, &mut options.msaa, MSAA_NAMES.len(), |i| MSAA_NAMES[i]);
+                });
+
+                egui::ComboBox::from_label("Packet smoothing").width(100.).show_index(
                     ui,
-                    &mut options.shadows,
-                    SHADOW_NAMES.len(),
-                    |i| SHADOW_NAMES[i],
+                    &mut options.packet_smoothing as &mut usize,
+                    SMOOTHING_NAMES.len(),
+                    |i| SMOOTHING_NAMES[i],
                 );
-                #[cfg(not(feature = "ssao"))]
-                egui::ComboBox::from_label("MSAA")
-                    .width(40.)
-                    .show_index(ui, &mut options.msaa, MSAA_NAMES.len(), |i| MSAA_NAMES[i]);
+                ui.checkbox(&mut options.calc_ball_rot, "Ignore packet ball rotation");
             });
 
-            ui.horizontal(|ui| {
-                ui.label("Game speed");
-                ui.add(
-                    egui::DragValue::new(&mut options.game_speed)
-                        .clamp_range(0.1..=10.0)
-                        .speed(0.02)
-                        .fixed_decimals(1),
-                );
-                ui.checkbox(&mut options.paused, "Paused");
+            CollapsingHeader::new("World settings").default_open(true).show(ui, |ui| {
+                ui.horizontal(|ui| {
+                    ui.label("Game speed");
+                    ui.add(
+                        egui::DragValue::new(&mut options.game_speed)
+                            .range(0.1..=10.0)
+                            .speed(0.02)
+                            .fixed_decimals(1),
+                    );
+                    ui.checkbox(&mut options.paused, "Paused");
+                });
+
+                ui.add_space(15.);
+
+                ui.horizontal(|ui| {
+                    ui.checkbox(&mut options.show_time, "In-game time");
+                    ui.checkbox(&mut options.ball_cam, "Ball cam");
+                });
+                ui.add(egui::Slider::new(&mut options.ui_scale, 0.4..=4.0).text("UI scale"));
+                ui.label("Mouse sensitivity:");
+                ui.add(egui::Slider::new(&mut options.mouse_sensitivity, 0.01..=4.0));
+
+                ui.add_space(15.);
+
+                ui.checkbox(&mut options.stop_day, "Stop day cycle");
+                ui.add(egui::Slider::new(&mut options.daytime, 0.0..=150.0).text("Daytime"));
+                ui.add(egui::Slider::new(&mut options.day_speed, 0.0..=10.0).text("Day speed"));
             });
 
-            egui::ComboBox::from_label("Packet smoothing").width(100.).show_index(
-                ui,
-                &mut options.packet_smoothing as &mut usize,
-                SMOOTHING_NAMES.len(),
-                |i| SMOOTHING_NAMES[i],
-            );
-            ui.checkbox(&mut options.calc_ball_rot, "Ignore packet ball rotation");
-
-            ui.menu_button("Open rendering manager", |ui| {
+            ui.collapsing("Rendering manager", |ui| {
                 ui.checkbox(&mut options.allow_rendering, "Allow rendering");
 
                 ui.add_space(10.);
@@ -372,22 +232,6 @@ fn ui_system(
                 ui.label(format!("Groups: {}", render_info.groups));
                 ui.label(format!("Items: {}", render_info.items));
             });
-
-            ui.add_space(10.);
-
-            ui.horizontal(|ui| {
-                ui.checkbox(&mut options.show_time, "In-game time");
-                ui.checkbox(&mut options.ball_cam, "Ball cam");
-            });
-            ui.add(egui::Slider::new(&mut options.ui_scale, 0.4..=4.0).text("UI scale"));
-            ui.label("Mouse sensitivity:");
-            ui.add(egui::Slider::new(&mut options.mouse_sensitivity, 0.01..=4.0));
-
-            ui.add_space(10.);
-
-            ui.checkbox(&mut options.stop_day, "Stop day cycle");
-            ui.add(egui::Slider::new(&mut options.daytime, 0.0..=150.0).text("Daytime"));
-            ui.add(egui::Slider::new(&mut options.day_speed, 0.0..=10.0).text("Day speed"));
         });
 }
 
diff --git a/src/settings/options.rs b/src/settings/options.rs
index 747febc..4388f09 100644
--- a/src/settings/options.rs
+++ b/src/settings/options.rs
@@ -1,10 +1,16 @@
+use crate::camera::PrimaryCamera;
 use bevy::prelude::*;
+use std::{
+    fs,
+    io::{self, Write},
+};
 
 pub struct GameOptions;
 
 impl Plugin for GameOptions {
     fn build(&self, app: &mut App) {
         app.insert_resource(if cfg!(feature = "ssao") { Msaa::Off } else { Msaa::default() })
+            .insert_resource(Options::default_read_file())
             .insert_resource(BallCam::default())
             .insert_resource(UiOverlayScale::default())
             .insert_resource(ShowTime::default())
@@ -15,6 +21,167 @@ impl Plugin for GameOptions {
     }
 }
 
+#[allow(clippy::struct_excessive_bools)]
+#[derive(Clone, Resource)]
+pub struct Options {
+    pub vsync: bool,
+    pub uncap_fps: bool,
+    pub fps_limit: f64,
+    pub fps: (usize, [f32; 120]),
+    pub ball_cam: bool,
+    pub stop_day: bool,
+    pub daytime: f32,
+    pub day_speed: f32,
+    pub msaa: usize,
+    pub camera_state: PrimaryCamera,
+    pub show_time: bool,
+    pub ui_scale: f32,
+    pub shadows: usize,
+    pub game_speed: f32,
+    pub paused: bool,
+    pub mouse_sensitivity: f32,
+    pub allow_rendering: bool,
+    pub packet_smoothing: usize,
+    pub calc_ball_rot: bool,
+}
+
+impl Default for Options {
+    #[inline]
+    fn default() -> Self {
+        Self {
+            vsync: false,
+            uncap_fps: false,
+            fps_limit: 120.,
+
+            fps: (0, [0.; 120]),
+            ball_cam: true,
+            stop_day: true,
+            daytime: 25.,
+            day_speed: 1.,
+            msaa: 2,
+            camera_state: PrimaryCamera::Spectator,
+            show_time: true,
+            ui_scale: 1.,
+            shadows: 0,
+            game_speed: 1.,
+            paused: false,
+            mouse_sensitivity: 1.,
+            allow_rendering: true,
+            packet_smoothing: 1,
+            calc_ball_rot: true,
+        }
+    }
+}
+
+impl Options {
+    const FILE_NAME: &'static str = "settings.txt";
+
+    #[inline]
+    fn default_read_file() -> Self {
+        Self::read_from_file().unwrap_or_else(|_| Self::create_file_from_defualt())
+    }
+
+    fn read_from_file() -> io::Result<Self> {
+        let mut options = Self::default();
+
+        let file = fs::read_to_string(Self::FILE_NAME)?;
+
+        for line in file.lines() {
+            let mut parts = line.split('=');
+
+            let Some(key) = parts.next() else {
+                continue;
+            };
+
+            let Some(value) = parts.next() else {
+                continue;
+            };
+
+            match key {
+                "vsync" => options.vsync = value.parse().unwrap(),
+                "uncap_fps" => options.uncap_fps = value.parse().unwrap(),
+                "fps_limit" => options.fps_limit = value.parse().unwrap(),
+                "ball_cam" => options.ball_cam = value.parse().unwrap(),
+                "stop_day" => options.stop_day = value.parse().unwrap(),
+                "daytime" => options.daytime = value.parse().unwrap(),
+                "day_speed" => options.day_speed = value.parse().unwrap(),
+                "msaa" => options.msaa = value.parse().unwrap(),
+                "camera_state" => options.camera_state = serde_json::from_str(value).unwrap(),
+                "show_time" => options.show_time = value.parse().unwrap(),
+                "ui_scale" => options.ui_scale = value.parse().unwrap(),
+                "shadows" => options.shadows = value.parse().unwrap(),
+                "game_speed" => options.game_speed = value.parse().unwrap(),
+                "paused" => options.paused = value.parse().unwrap(),
+                "mouse_sensitivity" => options.mouse_sensitivity = value.parse().unwrap(),
+                "allow_rendering" => options.allow_rendering = value.parse().unwrap(),
+                "packet_smoothing" => options.packet_smoothing = serde_json::from_str(value).unwrap(),
+                "calc_ball_rot" => options.calc_ball_rot = value.parse().unwrap(),
+                _ => println!("Unknown key {key} with value {value}"),
+            }
+        }
+
+        Ok(options)
+    }
+
+    fn create_file_from_defualt() -> Self {
+        let options = Self::default();
+
+        if let Err(e) = options.write_options_to_file() {
+            println!("Failed to create {} due to: {e}", Self::FILE_NAME);
+        }
+
+        options
+    }
+
+    pub fn write_options_to_file(&self) -> io::Result<()> {
+        let mut file = fs::File::create(Self::FILE_NAME)?;
+
+        file.write_fmt(format_args!("vsync={}\n", self.vsync))?;
+        file.write_fmt(format_args!("uncap_fps={}\n", self.uncap_fps))?;
+        file.write_fmt(format_args!("fps_limit={}\n", self.fps_limit))?;
+        file.write_fmt(format_args!("ball_cam={}\n", self.ball_cam))?;
+        file.write_fmt(format_args!("stop_day={}\n", self.stop_day))?;
+        file.write_fmt(format_args!("daytime={}\n", self.daytime))?;
+        file.write_fmt(format_args!("day_speed={}\n", self.day_speed))?;
+        file.write_fmt(format_args!("msaa={}\n", self.msaa))?;
+        file.write_fmt(format_args!("camera_state={}\n", serde_json::to_string(&self.camera_state)?))?;
+        file.write_fmt(format_args!("show_time={}\n", self.show_time))?;
+        file.write_fmt(format_args!("ui_scale={}\n", self.ui_scale))?;
+        file.write_fmt(format_args!("shadows={}\n", self.shadows))?;
+        file.write_fmt(format_args!("game_speed={}\n", self.game_speed))?;
+        file.write_fmt(format_args!("paused={}\n", self.paused))?;
+        file.write_fmt(format_args!("mouse_sensitivity={}\n", self.mouse_sensitivity))?;
+        file.write_fmt(format_args!("allow_rendering={}\n", self.allow_rendering))?;
+        file.write_fmt(format_args!("packet_smoothing={}\n", self.packet_smoothing))?;
+        file.write_fmt(format_args!("calc_ball_rot={}\n", self.calc_ball_rot))?;
+
+        Ok(())
+    }
+
+    #[inline]
+    #[allow(clippy::float_cmp)]
+    pub fn is_not_similar(&self, other: &Self) -> bool {
+        self.vsync != other.vsync
+            || self.uncap_fps != other.uncap_fps
+            || self.fps_limit != other.fps_limit
+            || self.ball_cam != other.ball_cam
+            || self.stop_day != other.stop_day
+            || self.daytime != other.daytime
+            || self.day_speed != other.day_speed
+            || self.msaa != other.msaa
+            || self.camera_state != other.camera_state
+            || self.show_time != other.show_time
+            || self.ui_scale != other.ui_scale
+            || self.shadows != other.shadows
+            || self.game_speed != other.game_speed
+            || self.paused != other.paused
+            || self.mouse_sensitivity != other.mouse_sensitivity
+            || self.allow_rendering != other.allow_rendering
+            || self.packet_smoothing != other.packet_smoothing
+            || self.calc_ball_rot != other.calc_ball_rot
+    }
+}
+
 #[derive(Clone, Copy, Resource, Default)]
 pub enum PacketSmoothing {
     None,
diff --git a/src/udp.rs b/src/udp.rs
index e966eda..d40789e 100644
--- a/src/udp.rs
+++ b/src/udp.rs
@@ -1,16 +1,12 @@
 use crate::{
     assets::{get_material, get_mesh_info, BoostPickupGlows, CarWheelMesh},
     bytes::{FromBytes, ToBytes, ToBytesExact},
-    camera::{BoostAmount, HighlightedEntity, PrimaryCamera, TimeDisplay, BOOST_INDICATOR_FONT_SIZE, BOOST_INDICATOR_POS},
-    mesh::{BoostPadClicked, CarClicked, ChangeCarPos, LargeBoostPadLocRots},
+    camera::{PrimaryCamera, TimeDisplay},
+    mesh::LargeBoostPadLocRots,
     morton::Morton,
     renderer::{RenderGroups, RenderMessage, UdpRendererPlugin},
     rocketsim::{CarInfo, GameMode, GameState, Team},
-    settings::{
-        gui::Options,
-        options::{BallCam, CalcBallRot, GameSpeed, PacketSmoothing, ShowTime, UiOverlayScale},
-        state_setting::UserCarStates,
-    },
+    settings::options::{BallCam, CalcBallRot, GameSpeed, Options, PacketSmoothing, ShowTime},
     GameLoadState, ServerPort,
 };
 use ahash::HashMap;
@@ -21,10 +17,7 @@ use bevy::{
     pbr::{NotShadowCaster, NotShadowReceiver},
     prelude::*,
     time::Stopwatch,
-    window::PrimaryWindow,
 };
-use bevy_mod_picking::{backends::raycast::RaycastPickable, prelude::*};
-use bevy_vector_shapes::prelude::*;
 use crossbeam_channel::{Receiver, Sender};
 use itertools::izip;
 use std::{
@@ -36,6 +29,16 @@ use std::{
     time::Duration,
 };
 
+use crate::{
+    camera::{BoostAmount, HighlightedEntity, BOOST_INDICATOR_FONT_SIZE, BOOST_INDICATOR_POS},
+    mesh::{BoostPadClicked, CarClicked, ChangeCarPos},
+    settings::{options::UiOverlayScale, state_setting::UserCarStates},
+};
+
+use bevy::window::PrimaryWindow;
+use bevy_mod_picking::{backends::raycast::RaycastPickable, prelude::*};
+use bevy_vector_shapes::prelude::*;
+
 #[cfg(debug_assertions)]
 use crate::camera::EntityName;
 
@@ -148,6 +151,7 @@ const CAR_BODIES: [&str; NUM_CAR_BODIES] = [
 ];
 
 #[cfg(debug_assertions)]
+
 const CAR_BODY_NAMES: [&str; NUM_CAR_BODIES] = [
     "octane_body",
     "dominus_body",
@@ -157,24 +161,24 @@ const CAR_BODY_NAMES: [&str; NUM_CAR_BODIES] = [
     "merc_body",
 ];
 
-pub const BLUE_COLOR: Color = if cfg!(feature = "full_load") {
-    Color::rgb(0.03, 0.09, 0.79)
+pub const BLUE_COLOR: Srgba = if cfg!(feature = "full_load") {
+    Srgba::rgb(0.03, 0.09, 0.79)
 } else {
-    Color::rgb(0.01, 0.03, 0.39)
+    Srgba::rgb(0.01, 0.03, 0.39)
 };
 
-pub const ORANGE_COLOR: Color = if cfg!(feature = "full_load") {
-    Color::rgb(0.41, 0.21, 0.01)
+pub const ORANGE_COLOR: Srgba = if cfg!(feature = "full_load") {
+    Srgba::rgb(0.41, 0.21, 0.01)
 } else {
-    Color::rgb(0.82, 0.42, 0.02)
+    Srgba::rgb(0.82, 0.42, 0.02)
 };
 
 #[inline]
 /// Use colors that are a bit darker if we don't have the `full_load` feature
 const fn get_color_from_team(team: Team) -> Color {
     match team {
-        Team::Blue => BLUE_COLOR,
-        Team::Orange => ORANGE_COLOR,
+        Team::Blue => Color::Srgba(BLUE_COLOR),
+        Team::Orange => Color::Srgba(ORANGE_COLOR),
     }
 }
 
@@ -291,7 +295,7 @@ fn spawn_car(
                 PbrBundle {
                     mesh: meshes.add(Cylinder::new(10., CAR_BOOST_LENGTH)),
                     material: materials.add(StandardMaterial {
-                        base_color: Color::rgba(1., 1., 0., 0.),
+                        base_color: Color::srgba(1., 1., 0., 0.),
                         alpha_mode: AlphaMode::Add,
                         cull_mode: None,
                         ..default()
@@ -608,7 +612,7 @@ fn apply_udp_updates(
     for update in udp_updates.try_iter() {
         match update {
             UdpUpdate::Exit => {
-                exit.send(AppExit);
+                exit.send(AppExit::Success);
                 return;
             }
             UdpUpdate::State(new_state) => {
@@ -665,9 +669,9 @@ fn update_ball(
 
     let amount = (transform.translation.z.abs() + 500.) / 3500.;
     point_light.color = if new_pos.z > 0. {
-        Color::rgb(amount.max(0.5), (amount * (2. / 3.)).max(0.5), 0.5)
+        Color::srgb(amount.max(0.5), (amount * (2. / 3.)).max(0.5), 0.5)
     } else {
-        Color::rgb(0.5, 0.5, amount.max(0.5))
+        Color::srgb(0.5, 0.5, amount.max(0.5))
     };
 
     transform.rotation = states.current.ball.rot_mat.to_bevy();
@@ -713,10 +717,10 @@ fn update_car_extra(
                     let material_handle = car_materials.get_mut(entity).unwrap();
                     let material = materials.get_mut(material_handle).unwrap();
                     if target_car.state.is_demoed {
-                        material.base_color.set_a(0.);
+                        material.base_color.set_alpha(0.);
                         last_demoed_states.push(car.id());
                     } else {
-                        material.base_color.set_a(1.);
+                        material.base_color.set_alpha(1.);
                         last_demoed_states.retain(|&id| id != car.id());
                     }
                 }
@@ -740,10 +744,10 @@ fn update_car_extra(
 
                 let material = materials.get_mut(material_handle).unwrap();
                 if is_boosting {
-                    material.base_color.set_a(0.7);
+                    material.base_color.set_alpha(0.7);
                     last_boost_states.push(car.id());
                 } else {
-                    material.base_color.set_a(0.0);
+                    material.base_color.set_alpha(0.0);
                     last_boost_states.retain(|&id| id != car.id());
                 }
             }
@@ -975,12 +979,12 @@ fn update_pads_count(
         let hitbox_material = materials.add(Color::NONE);
 
         let large_pad_mesh = match asset_server.get_load_state(&pad_glows.large) {
-            Some(LoadState::Failed) | None => pad_glows.large_hitbox.clone(),
+            Some(LoadState::Failed(_)) | None => pad_glows.large_hitbox.clone(),
             _ => pad_glows.large.clone(),
         };
 
         let small_pad_mesh = match asset_server.get_load_state(&pad_glows.small) {
-            Some(LoadState::Failed) | None => pad_glows.small_hitbox.clone(),
+            Some(LoadState::Failed(_)) | None => pad_glows.small_hitbox.clone(),
             _ => pad_glows.small.clone(),
         };
 
@@ -1060,7 +1064,7 @@ fn update_pads_count(
                         mesh: visual_mesh,
                         transform,
                         material: materials.add(StandardMaterial {
-                            base_color: Color::rgba(0.9, 0.9, 0.1, 0.6),
+                            base_color: Color::srgba(0.9, 0.9, 0.1, 0.6),
                             alpha_mode: AlphaMode::Add,
                             double_sided: true,
                             cull_mode: None,
@@ -1113,7 +1117,7 @@ fn update_pad_colors(
             0.0
         };
 
-        materials.get_mut(handle).unwrap().base_color.set_a(alpha);
+        materials.get_mut(handle).unwrap().base_color.set_alpha(alpha);
     }
 }
 
@@ -1164,7 +1168,7 @@ fn update_boost_meter(
     let painter_pos = (window_res / 2. - (BOOST_INDICATOR_POS + 25.) * ui_scale.scale) * Vec2::new(1., -1.);
 
     painter.set_translation(painter_pos.extend(0.));
-    painter.color = Color::rgb(0.075, 0.075, 0.15);
+    painter.color = Color::srgb(0.075, 0.075, 0.15);
     painter.circle(100.0 * ui_scale.scale);
 
     let scale = car_state.boost / 100.;
@@ -1173,7 +1177,7 @@ fn update_boost_meter(
     let full_angle = 11. * PI / 6.;
     let end_angle = (full_angle - start_angle).mul_add(scale, start_angle);
 
-    painter.color = Color::rgb(1., 0.84 * scale, 0.);
+    painter.color = Color::srgb(1., 0.84 * scale, 0.);
     painter.hollow = true;
     painter.thickness = 4.;
     painter.arc(80. * ui_scale.scale, start_angle, end_angle);