diff --git a/Cargo.lock b/Cargo.lock
index c177fca24..34a9a26f8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -20,24 +20,24 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046"
 
 [[package]]
 name = "accesskit"
-version = "0.11.2"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76eb1adf08c5bcaa8490b9851fd53cca27fa9880076f178ea9d29f05196728a8"
+checksum = "6cb10ed32c63247e4e39a8f42e8e30fb9442fbf7878c8e4a9849e7e381619bea"
 
 [[package]]
 name = "accesskit_consumer"
-version = "0.15.2"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04bb4d9e4772fe0d47df57d0d5dbe5d85dd05e2f37ae1ddb6b105e76be58fb00"
+checksum = "8c17cca53c09fbd7288667b22a201274b9becaa27f0b91bf52a526db95de45e6"
 dependencies = [
  "accesskit",
 ]
 
 [[package]]
 name = "accesskit_macos"
-version = "0.9.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134d0acf6acb667c89d3332999b1a5df4edbc8d6113910f392ebb73f2b03bb56"
+checksum = "cd3b6ae1eabbfbced10e840fd3fce8a93ae84f174b3e4ba892ab7bcb42e477a7"
 dependencies = [
  "accesskit",
  "accesskit_consumer",
@@ -47,23 +47,23 @@ dependencies = [
 
 [[package]]
 name = "accesskit_windows"
-version = "0.14.3"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9eac0a7f2d7cd7a93b938af401d3d8e8b7094217989a7c25c55a953023436e31"
+checksum = "afcae27ec0974fc7c3b0b318783be89fd1b2e66dd702179fe600166a38ff4a0b"
 dependencies = [
  "accesskit",
  "accesskit_consumer",
- "arrayvec",
  "once_cell",
  "paste",
+ "static_assertions",
  "windows 0.48.0",
 ]
 
 [[package]]
 name = "accesskit_winit"
-version = "0.14.4"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "825d23acee1bd6d25cbaa3ca6ed6e73faf24122a774ec33d52c5c86c6ab423c0"
+checksum = "88e39fcec2e10971e188730b7a76bab60647dacc973d4591855ebebcadfaa738"
 dependencies = [
  "accesskit",
  "accesskit_macos",
@@ -470,6 +470,12 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "arrayref"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
+
 [[package]]
 name = "arrayvec"
 version = "0.7.4"
@@ -510,6 +516,16 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "async-broadcast"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b"
+dependencies = [
+ "event-listener 2.5.3",
+ "futures-core",
+]
+
 [[package]]
 name = "async-channel"
 version = "1.9.0"
@@ -561,6 +577,18 @@ dependencies = [
  "slab",
 ]
 
+[[package]]
+name = "async-fs"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06"
+dependencies = [
+ "async-lock 2.8.0",
+ "autocfg",
+ "blocking",
+ "futures-lite 1.13.0",
+]
+
 [[package]]
 name = "async-global-executor"
 version = "2.4.1"
@@ -798,18 +826,18 @@ dependencies = [
 
 [[package]]
 name = "bevy"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91c6d3ec4f89e85294dc97334c5b271ddc301fdf67ac9bb994fe44d9273e6ed7"
+checksum = "e4bc7e09282a82a48d70ade0c4c1154b0fd7882a735a39c66766a5d0f4718ea9"
 dependencies = [
  "bevy_internal",
 ]
 
 [[package]]
 name = "bevy_a11y"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "132c9e35a77c5395951f6d25fa2c52ee92296353426df4f961e60f3ff47e2e42"
+checksum = "68080288c932634f6563d3a8299efe0ddc9ea6787539c4c771ba250d089a94f0"
 dependencies = [
  "accesskit",
  "bevy_app",
@@ -819,9 +847,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_animation"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f44eae3f1c35a87e38ad146f72317f19ce7616dad8bbdfb88ee752c1282d28c5"
+checksum = "7aa37683b1281e1ba8cf285644e6e3f0704f14b3901c5ee282067ff7ff6f4a56"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -838,9 +866,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_app"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f557a7d59e1e16892d7544fc37316506ee598cb5310ef0365125a30783c11531"
+checksum = "d41731817993f92e4363dd3335558e779e290bc71eefc0b5547052b85810907e"
 dependencies = [
  "bevy_derive",
  "bevy_ecs",
@@ -854,26 +882,29 @@ dependencies = [
 
 [[package]]
 name = "bevy_asset"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9714af523da4cdf58c42a317e5ed40349708ad954a18533991fd64c8ae0a6f68"
+checksum = "935984568f75867dd7357133b06f4b1502cd2be55e4642d483ce597e46e63bff"
 dependencies = [
- "anyhow",
- "async-channel 1.9.0",
+ "async-broadcast",
+ "async-fs",
+ "async-lock 2.8.0",
  "bevy_app",
- "bevy_diagnostic",
+ "bevy_asset_macros",
  "bevy_ecs",
  "bevy_log",
  "bevy_reflect",
  "bevy_tasks",
  "bevy_utils",
  "bevy_winit",
+ "blake3",
  "crossbeam-channel",
  "downcast-rs",
- "fastrand 1.9.0",
+ "futures-io",
+ "futures-lite 1.13.0",
  "js-sys",
- "notify",
  "parking_lot 0.12.1",
+ "ron",
  "serde",
  "thiserror",
  "wasm-bindgen",
@@ -881,13 +912,24 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "bevy_asset_macros"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f48b9bbe4ec605e4910b5cd1e1a0acbfbe0b80af5f3bcc4489a9fdd1e80058c"
+dependencies = [
+ "bevy_macro_utils",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.50",
+]
+
 [[package]]
 name = "bevy_audio"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4de308bd63a2f7a0b77ffeb7cf00cc185ec01393c5db2091fe03964f97152749"
+checksum = "18a69889e1bfa4dbac4e641536b94f91c441da55796ad9832e77836b8264688b"
 dependencies = [
- "anyhow",
  "bevy_app",
  "bevy_asset",
  "bevy_derive",
@@ -897,15 +939,14 @@ dependencies = [
  "bevy_transform",
  "bevy_utils",
  "oboe",
- "parking_lot 0.12.1",
  "rodio",
 ]
 
 [[package]]
 name = "bevy_core"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d5272321be5fcf5ce2fb16023bc825bb10dfcb71611117296537181ce950f48"
+checksum = "3daa24502a14839509f02407bc7e48299fe84d260877de23b60662de0f4f4b6c"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -918,15 +959,16 @@ dependencies = [
 
 [[package]]
 name = "bevy_core_pipeline"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67382fa9c96ce4f4e5833ed7cedd9886844a8f3284b4a717bd4ac738dcdea0c3"
+checksum = "b4b77c4fca6e90edbe2e72da7bc9aa7aed7dfdfded0920ae0a0c845f5e11084a"
 dependencies = [
  "bevy_app",
  "bevy_asset",
  "bevy_core",
  "bevy_derive",
  "bevy_ecs",
+ "bevy_log",
  "bevy_math",
  "bevy_reflect",
  "bevy_render",
@@ -939,9 +981,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_derive"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44e4e2784a81430199e4157e02903a987a32127c773985506f020e7d501b62e"
+checksum = "f484318350462c58ba3942a45a656c1fd6b6e484a6b6b7abc3a787ad1a51e500"
 dependencies = [
  "bevy_macro_utils",
  "quote",
@@ -950,9 +992,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_diagnostic"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6babb230dc383c98fdfc9603e3a7a2a49e1e2879dbe8291059ef37dca897932e"
+checksum = "fa38ca5967d335cc1006a0e0f1a86c350e2f15fd1878449f61d04cd57a7c4060"
 dependencies = [
  "bevy_app",
  "bevy_core",
@@ -965,9 +1007,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_ecs"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "266144b36df7e834d5198049e037ecdf2a2310a76ce39ed937d1b0a6a2c4e8c6"
+checksum = "7709fbd22f81fb681534cd913c41e1cd18b17143368743281195d7f024b61aea"
 dependencies = [
  "async-channel 1.9.0",
  "bevy_ecs_macros",
@@ -986,9 +1028,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_ecs_macros"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7157a9c3be038d5008ee3f114feb6cf6b39c1d3d32ee21a7cacb8f81fccdfa80"
+checksum = "a8843aa489f159f25cdcd9fee75cd7d221a7098a71eaa72cb2d6b40ac4e3f1ba"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
@@ -998,9 +1040,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_encase_derive"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0ac0f55ad6bca1be7b0f35bbd5fc95ed3d31e4e9db158fee8e5327f59006001"
+checksum = "5328a3715e933ebbff07d0e99528dc423c4f7a53590ed1ac19a120348b028990"
 dependencies = [
  "bevy_macro_utils",
  "encase_derive_impl",
@@ -1008,9 +1050,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_gilrs"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65f4d79c55829f8016014593a42453f61a564ffb06ef79460d25696ccdfac67b"
+checksum = "9b81ca2ebf66cbc7f998f1f142b15038ffe3c4ae1d51f70adda26dcf51b0c4ca"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -1024,9 +1066,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_gizmos"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e286a3e7276431963f4aa29165ea5429fa7dbbc6d5c5ba0c531e7dd44ecc88a2"
+checksum = "db232274ddca2ae452eb2731b98267b795d133ddd14013121bc7daddde1c7491"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -1044,11 +1086,10 @@ dependencies = [
 
 [[package]]
 name = "bevy_gltf"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f07494a733dca032e71a20f4b1f423de765da49cbff34406ae6cd813f9b50c41"
+checksum = "85adc6b1fc86687bf67149e0bafaa4d6da432232fa956472d1b37f19121d3ace"
 dependencies = [
- "anyhow",
  "base64 0.13.1",
  "bevy_animation",
  "bevy_app",
@@ -1075,9 +1116,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_hierarchy"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "103f8f58416ac6799b8c7f0b418f1fac9eba44fa924df3b0e16b09256b897e3d"
+checksum = "06bd477152ce2ae1430f5e0a4f19216e5785c22fee1ab23788b5982dc59d1a55"
 dependencies = [
  "bevy_app",
  "bevy_core",
@@ -1090,9 +1131,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_input"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffbd935401101ac8003f3c3aea70788c65ad03f7a32716a10608bedda7a648bc"
+checksum = "cab9a599189b2a694c182d60cd52219dd9364f9892ff542d87799b8e45d9e6dc"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -1104,9 +1145,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_internal"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0e35a9b2bd29aa784b3cc416bcbf2a298f69f00ca51fd042ea39d9af7fad37e"
+checksum = "f124bece9831afd80897815231072d51bfe3ac58c6bb58eca8880963b6d0487c"
 dependencies = [
  "bevy_a11y",
  "bevy_animation",
@@ -1143,22 +1184,23 @@ dependencies = [
 
 [[package]]
 name = "bevy_kira_audio"
-version = "0.16.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fc50583e632d0173437cb618077f957c1eb7a9eef9bce107fbf9f90b22e4f84"
+checksum = "9a9678086759e54871faab0829592423492e19f8de5076127315cf892ae56f33"
 dependencies = [
  "anyhow",
  "bevy",
  "kira",
  "parking_lot 0.12.1",
  "thiserror",
+ "uuid",
 ]
 
 [[package]]
 name = "bevy_log"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07dcc615ff4f617b06c3f9522fca3c55d56f9644db293318f8ab68fcdea5d4fe"
+checksum = "0dc10ba1d225a8477b9e80a1bf797d8a8b8274e83c9b24fb4d9351aec9229755"
 dependencies = [
  "android_log-sys",
  "bevy_app",
@@ -1172,21 +1214,22 @@ dependencies = [
 
 [[package]]
 name = "bevy_macro_utils"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23ddc18d489b4e57832d4958cde7cd2f349f0ad91e5892ac9e2f2ee16546b981"
+checksum = "e566640c6b6dced73d2006c764c2cffebe1a82be4809486c4a5d7b4b50efed4d"
 dependencies = [
+ "proc-macro2",
  "quote",
  "rustc-hash",
  "syn 2.0.50",
- "toml_edit",
+ "toml_edit 0.20.7",
 ]
 
 [[package]]
 name = "bevy_math"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78286a81fead796dc4b45ab14f4f02fe29a94423d3587bcfef872b2a8e0a474b"
+checksum = "58ddc2b76783939c530178f88e5711a1b01044d7b02db4033e2eb8b43b6cf4ec"
 dependencies = [
  "glam 0.24.2",
  "serde",
@@ -1194,18 +1237,18 @@ dependencies = [
 
 [[package]]
 name = "bevy_mikktspace"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6cfc2a21ea47970a9b1f0f4735af3256a8f204815bd756110051d10f9d909497"
+checksum = "8ec4962977a746d870170532fc92759e04d3dbcae8b7b82e7ca3bb83b1d75277"
 dependencies = [
  "glam 0.24.2",
 ]
 
 [[package]]
 name = "bevy_pbr"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63ca796a619e61cd43a0a3b11fde54644f7f0732a1fba1eef5d406248c6eba85"
+checksum = "520bfd2a898c74f84ea52cfb8eb061f37373ad15e623489d5f75d27ebd6138fe"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -1220,21 +1263,24 @@ dependencies = [
  "bevy_window",
  "bitflags 2.4.2",
  "bytemuck",
+ "fixedbitset",
  "naga_oil",
  "radsort",
+ "smallvec",
+ "thread_local",
 ]
 
 [[package]]
 name = "bevy_ptr"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72c7586401a46f7d8e436028225c1df5288f2e0082d066b247a82466fea155c6"
+checksum = "c77ec20c8fafcdc196508ef5ccb4f0400a8d193cb61f7b14a36ed9a25ad423cf"
 
 [[package]]
 name = "bevy_reflect"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0778197a1eb3e095a71417c74b7152ede02975cdc95b5ea4ddc5251ed00a2eb5"
+checksum = "d7921f15fc944c9c8ad01d7dbcea6505b8909c6655cd9382bab1407181556038"
 dependencies = [
  "bevy_math",
  "bevy_ptr",
@@ -1243,8 +1289,6 @@ dependencies = [
  "downcast-rs",
  "erased-serde",
  "glam 0.24.2",
- "once_cell",
- "parking_lot 0.12.1",
  "serde",
  "smallvec",
  "smol_str",
@@ -1253,12 +1297,11 @@ dependencies = [
 
 [[package]]
 name = "bevy_reflect_derive"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "342a4b2d09db22c48607d23ad59a056aff1ee004549050a51d490d375ba29528"
+checksum = "b4a8c5475f216e751ef4452a1306b00711f33d2d04d9f149e4c845dfeb6753a0"
 dependencies = [
  "bevy_macro_utils",
- "bit-set",
  "proc-macro2",
  "quote",
  "syn 2.0.50",
@@ -1267,11 +1310,10 @@ dependencies = [
 
 [[package]]
 name = "bevy_render"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39df4824b760928c27afc7b00fb649c7a63c9d76661ab014ff5c86537ee906cb"
+checksum = "bdefdd3737125b0d94a6ff20bb70fa8cfe9d7d5dcd72ba4dfe6c5f1d30d9f6e4"
 dependencies = [
- "anyhow",
  "async-channel 1.9.0",
  "bevy_app",
  "bevy_asset",
@@ -1302,8 +1344,6 @@ dependencies = [
  "ktx2",
  "naga",
  "naga_oil",
- "parking_lot 0.12.1",
- "regex",
  "ruzstd",
  "serde",
  "smallvec",
@@ -1312,14 +1352,13 @@ dependencies = [
  "wasm-bindgen",
  "web-sys",
  "wgpu",
- "wgpu-hal",
 ]
 
 [[package]]
 name = "bevy_render_macros"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bd08c740aac73363e32fb45af869b10cec65bcb76fe3e6cd0f8f7eebf4c36c9"
+checksum = "64d86bfc5a1e7fbeeaec0c4ceab18155530f5506624670965db3415f75826bea"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
@@ -1329,11 +1368,10 @@ dependencies = [
 
 [[package]]
 name = "bevy_scene"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd47e1263506153bef3a8be97fe2d856f206d315668c4f97510ca6cc181d9681"
+checksum = "e7df078b5e406e37c8a1c6ba0d652bf105fde713ce3c3efda7263fe27467eee5"
 dependencies = [
- "anyhow",
  "bevy_app",
  "bevy_asset",
  "bevy_derive",
@@ -1351,9 +1389,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_sprite"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a8ca824fad75c6ef74cfbbba0a4ce3ccc435fa23d6bf3f003f260548813397"
+checksum = "c7cc0c9d946e17e3e0aaa202f182837bc796c4f862b2e5a805134f873f21cf7f"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -1370,15 +1408,16 @@ dependencies = [
  "bytemuck",
  "fixedbitset",
  "guillotiere",
+ "radsort",
  "rectangle-pack",
  "thiserror",
 ]
 
 [[package]]
 name = "bevy_tasks"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c73bbb847c83990d3927005090df52f8ac49332e1643d2ad9aac3cd2974e66bf"
+checksum = "f4fefa7fe0da8923525f7500e274f1bd60dbd79918a25cf7d0dfa0a6ba15c1cf"
 dependencies = [
  "async-channel 1.9.0",
  "async-executor",
@@ -1390,12 +1429,11 @@ dependencies = [
 
 [[package]]
 name = "bevy_text"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "692288ab7b0a9f8b38058964c52789fc6bcb63703b23de51cce90ec41bfca355"
+checksum = "3a9a79d49ca06170d69149949b134c14e8b99ace1444c1ca2cd4743b19d5b055"
 dependencies = [
  "ab_glyph",
- "anyhow",
  "bevy_app",
  "bevy_asset",
  "bevy_ecs",
@@ -1413,9 +1451,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_time"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d58d6dbae9c8225d8c0e0f04d2c5dbb71d22adc01ecd5ab3cebc364139e4a6d"
+checksum = "e6250d76eed3077128b6a3d004f9f198b01107800b9824051e32bb658054e837"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -1427,22 +1465,23 @@ dependencies = [
 
 [[package]]
 name = "bevy_transform"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b9b0ac0149a57cd846cb357a35fc99286f9848e53d4481954608ac9552ed2d4"
+checksum = "d541e0c292edbd96afae816ee680e02247422423ccd5dc635c1e211a20ed64be"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
  "bevy_hierarchy",
  "bevy_math",
  "bevy_reflect",
+ "thiserror",
 ]
 
 [[package]]
 name = "bevy_ui"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59b6d295a755e5b79e869a09e087029d72974562a521ec7ccfba7141fa948a32"
+checksum = "d785e3b75dabcb2a8ad0d50933f8f3446d59e512cabc2d2a145e28c2bb8792ba"
 dependencies = [
  "bevy_a11y",
  "bevy_app",
@@ -1470,15 +1509,16 @@ dependencies = [
 
 [[package]]
 name = "bevy_utils"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d9484e32434ea84dc548cff246ce0c6f756c1336f5ea03f24ac120a48595c7"
+checksum = "7915222f4a08ccc782e08d10b751b42e5f9d786e697d0cb3fd09333cb7e8b6ea"
 dependencies = [
  "ahash 0.8.9",
  "bevy_utils_proc_macros",
  "getrandom",
  "hashbrown 0.14.3",
  "instant",
+ "nonmax",
  "petgraph",
  "thiserror",
  "tracing",
@@ -1487,9 +1527,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_utils_proc_macros"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5391b242c36f556db01d5891444730c83aa9dd648b6a8fd2b755d22cb3bddb57"
+checksum = "7aafecc952b6b8eb1a93c12590bd867d25df2f4ae1033a01dfdfc3c35ebccfff"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1498,10 +1538,11 @@ dependencies = [
 
 [[package]]
 name = "bevy_window"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd584c0da7c4ada6557b09f57f30fb7cff21ccedc641473fc391574b4c9b7944"
+checksum = "41ee72bf7f974000e9b31bb971a89387f1432ba9413f35c4fef59fef49767260"
 dependencies = [
+ "bevy_a11y",
  "bevy_app",
  "bevy_ecs",
  "bevy_input",
@@ -1513,9 +1554,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_winit"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfdc044abdb95790c20053e6326760f0a2985f0dcd78613d397bf35f16039d53"
+checksum = "1eb71f287eca9006dda998784c7b931e400ae2cc4c505da315882a8b082f21ad"
 dependencies = [
  "accesskit_winit",
  "approx",
@@ -1605,6 +1646,19 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "blake3"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87"
+dependencies = [
+ "arrayref",
+ "arrayvec",
+ "cc",
+ "cfg-if",
+ "constant_time_eq",
+]
+
 [[package]]
 name = "block"
 version = "0.1.6"
@@ -1950,6 +2004,12 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "87ca1caa64ef4ed453e68bb3db612e51cf1b2f5b871337f0fcab1c8f87cc3dff"
 
+[[package]]
+name = "constant_time_eq"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
+
 [[package]]
 name = "constgebra"
 version = "0.1.3"
@@ -2001,7 +2061,7 @@ dependencies = [
  "bitflags 1.3.2",
  "core-foundation",
  "core-graphics-types",
- "foreign-types",
+ "foreign-types 0.3.2",
  "libc",
 ]
 
@@ -2197,12 +2257,12 @@ dependencies = [
 
 [[package]]
 name = "d3d12"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da"
+checksum = "e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20"
 dependencies = [
- "bitflags 1.3.2",
- "libloading 0.7.4",
+ "bitflags 2.4.2",
+ "libloading 0.8.1",
  "winapi",
 ]
 
@@ -2463,6 +2523,7 @@ dependencies = [
  "de_types",
  "futures-lite 1.13.0",
  "iyes_progress",
+ "tracing",
 ]
 
 [[package]]
@@ -2563,6 +2624,7 @@ dependencies = [
  "de_types",
  "futures-lite 1.13.0",
  "thiserror",
+ "tracing",
 ]
 
 [[package]]
@@ -2670,6 +2732,7 @@ dependencies = [
  "rstar",
  "spade",
  "tinyvec",
+ "tracing",
 ]
 
 [[package]]
@@ -3124,7 +3187,28 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
 dependencies = [
- "foreign-types-shared",
+ "foreign-types-shared 0.1.1",
+]
+
+[[package]]
+name = "foreign-types"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
+dependencies = [
+ "foreign-types-macros",
+ "foreign-types-shared 0.3.1",
+]
+
+[[package]]
+name = "foreign-types-macros"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.50",
 ]
 
 [[package]]
@@ -3133,6 +3217,12 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
+[[package]]
+name = "foreign-types-shared"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
+
 [[package]]
 name = "form_urlencoded"
 version = "1.2.1"
@@ -3142,15 +3232,6 @@ dependencies = [
  "percent-encoding",
 ]
 
-[[package]]
-name = "fsevent-sys"
-version = "4.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "futures"
 version = "0.3.30"
@@ -3322,7 +3403,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0af1827b7dd2f36d740ae804c1b3ea0d64c12533fb61ff91883005143a0e8c5a"
 dependencies = [
  "core-foundation",
- "inotify 0.10.2",
+ "inotify",
  "io-kit-sys",
  "js-sys",
  "libc",
@@ -3443,21 +3524,21 @@ dependencies = [
 
 [[package]]
 name = "gpu-alloc"
-version = "0.5.4"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22beaafc29b38204457ea030f6fb7a84c9e4dd1b86e311ba0542533453d87f62"
+checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.2",
  "gpu-alloc-types",
 ]
 
 [[package]]
 name = "gpu-alloc-types"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5"
+checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.2",
 ]
 
 [[package]]
@@ -3797,17 +3878,6 @@ version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a257582fdcde896fd96463bf2d40eefea0580021c0712a0e2b028b60b47a837a"
 
-[[package]]
-name = "inotify"
-version = "0.9.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff"
-dependencies = [
- "bitflags 1.3.2",
- "inotify-sys",
- "libc",
-]
-
 [[package]]
 name = "inotify"
 version = "0.10.2"
@@ -3913,9 +3983,9 @@ checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
 
 [[package]]
 name = "iyes_progress"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3f093e3b8f18730767ecf5b60c455b4f6b806d3c79ae2a31ca89d285718d635"
+checksum = "1ed260fda0df8ed859329f221a5eb24175d38fd7d10f586cf6468574e6385b79"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -4020,26 +4090,6 @@ dependencies = [
  "symphonia",
 ]
 
-[[package]]
-name = "kqueue"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c"
-dependencies = [
- "kqueue-sys",
- "libc",
-]
-
-[[package]]
-name = "kqueue-sys"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b"
-dependencies = [
- "bitflags 1.3.2",
- "libc",
-]
-
 [[package]]
 name = "ktx2"
 version = "0.3.0"
@@ -4253,16 +4303,17 @@ dependencies = [
 
 [[package]]
 name = "metal"
-version = "0.24.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060"
+checksum = "623b5e6cefd76e58f774bd3cc0c6f5c7615c58c03a97815245a25c3c9bdee318"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.2",
  "block",
  "core-graphics-types",
- "foreign-types",
+ "foreign-types 0.5.0",
  "log",
  "objc",
+ "paste",
 ]
 
 [[package]]
@@ -4307,12 +4358,12 @@ dependencies = [
 
 [[package]]
 name = "naga"
-version = "0.12.3"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbcc2e0513220fd2b598e6068608d4462db20322c0e77e47f6f488dfcfc279cb"
+checksum = "c1ceaaa4eedaece7e4ec08c55c640ba03dbb73fb812a6570a59bcf1930d0f70e"
 dependencies = [
  "bit-set",
- "bitflags 1.3.2",
+ "bitflags 2.4.2",
  "codespan-reporting",
  "hexf-parse",
  "indexmap 1.9.3",
@@ -4328,9 +4379,9 @@ dependencies = [
 
 [[package]]
 name = "naga_oil"
-version = "0.8.2"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8be942a5c21c58b9b0bf4d9b99db3634ddb7a916f8e1d1d0b71820cc4150e56b"
+checksum = "4ac54c77b3529887f9668d3dd81e955e58f252b31a333f836e3548c06460b958"
 dependencies = [
  "bit-set",
  "codespan-reporting",
@@ -4339,7 +4390,7 @@ dependencies = [
  "naga",
  "once_cell",
  "regex",
- "regex-syntax 0.6.29",
+ "regex-syntax 0.7.5",
  "rustc-hash",
  "thiserror",
  "tracing",
@@ -4467,23 +4518,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "notify"
-version = "6.1.1"
+name = "nonmax"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d"
-dependencies = [
- "bitflags 2.4.2",
- "crossbeam-channel",
- "filetime",
- "fsevent-sys",
- "inotify 0.9.6",
- "kqueue",
- "libc",
- "log",
- "mio",
- "walkdir",
- "windows-sys 0.48.0",
-]
+checksum = "610a5acd306ec67f907abe5567859a3c693fb9886eb1f012ab8f2a47bef3db51"
 
 [[package]]
 name = "ntapi"
@@ -4764,7 +4802,7 @@ checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
 dependencies = [
  "bitflags 2.4.2",
  "cfg-if",
- "foreign-types",
+ "foreign-types 0.3.2",
  "libc",
  "once_cell",
  "openssl-macros",
@@ -5165,7 +5203,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
 dependencies = [
  "once_cell",
- "toml_edit",
+ "toml_edit 0.19.15",
 ]
 
 [[package]]
@@ -5348,6 +5386,12 @@ version = "0.6.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
+[[package]]
+name = "regex-syntax"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
+
 [[package]]
 name = "regex-syntax"
 version = "0.8.2"
@@ -6389,6 +6433,17 @@ dependencies = [
  "winnow",
 ]
 
+[[package]]
+name = "toml_edit"
+version = "0.20.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81"
+dependencies = [
+ "indexmap 2.2.3",
+ "toml_datetime",
+ "winnow",
+]
+
 [[package]]
 name = "tower-service"
 version = "0.3.2"
@@ -6641,6 +6696,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a"
 dependencies = [
  "getrandom",
+ "rand",
  "serde",
 ]
 
@@ -6828,9 +6884,9 @@ dependencies = [
 
 [[package]]
 name = "wgpu"
-version = "0.16.3"
+version = "0.17.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "480c965c9306872eb6255fa55e4b4953be55a8b64d57e61d7ff840d3dcc051cd"
+checksum = "752e44d3998ef35f71830dd1ad3da513e628e2e4d4aedb0ab580f850827a0b41"
 dependencies = [
  "arrayvec",
  "cfg-if",
@@ -6852,9 +6908,9 @@ dependencies = [
 
 [[package]]
 name = "wgpu-core"
-version = "0.16.1"
+version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f478237b4bf0d5b70a39898a66fa67ca3a007d79f2520485b8b0c3dfc46f8c2"
+checksum = "0f8a44dd301a30ceeed3c27d8c0090433d3da04d7b2a4042738095a424d12ae7"
 dependencies = [
  "arrayvec",
  "bit-vec",
@@ -6875,9 +6931,9 @@ dependencies = [
 
 [[package]]
 name = "wgpu-hal"
-version = "0.16.2"
+version = "0.17.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ecb3258078e936deee14fd4e0febe1cfe9bbb5ffef165cb60218d2ee5eb4448"
+checksum = "9a80bf0e3c77399bb52850cb0830af9bad073d5cfcb9dd8253bef8125c42db17"
 dependencies = [
  "android_system_properties",
  "arrayvec",
@@ -6887,7 +6943,6 @@ dependencies = [
  "block",
  "core-graphics-types",
  "d3d12",
- "foreign-types",
  "glow",
  "gpu-alloc",
  "gpu-allocator",
@@ -6917,9 +6972,9 @@ dependencies = [
 
 [[package]]
 name = "wgpu-types"
-version = "0.16.1"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0c153280bb108c2979eb5c7391cb18c56642dd3c072e55f52065e13e2a1252a"
+checksum = "ee64d7398d0c2f9ca48922c902ef69c42d000c759f3db41e355f4a570b052b67"
 dependencies = [
  "bitflags 2.4.2",
  "js-sys",
diff --git a/Cargo.toml b/Cargo.toml
index 9f7123e13..0fd914e92 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -119,7 +119,7 @@ assert_cmd = "2.0.10"
 async-compat = "0.2.1"
 async-std = "1.11"
 async-tar = "0.4.2"
-bevy_kira_audio = { version = "0.16.0", features = ["mp3"] }
+bevy_kira_audio = { version = "0.18", features = ["mp3"] }
 bincode = "2.0.0-rc.3"
 chrono = "0.4.24"
 clap = { version = "4.0", features = ["derive"] }
@@ -135,7 +135,7 @@ futures-lite = "1.13.0"
 glam = "0.24"
 gltf = "1.0"
 itertools = "0.11.0"
-iyes_progress = "0.9.0"
+iyes_progress = "0.10.0"
 log = "0.4.17"
 nalgebra = { version = "0.32.3", features = ["convert-glam024"] }
 nix = "0.26.2"
@@ -164,7 +164,7 @@ url = { version = "2.3.1", features = ["serde"] }
 urlencoding = "2.1.2"
 
 [workspace.dependencies.bevy]
-version = "0.11"
+version = "0.12"
 default-features = false
 features = [
     "animation",
@@ -185,7 +185,6 @@ features = [
     "ktx2",
     "zstd",
     "x11",
-    "filesystem_watcher",
     "bevy_gizmos",
     "android_shared_stdcxx",
     "tonemapping_luts",
diff --git a/assets/shaders/bar.wgsl b/assets/shaders/bar.wgsl
index 747f84bf6..9b81bcf7e 100644
--- a/assets/shaders/bar.wgsl
+++ b/assets/shaders/bar.wgsl
@@ -1,5 +1,7 @@
-#import bevy_pbr::mesh_bindings  mesh
-#import bevy_pbr::mesh_functions mesh_position_local_to_clip
+#import bevy_pbr::{
+    mesh_bindings::mesh,
+    mesh_functions::{get_model_matrix, mesh_position_local_to_clip},
+}
 
 const BACKGROUND_COLOR = vec4<f32>(0., 0., 0., 0.75);
 const FOREGROUND_COLOR = vec4<f32>(0.6, 1., 0.6, 0.75);
@@ -8,6 +10,7 @@ const FOREGROUND_COLOR = vec4<f32>(0.6, 1., 0.6, 0.75);
 var<uniform> value: f32;
 
 struct Vertex {
+    @builtin(instance_index) instance_index: u32,
     @location(0) position: vec2<f32>,
     @location(1) uv: vec2<f32>,
 };
@@ -25,7 +28,10 @@ struct FragmentInput {
 fn vertex(vertex: Vertex) -> VertexOutput {
     var out: VertexOutput;
 
-    out.clip_position = mesh_position_local_to_clip(mesh.model, vec4<f32>(0., 0., 0., 1.0));
+    out.clip_position = mesh_position_local_to_clip(
+        get_model_matrix(vertex.instance_index),
+        vec4<f32>(0., 0., 0., 1.0),
+    );
 
     let scale = max(1., out.clip_position.w / 40.);
     out.clip_position += vec4<f32>(scale * vertex.position, 0., 0.);
diff --git a/assets/shaders/rally_point.wgsl b/assets/shaders/rally_point.wgsl
index fccf56d43..1860f9a87 100644
--- a/assets/shaders/rally_point.wgsl
+++ b/assets/shaders/rally_point.wgsl
@@ -1,6 +1,8 @@
-#import bevy_pbr::mesh_view_bindings  globals
-#import bevy_pbr::mesh_bindings       mesh
-#import bevy_pbr::mesh_vertex_output  MeshVertexOutput
+#import bevy_pbr::{
+    forward_io::VertexOutput,
+    mesh_bindings::mesh,
+    mesh_view_bindings::globals,
+}
 
 struct CustomMaterial {
     color: vec4<f32>,
@@ -23,9 +25,10 @@ const FADE: f32 = 3.;
 
 @fragment
 fn fragment(
-    in: MeshVertexOutput,
+    in: VertexOutput,
 ) -> @location(0) vec4<f32> {
-    let world_space_length: f32 = length(mesh.model[0].xyz);
+    let model = mesh[in.instance_index].model;
+    let world_space_length: f32 = length(vec3(model[0][0], model[1][0], model[2][0]));
     let scaled_x: f32 = in.uv.x * world_space_length;
     let offset_y: f32 = abs(in.uv.y - 0.5) * POINTINESS;
     let scaled_time: f32 = globals.time * SPEED;
diff --git a/assets/shaders/terrain.wgsl b/assets/shaders/terrain.wgsl
index bf50ffdc2..71fe62a65 100644
--- a/assets/shaders/terrain.wgsl
+++ b/assets/shaders/terrain.wgsl
@@ -1,13 +1,13 @@
-#import bevy_pbr::mesh_vertex_output       MeshVertexOutput
-#import bevy_pbr::mesh_bindings            mesh
-#import bevy_pbr::mesh_view_bindings       view
-#import bevy_core_pipeline::tonemapping    tone_mapping
-#import bevy_pbr::pbr_functions            PbrInput, pbr_input_new, prepare_world_normal, apply_normal_mapping, calculate_view, pbr
-#import bevy_pbr::pbr_types as pbr_types
-
+#import bevy_pbr::{
+    forward_io::{VertexOutput, FragmentOutput},
+    pbr_fragment::pbr_input_from_standard_material,
+    pbr_functions::{
+        alpha_discard,
+        apply_pbr_lighting,
+        main_pass_post_lighting_processing,
+    },
+}
 
-// How large (in meters) is a texture.
-const TEXTURE_SIZE = 16.;
 const SHAPE_COLOR = vec4<f32>(1., 1., 1., 0.75);
 const SHAPE_THICKNESS = 0.15;
 // Keep these array lengths in sync with /crates/terrain/src/shader.rs.
@@ -34,15 +34,12 @@ struct Rectangles {
     count: u32,
 };
 
-@group(1) @binding(0)
+@group(1) @binding(100)
+var<uniform> uv_scale: f32;
+@group(1) @binding(101)
 var<uniform> circles: KdTree;
-@group(1) @binding(1)
+@group(1) @binding(102)
 var<uniform> rectangles: Rectangles;
-@group(1) @binding(2)
-var terrain_texture: texture_2d<f32>;
-@group(1) @binding(3)
-var terrain_sampler: sampler;
-
 fn mix_colors(base: vec4<f32>, cover: vec4<f32>) -> vec4<f32> {
     let alpha = base.a * cover.a;
     let rgb = base.rgb * cover.a + cover.rgb * (1. - cover.a);
@@ -51,11 +48,11 @@ fn mix_colors(base: vec4<f32>, cover: vec4<f32>) -> vec4<f32> {
 
 fn draw_circle(
     base: vec4<f32>,
-    uv: vec2<f32>,
+    location: vec2<f32>,
     center: vec2<f32>,
     radius: f32,
 ) -> vec4<f32> {
-    let distance: f32 = distance(uv, center);
+    let distance: f32 = distance(location, center);
     if distance <= (radius + SHAPE_THICKNESS) && radius <= distance {
         return mix_colors(base, SHAPE_COLOR);
     }
@@ -73,14 +70,14 @@ struct Next {
     potential: f32,
 }
 
-fn nearest(uv: vec2<f32>) -> u32 {
+fn nearest(location: vec2<f32>) -> u32 {
     if circles.count == 0u {
         return MAX_KD_TREE_SIZE;
     }
 
     var best: KdRecord;
     best.index = 0u;
-    best.distance = distance(circles.nodes[0].location, uv);
+    best.distance = distance(circles.nodes[0].location, location);
 
     var stack_size: u32 = 1u;
     // Make sure that the stack size is large enought to cover balanced three
@@ -100,14 +97,14 @@ fn nearest(uv: vec2<f32>) -> u32 {
 
         let node = circles.nodes[next.index];
 
-        let distance = distance(node.location, uv);
+        let distance = distance(node.location, location);
         if distance < best.distance {
             best.index = next.index;
             best.distance = distance;
         }
 
         let axis = next.depth % 2u;
-        let diff = uv[axis] - node.location[axis];
+        let diff = location[axis] - node.location[axis];
 
         var close = 2u * next.index + 2u;
         var away = 2u * next.index + 1u;
@@ -135,25 +132,25 @@ fn nearest(uv: vec2<f32>) -> u32 {
     return best.index;
 }
 
-fn draw_circles(base: vec4<f32>, uv: vec2<f32>) -> vec4<f32> {
+fn draw_circles(base: vec4<f32>, location: vec2<f32>) -> vec4<f32> {
     var output_color = base;
 
-    let index = nearest(uv);
+    let index = nearest(location);
     if index < MAX_KD_TREE_SIZE {
         let node = circles.nodes[index];
         let center = node.location;
         let radius = node.radius;
-        output_color = draw_circle(output_color, uv, center, radius);
+        output_color = draw_circle(output_color, location, center, radius);
     }
 
     return output_color;
 }
 
-fn draw_rectangles(base: vec4<f32>, uv: vec2<f32>) -> vec4<f32> {
+fn draw_rectangles(base: vec4<f32>, location: vec2<f32>) -> vec4<f32> {
     for (var i = 0u; i < rectangles.count; i++) {
         let rectangle = rectangles.items[i];
-        let local_uv = (rectangle.inverse_transform * vec3(uv, 1.0)).xy;
-        if all(abs(local_uv) <= rectangle.half_size + SHAPE_THICKNESS) && any(rectangle.half_size <= abs(local_uv)) {
+        let local_location = (rectangle.inverse_transform * vec3(location, 1.0)).xy;
+        if all(abs(local_location) <= rectangle.half_size + SHAPE_THICKNESS) && any(rectangle.half_size <= abs(local_location)) {
             return mix_colors(base, SHAPE_COLOR);
         }
     }
@@ -163,57 +160,20 @@ fn draw_rectangles(base: vec4<f32>, uv: vec2<f32>) -> vec4<f32> {
 
 @fragment
 fn fragment(
-    in: MeshVertexOutput,
+    in: VertexOutput,
     @builtin(front_facing) is_front: bool,
-) -> @location(0) vec4<f32> {
-    var pbr_input: PbrInput = pbr_input_new();
-    pbr_input.material.perceptual_roughness = 0.8;
-    pbr_input.material.metallic = 0.23;
-    pbr_input.material.reflectance = 0.06;
-
-    pbr_input.material.base_color = textureSample(
-        terrain_texture,
-        terrain_sampler,
-        in.uv / TEXTURE_SIZE
-    );
-
-#ifdef VERTEX_COLORS
-    pbr_input.material.base_color = pbr_input.material.base_color * in.color;
-#endif
-
-    pbr_input.frag_coord = in.position;
-    pbr_input.world_position = in.world_position;
-    pbr_input.world_normal = prepare_world_normal(
-        in.world_normal,
-        (pbr_input.material.flags & pbr_types::STANDARD_MATERIAL_FLAGS_DOUBLE_SIDED_BIT) != 0u,
-        is_front,
-    );
-
-    pbr_input.is_orthographic = view.projection[3].w == 1.0;
-
-    pbr_input.N = apply_normal_mapping(
-        pbr_input.material.flags,
-        pbr_input.world_normal,
-#ifdef VERTEX_TANGENTS
-#ifdef STANDARDMATERIAL_NORMAL_MAP
-        in.world_tangent,
-#endif
-#endif
-#ifdef VERTEX_UVS
-        in.uv,
-#endif
-        view.mip_bias,
-    );
-    pbr_input.V = calculate_view(in.world_position, pbr_input.is_orthographic);
-    pbr_input.flags = mesh.flags;
-
-    var output_color = pbr(pbr_input);
-
-#ifdef TONEMAP_IN_SHADER
-    output_color = tone_mapping(output_color, view.color_grading);
-#endif
-
-    output_color = draw_circles(output_color, in.uv);
-    output_color = draw_rectangles(output_color, in.uv);
-    return output_color;
+) -> FragmentOutput {
+    var pbr_input = pbr_input_from_standard_material(in, is_front);
+    pbr_input.material.base_color = alpha_discard(pbr_input.material, pbr_input.material.base_color);
+
+    var out: FragmentOutput;
+    out.color = apply_pbr_lighting(pbr_input);
+
+    let location = uv_scale * in.uv;
+    out.color = draw_circles(out.color, location);
+    out.color = draw_rectangles(out.color, location);
+
+    out.color = main_pass_post_lighting_processing(pbr_input, out.color);
+
+    return out;
 }
diff --git a/assets/shaders/trail.wgsl b/assets/shaders/trail.wgsl
index a068ca163..d0e29c83a 100644
--- a/assets/shaders/trail.wgsl
+++ b/assets/shaders/trail.wgsl
@@ -1,5 +1,7 @@
-#import bevy_pbr::mesh_view_bindings  globals
-#import bevy_pbr::mesh_vertex_output  MeshVertexOutput
+#import bevy_pbr::{
+    forward_io::VertexOutput,
+    mesh_view_bindings::globals,
+}
 
 const COLOR = vec4<f32>(1., 0.85, 0.1, 0.7);
 
@@ -8,7 +10,7 @@ var<uniform> start_time: f32;
 
 @fragment
 fn fragment(
-    in: MeshVertexOutput,
+    in: VertexOutput,
 ) -> @location(0) vec4<f32> {
     var color = COLOR;
     // Use max(0., ...) because the times are wrapping.
diff --git a/crates/audio/src/music.rs b/crates/audio/src/music.rs
index 021079843..24324d22c 100644
--- a/crates/audio/src/music.rs
+++ b/crates/audio/src/music.rs
@@ -29,8 +29,8 @@ fn setup(mut commands: Commands, server: Res<AssetServer>) {
 
 fn load(server: Res<AssetServer>, tracks: Res<Tracks>) -> Progress {
     match server.get_load_state(&tracks.0) {
-        LoadState::Loaded => true.into(),
-        LoadState::NotLoaded | LoadState::Loading => false.into(),
+        Some(LoadState::Loaded) => true.into(),
+        Some(LoadState::NotLoaded) | Some(LoadState::Loading) => false.into(),
         _ => panic!("Unexpected loading state."),
     }
 }
diff --git a/crates/audio/src/spatial.rs b/crates/audio/src/spatial.rs
index 26c60b473..f27f1e38b 100644
--- a/crates/audio/src/spatial.rs
+++ b/crates/audio/src/spatial.rs
@@ -78,8 +78,8 @@ fn load(server: Res<AssetServer>, sounds: Res<Sounds>) -> Progress {
             .0
             .values()
             .map(|handle| match server.get_load_state(handle) {
-                LoadState::Loaded => 1,
-                LoadState::NotLoaded | LoadState::Loading => 0,
+                Some(LoadState::Loaded) => 1,
+                Some(LoadState::NotLoaded) | Some(LoadState::Loading) => 0,
                 _ => panic!("Unexpected loading state."),
             })
             .sum(),
@@ -146,7 +146,7 @@ fn play(
     let camera = camera.single();
     let sound_volume = config.audio().sound_volume() as f64;
 
-    for PlaySpatialAudioEvent { sound, position } in &mut play_events {
+    for PlaySpatialAudioEvent { sound, position } in play_events.read() {
         let (volume, pan) = calculate_volume_and_pan(camera, &focus, *position);
         let handle = audio
             .play(sounds.0[*sound].clone())
diff --git a/crates/behaviour/src/chase.rs b/crates/behaviour/src/chase.rs
index a6a911cfe..f404a29ea 100644
--- a/crates/behaviour/src/chase.rs
+++ b/crates/behaviour/src/chase.rs
@@ -114,7 +114,7 @@ impl ChaseTarget {
 }
 
 fn handle_chase_events(mut commands: Commands, mut events: EventReader<ChaseTargetEvent>) {
-    for event in events.iter() {
+    for event in events.read() {
         let mut entity_commands = commands.entity(event.entity());
         match event.target() {
             Some(target) => entity_commands.insert(ChaseTargetComponent::new(target.clone())),
diff --git a/crates/camera/src/camera.rs b/crates/camera/src/camera.rs
index 086d344a6..ccfd2613b 100644
--- a/crates/camera/src/camera.rs
+++ b/crates/camera/src/camera.rs
@@ -1,7 +1,6 @@
 use std::f32::consts::FRAC_PI_2;
 
 use bevy::{
-    ecs::query::Has,
     pbr::{CascadeShadowConfig, CascadeShadowConfigBuilder, DirectionalLightShadowMap},
     prelude::*,
 };
@@ -391,7 +390,7 @@ fn process_move_focus_events(
     terrain: TerrainCollider,
     mut out_events: EventWriter<UpdateTranslationEvent>,
 ) {
-    let event = match in_events.iter().last() {
+    let event = match in_events.read().last() {
         Some(event) => event,
         None => return,
     };
@@ -516,7 +515,7 @@ fn handle_horizontal_events(
     mut movement: ResMut<HorizontalMovement>,
     mut events: EventReader<MoveCameraHorizontallyEvent>,
 ) {
-    if let Some(event) = events.iter().last() {
+    if let Some(event) = events.read().last() {
         movement.set(event.direction());
     }
 }
@@ -526,7 +525,7 @@ fn handle_zoom_events(
     mut events: EventReader<ZoomCameraEvent>,
     mut desired: ResMut<DesiredDistance>,
 ) {
-    for event in events.iter() {
+    for event in events.read() {
         desired.zoom_clamped(conf.camera(), event.factor());
     }
 }
@@ -535,7 +534,7 @@ fn handle_tilt_events(
     mut events: EventReader<TiltCameraEvent>,
     mut desired: ResMut<DesiredOffNadir>,
 ) {
-    for event in events.iter() {
+    for event in events.read() {
         desired.tilt_clamped(Radian::ONE * event.delta());
     }
 }
@@ -544,7 +543,7 @@ fn handle_rotate_events(
     mut events: EventReader<RotateCameraEvent>,
     mut desired: ResMut<DesiredAzimuth>,
 ) {
-    for event in events.iter() {
+    for event in events.read() {
         desired.rotate(Radian::ONE * event.delta());
     }
 }
diff --git a/crates/camera/src/skybox.rs b/crates/camera/src/skybox.rs
index 39d7f9524..c6c5b5af6 100644
--- a/crates/camera/src/skybox.rs
+++ b/crates/camera/src/skybox.rs
@@ -1,7 +1,6 @@
 use bevy::{
     asset::LoadState,
     core_pipeline::Skybox,
-    ecs::query::Has,
     prelude::*,
     render::render_resource::{TextureViewDescriptor, TextureViewDimension},
 };
@@ -48,8 +47,8 @@ fn configure_cubemap(
     }
 
     match server.get_load_state(&source.handle) {
-        LoadState::Loaded => (),
-        LoadState::NotLoaded | LoadState::Loading => return false.into(),
+        Some(LoadState::Loaded) => (),
+        Some(LoadState::NotLoaded) | Some(LoadState::Loading) => return false.into(),
         _ => panic!("Unexpected loading state."),
     }
 
diff --git a/crates/combat/src/attack.rs b/crates/combat/src/attack.rs
index 0ca6a8bb4..cca10aa98 100644
--- a/crates/combat/src/attack.rs
+++ b/crates/combat/src/attack.rs
@@ -105,7 +105,7 @@ fn attack(
     cannons: Query<&LaserCannon>,
     mut chase_events: EventWriter<ChaseTargetEvent>,
 ) {
-    for event in attack_events.iter() {
+    for event in attack_events.read() {
         if let Ok(cannon) = cannons.get(event.attacker()) {
             commands
                 .entity(event.attacker())
diff --git a/crates/combat/src/health.rs b/crates/combat/src/health.rs
index 3d9cc51c4..16a2df9fa 100644
--- a/crates/combat/src/health.rs
+++ b/crates/combat/src/health.rs
@@ -81,7 +81,7 @@ fn update_local_health(
     mut out_events: EventWriter<UpdateHealthEvent>,
     mut net_events: EventWriter<ToPlayersEvent>,
 ) {
-    for event in in_events.iter() {
+    for event in in_events.read() {
         out_events.send(UpdateHealthEvent::new(event.entity, event.delta));
 
         if config.multiplayer() {
@@ -97,7 +97,7 @@ fn update_remote_health(
     mut in_events: EventReader<NetRecvHealthEvent>,
     mut out_events: EventWriter<UpdateHealthEvent>,
 ) {
-    for event in in_events.iter() {
+    for event in in_events.read() {
         out_events.send(UpdateHealthEvent::new(event.entity(), event.delta()));
     }
 }
@@ -107,7 +107,7 @@ fn update_health(
     mut health_events: EventReader<UpdateHealthEvent>,
     mut bar_events: EventWriter<UpdateBarValueEvent>,
 ) {
-    for event in health_events.iter() {
+    for event in health_events.read() {
         let Ok(mut health) = healths.get_mut(event.entity) else {
             continue;
         };
diff --git a/crates/combat/src/laser.rs b/crates/combat/src/laser.rs
index 7fb86bcef..64b3fbf9c 100644
--- a/crates/combat/src/laser.rs
+++ b/crates/combat/src/laser.rs
@@ -81,7 +81,7 @@ fn fire(
     mut health: EventWriter<LocalUpdateHealthEvent>,
     mut trail: EventWriter<LocalLaserTrailEvent>,
 ) {
-    for fire in fires.iter() {
+    for fire in fires.read() {
         let observation = sightline.sight(fire.ray(), fire.max_toi(), fire.attacker());
 
         trail.send(LocalLaserTrailEvent::new(Ray::new(
diff --git a/crates/combat/src/trail.rs b/crates/combat/src/trail.rs
index 5d3af1f82..8dc1121e5 100644
--- a/crates/combat/src/trail.rs
+++ b/crates/combat/src/trail.rs
@@ -3,7 +3,7 @@ use std::time::Duration;
 use bevy::{
     pbr::{MaterialPipeline, MaterialPipelineKey, NotShadowCaster, NotShadowReceiver},
     prelude::*,
-    reflect::{TypePath, TypeUuid},
+    reflect::TypePath,
     render::{
         mesh::{Indices, MeshVertexBufferLayout, PrimitiveTopology},
         render_resource::{
@@ -87,8 +87,7 @@ impl Trail {
     }
 }
 
-#[derive(AsBindGroup, TypeUuid, TypePath, Debug, Clone)]
-#[uuid = "560ab431-1a54-48b3-87ea-8de8d94ceafb"]
+#[derive(Asset, AsBindGroup, TypePath, Debug, Clone)]
 struct TrailMaterial {
     #[uniform(0)]
     start_time: f32,
@@ -129,7 +128,7 @@ fn local_laser_trail(
     mut out_events: EventWriter<LaserTrailEvent>,
     mut net_events: EventWriter<ToPlayersEvent>,
 ) {
-    for event in in_events.iter() {
+    for event in in_events.read() {
         out_events.send(LaserTrailEvent(event.0));
 
         if config.multiplayer() {
@@ -147,7 +146,7 @@ fn remote_laser_trail(
     mut in_events: EventReader<NetRecvProjectileEvent>,
     mut out_events: EventWriter<LaserTrailEvent>,
 ) {
-    for event in in_events.iter() {
+    for event in in_events.read() {
         match **event {
             NetProjectile::Laser { origin, direction } => {
                 out_events.send(LaserTrailEvent(Ray::new(origin.into(), direction.into())));
@@ -163,7 +162,7 @@ fn laser_trail(
     mesh: Res<MeshHandle>,
     mut events: EventReader<LaserTrailEvent>,
 ) {
-    for event in events.iter() {
+    for event in events.read() {
         let material = materials.add(TrailMaterial::new(time.elapsed_seconds_wrapped()));
 
         commands.spawn((
@@ -189,7 +188,7 @@ fn laser_sound(
     mut events: EventReader<LaserTrailEvent>,
     mut sound_events: EventWriter<PlaySpatialAudioEvent>,
 ) {
-    for event in events.iter() {
+    for event in events.read() {
         sound_events.send(PlaySpatialAudioEvent::new(
             Sound::LaserFire,
             event.0.origin.into(),
diff --git a/crates/conf/src/io.rs b/crates/conf/src/io.rs
index 9456747a2..5f73a6604 100644
--- a/crates/conf/src/io.rs
+++ b/crates/conf/src/io.rs
@@ -1,6 +1,6 @@
 use anyhow::{Context, Result};
 use async_std::{fs, path::Path};
-use bevy::prelude::info;
+use tracing::info;
 
 /// Loads configuration file to a string. Returns Ok(None) if the configuration
 /// file does not exist.
diff --git a/crates/construction/src/manufacturing.rs b/crates/construction/src/manufacturing.rs
index 5404e14bd..7a2d2c26f 100644
--- a/crates/construction/src/manufacturing.rs
+++ b/crates/construction/src/manufacturing.rs
@@ -321,7 +321,7 @@ fn change_locations(
     mut pole_events: EventWriter<UpdatePoleLocationEvent>,
     mut line_events: EventWriter<UpdateLineEndEvent>,
 ) {
-    for event in events.iter() {
+    for event in events.read() {
         if let Ok(mut location) = locations.get_mut(event.factory()) {
             let owner = event.factory();
             location.0 = event.position();
@@ -337,7 +337,7 @@ fn enqueue(
     mut events: EventReader<EnqueueAssemblyEvent>,
     mut lines: Query<&mut AssemblyLine>,
 ) {
-    for event in events.iter() {
+    for event in events.read() {
         let Ok(mut line) = lines.get_mut(event.factory()) else {
             continue;
         };
@@ -415,7 +415,7 @@ fn deliver(
         &DeliveryLocation,
     )>,
 ) {
-    for delivery in deliver_events.iter() {
+    for delivery in deliver_events.read() {
         info!(
             "Manufacturing of {} in {:?} just finished.",
             delivery.unit(),
diff --git a/crates/controller/src/commands/executor.rs b/crates/controller/src/commands/executor.rs
index 595cdc6c6..f6554e5ac 100644
--- a/crates/controller/src/commands/executor.rs
+++ b/crates/controller/src/commands/executor.rs
@@ -85,7 +85,7 @@ fn send_selected_system(
     mut path_events: EventWriter<UpdateEntityPathEvent>,
     mut chase_events: EventWriter<ChaseTargetEvent>,
 ) {
-    if let Some(send) = send_events.iter().last() {
+    if let Some(send) = send_events.read().last() {
         for entity in selected.iter() {
             chase_events.send(ChaseTargetEvent::new(entity, None));
             path_events.send(UpdateEntityPathEvent::new(
@@ -103,7 +103,7 @@ fn delivery_location_system(
     selected: Query<Entity, SelectedFactory>,
     mut out_events: EventWriter<ChangeDeliveryLocationEvent>,
 ) {
-    if let Some(event) = in_events.iter().last() {
+    if let Some(event) = in_events.read().last() {
         for entity in selected.iter() {
             out_events.send(ChangeDeliveryLocationEvent::new(entity, event.target()));
         }
@@ -115,7 +115,7 @@ fn attack_system(
     selected: Query<Entity, SelectedMovable>,
     mut individual_events: EventWriter<AttackEvent>,
 ) {
-    if let Some(group_event) = group_events.iter().last() {
+    if let Some(group_event) = group_events.read().last() {
         for attacker in selected.iter() {
             individual_events.send(AttackEvent::new(attacker, group_event.target()));
         }
diff --git a/crates/controller/src/commands/handlers.rs b/crates/controller/src/commands/handlers.rs
index 1026a4b96..541f789e3 100644
--- a/crates/controller/src/commands/handlers.rs
+++ b/crates/controller/src/commands/handlers.rs
@@ -138,7 +138,7 @@ fn on_click(button: MouseButton) -> impl Fn(EventReader<MouseClickedEvent>) -> b
     move |mut events: EventReader<MouseClickedEvent>| {
         // It is desirable to exhaust the iterator, thus .filter().count() is
         // used instead of .any()
-        events.iter().filter(|e| e.button() == button).count() > 0
+        events.read().filter(|e| e.button() == button).count() > 0
     }
 }
 
@@ -146,7 +146,7 @@ fn on_double_click(button: MouseButton) -> impl Fn(EventReader<MouseDoubleClicke
     move |mut events: EventReader<MouseDoubleClickedEvent>| {
         // It is desirable to exhaust the iterator, thus .filter().count() is
         // used instead of .any()
-        events.iter().filter(|e| e.button() == button).count() > 0
+        events.read().filter(|e| e.button() == button).count() > 0
     }
 }
 
@@ -210,7 +210,7 @@ fn move_camera_arrows_system(
     mut key_events: EventReader<KeyboardInput>,
     mut move_events: EventWriter<MoveCameraHorizontallyEvent>,
 ) {
-    for key_event in key_events.iter() {
+    for key_event in key_events.read() {
         let Some(key_code) = key_event.key_code else {
             continue;
         };
@@ -277,7 +277,7 @@ fn zoom_camera(
 ) {
     let conf = conf.camera();
     let factor = wheel_events
-        .iter()
+        .read()
         .fold(1.0, |factor, event| match event.unit {
             MouseScrollUnit::Line => factor * conf.wheel_zoom_sensitivity().powf(event.y),
             MouseScrollUnit::Pixel => factor * conf.touchpad_zoom_sensitivity().powf(event.y),
@@ -297,7 +297,7 @@ fn pivot_camera(
         return;
     }
 
-    let delta = mouse_event.iter().fold(Vec2::ZERO, |sum, e| sum + e.delta);
+    let delta = mouse_event.read().fold(Vec2::ZERO, |sum, e| sum + e.delta);
     let sensitivity = conf.camera().rotation_sensitivity();
     if delta.x != 0. {
         rotate_event.send(RotateCameraEvent::new(sensitivity * delta.x));
@@ -390,7 +390,7 @@ fn update_drags(
     mut ui_events: EventWriter<UpdateSelectionBoxEvent>,
     mut select_events: EventWriter<SelectInRectEvent>,
 ) {
-    for drag_event in drag_events.iter() {
+    for drag_event in drag_events.read() {
         if drag_event.button() != MouseButton::Left {
             continue;
         }
diff --git a/crates/controller/src/commands/keyboard.rs b/crates/controller/src/commands/keyboard.rs
index 2c67be9c3..1b5d4b524 100644
--- a/crates/controller/src/commands/keyboard.rs
+++ b/crates/controller/src/commands/keyboard.rs
@@ -36,7 +36,7 @@ impl KeyCondition {
     pub(super) fn build(self) -> impl Fn(Res<Input<KeyCode>>, EventReader<KeyboardInput>) -> bool {
         move |keys: Res<Input<KeyCode>>, mut events: EventReader<KeyboardInput>| {
             let proper_key = events
-                .iter()
+                .read()
                 .filter(|k| {
                     k.state == ButtonState::Pressed && k.key_code.map_or(false, |c| c == self.key)
                 })
diff --git a/crates/controller/src/draft.rs b/crates/controller/src/draft.rs
index 671d721a5..36aa2f5da 100644
--- a/crates/controller/src/draft.rs
+++ b/crates/controller/src/draft.rs
@@ -99,7 +99,7 @@ fn new_drafts(
     mut events: EventReader<NewDraftEvent>,
     drafts: Query<Entity, With<DraftAllowed>>,
 ) {
-    let event = match events.iter().last() {
+    let event = match events.read().last() {
         Some(event) => event,
         None => return,
     };
diff --git a/crates/controller/src/hud/interaction.rs b/crates/controller/src/hud/interaction.rs
index 17ffa08ab..4411f0b77 100644
--- a/crates/controller/src/hud/interaction.rs
+++ b/crates/controller/src/hud/interaction.rs
@@ -2,7 +2,6 @@ use bevy::{
     ecs::{query::ReadOnlyWorldQuery, system::SystemParam},
     prelude::*,
 };
-use glam::Vec3Swizzles;
 
 /// Top-level non-transparent or otherwise interaction blocking Node. All such
 /// nodes are marked with this component and no descendants have it attached.
@@ -23,7 +22,7 @@ where
         's,
         (
             &'static GlobalTransform,
-            &'static ComputedVisibility,
+            &'static ViewVisibility,
             &'static Node,
         ),
         F,
@@ -34,6 +33,7 @@ impl<'w, 's, F> HudNodes<'w, 's, F>
 where
     F: ReadOnlyWorldQuery + Sync + Send + 'static,
 {
+    /// See [`Self::relative_position`].
     pub(crate) fn contains_point(&self, point: Vec2) -> bool {
         self.relative_position(point).is_some()
     }
@@ -43,11 +43,16 @@ where
     ///
     /// The returned point is between (0, 0) (top-left corner) and (1, 1)
     /// (bottom-right corner).
+    ///
+    /// The method relies on [`ViewVisibility`], therefore the results are
+    /// accurate with respect to the last rendered frame only iff called before
+    /// [`bevy::render::view::VisibilitySystems::VisibilityPropagate`] (during
+    /// `PostUpdate` schedule).
     pub(crate) fn relative_position(&self, point: Vec2) -> Option<Vec2> {
         self.hud
             .iter()
             .filter_map(|(box_transform, visibility, node)| {
-                if !visibility.is_visible() {
+                if !visibility.get() {
                     return None;
                 }
 
diff --git a/crates/controller/src/hud/menu.rs b/crates/controller/src/hud/menu.rs
index a901566c5..a9bc27ab1 100644
--- a/crates/controller/src/hud/menu.rs
+++ b/crates/controller/src/hud/menu.rs
@@ -116,7 +116,7 @@ fn toggle_system(
     mut events: EventReader<ToggleGameMenuEvent>,
     mut query: Query<&mut Visibility, With<PopUpMenu>>,
 ) {
-    if events.iter().count() % 2 == 0 {
+    if events.read().count() % 2 == 0 {
         return;
     }
 
diff --git a/crates/controller/src/hud/minimap/interaction.rs b/crates/controller/src/hud/minimap/interaction.rs
index 441f838ed..2967d0d1b 100644
--- a/crates/controller/src/hud/minimap/interaction.rs
+++ b/crates/controller/src/hud/minimap/interaction.rs
@@ -119,7 +119,7 @@ fn press_handler(
 ) {
     let cursor = window_query.single().cursor_position();
 
-    for event in input_events.iter() {
+    for event in input_events.read() {
         match event.state {
             ButtonState::Released => {
                 dragging.retain(|b| *b != event.button);
@@ -173,7 +173,7 @@ fn move_camera_system(
     mut drag_events: EventReader<MinimapDragEvent>,
     mut camera_events: EventWriter<MoveFocusEvent>,
 ) {
-    for press in press_events.iter() {
+    for press in press_events.read() {
         if press.button() != MouseButton::Left {
             continue;
         }
@@ -182,7 +182,7 @@ fn move_camera_system(
         camera_events.send(event);
     }
 
-    for drag in drag_events.iter() {
+    for drag in drag_events.read() {
         if drag.button() != MouseButton::Left {
             continue;
         }
@@ -196,7 +196,7 @@ fn send_units_system(
     mut press_events: EventReader<MinimapPressEvent>,
     mut send_events: EventWriter<SendSelectedEvent>,
 ) {
-    for press in press_events.iter() {
+    for press in press_events.read() {
         if press.button() != MouseButton::Right {
             continue;
         }
@@ -208,7 +208,7 @@ fn delivery_location_system(
     mut press_events: EventReader<MinimapPressEvent>,
     mut location_events: EventWriter<DeliveryLocationSelectedEvent>,
 ) {
-    for press in press_events.iter() {
+    for press in press_events.read() {
         if press.button() != MouseButton::Right {
             continue;
         }
diff --git a/crates/controller/src/hud/selection.rs b/crates/controller/src/hud/selection.rs
index f9780970c..32611c423 100644
--- a/crates/controller/src/hud/selection.rs
+++ b/crates/controller/src/hud/selection.rs
@@ -35,7 +35,7 @@ fn process_events(
     mut boxes: Query<(Entity, &mut Style), With<SelectionBox>>,
     mut events: EventReader<UpdateSelectionBoxEvent>,
 ) {
-    if let Some(event) = events.iter().last() {
+    if let Some(event) = events.read().last() {
         match event.0 {
             Some(rect) => {
                 let size = rect.size();
diff --git a/crates/controller/src/mouse/input.rs b/crates/controller/src/mouse/input.rs
index 9bdab4dca..0ac9d63f5 100644
--- a/crates/controller/src/mouse/input.rs
+++ b/crates/controller/src/mouse/input.rs
@@ -273,7 +273,7 @@ fn update_buttons(
     mut clicks: EventWriter<MouseClickedEvent>,
     mut drags: EventWriter<MouseDraggedEvent>,
 ) {
-    for event in input_events.iter() {
+    for event in input_events.read() {
         match event.state {
             ButtonState::Released => {
                 if let Some(drag_resolution) = mouse_state.resolve(event.button) {
@@ -305,7 +305,7 @@ fn check_double_click(
     mut last_click_time: Local<f64>,
     time: Res<Time>,
 ) {
-    for mouse_clicked in clicks.iter() {
+    for mouse_clicked in clicks.read() {
         let current_time = time.elapsed_seconds_f64();
 
         if last_click_position.map_or(true, |p| {
diff --git a/crates/controller/src/selection/area.rs b/crates/controller/src/selection/area.rs
index 5df64e694..68cce8fa5 100644
--- a/crates/controller/src/selection/area.rs
+++ b/crates/controller/src/selection/area.rs
@@ -73,7 +73,7 @@ fn select_in_area(
     mut in_events: EventReader<SelectInRectEvent>,
     mut out_events: EventWriter<SelectEvent>,
 ) {
-    for in_event in in_events.iter() {
+    for in_event in in_events.read() {
         let event_frustum = screen_frustum.rect(in_event.rect());
         let entities: Vec<Entity> = candidates
             .iter()
diff --git a/crates/controller/src/selection/bookkeeping.rs b/crates/controller/src/selection/bookkeeping.rs
index d5fee8a5d..27cb07813 100644
--- a/crates/controller/src/selection/bookkeeping.rs
+++ b/crates/controller/src/selection/bookkeeping.rs
@@ -149,7 +149,7 @@ impl<'w, 's> Selector<'w, 's> {
 
 fn update_selection(mut events: EventReader<SelectEvent>, selector_builder: SelectorBuilder) {
     let mut selector = selector_builder.build();
-    for event in events.iter() {
+    for event in events.read() {
         selector.update(event.entities(), event.mode());
     }
     selector.execute();
@@ -162,7 +162,7 @@ fn selected_system(
     mut poles: EventWriter<UpdatePoleVisibilityEvent>,
     mut lines: EventWriter<UpdateLineVisibilityEvent>,
 ) {
-    for event in events.iter() {
+    for event in events.read() {
         if let Ok(mut visibility) = markers.get_mut(event.0) {
             visibility.0.update_visible(SELECTION_BAR_ID, true);
         }
@@ -185,7 +185,7 @@ fn deselected_system(
     mut poles: EventWriter<UpdatePoleVisibilityEvent>,
     mut lines: EventWriter<UpdateLineVisibilityEvent>,
 ) {
-    for event in events.iter() {
+    for event in events.read() {
         if let Ok(mut visibility) = markers.get_mut(event.0) {
             visibility.0.update_visible(SELECTION_BAR_ID, false);
         }
diff --git a/crates/core/src/errors.rs b/crates/core/src/errors.rs
index b69c704f8..e18a3c7cd 100644
--- a/crates/core/src/errors.rs
+++ b/crates/core/src/errors.rs
@@ -4,7 +4,7 @@ macro_rules! log_full_error {
         use std::error::Error;
         use std::fmt::Write;
 
-        use bevy::prelude::error;
+        use tracing::error;
 
         let mut error_message = format!("{}", $err);
         let mut error: &dyn Error = &$err;
diff --git a/crates/core/src/frustum.rs b/crates/core/src/frustum.rs
index 0aa836431..239963060 100644
--- a/crates/core/src/frustum.rs
+++ b/crates/core/src/frustum.rs
@@ -23,12 +23,11 @@ pub fn intersects_parry(frustum: &Frustum, transform: Transform, aabb: &AabbP) -
 ///
 /// * `aabb` - object space AABB.
 pub fn intersects_bevy(frustum: &Frustum, transform: &GlobalTransform, aabb: &Aabb) -> bool {
-    let model = transform.compute_matrix();
     let model_sphere = Sphere {
-        center: model.transform_point3a(aabb.center),
+        center: transform.transform_point(aabb.center.into()).into(),
         radius: transform.radius_vec3a(aabb.half_extents),
     };
 
     frustum.intersects_sphere(&model_sphere, false)
-        && frustum.intersects_obb(aabb, &model, false, true)
+        && frustum.intersects_obb(aabb, &transform.affine(), false, true)
 }
diff --git a/crates/energy/src/battery.rs b/crates/energy/src/battery.rs
index 5b18417a7..b70335666 100644
--- a/crates/energy/src/battery.rs
+++ b/crates/energy/src/battery.rs
@@ -80,8 +80,9 @@ pub(crate) fn discharge_battery(time: Res<Time>, mut battery: Query<&mut Battery
 
 #[cfg(test)]
 mod tests {
+    use std::time::Duration;
+
     use bevy::prelude::*;
-    use bevy::time::TimePlugin;
 
     use super::*;
     use crate::battery::{Battery, DEFAULT_CAPACITY, DISCHARGE_RATE};
@@ -98,18 +99,21 @@ mod tests {
             ))
             .id();
 
-        app.add_plugins((BatteryPlugin, TimePlugin));
+        app.init_resource::<Time>();
+        app.add_plugins(BatteryPlugin);
 
         // run the app for 1 second
         app.update();
-        std::thread::sleep(std::time::Duration::from_secs(1));
+        app.world
+            .get_resource_mut::<Time>()
+            .unwrap()
+            .advance_by(Duration::from_secs(1));
         app.update();
 
         // check that the battery has discharged by at least 1*rate and 1.5*rate at most
         let battery = app.world.get::<Battery>(entity).unwrap();
         println!("battery: {:?}", battery);
 
-        assert!(battery.energy() <= DEFAULT_CAPACITY - DISCHARGE_RATE);
-        assert!(battery.energy() >= DEFAULT_CAPACITY - DISCHARGE_RATE * 1.5);
+        assert!(battery.energy() == DEFAULT_CAPACITY - DISCHARGE_RATE);
     }
 }
diff --git a/crates/gui/src/focus.rs b/crates/gui/src/focus.rs
index dba9a1304..48e998a1a 100644
--- a/crates/gui/src/focus.rs
+++ b/crates/gui/src/focus.rs
@@ -97,7 +97,7 @@ fn focus_system(
     let mut current = focus.current;
 
     if let Some(current_entity) = current {
-        if removals.iter().any(|e| e == current_entity) {
+        if removals.read().any(|e| e == current_entity) {
             current = None;
         }
     }
@@ -112,7 +112,7 @@ fn focus_system(
         }
     }
 
-    if let Some(event) = events.iter().last() {
+    if let Some(event) = events.read().last() {
         current = event.0;
     }
 
@@ -123,7 +123,7 @@ fn focus_system(
     }
 
     if let Some(previous_entity) = focus.previous {
-        if removals.iter().any(|e| e == previous_entity) {
+        if removals.read().any(|e| e == previous_entity) {
             focus.previous = None;
         }
     }
diff --git a/crates/gui/src/textbox.rs b/crates/gui/src/textbox.rs
index 55c36d288..c834b3b2f 100644
--- a/crates/gui/src/textbox.rs
+++ b/crates/gui/src/textbox.rs
@@ -158,13 +158,13 @@ fn input_system(
 
     // FIXME: Fix ordering of multiple event streams once
     // https://github.com/bevyengine/bevy/issues/5984 is fixed.
-    for event in characters.iter() {
+    for event in characters.read() {
         if !event.char.is_control() {
             text_box.push(event.char);
         }
     }
 
-    for event in keyboard.iter() {
+    for event in keyboard.read() {
         if event.state != ButtonState::Pressed {
             continue;
         }
diff --git a/crates/gui/src/toast.rs b/crates/gui/src/toast.rs
index ea3fffe5a..eb5ad648a 100644
--- a/crates/gui/src/toast.rs
+++ b/crates/gui/src/toast.rs
@@ -91,7 +91,7 @@ impl CurrentToast {
 }
 
 fn process_events(mut events: EventReader<ToastEvent>, mut queue: ResMut<ToastQueue>) {
-    for event in events.iter() {
+    for event in events.read() {
         info!("Enqueuing a toast: {}", event.text());
         queue.push(event.text().to_owned())
     }
diff --git a/crates/index/src/precise/mod.rs b/crates/index/src/precise/mod.rs
index f00bbe94a..351364063 100644
--- a/crates/index/src/precise/mod.rs
+++ b/crates/index/src/precise/mod.rs
@@ -111,7 +111,7 @@ fn insert(
 }
 
 fn remove(mut index: ResMut<EntityIndex>, mut removed: RemovedComponents<Indexed>) {
-    for entity in removed.iter() {
+    for entity in removed.read() {
         index.remove(entity);
     }
 }
diff --git a/crates/loader/Cargo.toml b/crates/loader/Cargo.toml
index 603704a98..b747c24ca 100644
--- a/crates/loader/Cargo.toml
+++ b/crates/loader/Cargo.toml
@@ -25,5 +25,6 @@ de_types.workspace = true
 
 # Other
 bevy.workspace = true
-iyes_progress.workspace = true
 futures-lite.workspace = true
+iyes_progress.workspace = true
+tracing.workspace = true
diff --git a/crates/loader/src/readiness.rs b/crates/loader/src/readiness.rs
index c56a0b0be..c3c995557 100644
--- a/crates/loader/src/readiness.rs
+++ b/crates/loader/src/readiness.rs
@@ -40,7 +40,7 @@ fn progress(
     move |conf: Res<GameConfig>,
           mut events: EventReader<GameReadinessEvent>,
           mut state: ResMut<NextState<GameState>>| {
-        if !conf.multiplayer() || events.iter().any(|e| **e == readiness) {
+        if !conf.multiplayer() || events.read().any(|e| **e == readiness) {
             state.set(target_state);
         }
     }
diff --git a/crates/lobby_client/src/plugin.rs b/crates/lobby_client/src/plugin.rs
index 127bb771f..45b66f553 100644
--- a/crates/lobby_client/src/plugin.rs
+++ b/crates/lobby_client/src/plugin.rs
@@ -114,7 +114,7 @@ fn fire<T: LobbyRequestCreator>(
     mut requests: EventReader<RequestEvent<T>>,
     mut responses: EventWriter<ResponseEvent<T>>,
 ) {
-    for event in requests.iter() {
+    for event in requests.read() {
         let result = client.fire(event.request());
 
         match result {
diff --git a/crates/lobby_client/src/systems.rs b/crates/lobby_client/src/systems.rs
index 39a196cb4..9127ac0fc 100644
--- a/crates/lobby_client/src/systems.rs
+++ b/crates/lobby_client/src/systems.rs
@@ -46,7 +46,7 @@ fn set_token<T>(mut events: EventReader<ResponseEvent<T>>, mut auth: ResMut<Auth
 where
     T: LobbyRequest<Response = Token>,
 {
-    let Some(event) = events.iter().last() else {
+    let Some(event) = events.read().last() else {
         return;
     };
     let Ok(token) = event.result() else { return };
diff --git a/crates/map/src/size.rs b/crates/map/src/size.rs
index d857d7698..cd9a2f29f 100644
--- a/crates/map/src/size.rs
+++ b/crates/map/src/size.rs
@@ -1,4 +1,4 @@
-use bevy::{prelude::Resource, reflect::TypeUuid};
+use bevy::prelude::Resource;
 use glam::Vec2;
 use parry2d::bounding_volume::Aabb;
 use serde::{Deserialize, Serialize};
@@ -7,8 +7,7 @@ use thiserror::Error;
 /// Maximum size of a side of the map in meters.
 pub const MAX_MAP_SIZE: f32 = 8000.;
 
-#[derive(Clone, Copy, Debug, TypeUuid, Serialize, Deserialize, PartialEq, Resource)]
-#[uuid = "bbf80d94-c4de-4c7c-9bdc-552ef25aff4e"]
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, PartialEq, Resource)]
 pub struct MapBounds(Vec2);
 
 impl MapBounds {
diff --git a/crates/menu/Cargo.toml b/crates/menu/Cargo.toml
index b290ac4bc..a6ddf6879 100644
--- a/crates/menu/Cargo.toml
+++ b/crates/menu/Cargo.toml
@@ -28,3 +28,4 @@ async-std.workspace = true
 bevy.workspace = true
 futures-lite.workspace = true
 thiserror.workspace = true
+tracing.workspace = true
diff --git a/crates/menu/src/multiplayer/create.rs b/crates/menu/src/multiplayer/create.rs
index e94d9e676..4d58315c5 100644
--- a/crates/menu/src/multiplayer/create.rs
+++ b/crates/menu/src/multiplayer/create.rs
@@ -212,7 +212,7 @@ fn map_selected_system(
     mut buttons: ButtonOps,
     mut toasts: EventWriter<ToastEvent>,
 ) {
-    let Some(event) = map_selected_events.iter().last() else {
+    let Some(event) = map_selected_events.read().last() else {
         return;
     };
     let hash = match MapHash::try_from(event.path()) {
diff --git a/crates/menu/src/multiplayer/gamelisting.rs b/crates/menu/src/multiplayer/gamelisting.rs
index 02f98a5c1..fc9393427 100644
--- a/crates/menu/src/multiplayer/gamelisting.rs
+++ b/crates/menu/src/multiplayer/gamelisting.rs
@@ -167,7 +167,7 @@ fn list_games_system(
     mut events: EventReader<ResponseEvent<ListGamesRequest>>,
     mut toasts: EventWriter<ToastEvent>,
 ) {
-    let Some(event) = events.iter().last() else {
+    let Some(event) = events.read().last() else {
         return;
     };
     commands.entity(table.0).despawn_descendants();
diff --git a/crates/menu/src/multiplayer/joined/state.rs b/crates/menu/src/multiplayer/joined/state.rs
index 694e57e26..d18c1c8c5 100644
--- a/crates/menu/src/multiplayer/joined/state.rs
+++ b/crates/menu/src/multiplayer/joined/state.rs
@@ -87,7 +87,7 @@ fn handle_readiness(
     mut sender: Sender<GetGameRequest>,
     mut ready: ResMut<ReadyRes>,
 ) {
-    if events.iter().all(|e| **e != Readiness::Ready) {
+    if events.read().all(|e| **e != Readiness::Ready) {
         return;
     }
 
@@ -128,7 +128,7 @@ fn start(
     mut multi_state: ResMut<NextState<MultiplayerState>>,
     mut toasts: EventWriter<ToastEvent>,
 ) {
-    let Some(event) = events.iter().last() else {
+    let Some(event) = events.read().last() else {
         return;
     };
 
diff --git a/crates/menu/src/multiplayer/joined/ui.rs b/crates/menu/src/multiplayer/joined/ui.rs
index a5942fd80..bd2aefba5 100644
--- a/crates/menu/src/multiplayer/joined/ui.rs
+++ b/crates/menu/src/multiplayer/joined/ui.rs
@@ -97,7 +97,7 @@ fn refresh(
     mut events: EventReader<RefreshPlayersEvent>,
     box_id: Res<PlayersBoxRes>,
 ) {
-    let Some(event) = events.iter().last() else {
+    let Some(event) = events.read().last() else {
         return;
     };
 
diff --git a/crates/menu/src/multiplayer/joining.rs b/crates/menu/src/multiplayer/joining.rs
index dfed48552..fbef53519 100644
--- a/crates/menu/src/multiplayer/joining.rs
+++ b/crates/menu/src/multiplayer/joining.rs
@@ -75,7 +75,7 @@ fn handle_joined_event(
     mut events: EventReader<GameJoinedEvent>,
     mut sender: Sender<JoinGameRequest>,
 ) {
-    let Some(event) = events.iter().last() else {
+    let Some(event) = events.read().last() else {
         return;
     };
 
diff --git a/crates/menu/src/multiplayer/requests.rs b/crates/menu/src/multiplayer/requests.rs
index b434fcf2c..4aed8e791 100644
--- a/crates/menu/src/multiplayer/requests.rs
+++ b/crates/menu/src/multiplayer/requests.rs
@@ -70,7 +70,7 @@ where
     /// ignored.
     pub(super) fn receive(&mut self) -> Option<&Result<T::Response>> {
         self.responses
-            .iter()
+            .read()
             .filter_map(|e| {
                 if self.counter.compare(e.id()) {
                     Some(e.result())
diff --git a/crates/menu/src/multiplayer/setup.rs b/crates/menu/src/multiplayer/setup.rs
index f548cba9b..f0a34026b 100644
--- a/crates/menu/src/multiplayer/setup.rs
+++ b/crates/menu/src/multiplayer/setup.rs
@@ -70,7 +70,7 @@ fn handle_setup_event(
     mut next_state: ResMut<NextState<MultiplayerState>>,
     mut events: EventReader<SetupGameEvent>,
 ) {
-    let Some(event) = events.iter().last() else {
+    let Some(event) = events.read().last() else {
         return;
     };
 
@@ -128,7 +128,7 @@ fn create_game_in_lobby(
     mut opened_events: EventReader<GameOpenedEvent>,
     mut sender: Sender<CreateGameRequest>,
 ) {
-    let Some(opened_event) = opened_events.iter().last() else {
+    let Some(opened_event) = opened_events.read().last() else {
         return;
     };
 
@@ -139,7 +139,7 @@ fn create_game_in_lobby(
 }
 
 fn handle_joined_event(mut commands: Commands, mut events: EventReader<GameJoinedEvent>) {
-    let Some(event) = events.iter().last() else {
+    let Some(event) = events.read().last() else {
         return;
     };
     commands.insert_resource(LocalPlayerRes::new(event.player()));
diff --git a/crates/menu/src/singleplayer.rs b/crates/menu/src/singleplayer.rs
index 1df1d2bb1..36a6547a6 100644
--- a/crates/menu/src/singleplayer.rs
+++ b/crates/menu/src/singleplayer.rs
@@ -123,7 +123,7 @@ fn button_system(
 }
 
 fn map_selected_system(mut events: EventReader<MapSelectedEvent>, mut map: ResMut<SelectedMap>) {
-    let Some(event) = events.iter().last() else {
+    let Some(event) = events.read().last() else {
         return;
     };
     map.0 = Some(event.path().into());
diff --git a/crates/movement/src/altitude.rs b/crates/movement/src/altitude.rs
index cd4001672..7d92b4cd7 100644
--- a/crates/movement/src/altitude.rs
+++ b/crates/movement/src/altitude.rs
@@ -67,8 +67,9 @@ fn update(
         &Transform,
     )>,
 ) {
-    objects.par_iter_mut().for_each_mut(
-        |(object_type, mut horizontal, mut climbing, transform)| {
+    objects
+        .par_iter_mut()
+        .for_each(|(object_type, mut horizontal, mut climbing, transform)| {
             let Some(flight) = solids.get(**object_type).flight() else {
                 return;
             };
@@ -97,6 +98,5 @@ fn update(
             if climbing.speed() != desired {
                 climbing.set_speed(desired);
             }
-        },
-    );
+        });
 }
diff --git a/crates/movement/src/kinematics.rs b/crates/movement/src/kinematics.rs
index b9f1fcf04..cb6d85906 100644
--- a/crates/movement/src/kinematics.rs
+++ b/crates/movement/src/kinematics.rs
@@ -117,7 +117,7 @@ fn kinematics(
 
     objects
         .par_iter_mut()
-        .for_each_mut(|(movement, climbing, mut kinematics, mut velocity)| {
+        .for_each(|(movement, climbing, mut kinematics, mut velocity)| {
             let desired_h_velocity = movement.velocity();
             let desired_heading = if desired_h_velocity == Vec2::ZERO {
                 kinematics.heading()
diff --git a/crates/movement/src/obstacles.rs b/crates/movement/src/obstacles.rs
index 357ac70a6..fbfd37fe8 100644
--- a/crates/movement/src/obstacles.rs
+++ b/crates/movement/src/obstacles.rs
@@ -76,7 +76,7 @@ fn update_nearby<M: Send + Sync + 'static, T: Component>(
 ) {
     objects
         .par_iter_mut()
-        .for_each_mut(|(entity, transform, mut cache)| {
+        .for_each(|(entity, transform, mut cache)| {
             cache.clear();
             let half_extent = Vec3::splat(NEARBY_HALF_EXTENT);
             let mins = transform.translation - half_extent;
diff --git a/crates/movement/src/pathing.rs b/crates/movement/src/pathing.rs
index 328e697af..275c6ddf4 100644
--- a/crates/movement/src/pathing.rs
+++ b/crates/movement/src/pathing.rs
@@ -68,7 +68,7 @@ fn follow_path(
 ) {
     objects
         .par_iter_mut()
-        .for_each_mut(|(transform, mut path, mut movement)| {
+        .for_each(|(transform, mut path, mut movement)| {
             let location = transform.translation.to_flat();
             let remaining = path.destination().distance(location);
             let advancement = path.advance(location, MAX_H_SPEED * 0.5);
diff --git a/crates/movement/src/repulsion.rs b/crates/movement/src/repulsion.rs
index 103cd7312..6ce6a56a2 100644
--- a/crates/movement/src/repulsion.rs
+++ b/crates/movement/src/repulsion.rs
@@ -159,7 +159,7 @@ fn repel_static(
 ) {
     objects
         .par_iter_mut()
-        .for_each_mut(|(movement, disc, static_obstacles, mut repulsion)| {
+        .for_each(|(movement, disc, static_obstacles, mut repulsion)| {
             if movement.stationary() {
                 return;
             }
@@ -204,7 +204,7 @@ fn repel_movable(
 ) {
     objects
         .par_iter_mut()
-        .for_each_mut(|(movement, disc, movable_obstacles, mut repulsion)| {
+        .for_each(|(movement, disc, movable_obstacles, mut repulsion)| {
             if movement.stationary() {
                 return;
             }
@@ -232,7 +232,7 @@ fn repel_bounds(
 ) {
     objects
         .par_iter_mut()
-        .for_each_mut(|(movement, disc, mut repulsion)| {
+        .for_each(|(movement, disc, mut repulsion)| {
             if movement.stationary() {
                 return;
             }
@@ -259,11 +259,11 @@ fn apply(
         &mut DesiredVelocity<RepulsionVelocity>,
     )>,
 ) {
-    objects.par_iter_mut().for_each_mut(
-        |(mut repulsion, path_velocity, mut repulsion_velocity)| {
+    objects
+        .par_iter_mut()
+        .for_each(|(mut repulsion, path_velocity, mut repulsion_velocity)| {
             let velocity = repulsion.apply(path_velocity.velocity());
             repulsion_velocity.update(velocity.clamp_length_max(MAX_H_SPEED));
             repulsion.clear();
-        },
-    );
+        });
 }
diff --git a/crates/movement/src/syncing.rs b/crates/movement/src/syncing.rs
index 7c6ad9dbb..1e6fe5eac 100644
--- a/crates/movement/src/syncing.rs
+++ b/crates/movement/src/syncing.rs
@@ -78,7 +78,7 @@ fn receive_transforms(
     mut entities: Query<&mut Transform>,
     mut events: EventReader<NetRecvTransformEvent>,
 ) {
-    for event in events.iter() {
+    for event in events.read() {
         if let Ok(mut transform) = entities.get_mut(event.entity()) {
             *transform = event.transform();
         }
diff --git a/crates/multiplayer/src/game.rs b/crates/multiplayer/src/game.rs
index 061b74dc1..3f4eff652 100644
--- a/crates/multiplayer/src/game.rs
+++ b/crates/multiplayer/src/game.rs
@@ -129,7 +129,7 @@ fn process_from_server(
     mut opened: EventWriter<GameOpenedEvent>,
     mut fatals: EventWriter<FatalErrorEvent>,
 ) {
-    for event in events.iter() {
+    for event in events.read() {
         match event.message() {
             FromServer::Pong(id) => {
                 info!("Pong {} received from server.", *id);
@@ -170,7 +170,7 @@ fn process_from_game(
     mut readiness_events: EventWriter<GameReadinessEvent>,
     mut next_state: ResMut<NextState<NetState>>,
 ) {
-    for event in inputs.iter() {
+    for event in inputs.read() {
         match event.message() {
             FromGame::Pong(id) => {
                 trace!("Received Pong({id}).");
@@ -230,7 +230,7 @@ fn set_readiness(
     mut readiness_events: EventReader<SetReadinessEvent>,
     mut message_events: EventWriter<ToGameServerEvent>,
 ) {
-    let Some(readiness) = readiness_events.iter().last() else {
+    let Some(readiness) = readiness_events.read().last() else {
         return;
     };
 
diff --git a/crates/multiplayer/src/lifecycle.rs b/crates/multiplayer/src/lifecycle.rs
index 98dba27fa..20a410593 100644
--- a/crates/multiplayer/src/lifecycle.rs
+++ b/crates/multiplayer/src/lifecycle.rs
@@ -129,7 +129,7 @@ fn errors(
     mut toasts: EventWriter<ToastEvent>,
     mut shutdowns: EventWriter<ShutdownMultiplayerEvent>,
 ) {
-    let Some(event) = events.iter().next() else {
+    let Some(event) = events.read().next() else {
         return;
     };
 
diff --git a/crates/multiplayer/src/messages.rs b/crates/multiplayer/src/messages.rs
index 481e58e63..fc166c61d 100644
--- a/crates/multiplayer/src/messages.rs
+++ b/crates/multiplayer/src/messages.rs
@@ -321,7 +321,7 @@ fn message_sender<E>(
     let mut unordered = PackageBuilder::new(Reliability::Unordered, E::PEERS, addr);
     let mut semi_ordered = PackageBuilder::new(Reliability::SemiOrdered, E::PEERS, addr);
 
-    for event in inputs.iter() {
+    for event in inputs.read() {
         let builder = match event.reliability() {
             Reliability::Unreliable => &mut unreliable,
             Reliability::Unordered => &mut unordered,
@@ -347,7 +347,7 @@ fn recv_messages(
     mut players: EventWriter<FromPlayersEvent>,
     mut fatals: EventWriter<FatalErrorEvent>,
 ) {
-    for event in packages.iter() {
+    for event in packages.read() {
         let package = event.package();
         if ports.is_main(package.source().port()) {
             decode_and_send::<FromServer, _>(package, &mut main_server, &mut fatals);
diff --git a/crates/multiplayer/src/playermsg.rs b/crates/multiplayer/src/playermsg.rs
index 7a058baf0..6706dae57 100644
--- a/crates/multiplayer/src/playermsg.rs
+++ b/crates/multiplayer/src/playermsg.rs
@@ -362,7 +362,7 @@ fn recv_messages(
     mut health_events: EventWriter<NetRecvHealthEvent>,
     mut projectile_events: EventWriter<NetRecvProjectileEvent>,
 ) {
-    for input in inputs.iter() {
+    for input in inputs.read() {
         match input.message() {
             ToPlayers::Spawn {
                 entity,
diff --git a/crates/multiplayer/src/stats.rs b/crates/multiplayer/src/stats.rs
index 3972c439f..451c881f2 100644
--- a/crates/multiplayer/src/stats.rs
+++ b/crates/multiplayer/src/stats.rs
@@ -243,7 +243,7 @@ fn pong<const R: bool>(
     mut tracker: ResMut<PingTracker<R>>,
     mut messages: EventReader<FromGameServerEvent>,
 ) {
-    for event in messages.iter() {
+    for event in messages.read() {
         if let FromGame::Pong(id) = event.message() {
             if let Some(send_time) = tracker.resolve(*id) {
                 let time = Instant::now();
diff --git a/crates/objects/src/collection.rs b/crates/objects/src/collection.rs
index 033a36a03..9197d9025 100644
--- a/crates/objects/src/collection.rs
+++ b/crates/objects/src/collection.rs
@@ -2,7 +2,7 @@ use std::{hash::Hash, path::PathBuf};
 
 use ahash::AHashMap;
 use bevy::{
-    asset::{Asset, AssetPath, LoadState},
+    asset::{AssetPath, RecursiveDependencyLoadState},
     prelude::*,
 };
 use enum_iterator::Sequence;
@@ -39,7 +39,11 @@ where
                 let mut model_path = PathBuf::new();
                 model_path.push(Self::DIRECTORY);
                 model_path.push(format!("{}.{}", key.stem(), Self::SUFFIX));
-                let handle = server.load(AssetPath::new(model_path, Self::label()));
+                let mut asset_path = AssetPath::from(model_path);
+                if let Some(label) = Self::label() {
+                    asset_path = asset_path.with_label(label);
+                }
+                let handle = server.load(asset_path);
                 (key, handle)
             },
         )))
@@ -47,18 +51,29 @@ where
 
     /// Returns progress of the loading.
     ///
+    /// It shall not be called before [`Self::init`].
+    ///
     /// # Panics
     ///
-    /// Panics if loading any of the assets is either failed or unloaded.
+    /// Panics if loading any of the assets is either failed or unknown.
     fn progress(&self, server: &AssetServer) -> Progress {
         enum_iterator::all::<Self::Key>()
-            .map(|key| match server.get_load_state(self.get(key)) {
-                LoadState::Failed => panic!("Model loading failed"),
-                LoadState::Unloaded => panic!("Model is unexpectedly unloaded"),
-                LoadState::NotLoaded => false.into(),
-                LoadState::Loading => false.into(),
-                LoadState::Loaded => true.into(),
-            })
+            .map(
+                |key| match server.get_recursive_dependency_load_state(self.get(key)) {
+                    Some(load_state) => match load_state {
+                        RecursiveDependencyLoadState::Failed => panic!("Model loading failed"),
+                        RecursiveDependencyLoadState::NotLoaded => false.into(),
+                        RecursiveDependencyLoadState::Loading => false.into(),
+                        RecursiveDependencyLoadState::Loaded => true.into(),
+                    },
+                    None => panic!(
+                        "Unknown asset: {}/{}.{}",
+                        Self::DIRECTORY,
+                        key.stem(),
+                        Self::SUFFIX
+                    ),
+                },
+            )
             .reduce(|a, b| a + b)
             .unwrap_or(Progress { done: 0, total: 0 })
     }
diff --git a/crates/objects/src/solids.rs b/crates/objects/src/solids.rs
index 0a4d6b730..a8ea84718 100644
--- a/crates/objects/src/solids.rs
+++ b/crates/objects/src/solids.rs
@@ -1,10 +1,10 @@
 use ahash::AHashMap;
 use anyhow::Context;
 use bevy::{
-    asset::{AssetLoader, LoadContext, LoadedAsset},
+    asset::{io::Reader, AssetLoader, AsyncReadExt, LoadContext},
     ecs::system::SystemParam,
     prelude::*,
-    reflect::{TypePath, TypeUuid},
+    reflect::TypePath,
     utils::BoxedFuture,
 };
 use de_core::state::AppState;
@@ -28,8 +28,8 @@ pub(crate) struct SolidsPlugin;
 
 impl Plugin for SolidsPlugin {
     fn build(&self, app: &mut App) {
-        app.add_asset::<SolidObject>()
-            .add_asset_loader(SolidObjectLoader)
+        app.init_asset::<SolidObject>()
+            .register_asset_loader(SolidObjectLoader)
             .add_systems(OnEnter(AppState::AppLoading), setup)
             .add_systems(
                 Update,
@@ -66,8 +66,7 @@ impl AssetCollectionLoader for Solids {
     }
 }
 
-#[derive(TypeUuid, TypePath)]
-#[uuid = "7b0690cc-951e-487b-8e69-db3119f5fb32"]
+#[derive(Asset, TypePath)]
 pub struct SolidObject {
     ichnography: Ichnography,
     collider: ObjectCollider,
@@ -128,17 +127,22 @@ struct SolidObjectSerde {
 struct SolidObjectLoader;
 
 impl AssetLoader for SolidObjectLoader {
+    type Asset = SolidObject;
+    type Settings = ();
+    type Error = anyhow::Error;
+
     fn load<'a>(
         &'a self,
-        bytes: &'a [u8],
-        load_context: &'a mut LoadContext,
-    ) -> BoxedFuture<'a, anyhow::Result<()>> {
+        reader: &'a mut Reader,
+        _settings: &'a Self::Settings,
+        _load_context: &'a mut LoadContext,
+    ) -> BoxedFuture<'a, anyhow::Result<Self::Asset>> {
         Box::pin(async move {
+            let mut bytes = Vec::new();
+            reader.read_to_end(&mut bytes).await?;
             let solid_serde: SolidObjectSerde =
-                serde_json::from_slice(bytes).context("Failed to parse object JSON")?;
-            let solid = SolidObject::try_from(solid_serde)?;
-            load_context.set_default_asset(LoadedAsset::new(solid));
-            Ok(())
+                serde_json::from_slice(&bytes).context("Failed to parse object JSON")?;
+            SolidObject::try_from(solid_serde)
         })
     }
 
diff --git a/crates/pathing/Cargo.toml b/crates/pathing/Cargo.toml
index f8ce1b6cf..3d8070f95 100644
--- a/crates/pathing/Cargo.toml
+++ b/crates/pathing/Cargo.toml
@@ -21,16 +21,17 @@ de_objects.workspace = true
 de_types.workspace = true
 
 # Other
+ahash.workspace = true
+approx.workspace = true
 bevy.workspace = true
+futures-lite.workspace = true
 glam.workspace = true
-parry2d.workspace = true
 nalgebra.workspace = true
-ahash.workspace = true
-approx.workspace = true
+parry2d.workspace = true
 rstar.workspace = true
-tinyvec.workspace = true
 spade.workspace = true
-futures-lite.workspace = true
+tinyvec.workspace = true
+tracing.workspace = true
 
 [dev-dependencies]
 # DE
diff --git a/crates/pathing/src/finder.rs b/crates/pathing/src/finder.rs
index 627878a01..f4fd90977 100644
--- a/crates/pathing/src/finder.rs
+++ b/crates/pathing/src/finder.rs
@@ -1,7 +1,6 @@
 //! This module contains global map shortest path finder.
 
 use ahash::AHashMap;
-use bevy::prelude::{debug, info};
 use de_map::size::MapBounds;
 use de_types::path::Path;
 use parry2d::{
@@ -12,6 +11,7 @@ use parry2d::{
 };
 use rstar::{PointDistance, RTree, RTreeObject, AABB};
 use tinyvec::{ArrayVec, TinyVec};
+use tracing::{debug, info};
 
 use crate::{
     exclusion::ExclusionArea,
diff --git a/crates/pathing/src/fplugin.rs b/crates/pathing/src/fplugin.rs
index 7d11520c6..748dd3643 100644
--- a/crates/pathing/src/fplugin.rs
+++ b/crates/pathing/src/fplugin.rs
@@ -177,7 +177,7 @@ fn check_removed(
     mut state: ResMut<UpdateFinderState>,
     mut removed: RemovedComponents<StaticSolid>,
 ) {
-    if removed.iter().next().is_some() {
+    if removed.read().next().is_some() {
         state.invalidate();
     }
 }
diff --git a/crates/pathing/src/pplugin.rs b/crates/pathing/src/pplugin.rs
index c8b8344df..3bfddfe4a 100644
--- a/crates/pathing/src/pplugin.rs
+++ b/crates/pathing/src/pplugin.rs
@@ -1,6 +1,5 @@
 use ahash::AHashMap;
 use bevy::{
-    ecs::query::Has,
     prelude::*,
     tasks::{AsyncComputeTaskPool, Task},
 };
@@ -217,7 +216,7 @@ fn update_requested_paths(
     mut events: EventReader<UpdateEntityPathEvent>,
     entities: Query<&Transform, With<MovableSolid>>,
 ) {
-    for event in events.iter() {
+    for event in events.read() {
         if let Ok(transform) = entities.get(event.entity()) {
             commands.entity(event.entity()).insert(event.target());
             state.spawn_new(
@@ -244,7 +243,7 @@ fn update_path_components(
     targets: Query<&PathTarget>,
     mut events: EventReader<PathFoundEvent>,
 ) {
-    for event in events.iter() {
+    for event in events.read() {
         let mut entity_commands = commands.entity(event.entity());
         match event.path() {
             Some(path) => {
@@ -271,7 +270,7 @@ fn remove_path_targets(
     targets: Query<&PathTarget>,
     mut removed: RemovedComponents<ScheduledPath>,
 ) {
-    for entity in removed.iter() {
+    for entity in removed.read() {
         if let Ok(target) = targets.get(entity) {
             if !target.permanent() {
                 commands.entity(entity).remove::<PathTarget>();
diff --git a/crates/pathing/src/syncing.rs b/crates/pathing/src/syncing.rs
index 277750166..5fbe74abd 100644
--- a/crates/pathing/src/syncing.rs
+++ b/crates/pathing/src/syncing.rs
@@ -34,7 +34,7 @@ impl Plugin for SyncingPlugin {
 }
 
 fn receive_paths(mut commands: Commands, mut events: EventReader<NetRecvSetPathEvent>) {
-    for event in events.iter() {
+    for event in events.read() {
         let mut entity_commands = commands.entity(event.entity());
 
         match event.path() {
@@ -53,7 +53,7 @@ fn send_new_paths(
     mut path_events: EventReader<PathFoundEvent>,
     mut net_events: EventWriter<ToPlayersEvent>,
 ) {
-    for event in path_events.iter() {
+    for event in path_events.read() {
         net_events.send(ToPlayersEvent::new(ToPlayers::SetPath {
             entity: net_entities.local_net_id(event.entity()),
             waypoints: event.path().map(|p| p.try_into().unwrap()),
diff --git a/crates/signs/src/bars.rs b/crates/signs/src/bars.rs
index c071605e0..347d4e98d 100644
--- a/crates/signs/src/bars.rs
+++ b/crates/signs/src/bars.rs
@@ -3,7 +3,7 @@ use std::time::Duration;
 use bevy::{
     pbr::{MaterialPipeline, MaterialPipelineKey, NotShadowCaster, NotShadowReceiver},
     prelude::*,
-    reflect::{TypePath, TypeUuid},
+    reflect::TypePath,
     render::{
         mesh::{Indices, MeshVertexAttribute, MeshVertexBufferLayout},
         render_resource::{
@@ -135,8 +135,7 @@ impl BarMesh {
     }
 }
 
-#[derive(AsBindGroup, TypeUuid, TypePath, Debug, Clone)]
-#[uuid = "66547498-fb0d-4fb6-a8e6-c792367e53d6"]
+#[derive(Asset, AsBindGroup, TypePath, Debug, Clone)]
 struct BarMaterial {
     #[uniform(0)]
     value: f32,
@@ -241,7 +240,7 @@ fn update_value(
     mut bars: Query<(&Handle<BarMaterial>, &mut BarUpdateTimer)>,
     mut events: EventReader<UpdateBarValueEvent>,
 ) {
-    for event in events.iter() {
+    for event in events.read() {
         if let Ok(child) = parents.get(event.entity()) {
             let (handle, mut timer) = bars.get_mut(child.0).unwrap();
             let material = materials.get_mut(handle).unwrap();
@@ -257,7 +256,7 @@ fn update_visibility_events(
     mut bars: Query<&mut VisibilityFlags>,
     mut events: EventReader<UpdateBarVisibilityEvent>,
 ) {
-    for event in events.iter() {
+    for event in events.read() {
         if let Ok(child) = parents.get(event.entity()) {
             bars.get_mut(child.0)
                 .unwrap()
diff --git a/crates/signs/src/line.rs b/crates/signs/src/line.rs
index dd5916660..89df70c95 100644
--- a/crates/signs/src/line.rs
+++ b/crates/signs/src/line.rs
@@ -1,6 +1,6 @@
 use ahash::AHashMap;
 use bevy::prelude::*;
-use bevy::reflect::{TypePath, TypeUuid};
+use bevy::reflect::TypePath;
 use bevy::render::render_resource::{AsBindGroup, ShaderRef};
 use de_core::cleanup::DespawnOnGameExit;
 use de_core::objects::Active;
@@ -53,8 +53,7 @@ enum LinesSet {
 }
 
 // Passed to the `rally_point.wgsl` shader
-#[derive(AsBindGroup, TypeUuid, TypePath, Debug, Clone)]
-#[uuid = "d0fae52d-f398-4416-9b72-9039093a6c34"]
+#[derive(Asset, AsBindGroup, TypePath, Debug, Clone)]
 pub struct LineMaterial {}
 
 impl Material for LineMaterial {
@@ -160,7 +159,7 @@ fn update_line_end(
     lines: Res<LineLocations>,
     mut line_location: EventWriter<UpdateLineLocationEvent>,
 ) {
-    for event in &mut events {
+    for event in events.read() {
         if let Some(old_location) = lines.0.get(&event.owner) {
             let location = LineLocation::new(old_location.start, event.end);
             line_location.send(UpdateLineLocationEvent::new(event.owner, location));
@@ -174,7 +173,7 @@ fn update_line_location(
     mut transforms: Query<&mut Transform>,
     mut line_locations: ResMut<LineLocations>,
 ) {
-    for event in &mut events {
+    for event in events.read() {
         line_locations.0.insert(event.owner, event.location);
         if let Some(line_entity) = lines.0.get(&event.owner) {
             let mut current_transform = transforms.get_mut(*line_entity).unwrap();
@@ -190,7 +189,7 @@ fn update_line_visibility(
     mut commands: Commands,
     line_mesh: Res<LineMesh>,
 ) {
-    for event in &mut events {
+    for event in events.read() {
         if event.visible && !lines.0.contains_key(&event.owner) {
             let transform = line_locations
                 .0
@@ -221,7 +220,7 @@ fn owner_despawn(
     mut lines: ResMut<LineEntities>,
     mut removed: RemovedComponents<Active>,
 ) {
-    for owner in removed.iter() {
+    for owner in removed.read() {
         if let Some(line) = lines.0.remove(&owner) {
             commands.entity(line).despawn_recursive();
         }
diff --git a/crates/signs/src/pole.rs b/crates/signs/src/pole.rs
index 85b357026..3ce03261f 100644
--- a/crates/signs/src/pole.rs
+++ b/crates/signs/src/pole.rs
@@ -128,7 +128,7 @@ fn location_events(
     mut owner_to_pole: ResMut<OwnersToPoles>,
     mut events: EventReader<UpdatePoleLocationEvent>,
 ) {
-    for event in events.iter() {
+    for event in events.read() {
         owner_to_pole
             .0
             .entry(event.owner)
@@ -144,7 +144,7 @@ fn visibility_events(
     mut owner_to_pole: ResMut<OwnersToPoles>,
     mut events: EventReader<UpdatePoleVisibilityEvent>,
 ) {
-    for event in events.iter() {
+    for event in events.read() {
         if let Some(pole) = owner_to_pole.0.get_mut(&event.owner) {
             pole.visible = event.visible;
         }
@@ -155,7 +155,7 @@ fn despawned(
     mut owner_to_pole: ResMut<OwnersToPoles>,
     mut despawned: RemovedComponents<ObjectTypeComponent>,
 ) {
-    for entity in despawned.iter() {
+    for entity in despawned.read() {
         owner_to_pole.0.remove(&entity);
     }
 }
@@ -200,7 +200,7 @@ fn spawn_poles(
     mut events: EventReader<SpawnPoleEvent>,
 ) {
     let scene = scenes.get(SceneType::Pole);
-    for event in events.iter() {
+    for event in events.read() {
         let location = event.0.into();
 
         let transform = Transform::from_translation(event.0.to_msl());
@@ -208,8 +208,7 @@ fn spawn_poles(
             .spawn((
                 transform,
                 GlobalTransform::from(transform),
-                Visibility::Visible,
-                ComputedVisibility::default(),
+                VisibilityBundle::default(),
                 DespawnOnGameExit,
                 scene.clone(),
             ))
@@ -224,7 +223,7 @@ fn despawn_poles(
     mut poles: ResMut<Poles>,
     mut events: EventReader<DespawnPoleEvent>,
 ) {
-    for event in events.iter() {
+    for event in events.read() {
         let entity = poles.0.remove(&event.0.into()).unwrap();
         commands.entity(entity).despawn_recursive();
     }
@@ -235,7 +234,7 @@ fn move_poles(
     mut query: Query<&mut Transform>,
     mut events: EventReader<MovePoleEvent>,
 ) {
-    for event in events.iter() {
+    for event in events.read() {
         let old = Vec2Ord::from(event.0);
         let new = Vec2Ord::from(event.1);
         let entity = poles.0.remove(&old).unwrap();
diff --git a/crates/spawner/src/despawner.rs b/crates/spawner/src/despawner.rs
index b7713f982..45e6bd910 100644
--- a/crates/spawner/src/despawner.rs
+++ b/crates/spawner/src/despawner.rs
@@ -71,7 +71,7 @@ fn despawn_active_local(
     mut event_writer: EventWriter<DespawnActiveEvent>,
     mut net_events: EventWriter<ToPlayersEvent>,
 ) {
-    for event in event_reader.iter() {
+    for event in event_reader.read() {
         event_writer.send(DespawnActiveEvent(event.0));
 
         if config.multiplayer() {
@@ -86,7 +86,7 @@ fn despawn_active_remote(
     mut event_reader: EventReader<NetRecvDespawnActiveEvent>,
     mut event_writer: EventWriter<DespawnActiveEvent>,
 ) {
-    for event in event_reader.iter() {
+    for event in event_reader.read() {
         event_writer.send(DespawnActiveEvent(event.entity()));
     }
 }
@@ -96,7 +96,7 @@ fn despawn_active_peer_left(
     mut peer_left_events: EventReader<PeerLeftEvent>,
     mut event_writer: EventWriter<DespawnActiveEvent>,
 ) {
-    for event in peer_left_events.iter() {
+    for event in peer_left_events.read() {
         if let Some(entity_map) = net_commands.remove_player(event.id()) {
             for entity in entity_map.locals() {
                 event_writer.send(DespawnActiveEvent(entity));
@@ -112,7 +112,7 @@ fn despawn_active(
     mut event_writer: EventWriter<DespawnEvent>,
     mut play_audio: EventWriter<PlaySpatialAudioEvent>,
 ) {
-    for event in event_reader.iter() {
+    for event in event_reader.read() {
         let Ok((&player, &object_type, transform)) = entities.get(event.0) else {
             panic!("Despawn of non-existing active object requested.");
         };
@@ -136,7 +136,7 @@ fn despawn_active(
 
 /// Despawn all entities marked for despawning
 fn despawn(mut commands: Commands, mut despawning: EventReader<DespawnEvent>) {
-    for entity in despawning.iter() {
+    for entity in despawning.read() {
         commands.entity(entity.0).despawn_recursive();
     }
 }
@@ -229,7 +229,7 @@ fn send_data<'w, Q, T, F>(
     Q: WorldQuery + Send + Sync + 'w,
     F: ReadOnlyWorldQuery + Send + Sync + 'w,
 {
-    for DespawnEvent(entity) in despawning.iter() {
+    for DespawnEvent(entity) in despawning.read() {
         if let Ok(data) = data.get_component::<T>(*entity) {
             events.send(DespawnedComponentsEvent {
                 entity: *entity,
@@ -311,7 +311,7 @@ mod tests {
         trace!("-----------------------------------");
 
         assert_eq!(
-            simple_events.get(&app.world).iter().next().unwrap().data,
+            simple_events.get(&app.world).read().next().unwrap().data,
             TestComponent { value: 1 }
         );
 
@@ -335,7 +335,7 @@ mod tests {
         trace!("-----------------------------------");
 
         assert_eq!(
-            complex_events.get(&app.world).iter().next().unwrap().data,
+            complex_events.get(&app.world).read().next().unwrap().data,
             ComplexComponent {
                 value: 2,
                 value2: ComplexStruct {
diff --git a/crates/spawner/src/draft.rs b/crates/spawner/src/draft.rs
index 5c9fb356c..43d6c6660 100644
--- a/crates/spawner/src/draft.rs
+++ b/crates/spawner/src/draft.rs
@@ -53,8 +53,7 @@ pub struct DraftBundle {
     object_type: ObjectTypeComponent,
     transform: Transform,
     global_transform: GlobalTransform,
-    visibility: Visibility,
-    computed_visibility: ComputedVisibility,
+    visibility: VisibilityBundle,
     draft: DraftAllowed,
     ready: DraftReady,
 }
@@ -65,8 +64,7 @@ impl DraftBundle {
             object_type: ObjectType::Active(ActiveObjectType::Building(building_type)).into(),
             transform,
             global_transform: transform.into(),
-            visibility: Visibility::Inherited,
-            computed_visibility: ComputedVisibility::HIDDEN,
+            visibility: VisibilityBundle::default(),
             draft: DraftAllowed::default(),
             ready: DraftReady::default(),
         }
diff --git a/crates/spawner/src/spawner.rs b/crates/spawner/src/spawner.rs
index 9a7f83c47..39bc33ea0 100644
--- a/crates/spawner/src/spawner.rs
+++ b/crates/spawner/src/spawner.rs
@@ -147,7 +147,7 @@ fn spawn_local_active(
     mut path_events: EventWriter<UpdateEntityPathEvent>,
     mut net_events: EventWriter<ToPlayersEvent>,
 ) {
-    for event in event_reader.iter() {
+    for event in event_reader.read() {
         let mut entity_commands = commands.spawn(Local);
 
         if config.locals().is_playable(event.player) || cfg!(feature = "godmode") {
@@ -181,7 +181,7 @@ fn spawn_remote_active(
     mut event_reader: EventReader<NetRecvSpawnActiveEvent>,
     mut event_writer: EventWriter<SpawnActiveEvent>,
 ) {
-    for event in event_reader.iter() {
+    for event in event_reader.read() {
         event_writer.send(SpawnActiveEvent::new(
             event.entity(),
             event.object_type(),
@@ -200,7 +200,7 @@ fn spawn_active(
     mut event_writer: EventWriter<SpawnEvent>,
     mut audio_events: EventWriter<PlaySpatialAudioEvent>,
 ) {
-    for event in event_reader.iter() {
+    for event in event_reader.read() {
         counter
             .player_mut(event.player)
             .update(event.object_type, 1);
@@ -256,7 +256,7 @@ fn spawn_inactive(
     mut event_reader: EventReader<SpawnInactiveEvent>,
     mut event_writer: EventWriter<SpawnEvent>,
 ) {
-    for event in event_reader.iter() {
+    for event in event_reader.read() {
         let entity = commands.spawn(StaticSolid).id();
         event_writer.send(SpawnEvent::new(
             entity,
@@ -267,15 +267,14 @@ fn spawn_inactive(
 }
 
 fn spawn(mut commands: Commands, scenes: Res<Scenes>, mut events: EventReader<SpawnEvent>) {
-    for event in events.iter() {
+    for event in events.read() {
         info!("Spawning object {}", event.object_type);
         let mut entity_commands = commands.entity(event.entity);
 
         entity_commands.insert((
             event.transform,
             GlobalTransform::from(event.transform),
-            Visibility::Inherited,
-            ComputedVisibility::default(),
+            VisibilityBundle::default(),
             ObjectTypeComponent::from(event.object_type),
             scenes.get(SceneType::Solid(event.object_type)).clone(),
             DespawnOnGameExit,
diff --git a/crates/terrain/src/marker.rs b/crates/terrain/src/marker.rs
index 589953d74..b66de19c3 100644
--- a/crates/terrain/src/marker.rs
+++ b/crates/terrain/src/marker.rs
@@ -1,4 +1,5 @@
 use bevy::{
+    pbr::ExtendedMaterial,
     prelude::*,
     render::{
         primitives::{Aabb as BevyAabb, Frustum},
@@ -114,13 +115,16 @@ impl Marker for RectangleMarker {
 }
 
 fn update_markers<M>(
-    mut materials: ResMut<Assets<TerrainMaterial>>,
+    mut materials: ResMut<Assets<ExtendedMaterial<StandardMaterial, TerrainMaterial>>>,
     solids: SolidObjects,
     camera: Query<(&Transform, &Frustum), With<Camera3d>>,
-    terrains: Query<(&ComputedVisibility, &Handle<TerrainMaterial>)>,
+    terrains: Query<(
+        &ViewVisibility,
+        &Handle<ExtendedMaterial<StandardMaterial, TerrainMaterial>>,
+    )>,
     markers: Query<(
         &ObjectTypeComponent,
-        &ComputedVisibility,
+        &ViewVisibility,
         &GlobalTransform,
         &M,
         &MarkerVisibility,
@@ -140,7 +144,7 @@ fn update_markers<M>(
 
     let mut candidates = Vec::new();
     for (&object_type, circle_visibility, transform, marker, marker_visibility) in markers.iter() {
-        if !circle_visibility.is_visible_in_hierarchy() {
+        if !circle_visibility.get() {
             continue;
         }
 
@@ -171,11 +175,11 @@ fn update_markers<M>(
         .collect();
 
     for (terrain_visibility, material) in terrains.iter() {
-        if !terrain_visibility.is_visible_in_hierarchy() {
+        if !terrain_visibility.get() {
             continue;
         }
 
         let material = materials.get_mut(material).unwrap();
-        M::apply_to_material(material, shapes.clone());
+        M::apply_to_material(&mut material.extension, shapes.clone());
     }
 }
diff --git a/crates/terrain/src/plugin.rs b/crates/terrain/src/plugin.rs
index 1b26214a5..463f41565 100644
--- a/crates/terrain/src/plugin.rs
+++ b/crates/terrain/src/plugin.rs
@@ -1,15 +1,16 @@
 use bevy::{
     asset::LoadState,
+    pbr::ExtendedMaterial,
     prelude::*,
-    render::{
-        render_resource::{AddressMode, SamplerDescriptor},
-        texture::ImageSampler,
-    },
+    render::texture::{ImageAddressMode, ImageSampler, ImageSamplerDescriptor},
 };
 use de_core::{gamestate::GameState, state::AppState};
 use iyes_progress::prelude::*;
 
-use crate::{shader::TerrainMaterial, terrain::Terrain};
+use crate::{
+    shader::{TerrainMaterial, UV_SCALE},
+    terrain::Terrain,
+};
 
 const TERRAIN_TEXTURE: &str = "textures/terrain.png";
 
@@ -17,7 +18,9 @@ pub(crate) struct TerrainPlugin;
 
 impl Plugin for TerrainPlugin {
     fn build(&self, app: &mut App) {
-        app.add_plugins(MaterialPlugin::<TerrainMaterial>::default())
+        app.add_plugins(MaterialPlugin::<
+            ExtendedMaterial<StandardMaterial, TerrainMaterial>,
+        >::default())
             .add_systems(OnEnter(AppState::InGame), load)
             .add_systems(OnExit(AppState::InGame), cleanup)
             .add_systems(
@@ -55,38 +58,50 @@ fn setup_textures(
     };
 
     match server.get_load_state(&textures.0) {
-        LoadState::NotLoaded => false.into(),
-        LoadState::Loading => false.into(),
-        LoadState::Failed => panic!("Texture loading has failed."),
-        LoadState::Unloaded => unreachable!(),
-        LoadState::Loaded => {
-            // Ideally, this setup would happen in some kind of asset post
-            // processing. This is however not yet supported by Bevy.
-            //
-            // https://github.com/bevyengine/bevy/discussions/3972
-            let image = images.get_mut(&textures.0).unwrap();
-            image.sampler_descriptor = ImageSampler::Descriptor(SamplerDescriptor {
-                address_mode_u: AddressMode::Repeat,
-                address_mode_v: AddressMode::Repeat,
-                ..Default::default()
-            });
+        Some(load_state) => match load_state {
+            LoadState::NotLoaded => false.into(),
+            LoadState::Loading => false.into(),
+            LoadState::Failed => panic!("Texture loading has failed."),
+            LoadState::Loaded => {
+                // Ideally, this setup would happen in some kind of asset post
+                // processing. This was not supported by Bevy at the time of
+                // implementation.
+                //
+                // https://github.com/bevyengine/bevy/discussions/3972
+                let image = images.get_mut(&textures.0).unwrap();
+                image.sampler = ImageSampler::Descriptor(ImageSamplerDescriptor {
+                    address_mode_u: ImageAddressMode::Repeat,
+                    address_mode_v: ImageAddressMode::Repeat,
+                    ..Default::default()
+                });
 
-            true.into()
-        }
+                true.into()
+            }
+        },
+        None => panic!("Terrain texture asset unknown."),
     }
 }
 
 fn init(
     mut commands: Commands,
     mut meshes: ResMut<Assets<Mesh>>,
-    mut materials: ResMut<Assets<TerrainMaterial>>,
+    mut materials: ResMut<Assets<ExtendedMaterial<StandardMaterial, TerrainMaterial>>>,
     textures: Res<Textures>,
     uninitialized: Query<(Entity, &Terrain, &Transform), Without<Handle<Mesh>>>,
 ) {
     for (entity, terrain, transform) in uninitialized.iter() {
         commands.entity(entity).insert(MaterialMeshBundle {
             mesh: meshes.add(terrain.generate_mesh(transform.translation)),
-            material: materials.add(TerrainMaterial::new(textures.0.clone())),
+            material: materials.add(ExtendedMaterial {
+                base: StandardMaterial {
+                    base_color_texture: Some(textures.0.clone()),
+                    perceptual_roughness: 0.8,
+                    metallic: 0.23,
+                    reflectance: 0.06,
+                    ..default()
+                },
+                extension: TerrainMaterial::new(UV_SCALE),
+            }),
             transform: *transform,
             ..Default::default()
         });
diff --git a/crates/terrain/src/shader.rs b/crates/terrain/src/shader.rs
index 1e4663a47..f37b4f818 100644
--- a/crates/terrain/src/shader.rs
+++ b/crates/terrain/src/shader.rs
@@ -1,12 +1,14 @@
 use std::{cmp::Ordering, ops::Range};
 
 use bevy::{
-    prelude::{Handle, Image, Material},
-    reflect::{TypePath, TypeUuid},
+    asset::Asset,
+    pbr::MaterialExtension,
+    reflect::TypePath,
     render::render_resource::{AsBindGroup, ShaderRef, ShaderType},
 };
 use glam::{Mat3, Vec2};
 
+pub(crate) const UV_SCALE: f32 = 16.;
 // * Keep this in sync with terrain.wgsl.
 // * Keep this smaller or equal to de_types::objects::PLAYER_MAX_UNITS.
 pub(crate) const CIRCLE_CAPACITY: usize = 127;
@@ -14,24 +16,22 @@ pub(crate) const CIRCLE_CAPACITY: usize = 127;
 // * Keep this smaller or equal to de_types::objects::PLAYER_MAX_BUILDINGS.
 pub(crate) const RECTANGLE_CAPACITY: usize = 31;
 
-#[derive(AsBindGroup, TypeUuid, TypePath, Debug, Clone)]
-#[uuid = "9e124e04-fdf1-4836-b82d-fa2f01fddb62"]
+#[derive(Asset, AsBindGroup, TypePath, Debug, Clone)]
 pub struct TerrainMaterial {
-    #[uniform(0)]
+    #[uniform(100)]
+    uv_scale: f32,
+    #[uniform(101)]
     circles: KdTree,
-    #[uniform(1)]
+    #[uniform(102)]
     rectangles: Rectangles,
-    #[texture(2)]
-    #[sampler(3)]
-    texture: Handle<Image>,
 }
 
 impl TerrainMaterial {
-    pub(crate) fn new(texture: Handle<Image>) -> Self {
+    pub(crate) fn new(uv_scale: f32) -> Self {
         Self {
+            uv_scale,
             circles: KdTree::empty(),
             rectangles: Rectangles::default(),
-            texture,
         }
     }
 
@@ -44,7 +44,7 @@ impl TerrainMaterial {
     }
 }
 
-impl Material for TerrainMaterial {
+impl MaterialExtension for TerrainMaterial {
     fn fragment_shader() -> ShaderRef {
         "shaders/terrain.wgsl".into()
     }
diff --git a/crates/terrain/src/terrain.rs b/crates/terrain/src/terrain.rs
index 6af7a6148..de1826a2a 100644
--- a/crates/terrain/src/terrain.rs
+++ b/crates/terrain/src/terrain.rs
@@ -14,6 +14,8 @@ use parry3d::{
     shape::HeightField,
 };
 
+use crate::shader::UV_SCALE;
+
 #[derive(Bundle)]
 pub struct TerrainBundle {
     transform: Transform,
@@ -76,7 +78,10 @@ impl Terrain {
                         let world = Vec2::new(point.x, point.z).to_msl();
                         positions.push([world.x, point.y, world.z]);
                         normals.push([0., 1., 0.]);
-                        uvs.push([point.x + translation.x, point.z + translation.y]);
+                        uvs.push([
+                            (point.x + translation.x) / UV_SCALE,
+                            (point.z + translation.y) / UV_SCALE,
+                        ]);
                     }
                 }
             }