diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index 63595dbc..c3ebbcbc 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -3,15 +3,8 @@
 Auto-generated from all feature plans. Last updated: 2025-11-24
 
 ## Active Technologies
-- Rust 1.81 (Rust 2021 edition via rustup) + Bevy 0.16 (ECS, input handling, window management, Time, rendering), bevy_rapier3d 0.31 (physics simulation control) (004-pause-system)
-- N/A (runtime state only, no persistence) (004-pause-system)
 
-- Rust 1.81 (Rust 2021 edition via rustup) + Bevy 0.16 (ECS, scheduling, `Time`, asset system), bevy_rapier3d 0.31 (physics + collision), serde/ron (level asset parsing) (003-map-format)
-- Rust 1.81 (Rust 2021 edition via rustup) + Bevy 0.16 (ECS, scheduling, `Time`), bevy_rapier3d 0.31 (physics + collision sensors), serde/ron (level matrix assets) (002-ball-respawn)
-- File-based RON assets under `assets/levels/`; no runtime persistence (002-ball-respawn)
-- Rust 1.81 (Rust 2021 edition) + Bevy 0.16 (PBR, asset system), bevy_rapier3d 0.31 (physics-driven gameplay), serde/ron for level parsing (001-apply-textures)
-- File-based assets only (RON levels + PNG textures) (001-apply-textures)
-- Rust 2021 edition (toolchain managed by rustup) (001-complete-game)
+- Rust 1.81 (Rust 2021 edition via rustup) + Bevy 0.17 (ECS, input handling, window management, Time, rendering), bevy_rapier3d (physics simulation control)
 
 ## Project Structure
 
@@ -31,12 +24,12 @@ tests/
 Rust 2021 edition (toolchain managed by rustup): Follow standard conventions
 
 ## Recent Changes
+
 - 004-pause-system: Added Rust 1.81 (Rust 2021 edition via rustup) + Bevy 0.16 (ECS, input handling, window management, Time, rendering), bevy_rapier3d 0.31 (physics simulation control)
 
 - 003-map-format: Added Rust 1.81 (Rust 2021 edition via rustup) + Bevy 0.16 (ECS, scheduling, `Time`, asset system), bevy_rapier3d 0.31 (physics + collision), serde/ron (level asset parsing)
 
 - 002-ball-respawn: Added Rust 1.81 (Rust 2021 edition via rustup) + Bevy 0.16 (ECS, scheduling, `Time`), bevy_rapier3d 0.31 (physics + collision sensors), serde/ron (level matrix assets)
 
-
 <!-- MANUAL ADDITIONS START -->
 <!-- MANUAL ADDITIONS END -->
diff --git a/Cargo.lock b/Cargo.lock
index 5fffc39a..0676515e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,28 +2,43 @@
 # It is not intended for manual editing.
 version = 4
 
+[[package]]
+name = "ab_glyph"
+version = "0.2.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01c0457472c38ea5bd1c3b5ada5e368271cb550be7a4ca4a0b4634e9913f6cc2"
+dependencies = [
+ "ab_glyph_rasterizer",
+ "owned_ttf_parser",
+]
+
+[[package]]
+name = "ab_glyph_rasterizer"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "366ffbaa4442f4684d91e2cd7c5ea7c4ed8add41959a31447066e279e432b618"
+
 [[package]]
 name = "accesskit"
-version = "0.18.0"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "becf0eb5215b6ecb0a739c31c21bd83c4f326524c9b46b7e882d77559b60a529"
+checksum = "cf203f9d3bd8f29f98833d1fbef628df18f759248a547e7e01cfbf63cda36a99"
 
 [[package]]
 name = "accesskit_consumer"
-version = "0.27.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0bf66a7bf0b7ea4fd7742d50b64782a88f99217cf246b3f93b4162528dde520"
+checksum = "db81010a6895d8707f9072e6ce98070579b43b717193d2614014abd5cb17dd43"
 dependencies = [
  "accesskit",
  "hashbrown 0.15.2",
- "immutable-chunkmap",
 ]
 
 [[package]]
 name = "accesskit_macos"
-version = "0.19.0"
+version = "0.22.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09e230718177753b4e4ad9e1d9f6cfc2f4921212d4c1c480b253f526babb258d"
+checksum = "a0089e5c0ac0ca281e13ea374773898d9354cc28d15af9f0f7394d44a495b575"
 dependencies = [
  "accesskit",
  "accesskit_consumer",
@@ -35,24 +50,23 @@ dependencies = [
 
 [[package]]
 name = "accesskit_windows"
-version = "0.25.0"
+version = "0.29.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65178f3df98a51e4238e584fcb255cb1a4f9111820848eeddd37663be40a625f"
+checksum = "d2d63dd5041e49c363d83f5419a896ecb074d309c414036f616dc0b04faca971"
 dependencies = [
  "accesskit",
  "accesskit_consumer",
  "hashbrown 0.15.2",
- "paste",
  "static_assertions",
- "windows 0.58.0",
- "windows-core 0.58.0",
+ "windows 0.61.3",
+ "windows-core 0.61.2",
 ]
 
 [[package]]
 name = "accesskit_winit"
-version = "0.25.0"
+version = "0.29.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34d941bb8c414caba6e206de669c7dc0dbeb305640ea890772ee422a40e6b89f"
+checksum = "c8cfabe59d0eaca7412bfb1f70198dd31e3b0496fee7e15b066f9c36a1a140a0"
 dependencies = [
  "accesskit",
  "accesskit_macos",
@@ -74,6 +88,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
  "cfg-if",
+ "getrandom 0.2.15",
  "once_cell",
  "version_check",
  "zerocopy 0.7.35",
@@ -312,9 +327,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "bevy"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b8369c16b7c017437021341521f8b4a0d98e1c70113fb358c3258ae7d661d79"
+checksum = "76d3ee8652fe0577fd8a99054e147740850140d530be8e044a9be4e23a3e8a24"
 dependencies = [
  "bevy_dylib",
  "bevy_internal",
@@ -322,9 +337,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_a11y"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed3561712cf49074d89e9989bfc2e6c6add5d33288f689db9a0c333300d2d004"
+checksum = "6702a82db1b383641fc7c503451847cdafb57076c203cd3bfe549d3eeef474c3"
 dependencies = [
  "accesskit",
  "bevy_app",
@@ -333,32 +348,40 @@ dependencies = [
  "bevy_reflect",
 ]
 
+[[package]]
+name = "bevy_android"
+version = "0.17.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42b2d9435e9fe8d7107bb795a6140277872ad5b992cb3934f8d28cfd11040f6f"
+dependencies = [
+ "android-activity",
+]
+
 [[package]]
 name = "bevy_animation"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49796627726d0b9a722ad9a0127719e7c1868f474d6575ec0f411e8299c4d7bb"
+checksum = "bfaf3ea6d435f4736b3deb60958270443501f5795c7964b1b504abd3be970b4f"
 dependencies = [
+ "bevy_animation_macros",
  "bevy_app",
  "bevy_asset",
  "bevy_color",
  "bevy_derive",
  "bevy_ecs",
- "bevy_log",
  "bevy_math",
  "bevy_mesh",
  "bevy_platform",
  "bevy_reflect",
- "bevy_render",
  "bevy_time",
  "bevy_transform",
  "bevy_utils",
  "blake3",
  "derive_more",
- "downcast-rs",
+ "downcast-rs 2.0.2",
  "either",
- "petgraph 0.7.1",
- "ron",
+ "petgraph",
+ "ron 0.10.1",
  "serde",
  "smallvec",
  "thiserror 2.0.17",
@@ -367,11 +390,44 @@ dependencies = [
  "uuid",
 ]
 
+[[package]]
+name = "bevy_animation_macros"
+version = "0.17.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d577eae7246a1cda461df1b63188619fc6a3c619adba2a8e5a79e9aa51f64671"
+dependencies = [
+ "bevy_macro_utils",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "bevy_anti_alias"
+version = "0.17.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15820535cc88bc280f55635eb3ea58df2703a434a0cc2343472eaa7e607fb27b"
+dependencies = [
+ "bevy_app",
+ "bevy_asset",
+ "bevy_camera",
+ "bevy_core_pipeline",
+ "bevy_derive",
+ "bevy_diagnostic",
+ "bevy_ecs",
+ "bevy_image",
+ "bevy_math",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_shader",
+ "bevy_utils",
+ "tracing",
+]
+
 [[package]]
 name = "bevy_app"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4491cc4c718ae76b4c6883df58b94cc88b32dcd894ea8d5b603c7c7da72ca967"
+checksum = "8e4fc5dfe9d1d9b8233e1878353b5e66a3f5910c2131d3abf68f9a4116b2d433"
 dependencies = [
  "bevy_derive",
  "bevy_ecs",
@@ -382,7 +438,7 @@ dependencies = [
  "cfg-if",
  "console_error_panic_hook",
  "ctrlc",
- "downcast-rs",
+ "downcast-rs 2.0.2",
  "log",
  "thiserror 2.0.17",
  "variadics_please",
@@ -392,14 +448,15 @@ dependencies = [
 
 [[package]]
 name = "bevy_asset"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f56111d9b88d8649f331a667d9d72163fb26bd09518ca16476d238653823db1e"
+checksum = "357787dbfaba3f73fd185e15d6df70605bddaa774f2ebbcab1aaa031f21fb6c2"
 dependencies = [
  "async-broadcast",
  "async-fs",
  "async-lock",
  "atomicow",
+ "bevy_android",
  "bevy_app",
  "bevy_asset_macros",
  "bevy_ecs",
@@ -407,20 +464,19 @@ dependencies = [
  "bevy_reflect",
  "bevy_tasks",
  "bevy_utils",
- "bevy_window",
  "bitflags 2.10.0",
  "blake3",
  "crossbeam-channel",
  "derive_more",
  "disqualified",
- "downcast-rs",
+ "downcast-rs 2.0.2",
  "either",
  "futures-io",
  "futures-lite",
  "js-sys",
  "notify-debouncer-full",
  "parking_lot",
- "ron",
+ "ron 0.10.1",
  "serde",
  "stackfuture",
  "thiserror 2.0.17",
@@ -433,9 +489,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_asset_macros"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4cca3e67c0ec760d8889d42293d987ce5da92eaf9c592bf5d503728a63b276d"
+checksum = "afa09271d4ca0bf31fda3a9ad57273775d448a05c4046d9367f71d29968d85b4"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
@@ -445,27 +501,53 @@ dependencies = [
 
 [[package]]
 name = "bevy_audio"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2b4f6f2a5c6c0e7c6825e791d2a061c76c2d6784f114c8f24382163fabbfaaa"
+checksum = "d79e56e072001524100b00e38cfdea302d9fdabbff48109fc67b528b27a237bb"
 dependencies = [
  "bevy_app",
  "bevy_asset",
- "bevy_derive",
  "bevy_ecs",
  "bevy_math",
  "bevy_reflect",
  "bevy_transform",
+ "coreaudio-sys",
  "cpal",
  "rodio",
  "tracing",
 ]
 
+[[package]]
+name = "bevy_camera"
+version = "0.17.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8af1d5a57fde6e577e7b1db58996afb381618294be75a37b3070a20d309678b0"
+dependencies = [
+ "bevy_app",
+ "bevy_asset",
+ "bevy_color",
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_image",
+ "bevy_math",
+ "bevy_mesh",
+ "bevy_reflect",
+ "bevy_transform",
+ "bevy_utils",
+ "bevy_window",
+ "derive_more",
+ "downcast-rs 2.0.2",
+ "serde",
+ "smallvec",
+ "thiserror 2.0.17",
+ "wgpu-types",
+]
+
 [[package]]
 name = "bevy_color"
-version = "0.16.2"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c101cbe1e26b8d701eb77263b14346e2e0cbbd2a6e254b9b1aead814e5ca8d3"
+checksum = "49504fac6b9897f03b4bdc0189c04ef1ba0a9b37926343aa520a71619e90e116"
 dependencies = [
  "bevy_math",
  "bevy_reflect",
@@ -479,29 +561,28 @@ dependencies = [
 
 [[package]]
 name = "bevy_core_pipeline"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59ed46363cad80dc00f08254c3015232bd6f640738403961c6d63e7ecfc61625"
+checksum = "6af7e735685a652a8dba41b886f1330faeb57d4c61398917b7e49b09a7a1c3c1"
 dependencies = [
  "bevy_app",
  "bevy_asset",
+ "bevy_camera",
  "bevy_color",
  "bevy_derive",
- "bevy_diagnostic",
  "bevy_ecs",
  "bevy_image",
  "bevy_math",
  "bevy_platform",
  "bevy_reflect",
  "bevy_render",
+ "bevy_shader",
  "bevy_transform",
  "bevy_utils",
  "bevy_window",
  "bitflags 2.10.0",
- "bytemuck",
  "nonmax",
  "radsort",
- "serde",
  "smallvec",
  "thiserror 2.0.17",
  "tracing",
@@ -509,9 +590,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_derive"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b837bf6c51806b10ebfa9edf1844ad80a3a0760d6c5fac4e90761df91a8901a"
+checksum = "f9396b256b366a43d7f61d1f230cdab0a512fb4712cbf7d688f3d6fce4c5ea8a"
 dependencies = [
  "bevy_macro_utils",
  "quote",
@@ -520,16 +601,16 @@ dependencies = [
 
 [[package]]
 name = "bevy_diagnostic"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48797366f312a8f31e237d08ce3ee70162591282d2bfe7c5ad8be196fb263e55"
+checksum = "d1cdb0ed0c8423570fbbb7c4fc2719a203dd40928fefff45f76ef0889685a446"
 dependencies = [
+ "atomic-waker",
  "bevy_app",
  "bevy_ecs",
  "bevy_platform",
  "bevy_tasks",
  "bevy_time",
- "bevy_utils",
  "const-fnv1a-hash",
  "log",
  "serde",
@@ -538,18 +619,18 @@ dependencies = [
 
 [[package]]
 name = "bevy_dylib"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dc3602098b2604941b2829a04ac316de1e36aad949cbffce8861896b9b32532"
+checksum = "d50a92aea6e896b6939ea51db6ced3a7e2dfd591016286e3eed9cb60d9e4f149"
 dependencies = [
  "bevy_internal",
 ]
 
 [[package]]
 name = "bevy_ecs"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c2bf6521aae57a0ec3487c4bfb59e36c4a378e834b626a4bea6a885af2fdfe7"
+checksum = "a7dd5229dd00d00e70ac6b2fc0a139961252f6ce07d3d268cfcac0da86d5bde4"
 dependencies = [
  "arrayvec",
  "bevy_ecs_macros",
@@ -562,12 +643,12 @@ dependencies = [
  "bumpalo",
  "concurrent-queue",
  "derive_more",
- "disqualified",
  "fixedbitset",
  "indexmap",
  "log",
  "nonmax",
  "serde",
+ "slotmap",
  "smallvec",
  "thiserror 2.0.17",
  "variadics_please",
@@ -575,9 +656,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_ecs_macros"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38748d6f3339175c582d751f410fb60a93baf2286c3deb7efebb0878dce7f413"
+checksum = "c4d83bdd2285af4867e76c691406e0a4b55611b583d0c45b6ac7bcec1b45fd48"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
@@ -587,9 +668,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_encase_derive"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8148f4edee470a2ea5cad010184c492a4c94c36d7a7158ea28e134ea87f274ab"
+checksum = "7179e985f3f1b99265cb87fe194db3b00aee8e2914888d621ff9826e1417ee19"
 dependencies = [
  "bevy_macro_utils",
  "encase_derive_impl",
@@ -597,16 +678,15 @@ dependencies = [
 
 [[package]]
 name = "bevy_gilrs"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97efef87c631949e67d06bb5d7dfd2a5f936b3b379afb6b1485b08edbb219b87"
+checksum = "a39dd8fdfe93314d47355ab3c58da40b648908a368bc536872f75fad4e8f3755"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
  "bevy_input",
  "bevy_platform",
  "bevy_time",
- "bevy_utils",
  "gilrs",
  "thiserror 2.0.17",
  "tracing",
@@ -614,22 +694,26 @@ dependencies = [
 
 [[package]]
 name = "bevy_gizmos"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7823154a9682128c261d8bddb3a4d7192a188490075c527af04520c2f0f8aad6"
+checksum = "7ebb9e3ca4938b48e5111151ce4b08f0e6fc207b854db08fa2d8de15ecabe8f8"
 dependencies = [
  "bevy_app",
  "bevy_asset",
+ "bevy_camera",
  "bevy_color",
  "bevy_core_pipeline",
  "bevy_ecs",
  "bevy_gizmos_macros",
  "bevy_image",
+ "bevy_light",
  "bevy_math",
+ "bevy_mesh",
  "bevy_pbr",
  "bevy_reflect",
  "bevy_render",
- "bevy_sprite",
+ "bevy_shader",
+ "bevy_sprite_render",
  "bevy_time",
  "bevy_transform",
  "bevy_utils",
@@ -639,30 +723,30 @@ dependencies = [
 
 [[package]]
 name = "bevy_gizmos_macros"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f378f3b513218ddc78254bbe76536d9de59c1429ebd0c14f5d8f2a25812131ad"
+checksum = "92c4b3c3aac86f0db85d4f708883ebdc735c3f88ac5b84c033874fcdd3540a9d"
 dependencies = [
  "bevy_macro_utils",
- "proc-macro2",
  "quote",
  "syn",
 ]
 
 [[package]]
 name = "bevy_gltf"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10a080237c0b8842ccc15a06d3379302c68580eeea4497b1c7387e470eda1f07"
+checksum = "3479fbaf897320a3ee30c1626b4a1bee0be874ca27699c3b2f3494891d103d9b"
 dependencies = [
  "base64 0.22.1",
  "bevy_animation",
  "bevy_app",
  "bevy_asset",
+ "bevy_camera",
  "bevy_color",
- "bevy_core_pipeline",
  "bevy_ecs",
  "bevy_image",
+ "bevy_light",
  "bevy_math",
  "bevy_mesh",
  "bevy_pbr",
@@ -672,7 +756,6 @@ dependencies = [
  "bevy_scene",
  "bevy_tasks",
  "bevy_transform",
- "bevy_utils",
  "fixedbitset",
  "gltf",
  "itertools 0.14.0",
@@ -686,13 +769,14 @@ dependencies = [
 
 [[package]]
 name = "bevy_image"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65e6e900cfecadbc3149953169e36b9e26f922ed8b002d62339d8a9dc6129328"
+checksum = "d546bbe2486bfa14971517e7ef427a9384749817c201d3afc60de0325cf52f11"
 dependencies = [
  "bevy_app",
  "bevy_asset",
  "bevy_color",
+ "bevy_ecs",
  "bevy_math",
  "bevy_platform",
  "bevy_reflect",
@@ -714,16 +798,15 @@ dependencies = [
 
 [[package]]
 name = "bevy_input"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18d6b6516433f6f7d680f648d04eb1866bb3927a1782d52f74831b62042f3cd1"
+checksum = "8ca955b99f4dc2059e9c8574f8d95a5dd5002809fda80d062a94a553c571a467"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
  "bevy_math",
  "bevy_platform",
  "bevy_reflect",
- "bevy_utils",
  "derive_more",
  "log",
  "smol_str",
@@ -732,14 +815,15 @@ dependencies = [
 
 [[package]]
 name = "bevy_input_focus"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e2d079fda74d1416e0a57dac29ea2b79ff77f420cd6b87f833d3aa29a46bc4d"
+checksum = "de4d1d0e833e31beba1f28a77152b35f946e8c45df364ec4969d58788ab9de7f"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
  "bevy_input",
  "bevy_math",
+ "bevy_picking",
  "bevy_reflect",
  "bevy_window",
  "log",
@@ -748,15 +832,18 @@ dependencies = [
 
 [[package]]
 name = "bevy_internal"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "857da8785678fde537d02944cd20dec9cafb7d4c447efe15f898dc60e733cacd"
+checksum = "8f5e645f9e1a24c9667c768b6233beaf4e241739d8ca4fbba59435cc27aabad5"
 dependencies = [
  "bevy_a11y",
+ "bevy_android",
  "bevy_animation",
+ "bevy_anti_alias",
  "bevy_app",
  "bevy_asset",
  "bevy_audio",
+ "bevy_camera",
  "bevy_color",
  "bevy_core_pipeline",
  "bevy_derive",
@@ -768,36 +855,64 @@ dependencies = [
  "bevy_image",
  "bevy_input",
  "bevy_input_focus",
+ "bevy_light",
  "bevy_log",
  "bevy_math",
+ "bevy_mesh",
  "bevy_pbr",
  "bevy_picking",
  "bevy_platform",
+ "bevy_post_process",
  "bevy_ptr",
  "bevy_reflect",
  "bevy_render",
  "bevy_scene",
+ "bevy_shader",
  "bevy_sprite",
+ "bevy_sprite_render",
  "bevy_state",
  "bevy_tasks",
  "bevy_text",
  "bevy_time",
  "bevy_transform",
  "bevy_ui",
+ "bevy_ui_render",
  "bevy_utils",
  "bevy_window",
  "bevy_winit",
 ]
 
+[[package]]
+name = "bevy_light"
+version = "0.17.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47093733280976ebd595f6e25f76603d5067ca4eb7544e59ecb0dd2fc5147810"
+dependencies = [
+ "bevy_app",
+ "bevy_asset",
+ "bevy_camera",
+ "bevy_color",
+ "bevy_ecs",
+ "bevy_image",
+ "bevy_math",
+ "bevy_mesh",
+ "bevy_platform",
+ "bevy_reflect",
+ "bevy_transform",
+ "bevy_utils",
+ "tracing",
+]
+
 [[package]]
 name = "bevy_log"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7a61ee8aef17a974f5ca481dcedf0c2bd52670e231d4c4bc9ddef58328865f9"
+checksum = "b1a2d4ea086ac4663ab9dfb056c7b85eee39e18f7e3e9a4ae6e39897eaa155c5"
 dependencies = [
  "android_log-sys",
  "bevy_app",
  "bevy_ecs",
+ "bevy_platform",
  "bevy_utils",
  "tracing",
  "tracing-log",
@@ -808,27 +923,27 @@ dependencies = [
 
 [[package]]
 name = "bevy_macro_utils"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "052eeebcb8e7e072beea5031b227d9a290f8a7fbbb947573ab6ec81df0fb94be"
+checksum = "62d984f9f8bd0f0d9fb020492a955e641e30e7a425f3588bf346cb3e61fec3c3"
 dependencies = [
  "parking_lot",
  "proc-macro2",
  "quote",
  "syn",
- "toml_edit",
+ "toml_edit 0.23.7",
 ]
 
 [[package]]
 name = "bevy_math"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68553e0090fe9c3ba066c65629f636bd58e4ebd9444fdba097b91af6cd3e243f"
+checksum = "5fa74ae5d968749cc073da991757d3c7e3504ac6dbaac5f8c2a54b9d19b0b7ed"
 dependencies = [
  "approx",
  "bevy_reflect",
  "derive_more",
- "glam 0.29.3",
+ "glam 0.30.9",
  "itertools 0.14.0",
  "libm",
  "rand",
@@ -841,10 +956,11 @@ dependencies = [
 
 [[package]]
 name = "bevy_mesh"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b10399c7027001edbc0406d7d0198596b1f07206c1aae715274106ba5bdcac40"
+checksum = "cd9a0ea86abbd17655bc6f9f8d94461dfcd0322431f752fc03748df8b335eff2"
 dependencies = [
+ "bevy_app",
  "bevy_asset",
  "bevy_derive",
  "bevy_ecs",
@@ -854,11 +970,10 @@ dependencies = [
  "bevy_platform",
  "bevy_reflect",
  "bevy_transform",
- "bevy_utils",
  "bitflags 2.10.0",
  "bytemuck",
+ "derive_more",
  "hexasphere",
- "serde",
  "thiserror 2.0.17",
  "tracing",
  "wgpu-types",
@@ -866,41 +981,40 @@ dependencies = [
 
 [[package]]
 name = "bevy_mikktspace"
-version = "0.16.1"
+version = "0.17.0-dev"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bb60c753b968a2de0fd279b76a3d19517695e771edb4c23575c7f92156315de"
-dependencies = [
- "glam 0.29.3",
-]
+checksum = "7ef8e4b7e61dfe7719bb03c884dc270cd46a82efb40f93e9933b990c5c190c59"
 
 [[package]]
 name = "bevy_pbr"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5e0b4eb871f364a0d217f70f6c41d7fdc6f9f931fa1abbf222180c03d0ae410"
+checksum = "4c514b950cda849aa64e9b076a235913577370275125a34a478758505a19d776"
 dependencies = [
  "bevy_app",
  "bevy_asset",
+ "bevy_camera",
  "bevy_color",
  "bevy_core_pipeline",
  "bevy_derive",
  "bevy_diagnostic",
  "bevy_ecs",
  "bevy_image",
+ "bevy_light",
  "bevy_math",
+ "bevy_mesh",
  "bevy_platform",
  "bevy_reflect",
  "bevy_render",
+ "bevy_shader",
  "bevy_transform",
  "bevy_utils",
- "bevy_window",
  "bitflags 2.10.0",
  "bytemuck",
  "derive_more",
  "fixedbitset",
  "nonmax",
  "offset-allocator",
- "radsort",
  "smallvec",
  "static_assertions",
  "thiserror 2.0.17",
@@ -909,12 +1023,13 @@ dependencies = [
 
 [[package]]
 name = "bevy_picking"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ed04757938655ed8094ea1efb533f99063a8b22abffc22010c694d291522850"
+checksum = "b371779713b40dea83b24cdb95054fe999fe8372351a317c4fb768859ac5f010"
 dependencies = [
  "bevy_app",
  "bevy_asset",
+ "bevy_camera",
  "bevy_derive",
  "bevy_ecs",
  "bevy_input",
@@ -922,10 +1037,8 @@ dependencies = [
  "bevy_mesh",
  "bevy_platform",
  "bevy_reflect",
- "bevy_render",
  "bevy_time",
  "bevy_transform",
- "bevy_utils",
  "bevy_window",
  "crossbeam-channel",
  "tracing",
@@ -934,33 +1047,66 @@ dependencies = [
 
 [[package]]
 name = "bevy_platform"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7573dc824a1b08b4c93fdbe421c53e1e8188e9ca1dd74a414455fe571facb47"
+checksum = "4691af6d7cfd1b5deb2fc926a43a180a546cdc3fe1e5a013fcee60db9bb2c81f"
 dependencies = [
- "cfg-if",
  "critical-section",
- "foldhash",
- "getrandom 0.2.15",
- "hashbrown 0.15.2",
+ "foldhash 0.2.0",
+ "futures-channel",
+ "getrandom 0.3.4",
+ "hashbrown 0.16.0",
+ "js-sys",
  "portable-atomic",
  "portable-atomic-util",
  "serde",
  "spin",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
  "web-time",
 ]
 
+[[package]]
+name = "bevy_post_process"
+version = "0.17.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b857972f5d56b43b0dce2c843b75b64d5fbbd0f6177f6ecccd75e7e41f72deb"
+dependencies = [
+ "bevy_app",
+ "bevy_asset",
+ "bevy_camera",
+ "bevy_color",
+ "bevy_core_pipeline",
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_image",
+ "bevy_math",
+ "bevy_platform",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_shader",
+ "bevy_transform",
+ "bevy_utils",
+ "bevy_window",
+ "bitflags 2.10.0",
+ "nonmax",
+ "radsort",
+ "smallvec",
+ "thiserror 2.0.17",
+ "tracing",
+]
+
 [[package]]
 name = "bevy_ptr"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df7370d0e46b60e071917711d0860721f5347bc958bf325975ae6913a5dfcf01"
+checksum = "17d24d7906c7de556033168b3485de36c59049fbaef0c2c44c715a23e0329b10"
 
 [[package]]
 name = "bevy_rapier3d"
-version = "0.31.0"
+version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ed7b07ace7682f96ca3860022a0dbd8080d0abd295121e8ce4a3e04dc11e32b"
+checksum = "802f869a3f9e1fecffcbc8d1c4593ded900ee90aef359ef430a49cf3964067ee"
 dependencies = [
  "bevy",
  "bitflags 2.10.0",
@@ -971,9 +1117,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_reflect"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daeb91a63a1a4df00aa58da8cc4ddbd4b9f16ab8bb647c5553eb156ce36fa8c2"
+checksum = "b5472b91928c0f3e4e3988c0d036b00719f19520f53a0c3f8c2af72f00e693c5"
 dependencies = [
  "assert_type_match",
  "bevy_platform",
@@ -982,11 +1128,12 @@ dependencies = [
  "bevy_utils",
  "derive_more",
  "disqualified",
- "downcast-rs",
+ "downcast-rs 2.0.2",
  "erased-serde",
- "foldhash",
- "glam 0.29.3",
- "petgraph 0.7.1",
+ "foldhash 0.2.0",
+ "glam 0.30.9",
+ "inventory",
+ "petgraph",
  "serde",
  "smallvec",
  "smol_str",
@@ -998,11 +1145,12 @@ dependencies = [
 
 [[package]]
 name = "bevy_reflect_derive"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ddadc55fe16b45faaa54ab2f9cb00548013c74812e8b018aa172387103cce6"
+checksum = "083784255162fa39960aa3cf3c23af0e515db2daa7f2e796ae34df993f4d3f6c"
 dependencies = [
  "bevy_macro_utils",
+ "indexmap",
  "proc-macro2",
  "quote",
  "syn",
@@ -1011,13 +1159,14 @@ dependencies = [
 
 [[package]]
 name = "bevy_render"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef91fed1f09405769214b99ebe4390d69c1af5cdd27967deae9135c550eb1667"
+checksum = "44117cbc9448b5a3118eb9c65bd9ec4c574be996148793be2443257daae6eb05"
 dependencies = [
  "async-channel",
  "bevy_app",
  "bevy_asset",
+ "bevy_camera",
  "bevy_color",
  "bevy_derive",
  "bevy_diagnostic",
@@ -1029,6 +1178,7 @@ dependencies = [
  "bevy_platform",
  "bevy_reflect",
  "bevy_render_macros",
+ "bevy_shader",
  "bevy_tasks",
  "bevy_time",
  "bevy_transform",
@@ -1036,22 +1186,17 @@ dependencies = [
  "bevy_window",
  "bitflags 2.10.0",
  "bytemuck",
- "codespan-reporting",
  "derive_more",
- "downcast-rs",
+ "downcast-rs 2.0.2",
  "encase",
  "fixedbitset",
- "futures-lite",
  "image",
  "indexmap",
  "js-sys",
- "ktx2",
  "naga",
- "naga_oil",
  "nonmax",
  "offset-allocator",
  "send_wrapper",
- "serde",
  "smallvec",
  "thiserror 2.0.17",
  "tracing",
@@ -1063,9 +1208,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_render_macros"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abd42cf6c875bcf38da859f8e731e119a6aff190d41dd0a1b6000ad57cf2ed3d"
+checksum = "f9557b7b6b06b1b70c147581f4f410c2de73b6f6f0e82915887020f953bacb5a"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
@@ -1075,17 +1220,17 @@ dependencies = [
 
 [[package]]
 name = "bevy_scene"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c52ca165200995fe8afd2a1a6c03e4ffee49198a1d4653d32240ea7f217d4ab"
+checksum = "7fcf6efd31fdd1e05724c95900bb1055716c8e3633b05fa731ee75db4241c17d"
 dependencies = [
  "bevy_app",
  "bevy_asset",
+ "bevy_camera",
  "bevy_derive",
  "bevy_ecs",
  "bevy_platform",
  "bevy_reflect",
- "bevy_render",
  "bevy_transform",
  "bevy_utils",
  "derive_more",
@@ -1094,41 +1239,85 @@ dependencies = [
  "uuid",
 ]
 
+[[package]]
+name = "bevy_shader"
+version = "0.17.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a655de9f64e113a6e37be76401fb0d6cb84ed7cc4f891e70af4e39d26e9080c3"
+dependencies = [
+ "bevy_asset",
+ "bevy_platform",
+ "bevy_reflect",
+ "naga",
+ "naga_oil",
+ "serde",
+ "thiserror 2.0.17",
+ "tracing",
+ "wgpu-types",
+]
+
 [[package]]
 name = "bevy_sprite"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ccae7bab2cb956fb0434004c359e432a3a1a074a6ef4eb471f1fb099f0b620b"
+checksum = "52b9a80aadf102ef0b012ceba5326253638c891994c303479e9973092e4e1c8b"
 dependencies = [
  "bevy_app",
  "bevy_asset",
+ "bevy_camera",
  "bevy_color",
- "bevy_core_pipeline",
  "bevy_derive",
  "bevy_ecs",
  "bevy_image",
  "bevy_math",
+ "bevy_mesh",
  "bevy_picking",
+ "bevy_reflect",
+ "bevy_text",
+ "bevy_transform",
+ "bevy_window",
+ "radsort",
+ "tracing",
+ "wgpu-types",
+]
+
+[[package]]
+name = "bevy_sprite_render"
+version = "0.17.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5eec49a2a9185526f9828559a40b6f66d4c2dbae2df8ea2936d88ba449a5e86a"
+dependencies = [
+ "bevy_app",
+ "bevy_asset",
+ "bevy_camera",
+ "bevy_color",
+ "bevy_core_pipeline",
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_image",
+ "bevy_math",
+ "bevy_mesh",
  "bevy_platform",
  "bevy_reflect",
  "bevy_render",
+ "bevy_shader",
+ "bevy_sprite",
+ "bevy_text",
  "bevy_transform",
  "bevy_utils",
- "bevy_window",
  "bitflags 2.10.0",
  "bytemuck",
  "derive_more",
  "fixedbitset",
  "nonmax",
- "radsort",
  "tracing",
 ]
 
 [[package]]
 name = "bevy_state"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "155d3cd97b900539008cdcaa702f88b724d94b08977b8e591a32536ce66faa8c"
+checksum = "05e8556a55d548844fc067fac6657b62f8073c94bd7e13c86aa7573f4c2a67b3"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -1142,43 +1331,39 @@ dependencies = [
 
 [[package]]
 name = "bevy_state_macros"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2481c1304fd2a1851a0d4cb63a1ce6421ae40f3f0117cbc9882963ee4c9bb609"
+checksum = "bcda45913b1d6470c6b751656e72fb3f25ca6b5b7b2ee055b294aaed1eb7e5ba"
 dependencies = [
  "bevy_macro_utils",
- "proc-macro2",
  "quote",
  "syn",
 ]
 
 [[package]]
 name = "bevy_tasks"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b674242641cab680688fc3b850243b351c1af49d4f3417a576debd6cca8dcf5"
+checksum = "bcbbfa5a58a16c4228434d3018c23fde3d78dcd76ec5f5b2b482a21f4b158dd3"
 dependencies = [
  "async-channel",
  "async-executor",
  "async-task",
  "atomic-waker",
  "bevy_platform",
- "cfg-if",
  "concurrent-queue",
  "crossbeam-queue",
  "derive_more",
- "futures-channel",
  "futures-lite",
  "heapless",
  "pin-project",
- "wasm-bindgen-futures",
 ]
 
 [[package]]
 name = "bevy_text"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d76c85366159f5f54110f33321c76d8429cfd8f39638f26793a305dae568b60"
+checksum = "fc144cc6a30ed44a88e342c22d9e3a66a0993a74f792ae07ba79318efb41a86d"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -1190,25 +1375,21 @@ dependencies = [
  "bevy_math",
  "bevy_platform",
  "bevy_reflect",
- "bevy_render",
- "bevy_sprite",
- "bevy_transform",
  "bevy_utils",
- "bevy_window",
  "cosmic-text",
  "serde",
  "smallvec",
  "sys-locale",
  "thiserror 2.0.17",
  "tracing",
- "unicode-bidi",
+ "wgpu-types",
 ]
 
 [[package]]
 name = "bevy_time"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc98eb356c75be04fbbc77bb3d8ffa24c8bacd99f76111cee23d444be6ac8c9c"
+checksum = "32835c3dbe082fbbe7d4f2f37f655073421f2882d4320ac2d59f922474260de4"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -1221,9 +1402,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_transform"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df218e440bb9a19058e1b80a68a031c887bcf7bd3a145b55f361359a2fa3100d"
+checksum = "b41fabfeaa53f51ff5ccf4d87e66836293159d50d21f6d3e16c93efb7c30f969"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -1239,16 +1420,16 @@ dependencies = [
 
 [[package]]
 name = "bevy_ui"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea4a4d2ba51865bc3039af29a26b4f52c48b54cc758369f52004caf4b6f03770"
+checksum = "aa0fe27b8c641c2537480774dfd9198d56779371b04dd76618db39da4e7c7483"
 dependencies = [
  "accesskit",
  "bevy_a11y",
  "bevy_app",
  "bevy_asset",
+ "bevy_camera",
  "bevy_color",
- "bevy_core_pipeline",
  "bevy_derive",
  "bevy_ecs",
  "bevy_image",
@@ -1257,61 +1438,91 @@ dependencies = [
  "bevy_picking",
  "bevy_platform",
  "bevy_reflect",
- "bevy_render",
  "bevy_sprite",
  "bevy_text",
  "bevy_transform",
  "bevy_utils",
  "bevy_window",
- "bytemuck",
  "derive_more",
- "nonmax",
  "smallvec",
  "taffy",
  "thiserror 2.0.17",
  "tracing",
+ "uuid",
+]
+
+[[package]]
+name = "bevy_ui_render"
+version = "0.17.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1d2e783bb5f0b748e6360a0055421d5c934b43830b205a84996a75e54330cd7"
+dependencies = [
+ "bevy_app",
+ "bevy_asset",
+ "bevy_camera",
+ "bevy_color",
+ "bevy_core_pipeline",
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_image",
+ "bevy_math",
+ "bevy_mesh",
+ "bevy_platform",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_shader",
+ "bevy_sprite",
+ "bevy_sprite_render",
+ "bevy_text",
+ "bevy_transform",
+ "bevy_ui",
+ "bevy_utils",
+ "bytemuck",
+ "derive_more",
+ "tracing",
 ]
 
 [[package]]
 name = "bevy_utils"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94f7a8905a125d2017e8561beefb7f2f5e67e93ff6324f072ad87c5fd6ec3b99"
+checksum = "789d04f88c764877a4552e07745b402dbc45f5d0545e6d102558f2f1752a1d89"
 dependencies = [
  "bevy_platform",
+ "disqualified",
  "thread_local",
 ]
 
 [[package]]
 name = "bevy_window"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df7e8ad0c17c3cc23ff5566ae2905c255e6986037fb041f74c446216f5c38431"
+checksum = "8ae54ec7a0fc344278592a688a01b57b32182abc3ca7d47040773c4cbc2e15e0"
 dependencies = [
- "android-activity",
  "bevy_app",
+ "bevy_asset",
  "bevy_ecs",
+ "bevy_image",
  "bevy_input",
  "bevy_math",
  "bevy_platform",
  "bevy_reflect",
- "bevy_utils",
  "log",
  "raw-window-handle",
  "serde",
- "smol_str",
 ]
 
 [[package]]
 name = "bevy_winit"
-version = "0.16.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a5e7f00c6b3b6823df5ec2a5e9067273607208919bc8c211773ebb9643c87f0"
+checksum = "feeaa46d3c4480323e690de8a4ca7f914c074af1f5f70ee3246392992dbf4a0c"
 dependencies = [
  "accesskit",
  "accesskit_winit",
  "approx",
  "bevy_a11y",
+ "bevy_android",
  "bevy_app",
  "bevy_asset",
  "bevy_derive",
@@ -1324,12 +1535,10 @@ dependencies = [
  "bevy_platform",
  "bevy_reflect",
  "bevy_tasks",
- "bevy_utils",
  "bevy_window",
  "bytemuck",
  "cfg-if",
- "crossbeam-channel",
- "raw-window-handle",
+ "js-sys",
  "tracing",
  "wasm-bindgen",
  "web-sys",
@@ -1337,26 +1546,6 @@ dependencies = [
  "winit",
 ]
 
-[[package]]
-name = "bindgen"
-version = "0.70.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f"
-dependencies = [
- "bitflags 2.10.0",
- "cexpr",
- "clang-sys",
- "itertools 0.13.0",
- "log",
- "prettyplease",
- "proc-macro2",
- "quote",
- "regex",
- "rustc-hash 1.1.0",
- "shlex",
- "syn",
-]
-
 [[package]]
 name = "bindgen"
 version = "0.72.1"
@@ -1375,30 +1564,15 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "bit-set"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
-dependencies = [
- "bit-vec 0.6.3",
-]
-
 [[package]]
 name = "bit-set"
 version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
 dependencies = [
- "bit-vec 0.8.0",
+ "bit-vec",
 ]
 
-[[package]]
-name = "bit-vec"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
-
 [[package]]
 name = "bit-vec"
 version = "0.8.0"
@@ -1417,6 +1591,7 @@ version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
 dependencies = [
+ "bytemuck",
  "serde_core",
 ]
 
@@ -1467,7 +1642,7 @@ version = "0.0.1"
 dependencies = [
  "bevy",
  "bevy_rapier3d",
- "ron",
+ "ron 0.8.1",
  "serde",
  "serde_json",
  "tracing",
@@ -1526,11 +1701,23 @@ dependencies = [
  "bitflags 2.10.0",
  "log",
  "polling",
- "rustix",
+ "rustix 0.38.42",
  "slab",
  "thiserror 1.0.69",
 ]
 
+[[package]]
+name = "calloop-wayland-source"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20"
+dependencies = [
+ "calloop",
+ "rustix 0.38.42",
+ "wayland-backend",
+ "wayland-client",
+]
+
 [[package]]
 name = "cc"
 version = "1.2.6"
@@ -1582,10 +1769,11 @@ dependencies = [
 
 [[package]]
 name = "codespan-reporting"
-version = "0.11.1"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
+checksum = "fe6d2e5af09e8c8ad56c969f2157a3d4238cebc7c55f0a517728c38f7b200f81"
 dependencies = [
+ "serde",
  "termcolor",
  "unicode-width",
 ]
@@ -1687,7 +1875,7 @@ checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081"
 dependencies = [
  "bitflags 1.3.2",
  "core-foundation 0.9.4",
- "core-graphics-types",
+ "core-graphics-types 0.1.3",
  "foreign-types",
  "libc",
 ]
@@ -1703,6 +1891,17 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "core-graphics-types"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
+dependencies = [
+ "bitflags 2.10.0",
+ "core-foundation 0.10.0",
+ "libc",
+]
+
 [[package]]
 name = "coreaudio-rs"
 version = "0.11.3"
@@ -1720,14 +1919,14 @@ version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ceec7a6067e62d6f931a2baf6f3a751f4a892595bcec1461a3c94ef9949864b6"
 dependencies = [
- "bindgen 0.72.1",
+ "bindgen",
 ]
 
 [[package]]
 name = "cosmic-text"
-version = "0.13.2"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e418dd4f5128c3e93eab12246391c54a20c496811131f85754dc8152ee207892"
+checksum = "da46a9d5a8905cc538a4a5bceb6a4510de7a51049c5588c0114efce102bcbbe8"
 dependencies = [
  "bitflags 2.10.0",
  "fontdb",
@@ -1844,18 +2043,18 @@ checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
 
 [[package]]
 name = "derive_more"
-version = "1.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05"
+checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678"
 dependencies = [
  "derive_more-impl",
 ]
 
 [[package]]
 name = "derive_more-impl"
-version = "1.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22"
+checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1893,6 +2092,12 @@ dependencies = [
  "litrs",
 ]
 
+[[package]]
+name = "downcast-rs"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
+
 [[package]]
 name = "downcast-rs"
 version = "2.0.2"
@@ -1922,30 +2127,30 @@ dependencies = [
 
 [[package]]
 name = "encase"
-version = "0.10.0"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0a05902cf601ed11d564128448097b98ebe3c6574bd7b6a653a3d56d54aa020"
+checksum = "02ba239319a4f60905966390f5e52799d868103a533bb7e27822792332504ddd"
 dependencies = [
  "const_panic",
  "encase_derive",
- "glam 0.29.3",
- "thiserror 1.0.69",
+ "glam 0.30.9",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
 name = "encase_derive"
-version = "0.10.0"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "181d475b694e2dd56ae919ce7699d344d1fd259292d590c723a50d1189a2ea85"
+checksum = "5223d6c647f09870553224f6e37261fe5567bc5a4f4cf13ed337476e79990f2f"
 dependencies = [
  "encase_derive_impl",
 ]
 
 [[package]]
 name = "encase_derive_impl"
-version = "0.10.0"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f97b51c5cc57ef7c5f7a0c57c250251c49ee4c28f819f87ac32f4aceabc36792"
+checksum = "1796db3d892515842ca2dfb11124c4bb4a9e58d9f2c5c1072e5bca1b2334507b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2060,6 +2265,12 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f"
 
+[[package]]
+name = "foldhash"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
+
 [[package]]
 name = "font-types"
 version = "0.10.0"
@@ -2179,10 +2390,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if",
- "js-sys",
  "libc",
  "wasi",
- "wasm-bindgen",
 ]
 
 [[package]]
@@ -2192,9 +2401,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
 dependencies = [
  "cfg-if",
+ "js-sys",
  "libc",
  "r-efi",
  "wasip2",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -2242,23 +2453,107 @@ dependencies = [
  "xml-rs",
 ]
 
+[[package]]
+name = "glam"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "333928d5eb103c5d4050533cec0384302db6be8ef7d3cebd30ec6a35350353da"
+
+[[package]]
+name = "glam"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3abb554f8ee44336b72d522e0a7fe86a29e09f839a36022fa869a7dfe941a54b"
+
+[[package]]
+name = "glam"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4126c0479ccf7e8664c36a2d719f5f2c140fbb4f9090008098d2c291fa5b3f16"
+
+[[package]]
+name = "glam"
+version = "0.17.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e01732b97afd8508eee3333a541b9f7610f454bb818669e66e90f5f57c93a776"
+
+[[package]]
+name = "glam"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "525a3e490ba77b8e326fb67d4b44b4bd2f920f44d4cc73ccec50adc68e3bee34"
+
+[[package]]
+name = "glam"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b8509e6791516e81c1a630d0bd7fbac36d2fa8712a9da8662e716b52d5051ca"
+
+[[package]]
+name = "glam"
+version = "0.20.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f43e957e744be03f5801a55472f593d43fabdebf25a4585db250f04d86b1675f"
+
+[[package]]
+name = "glam"
+version = "0.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "518faa5064866338b013ff9b2350dc318e14cc4fcd6cb8206d7e7c9886c98815"
+
+[[package]]
+name = "glam"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12f597d56c1bd55a811a1be189459e8fad2bbc272616375602443bdfb37fa774"
+
+[[package]]
+name = "glam"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e4afd9ad95555081e109fe1d21f2a30c691b5f0919c67dfa690a2e1eb6bd51c"
+
+[[package]]
+name = "glam"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945"
+
+[[package]]
+name = "glam"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3"
+
+[[package]]
+name = "glam"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e05e7e6723e3455f4818c7b26e855439f7546cf617ef669d1adedb8669e5cb9"
+
+[[package]]
+name = "glam"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "779ae4bf7e8421cf91c0b3b64e7e8b40b862fba4d393f59150042de7c4965a94"
+
 [[package]]
 name = "glam"
 version = "0.29.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8babf46d4c1c9d92deac9f7be466f76dfc4482b6452fc5024b5e8daf6ffeb3ee"
-dependencies = [
- "bytemuck",
- "libm",
- "rand",
- "serde",
-]
 
 [[package]]
 name = "glam"
 version = "0.30.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd47b05dddf0005d850e5644cae7f2b14ac3df487979dbfff3b56f20b1a6ae46"
+dependencies = [
+ "bytemuck",
+ "libm",
+ "rand",
+ "serde_core",
+]
 
 [[package]]
 name = "glob"
@@ -2398,6 +2693,7 @@ checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b"
 dependencies = [
  "cfg-if",
  "crunchy",
+ "num-traits",
  "zerocopy 0.8.27",
 ]
 
@@ -2426,9 +2722,7 @@ version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
 dependencies = [
- "equivalent",
- "foldhash",
- "serde",
+ "foldhash 0.1.4",
 ]
 
 [[package]]
@@ -2436,6 +2730,11 @@ name = "hashbrown"
 version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"
+dependencies = [
+ "equivalent",
+ "foldhash 0.2.0",
+ "serde",
+]
 
 [[package]]
 name = "heapless"
@@ -2448,12 +2747,6 @@ dependencies = [
  "stable_deref_trait",
 ]
 
-[[package]]
-name = "heck"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
-
 [[package]]
 name = "hermit-abi"
 version = "0.4.0"
@@ -2462,12 +2755,13 @@ checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
 
 [[package]]
 name = "hexasphere"
-version = "15.0.0"
+version = "16.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "741ab88b8cc670443da777c3daab02cebf5a3caccfc04e3c052f55c94d1643fe"
+checksum = "29a164ceff4500f2a72b1d21beaa8aa8ad83aec2b641844c659b190cb3ea2e0b"
 dependencies = [
  "constgebra",
- "glam 0.29.3",
+ "glam 0.30.9",
+ "tinyvec",
 ]
 
 [[package]]
@@ -2488,15 +2782,6 @@ dependencies = [
  "png",
 ]
 
-[[package]]
-name = "immutable-chunkmap"
-version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3e98b1520e49e252237edc238a39869da9f3241f2ec19dc788c1d24694d1e4"
-dependencies = [
- "arrayvec",
-]
-
 [[package]]
 name = "indexmap"
 version = "2.12.0"
@@ -2535,6 +2820,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "inventory"
+version = "0.3.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc61209c082fbeb19919bee74b176221b27223e27b65d781eb91af24eb1fb46e"
+dependencies = [
+ "rustversion",
+]
+
 [[package]]
 name = "io-kit-sys"
 version = "0.4.1"
@@ -2649,11 +2943,11 @@ dependencies = [
 
 [[package]]
 name = "ktx2"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87d65e08a9ec02e409d27a0139eaa6b9756b4d81fe7cde71f6941a83730ce838"
+checksum = "ff7f53bdf698e7aa7ec916411bbdc8078135da11b66db5182675b2227f6c0d07"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.10.0",
 ]
 
 [[package]]
@@ -2722,6 +3016,12 @@ version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
+[[package]]
+name = "linux-raw-sys"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
+
 [[package]]
 name = "litrs"
 version = "0.4.1"
@@ -2798,13 +3098,13 @@ dependencies = [
 
 [[package]]
 name = "metal"
-version = "0.31.0"
+version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f569fb946490b5743ad69813cb19629130ce9374034abe31614a36402d18f99e"
+checksum = "00c15a6f673ff72ddcc22394663290f870fb224c1bfce55734a75c414150e605"
 dependencies = [
  "bitflags 2.10.0",
  "block",
- "core-graphics-types",
+ "core-graphics-types 0.2.0",
  "foreign-types",
  "log",
  "objc",
@@ -2841,55 +3141,71 @@ dependencies = [
 
 [[package]]
 name = "naga"
-version = "24.0.0"
+version = "26.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e380993072e52eef724eddfcde0ed013b0c023c3f0417336ed041aa9f076994e"
+checksum = "916cbc7cb27db60be930a4e2da243cf4bc39569195f22fd8ee419cd31d5b662c"
 dependencies = [
  "arrayvec",
- "bit-set 0.8.0",
+ "bit-set",
  "bitflags 2.10.0",
+ "cfg-if",
  "cfg_aliases",
  "codespan-reporting",
+ "half",
+ "hashbrown 0.15.2",
  "hexf-parse",
  "indexmap",
+ "libm",
  "log",
+ "num-traits",
+ "once_cell",
  "pp-rs",
  "rustc-hash 1.1.0",
  "spirv",
- "strum",
- "termcolor",
  "thiserror 2.0.17",
- "unicode-xid",
+ "unicode-ident",
 ]
 
 [[package]]
 name = "naga_oil"
-version = "0.17.1"
+version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2464f7395decfd16bb4c33fb0cb3b2c645cc60d051bc7fb652d3720bfb20f18"
+checksum = "1b586d3cf5c9b7e13fe2af6e114406ff70773fd80881960378933b63e76f37dd"
 dependencies = [
- "bit-set 0.5.3",
  "codespan-reporting",
  "data-encoding",
  "indexmap",
  "naga",
- "once_cell",
  "regex",
- "regex-syntax",
  "rustc-hash 1.1.0",
- "thiserror 1.0.69",
+ "thiserror 2.0.17",
  "tracing",
  "unicode-ident",
 ]
 
 [[package]]
 name = "nalgebra"
-version = "0.33.2"
+version = "0.34.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26aecdf64b707efd1310e3544d709c5c0ac61c13756046aaaba41be5c4f66a3b"
+checksum = "c4d5b3eff5cd580f93da45e64715e8c20a3996342f1e466599cf7a267a0c2f5f"
 dependencies = [
  "approx",
+ "glam 0.14.0",
+ "glam 0.15.2",
+ "glam 0.16.0",
+ "glam 0.17.3",
+ "glam 0.18.0",
+ "glam 0.19.0",
+ "glam 0.20.5",
+ "glam 0.21.3",
+ "glam 0.22.0",
+ "glam 0.23.0",
+ "glam 0.24.2",
+ "glam 0.25.0",
+ "glam 0.27.0",
+ "glam 0.28.0",
  "glam 0.29.3",
+ "glam 0.30.9",
  "matrixmultiply",
  "nalgebra-macros",
  "num-complex",
@@ -2901,9 +3217,9 @@ dependencies = [
 
 [[package]]
 name = "nalgebra-macros"
-version = "0.2.2"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "254a5372af8fc138e36684761d3c0cdb758a4410e938babcff1c860ce14ddbfc"
+checksum = "973e7178a678cfd059ccec50887658d482ce16b0aa9da3888ddeab5cd5eb4889"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3043,7 +3359,7 @@ version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -3256,6 +3572,16 @@ dependencies = [
  "objc2",
 ]
 
+[[package]]
+name = "objc2-io-kit"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33fafba39597d6dc1fb709123dfa8289d39406734be322956a69f0931c73bb15"
+dependencies = [
+ "libc",
+ "objc2-core-foundation",
+]
+
 [[package]]
 name = "objc2-link-presentation"
 version = "0.2.2"
@@ -3423,6 +3749,15 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "owned_ttf_parser"
+version = "0.25.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36820e9051aca1014ddc75770aab4d68bc1e9e632f0f5627c4086bc216fb583b"
+dependencies = [
+ "ttf-parser 0.25.1",
+]
+
 [[package]]
 name = "parking"
 version = "2.2.1"
@@ -3454,18 +3789,18 @@ dependencies = [
 
 [[package]]
 name = "parry3d"
-version = "0.22.1"
+version = "0.25.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e0877164c86c741f30fcb13e551a37f5805ffc053710644af3ef8080e526f68"
+checksum = "e99471b7b6870f7fe406d5611dd4b4c9b07aa3e5436b1d27e1515f9832bb0c6b"
 dependencies = [
  "approx",
  "arrayvec",
  "bitflags 2.10.0",
- "downcast-rs",
+ "downcast-rs 2.0.2",
  "either",
  "ena",
- "glam 0.30.9",
- "hashbrown 0.15.2",
+ "foldhash 0.2.0",
+ "hashbrown 0.16.0",
  "log",
  "nalgebra",
  "num-derive",
@@ -3492,18 +3827,6 @@ version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
-[[package]]
-name = "petgraph"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3672b37090dbd86368a4145bc067582552b29c27377cad4e0a306c97f9bd7772"
-dependencies = [
- "fixedbitset",
- "indexmap",
- "serde",
- "serde_derive",
-]
-
 [[package]]
 name = "petgraph"
 version = "0.8.3"
@@ -3514,6 +3837,7 @@ dependencies = [
  "hashbrown 0.15.2",
  "indexmap",
  "serde",
+ "serde_derive",
 ]
 
 [[package]]
@@ -3582,7 +3906,7 @@ dependencies = [
  "concurrent-queue",
  "hermit-abi",
  "pin-project-lite",
- "rustix",
+ "rustix 0.38.42",
  "tracing",
  "windows-sys 0.59.0",
 ]
@@ -3626,23 +3950,13 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa"
 
-[[package]]
-name = "prettyplease"
-version = "0.2.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033"
-dependencies = [
- "proc-macro2",
- "syn",
-]
-
 [[package]]
 name = "proc-macro-crate"
 version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
 dependencies = [
- "toml_edit",
+ "toml_edit 0.22.22",
 ]
 
 [[package]]
@@ -3673,6 +3987,15 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "quick-xml"
+version = "0.37.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "quote"
 version = "1.0.38"
@@ -3696,20 +4019,19 @@ checksum = "019b4b213425016d7d84a153c4c73afb0946fbb4840e4eece7ba8848b9d6da22"
 
 [[package]]
 name = "rand"
-version = "0.8.5"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
 dependencies = [
- "libc",
  "rand_chacha",
  "rand_core",
 ]
 
 [[package]]
 name = "rand_chacha"
-version = "0.3.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
 dependencies = [
  "ppv-lite86",
  "rand_core",
@@ -3717,18 +4039,18 @@ dependencies = [
 
 [[package]]
 name = "rand_core"
-version = "0.6.4"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
 dependencies = [
- "getrandom 0.2.15",
+ "getrandom 0.3.4",
 ]
 
 [[package]]
 name = "rand_distr"
-version = "0.4.3"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31"
+checksum = "6a8615d50dcf34fa31f7ab52692afec947c4dd0ab803cc87cb3b0b4570ff7463"
 dependencies = [
  "num-traits",
  "rand",
@@ -3748,28 +4070,26 @@ checksum = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684"
 
 [[package]]
 name = "rapier3d"
-version = "0.27.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b274764d058e242961750c11aff7433255321f621bb98220bb0a82beff1f9897"
+checksum = "68073fdc88f6b709002767ce8deffffb05ac06824bf9f98a23e270bcea64ba9f"
 dependencies = [
  "approx",
  "arrayvec",
- "bit-vec 0.8.0",
+ "bit-vec",
  "bitflags 2.10.0",
- "downcast-rs",
+ "downcast-rs 2.0.2",
  "log",
  "nalgebra",
  "num-derive",
  "num-traits",
  "ordered-float 5.1.0",
  "parry3d",
- "petgraph 0.8.3",
  "profiling",
  "rustc-hash 2.1.0",
  "simba",
- "smallvec",
+ "static_assertions",
  "thiserror 2.0.17",
- "vec_map",
  "wide",
 ]
 
@@ -3882,6 +4202,19 @@ dependencies = [
  "serde_derive",
 ]
 
+[[package]]
+name = "ron"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "beceb6f7bf81c73e73aeef6dd1356d9a1b2b4909e1f0fc3e59b034f9572d7b7f"
+dependencies = [
+ "base64 0.22.1",
+ "bitflags 2.10.0",
+ "serde",
+ "serde_derive",
+ "unicode-ident",
+]
+
 [[package]]
 name = "roxmltree"
 version = "0.20.0"
@@ -3920,10 +4253,23 @@ dependencies = [
  "bitflags 2.10.0",
  "errno",
  "libc",
- "linux-raw-sys",
+ "linux-raw-sys 0.4.14",
  "windows-sys 0.59.0",
 ]
 
+[[package]]
+name = "rustix"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
+dependencies = [
+ "bitflags 2.10.0",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.11.0",
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "rustversion"
 version = "1.0.22"
@@ -3980,12 +4326,31 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "scoped-tls"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
+
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
+[[package]]
+name = "sctk-adwaita"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6277f0217056f77f1d8f49f2950ac6c278c0d607c45f5ee99328d792ede24ec"
+dependencies = [
+ "ab_glyph",
+ "log",
+ "memmap2",
+ "smithay-client-toolkit",
+ "tiny-skia",
+]
+
 [[package]]
 name = "self_cell"
 version = "1.1.0"
@@ -4058,9 +4423,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "simba"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3a386a501cd104797982c15ae17aafe8b9261315b5d07e3ec803f2ea26be0fa"
+checksum = "c99284beb21666094ba2b75bbceda012e610f5479dfcc2d6e2426f53197ffd95"
 dependencies = [
  "approx",
  "num-complex",
@@ -4107,7 +4472,32 @@ dependencies = [
 name = "smallvec"
 version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[package]]
+name = "smithay-client-toolkit"
+version = "0.19.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016"
+dependencies = [
+ "bitflags 2.10.0",
+ "calloop",
+ "calloop-wayland-source",
+ "cursor-icon",
+ "libc",
+ "log",
+ "memmap2",
+ "rustix 0.38.42",
+ "thiserror 1.0.69",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-csd-frame",
+ "wayland-cursor",
+ "wayland-protocols",
+ "wayland-protocols-wlr",
+ "wayland-scanner",
+ "xkeysym",
+]
 
 [[package]]
 name = "smol_str"
@@ -4132,9 +4522,9 @@ dependencies = [
 
 [[package]]
 name = "spin"
-version = "0.9.8"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+checksum = "d5fe4ccb98d9c292d56fec89a5e07da7fc4cf0dc11e156b41793132775d3e591"
 dependencies = [
  "portable-atomic",
 ]
@@ -4167,26 +4557,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
 [[package]]
-name = "strum"
-version = "0.26.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
-dependencies = [
- "strum_macros",
-]
-
-[[package]]
-name = "strum_macros"
-version = "0.26.4"
+name = "strict-num"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "rustversion",
- "syn",
-]
+checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731"
 
 [[package]]
 name = "svg_fmt"
@@ -4227,15 +4601,16 @@ dependencies = [
 
 [[package]]
 name = "sysinfo"
-version = "0.34.2"
+version = "0.37.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4b93974b3d3aeaa036504b8eefd4c039dced109171c1ae973f1dc63b2c7e4b2"
+checksum = "16607d5caffd1c07ce073528f9ed972d88db15dd44023fa57142963be3feb11f"
 dependencies = [
  "libc",
  "memchr",
  "ntapi",
  "objc2-core-foundation",
- "windows 0.54.0",
+ "objc2-io-kit",
+ "windows 0.61.3",
 ]
 
 [[package]]
@@ -4309,6 +4684,31 @@ dependencies = [
  "once_cell",
 ]
 
+[[package]]
+name = "tiny-skia"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab"
+dependencies = [
+ "arrayref",
+ "arrayvec",
+ "bytemuck",
+ "cfg-if",
+ "log",
+ "tiny-skia-path",
+]
+
+[[package]]
+name = "tiny-skia-path"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93"
+dependencies = [
+ "arrayref",
+ "bytemuck",
+ "strict-num",
+]
+
 [[package]]
 name = "tinyvec"
 version = "1.8.1"
@@ -4330,6 +4730,15 @@ version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
 
+[[package]]
+name = "toml_datetime"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533"
+dependencies = [
+ "serde_core",
+]
+
 [[package]]
 name = "toml_edit"
 version = "0.22.22"
@@ -4337,8 +4746,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
 dependencies = [
  "indexmap",
- "toml_datetime",
- "winnow",
+ "toml_datetime 0.6.8",
+ "winnow 0.6.20",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.23.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6485ef6d0d9b5d0ec17244ff7eb05310113c3f316f2d14200d4de56b3cb98f8d"
+dependencies = [
+ "indexmap",
+ "toml_datetime 0.7.3",
+ "toml_parser",
+ "winnow 0.7.14",
+]
+
+[[package]]
+name = "toml_parser"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e"
+dependencies = [
+ "winnow 0.7.14",
 ]
 
 [[package]]
@@ -4386,15 +4816,12 @@ dependencies = [
 
 [[package]]
 name = "tracing-oslog"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "528bdd1f0e27b5dd9a4ededf154e824b0532731e4af73bb531de46276e0aab1e"
+checksum = "d76902d2a8d5f9f55a81155c08971734071968c90f2d9bfe645fe700579b2950"
 dependencies = [
- "bindgen 0.70.1",
  "cc",
  "cfg-if",
- "once_cell",
- "parking_lot",
  "tracing-core",
  "tracing-subscriber",
 ]
@@ -4440,6 +4867,12 @@ version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8"
 
+[[package]]
+name = "ttf-parser"
+version = "0.25.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2df906b07856748fa3f6e0ad0cbaa047052d4a7dd609e231c4f72cee8c36f31"
+
 [[package]]
 name = "twox-hash"
 version = "2.1.2"
@@ -4642,6 +5075,114 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "wayland-backend"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "673a33c33048a5ade91a6b139580fa174e19fb0d23f396dca9fa15f2e1e49b35"
+dependencies = [
+ "cc",
+ "downcast-rs 1.2.1",
+ "rustix 1.1.2",
+ "scoped-tls",
+ "smallvec",
+ "wayland-sys",
+]
+
+[[package]]
+name = "wayland-client"
+version = "0.31.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c66a47e840dc20793f2264eb4b3e4ecb4b75d91c0dd4af04b456128e0bdd449d"
+dependencies = [
+ "bitflags 2.10.0",
+ "rustix 1.1.2",
+ "wayland-backend",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-csd-frame"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e"
+dependencies = [
+ "bitflags 2.10.0",
+ "cursor-icon",
+ "wayland-backend",
+]
+
+[[package]]
+name = "wayland-cursor"
+version = "0.31.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "447ccc440a881271b19e9989f75726d60faa09b95b0200a9b7eb5cc47c3eeb29"
+dependencies = [
+ "rustix 1.1.2",
+ "wayland-client",
+ "xcursor",
+]
+
+[[package]]
+name = "wayland-protocols"
+version = "0.32.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "efa790ed75fbfd71283bd2521a1cfdc022aabcc28bdcff00851f9e4ae88d9901"
+dependencies = [
+ "bitflags 2.10.0",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-protocols-plasma"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a07a14257c077ab3279987c4f8bb987851bf57081b93710381daea94f2c2c032"
+dependencies = [
+ "bitflags 2.10.0",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-protocols-wlr"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "efd94963ed43cf9938a090ca4f7da58eb55325ec8200c3848963e98dc25b78ec"
+dependencies = [
+ "bitflags 2.10.0",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-scanner"
+version = "0.31.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54cb1e9dc49da91950bdfd8b848c49330536d9d1fb03d4bfec8cae50caa50ae3"
+dependencies = [
+ "proc-macro2",
+ "quick-xml",
+ "quote",
+]
+
+[[package]]
+name = "wayland-sys"
+version = "0.31.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34949b42822155826b41db8e5d0c1be3a2bd296c747577a43a3e6daefc296142"
+dependencies = [
+ "dlib",
+ "log",
+ "pkg-config",
+]
+
 [[package]]
 name = "web-sys"
 version = "0.3.82"
@@ -4664,24 +5205,25 @@ dependencies = [
 
 [[package]]
 name = "wgpu"
-version = "24.0.5"
+version = "26.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b0b3436f0729f6cdf2e6e9201f3d39dc95813fad61d826c1ed07918b4539353"
+checksum = "70b6ff82bbf6e9206828e1a3178e851f8c20f1c9028e74dd3a8090741ccd5798"
 dependencies = [
  "arrayvec",
  "bitflags 2.10.0",
+ "cfg-if",
  "cfg_aliases",
  "document-features",
+ "hashbrown 0.15.2",
  "js-sys",
  "log",
  "naga",
- "parking_lot",
+ "portable-atomic",
  "profiling",
  "raw-window-handle",
  "smallvec",
  "static_assertions",
  "wasm-bindgen",
- "wasm-bindgen-futures",
  "web-sys",
  "wgpu-core",
  "wgpu-hal",
@@ -4690,49 +5232,84 @@ dependencies = [
 
 [[package]]
 name = "wgpu-core"
-version = "24.0.5"
+version = "26.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f0aa306497a238d169b9dc70659105b4a096859a34894544ca81719242e1499"
+checksum = "d5f62f1053bd28c2268f42916f31588f81f64796e2ff91b81293515017ca8bd9"
 dependencies = [
  "arrayvec",
- "bit-vec 0.8.0",
+ "bit-set",
+ "bit-vec",
  "bitflags 2.10.0",
  "cfg_aliases",
  "document-features",
+ "hashbrown 0.15.2",
  "indexmap",
  "log",
  "naga",
  "once_cell",
  "parking_lot",
+ "portable-atomic",
  "profiling",
  "raw-window-handle",
  "rustc-hash 1.1.0",
  "smallvec",
  "thiserror 2.0.17",
+ "wgpu-core-deps-apple",
+ "wgpu-core-deps-wasm",
+ "wgpu-core-deps-windows-linux-android",
  "wgpu-hal",
  "wgpu-types",
 ]
 
+[[package]]
+name = "wgpu-core-deps-apple"
+version = "26.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18ae5fbde6a4cbebae38358aa73fcd6e0f15c6144b67ef5dc91ded0db125dbdf"
+dependencies = [
+ "wgpu-hal",
+]
+
+[[package]]
+name = "wgpu-core-deps-wasm"
+version = "26.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c03b9f9e1a50686d315fc6debe4980cc45cd37b0e919351917df494e8fdc8885"
+dependencies = [
+ "wgpu-hal",
+]
+
+[[package]]
+name = "wgpu-core-deps-windows-linux-android"
+version = "26.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "720a5cb9d12b3d337c15ff0e24d3e97ed11490ff3f7506e7f3d98c68fa5d6f14"
+dependencies = [
+ "wgpu-hal",
+]
+
 [[package]]
 name = "wgpu-hal"
-version = "24.0.4"
+version = "26.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f112f464674ca69f3533248508ee30cb84c67cf06c25ff6800685f5e0294e259"
+checksum = "a8d0e67224cc7305b3b4eb2cc57ca4c4c3afc665c1d1bee162ea806e19c47bdd"
 dependencies = [
  "android_system_properties",
  "arrayvec",
  "ash",
- "bit-set 0.8.0",
+ "bit-set",
  "bitflags 2.10.0",
  "block",
  "bytemuck",
+ "cfg-if",
  "cfg_aliases",
- "core-graphics-types",
+ "core-graphics-types 0.2.0",
  "glow",
  "glutin_wgl_sys",
  "gpu-alloc",
  "gpu-allocator",
  "gpu-descriptor",
+ "hashbrown 0.15.2",
  "js-sys",
  "khronos-egl",
  "libc",
@@ -4740,16 +5317,16 @@ dependencies = [
  "log",
  "metal",
  "naga",
- "ndk-sys 0.5.0+25.2.9519653",
+ "ndk-sys 0.6.0+11769913",
  "objc",
- "once_cell",
  "ordered-float 4.6.0",
  "parking_lot",
+ "portable-atomic",
+ "portable-atomic-util",
  "profiling",
  "range-alloc",
  "raw-window-handle",
  "renderdoc-sys",
- "rustc-hash 1.1.0",
  "smallvec",
  "thiserror 2.0.17",
  "wasm-bindgen",
@@ -4761,14 +5338,16 @@ dependencies = [
 
 [[package]]
 name = "wgpu-types"
-version = "24.0.0"
+version = "26.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50ac044c0e76c03a0378e7786ac505d010a873665e2d51383dcff8dd227dc69c"
+checksum = "eca7a8d8af57c18f57d393601a1fb159ace8b2328f1b6b5f80893f7d672c9ae2"
 dependencies = [
  "bitflags 2.10.0",
+ "bytemuck",
  "js-sys",
  "log",
  "serde",
+ "thiserror 2.0.17",
  "web-sys",
 ]
 
@@ -4833,6 +5412,28 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows"
+version = "0.61.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893"
+dependencies = [
+ "windows-collections",
+ "windows-core 0.61.2",
+ "windows-future",
+ "windows-link 0.1.3",
+ "windows-numerics",
+]
+
+[[package]]
+name = "windows-collections"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8"
+dependencies = [
+ "windows-core 0.61.2",
+]
+
 [[package]]
 name = "windows-core"
 version = "0.54.0"
@@ -4849,13 +5450,37 @@ version = "0.58.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99"
 dependencies = [
- "windows-implement",
- "windows-interface",
+ "windows-implement 0.58.0",
+ "windows-interface 0.58.0",
  "windows-result 0.2.0",
- "windows-strings",
+ "windows-strings 0.1.0",
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-core"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
+dependencies = [
+ "windows-implement 0.60.2",
+ "windows-interface 0.59.3",
+ "windows-link 0.1.3",
+ "windows-result 0.3.4",
+ "windows-strings 0.4.2",
+]
+
+[[package]]
+name = "windows-future"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e"
+dependencies = [
+ "windows-core 0.61.2",
+ "windows-link 0.1.3",
+ "windows-threading",
+]
+
 [[package]]
 name = "windows-implement"
 version = "0.58.0"
@@ -4867,6 +5492,17 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "windows-implement"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "windows-interface"
 version = "0.58.0"
@@ -4878,12 +5514,39 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "windows-interface"
+version = "0.59.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "windows-link"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
+
 [[package]]
 name = "windows-link"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
 
+[[package]]
+name = "windows-numerics"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1"
+dependencies = [
+ "windows-core 0.61.2",
+ "windows-link 0.1.3",
+]
+
 [[package]]
 name = "windows-result"
 version = "0.1.2"
@@ -4902,6 +5565,15 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-result"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
+dependencies = [
+ "windows-link 0.1.3",
+]
+
 [[package]]
 name = "windows-strings"
 version = "0.1.0"
@@ -4912,6 +5584,15 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-strings"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
+dependencies = [
+ "windows-link 0.1.3",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.45.0"
@@ -4954,7 +5635,7 @@ version = "0.61.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
 dependencies = [
- "windows-link",
+ "windows-link 0.2.1",
 ]
 
 [[package]]
@@ -5009,7 +5690,7 @@ version = "0.53.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
 dependencies = [
- "windows-link",
+ "windows-link 0.2.1",
  "windows_aarch64_gnullvm 0.53.1",
  "windows_aarch64_msvc 0.53.1",
  "windows_i686_gnu 0.53.1",
@@ -5020,6 +5701,15 @@ dependencies = [
  "windows_x86_64_msvc 0.53.1",
 ]
 
+[[package]]
+name = "windows-threading"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6"
+dependencies = [
+ "windows-link 0.1.3",
+]
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.42.2"
@@ -5206,6 +5896,7 @@ version = "0.30.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dba50bc8ef4b6f1a75c9274fb95aa9a8f63fbc66c56f391bd85cf68d51e7b1a3"
 dependencies = [
+ "ahash",
  "android-activity",
  "atomic-waker",
  "bitflags 2.10.0",
@@ -5220,6 +5911,7 @@ dependencies = [
  "dpi",
  "js-sys",
  "libc",
+ "memmap2",
  "ndk 0.9.0",
  "objc2",
  "objc2-app-kit",
@@ -5230,12 +5922,18 @@ dependencies = [
  "pin-project",
  "raw-window-handle",
  "redox_syscall 0.4.1",
- "rustix",
+ "rustix 0.38.42",
+ "sctk-adwaita",
+ "smithay-client-toolkit",
  "smol_str",
  "tracing",
  "unicode-segmentation",
  "wasm-bindgen",
  "wasm-bindgen-futures",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+ "wayland-protocols-plasma",
  "web-sys",
  "web-time",
  "windows-sys 0.52.0",
@@ -5253,6 +5951,15 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "winnow"
+version = "0.7.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "wit-bindgen"
 version = "0.46.0"
@@ -5281,7 +5988,7 @@ dependencies = [
  "libc",
  "libloading",
  "once_cell",
- "rustix",
+ "rustix 0.38.42",
  "x11rb-protocol",
 ]
 
@@ -5291,6 +5998,12 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d"
 
+[[package]]
+name = "xcursor"
+version = "0.3.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bec9e4a500ca8864c5b47b8b482a73d62e4237670e5b5f1d6b9e3cae50f28f2b"
+
 [[package]]
 name = "xkbcommon-dl"
 version = "0.4.2"
diff --git a/Cargo.toml b/Cargo.toml
index 50235e1d..9523a2f8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -18,9 +18,8 @@ opt-level = 1
 opt-level = 3
 
 [dependencies]
-bevy = { version = "0.16.0", features = ["dynamic_linking"] }
-bevy_rapier3d = { version = "0.31.0", features = [
-    "simd-stable",
+bevy = { version = "0.17.3", features = ["dynamic_linking"] }
+bevy_rapier3d = { version = "0.32.0", features = [
     "debug-render-3d",
 ] }
 serde = { version = "1.0", features = ["derive"] }
@@ -29,7 +28,7 @@ serde_json = "1.0"
 tracing = "0.1"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-bevy = { version = "0.16.0", features = ["file_watcher"] }
+bevy = { version = "0.17.3", features = ["file_watcher"] }
 
 # These lints may be important signals about code quality, but normal Bevy code
 # commonly triggers them and the CI workflow treats them as errors, so we've
diff --git a/src/level_loader.rs b/src/level_loader.rs
index e3c10049..fa903396 100644
--- a/src/level_loader.rs
+++ b/src/level_loader.rs
@@ -55,15 +55,19 @@ impl Plugin for LevelLoaderPlugin {
         app.add_systems(
             Update,
             (
-                advance_level_when_cleared,
-                handle_level_advance_delay,
-                finalize_level_advance.after(handle_level_advance_delay),
-                spawn_fade_overlay_if_needed,
-                update_fade_overlay,
-                restart_level_on_key,
-                destroy_all_bricks_on_key,
-                process_level_switch_requests,
-                sync_level_presentation,
+                (
+                    advance_level_when_cleared,
+                    handle_level_advance_delay,
+                    finalize_level_advance.after(handle_level_advance_delay),
+                    spawn_fade_overlay_if_needed,
+                ),
+                (
+                    update_fade_overlay,
+                    restart_level_on_key,
+                    destroy_all_bricks_on_key,
+                    process_level_switch_requests,
+                    sync_level_presentation,
+                ),
             )
                 .in_set(LevelAdvanceSet),
         );
@@ -71,14 +75,18 @@ impl Plugin for LevelLoaderPlugin {
         app.add_systems(
             Update,
             (
-                advance_level_when_cleared,
-                handle_level_advance_delay,
-                finalize_level_advance.after(handle_level_advance_delay),
-                spawn_fade_overlay_if_needed,
-                update_fade_overlay,
-                restart_level_on_key,
-                destroy_all_bricks_on_key,
-                process_level_switch_requests,
+                (
+                    advance_level_when_cleared,
+                    handle_level_advance_delay,
+                    finalize_level_advance.after(handle_level_advance_delay),
+                    spawn_fade_overlay_if_needed,
+                ),
+                (
+                    update_fade_overlay,
+                    restart_level_on_key,
+                    destroy_all_bricks_on_key,
+                    process_level_switch_requests,
+                ),
             ),
         );
     }
@@ -774,7 +782,7 @@ fn destroy_all_bricks_on_key(
 }
 
 pub(crate) fn process_level_switch_requests(
-    mut requests: EventReader<LevelSwitchRequested>,
+    mut requests: bevy::ecs::message::MessageReader<LevelSwitchRequested>,
     mut switch_state: ResMut<LevelSwitchState>,
     current_level: Option<Res<CurrentLevel>>,
     mut commands: Commands,
@@ -862,7 +870,7 @@ fn handle_level_advance_delay(
         return;
     }
     level_advance.timer.tick(time.delta());
-    if !level_advance.timer.finished() {
+    if !level_advance.timer.is_finished() {
         return;
     }
     let def = level_advance.pending.as_ref().unwrap();
diff --git a/src/lib.rs b/src/lib.rs
index c1ce86cc..a31b2230 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -23,14 +23,13 @@ use bevy::pbr::wireframe::{WireframeConfig, WireframePlugin};
 #[cfg(not(target_arch = "wasm32"))]
 use bevy::window::MonitorSelection;
 use bevy::{
+    asset::RenderAssetUsages,
     color::palettes::{basic::SILVER, css::RED},
+    ecs::message::{MessageReader, MessageWriter},
     input::mouse::{AccumulatedMouseMotion, AccumulatedMouseScroll},
     prelude::*,
-    render::{
-        render_asset::RenderAssetUsages,
-        render_resource::{Extent3d, TextureDimension, TextureFormat},
-    },
-    window::{CursorGrabMode, PrimaryWindow, Window, WindowMode, WindowPlugin},
+    render::render_resource::{Extent3d, TextureDimension, TextureFormat},
+    window::{CursorGrabMode, CursorOptions, PrimaryWindow, Window, WindowMode, WindowPlugin},
 };
 use bevy_rapier3d::prelude::*;
 
@@ -318,7 +317,7 @@ fn update_camera_shake(
         if let Some(mut shake) = shake_opt {
             shake.timer.tick(time.delta());
 
-            if shake.timer.finished() {
+            if shake.timer.is_finished() {
                 // Restore original position and remove shake component
                 transform.translation = shake.original_position;
                 commands.entity(entity).remove::<CameraShake>();
@@ -339,7 +338,7 @@ fn update_camera_shake(
 
 /// Observer to start camera shake
 fn start_camera_shake(
-    trigger: Trigger<StartCameraShake>,
+    trigger: On<StartCameraShake>,
     mut cameras: Query<(Entity, &Transform), (With<Camera3d>, Without<CameraShake>)>,
     mut commands: Commands,
 ) {
@@ -369,7 +368,7 @@ fn update_paddle_growth(
     for (entity, mut transform, mut growing) in paddles.iter_mut() {
         growing.timer.tick(time.delta());
 
-        if growing.timer.finished() {
+        if growing.timer.is_finished() {
             // Growth complete: set final scale, enable gravity, remove component
             transform.scale = growing.target_scale;
             if let Ok(mut config) = rapier_config.single_mut() {
@@ -554,7 +553,7 @@ fn uv_debug_texture() -> Image {
 /// Mark bricks for despawn when hit by the ball
 /// This allows the physics collision response to complete before removal
 fn mark_brick_on_ball_collision(
-    mut collision_events: EventReader<CollisionEvent>,
+    mut collision_events: MessageReader<CollisionEvent>,
     balls: Query<Entity, With<Ball>>,
     bricks: Query<Entity, (With<Brick>, Without<MarkedForDespawn>)>,
     mut commands: Commands,
@@ -595,22 +594,23 @@ fn toggle_wireframe(
 }
 
 fn grab_mouse(
-    mut window: Single<&mut Window, With<PrimaryWindow>>,
+    window: Single<&Window, With<PrimaryWindow>>,
+    mut cursor_options: Single<&mut CursorOptions, With<PrimaryWindow>>,
     mouse: Res<ButtonInput<MouseButton>>,
     key: Res<ButtonInput<KeyCode>>,
-    mut app_exit: EventWriter<AppExit>,
+    mut app_exit: MessageWriter<AppExit>,
 ) {
     if !window.focused {
         return;
     }
     if mouse.just_pressed(MouseButton::Left) {
-        window.cursor_options.visible = false;
-        window.cursor_options.grab_mode = CursorGrabMode::Locked;
+        cursor_options.visible = false;
+        cursor_options.grab_mode = CursorGrabMode::Locked;
     }
 
     if key.just_pressed(KeyCode::Escape) {
-        window.cursor_options.visible = true;
-        window.cursor_options.grab_mode = CursorGrabMode::None;
+        cursor_options.visible = true;
+        cursor_options.grab_mode = CursorGrabMode::None;
     }
 
     if key.just_pressed(KeyCode::KeyQ) {
@@ -674,7 +674,7 @@ fn read_character_controller_collisions(
 }
 
 fn on_wall_hit(
-    trigger: Trigger<WallHit>,
+    trigger: On<WallHit>,
     mut balls: Query<&mut ExternalImpulse, With<Ball>>,
     mut controllers: Query<&mut KinematicCharacterController, With<Paddle>>,
     mut commands: Commands,
@@ -703,7 +703,7 @@ struct StartCameraShake {
 }
 
 fn on_brick_hit(
-    trigger: Trigger<BrickHit>,
+    trigger: On<BrickHit>,
     mut controllers: Query<&mut KinematicCharacterController, With<Paddle>>,
     mut commands: Commands,
 ) {
@@ -721,7 +721,7 @@ fn on_brick_hit(
 }
 
 fn on_paddle_ball_hit(
-    trigger: Trigger<BallHit>,
+    trigger: On<BallHit>,
     mut balls: Query<(Entity, &mut ExternalImpulse), With<Ball>>,
 ) {
     let event = trigger.event();
diff --git a/src/pause.rs b/src/pause.rs
index 4eb8a086..b5b9e9cc 100644
--- a/src/pause.rs
+++ b/src/pause.rs
@@ -11,7 +11,7 @@
 use bevy::prelude::*;
 #[cfg(not(target_arch = "wasm32"))]
 use bevy::window::WindowMode;
-use bevy::window::{PrimaryWindow, Window};
+use bevy::window::{CursorOptions, PrimaryWindow, Window};
 use bevy_rapier3d::prelude::*;
 
 use crate::level_loader::LevelAdvanceState;
@@ -200,7 +200,7 @@ fn apply_pause_to_window_mode(_pause_state: Res<PauseState>) {
 /// Hides cursor during active gameplay, shows cursor when paused.
 fn apply_pause_to_cursor(
     pause_state: Res<PauseState>,
-    mut window: Single<&mut Window, With<PrimaryWindow>>,
+    mut cursor_options: Single<&mut CursorOptions, With<PrimaryWindow>>,
 ) {
     // Only run when pause state changes
     if !pause_state.is_changed() {
@@ -210,18 +210,18 @@ fn apply_pause_to_cursor(
     match *pause_state {
         PauseState::Active => {
             // Game active - hide cursor for gameplay
-            window.cursor_options.visible = false;
+            cursor_options.visible = false;
         }
         PauseState::Paused { .. } => {
             // Game paused - show cursor for UI interaction
-            window.cursor_options.visible = true;
+            cursor_options.visible = true;
         }
     }
 }
 
 /// Startup system to hide cursor when game launches.
-fn hide_cursor_on_startup(mut window: Single<&mut Window, With<PrimaryWindow>>) {
-    window.cursor_options.visible = false;
+fn hide_cursor_on_startup(mut cursor_options: Single<&mut CursorOptions, With<PrimaryWindow>>) {
+    cursor_options.visible = false;
 }
 
 /// Run condition that returns true when the game is not paused.
diff --git a/src/systems/level_switch.rs b/src/systems/level_switch.rs
index 349cf33c..7901ff9a 100644
--- a/src/systems/level_switch.rs
+++ b/src/systems/level_switch.rs
@@ -1,11 +1,12 @@
+use bevy::ecs::message::{Message, MessageWriter};
 use bevy::prelude::*;
 use std::path::{Path, PathBuf};
 use tracing::info;
 #[cfg(not(target_arch = "wasm32"))]
 use tracing::warn;
 
-/// Event emitted when any source requests a level switch.
-#[derive(Event, Debug, Clone, Copy, PartialEq, Eq)]
+/// Message emitted when any source requests a level switch.
+#[derive(Message, Debug, Clone, Copy, PartialEq, Eq)]
 pub struct LevelSwitchRequested {
     pub source: LevelSwitchSource,
 }
@@ -131,7 +132,7 @@ pub struct LevelSwitchPlugin;
 
 impl Plugin for LevelSwitchPlugin {
     fn build(&self, app: &mut App) {
-        app.add_event::<LevelSwitchRequested>()
+        app.add_message::<LevelSwitchRequested>()
             .init_resource::<LevelSwitchState>()
             .add_systems(Update, (queue_keyboard_requests, poll_contract_trigger));
     }
@@ -139,7 +140,7 @@ impl Plugin for LevelSwitchPlugin {
 
 fn queue_keyboard_requests(
     keyboard: Res<ButtonInput<KeyCode>>,
-    mut events: EventWriter<LevelSwitchRequested>,
+    mut events: MessageWriter<LevelSwitchRequested>,
 ) {
     if keyboard.just_pressed(KeyCode::KeyL) {
         events.write(LevelSwitchRequested {
@@ -150,7 +151,7 @@ fn queue_keyboard_requests(
 
 fn poll_contract_trigger(
     #[cfg(not(target_arch = "wasm32"))] state: Res<LevelSwitchState>,
-    #[cfg(not(target_arch = "wasm32"))] mut events: EventWriter<LevelSwitchRequested>,
+    #[cfg(not(target_arch = "wasm32"))] mut events: MessageWriter<LevelSwitchRequested>,
 ) {
     #[cfg(not(target_arch = "wasm32"))]
     {
diff --git a/src/systems/respawn.rs b/src/systems/respawn.rs
index ecdbd99b..5ae27e88 100644
--- a/src/systems/respawn.rs
+++ b/src/systems/respawn.rs
@@ -1,3 +1,4 @@
+use bevy::ecs::message::{Message, MessageReader, MessageWriter};
 use bevy::prelude::*;
 use bevy_rapier3d::prelude::*;
 use std::{collections::VecDeque, f32::consts::PI, time::Duration};
@@ -160,7 +161,7 @@ pub struct RespawnHandle {
 /// Plugin wiring the respawn flow through ordered system sets.
 pub struct RespawnPlugin;
 
-#[derive(Event, Debug, Clone, Copy)]
+#[derive(Message, Debug, Clone, Copy)]
 pub struct LifeLostEvent {
     pub ball: Entity,
     pub cause: LifeLossCause,
@@ -173,7 +174,7 @@ pub enum LifeLossCause {
 }
 
 #[allow(dead_code)]
-#[derive(Event, Debug, Clone, Copy)]
+#[derive(Message, Debug, Clone, Copy)]
 pub struct RespawnScheduled {
     pub ball: Entity,
     pub paddle: Option<Entity>,
@@ -182,7 +183,7 @@ pub struct RespawnScheduled {
 }
 
 #[allow(dead_code)]
-#[derive(Event, Debug, Clone, Copy)]
+#[derive(Message, Debug, Clone, Copy)]
 pub struct RespawnCompleted {
     pub ball: Entity,
     pub paddle: Option<Entity>,
@@ -190,7 +191,7 @@ pub struct RespawnCompleted {
 }
 
 #[allow(dead_code)]
-#[derive(Event, Debug, Clone, Copy)]
+#[derive(Message, Debug, Clone, Copy)]
 pub struct GameOverRequested {
     pub remaining_lives: u8,
 }
@@ -214,10 +215,10 @@ impl Plugin for RespawnPlugin {
             .init_resource::<LivesState>()
             .init_resource::<SpawnPoints>()
             .init_resource::<RespawnVisualState>()
-            .add_event::<LifeLostEvent>()
-            .add_event::<RespawnScheduled>()
-            .add_event::<RespawnCompleted>()
-            .add_event::<GameOverRequested>()
+            .add_message::<LifeLostEvent>()
+            .add_message::<RespawnScheduled>()
+            .add_message::<RespawnCompleted>()
+            .add_message::<GameOverRequested>()
             .configure_sets(
                 Update,
                 (
@@ -257,13 +258,13 @@ impl Plugin for RespawnPlugin {
 }
 
 fn detect_ball_loss(
-    mut collision_events: EventReader<CollisionEvent>,
+    mut collision_events: MessageReader<CollisionEvent>,
     balls: Query<Entity, With<Ball>>,
     ball_handles: Query<&RespawnHandle, With<Ball>>,
     lower_goals: Query<Entity, With<LowerGoal>>,
     spawn_points: Res<SpawnPoints>,
     mut commands: Commands,
-    mut life_lost_events: EventWriter<LifeLostEvent>,
+    mut life_lost_events: MessageWriter<LifeLostEvent>,
 ) {
     for event in collision_events.read() {
         if let CollisionEvent::Started(e1, e2, _) = event {
@@ -297,7 +298,7 @@ fn detect_ball_loss(
     }
 }
 
-fn life_loss_logging(mut life_lost_events: EventReader<LifeLostEvent>) {
+fn life_loss_logging(mut life_lost_events: MessageReader<LifeLostEvent>) {
     for event in life_lost_events.read() {
         let spawn = event.ball_spawn.translation;
         info!(
@@ -313,7 +314,7 @@ fn life_loss_logging(mut life_lost_events: EventReader<LifeLostEvent>) {
     }
 }
 
-fn log_respawn_scheduled(mut events: EventReader<RespawnScheduled>) {
+fn log_respawn_scheduled(mut events: MessageReader<RespawnScheduled>) {
     for event in events.read() {
         info!(
             target: "respawn",
@@ -327,7 +328,7 @@ fn log_respawn_scheduled(mut events: EventReader<RespawnScheduled>) {
     }
 }
 
-fn log_game_over_requested(mut events: EventReader<GameOverRequested>) {
+fn log_game_over_requested(mut events: MessageReader<GameOverRequested>) {
     for event in events.read() {
         info!(
             target: "respawn",
@@ -372,7 +373,7 @@ fn start_pending_request(
     respawn_schedule: &mut RespawnSchedule,
     request: RespawnRequest,
     time: &Time,
-    respawn_scheduled_events: &mut EventWriter<RespawnScheduled>,
+    respawn_scheduled_events: &mut MessageWriter<RespawnScheduled>,
 ) {
     respawn_schedule.timer.reset();
     respawn_schedule.pending = Some(request);
@@ -413,11 +414,11 @@ fn hydrate_respawn_request(
 
 fn enqueue_respawn_requests(
     mut respawn_schedule: ResMut<RespawnSchedule>,
-    mut events: EventReader<LifeLostEvent>,
+    mut events: MessageReader<LifeLostEvent>,
     lives_state: Res<LivesState>,
     time: Res<Time>,
     spawn_points: Res<SpawnPoints>,
-    mut game_over_events: EventWriter<GameOverRequested>,
+    mut game_over_events: MessageWriter<GameOverRequested>,
     mut paddles: Query<(Entity, Option<&mut Velocity>), With<Paddle>>,
     paddle_handles: Query<&RespawnHandle, With<Paddle>>,
     mut commands: Commands,
@@ -471,7 +472,7 @@ fn process_respawn_queue(
     mut respawn_schedule: ResMut<RespawnSchedule>,
     time: Res<Time>,
     spawn_points: Res<SpawnPoints>,
-    mut respawn_scheduled_events: EventWriter<RespawnScheduled>,
+    mut respawn_scheduled_events: MessageWriter<RespawnScheduled>,
     mut paddles: Query<(Entity, Option<&mut Velocity>), With<Paddle>>,
     paddle_handles: Query<&RespawnHandle, With<Paddle>>,
     mut commands: Commands,
@@ -504,7 +505,7 @@ fn respawn_executor(
     mut meshes: ResMut<Assets<Mesh>>,
     mut materials: ResMut<Assets<StandardMaterial>>,
     mut paddles: Query<(Entity, &mut Transform, Option<&mut Velocity>), With<Paddle>>,
-    mut respawn_completed_events: EventWriter<RespawnCompleted>,
+    mut respawn_completed_events: MessageWriter<RespawnCompleted>,
     mut commands: Commands,
     #[cfg(feature = "texture_manifest")] canonical: Option<
         Res<crate::systems::textures::CanonicalMaterialHandles>,
@@ -518,7 +519,7 @@ fn respawn_executor(
     }
 
     respawn_schedule.timer.tick(time.delta());
-    if !respawn_schedule.timer.finished() {
+    if !respawn_schedule.timer.is_finished() {
         return;
     }
 
@@ -672,7 +673,7 @@ fn respawn_executor(
 }
 
 fn respawn_visual_trigger(
-    mut events: EventReader<RespawnScheduled>,
+    mut events: MessageReader<RespawnScheduled>,
     mut commands: Commands,
     mut visual_state: ResMut<RespawnVisualState>,
     overlay_query: Query<Entity, With<RespawnFadeOverlay>>,
@@ -730,7 +731,7 @@ fn animate_respawn_visual(
         };
         color.0 = Color::srgba(0.0, 0.0, 0.0, alpha.clamp(0.0, 0.6));
         visual_state.active = true;
-        if overlay.timer.finished() {
+        if overlay.timer.is_finished() {
             commands.entity(entity).despawn();
             visual_state.active = false;
         }
@@ -777,7 +778,8 @@ fn restore_paddle_control(
 mod tests {
     use super::*;
     use bevy::app::App;
-    use bevy::ecs::event::Events;
+    use bevy::ecs::entity::EntityRow;
+    use bevy::ecs::message::Messages;
     use bevy::time::Time;
     use bevy::MinimalPlugins;
     use bevy_rapier3d::prelude::CollisionEvent;
@@ -790,7 +792,7 @@ mod tests {
         app.add_plugins(MinimalPlugins)
             .insert_resource(Assets::<Mesh>::default())
             .insert_resource(Assets::<StandardMaterial>::default())
-            .add_event::<CollisionEvent>()
+            .add_message::<CollisionEvent>()
             .add_plugins(RespawnPlugin);
         {
             let mut spawn_points = app.world_mut().resource_mut::<SpawnPoints>();
@@ -838,8 +840,8 @@ mod tests {
             .id();
 
         app.world_mut()
-            .resource_mut::<Events<CollisionEvent>>()
-            .send(CollisionEvent::Started(
+            .resource_mut::<Messages<CollisionEvent>>()
+            .write(CollisionEvent::Started(
                 ball,
                 lower_goal,
                 CollisionEventFlags::SENSOR,
@@ -873,7 +875,7 @@ mod tests {
         {
             let mut schedule = app.world_mut().resource_mut::<RespawnSchedule>();
             schedule.pending = Some(RespawnRequest {
-                lost_ball: Entity::from_raw(999),
+                lost_ball: Entity::from_row(EntityRow::from_raw_u32(999).unwrap()),
                 tracked_paddle: Some(paddle),
                 remaining_lives: 2,
                 ball_spawn: Some(SpawnTransform::new(
@@ -898,10 +900,12 @@ mod tests {
         let paddle_transform = world.entity(paddle).get::<Transform>().unwrap();
         assert_eq!(paddle_transform.translation, Vec3::new(-1.0, 2.0, 0.0));
 
-        let ball_count = world
-            .iter_entities()
-            .filter(|entity| entity.contains::<Ball>() && entity.contains::<BallFrozen>())
-            .count();
+        let ball_count = {
+            let mut query = app
+                .world_mut()
+                .query_filtered::<Entity, (With<Ball>, With<BallFrozen>)>();
+            query.iter(app.world()).count()
+        };
         assert_eq!(ball_count, 1);
     }
 
@@ -925,7 +929,7 @@ mod tests {
         {
             let mut schedule = app.world_mut().resource_mut::<RespawnSchedule>();
             schedule.pending = Some(RespawnRequest {
-                lost_ball: Entity::from_raw(1),
+                lost_ball: Entity::from_row(EntityRow::from_raw_u32(1).unwrap()),
                 tracked_paddle: None,
                 remaining_lives: 1,
                 ball_spawn: Some(SpawnTransform::new(Vec3::ZERO, Quat::IDENTITY)),
@@ -1011,8 +1015,8 @@ mod tests {
         let lower_goal = app.world_mut().spawn(LowerGoal).id();
 
         app.world_mut()
-            .resource_mut::<Events<CollisionEvent>>()
-            .send(CollisionEvent::Started(
+            .resource_mut::<Messages<CollisionEvent>>()
+            .write(CollisionEvent::Started(
                 ball,
                 lower_goal,
                 CollisionEventFlags::SENSOR,
@@ -1024,7 +1028,7 @@ mod tests {
         let respawn_schedule = app.world().resource::<RespawnSchedule>();
         assert!(respawn_schedule.pending.is_none());
 
-        let events = app.world().resource::<Events<GameOverRequested>>();
+        let events = app.world().resource::<Messages<GameOverRequested>>();
         assert!(!events.is_empty());
     }
 
@@ -1054,8 +1058,8 @@ mod tests {
         ));
 
         app.world_mut()
-            .resource_mut::<Events<CollisionEvent>>()
-            .send(CollisionEvent::Started(
+            .resource_mut::<Messages<CollisionEvent>>()
+            .write(CollisionEvent::Started(
                 ball_a,
                 lower_goal,
                 CollisionEventFlags::SENSOR,
@@ -1071,8 +1075,8 @@ mod tests {
         }
 
         app.world_mut()
-            .resource_mut::<Events<CollisionEvent>>()
-            .send(CollisionEvent::Started(
+            .resource_mut::<Messages<CollisionEvent>>()
+            .write(CollisionEvent::Started(
                 ball_b,
                 lower_goal,
                 CollisionEventFlags::SENSOR,
diff --git a/src/systems/textures/contracts.rs b/src/systems/textures/contracts.rs
index 559268d2..7d9d02dd 100644
--- a/src/systems/textures/contracts.rs
+++ b/src/systems/textures/contracts.rs
@@ -1,6 +1,7 @@
 use std::collections::BTreeMap;
 
-use bevy::prelude::{Color, Event, Vec2};
+use bevy::ecs::message::Message;
+use bevy::prelude::{Color, Vec2};
 use ron::Value as RonValue;
 use serde::{Deserialize, Serialize};
 use serde_json::Value as JsonValue;
@@ -211,12 +212,12 @@ fn ron_to_json(value: &RonValue) -> JsonValue {
 // Preview Asset Tooling Hook
 // ============================================================================
 
-/// Event to request a temporary texture profile preview.
+/// Message to request a temporary texture profile preview.
 ///
 /// Implements the `/visual-assets/preview` contract for tooling.
 /// When received, the system temporarily injects the profile into the manifest
 /// so artists can preview new art without rebuilding the game.
-#[derive(Event, Debug, Clone)]
+#[derive(Message, Debug, Clone)]
 pub struct PreviewVisualAsset {
     /// The profile to preview. Must include a valid `id` field.
     pub profile: VisualAssetProfileContract,
diff --git a/src/systems/textures/loader.rs b/src/systems/textures/loader.rs
index 1766536e..383056cf 100644
--- a/src/systems/textures/loader.rs
+++ b/src/systems/textures/loader.rs
@@ -3,6 +3,7 @@ use std::fmt::{Display, Formatter};
 
 use bevy::asset::io::Reader;
 use bevy::asset::{AssetEvent, AssetLoader, LoadContext};
+use bevy::ecs::message::MessageReader;
 use bevy::prelude::*;
 use bevy::tasks::ConditionalSendFuture;
 use ron::Value as RonValue;
@@ -25,7 +26,7 @@ impl Plugin for TextureManifestPlugin {
         app.init_asset::<RawTextureManifest>();
         app.register_asset_loader(TextureManifestLoader);
         app.init_resource::<TextureManifest>();
-        app.add_event::<PreviewVisualAsset>();
+        app.add_message::<PreviewVisualAsset>();
         app.add_systems(Startup, load_texture_manifest);
         app.add_systems(
             Update,
@@ -238,7 +239,7 @@ fn hydrate_manifest_resource(
     handle: Option<Res<TextureManifestHandle>>,
     assets: Res<Assets<RawTextureManifest>>,
     mut manifest: ResMut<TextureManifest>,
-    mut events: EventReader<AssetEvent<RawTextureManifest>>,
+    mut events: MessageReader<AssetEvent<RawTextureManifest>>,
     mut ready_once: Local<bool>,
 ) {
     let Some(handle) = handle else {
@@ -278,7 +279,7 @@ fn hydrate_manifest_resource(
 /// profiles into the manifest. This allows artists to preview new textures
 /// without modifying the manifest file.
 fn process_preview_requests(
-    mut events: EventReader<PreviewVisualAsset>,
+    mut events: MessageReader<PreviewVisualAsset>,
     mut manifest: ResMut<TextureManifest>,
 ) {
     for event in events.read() {
@@ -315,7 +316,7 @@ fn process_preview_requests(
 
 fn log_manifest_removal(
     handle: Option<Res<TextureManifestHandle>>,
-    mut events: EventReader<AssetEvent<RawTextureManifest>>,
+    mut events: MessageReader<AssetEvent<RawTextureManifest>>,
 ) {
     let Some(handle) = handle else {
         return;
diff --git a/src/systems/textures/materials.rs b/src/systems/textures/materials.rs
index 70cc64f2..ab21c3ce 100644
--- a/src/systems/textures/materials.rs
+++ b/src/systems/textures/materials.rs
@@ -3,6 +3,7 @@
 use super::loader::ObjectClass;
 use std::collections::{HashMap, HashSet};
 
+use bevy::ecs::message::{MessageReader, Messages};
 use bevy::prelude::*;
 use tracing::{debug, info, warn};
 
@@ -23,7 +24,7 @@ impl Plugin for TextureMaterialsPlugin {
             (
                 hydrate_texture_materials,
                 watch_ball_type_changes,
-                set_texture_repeat_mode.run_if(resource_exists::<Events<AssetEvent<Image>>>),
+                set_texture_repeat_mode.run_if(resource_exists::<Messages<AssetEvent<Image>>>),
                 apply_canonical_materials_to_existing_entities,
             ),
         );
@@ -247,7 +248,7 @@ fn initialize_fallback_registry(
 
 fn set_texture_repeat_mode(
     images: Option<ResMut<Assets<Image>>>,
-    mut events: EventReader<AssetEvent<Image>>,
+    mut events: MessageReader<AssetEvent<Image>>,
 ) {
     use bevy::image::{ImageAddressMode, ImageSampler, ImageSamplerDescriptor};
 
diff --git a/src/ui/pause_overlay.rs b/src/ui/pause_overlay.rs
index abe3d514..e581aad8 100644
--- a/src/ui/pause_overlay.rs
+++ b/src/ui/pause_overlay.rs
@@ -4,6 +4,7 @@
 //! It provides functions to spawn and despawn the "PAUSED\nClick to Resume" message.
 
 use bevy::prelude::*;
+use bevy::text::Justify;
 
 use crate::pause::PauseState;
 
@@ -31,7 +32,7 @@ pub fn spawn_pause_overlay(
                 ..default()
             },
             TextColor(Color::WHITE),
-            TextLayout::new_with_justify(JustifyText::Center),
+            TextLayout::new_with_justify(Justify::Center),
             Node {
                 position_type: PositionType::Absolute,
                 width: Val::Percent(100.0),
diff --git a/tests/common/multi_respawn.rs b/tests/common/multi_respawn.rs
index 06ce1a12..eb1c956c 100644
--- a/tests/common/multi_respawn.rs
+++ b/tests/common/multi_respawn.rs
@@ -1,6 +1,6 @@
 use super::tests::{advance_time, ball_handle_at, paddle_handle_at, test_app};
 use super::*;
-use bevy::ecs::event::Events;
+use bevy::ecs::message::Messages;
 use bevy_rapier3d::prelude::CollisionEvent;
 use bevy_rapier3d::rapier::prelude::CollisionEventFlags;
 use std::time::Duration;
@@ -25,8 +25,8 @@ fn sequential_life_losses_complete_in_order() {
     ));
 
     {
-        let mut collisions = app.world_mut().resource_mut::<Events<CollisionEvent>>();
-        collisions.send(CollisionEvent::Started(
+        let mut collisions = app.world_mut().resource_mut::<Messages<CollisionEvent>>();
+        collisions.write(CollisionEvent::Started(
             ball_a,
             lower_goal,
             CollisionEventFlags::SENSOR,
@@ -43,8 +43,8 @@ fn sequential_life_losses_complete_in_order() {
     }
 
     {
-        let mut collisions = app.world_mut().resource_mut::<Events<CollisionEvent>>();
-        collisions.send(CollisionEvent::Started(
+        let mut collisions = app.world_mut().resource_mut::<Messages<CollisionEvent>>();
+        collisions.write(CollisionEvent::Started(
             ball_b,
             lower_goal,
             CollisionEventFlags::SENSOR,
@@ -78,7 +78,7 @@ fn sequential_life_losses_complete_in_order() {
         assert_eq!(schedule.pending.as_ref().unwrap().lost_ball, ball_b);
     }
 
-    let completions = app.world().resource::<Events<RespawnCompleted>>();
+    let completions = app.world().resource::<Messages<RespawnCompleted>>();
     assert!(
         !completions.is_empty(),
         "expected at least one respawn completion event"
@@ -110,8 +110,8 @@ fn game_over_halts_additional_respawns() {
     ));
 
     {
-        let mut collisions = app.world_mut().resource_mut::<Events<CollisionEvent>>();
-        collisions.send(CollisionEvent::Started(
+        let mut collisions = app.world_mut().resource_mut::<Messages<CollisionEvent>>();
+        collisions.write(CollisionEvent::Started(
             ball_a,
             lower_goal,
             CollisionEventFlags::SENSOR,
@@ -126,8 +126,8 @@ fn game_over_halts_additional_respawns() {
     }
 
     {
-        let mut collisions = app.world_mut().resource_mut::<Events<CollisionEvent>>();
-        collisions.send(CollisionEvent::Started(
+        let mut collisions = app.world_mut().resource_mut::<Messages<CollisionEvent>>();
+        collisions.write(CollisionEvent::Started(
             ball_b,
             lower_goal,
             CollisionEventFlags::SENSOR,
@@ -144,7 +144,7 @@ fn game_over_halts_additional_respawns() {
         assert_eq!(schedule.pending.as_ref().unwrap().lost_ball, ball_a);
     }
 
-    let game_over_events = app.world().resource::<Events<GameOverRequested>>();
+    let game_over_events = app.world().resource::<Messages<GameOverRequested>>();
     assert!(
         !game_over_events.is_empty(),
         "expected GameOverRequested to fire when lives hit zero"
diff --git a/tests/common/respawn_timer.rs b/tests/common/respawn_timer.rs
index 6768f37b..f62b50fa 100644
--- a/tests/common/respawn_timer.rs
+++ b/tests/common/respawn_timer.rs
@@ -1,6 +1,6 @@
 use super::tests::{advance_time, ball_handle_at, paddle_handle_at, test_app};
 use super::*;
-use bevy::ecs::event::Events;
+use bevy::ecs::message::Messages;
 use bevy_rapier3d::prelude::{CollisionEvent, Velocity};
 use bevy_rapier3d::rapier::prelude::CollisionEventFlags;
 use std::time::Duration;
@@ -25,8 +25,8 @@ fn spawn_respawn_fixture(app: &mut App) -> (Entity, Entity, Entity) {
 
 fn trigger_life_loss(app: &mut App, ball: Entity, lower_goal: Entity) {
     app.world_mut()
-        .resource_mut::<Events<CollisionEvent>>()
-        .send(CollisionEvent::Started(
+        .resource_mut::<Messages<CollisionEvent>>()
+        .write(CollisionEvent::Started(
             ball,
             lower_goal,
             CollisionEventFlags::SENSOR,
@@ -50,7 +50,7 @@ fn respawn_timer_finishes_within_frame_tolerance() {
         let mut schedule = app.world_mut().resource_mut::<RespawnSchedule>();
         schedule.timer.tick(total_duration - frame_tolerance);
         assert!(
-            !schedule.timer.finished(),
+            !schedule.timer.is_finished(),
             "timer should remain pending right before frame tolerance boundary",
         );
     }
@@ -82,7 +82,7 @@ fn respawn_timer_finishes_within_frame_tolerance() {
         );
     }
 
-    let completions = app.world().resource::<Events<RespawnCompleted>>();
+    let completions = app.world().resource::<Messages<RespawnCompleted>>();
     assert!(
         !completions.is_empty(),
         "respawn completion event should fire when timer elapses",
@@ -109,12 +109,15 @@ fn ball_remains_frozen_until_launch_unlock() {
     advance_time(&mut app, 0.0);
     app.update();
 
-    let respawned_ball = app
-        .world()
-        .iter_entities()
-        .find(|entity| entity.contains::<Ball>() && entity.contains::<BallFrozen>())
-        .map(|entity| entity.id())
-        .expect("respawned ball should exist");
+    let respawned_ball = {
+        let mut query = app
+            .world_mut()
+            .query_filtered::<Entity, (With<Ball>, With<BallFrozen>)>();
+        query
+            .iter(app.world())
+            .next()
+            .expect("respawned ball should exist")
+    };
 
     {
         let world = app.world();
@@ -161,12 +164,16 @@ fn ball_remains_frozen_until_launch_unlock() {
     }
 
     {
+        let overlay_entity = {
+            let mut query = app
+                .world_mut()
+                .query_filtered::<Entity, With<RespawnFadeOverlay>>();
+            query
+                .iter(app.world())
+                .next()
+                .expect("respawn overlay should exist while visual state is active")
+        };
         let world = app.world_mut();
-        let overlay_entity = world
-            .iter_entities()
-            .find(|entity| entity.contains::<RespawnFadeOverlay>())
-            .map(|entity| entity.id())
-            .expect("respawn overlay should exist while visual state is active");
         let mut entity = world.entity_mut(overlay_entity);
         let mut overlay = entity
             .get_mut::<RespawnFadeOverlay>()
diff --git a/tests/common/respawn_visual.rs b/tests/common/respawn_visual.rs
index c7174699..761db81b 100644
--- a/tests/common/respawn_visual.rs
+++ b/tests/common/respawn_visual.rs
@@ -1,6 +1,7 @@
 use super::tests::{advance_time, test_app};
 use super::*;
-use bevy::ecs::event::Events;
+use bevy::ecs::entity::EntityRow;
+use bevy::ecs::message::Messages;
 use bevy_rapier3d::prelude::{ExternalImpulse, Velocity};
 use std::time::Duration;
 
@@ -9,9 +10,9 @@ fn overlay_spawns_on_respawn_schedule() {
     let mut app = test_app();
 
     {
-        let mut events = app.world_mut().resource_mut::<Events<RespawnScheduled>>();
-        events.send(RespawnScheduled {
-            ball: Entity::from_raw(1),
+        let mut events = app.world_mut().resource_mut::<Messages<RespawnScheduled>>();
+        events.write(RespawnScheduled {
+            ball: Entity::from_row(EntityRow::from_raw_u32(1).unwrap()),
             paddle: None,
             completes_at: 0.0,
             remaining_lives: 3,
@@ -20,10 +21,12 @@ fn overlay_spawns_on_respawn_schedule() {
 
     app.update();
 
-    let overlay_exists = app
-        .world()
-        .iter_entities()
-        .any(|entity| entity.contains::<RespawnFadeOverlay>());
+    let overlay_exists = {
+        let mut query = app
+            .world_mut()
+            .query_filtered::<Entity, With<RespawnFadeOverlay>>();
+        query.iter(app.world()).next().is_some()
+    };
     assert!(
         overlay_exists,
         "respawn overlay should spawn when schedule event fires"
@@ -46,8 +49,8 @@ fn controls_wait_until_overlay_finishes() {
         .id();
 
     {
-        let mut events = app.world_mut().resource_mut::<Events<RespawnScheduled>>();
-        events.send(RespawnScheduled {
+        let mut events = app.world_mut().resource_mut::<Messages<RespawnScheduled>>();
+        events.write(RespawnScheduled {
             ball,
             paddle: Some(paddle),
             completes_at: 0.0,
@@ -72,12 +75,15 @@ fn controls_wait_until_overlay_finishes() {
     }
 
     // Finish overlay timer and ensure control unlocks afterwards.
-    let overlay_entity = app
-        .world()
-        .iter_entities()
-        .find(|entity| entity.contains::<RespawnFadeOverlay>())
-        .map(|entity| entity.id())
-        .expect("overlay entity should exist");
+    let overlay_entity = {
+        let mut query = app
+            .world_mut()
+            .query_filtered::<Entity, With<RespawnFadeOverlay>>();
+        query
+            .iter(app.world())
+            .next()
+            .expect("overlay entity should exist")
+    };
     {
         let world = app.world_mut();
         let mut entity = world.entity_mut(overlay_entity);
diff --git a/tests/integration_transition.rs b/tests/integration_transition.rs
index 027be632..2c03adb3 100644
--- a/tests/integration_transition.rs
+++ b/tests/integration_transition.rs
@@ -1,7 +1,6 @@
 //! Integration test scaffolds for level transition and compatibility behaviors.
 //! Currently focuses on state resource evolution; future work will exercise full ECS flows.
 
-use bevy::prelude::*;
 use brkrs::level_loader::LevelAdvanceState;
 
 // NOTE: Full system invocation (advance_level_when_cleared -> handle_level_advance_delay -> finalize_level_advance)
@@ -27,7 +26,6 @@ fn transition_two_stage_unfreeze_future() {
     // 3. Step frames while checking LevelAdvanceState.unfreezing flag
     // 4. Assert ball entity loses BallFrozen then (next frame) has zeroed Velocity then impulse applied
     // For now, ignored.
-    assert!(true);
 }
 
 #[test]
@@ -35,5 +33,4 @@ fn transition_two_stage_unfreeze_future() {
 fn backward_compat_warning_future() {
     // Placeholder: will load synthetic 22x22 matrix via direct function call or temporary file
     // and capture logs using a tracing subscriber capturing warn! output.
-    assert!(true);
 }
diff --git a/tests/level_switcher.rs b/tests/level_switcher.rs
index 9acc4d8f..46bd7386 100644
--- a/tests/level_switcher.rs
+++ b/tests/level_switcher.rs
@@ -32,7 +32,7 @@ fn initialize_level_systems(app: &mut App) {
 }
 
 fn trigger_level_switch(app: &mut App) {
-    app.world_mut().send_event(LevelSwitchRequested {
+    app.world_mut().write_message(LevelSwitchRequested {
         source: LevelSwitchSource::Keyboard,
     });
     // First update processes the event and queues commands.
diff --git a/tests/respawn_timer.rs b/tests/respawn_timer.rs
index 03d59a4a..a6a8f3e3 100644
--- a/tests/respawn_timer.rs
+++ b/tests/respawn_timer.rs
@@ -1,5 +1,5 @@
 use bevy::app::App;
-use bevy::ecs::event::Events;
+use bevy::ecs::message::Messages;
 use bevy::prelude::*;
 use bevy::MinimalPlugins;
 use bevy_rapier3d::prelude::{CollisionEvent, Velocity};
@@ -18,7 +18,7 @@ fn test_app() -> App {
     app.add_plugins(MinimalPlugins)
         .insert_resource(Assets::<Mesh>::default())
         .insert_resource(Assets::<StandardMaterial>::default())
-        .add_event::<CollisionEvent>()
+        .add_message::<CollisionEvent>()
         .add_plugins(RespawnPlugin);
     {
         let mut spawn_points = app.world_mut().resource_mut::<SpawnPoints>();
@@ -67,8 +67,8 @@ fn spawn_respawn_fixture(app: &mut App) -> (Entity, Entity, Entity) {
 
 fn trigger_life_loss(app: &mut App, ball: Entity, lower_goal: Entity) {
     app.world_mut()
-        .resource_mut::<Events<CollisionEvent>>()
-        .send(CollisionEvent::Started(
+        .resource_mut::<Messages<CollisionEvent>>()
+        .write(CollisionEvent::Started(
             ball,
             lower_goal,
             CollisionEventFlags::SENSOR,
@@ -92,7 +92,7 @@ fn respawn_timer_finishes_within_frame_tolerance() {
         let mut schedule = app.world_mut().resource_mut::<RespawnSchedule>();
         schedule.timer.tick(total_duration - frame_tolerance);
         assert!(
-            !schedule.timer.finished(),
+            !schedule.timer.is_finished(),
             "timer should remain pending right before frame tolerance boundary",
         );
     }
@@ -124,7 +124,7 @@ fn respawn_timer_finishes_within_frame_tolerance() {
         );
     }
 
-    let completions = app.world().resource::<Events<RespawnCompleted>>();
+    let completions = app.world().resource::<Messages<RespawnCompleted>>();
     assert!(
         !completions.is_empty(),
         "respawn completion event should fire when timer elapses",
@@ -151,12 +151,15 @@ fn ball_remains_frozen_until_launch_unlock() {
     advance_time(&mut app, 0.0);
     app.update();
 
-    let respawned_ball = app
-        .world()
-        .iter_entities()
-        .find(|entity| entity.contains::<Ball>() && entity.contains::<BallFrozen>())
-        .map(|entity| entity.id())
-        .expect("respawned ball should exist");
+    let respawned_ball = {
+        let mut query = app
+            .world_mut()
+            .query_filtered::<Entity, (With<Ball>, With<BallFrozen>)>();
+        query
+            .iter(app.world())
+            .next()
+            .expect("respawned ball should exist")
+    };
 
     {
         let world = app.world();
@@ -189,12 +192,16 @@ fn ball_remains_frozen_until_launch_unlock() {
     }
 
     {
+        let overlay_entity = {
+            let mut query = app
+                .world_mut()
+                .query_filtered::<Entity, With<RespawnFadeOverlay>>();
+            query
+                .iter(app.world())
+                .next()
+                .expect("respawn overlay should exist while fade is active")
+        };
         let world = app.world_mut();
-        let overlay_entity = world
-            .iter_entities()
-            .find(|entity| entity.contains::<RespawnFadeOverlay>())
-            .map(|entity| entity.id())
-            .expect("respawn overlay should exist while fade is active");
         {
             let mut entity = world.entity_mut(overlay_entity);
             let mut overlay = entity
diff --git a/tests/respawn_visual.rs b/tests/respawn_visual.rs
index 6ed8fcc0..c10c0044 100644
--- a/tests/respawn_visual.rs
+++ b/tests/respawn_visual.rs
@@ -1,5 +1,6 @@
 use bevy::app::App;
-use bevy::ecs::event::Events;
+use bevy::ecs::entity::EntityRow;
+use bevy::ecs::message::Messages;
 use bevy::prelude::*;
 use bevy::time::Time;
 use bevy::MinimalPlugins;
@@ -18,7 +19,7 @@ fn test_app() -> App {
     app.add_plugins(MinimalPlugins)
         .insert_resource(Assets::<Mesh>::default())
         .insert_resource(Assets::<StandardMaterial>::default())
-        .add_event::<CollisionEvent>()
+        .add_message::<CollisionEvent>()
         .add_plugins(RespawnPlugin);
     {
         let mut spawn_points = app.world_mut().resource_mut::<SpawnPoints>();
@@ -34,8 +35,8 @@ fn advance_time(app: &mut App, delta_secs: f32) {
 }
 
 fn send_respawn_event(app: &mut App, ball: Entity, paddle: Option<Entity>) {
-    let mut events = app.world_mut().resource_mut::<Events<RespawnScheduled>>();
-    events.send(RespawnScheduled {
+    let mut events = app.world_mut().resource_mut::<Messages<RespawnScheduled>>();
+    events.write(RespawnScheduled {
         ball,
         paddle,
         completes_at: 0.0,
@@ -44,12 +45,15 @@ fn send_respawn_event(app: &mut App, ball: Entity, paddle: Option<Entity>) {
 }
 
 fn finish_overlay_timer(app: &mut App) {
-    let overlay_entity = app
-        .world()
-        .iter_entities()
-        .find(|entity| entity.contains::<RespawnFadeOverlay>())
-        .map(|entity| entity.id())
-        .expect("respawn overlay should exist");
+    let overlay_entity = {
+        let mut query = app
+            .world_mut()
+            .query_filtered::<Entity, With<RespawnFadeOverlay>>();
+        query
+            .iter(app.world())
+            .next()
+            .expect("respawn overlay should exist")
+    };
     let duration = {
         let world = app.world();
         world
@@ -67,28 +71,33 @@ fn finish_overlay_timer(app: &mut App) {
         .tick(duration + Duration::from_millis(100));
 }
 
-fn overlay_exists(app: &App) -> bool {
-    app.world()
-        .iter_entities()
-        .any(|entity| entity.contains::<RespawnFadeOverlay>())
+fn overlay_exists(app: &mut App) -> bool {
+    let mut query = app
+        .world_mut()
+        .query_filtered::<Entity, With<RespawnFadeOverlay>>();
+    query.iter(app.world()).next().is_some()
 }
 
 #[test]
 fn overlay_spawns_and_clears_after_duration() {
     let mut app = test_app();
 
-    send_respawn_event(&mut app, Entity::from_raw(1), None);
+    send_respawn_event(
+        &mut app,
+        Entity::from_row(EntityRow::from_raw_u32(1).unwrap()),
+        None,
+    );
     advance_time(&mut app, 0.016);
     app.update();
 
-    assert!(overlay_exists(&app));
+    assert!(overlay_exists(&mut app));
     assert!(app.world().resource::<RespawnVisualState>().is_active());
 
     finish_overlay_timer(&mut app);
     advance_time(&mut app, 0.0);
     app.update();
 
-    assert!(!overlay_exists(&app));
+    assert!(!overlay_exists(&mut app));
     assert!(
         !app.world().resource::<RespawnVisualState>().is_active(),
         "visual state should clear once overlay despawns",