diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5ace6e657..aefb98393 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -174,6 +174,7 @@ all the sub-crates. The crate inter-dependencies form an orderly DAG.
 
 ### Bevy Schedule
 
+TODO fix this
 See de_core::baseset::GameSet.
 
 ### Coordinate Systems
diff --git a/Cargo.lock b/Cargo.lock
index b659739bf..27cc54f0f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -20,24 +20,24 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046"
 
 [[package]]
 name = "accesskit"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "704d532b1cd3d912bb37499c55a81ac748cc1afa737eedd100ba441acdd47d38"
+checksum = "02c98a5d094590335462354da402d754fe2cb78f0e6ce5024611c28ed539c1de"
 
 [[package]]
 name = "accesskit_consumer"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48ba8b23cfca3944012ee2e5c71c02077a400e034c720eed6bd927cb6b4d1fd9"
+checksum = "ca541e0fdb600916d196a940228df99b86d804fd2e6ef13894d7814f2799db43"
 dependencies = [
  "accesskit",
 ]
 
 [[package]]
 name = "accesskit_macos"
-version = "0.6.2"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58d062544d6cc36f4213323b7cb3a0d74ddff4b0d2311ab5e7596f4278bb2cc9"
+checksum = "4baea9413f0daf1cd4aab199bc09f8139cd726ce7673d523c27d186b8b878325"
 dependencies = [
  "accesskit",
  "accesskit_consumer",
@@ -47,9 +47,9 @@ dependencies = [
 
 [[package]]
 name = "accesskit_windows"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aaf5b3c3828397ee832ba4a72fb1a4ace10f781e31885f774cbd531014059115"
+checksum = "e11c7f177739f23bd19bb856e4a64fdd96eb8638ec0a6a6dde9a7019a9e91c53"
 dependencies = [
  "accesskit",
  "accesskit_consumer",
@@ -61,9 +61,9 @@ dependencies = [
 
 [[package]]
 name = "accesskit_winit"
-version = "0.12.4"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbcb615217efc79c4bed3094c4ca76c4bc554751d1da16f3ed4ba0459b1e8f31"
+checksum = "14f1bd64cd0b480cafb7bdd91eb489a1ff50f0f5702437b9efa32a25b8bb82a1"
 dependencies = [
  "accesskit",
  "accesskit_macos",
@@ -129,12 +129,12 @@ dependencies = [
 
 [[package]]
 name = "actix-macros"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "465a6172cf69b960917811022d8f29bc0b7fa1398bc4f78b3c466673db1213b6"
+checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb"
 dependencies = [
  "quote",
- "syn 1.0.109",
+ "syn 2.0.27",
 ]
 
 [[package]]
@@ -389,9 +389,9 @@ checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
 
 [[package]]
 name = "android_log-sys"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85965b6739a430150bdd138e2374a98af0c3ee0d030b3bb7fc3bddff58d0102e"
+checksum = "27f0fc03f560e1aebde41c2398b691cb98b5ea5996a6184a7a67bbbb77448969"
 
 [[package]]
 name = "android_system_properties"
@@ -459,9 +459,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.71"
+version = "1.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
+checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854"
 
 [[package]]
 name = "approx"
@@ -484,14 +484,14 @@ version = "0.37.3+1.3.251"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a"
 dependencies = [
- "libloading",
+ "libloading 0.7.4",
 ]
 
 [[package]]
 name = "assert_cmd"
-version = "2.0.11"
+version = "2.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86d6b683edf8d1119fe420a94f8a7e389239666aa72e65495d91c00462510151"
+checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6"
 dependencies = [
  "anstyle",
  "bstr",
@@ -545,7 +545,7 @@ dependencies = [
  "async-lock",
  "async-task",
  "concurrent-queue",
- "fastrand",
+ "fastrand 1.9.0",
  "futures-lite",
  "slab",
 ]
@@ -725,27 +725,27 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 
 [[package]]
 name = "basic-toml"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f838d03a705d72b12389b8930bd14cacf493be1380bfb15720d4d12db5ab03ac"
+checksum = "7bfc506e7a2370ec239e1d072507b2a80c833083699d3c6fa176fbb4de8448c6"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "bevy"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b93f906133305915d63f04108e6873c1b93a6605fe374b8f3391f6bda093e396"
+checksum = "04a90fe8e9c03fa2d30acf39a5178a48526df00c1ccea2fc43fa6d9ca4d8a168"
 dependencies = [
  "bevy_internal",
 ]
 
 [[package]]
 name = "bevy_a11y"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "037c4063f7dac1a5d596eb47f40782a04ca5838dc4274dbbadc90eb81efe5169"
+checksum = "f758f437d9d862bf10a8e3a0f76b426095c19a87d118c945dcb935358d856076"
 dependencies = [
  "accesskit",
  "bevy_app",
@@ -755,9 +755,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_animation"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0dc19f21846ebf8ba4d96617c2517b5119038774aa5dbbaf1bff122332b359c"
+checksum = "3d130cb8b7e2b81304591c5c8e511accd2df58b8d8185ab4836ed2f377e6a61f"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -766,6 +766,7 @@ dependencies = [
  "bevy_hierarchy",
  "bevy_math",
  "bevy_reflect",
+ "bevy_render",
  "bevy_time",
  "bevy_transform",
  "bevy_utils",
@@ -773,13 +774,14 @@ dependencies = [
 
 [[package]]
 name = "bevy_app"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01db46963eb9486f7884121527ec69751d0e448f9e1d5329e80ea3424118a31a"
+checksum = "1817e8d5b1146ea9e7730a7264d3470394840e0754d15abded26473f867967a0"
 dependencies = [
  "bevy_derive",
  "bevy_ecs",
  "bevy_reflect",
+ "bevy_tasks",
  "bevy_utils",
  "downcast-rs",
  "wasm-bindgen",
@@ -788,9 +790,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_asset"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98609b4b0694a23bde0628aed626644967991f167aad9db2afb68dacb0017540"
+checksum = "4e12f951d4af2ad4ad230cd7bcb05248149c415eec17c34bf26731c4cd8b897f"
 dependencies = [
  "anyhow",
  "bevy_app",
@@ -803,7 +805,7 @@ dependencies = [
  "bevy_winit",
  "crossbeam-channel",
  "downcast-rs",
- "fastrand",
+ "fastrand 1.9.0",
  "js-sys",
  "notify",
  "parking_lot 0.12.1",
@@ -816,13 +818,14 @@ dependencies = [
 
 [[package]]
 name = "bevy_audio"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42b9f9b87b0d094268ce52bb75ff346ae0054573f7acc5d66bf032e2c88f748d"
+checksum = "a6bade3f5389f9463e150af874aebe672b5101df4268d28b0109a66f9cdce56e"
 dependencies = [
  "anyhow",
  "bevy_app",
  "bevy_asset",
+ "bevy_derive",
  "bevy_ecs",
  "bevy_math",
  "bevy_reflect",
@@ -835,9 +838,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_core"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ee53d7b4691b57207d72e996992c995a53f3e8d21ca7151ca3956d9ce7d232e"
+checksum = "263b6a943ecba176c8390a1100615021f61a3b2d7a87e8eecf4009b6ed4457e0"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -850,12 +853,13 @@ dependencies = [
 
 [[package]]
 name = "bevy_core_pipeline"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "093ae5ced77251602ad6e43521e2acc1a5570bf85b80f232f1a7fdd43b50f8d8"
+checksum = "50c70113b5c4106855b888f96d8574697eb9082713f976c9b6487c1f5ab28589"
 dependencies = [
  "bevy_app",
  "bevy_asset",
+ "bevy_core",
  "bevy_derive",
  "bevy_ecs",
  "bevy_math",
@@ -863,27 +867,27 @@ dependencies = [
  "bevy_render",
  "bevy_transform",
  "bevy_utils",
- "bitflags 1.3.2",
+ "bitflags 2.3.3",
  "radsort",
  "serde",
 ]
 
 [[package]]
 name = "bevy_derive"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dff0add5ab4a6b2b7e86e18f9043bb48b6386faa3b56abaa0ed97a3d669a1992"
+checksum = "e1477347b17df781756ba0dfd677e2975e57e930752cd3cd42e6cdd8fdaa3223"
 dependencies = [
  "bevy_macro_utils",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.27",
 ]
 
 [[package]]
 name = "bevy_diagnostic"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64c778422643b0adee9e82abbd07e1e906eb9947c274a9b18e0f7fbf137d4c34"
+checksum = "37a594f970c261007cdd3edeccd61651c2cb4513de3d0b8b35d93f5d9c32c059"
 dependencies = [
  "bevy_app",
  "bevy_core",
@@ -896,9 +900,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_ecs"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bed2f74687ccf13046c0f8e3b00dc61d7e656877b4a1380cf04635bb74d8e586"
+checksum = "032c81ba7d919c1004b0abc33cc6c588c8f896a4d7c55a7c7aa1e46382242f43"
 dependencies = [
  "async-channel",
  "bevy_ecs_macros",
@@ -911,26 +915,27 @@ dependencies = [
  "fixedbitset",
  "rustc-hash",
  "serde",
+ "thiserror",
  "thread_local",
 ]
 
 [[package]]
 name = "bevy_ecs_macros"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a97fd126a0db7b30fb1833614b3a657b44ac88485741c33b2780e25de0f96d78"
+checksum = "a15ff7fcafdb8fe464ddd300b4860a76d5c6f9d684472e4bf21852d6f0ff3991"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.27",
 ]
 
 [[package]]
 name = "bevy_encase_derive"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c086ebdc1f5522787d63772943277cc74a279445fb65db4d58c2c5330654648e"
+checksum = "6bdf808dbdc68a0c519e09026c627bda85250205a40ac02794866bff254d6b56"
 dependencies = [
  "bevy_macro_utils",
  "encase_derive_impl",
@@ -938,22 +943,45 @@ dependencies = [
 
 [[package]]
 name = "bevy_gilrs"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f32eb07e8c9ea4be7195ccec10d8f9ad70200f3ae2e13adc4b84df9f50bb1c6"
+checksum = "b877a371caa64edd6ec5d66b47c67b9e9e9acff2f3bcc51e31e175463e89f6ba"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
  "bevy_input",
+ "bevy_log",
+ "bevy_time",
  "bevy_utils",
  "gilrs",
+ "thiserror",
+]
+
+[[package]]
+name = "bevy_gizmos"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7938b43b4bdf9d039b7d3b310f871ed5ffa5a185e861a9c85731c40182019f8d"
+dependencies = [
+ "bevy_app",
+ "bevy_asset",
+ "bevy_core",
+ "bevy_core_pipeline",
+ "bevy_ecs",
+ "bevy_math",
+ "bevy_pbr",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_sprite",
+ "bevy_transform",
+ "bevy_utils",
 ]
 
 [[package]]
 name = "bevy_gltf"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2707632208617c3660ea7a1d2ef2ccc84b59f217c2f01a1d0abe81db4ae7bbde"
+checksum = "f09b699698a2f5843ef63064010a5e7783403f99a697a04f41a2f8141cb4245d"
 dependencies = [
  "anyhow",
  "base64 0.13.1",
@@ -975,14 +1003,16 @@ dependencies = [
  "bevy_utils",
  "gltf",
  "percent-encoding",
+ "serde",
+ "serde_json",
  "thiserror",
 ]
 
 [[package]]
 name = "bevy_hierarchy"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d04099865a13d1fd8bf3c044a80148cb3d23bfe8c3d5f082dda2ce091d85532"
+checksum = "ba41e1bb0c367b31e59b53ab858de56764c78bee87c121843c1ff033efa0086c"
 dependencies = [
  "bevy_app",
  "bevy_core",
@@ -995,9 +1025,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_input"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a15d40aa636bb656967ac16ca36066ab7a7bb9179e1b0390c5705e54208e8fd7"
+checksum = "7221091c7b219a63a1f3f019512e8b72bed673230b97c3fcbca37ba566b1cffb"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -1009,9 +1039,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_internal"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "862b11931c5874cb00778ffb715fc526ee49e52a493d3bcf50e8010f301858b3"
+checksum = "0f232e7bd2566abd05656789e3c6278a5ca2a24f1232dff525e5b0233a99a610"
 dependencies = [
  "bevy_a11y",
  "bevy_animation",
@@ -1024,6 +1054,7 @@ dependencies = [
  "bevy_diagnostic",
  "bevy_ecs",
  "bevy_gilrs",
+ "bevy_gizmos",
  "bevy_gltf",
  "bevy_hierarchy",
  "bevy_input",
@@ -1047,9 +1078,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_log"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25980c90ceaad34d09a53291e72ca56fcc754a974cd4654fffcf5b68b283b7a7"
+checksum = "487dfd1fc75fada8f3f2f4773addf3fbba53a2a91cb913616e6dc6c26dd62995"
 dependencies = [
  "android_log-sys",
  "bevy_app",
@@ -1063,20 +1094,21 @@ dependencies = [
 
 [[package]]
 name = "bevy_macro_utils"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b2fee53b2497cdc3bffff2ddf52afa751242424a5fd0d51d227d4dab081d0d9"
+checksum = "fd3868e555723249fde3786891f35893b3001b2be4efb51f431467cb7fc378cd"
 dependencies = [
  "quote",
- "syn 1.0.109",
+ "rustc-hash",
+ "syn 2.0.27",
  "toml_edit",
 ]
 
 [[package]]
 name = "bevy_math"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da6a1109d06fe947990db032e719e162414cf9bf7a478dcc52742f1c7136c42a"
+checksum = "25088c6598fe0b8ded992c781dc49e613993c7a4e6a731c0f2ab0408add6afdb"
 dependencies = [
  "glam",
  "serde",
@@ -1084,18 +1116,18 @@ dependencies = [
 
 [[package]]
 name = "bevy_mikktspace"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39106bc2ee21fce9496d2e15e0ba7925dff63e3eae10f7c1fc0094b56ad9f2bb"
+checksum = "99dde80034660f7dbb473141c31f0a746acc7229f5a06ce769aba5f16fd592ab"
 dependencies = [
  "glam",
 ]
 
 [[package]]
 name = "bevy_pbr"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f507cef55812aa70c2ec2b30fb996eb285fa7497d974cf03f76ec49c77fbe27"
+checksum = "3efec2ae4b4f9fd38b82b93350499dac2dc6f07e63ef50a03c00c52075e2dea8"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -1108,22 +1140,23 @@ dependencies = [
  "bevy_transform",
  "bevy_utils",
  "bevy_window",
- "bitflags 1.3.2",
+ "bitflags 2.3.3",
  "bytemuck",
+ "naga_oil",
  "radsort",
 ]
 
 [[package]]
 name = "bevy_ptr"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b88451d4c5a353bff67dbaa937b6886efd26ae114769c17f2b35099c7a4de"
+checksum = "c74fcf37593a0053f539c3b088f34f268cbefed031d8eb8ff0fb10d175160242"
 
 [[package]]
 name = "bevy_reflect"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc3979471890e336f3ba87961ef3ecd45c331cf2cb2f582c885e541af228b48"
+checksum = "362492a6b66f676176705cc06017b012320fa260a9cf4baf3513387e9c05693e"
 dependencies = [
  "bevy_math",
  "bevy_ptr",
@@ -1136,28 +1169,29 @@ dependencies = [
  "parking_lot 0.12.1",
  "serde",
  "smallvec",
+ "smol_str",
  "thiserror",
 ]
 
 [[package]]
 name = "bevy_reflect_derive"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bc7ea7c9bc2c531eb29ba5619976613d6680453ff5dd4a7fcd08848e8bec5ad"
+checksum = "8e974d78eaf1b45e1b4146711b5c16e37c24234e12f3a52f5f2e28332c969d3c"
 dependencies = [
  "bevy_macro_utils",
  "bit-set",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.27",
  "uuid",
 ]
 
 [[package]]
 name = "bevy_render"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee1e126226f0a4d439bf82fe07c1104f894a6a365888e3eba7356f9647e77a83"
+checksum = "46e4b6a82c3a2be1c0d0cbecf62debb8251b72c0ae76285f66265aabc5bf2d37"
 dependencies = [
  "anyhow",
  "async-channel",
@@ -1178,16 +1212,18 @@ dependencies = [
  "bevy_transform",
  "bevy_utils",
  "bevy_window",
- "bitflags 1.3.2",
+ "bitflags 2.3.3",
+ "bytemuck",
  "codespan-reporting",
  "downcast-rs",
  "encase",
  "futures-lite",
  "hexasphere",
  "image",
+ "js-sys",
  "ktx2",
  "naga",
- "once_cell",
+ "naga_oil",
  "parking_lot 0.12.1",
  "regex",
  "ruzstd",
@@ -1195,27 +1231,29 @@ dependencies = [
  "smallvec",
  "thiserror",
  "thread_local",
+ "wasm-bindgen",
+ "web-sys",
  "wgpu",
  "wgpu-hal",
 ]
 
 [[package]]
 name = "bevy_render_macros"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "652f8c4d9577c6e6a8b3dfd8a4ce331e8b6ecdbb99636a4b2701dec50104d6bc"
+checksum = "07c4d937f966644f5e1e3c9157736acdd36286bcce06142ff9ad25cd71348c09"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.27",
 ]
 
 [[package]]
 name = "bevy_scene"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1de59637d27726251091120ce6f63917328ffd60aaccbda4d65a615873aff631"
+checksum = "cf1e00eb30e2053d9fff0802b2f557350b4e66bac58d531de30882048b4e3232"
 dependencies = [
  "anyhow",
  "bevy_app",
@@ -1235,9 +1273,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_sprite"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c110358fe3651a5796fd1c07989635680738f5b5c7e9b8a463dd50d12bb78410"
+checksum = "03f64119444ef9788dcdd05012a60f0fa3b7ddb396d434ebcfc3edefd76c91b5"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -1250,7 +1288,7 @@ dependencies = [
  "bevy_render",
  "bevy_transform",
  "bevy_utils",
- "bitflags 1.3.2",
+ "bitflags 2.3.3",
  "bytemuck",
  "fixedbitset",
  "guillotiere",
@@ -1260,24 +1298,23 @@ dependencies = [
 
 [[package]]
 name = "bevy_tasks"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3de86364316e151aeb0897eaaa917c3ad5ee5ef1471a939023cf7f2d5ab76955"
+checksum = "faab904296a3d6976bb8a12bc0f42f6c98fb6cd87a96244e0151d359f684ec2d"
 dependencies = [
  "async-channel",
  "async-executor",
  "async-task",
  "concurrent-queue",
  "futures-lite",
- "once_cell",
  "wasm-bindgen-futures",
 ]
 
 [[package]]
 name = "bevy_text"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "995188f59dc06da3fc951e1f58a105cde2c817d5330ae67ddc0a140f46482f6b"
+checksum = "b52a19b3d0caf20acd1bdb47b6a00717accc834b46c4f204a63de15cea45ec4b"
 dependencies = [
  "ab_glyph",
  "anyhow",
@@ -1298,9 +1335,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_time"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3edbd605df1bced312eb9888d6be3d5a5fcac3d4140038bbe3233d218399eef"
+checksum = "d09225ad2ffef14da000080143730b36ba225844ae479e4791cdb9d08066d06a"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -1312,9 +1349,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_transform"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24383dfb97d8a14b17721ecfdf58556eff5ea9a4b2a3d91accf2b472783880b0"
+checksum = "da8a0cd3780e120e20be333cc48d41cb74620d798dc61bc18eb2a82d3545e184"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -1325,9 +1362,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_ui"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb597aeed4e1bf5e6913879c3e22a7d50a843b822a7f71a4a80ebdfdf79e68d4"
+checksum = "bb85992eb5809936b3326940dc8d6e7b219af3dde1ecbca5948addd6a78694cc"
 dependencies = [
  "bevy_a11y",
  "bevy_app",
@@ -1355,14 +1392,14 @@ dependencies = [
 
 [[package]]
 name = "bevy_utils"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a88ebbca55d360d72e9fe78df0d22e25cd419933c9559e79dae2757f7c4d066"
+checksum = "10bfde141f0cdd15e07bca72f4439a9db80877c283738f581d061972ef483b1b"
 dependencies = [
- "ahash 0.7.6",
+ "ahash 0.8.3",
  "bevy_utils_proc_macros",
  "getrandom",
- "hashbrown 0.12.3",
+ "hashbrown 0.14.0",
  "instant",
  "petgraph",
  "thiserror",
@@ -1372,20 +1409,20 @@ dependencies = [
 
 [[package]]
 name = "bevy_utils_proc_macros"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "630b92e32fa5cd7917c7d4fdbf63a90af958b01e096239f71bc4f8f3cf40c0d2"
+checksum = "9e37f2e885b0e8af59dc19871c313d3cf2a2495db35bb4d4ae0a61b3f87d5401"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.27",
 ]
 
 [[package]]
 name = "bevy_window"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad31234754268fbe12050290b0496e2296252a16995a38f94bfb9680a4f09fda"
+checksum = "0528832361e3d942df287c90537ef6fafb726c4934468a7c3a5d53d659bfbf54"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -1398,9 +1435,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_winit"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf17bd6330f7e633b7c56754c776511a8f52cde4bf54c0278f34d7527548f253"
+checksum = "24c6709dc70cfee1eb94d5f125d29612c4a9345dfc1a70dd3189af927b2fd503"
 dependencies = [
  "accesskit_winit",
  "approx",
@@ -1411,10 +1448,10 @@ dependencies = [
  "bevy_hierarchy",
  "bevy_input",
  "bevy_math",
+ "bevy_tasks",
  "bevy_utils",
  "bevy_window",
  "crossbeam-channel",
- "once_cell",
  "raw-window-handle",
  "wasm-bindgen",
  "web-sys",
@@ -1531,7 +1568,7 @@ dependencies = [
  "async-lock",
  "async-task",
  "atomic-waker",
- "fastrand",
+ "fastrand 1.9.0",
  "futures-lite",
  "log",
 ]
@@ -1591,7 +1628,7 @@ checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.25",
+ "syn 2.0.27",
 ]
 
 [[package]]
@@ -1707,14 +1744,14 @@ checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f"
 dependencies = [
  "glob",
  "libc",
- "libloading",
+ "libloading 0.7.4",
 ]
 
 [[package]]
 name = "clap"
-version = "4.3.11"
+version = "4.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1640e5cc7fb47dbb8338fd471b105e7ed6c3cb2aeb00c2e067127ffd3764a05d"
+checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -1723,9 +1760,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.3.11"
+version = "4.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98c59138d527eeaf9b53f35a77fcc1fad9d883116070c63d5de1c7dc7b00c72b"
+checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1"
 dependencies = [
  "anstream",
  "anstyle",
@@ -1735,14 +1772,14 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.3.2"
+version = "4.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f"
+checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050"
 dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.25",
+ "syn 2.0.27",
 ]
 
 [[package]]
@@ -1827,6 +1864,21 @@ version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6051f239ecec86fde3410901ab7860d458d160371533842974fc61f96d15879b"
 
+[[package]]
+name = "const_soft_float"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87ca1caa64ef4ed453e68bb3db612e51cf1b2f5b871337f0fcab1c8f87cc3dff"
+
+[[package]]
+name = "constgebra"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edd23e864550e6dafc1e41ac78ce4f1ccddc8672b40c403524a04ff3f0518420"
+dependencies = [
+ "const_soft_float",
+]
+
 [[package]]
 name = "convert_case"
 version = "0.4.0"
@@ -2080,7 +2132,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da"
 dependencies = [
  "bitflags 1.3.2",
- "libloading",
+ "libloading 0.7.4",
  "winapi",
 ]
 
@@ -2090,6 +2142,12 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f"
 
+[[package]]
+name = "data-encoding"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"
+
 [[package]]
 name = "de_audio"
 version = "0.1.0-dev"
@@ -2168,7 +2226,7 @@ dependencies = [
 name = "de_connector"
 version = "0.1.0-dev"
 dependencies = [
- "ahash 0.7.6",
+ "ahash 0.8.3",
  "anyhow",
  "assert_cmd",
  "async-std",
@@ -2186,7 +2244,7 @@ dependencies = [
 name = "de_construction"
 version = "0.1.0-dev"
 dependencies = [
- "ahash 0.7.6",
+ "ahash 0.8.3",
  "bevy",
  "de_core",
  "de_index",
@@ -2202,7 +2260,7 @@ dependencies = [
 name = "de_controller"
 version = "0.1.0-dev"
 dependencies = [
- "ahash 0.7.6",
+ "ahash 0.8.3",
  "bevy",
  "de_behaviour",
  "de_camera",
@@ -2293,7 +2351,7 @@ dependencies = [
 name = "de_index"
 version = "0.1.0-dev"
 dependencies = [
- "ahash 0.7.6",
+ "ahash 0.8.3",
  "bevy",
  "criterion",
  "de_core",
@@ -2345,7 +2403,7 @@ dependencies = [
 name = "de_lobby_client"
 version = "0.1.0-dev"
 dependencies = [
- "ahash 0.7.6",
+ "ahash 0.8.3",
  "anyhow",
  "async-compat",
  "bevy",
@@ -2385,7 +2443,7 @@ dependencies = [
 name = "de_map"
 version = "0.1.0-dev"
 dependencies = [
- "ahash 0.7.6",
+ "ahash 0.8.3",
  "async-std",
  "async-tar",
  "bevy",
@@ -2434,7 +2492,7 @@ dependencies = [
 name = "de_multiplayer"
 version = "0.1.0-dev"
 dependencies = [
- "ahash 0.7.6",
+ "ahash 0.8.3",
  "async-std",
  "bevy",
  "bincode",
@@ -2450,10 +2508,10 @@ dependencies = [
 name = "de_net"
 version = "0.1.0-dev"
 dependencies = [
- "ahash 0.7.6",
+ "ahash 0.8.3",
  "async-std",
  "bincode",
- "fastrand",
+ "fastrand 1.9.0",
  "futures",
  "priority-queue",
  "thiserror",
@@ -2464,7 +2522,7 @@ dependencies = [
 name = "de_objects"
 version = "0.1.0-dev"
 dependencies = [
- "ahash 0.7.6",
+ "ahash 0.8.3",
  "anyhow",
  "bevy",
  "de_core",
@@ -2482,7 +2540,7 @@ dependencies = [
 name = "de_pathing"
 version = "0.1.0-dev"
 dependencies = [
- "ahash 0.7.6",
+ "ahash 0.8.3",
  "approx",
  "bevy",
  "criterion",
@@ -2503,7 +2561,7 @@ dependencies = [
 name = "de_signs"
 version = "0.1.0-dev"
 dependencies = [
- "ahash 0.7.6",
+ "ahash 0.8.3",
  "bevy",
  "de_camera",
  "de_core",
@@ -2516,7 +2574,7 @@ dependencies = [
 name = "de_spawner"
 version = "0.1.0-dev"
 dependencies = [
- "ahash 0.7.6",
+ "ahash 0.8.3",
  "bevy",
  "de_core",
  "de_energy",
@@ -2532,7 +2590,7 @@ dependencies = [
 name = "de_terrain"
 version = "0.1.0-dev"
 dependencies = [
- "ahash 0.7.6",
+ "ahash 0.8.3",
  "bevy",
  "de_core",
  "de_map",
@@ -2641,15 +2699,15 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
 
 [[package]]
 name = "either"
-version = "1.8.1"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
+checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
 
 [[package]]
 name = "encase"
-version = "0.5.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6591f13a63571c4821802eb5b10fd1155b1290bce87086440003841c8c3909b"
+checksum = "8fce2eeef77fd4a293a54b62aa00ac9daebfbcda4bf8998c5a815635b004aa1c"
 dependencies = [
  "const_panic",
  "encase_derive",
@@ -2659,22 +2717,22 @@ dependencies = [
 
 [[package]]
 name = "encase_derive"
-version = "0.5.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f1da6deed1f8b6f5909616ffa695f63a5de54d6a0f084fa715c70c8ed3abac9"
+checksum = "0e520cde08cbf4f7cc097f61573ec06ce467019803de8ae82fb2823fa1554a0e"
 dependencies = [
  "encase_derive_impl",
 ]
 
 [[package]]
 name = "encase_derive_impl"
-version = "0.5.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae489d58959f3c4cdd1250866a05acfb341469affe4fced71aff3ba228be1693"
+checksum = "3fe2568f851fd6144a45fa91cfed8fe5ca8fc0b56ba6797bfc1ed2771b90e37c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.27",
 ]
 
 [[package]]
@@ -2703,7 +2761,7 @@ checksum = "eecf8589574ce9b895052fa12d69af7a233f99e6107f5cb8dd1044f2a17bfdcb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.25",
+ "syn 2.0.27",
 ]
 
 [[package]]
@@ -2723,7 +2781,7 @@ checksum = "8560b409800a72d2d7860f8e5f4e0b0bd22bea6a352ea2a9ce30ccdef7f16d2f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.25",
+ "syn 2.0.27",
 ]
 
 [[package]]
@@ -2747,9 +2805,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "erased-serde"
-version = "0.3.27"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f94c0e13118e7d7533271f754a168ae8400e6a1cc043f2bfd53cc7290f1a1de3"
+checksum = "da96524cc884f6558f1769b6c46686af2fe8e8b4cd253bd5a3cdba8181b8e070"
 dependencies = [
  "serde",
 ]
@@ -2799,6 +2857,12 @@ dependencies = [
  "instant",
 ]
 
+[[package]]
+name = "fastrand"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764"
+
 [[package]]
 name = "fdeflate"
 version = "0.3.0"
@@ -2952,7 +3016,7 @@ version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
 dependencies = [
- "fastrand",
+ "fastrand 1.9.0",
  "futures-core",
  "futures-io",
  "memchr",
@@ -2969,7 +3033,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.25",
+ "syn 2.0.27",
 ]
 
 [[package]]
@@ -3002,15 +3066,6 @@ dependencies = [
  "slab",
 ]
 
-[[package]]
-name = "fxhash"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
-dependencies = [
- "byteorder",
-]
-
 [[package]]
 name = "generic-array"
 version = "0.14.7"
@@ -3075,9 +3130,9 @@ checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
 
 [[package]]
 name = "glam"
-version = "0.23.0"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e4afd9ad95555081e109fe1d21f2a30c691b5f0919c67dfa690a2e1eb6bd51c"
+checksum = "42218cb640844e3872cc3c153dc975229e080a6c4733b34709ef445610550226"
 dependencies = [
  "bytemuck",
  "serde",
@@ -3103,9 +3158,9 @@ dependencies = [
 
 [[package]]
 name = "glow"
-version = "0.12.2"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "807edf58b70c0b5b2181dd39fe1839dbdb3ba02645630dc5f753e23da307f762"
+checksum = "ca0fe580e4b60a8ab24a868bc08e2f03cbcb20d3d676601fa909386713333728"
 dependencies = [
  "js-sys",
  "slotmap",
@@ -3136,7 +3191,7 @@ dependencies = [
  "inflections",
  "proc-macro2",
  "quote",
- "syn 2.0.25",
+ "syn 2.0.27",
 ]
 
 [[package]]
@@ -3214,6 +3269,15 @@ dependencies = [
  "bitflags 1.3.2",
 ]
 
+[[package]]
+name = "grid"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0634107a3a005070dd73e27e74ecb691a94e9e5ba7829f434db7fbf73a6b5c47"
+dependencies = [
+ "no-std-compat",
+]
+
 [[package]]
 name = "guillotiere"
 version = "0.6.2"
@@ -3265,7 +3329,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 dependencies = [
  "ahash 0.7.6",
- "serde",
 ]
 
 [[package]]
@@ -3276,6 +3339,7 @@ checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
 dependencies = [
  "ahash 0.8.3",
  "allocator-api2",
+ "serde",
 ]
 
 [[package]]
@@ -3289,14 +3353,14 @@ dependencies = [
 
 [[package]]
 name = "hassle-rs"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90601c6189668c7345fc53842cb3f3a3d872203d523be1b3cb44a36a3e62fb85"
+checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0"
 dependencies = [
  "bitflags 1.3.2",
  "com-rs",
  "libc",
- "libloading",
+ "libloading 0.7.4",
  "thiserror",
  "widestring",
  "winapi",
@@ -3338,12 +3402,12 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hexasphere"
-version = "8.1.0"
+version = "9.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd41d443f978bfa380a6dad58b62a08c43bcb960631f13e9d015b911eaf73588"
+checksum = "7cb3df16a7bcb1b5bc092abd55e14f77ca70aea14445026e264586fc62889a10"
 dependencies = [
+ "constgebra",
  "glam",
- "once_cell",
 ]
 
 [[package]]
@@ -3602,18 +3666,19 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.8"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a"
+checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
 
 [[package]]
 name = "iyes_progress"
-version = "0.8.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c445a5cfe8748bab1353bdeb93ee607d387395ce0c250b8937db3ef97e2d30f2"
+checksum = "c3f093e3b8f18730767ecf5b60c455b4f6b806d3c79ae2a31ca89d285718d635"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
+ "bevy_utils",
 ]
 
 [[package]]
@@ -3704,7 +3769,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3"
 dependencies = [
  "libc",
- "libloading",
+ "libloading 0.7.4",
  "pkg-config",
 ]
 
@@ -3791,6 +3856,16 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "libloading"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb"
+dependencies = [
+ "cfg-if",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "libm"
 version = "0.2.7"
@@ -3978,9 +4053,9 @@ dependencies = [
 
 [[package]]
 name = "naga"
-version = "0.11.1"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c3d4269bcb7d50121097702fde1afb75f4ea8083aeb7a55688dcf289a853271"
+checksum = "bbcc2e0513220fd2b598e6068608d4462db20322c0e77e47f6f488dfcfc279cb"
 dependencies = [
  "bit-set",
  "bitflags 1.3.2",
@@ -3989,7 +4064,6 @@ dependencies = [
  "indexmap 1.9.3",
  "log",
  "num-traits",
- "petgraph",
  "pp-rs",
  "rustc-hash",
  "spirv",
@@ -3998,6 +4072,26 @@ dependencies = [
  "unicode-xid",
 ]
 
+[[package]]
+name = "naga_oil"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d9c27fc9c84580434af75123d13ad98d9a56e16d033b16dcfa6940728c8c225"
+dependencies = [
+ "bit-set",
+ "codespan-reporting",
+ "data-encoding",
+ "indexmap 1.9.3",
+ "naga",
+ "once_cell",
+ "regex",
+ "regex-syntax 0.6.29",
+ "rustc-hash",
+ "thiserror",
+ "tracing",
+ "unicode-ident",
+]
+
 [[package]]
 name = "nalgebra"
 version = "0.32.3"
@@ -4098,6 +4192,12 @@ dependencies = [
  "static_assertions",
 ]
 
+[[package]]
+name = "no-std-compat"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c"
+
 [[package]]
 name = "nom"
 version = "7.1.3"
@@ -4110,9 +4210,9 @@ dependencies = [
 
 [[package]]
 name = "notify"
-version = "5.2.0"
+version = "6.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "729f63e1ca555a43fe3efa4f3efdf4801c479da85b432242a7b726f353c88486"
+checksum = "5738a2795d57ea20abec2d6d76c6081186709c0024187cd5977265eda6598b51"
 dependencies = [
  "bitflags 1.3.2",
  "crossbeam-channel",
@@ -4232,9 +4332,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
 dependencies = [
  "autocfg",
  "libm",
@@ -4289,7 +4389,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.25",
+ "syn 2.0.27",
 ]
 
 [[package]]
@@ -4413,7 +4513,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.25",
+ "syn 2.0.27",
 ]
 
 [[package]]
@@ -4579,9 +4679,9 @@ dependencies = [
 
 [[package]]
 name = "paste"
-version = "1.0.13"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4b27ab7be369122c218afc2079489cdcb4b517c0a3fc386ff11e1fedfcc2b35"
+checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
 
 [[package]]
 name = "pbkdf2"
@@ -4643,7 +4743,7 @@ checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.25",
+ "syn 2.0.27",
 ]
 
 [[package]]
@@ -4786,9 +4886,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.64"
+version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da"
+checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
 dependencies = [
  "unicode-ident",
 ]
@@ -4801,9 +4901,9 @@ checksum = "332cd62e95873ea4f41f3dfd6bbbfc5b52aec892d7e8d534197c4720a0bbbab2"
 
 [[package]]
 name = "quote"
-version = "1.0.29"
+version = "1.0.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105"
+checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965"
 dependencies = [
  "proc-macro2",
 ]
@@ -4965,9 +5065,9 @@ checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
 
 [[package]]
 name = "renderdoc-sys"
-version = "0.7.1"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1382d1f0a252c4bf97dc20d979a2fdd05b024acd7c2ed0f7595d7817666a157"
+checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b"
 
 [[package]]
 name = "reqwest"
@@ -5131,25 +5231,26 @@ dependencies = [
 
 [[package]]
 name = "ruzstd"
-version = "0.2.4"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cada0ef59efa6a5f4dc5e491f93d9f31e3fc7758df421ff1de8a706338e1100"
+checksum = "ac3ffab8f9715a0d455df4bbb9d21e91135aab3cd3ca187af0cd0c3c3f868fdc"
 dependencies = [
  "byteorder",
+ "thiserror-core",
  "twox-hash",
 ]
 
 [[package]]
 name = "ryu"
-version = "1.0.14"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9"
+checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
 
 [[package]]
 name = "safe_arch"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62a7484307bd40f8f7ccbacccac730108f2cae119a3b11c74485b48aa9ea650f"
+checksum = "f398075ce1e6a179b46f51bd88d0598b92b00d3551f1a2d4ac49e771b56ac354"
 dependencies = [
  "bytemuck",
 ]
@@ -5174,9 +5275,9 @@ dependencies = [
 
 [[package]]
 name = "scopeguard"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "sct"
@@ -5190,9 +5291,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "2.9.1"
+version = "2.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8"
+checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
 dependencies = [
  "bitflags 1.3.2",
  "core-foundation",
@@ -5203,9 +5304,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.9.0"
+version = "2.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7"
+checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
 dependencies = [
  "core-foundation-sys 0.8.4",
  "libc",
@@ -5213,35 +5314,35 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
+checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918"
 
 [[package]]
 name = "serde"
-version = "1.0.171"
+version = "1.0.174"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9"
+checksum = "3b88756493a5bd5e5395d53baa70b194b05764ab85b59e43e4b8f4e1192fa9b1"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.171"
+version = "1.0.174"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682"
+checksum = "6e5c3a298c7f978e53536f95a63bdc4c4a64550582f31a0359a9afda6aede62e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.25",
+ "syn 2.0.27",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.102"
+version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5062a995d481b2308b6064e9af76011f2921c35f97b0468811ed9f6cd91dfed"
+checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b"
 dependencies = [
  "itoa",
  "ryu",
@@ -5262,9 +5363,9 @@ dependencies = [
 
 [[package]]
 name = "serde_yaml"
-version = "0.9.22"
+version = "0.9.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "452e67b9c20c37fa79df53201dc03839651086ed9bbe92b3ca585ca9fdaa7d85"
+checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574"
 dependencies = [
  "indexmap 2.0.0",
  "itoa",
@@ -5322,9 +5423,9 @@ checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
 
 [[package]]
 name = "signal-hook"
-version = "0.3.15"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9"
+checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
 dependencies = [
  "libc",
  "signal-hook-registry",
@@ -5397,6 +5498,15 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "smol_str"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74212e6bbe9a4352329b2f68ba3130c15a3f26fe88ff22dbdc6cdd58fa85e99c"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "socket2"
 version = "0.4.9"
@@ -5555,9 +5665,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
 [[package]]
 name = "stringprep"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ee348cb74b87454fff4b551cbf727025810a004f88aeacae7f85b87f4e9a1c1"
+checksum = "db3737bde7edce97102e0e2b15365bf7a20bfdb5f60f4f9e8d7004258a51a8da"
 dependencies = [
  "unicode-bidi",
  "unicode-normalization",
@@ -5644,9 +5754,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.25"
+version = "2.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2"
+checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5655,9 +5765,9 @@ dependencies = [
 
 [[package]]
 name = "sysinfo"
-version = "0.28.4"
+version = "0.29.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4c2f3ca6693feb29a89724516f016488e9aafc7f37264f898593ee4b942f31b"
+checksum = "c7cb97a5a85a136d84e75d5c3cf89655090602efb1be0d8d5337b7e386af2908"
 dependencies = [
  "cfg-if",
  "core-foundation-sys 0.8.4",
@@ -5674,21 +5784,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3540ec65df399929a04a485feb50144475735920cc47eaf8eba09c70b1df4055"
 dependencies = [
  "arrayvec",
+ "grid",
  "num-traits",
  "slotmap",
 ]
 
 [[package]]
 name = "tempfile"
-version = "3.6.0"
+version = "3.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6"
+checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998"
 dependencies = [
- "autocfg",
  "cfg-if",
- "fastrand",
+ "fastrand 2.0.0",
  "redox_syscall 0.3.5",
- "rustix 0.37.23",
+ "rustix 0.38.4",
  "windows-sys 0.48.0",
 ]
 
@@ -5709,22 +5819,42 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
 
 [[package]]
 name = "thiserror"
-version = "1.0.43"
+version = "1.0.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42"
+checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90"
 dependencies = [
  "thiserror-impl",
 ]
 
+[[package]]
+name = "thiserror-core"
+version = "1.0.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d97345f6437bb2004cd58819d8a9ef8e36cdd7661c2abc4bbde0a7c40d9f497"
+dependencies = [
+ "thiserror-core-impl",
+]
+
+[[package]]
+name = "thiserror-core-impl"
+version = "1.0.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10ac1c5050e43014d16b2f94d0d2ce79e65ffdd8b38d8048f9c8f6a8a6da62ac"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "thiserror-impl"
-version = "1.0.43"
+version = "1.0.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f"
+checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.25",
+ "syn 2.0.27",
 ]
 
 [[package]]
@@ -5873,9 +6003,9 @@ checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
 
 [[package]]
 name = "toml_edit"
-version = "0.19.13"
+version = "0.19.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f8751d9c1b03c6500c387e96f81f815a4f8e72d142d2d4a9ffa6fedd51ddee7"
+checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a"
 dependencies = [
  "indexmap 2.0.0",
  "toml_datetime",
@@ -5920,7 +6050,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.25",
+ "syn 2.0.27",
 ]
 
 [[package]]
@@ -5994,9 +6124,9 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
 
 [[package]]
 name = "trybuild"
-version = "1.0.81"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04366e99ff743345622cd00af2af01d711dc2d1ef59250d7347698d21b546729"
+checksum = "a84e0202ea606ba5ebee8507ab2bfbe89b98551ed9b8f0be198109275cff284b"
 dependencies = [
  "basic-toml",
  "glob",
@@ -6037,9 +6167,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.10"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73"
+checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
 
 [[package]]
 name = "unicode-normalization"
@@ -6076,9 +6206,9 @@ checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e"
 
 [[package]]
 name = "unsafe-libyaml"
-version = "0.2.8"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1865806a559042e51ab5414598446a5871b561d21b6764f2eabb0dd481d880a6"
+checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa"
 
 [[package]]
 name = "untrusted"
@@ -6100,9 +6230,9 @@ dependencies = [
 
 [[package]]
 name = "urlencoding"
-version = "2.1.2"
+version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9"
+checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
 
 [[package]]
 name = "utf8parse"
@@ -6112,9 +6242,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
 [[package]]
 name = "uuid"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d023da39d1fde5a8a3fe1f3e01ca9632ada0a63e9797de55a879d6e2236277be"
+checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"
 dependencies = [
  "getrandom",
  "serde",
@@ -6223,7 +6353,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.25",
+ "syn 2.0.27",
  "wasm-bindgen-shared",
 ]
 
@@ -6257,7 +6387,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.25",
+ "syn 2.0.27",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -6310,9 +6440,9 @@ dependencies = [
 
 [[package]]
 name = "wgpu"
-version = "0.15.1"
+version = "0.16.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d745a1b6d91d85c33defbb29f0eee0450e1d2614d987e14bf6baf26009d132d7"
+checksum = "480c965c9306872eb6255fa55e4b4953be55a8b64d57e61d7ff840d3dcc051cd"
 dependencies = [
  "arrayvec",
  "cfg-if",
@@ -6334,20 +6464,20 @@ dependencies = [
 
 [[package]]
 name = "wgpu-core"
-version = "0.15.1"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7131408d940e335792645a98f03639573b0480e9e2e7cddbbab74f7c6d9f3fff"
+checksum = "8f478237b4bf0d5b70a39898a66fa67ca3a007d79f2520485b8b0c3dfc46f8c2"
 dependencies = [
  "arrayvec",
  "bit-vec",
- "bitflags 1.3.2",
+ "bitflags 2.3.3",
  "codespan-reporting",
- "fxhash",
  "log",
  "naga",
  "parking_lot 0.12.1",
  "profiling",
  "raw-window-handle",
+ "rustc-hash",
  "smallvec",
  "thiserror",
  "web-sys",
@@ -6357,20 +6487,19 @@ dependencies = [
 
 [[package]]
 name = "wgpu-hal"
-version = "0.15.4"
+version = "0.16.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdcf61a283adc744bb5453dd88ea91f3f86d5ca6b027661c6c73c7734ae0288b"
+checksum = "1ecb3258078e936deee14fd4e0febe1cfe9bbb5ffef165cb60218d2ee5eb4448"
 dependencies = [
  "android_system_properties",
  "arrayvec",
  "ash",
  "bit-set",
- "bitflags 1.3.2",
+ "bitflags 2.3.3",
  "block",
  "core-graphics-types",
  "d3d12",
  "foreign-types",
- "fxhash",
  "glow",
  "gpu-alloc",
  "gpu-allocator",
@@ -6379,7 +6508,7 @@ dependencies = [
  "js-sys",
  "khronos-egl",
  "libc",
- "libloading",
+ "libloading 0.8.0",
  "log",
  "metal",
  "naga",
@@ -6389,6 +6518,7 @@ dependencies = [
  "range-alloc",
  "raw-window-handle",
  "renderdoc-sys",
+ "rustc-hash",
  "smallvec",
  "thiserror",
  "wasm-bindgen",
@@ -6399,11 +6529,11 @@ dependencies = [
 
 [[package]]
 name = "wgpu-types"
-version = "0.15.2"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32444e121b0bd00cb02c0de32fde457a9491bd44e03e7a5db6df9b1da2f6f110"
+checksum = "d0c153280bb108c2979eb5c7391cb18c56642dd3c072e55f52065e13e2a1252a"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.3.3",
  "js-sys",
  "web-sys",
 ]
@@ -6420,9 +6550,9 @@ dependencies = [
 
 [[package]]
 name = "widestring"
-version = "0.5.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983"
+checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8"
 
 [[package]]
 name = "winapi"
@@ -6714,24 +6844,24 @@ checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a"
 
 [[package]]
 name = "xml-rs"
-version = "0.8.15"
+version = "0.8.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a56c84a8ccd4258aed21c92f70c0f6dea75356b6892ae27c24139da456f9336"
+checksum = "47430998a7b5d499ccee752b41567bc3afc57e1327dc855b1a2aa44ce29b5fa1"
 
 [[package]]
 name = "zstd"
-version = "0.12.3+zstd.1.5.2"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806"
+checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c"
 dependencies = [
  "zstd-safe",
 ]
 
 [[package]]
 name = "zstd-safe"
-version = "6.0.5+zstd.1.5.4"
+version = "6.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d56d9e60b4b1758206c238a10165fbcae3ca37b01744e394c463463f6529d23b"
+checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581"
 dependencies = [
  "libc",
  "zstd-sys",
diff --git a/Cargo.toml b/Cargo.toml
index fad181f3a..4bd552db6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -104,14 +104,14 @@ de_uom = { path = "crates/uom", version = "0.1.0-dev" }
 
 # Other
 ab_glyph = "0.2.21"
-ahash = "0.7.6"
+ahash = "0.8.3"
 anyhow = "1.0"
 approx = "0.5.1"
 assert_cmd = "2.0.10"
 async-compat = "0.2.1"
 async-std = "1.11"
 async-tar = "0.4.2"
-bevy = { version = "0.10", features = ["mp3"] }
+bevy = { version = "0.11", features = ["mp3"] }
 bincode = "2.0.0-rc.3"
 chrono = "0.4.24"
 clap = { version = "4.0", features = ["derive"] }
@@ -124,12 +124,12 @@ fern = "0.6.2"
 flate2 = "1.0.26"
 futures = "0.3.28"
 futures-lite = "1.13.0"
-glam = "0.23"
+glam = "0.24"
 gltf = "1.0"
 itertools = "0.11.0"
-iyes_progress = "0.8.0"
+iyes_progress = "0.9.0"
 log = "0.4.17"
-nalgebra = { version = "0.32.2", features = ["convert-glam023"] }
+nalgebra = { version = "0.32.3", features = ["convert-glam024"] }
 nix = "0.26.2"
 ntest = "0.9.0"
 parry2d = "0.13.1"
diff --git a/assets/shaders/bar.wgsl b/assets/shaders/bar.wgsl
index d63e66625..747f84bf6 100644
--- a/assets/shaders/bar.wgsl
+++ b/assets/shaders/bar.wgsl
@@ -1,6 +1,5 @@
-#import bevy_pbr::mesh_view_bindings
-#import bevy_pbr::mesh_bindings
-#import bevy_pbr::mesh_functions
+#import bevy_pbr::mesh_bindings  mesh
+#import bevy_pbr::mesh_functions 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);
diff --git a/assets/shaders/rally_point.wgsl b/assets/shaders/rally_point.wgsl
index f52d01427..fccf56d43 100644
--- a/assets/shaders/rally_point.wgsl
+++ b/assets/shaders/rally_point.wgsl
@@ -1,5 +1,6 @@
-#import bevy_pbr::mesh_view_bindings
-#import bevy_pbr::mesh_bindings
+#import bevy_pbr::mesh_view_bindings  globals
+#import bevy_pbr::mesh_bindings       mesh
+#import bevy_pbr::mesh_vertex_output  MeshVertexOutput
 
 struct CustomMaterial {
     color: vec4<f32>,
@@ -22,11 +23,11 @@ const FADE: f32 = 3.;
 
 @fragment
 fn fragment(
-    #import bevy_pbr::mesh_vertex_output
+    in: MeshVertexOutput,
 ) -> @location(0) vec4<f32> {
     let world_space_length: f32 = length(mesh.model[0].xyz);
-    let scaled_x: f32 = uv.x * world_space_length;
-    let offset_y: f32 = abs(uv.y - 0.5) * POINTINESS;
+    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;
     let total_length = LENGTH + SPACING;
 
diff --git a/assets/shaders/terrain.wgsl b/assets/shaders/terrain.wgsl
index 6c79551be..240325c82 100644
--- a/assets/shaders/terrain.wgsl
+++ b/assets/shaders/terrain.wgsl
@@ -1,14 +1,17 @@
-#import bevy_pbr::mesh_view_bindings
-#import bevy_pbr::mesh_bindings
-
-#import bevy_pbr::pbr_types
-#import bevy_pbr::utils
-#import bevy_pbr::clustered_forward
-#import bevy_pbr::lighting
-#import bevy_pbr::pbr_ambient
-#import bevy_pbr::shadows
-#import bevy_pbr::fog
-#import bevy_pbr::pbr_functions
+#define_import_path bevy_pbr::fragment
+
+#import bevy_pbr::pbr_functions as pbr_functions
+#import bevy_pbr::pbr_types as pbr_types
+#import bevy_pbr::prepass_utils
+
+#import bevy_pbr::mesh_vertex_output       MeshVertexOutput
+#import bevy_pbr::mesh_bindings            mesh
+#import bevy_pbr::mesh_view_bindings       view, fog, screen_space_ambient_occlusion_texture
+#import bevy_pbr::mesh_view_types          FOG_MODE_OFF
+#import bevy_core_pipeline::tonemapping    screen_space_dither, powsafe, tone_mapping
+#import bevy_pbr::parallax_mapping         parallaxed_uv
+
+#import bevy_pbr::prepass_utils
 
 // How large (in meters) is a texture.
 const TEXTURE_SIZE = 16.;
@@ -47,12 +50,6 @@ var terrain_texture: texture_2d<f32>;
 @group(1) @binding(3)
 var terrain_sampler: sampler;
 
-struct FragmentInput {
-    @builtin(front_facing) is_front: bool,
-    @builtin(position) frag_coord: vec4<f32>,
-    #import bevy_pbr::mesh_vertex_output
-};
-
 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);
@@ -172,34 +169,34 @@ fn draw_rectangles(base: vec4<f32>, uv: vec2<f32>) -> vec4<f32> {
 }
 
 @fragment
-fn fragment(in: FragmentInput) -> @location(0) vec4<f32> {
-    var pbr_input: PbrInput = pbr_input_new();
+fn fragment(
+    in: MeshVertexOutput,
+    @builtin(front_facing) is_front: bool,
+) -> @location(0) vec4<f32> {
+    var pbr_input: pbr_functions::PbrInput;
     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(
+    pbr_input.material.base_color = textureSampleBias(
         terrain_texture,
         terrain_sampler,
-        in.uv / TEXTURE_SIZE
+        in.uv / TEXTURE_SIZE,
+        view.mip_bias
     );
 
-#ifdef VERTEX_COLORS
-    pbr_input.material.base_color = pbr_input.material.base_color * in.color;
-#endif
-
-    pbr_input.frag_coord = in.frag_coord;
+    pbr_input.frag_coord = in.position;
     pbr_input.world_position = in.world_position;
-    pbr_input.world_normal = prepare_world_normal(
+    pbr_input.world_normal = pbr_functions::prepare_world_normal(
         in.world_normal,
-        (pbr_input.material.flags & STANDARD_MATERIAL_FLAGS_DOUBLE_SIDED_BIT) != 0u,
-        in.is_front,
+        false,
+        is_front,
     );
 
     pbr_input.is_orthographic = view.projection[3].w == 1.0;
 
-    pbr_input.N = apply_normal_mapping(
-        pbr_input.material.flags,
+    pbr_input.N = pbr_functions::apply_normal_mapping(
+        0u32,
         pbr_input.world_normal,
 #ifdef VERTEX_TANGENTS
 #ifdef STANDARDMATERIAL_NORMAL_MAP
@@ -207,16 +204,28 @@ fn fragment(in: FragmentInput) -> @location(0) vec4<f32> {
 #endif
 #endif
 #ifdef VERTEX_UVS
-        in.uv,
+         in.uv,
 #endif
+        view.mip_bias,
     );
-    pbr_input.V = calculate_view(in.world_position, pbr_input.is_orthographic);
+    pbr_input.V = pbr_functions::calculate_view(in.world_position, pbr_input.is_orthographic);
     pbr_input.flags = mesh.flags;
+    pbr_input.occlusion = vec3(1.0);
 
-    var output_color = pbr(pbr_input);
+    var output_color = pbr_functions::pbr(pbr_input);
+    output_color = pbr_functions::apply_fog(fog, output_color, in.world_position.xyz, view.world_position.xyz);
 
 #ifdef TONEMAP_IN_SHADER
-    output_color = tone_mapping(output_color);
+    output_color = tone_mapping(output_color, view.color_grading);
+#ifdef DEBAND_DITHER
+    var output_rgb = output_color.rgb;
+    output_rgb = powsafe(output_rgb, 1.0 / 2.2);
+    output_rgb = output_rgb + screen_space_dither(in.position.xy);
+    // This conversion back to linear space is required because our output texture format is
+    // SRGB; the GPU will assume our output is linear and will apply an SRGB conversion.
+    output_rgb = powsafe(output_rgb, 2.2);
+    output_color = vec4(output_rgb, output_color.a);
+#endif
 #endif
 
     output_color = draw_circles(output_color, in.uv);
diff --git a/assets/shaders/trail.wgsl b/assets/shaders/trail.wgsl
index ada22b8bc..a068ca163 100644
--- a/assets/shaders/trail.wgsl
+++ b/assets/shaders/trail.wgsl
@@ -1,4 +1,5 @@
-#import bevy_pbr::mesh_view_bindings
+#import bevy_pbr::mesh_view_bindings  globals
+#import bevy_pbr::mesh_vertex_output  MeshVertexOutput
 
 const COLOR = vec4<f32>(1., 0.85, 0.1, 0.7);
 
@@ -7,10 +8,10 @@ var<uniform> start_time: f32;
 
 @fragment
 fn fragment(
-    #import bevy_pbr::mesh_vertex_output
+    in: MeshVertexOutput,
 ) -> @location(0) vec4<f32> {
     var color = COLOR;
     // Use max(0., ...) because the times are wrapping.
-    color.a *= pow(0.001, max(0., globals.time - start_time)) * sqrt(1. - abs(uv.y));
+    color.a *= pow(0.001, max(0., globals.time - start_time)) * sqrt(1. - abs(in.uv.y));
     return color;
 }
diff --git a/crates/audio/src/music.rs b/crates/audio/src/music.rs
index 7c0d30441..9fb02ad98 100644
--- a/crates/audio/src/music.rs
+++ b/crates/audio/src/music.rs
@@ -1,4 +1,4 @@
-use bevy::{asset::LoadState, prelude::*};
+use bevy::{asset::LoadState, audio::Volume, prelude::*};
 use de_conf::Configuration;
 use de_core::state::AppState;
 use iyes_progress::prelude::*;
@@ -7,9 +7,12 @@ pub(crate) struct MusicPlugin;
 
 impl Plugin for MusicPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(setup.in_schedule(OnEnter(AppState::AppLoading)))
-            .add_system(load.track_progress().run_if(in_state(AppState::AppLoading)))
-            .add_system(start.in_schedule(OnExit(AppState::AppLoading)));
+        app.add_systems(OnEnter(AppState::AppLoading), setup)
+            .add_systems(
+                Update,
+                load.track_progress().run_if(in_state(AppState::AppLoading)),
+            )
+            .add_systems(OnExit(AppState::AppLoading), start);
     }
 }
 
@@ -28,12 +31,14 @@ fn load(server: Res<AssetServer>, tracks: Res<Tracks>) -> Progress {
     }
 }
 
-fn start(audio: Res<Audio>, tracks: Res<Tracks>, config: Res<Configuration>) {
+fn start(mut commands: Commands, tracks: Res<Tracks>, config: Res<Configuration>) {
     if !config.audio().music_enabled() {
         return;
     }
-    audio.play_with_settings(
-        tracks.0.clone(),
-        PlaybackSettings::LOOP.with_volume(config.audio().music_volume()),
-    );
+
+    let volume = Volume::new_relative(config.audio().music_volume());
+    commands.spawn(AudioBundle {
+        source: tracks.0.clone(),
+        settings: PlaybackSettings::LOOP.with_volume(volume),
+    });
 }
diff --git a/crates/behaviour/src/chase.rs b/crates/behaviour/src/chase.rs
index 289179e9a..cca9507ba 100644
--- a/crates/behaviour/src/chase.rs
+++ b/crates/behaviour/src/chase.rs
@@ -1,5 +1,5 @@
 use bevy::prelude::*;
-use de_core::{baseset::GameSet, gamestate::GameState, projection::ToFlat};
+use de_core::{gamestate::GameState, projection::ToFlat};
 use de_pathing::{PathQueryProps, PathTarget, UpdateEntityPathEvent};
 
 pub(crate) struct ChasePlugin;
@@ -7,17 +7,13 @@ pub(crate) struct ChasePlugin;
 impl Plugin for ChasePlugin {
     fn build(&self, app: &mut App) {
         app.add_event::<ChaseTargetEvent>()
-            .add_system(
+            .add_systems(
+                PreUpdate,
                 handle_chase_events
-                    .in_base_set(GameSet::PreUpdate)
                     .run_if(in_state(GameState::Playing))
                     .in_set(ChaseSet::ChaseTargetEvent),
             )
-            .add_system(
-                chase
-                    .in_base_set(GameSet::Update)
-                    .run_if(in_state(GameState::Playing)),
-            );
+            .add_systems(Update, chase.run_if(in_state(GameState::Playing)));
     }
 }
 
@@ -27,6 +23,7 @@ pub enum ChaseSet {
 }
 
 /// Send this event to start or stop chasing of an entity (movable or static).
+#[derive(Event)]
 pub struct ChaseTargetEvent {
     entity: Entity,
     target: Option<ChaseTarget>,
diff --git a/crates/camera/src/camera.rs b/crates/camera/src/camera.rs
index 00b68dbb3..891000bc4 100644
--- a/crates/camera/src/camera.rs
+++ b/crates/camera/src/camera.rs
@@ -3,8 +3,12 @@ use std::f32::consts::FRAC_PI_2;
 use bevy::prelude::*;
 use de_conf::{CameraConf, Configuration};
 use de_core::{
-    baseset::GameSet, cleanup::DespawnOnGameExit, events::ResendEventPlugin, gamestate::GameState,
-    projection::ToAltitude, state::AppState,
+    baseset::{InputSchedule, Movement, PreMovement},
+    cleanup::DespawnOnGameExit,
+    events::ResendEventPlugin,
+    gamestate::GameState,
+    projection::ToAltitude,
+    state::AppState,
 };
 use de_map::size::MapBounds;
 use de_terrain::{TerrainCollider, MAX_ELEVATION};
@@ -42,79 +46,64 @@ impl Plugin for CameraPlugin {
             .add_event::<ZoomCameraEvent>()
             .add_event::<RotateCameraEvent>()
             .add_event::<TiltCameraEvent>()
-            .add_plugin(ResendEventPlugin::<MoveFocusEvent>::default())
+            .add_plugins(ResendEventPlugin::<MoveFocusEvent>::default())
             .add_event::<FocusInvalidatedEvent>()
             .add_event::<UpdateTranslationEvent>()
-            .add_system(setup.in_schedule(OnEnter(AppState::InGame)))
-            .add_system(cleanup.in_schedule(OnExit(AppState::InGame)))
-            .add_system(
-                update_focus
-                    .in_base_set(GameSet::PreMovement)
-                    .run_if(in_state(GameState::Playing))
-                    .run_if(on_event::<FocusInvalidatedEvent>())
-                    .in_set(InternalCameraSet::UpdateFocus),
+            .add_systems(OnEnter(AppState::InGame), setup)
+            .add_systems(OnExit(AppState::InGame), cleanup)
+            .add_systems(
+                InputSchedule,
+                (
+                    handle_horizontal_events
+                        .run_if(in_state(GameState::Playing))
+                        .in_set(CameraSet::MoveHorizontallEvent),
+                    handle_zoom_events
+                        .run_if(in_state(GameState::Playing))
+                        .in_set(CameraSet::ZoomEvent),
+                    handle_rotate_events
+                        .run_if(in_state(GameState::Playing))
+                        .in_set(CameraSet::RotateEvent),
+                    handle_tilt_events
+                        .run_if(in_state(GameState::Playing))
+                        .in_set(CameraSet::TiltEvent),
+                ),
             )
-            .add_system(
-                handle_horizontal_events
-                    .in_base_set(GameSet::Input)
-                    .run_if(in_state(GameState::Playing))
-                    .in_set(CameraSet::MoveHorizontallEvent),
+            .add_systems(
+                PreMovement,
+                (
+                    update_focus
+                        .run_if(in_state(GameState::Playing))
+                        .run_if(on_event::<FocusInvalidatedEvent>())
+                        .in_set(InternalCameraSet::UpdateFocus),
+                    process_move_focus_events
+                        .run_if(in_state(GameState::Playing))
+                        .in_set(InternalCameraSet::MoveFocus)
+                        .after(InternalCameraSet::UpdateFocus),
+                    update_translation_handler
+                        .run_if(in_state(GameState::Playing))
+                        .run_if(on_event::<UpdateTranslationEvent>())
+                        .after(InternalCameraSet::MoveFocus),
+                ),
             )
-            .add_system(
-                handle_zoom_events
-                    .in_base_set(GameSet::Input)
-                    .run_if(in_state(GameState::Playing))
-                    .in_set(CameraSet::ZoomEvent),
-            )
-            .add_system(
-                handle_rotate_events
-                    .in_base_set(GameSet::Input)
-                    .run_if(in_state(GameState::Playing))
-                    .in_set(CameraSet::RotateEvent),
-            )
-            .add_system(
-                handle_tilt_events
-                    .in_base_set(GameSet::Input)
-                    .run_if(in_state(GameState::Playing))
-                    .in_set(CameraSet::TiltEvent),
-            )
-            .add_system(
-                process_move_focus_events
-                    .in_base_set(GameSet::PreMovement)
-                    .run_if(in_state(GameState::Playing))
-                    .in_set(InternalCameraSet::MoveFocus)
-                    .after(InternalCameraSet::UpdateFocus),
-            )
-            .add_system(
-                update_translation_handler
-                    .in_base_set(GameSet::PreMovement)
-                    .run_if(in_state(GameState::Playing))
-                    .run_if(on_event::<UpdateTranslationEvent>())
-                    .after(InternalCameraSet::MoveFocus),
-            )
-            .add_system(
-                zoom.in_base_set(GameSet::Movement)
-                    .run_if(in_state(GameState::Playing))
-                    .in_set(InternalCameraSet::Zoom),
-            )
-            .add_system(
-                pivot
-                    .in_base_set(GameSet::Movement)
-                    .run_if(in_state(GameState::Playing))
-                    .in_set(InternalCameraSet::Pivot)
-                    .run_if(
-                        resource_exists_and_changed::<DesiredOffNadir>()
-                            .or_else(resource_exists_and_changed::<DesiredAzimuth>()),
-                    ),
-            )
-            .add_system(
-                move_horizontaly
-                    .in_base_set(GameSet::Movement)
-                    .run_if(in_state(GameState::Playing))
-                    // Zooming changes camera focus point so do it
-                    // after other types of camera movement.
-                    .after(InternalCameraSet::Zoom)
-                    .after(InternalCameraSet::Pivot),
+            .add_systems(
+                Movement,
+                (
+                    zoom.run_if(in_state(GameState::Playing))
+                        .in_set(InternalCameraSet::Zoom),
+                    pivot
+                        .run_if(in_state(GameState::Playing))
+                        .run_if(
+                            resource_exists_and_changed::<DesiredOffNadir>()
+                                .or_else(resource_exists_and_changed::<DesiredAzimuth>()),
+                        )
+                        .in_set(InternalCameraSet::Pivot),
+                    move_horizontaly
+                        .run_if(in_state(GameState::Playing))
+                        // Zooming changes camera focus point so do it
+                        // after other types of camera movement.
+                        .after(InternalCameraSet::Zoom)
+                        .after(InternalCameraSet::Pivot),
+                ),
             );
     }
 }
@@ -135,6 +124,7 @@ enum InternalCameraSet {
     MoveFocus,
 }
 
+#[derive(Event)]
 pub struct MoveFocusEvent {
     point: Vec2,
 }
@@ -150,6 +140,7 @@ impl MoveFocusEvent {
 }
 
 /// Send this event to (re)set camera horizontal movement.
+#[derive(Event)]
 pub struct MoveCameraHorizontallyEvent(Vec2);
 
 impl MoveCameraHorizontallyEvent {
@@ -168,6 +159,7 @@ impl MoveCameraHorizontallyEvent {
 }
 
 /// Send this event to rotate camera around the vertical (Y) axis.
+#[derive(Event)]
 pub struct RotateCameraEvent(f32);
 
 impl RotateCameraEvent {
@@ -184,6 +176,7 @@ impl RotateCameraEvent {
 }
 
 /// Send this event to tilt the camera, i.e. to change elevation / off nadir.
+#[derive(Event)]
 pub struct TiltCameraEvent(f32);
 
 impl TiltCameraEvent {
@@ -200,6 +193,7 @@ impl TiltCameraEvent {
 }
 
 /// Send this event to zoom the camera.
+#[derive(Event)]
 pub struct ZoomCameraEvent(f32);
 
 impl ZoomCameraEvent {
@@ -245,9 +239,11 @@ impl CameraFocus {
     }
 }
 
+#[derive(Event)]
 struct FocusInvalidatedEvent;
 
 /// Send this event to (re)set camera translation based on focus point.
+#[derive(Event)]
 struct UpdateTranslationEvent;
 
 #[derive(Default, Resource)]
diff --git a/crates/camera/src/distance.rs b/crates/camera/src/distance.rs
index fa88cde0e..73d9ae7ca 100644
--- a/crates/camera/src/distance.rs
+++ b/crates/camera/src/distance.rs
@@ -1,6 +1,5 @@
 use bevy::prelude::*;
 use de_core::{
-    baseset::GameSet,
     objects::{MovableSolid, StaticSolid},
     state::AppState,
 };
@@ -9,21 +8,15 @@ pub(crate) struct DistancePlugin;
 
 impl Plugin for DistancePlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(
-            init::<MovableSolid>
-                .in_base_set(GameSet::PostUpdate)
-                .run_if(in_state(AppState::InGame)),
-        )
-        .add_system(
-            init::<StaticSolid>
-                .in_base_set(GameSet::PostUpdate)
-                .run_if(in_state(AppState::InGame)),
-        )
-        .add_system(
-            update
-                .in_base_set(GameSet::PostUpdate)
-                .run_if(in_state(AppState::InGame))
-                .in_set(DistanceSet::Update),
+        app.add_systems(
+            PostUpdate,
+            (
+                init::<MovableSolid>.run_if(in_state(AppState::InGame)),
+                init::<StaticSolid>.run_if(in_state(AppState::InGame)),
+                update
+                    .run_if(in_state(AppState::InGame))
+                    .in_set(DistanceSet::Update),
+            ),
         );
     }
 }
diff --git a/crates/combat/src/attack.rs b/crates/combat/src/attack.rs
index b6c342438..c7ada56d4 100644
--- a/crates/combat/src/attack.rs
+++ b/crates/combat/src/attack.rs
@@ -2,7 +2,7 @@ use std::{cmp::Ordering, collections::BinaryHeap};
 
 use bevy::prelude::*;
 use de_behaviour::{ChaseSet, ChaseTarget, ChaseTargetEvent};
-use de_core::{baseset::GameSet, gamestate::GameState, objects::ObjectType};
+use de_core::{gamestate::GameState, objects::ObjectType};
 use de_index::SpatialQuery;
 use de_objects::{LaserCannon, SolidObjects};
 use parry3d::query::Ray;
@@ -22,35 +22,34 @@ pub(crate) struct AttackPlugin;
 impl Plugin for AttackPlugin {
     fn build(&self, app: &mut App) {
         app.add_event::<AttackEvent>()
-            .add_system(
-                attack
-                    .in_base_set(GameSet::PreUpdate)
-                    .run_if(in_state(GameState::Playing))
-                    .in_set(AttackingSet::Attack)
-                    .before(ChaseSet::ChaseTargetEvent),
+            .add_systems(
+                PreUpdate,
+                (
+                    attack
+                        .run_if(in_state(GameState::Playing))
+                        .in_set(AttackingSet::Attack)
+                        .before(ChaseSet::ChaseTargetEvent),
+                    update_positions
+                        .run_if(in_state(GameState::Playing))
+                        .after(AttackingSet::Attack),
+                ),
             )
-            .add_system(
-                update_positions
-                    .in_base_set(GameSet::PreUpdate)
-                    .run_if(in_state(GameState::Playing))
-                    .after(AttackingSet::Attack),
-            )
-            .add_system(
-                charge
-                    .in_base_set(GameSet::Update)
-                    .run_if(in_state(GameState::Playing))
-                    .in_set(AttackingSet::Charge),
-            )
-            .add_system(
-                aim_and_fire
-                    .in_base_set(GameSet::Update)
-                    .run_if(in_state(GameState::Playing))
-                    .after(AttackingSet::Charge)
-                    .before(AttackingSet::Fire),
+            .add_systems(
+                Update,
+                (
+                    charge
+                        .run_if(in_state(GameState::Playing))
+                        .in_set(AttackingSet::Charge),
+                    aim_and_fire
+                        .run_if(in_state(GameState::Playing))
+                        .after(AttackingSet::Charge)
+                        .before(AttackingSet::Fire),
+                ),
             );
     }
 }
 
+#[derive(Event)]
 pub struct AttackEvent {
     attacker: Entity,
     enemy: Entity,
diff --git a/crates/combat/src/laser.rs b/crates/combat/src/laser.rs
index 44949d007..9b6ccf6af 100644
--- a/crates/combat/src/laser.rs
+++ b/crates/combat/src/laser.rs
@@ -1,5 +1,5 @@
 use bevy::prelude::*;
-use de_core::{baseset::GameSet, gamestate::GameState};
+use de_core::gamestate::GameState;
 use de_objects::Health;
 use de_signs::UpdateBarValueEvent;
 use de_spawner::SpawnerSet;
@@ -11,9 +11,9 @@ pub(crate) struct LaserPlugin;
 
 impl Plugin for LaserPlugin {
     fn build(&self, app: &mut App) {
-        app.add_event::<LaserFireEvent>().add_system(
-            fire.in_base_set(GameSet::Update)
-                .run_if(in_state(GameState::Playing))
+        app.add_event::<LaserFireEvent>().add_systems(
+            Update,
+            fire.run_if(in_state(GameState::Playing))
                 .in_set(AttackingSet::Fire)
                 .before(SpawnerSet::Destroyer),
         );
@@ -24,6 +24,7 @@ impl Plugin for LaserPlugin {
 ///
 /// This event is ignored when the attacker has 0 health or no longer exists.
 /// Thus ordering of the events is important.
+#[derive(Event)]
 pub(crate) struct LaserFireEvent {
     attacker: Entity,
     ray: Ray,
diff --git a/crates/combat/src/trail.rs b/crates/combat/src/trail.rs
index 59d53dfa8..cce01c6bf 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::TypeUuid,
+    reflect::{TypePath, TypeUuid},
     render::{
         mesh::{Indices, MeshVertexBufferLayout, PrimitiveTopology},
         render_resource::{
@@ -11,9 +11,7 @@ use bevy::{
         },
     },
 };
-use de_core::{
-    baseset::GameSet, cleanup::DespawnOnGameExit, gamestate::GameState, state::AppState,
-};
+use de_core::{cleanup::DespawnOnGameExit, gamestate::GameState, state::AppState};
 use parry3d::query::Ray;
 
 const TRAIL_LIFESPAN: Duration = Duration::from_millis(500);
@@ -23,23 +21,21 @@ pub(crate) struct TrailPlugin;
 
 impl Plugin for TrailPlugin {
     fn build(&self, app: &mut App) {
-        app.add_plugin(MaterialPlugin::<TrailMaterial>::default())
+        app.add_plugins(MaterialPlugin::<TrailMaterial>::default())
             .add_event::<TrailEvent>()
-            .add_system(setup.in_schedule(OnEnter(AppState::InGame)))
-            .add_system(cleanup.in_schedule(OnExit(AppState::InGame)))
-            .add_system(
-                spawn
-                    .in_base_set(GameSet::PostUpdate)
-                    .run_if(in_state(GameState::Playing)),
-            )
-            .add_system(
-                update
-                    .in_base_set(GameSet::PostUpdate)
-                    .run_if(in_state(GameState::Playing)),
+            .add_systems(OnEnter(AppState::InGame), setup)
+            .add_systems(OnExit(AppState::InGame), cleanup)
+            .add_systems(
+                PostUpdate,
+                (
+                    spawn.run_if(in_state(GameState::Playing)),
+                    update.run_if(in_state(GameState::Playing)),
+                ),
             );
     }
 }
 
+#[derive(Event)]
 pub(crate) struct TrailEvent(Ray);
 
 impl TrailEvent {
@@ -75,7 +71,7 @@ impl Trail {
     }
 }
 
-#[derive(AsBindGroup, TypeUuid, Debug, Clone)]
+#[derive(AsBindGroup, TypeUuid, TypePath, Debug, Clone)]
 #[uuid = "560ab431-1a54-48b3-87ea-8de8d94ceafb"]
 struct TrailMaterial {
     #[uniform(0)]
diff --git a/crates/conf/src/plugin.rs b/crates/conf/src/plugin.rs
index a3a446767..23496f4f2 100644
--- a/crates/conf/src/plugin.rs
+++ b/crates/conf/src/plugin.rs
@@ -16,9 +16,10 @@ pub(super) struct ConfPlugin;
 
 impl Plugin for ConfPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(start_loading.in_schedule(OnEnter(AppState::AppLoading)))
-            .add_system(cleanup.in_schedule(OnExit(AppState::AppLoading)))
-            .add_system(
+        app.add_systems(OnEnter(AppState::AppLoading), start_loading)
+            .add_systems(OnExit(AppState::AppLoading), cleanup)
+            .add_systems(
+                Update,
                 poll_conf
                     .track_progress()
                     .run_if(in_state(AppState::AppLoading)),
diff --git a/crates/construction/src/manufacturing.rs b/crates/construction/src/manufacturing.rs
index adf5bac81..92dd16339 100644
--- a/crates/construction/src/manufacturing.rs
+++ b/crates/construction/src/manufacturing.rs
@@ -3,7 +3,6 @@ use std::{collections::VecDeque, time::Duration};
 use ahash::AHashMap;
 use bevy::prelude::*;
 use de_core::{
-    baseset::GameSet,
     cleanup::DespawnOnGameExit,
     gamestate::GameState,
     gconfig::GameConfig,
@@ -32,41 +31,26 @@ impl Plugin for ManufacturingPlugin {
         app.add_event::<EnqueueAssemblyEvent>()
             .add_event::<ChangeDeliveryLocationEvent>()
             .add_event::<DeliverEvent>()
-            .add_system(
-                configure
-                    .in_base_set(GameSet::PostUpdate)
-                    .run_if(in_state(AppState::InGame)),
+            .add_systems(
+                PreUpdate,
+                (
+                    change_locations
+                        .run_if(in_state(GameState::Playing))
+                        .in_set(ManufacturingSet::ChangeLocations),
+                    check_spawn_locations
+                        .run_if(in_state(GameState::Playing))
+                        .before(ManufacturingSet::Produce),
+                    produce
+                        .run_if(in_state(GameState::Playing))
+                        .in_set(ManufacturingSet::Produce),
+                    deliver
+                        .run_if(in_state(GameState::Playing))
+                        .after(ManufacturingSet::ChangeLocations)
+                        .after(ManufacturingSet::Produce),
+                ),
             )
-            .add_system(
-                change_locations
-                    .in_base_set(GameSet::PreUpdate)
-                    .run_if(in_state(GameState::Playing))
-                    .in_set(ManufacturingSet::ChangeLocations),
-            )
-            .add_system(
-                enqueue
-                    .in_base_set(GameSet::Update)
-                    .run_if(in_state(GameState::Playing)),
-            )
-            .add_system(
-                check_spawn_locations
-                    .in_base_set(GameSet::PreUpdate)
-                    .run_if(in_state(GameState::Playing))
-                    .before(ManufacturingSet::Produce),
-            )
-            .add_system(
-                produce
-                    .in_base_set(GameSet::PreUpdate)
-                    .run_if(in_state(GameState::Playing))
-                    .in_set(ManufacturingSet::Produce),
-            )
-            .add_system(
-                deliver
-                    .in_base_set(GameSet::PreUpdate)
-                    .run_if(in_state(GameState::Playing))
-                    .after(ManufacturingSet::ChangeLocations)
-                    .after(ManufacturingSet::Produce),
-            );
+            .add_systems(Update, enqueue.run_if(in_state(GameState::Playing)))
+            .add_systems(PostUpdate, configure.run_if(in_state(AppState::InGame)));
     }
 }
 
@@ -77,6 +61,7 @@ enum ManufacturingSet {
 }
 
 /// Send this event to change target location of freshly manufactured units.
+#[derive(Event)]
 pub struct ChangeDeliveryLocationEvent {
     factory: Entity,
     position: Vec2,
@@ -97,6 +82,7 @@ impl ChangeDeliveryLocationEvent {
 }
 
 /// Send this event to enqueue a unit to be manufactured by a factory.
+#[derive(Event)]
 pub struct EnqueueAssemblyEvent {
     factory: Entity,
     unit: UnitType,
@@ -121,6 +107,7 @@ impl EnqueueAssemblyEvent {
     }
 }
 
+#[derive(Event)]
 struct DeliverEvent {
     factory: Entity,
     unit: UnitType,
diff --git a/crates/controller/src/commands/executor.rs b/crates/controller/src/commands/executor.rs
index 6053abd60..8fd7e7a8a 100644
--- a/crates/controller/src/commands/executor.rs
+++ b/crates/controller/src/commands/executor.rs
@@ -2,7 +2,7 @@ use bevy::prelude::*;
 use de_behaviour::ChaseTargetEvent;
 use de_combat::AttackEvent;
 use de_construction::{AssemblyLine, ChangeDeliveryLocationEvent};
-use de_core::{baseset::GameSet, gamestate::GameState, objects::MovableSolid};
+use de_core::{baseset::InputSchedule, gamestate::GameState, objects::MovableSolid};
 use de_pathing::{PathQueryProps, PathTarget, UpdateEntityPathEvent};
 use glam::Vec2;
 
@@ -15,23 +15,19 @@ impl Plugin for ExecutorPlugin {
         app.add_event::<SendSelectedEvent>()
             .add_event::<DeliveryLocationSelectedEvent>()
             .add_event::<GroupAttackEvent>()
-            .add_system(
-                send_selected_system
-                    .in_base_set(GameSet::Input)
-                    .run_if(in_state(GameState::Playing))
-                    .in_set(CommandsSet::SendSelected),
-            )
-            .add_system(
-                delivery_location_system
-                    .in_base_set(GameSet::Input)
-                    .run_if(in_state(GameState::Playing))
-                    .in_set(CommandsSet::DeliveryLocation),
-            )
-            .add_system(
-                attack_system
-                    .in_base_set(GameSet::Input)
-                    .run_if(in_state(GameState::Playing))
-                    .in_set(CommandsSet::Attack),
+            .add_systems(
+                InputSchedule,
+                (
+                    send_selected_system
+                        .run_if(in_state(GameState::Playing))
+                        .in_set(CommandsSet::SendSelected),
+                    delivery_location_system
+                        .run_if(in_state(GameState::Playing))
+                        .in_set(CommandsSet::DeliveryLocation),
+                    attack_system
+                        .run_if(in_state(GameState::Playing))
+                        .in_set(CommandsSet::Attack),
+                ),
             );
     }
 }
@@ -44,6 +40,7 @@ pub(crate) enum CommandsSet {
 }
 
 /// Send this event to send all selected movable units to a point on the map.
+#[derive(Event)]
 pub(crate) struct SendSelectedEvent(Vec2);
 
 impl SendSelectedEvent {
@@ -58,6 +55,7 @@ impl SendSelectedEvent {
 
 /// Send this event to set manufacturing delivery location for all selected
 /// building with a factory.
+#[derive(Event)]
 pub(crate) struct DeliveryLocationSelectedEvent(Vec2);
 
 impl DeliveryLocationSelectedEvent {
@@ -72,6 +70,7 @@ impl DeliveryLocationSelectedEvent {
 
 /// Send this event to attack an enemy with all selected movable units. The
 /// target must be an enemy entity.
+#[derive(Event)]
 pub(crate) struct GroupAttackEvent(Entity);
 
 impl GroupAttackEvent {
diff --git a/crates/controller/src/commands/handlers.rs b/crates/controller/src/commands/handlers.rs
index fe5800cda..064143f54 100644
--- a/crates/controller/src/commands/handlers.rs
+++ b/crates/controller/src/commands/handlers.rs
@@ -15,7 +15,7 @@ use de_camera::{
 };
 use de_conf::Configuration;
 use de_core::{
-    baseset::GameSet,
+    baseset::InputSchedule,
     gamestate::GameState,
     gconfig::GameConfig,
     objects::{BuildingType, ObjectType, Playable, PLAYER_MAX_BUILDINGS},
@@ -32,10 +32,10 @@ use super::{
 };
 use crate::{
     draft::{DiscardDraftsEvent, DraftSet, NewDraftEvent, SpawnDraftsEvent},
-    hud::{GameMenuSet, ToggleGameMenu, UpdateSelectionBoxEvent},
+    hud::{GameMenuSet, ToggleGameMenuEvent, UpdateSelectionBoxEvent},
     mouse::{
-        DragUpdateType, MouseClicked, MouseDoubleClicked, MouseDragged, MouseSet, Pointer,
-        PointerSet,
+        DragUpdateType, MouseClickedEvent, MouseDoubleClickedEvent, MouseDraggedEvent, MouseSet,
+        Pointer, PointerSet,
     },
     selection::{
         AreaSelectSet, SelectEvent, SelectInRectEvent, Selected, SelectionMode, SelectionSet,
@@ -56,9 +56,9 @@ impl HandlersPlugin {
         };
 
         for (building_type, &key) in key_map.iter() {
-            app.add_system(
+            app.add_systems(
+                InputSchedule,
                 place_draft(building_type)
-                    .in_base_set(GameSet::Input)
                     .run_if(in_state(GameState::Playing))
                     .run_if(KeyCondition::single(key).build())
                     .before(DraftSet::New)
@@ -70,97 +70,69 @@ impl HandlersPlugin {
 
 impl Plugin for HandlersPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(
-            right_click_handler
-                .in_base_set(GameSet::Input)
-                .run_if(in_state(GameState::Playing))
-                .run_if(on_click(MouseButton::Right))
-                .after(PointerSet::Update)
-                .after(MouseSet::Buttons)
-                .before(CommandsSet::SendSelected)
-                .before(CommandsSet::DeliveryLocation)
-                .before(CommandsSet::Attack),
-        )
-        .add_system(
-            left_click_handler
-                .in_base_set(GameSet::Input)
-                .run_if(in_state(GameState::Playing))
-                .run_if(on_click(MouseButton::Left))
-                .in_set(HandlersSet::LeftClick)
-                .before(SelectionSet::Update)
-                .before(DraftSet::Spawn)
-                .after(PointerSet::Update)
-                .after(MouseSet::Buttons),
-        )
-        .add_system(
-            double_click_handler
-                .in_base_set(GameSet::Input)
-                .run_if(in_state(GameState::Playing))
-                .run_if(on_double_click(MouseButton::Left))
-                .before(SelectionSet::Update)
-                .before(DraftSet::Spawn)
-                .after(PointerSet::Update)
-                .after(MouseSet::Buttons)
-                .after(HandlersSet::LeftClick),
-        )
-        .add_system(
-            move_camera_arrows_system
-                .in_base_set(GameSet::Input)
-                .run_if(in_state(GameState::Playing))
-                .before(CameraSet::MoveHorizontallEvent),
-        )
-        .add_system(
-            move_camera_mouse_system
-                .in_base_set(GameSet::Input)
-                .run_if(in_state(GameState::Playing))
-                .before(CameraSet::MoveHorizontallEvent),
-        )
-        .add_system(
-            zoom_camera
-                .in_base_set(GameSet::Input)
-                .run_if(in_state(GameState::Playing))
-                .before(CameraSet::ZoomEvent),
-        )
-        .add_system(
-            pivot_camera
-                .in_base_set(GameSet::Input)
-                .run_if(in_state(GameState::Playing))
-                .before(CameraSet::RotateEvent)
-                .before(CameraSet::TiltEvent),
-        )
-        .add_system(
-            handle_escape
-                .in_base_set(GameSet::Input)
-                .run_if(in_state(GameState::Playing))
-                .run_if(KeyCondition::single(KeyCode::Escape).build())
-                .before(GameMenuSet::Toggle)
-                .before(DraftSet::Discard),
-        )
-        .add_system(
-            select_all
-                .in_base_set(GameSet::Input)
-                .run_if(in_state(GameState::Playing))
-                .run_if(KeyCondition::single(KeyCode::A).with_ctrl().build())
-                .before(SelectionSet::Update),
-        )
-        .add_system(
-            select_all_visible
-                .in_base_set(GameSet::Input)
-                .run_if(in_state(GameState::Playing))
-                .run_if(
-                    KeyCondition::single(KeyCode::A)
-                        .with_ctrl()
-                        .with_shift()
-                        .build(),
-                )
-                .before(AreaSelectSet::SelectInArea),
-        )
-        .add_system(
-            update_drags
-                .in_base_set(GameSet::Input)
-                .run_if(in_state(GameState::Playing))
-                .before(AreaSelectSet::SelectInArea)
-                .after(MouseSet::Buttons),
+        app.add_systems(
+            InputSchedule,
+            (
+                right_click_handler
+                    .run_if(in_state(GameState::Playing))
+                    .run_if(on_click(MouseButton::Right))
+                    .after(PointerSet::Update)
+                    .after(MouseSet::Buttons)
+                    .before(CommandsSet::SendSelected)
+                    .before(CommandsSet::DeliveryLocation)
+                    .before(CommandsSet::Attack),
+                left_click_handler
+                    .run_if(in_state(GameState::Playing))
+                    .run_if(on_click(MouseButton::Left))
+                    .in_set(HandlersSet::LeftClick)
+                    .before(SelectionSet::Update)
+                    .before(DraftSet::Spawn)
+                    .after(PointerSet::Update)
+                    .after(MouseSet::Buttons),
+                double_click_handler
+                    .run_if(in_state(GameState::Playing))
+                    .run_if(on_double_click(MouseButton::Left))
+                    .before(SelectionSet::Update)
+                    .before(DraftSet::Spawn)
+                    .after(PointerSet::Update)
+                    .after(MouseSet::Buttons)
+                    .after(HandlersSet::LeftClick),
+                move_camera_arrows_system
+                    .run_if(in_state(GameState::Playing))
+                    .before(CameraSet::MoveHorizontallEvent),
+                move_camera_mouse_system
+                    .run_if(in_state(GameState::Playing))
+                    .before(CameraSet::MoveHorizontallEvent),
+                zoom_camera
+                    .run_if(in_state(GameState::Playing))
+                    .before(CameraSet::ZoomEvent),
+                pivot_camera
+                    .run_if(in_state(GameState::Playing))
+                    .before(CameraSet::RotateEvent)
+                    .before(CameraSet::TiltEvent),
+                handle_escape
+                    .run_if(in_state(GameState::Playing))
+                    .run_if(KeyCondition::single(KeyCode::Escape).build())
+                    .before(GameMenuSet::Toggle)
+                    .before(DraftSet::Discard),
+                select_all
+                    .run_if(in_state(GameState::Playing))
+                    .run_if(KeyCondition::single(KeyCode::A).with_ctrl().build())
+                    .before(SelectionSet::Update),
+                select_all_visible
+                    .run_if(in_state(GameState::Playing))
+                    .run_if(
+                        KeyCondition::single(KeyCode::A)
+                            .with_ctrl()
+                            .with_shift()
+                            .build(),
+                    )
+                    .before(AreaSelectSet::SelectInArea),
+                update_drags
+                    .run_if(in_state(GameState::Playing))
+                    .before(AreaSelectSet::SelectInArea)
+                    .after(MouseSet::Buttons),
+            ),
         );
 
         Self::add_place_draft_systems(app);
@@ -172,16 +144,16 @@ pub(crate) enum HandlersSet {
     LeftClick,
 }
 
-fn on_click(button: MouseButton) -> impl Fn(EventReader<MouseClicked>) -> bool {
-    move |mut events: EventReader<MouseClicked>| {
+fn on_click(button: MouseButton) -> impl Fn(EventReader<MouseClickedEvent>) -> bool {
+    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
     }
 }
 
-fn on_double_click(button: MouseButton) -> impl Fn(EventReader<MouseDoubleClicked>) -> bool {
-    move |mut events: EventReader<MouseDoubleClicked>| {
+fn on_double_click(button: MouseButton) -> impl Fn(EventReader<MouseDoubleClickedEvent>) -> bool {
+    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
@@ -223,7 +195,7 @@ fn double_click_handler(
     if !drafts.is_empty() {
         return;
     }
-    let selection_mode = if keys.pressed(KeyCode::LControl) {
+    let selection_mode = if keys.pressed(KeyCode::ControlLeft) {
         SelectionMode::Add
     } else {
         SelectionMode::Replace
@@ -296,9 +268,9 @@ fn move_camera_mouse_system(
         movement.x += 1.;
     }
     if cursor.y < MOVE_MARGIN {
-        movement.y -= 1.;
-    } else if cursor.y > (window.height() - MOVE_MARGIN) {
         movement.y += 1.;
+    } else if cursor.y > (window.height() - MOVE_MARGIN) {
+        movement.y -= 1.;
     }
 
     if (movement != Vec2::ZERO) == *was_moving {
@@ -331,7 +303,7 @@ fn pivot_camera(
     mut rotate_event: EventWriter<RotateCameraEvent>,
     mut tilt_event: EventWriter<TiltCameraEvent>,
 ) {
-    if !buttons.pressed(MouseButton::Middle) && !keys.pressed(KeyCode::LShift) {
+    if !buttons.pressed(MouseButton::Middle) && !keys.pressed(KeyCode::ShiftLeft) {
         return;
     }
 
@@ -354,7 +326,7 @@ fn left_click_handler(
     drafts: Query<(), With<DraftAllowed>>,
 ) {
     if drafts.is_empty() {
-        let selection_mode = if keys.pressed(KeyCode::LControl) {
+        let selection_mode = if keys.pressed(KeyCode::ControlLeft) {
             SelectionMode::AddToggle
         } else {
             SelectionMode::Replace
@@ -371,12 +343,12 @@ fn left_click_handler(
 }
 
 fn handle_escape(
-    mut toggle_menu_events: EventWriter<ToggleGameMenu>,
+    mut toggle_menu_events: EventWriter<ToggleGameMenuEvent>,
     mut discard_events: EventWriter<DiscardDraftsEvent>,
     drafts: Query<(), With<DraftAllowed>>,
 ) {
     if drafts.is_empty() {
-        toggle_menu_events.send(ToggleGameMenu);
+        toggle_menu_events.send(ToggleGameMenuEvent);
     } else {
         discard_events.send(DiscardDraftsEvent);
     }
@@ -425,7 +397,7 @@ fn select_all_visible(mut events: EventWriter<SelectInRectEvent>) {
 
 fn update_drags(
     keys: Res<Input<KeyCode>>,
-    mut drag_events: EventReader<MouseDragged>,
+    mut drag_events: EventReader<MouseDraggedEvent>,
     mut ui_events: EventWriter<UpdateSelectionBoxEvent>,
     mut select_events: EventWriter<SelectInRectEvent>,
 ) {
@@ -441,7 +413,8 @@ fn update_drags(
             },
             DragUpdateType::Released => {
                 if let Some(rect) = drag_event.rect() {
-                    let mode = if keys.pressed(KeyCode::LControl) || keys.pressed(KeyCode::RControl)
+                    let mode = if keys.pressed(KeyCode::ControlLeft)
+                        || keys.pressed(KeyCode::ControlRight)
                     {
                         SelectionMode::Add
                     } else {
diff --git a/crates/controller/src/commands/keyboard.rs b/crates/controller/src/commands/keyboard.rs
index f77d1d8da..2c67be9c3 100644
--- a/crates/controller/src/commands/keyboard.rs
+++ b/crates/controller/src/commands/keyboard.rs
@@ -43,8 +43,8 @@ impl KeyCondition {
                 .count()
                 > 0;
 
-            let control = keys.pressed(KeyCode::LControl) || keys.pressed(KeyCode::RControl);
-            let shift = keys.pressed(KeyCode::LShift) || keys.pressed(KeyCode::RShift);
+            let control = keys.pressed(KeyCode::ControlLeft) || keys.pressed(KeyCode::ControlRight);
+            let shift = keys.pressed(KeyCode::ShiftLeft) || keys.pressed(KeyCode::ShiftRight);
             self.control == control && shift == self.shift && proper_key
         }
     }
diff --git a/crates/controller/src/commands/mod.rs b/crates/controller/src/commands/mod.rs
index 4f5a8d2b7..48b3dc00c 100644
--- a/crates/controller/src/commands/mod.rs
+++ b/crates/controller/src/commands/mod.rs
@@ -16,6 +16,6 @@ pub(crate) struct CommandsPlugin;
 
 impl Plugin for CommandsPlugin {
     fn build(&self, app: &mut App) {
-        app.add_plugin(HandlersPlugin).add_plugin(ExecutorPlugin);
+        app.add_plugins((HandlersPlugin, ExecutorPlugin));
     }
 }
diff --git a/crates/controller/src/draft.rs b/crates/controller/src/draft.rs
index 46f6eb0a5..da55e258f 100644
--- a/crates/controller/src/draft.rs
+++ b/crates/controller/src/draft.rs
@@ -1,6 +1,6 @@
 use bevy::prelude::*;
 use de_core::{
-    baseset::GameSet,
+    baseset::InputSchedule,
     cleanup::DespawnOnGameExit,
     gamestate::GameState,
     gconfig::GameConfig,
@@ -18,31 +18,24 @@ impl Plugin for DraftPlugin {
         app.add_event::<SpawnDraftsEvent>()
             .add_event::<NewDraftEvent>()
             .add_event::<DiscardDraftsEvent>()
-            .add_system(
-                spawn
-                    .in_base_set(GameSet::Input)
-                    .run_if(in_state(AppState::InGame))
-                    .run_if(on_event::<SpawnDraftsEvent>())
-                    .in_set(DraftSet::Spawn),
-            )
-            .add_system(
-                new_drafts
-                    .in_base_set(GameSet::Input)
-                    .run_if(in_state(AppState::InGame))
-                    .in_set(DraftSet::New),
-            )
-            .add_system(
-                discard_drafts
-                    .in_base_set(GameSet::Input)
-                    .run_if(in_state(AppState::InGame))
-                    .run_if(on_event::<DiscardDraftsEvent>())
-                    .in_set(DraftSet::Discard),
-            )
-            .add_system(
-                move_drafts
-                    .in_base_set(GameSet::Input)
-                    .run_if(in_state(GameState::Playing))
-                    .after(PointerSet::Update),
+            .add_systems(
+                InputSchedule,
+                (
+                    spawn
+                        .run_if(in_state(AppState::InGame))
+                        .run_if(on_event::<SpawnDraftsEvent>())
+                        .in_set(DraftSet::Spawn),
+                    new_drafts
+                        .run_if(in_state(AppState::InGame))
+                        .in_set(DraftSet::New),
+                    discard_drafts
+                        .run_if(in_state(AppState::InGame))
+                        .run_if(on_event::<DiscardDraftsEvent>())
+                        .in_set(DraftSet::Discard),
+                    move_drafts
+                        .run_if(in_state(GameState::Playing))
+                        .after(PointerSet::Update),
+                ),
             );
     }
 }
@@ -54,13 +47,16 @@ pub(crate) enum DraftSet {
     Discard,
 }
 
+#[derive(Event)]
 pub(crate) struct SpawnDraftsEvent;
 
+#[derive(Event)]
 pub(crate) struct NewDraftEvent {
     point: Vec3,
     building_type: BuildingType,
 }
 
+#[derive(Event)]
 pub(crate) struct DiscardDraftsEvent;
 
 impl NewDraftEvent {
diff --git a/crates/controller/src/frustum.rs b/crates/controller/src/frustum.rs
index 8713cc19a..915dba484 100644
--- a/crates/controller/src/frustum.rs
+++ b/crates/controller/src/frustum.rs
@@ -5,7 +5,7 @@ use bevy::{
     prelude::*,
     render::{
         camera::Projection,
-        primitives::{Frustum, Plane},
+        primitives::{Frustum, HalfSpace},
     },
 };
 use de_core::screengeom::ScreenRect;
@@ -42,7 +42,7 @@ impl<'w, 's> ScreenFrustum<'w, 's> {
         debug_assert!(projection.fov < PI);
         debug_assert!(projection.fov > 0.);
 
-        let mut planes = [Plane::default(); 6];
+        let mut half_spaces = [HalfSpace::default(); 6];
 
         let y_max = (0.5 * projection.fov).tan();
         let maxs = [y_max * projection.aspect_ratio, y_max];
@@ -53,15 +53,15 @@ impl<'w, 's> ScreenFrustum<'w, 's> {
             norm[i / 2] = signum;
             norm[2] = signum * maxs[i / 2] * edges[i];
             let norm = transform.rotation * Vec3::from_array(norm);
-            planes[i] = Plane::new(norm.extend(-transform.translation.dot(norm)));
+            half_spaces[i] = HalfSpace::new(norm.extend(-transform.translation.dot(norm)));
         }
 
         let forward = transform.forward();
         let near_dist = -forward.dot(transform.translation + projection.near * forward);
         let far_dist = -forward.dot(transform.translation + projection.far * forward);
-        planes[4] = Plane::new(forward.extend(near_dist));
-        planes[5] = Plane::new(-forward.extend(far_dist));
+        half_spaces[4] = HalfSpace::new(forward.extend(near_dist));
+        half_spaces[5] = HalfSpace::new(-forward.extend(far_dist));
 
-        Frustum { planes }
+        Frustum { half_spaces }
     }
 }
diff --git a/crates/controller/src/hud/actionbar.rs b/crates/controller/src/hud/actionbar.rs
index 10d767ad6..db1846d9d 100644
--- a/crates/controller/src/hud/actionbar.rs
+++ b/crates/controller/src/hud/actionbar.rs
@@ -1,7 +1,7 @@
 use bevy::prelude::*;
 use de_construction::EnqueueAssemblyEvent;
 use de_core::{
-    baseset::GameSet,
+    baseset::InputSchedule,
     cleanup::DespawnOnGameExit,
     gamestate::GameState,
     objects::{ObjectType, UnitType},
@@ -16,25 +16,23 @@ pub(crate) struct ActionBarPlugin;
 
 impl Plugin for ActionBarPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(setup.in_schedule(OnEnter(GameState::Playing)))
-            .add_system(cleanup.in_schedule(OnExit(GameState::Playing)))
-            .add_system(
-                detect_update
-                    .in_base_set(GameSet::PostUpdate)
-                    .run_if(in_state(GameState::Playing))
-                    .in_set(ActionBarSet::DetectUpdate),
-            )
-            .add_system(
-                update
-                    .in_base_set(GameSet::PostUpdate)
-                    .run_if(in_state(GameState::Playing))
-                    .run_if(resource_exists_and_changed::<ActiveEntity>())
-                    .after(ActionBarSet::DetectUpdate),
+        app.add_systems(OnEnter(GameState::Playing), setup)
+            .add_systems(OnExit(GameState::Playing), cleanup)
+            .add_systems(
+                PostUpdate,
+                (
+                    detect_update
+                        .run_if(in_state(GameState::Playing))
+                        .in_set(ActionBarSet::DetectUpdate),
+                    update
+                        .run_if(in_state(GameState::Playing))
+                        .run_if(resource_exists_and_changed::<ActiveEntity>())
+                        .after(ActionBarSet::DetectUpdate),
+                ),
             )
-            .add_system(
-                button_system
-                    .in_base_set(GameSet::Input)
-                    .run_if(in_state(GameState::Playing)),
+            .add_systems(
+                InputSchedule,
+                button_system.run_if(in_state(GameState::Playing)),
             );
     }
 }
@@ -64,17 +62,13 @@ fn setup(mut commands: Commands) {
         .spawn((
             NodeBundle {
                 style: Style {
-                    size: Size {
-                        width: Val::Percent(60.),
-                        height: Val::Percent(15.),
-                    },
+                    width: Val::Percent(60.),
+                    height: Val::Percent(15.),
                     position_type: PositionType::Absolute,
-                    position: UiRect::new(
-                        Val::Percent(20.),
-                        Val::Percent(80.),
-                        Val::Percent(85.),
-                        Val::Percent(100.),
-                    ),
+                    left: Val::Percent(20.),
+                    right: Val::Percent(80.),
+                    top: Val::Percent(85.),
+                    bottom: Val::Percent(100.),
                     ..default()
                 },
                 background_color: HUD_COLOR.into(),
@@ -119,7 +113,8 @@ fn spawn_button(commands: &mut GuiCommands, parent: Entity, unit: UnitType) {
     let button = commands
         .spawn_button(
             OuterStyle {
-                size: Size::new(Val::Percent(10.), Val::Percent(80.)),
+                width: Val::Percent(10.),
+                height: Val::Percent(80.),
                 margin: UiRect::new(
                     Val::Percent(0.),
                     Val::Percent(0.),
@@ -140,7 +135,7 @@ fn button_system(
     mut events: EventWriter<EnqueueAssemblyEvent>,
 ) {
     for (&interaction, action) in interactions.iter() {
-        if let Interaction::Clicked = interaction {
+        if let Interaction::Pressed = interaction {
             events.send(EnqueueAssemblyEvent::new(active.0.unwrap(), action.0));
         }
     }
diff --git a/crates/controller/src/hud/details.rs b/crates/controller/src/hud/details.rs
index 14c837d4e..f3794aebc 100644
--- a/crates/controller/src/hud/details.rs
+++ b/crates/controller/src/hud/details.rs
@@ -1,5 +1,4 @@
 use bevy::prelude::*;
-use de_core::baseset::GameSet;
 use de_core::{cleanup::DespawnOnGameExit, gamestate::GameState};
 use de_energy::Battery;
 use de_gui::{BodyTextCommands, BodyTextOps, GuiCommands, OuterStyle};
@@ -13,13 +12,9 @@ pub(crate) struct DetailsPlugin;
 
 impl Plugin for DetailsPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(setup.in_schedule(OnEnter(GameState::Playing)))
-            .add_system(
-                update
-                    .in_base_set(GameSet::PostUpdate)
-                    .run_if(in_state(GameState::Playing)),
-            )
-            .add_system(clean_up.in_schedule(OnExit(GameState::Playing)));
+        app.add_systems(OnEnter(GameState::Playing), setup)
+            .add_systems(PostUpdate, update.run_if(in_state(GameState::Playing)))
+            .add_systems(OnExit(GameState::Playing), clean_up);
     }
 }
 
@@ -31,17 +26,13 @@ fn setup(mut commands: GuiCommands) {
         .spawn((
             NodeBundle {
                 style: Style {
-                    size: Size {
-                        width: Val::Percent(20.),
-                        height: Val::Percent(30.),
-                    },
+                    width: Val::Percent(20.),
+                    height: Val::Percent(30.),
                     position_type: PositionType::Absolute,
-                    position: UiRect::new(
-                        Val::Percent(0.),
-                        Val::Percent(20.),
-                        Val::Percent(70.),
-                        Val::Percent(100.),
-                    ),
+                    left: Val::Percent(0.),
+                    right: Val::Percent(20.),
+                    top: Val::Percent(70.),
+                    bottom: Val::Percent(100.),
                     ..default()
                 },
                 background_color: HUD_COLOR.into(),
@@ -54,10 +45,8 @@ fn setup(mut commands: GuiCommands) {
     let details_text = commands
         .spawn_body_text(
             OuterStyle {
-                size: Size {
-                    width: Val::Percent(20.),
-                    height: Val::Percent(30.),
-                },
+                width: Val::Percent(20.),
+                height: Val::Percent(30.),
                 margin: UiRect::all(Val::Percent(5.)),
             },
             "",
diff --git a/crates/controller/src/hud/interaction.rs b/crates/controller/src/hud/interaction.rs
index e6f47ee0e..ee0d47c6a 100644
--- a/crates/controller/src/hud/interaction.rs
+++ b/crates/controller/src/hud/interaction.rs
@@ -29,7 +29,6 @@ where
         ),
         F,
     >,
-    window_query: Query<'w, 's, &'static Window, With<PrimaryWindow>>,
 }
 
 impl<'w, 's, F> HudNodes<'w, 's, F>
@@ -46,10 +45,6 @@ where
     /// The returned point is between (0, 0) (top-left corner) and (1, 1)
     /// (bottom-right corner).
     pub(crate) fn relative_position(&self, point: Vec2) -> Option<Vec2> {
-        let window = self.window_query.single();
-        // This is because screen y starts on bottom, GlobalTransform on top.
-        let point = Vec2::new(point.x, window.height() - point.y);
-
         self.hud
             .iter()
             .filter_map(|(box_transform, visibility, node)| {
diff --git a/crates/controller/src/hud/menu.rs b/crates/controller/src/hud/menu.rs
index 7379c5a00..859cac828 100644
--- a/crates/controller/src/hud/menu.rs
+++ b/crates/controller/src/hud/menu.rs
@@ -1,7 +1,7 @@
 use core::fmt;
 
 use bevy::prelude::*;
-use de_core::{baseset::GameSet, gamestate::GameState, state::AppState};
+use de_core::{baseset::InputSchedule, gamestate::GameState, state::AppState};
 use de_gui::{ButtonCommands, GuiCommands, OuterStyle};
 
 use super::interaction::InteractionBlocker;
@@ -10,19 +10,17 @@ pub(crate) struct MenuPlugin;
 
 impl Plugin for MenuPlugin {
     fn build(&self, app: &mut App) {
-        app.add_event::<ToggleGameMenu>()
-            .add_system(setup.in_schedule(OnEnter(GameState::Playing)))
-            .add_system(cleanup.in_schedule(OnExit(GameState::Playing)))
-            .add_system(
-                toggle_system
-                    .in_base_set(GameSet::Input)
-                    .run_if(in_state(GameState::Playing))
-                    .in_set(GameMenuSet::Toggle),
-            )
-            .add_system(
-                button_system
-                    .in_base_set(GameSet::Input)
-                    .run_if(in_state(GameState::Playing)),
+        app.add_event::<ToggleGameMenuEvent>()
+            .add_systems(OnEnter(GameState::Playing), setup)
+            .add_systems(OnExit(GameState::Playing), cleanup)
+            .add_systems(
+                InputSchedule,
+                (
+                    toggle_system
+                        .run_if(in_state(GameState::Playing))
+                        .in_set(GameMenuSet::Toggle),
+                    button_system.run_if(in_state(GameState::Playing)),
+                ),
             );
     }
 }
@@ -32,7 +30,8 @@ pub(crate) enum GameMenuSet {
     Toggle,
 }
 
-pub(crate) struct ToggleGameMenu;
+#[derive(Event)]
+pub(crate) struct ToggleGameMenuEvent;
 
 #[derive(Component)]
 struct PopUpMenu;
@@ -56,7 +55,10 @@ fn setup(mut commands: GuiCommands) {
             style: Style {
                 position_type: PositionType::Absolute,
                 flex_direction: FlexDirection::Column,
-                position: UiRect::all(Val::Percent(0.)),
+                left: Val::Percent(0.),
+                right: Val::Percent(0.),
+                top: Val::Percent(0.),
+                bottom: Val::Percent(0.),
                 align_items: AlignItems::Center,
                 justify_content: JustifyContent::Center,
                 ..default()
@@ -72,7 +74,8 @@ fn setup(mut commands: GuiCommands) {
         .spawn(NodeBundle {
             style: Style {
                 flex_direction: FlexDirection::Column,
-                size: Size::new(Val::Percent(25.), Val::Percent(50.)),
+                width: Val::Percent(25.),
+                height: Val::Percent(50.),
                 padding: UiRect::horizontal(Val::Percent(1.)),
                 align_items: AlignItems::Center,
                 justify_content: JustifyContent::Center,
@@ -91,7 +94,8 @@ fn button(commands: &mut GuiCommands, parent: Entity, action: ButtonAction) {
     let button = commands
         .spawn_button(
             OuterStyle {
-                size: Size::new(Val::Percent(100.), Val::Percent(16.)),
+                width: Val::Percent(100.),
+                height: Val::Percent(16.),
                 margin: UiRect::new(
                     Val::Percent(0.),
                     Val::Percent(0.),
@@ -113,7 +117,7 @@ fn cleanup(mut commands: Commands, query: Query<Entity, With<PopUpMenu>>) {
 }
 
 fn toggle_system(
-    mut events: EventReader<ToggleGameMenu>,
+    mut events: EventReader<ToggleGameMenuEvent>,
     mut query: Query<&mut Visibility, With<PopUpMenu>>,
 ) {
     if events.iter().count() % 2 == 0 {
@@ -132,7 +136,7 @@ fn button_system(
     interactions: Query<(&Interaction, &ButtonAction), Changed<Interaction>>,
 ) {
     for (&interaction, &action) in interactions.iter() {
-        if let Interaction::Clicked = interaction {
+        if let Interaction::Pressed = interaction {
             match action {
                 ButtonAction::Quit => next_state.set(AppState::InMenu),
             }
diff --git a/crates/controller/src/hud/minimap/fill.rs b/crates/controller/src/hud/minimap/fill.rs
index e038460a7..f9711c8d4 100644
--- a/crates/controller/src/hud/minimap/fill.rs
+++ b/crates/controller/src/hud/minimap/fill.rs
@@ -1,6 +1,6 @@
 use bevy::{ecs::system::SystemParam, prelude::*};
 use de_core::{
-    baseset::GameSet, gamestate::GameState, gconfig::GameConfig, objects::ObjectType,
+    baseset::PostMovement, gamestate::GameState, gconfig::GameConfig, objects::ObjectType,
     player::Player, projection::ToFlat,
 };
 use de_map::size::MapBounds;
@@ -25,24 +25,20 @@ pub(super) struct FillPlugin;
 
 impl Plugin for FillPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(
-            clear_system
-                .in_base_set(GameSet::PostMovement)
-                .run_if(in_state(GameState::Playing))
-                .in_set(FillSet::Clear),
-        )
-        .add_system(
-            draw_entities_system
-                .in_base_set(GameSet::PostMovement)
-                .run_if(in_state(GameState::Playing))
-                .in_set(FillSet::DrawEntities)
-                .after(FillSet::Clear),
-        )
-        .add_system(
-            draw_camera_system
-                .in_base_set(GameSet::PostMovement)
-                .run_if(in_state(GameState::Playing))
-                .after(FillSet::DrawEntities),
+        app.add_systems(
+            PostMovement,
+            (
+                clear_system
+                    .run_if(in_state(GameState::Playing))
+                    .in_set(FillSet::Clear),
+                draw_entities_system
+                    .run_if(in_state(GameState::Playing))
+                    .in_set(FillSet::DrawEntities)
+                    .after(FillSet::Clear),
+                draw_camera_system
+                    .run_if(in_state(GameState::Playing))
+                    .after(FillSet::DrawEntities),
+            ),
         );
     }
 }
diff --git a/crates/controller/src/hud/minimap/interaction.rs b/crates/controller/src/hud/minimap/interaction.rs
index a2240bbb2..d646c81d8 100644
--- a/crates/controller/src/hud/minimap/interaction.rs
+++ b/crates/controller/src/hud/minimap/interaction.rs
@@ -6,7 +6,7 @@ use bevy::{
     window::PrimaryWindow,
 };
 use de_camera::MoveFocusEvent;
-use de_core::{baseset::GameSet, gamestate::GameState};
+use de_core::{baseset::InputSchedule, gamestate::GameState};
 use de_map::size::MapBounds;
 
 use super::nodes::MinimapNode;
@@ -19,33 +19,25 @@ pub(super) struct InteractionPlugin;
 
 impl Plugin for InteractionPlugin {
     fn build(&self, app: &mut App) {
-        app.add_event::<MinimapClickEvent>()
-            .add_system(
+        app.add_event::<MinimapClickEvent>().add_systems(
+            InputSchedule,
+            (
                 click_handler
-                    .in_base_set(GameSet::Input)
                     .run_if(in_state(GameState::Playing))
                     .in_set(InteractionSet::ClickHandler),
-            )
-            .add_system(
                 move_camera_system
-                    .in_base_set(GameSet::Input)
                     .run_if(in_state(GameState::Playing))
                     .after(InteractionSet::ClickHandler),
-            )
-            .add_system(
                 send_units_system
-                    .in_base_set(GameSet::Input)
                     .run_if(in_state(GameState::Playing))
                     .after(InteractionSet::ClickHandler)
                     .before(CommandsSet::SendSelected),
-            )
-            .add_system(
                 delivery_location_system
-                    .in_base_set(GameSet::Input)
                     .run_if(in_state(GameState::Playing))
                     .after(InteractionSet::ClickHandler)
                     .before(CommandsSet::DeliveryLocation),
-            );
+            ),
+        );
     }
 }
 
@@ -54,6 +46,7 @@ enum InteractionSet {
     ClickHandler,
 }
 
+#[derive(Event)]
 struct MinimapClickEvent {
     button: MouseButton,
     position: Vec2,
diff --git a/crates/controller/src/hud/minimap/mod.rs b/crates/controller/src/hud/minimap/mod.rs
index fad7589cf..23a539b8d 100644
--- a/crates/controller/src/hud/minimap/mod.rs
+++ b/crates/controller/src/hud/minimap/mod.rs
@@ -11,8 +11,6 @@ pub(crate) struct MinimapPlugin;
 
 impl Plugin for MinimapPlugin {
     fn build(&self, app: &mut App) {
-        app.add_plugin(NodesPlugin)
-            .add_plugin(FillPlugin)
-            .add_plugin(InteractionPlugin);
+        app.add_plugins((NodesPlugin, FillPlugin, InteractionPlugin));
     }
 }
diff --git a/crates/controller/src/hud/minimap/nodes.rs b/crates/controller/src/hud/minimap/nodes.rs
index 40d83b40a..27aed9f41 100644
--- a/crates/controller/src/hud/minimap/nodes.rs
+++ b/crates/controller/src/hud/minimap/nodes.rs
@@ -2,7 +2,7 @@ use bevy::{
     prelude::*,
     render::render_resource::{Extent3d, TextureDimension, TextureFormat},
 };
-use de_core::{baseset::GameSet, cleanup::DespawnOnGameExit, gamestate::GameState};
+use de_core::{baseset::PreMovement, cleanup::DespawnOnGameExit, gamestate::GameState};
 use de_map::size::MapBounds;
 
 use crate::hud::{interaction::InteractionBlocker, HUD_COLOR};
@@ -14,11 +14,10 @@ pub(super) struct NodesPlugin;
 
 impl Plugin for NodesPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(setup.in_schedule(OnEnter(GameState::Playing)))
-            .add_system(
-                update_resolution
-                    .in_base_set(GameSet::PreMovement)
-                    .run_if(in_state(GameState::Playing)),
+        app.add_systems(OnEnter(GameState::Playing), setup)
+            .add_systems(
+                PreMovement,
+                update_resolution.run_if(in_state(GameState::Playing)),
             );
     }
 }
@@ -37,13 +36,9 @@ fn setup(mut commands: Commands, mut images: ResMut<Assets<Image>>, map_bounds:
                 style: Style {
                     position_type: PositionType::Absolute,
                     padding: UiRect::all(MINIMAP_PADDING),
-                    size: Size::width(MINIMAP_WIDTH),
-                    position: UiRect {
-                        right: Val::Px(0.),
-                        bottom: Val::Px(0.),
-                        left: Val::Auto,
-                        top: Val::Auto,
-                    },
+                    width: MINIMAP_WIDTH,
+                    right: Val::Px(0.),
+                    bottom: Val::Px(0.),
                     ..default()
                 },
                 background_color: HUD_COLOR.into(),
@@ -56,7 +51,8 @@ fn setup(mut commands: Commands, mut images: ResMut<Assets<Image>>, map_bounds:
             parent
                 .spawn(ImageBundle {
                     style: Style {
-                        size: Size::all(Val::Percent(100.)),
+                        width: Val::Percent(100.),
+                        height: Val::Percent(100.),
                         aspect_ratio: Some(aspect),
                         ..default()
                     },
diff --git a/crates/controller/src/hud/mod.rs b/crates/controller/src/hud/mod.rs
index 1858cc5d1..3a12d5b45 100644
--- a/crates/controller/src/hud/mod.rs
+++ b/crates/controller/src/hud/mod.rs
@@ -8,7 +8,7 @@ mod minimap;
 mod selection;
 
 pub(crate) use interaction::HudNodes;
-pub(crate) use menu::{GameMenuSet, ToggleGameMenu};
+pub(crate) use menu::{GameMenuSet, ToggleGameMenuEvent};
 pub(crate) use selection::UpdateSelectionBoxEvent;
 
 use self::{
@@ -22,10 +22,12 @@ pub(crate) struct HudPlugin;
 
 impl Plugin for HudPlugin {
     fn build(&self, app: &mut App) {
-        app.add_plugin(SelectionPlugin)
-            .add_plugin(DetailsPlugin)
-            .add_plugin(ActionBarPlugin)
-            .add_plugin(MenuPlugin)
-            .add_plugin(MinimapPlugin);
+        app.add_plugins((
+            SelectionPlugin,
+            DetailsPlugin,
+            ActionBarPlugin,
+            MenuPlugin,
+            MinimapPlugin,
+        ));
     }
 }
diff --git a/crates/controller/src/hud/selection.rs b/crates/controller/src/hud/selection.rs
index 5b306e793..f9780970c 100644
--- a/crates/controller/src/hud/selection.rs
+++ b/crates/controller/src/hud/selection.rs
@@ -1,7 +1,5 @@
 use bevy::prelude::*;
-use de_core::{
-    baseset::GameSet, cleanup::DespawnOnGameExit, gamestate::GameState, screengeom::ScreenRect,
-};
+use de_core::{cleanup::DespawnOnGameExit, gamestate::GameState, screengeom::ScreenRect};
 
 const SELECTION_BOX_COLOR: Color = Color::rgba(0., 0.5, 0.8, 0.2);
 
@@ -9,14 +7,14 @@ pub(crate) struct SelectionPlugin;
 
 impl Plugin for SelectionPlugin {
     fn build(&self, app: &mut App) {
-        app.add_event::<UpdateSelectionBoxEvent>().add_system(
-            process_events
-                .in_base_set(GameSet::PostUpdate)
-                .run_if(in_state(GameState::Playing)),
+        app.add_event::<UpdateSelectionBoxEvent>().add_systems(
+            PostUpdate,
+            process_events.run_if(in_state(GameState::Playing)),
         );
     }
 }
 
+#[derive(Event)]
 pub struct UpdateSelectionBoxEvent(Option<ScreenRect>);
 
 impl UpdateSelectionBoxEvent {
@@ -41,17 +39,17 @@ fn process_events(
         match event.0 {
             Some(rect) => {
                 let size = rect.size();
-                let ui_size = Size::new(Val::Percent(50. * size.x), Val::Percent(50. * size.y));
-                let ui_rect = UiRect {
-                    left: Val::Percent(50. * (rect.left() + 1.)),
-                    top: Val::Percent(50. * (1. - rect.top())),
-                    ..Default::default()
-                };
+                let width = Val::Percent(50. * size.x);
+                let height = Val::Percent(50. * size.y);
+                let left = Val::Percent(50. * (rect.left() + 1.));
+                let top = Val::Percent(50. * (1. - rect.top()));
 
                 match boxes.get_single_mut() {
                     Ok((_, mut style)) => {
-                        style.size = ui_size;
-                        style.position = ui_rect;
+                        style.width = width;
+                        style.height = height;
+                        style.left = left;
+                        style.top = top;
                     }
                     Err(_) => {
                         assert!(boxes.is_empty());
@@ -60,8 +58,10 @@ fn process_events(
                             NodeBundle {
                                 style: Style {
                                     position_type: PositionType::Absolute,
-                                    size: ui_size,
-                                    position: ui_rect,
+                                    width,
+                                    height,
+                                    left,
+                                    top,
                                     ..Default::default()
                                 },
                                 background_color: BackgroundColor(SELECTION_BOX_COLOR),
diff --git a/crates/controller/src/mouse/input.rs b/crates/controller/src/mouse/input.rs
index f72f9d0e7..f86cb3b1b 100644
--- a/crates/controller/src/mouse/input.rs
+++ b/crates/controller/src/mouse/input.rs
@@ -4,7 +4,9 @@ use bevy::{
     prelude::*,
     window::PrimaryWindow,
 };
-use de_core::{baseset::GameSet, gamestate::GameState, screengeom::ScreenRect, state::AppState};
+use de_core::{
+    baseset::InputSchedule, gamestate::GameState, screengeom::ScreenRect, state::AppState,
+};
 
 use crate::hud::HudNodes;
 
@@ -15,38 +17,31 @@ pub(super) struct InputPlugin;
 
 impl Plugin for InputPlugin {
     fn build(&self, app: &mut App) {
-        app.add_event::<MouseClicked>()
-            .add_event::<MouseDoubleClicked>()
-            .add_event::<MouseDragged>()
-            .add_system(setup.in_schedule(OnEnter(AppState::InGame)))
-            .add_system(cleanup.in_schedule(OnExit(AppState::InGame)))
-            .add_system(
-                update_position
-                    .in_base_set(GameSet::Input)
-                    .run_if(in_state(GameState::Playing))
-                    .in_set(MouseSet::Position),
-            )
-            .add_system(
-                update_drags
-                    .in_base_set(GameSet::Input)
-                    .run_if(in_state(GameState::Playing))
-                    .run_if(resource_exists_and_changed::<MousePosition>())
-                    .in_set(MouseSet::Drags)
-                    .after(MouseSet::Position),
-            )
-            .add_system(
-                update_buttons
-                    .in_base_set(GameSet::Input)
-                    .run_if(in_state(GameState::Playing))
-                    .in_set(MouseSet::SingeButton)
-                    .after(MouseSet::Drags),
-            )
-            .add_system(
-                check_double_click
-                    .in_base_set(GameSet::Input)
-                    .run_if(in_state(GameState::Playing))
-                    .in_set(MouseSet::Buttons)
-                    .after(MouseSet::SingeButton),
+        app.add_event::<MouseClickedEvent>()
+            .add_event::<MouseDoubleClickedEvent>()
+            .add_event::<MouseDraggedEvent>()
+            .add_systems(OnEnter(AppState::InGame), setup)
+            .add_systems(OnExit(AppState::InGame), cleanup)
+            .add_systems(
+                InputSchedule,
+                (
+                    update_position
+                        .run_if(in_state(GameState::Playing))
+                        .in_set(MouseSet::Position),
+                    update_drags
+                        .run_if(in_state(GameState::Playing))
+                        .run_if(resource_exists_and_changed::<MousePosition>())
+                        .in_set(MouseSet::Drags)
+                        .after(MouseSet::Position),
+                    update_buttons
+                        .run_if(in_state(GameState::Playing))
+                        .in_set(MouseSet::SingeButton)
+                        .after(MouseSet::Drags),
+                    check_double_click
+                        .run_if(in_state(GameState::Playing))
+                        .in_set(MouseSet::Buttons)
+                        .after(MouseSet::SingeButton),
+                ),
             );
     }
 }
@@ -59,12 +54,13 @@ pub(crate) enum MouseSet {
     Buttons,
 }
 
-pub(crate) struct MouseClicked {
+#[derive(Event)]
+pub(crate) struct MouseClickedEvent {
     button: MouseButton,
     position: Vec2,
 }
 
-impl MouseClicked {
+impl MouseClickedEvent {
     fn new(button: MouseButton, position: Vec2) -> Self {
         Self { button, position }
     }
@@ -78,11 +74,12 @@ impl MouseClicked {
     }
 }
 
-pub(crate) struct MouseDoubleClicked {
+#[derive(Event)]
+pub(crate) struct MouseDoubleClickedEvent {
     button: MouseButton,
 }
 
-impl MouseDoubleClicked {
+impl MouseDoubleClickedEvent {
     fn new(button: MouseButton) -> Self {
         Self { button }
     }
@@ -92,13 +89,14 @@ impl MouseDoubleClicked {
     }
 }
 
-pub(crate) struct MouseDragged {
+#[derive(Event)]
+pub(crate) struct MouseDraggedEvent {
     button: MouseButton,
     rect: Option<ScreenRect>,
     update_type: DragUpdateType,
 }
 
-impl MouseDragged {
+impl MouseDraggedEvent {
     fn new(button: MouseButton, rect: Option<ScreenRect>, update_type: DragUpdateType) -> Self {
         Self {
             button,
@@ -136,9 +134,10 @@ impl MousePosition {
     /// Returns position of the mouse on screen normalized to values between
     /// [-1., -1.] (bottom-left corner) and [1., 1.] (upper-right corner).
     pub(crate) fn ndc(&self) -> Option<Vec2> {
-        self.0.map(|p| 2. * p - Vec2::ONE)
+        self.0.map(|p| Vec2::new(2. * p.x - 1., 1. - 2. * p.y))
     }
 
+    /// Top-left corner is (0, 0), bottom-right corner is (1, 1).
     fn position(&self) -> Option<Vec2> {
         self.0
     }
@@ -263,11 +262,11 @@ fn update_position(
 fn update_drags(
     mouse_position: Res<MousePosition>,
     mut mouse_state: ResMut<MouseDragStates>,
-    mut drags: EventWriter<MouseDragged>,
+    mut drags: EventWriter<MouseDraggedEvent>,
 ) {
     let resolutions = mouse_state.update(mouse_position.ndc());
     for (&button, &rect) in resolutions.iter() {
-        drags.send(MouseDragged::new(button, rect, DragUpdateType::Moved));
+        drags.send(MouseDraggedEvent::new(button, rect, DragUpdateType::Moved));
     }
 }
 
@@ -275,8 +274,8 @@ fn update_buttons(
     mouse_position: Res<MousePosition>,
     mut mouse_state: ResMut<MouseDragStates>,
     mut input_events: EventReader<MouseButtonInput>,
-    mut clicks: EventWriter<MouseClicked>,
-    mut drags: EventWriter<MouseDragged>,
+    mut clicks: EventWriter<MouseClickedEvent>,
+    mut drags: EventWriter<MouseDraggedEvent>,
 ) {
     for event in input_events.iter() {
         match event.state {
@@ -284,10 +283,10 @@ fn update_buttons(
                 if let Some(drag_resolution) = mouse_state.resolve(event.button) {
                     match drag_resolution {
                         DragResolution::Point(position) => {
-                            clicks.send(MouseClicked::new(event.button, position));
+                            clicks.send(MouseClickedEvent::new(event.button, position));
                         }
                         DragResolution::Rect(rect) => {
-                            drags.send(MouseDragged::new(
+                            drags.send(MouseDraggedEvent::new(
                                 event.button,
                                 rect,
                                 DragUpdateType::Released,
@@ -304,8 +303,8 @@ fn update_buttons(
 }
 
 fn check_double_click(
-    mut clicks: EventReader<MouseClicked>,
-    mut double_clicks: EventWriter<MouseDoubleClicked>,
+    mut clicks: EventReader<MouseClickedEvent>,
+    mut double_clicks: EventWriter<MouseDoubleClickedEvent>,
     mut last_click_position: Local<Option<Vec2>>,
     mut last_click_time: Local<f64>,
     time: Res<Time>,
@@ -318,7 +317,7 @@ fn check_double_click(
         }) {
             // Check if double click using timer
             if (current_time - *last_click_time) < DOUBLE_CLICK_TIME {
-                double_clicks.send(MouseDoubleClicked::new(mouse_clicked.button()));
+                double_clicks.send(MouseDoubleClickedEvent::new(mouse_clicked.button()));
             }
         }
 
diff --git a/crates/controller/src/mouse/mod.rs b/crates/controller/src/mouse/mod.rs
index 6370fd833..97021660f 100644
--- a/crates/controller/src/mouse/mod.rs
+++ b/crates/controller/src/mouse/mod.rs
@@ -1,7 +1,8 @@
 use bevy::prelude::*;
 use input::InputPlugin;
 pub(crate) use input::{
-    DragUpdateType, MouseClicked, MouseDoubleClicked, MouseDragged, MousePosition, MouseSet,
+    DragUpdateType, MouseClickedEvent, MouseDoubleClickedEvent, MouseDraggedEvent, MousePosition,
+    MouseSet,
 };
 use pointer::PointerPlugin;
 pub(crate) use pointer::{Pointer, PointerSet};
@@ -13,6 +14,6 @@ pub(crate) struct MousePlugin;
 
 impl Plugin for MousePlugin {
     fn build(&self, app: &mut App) {
-        app.add_plugin(InputPlugin).add_plugin(PointerPlugin);
+        app.add_plugins((InputPlugin, PointerPlugin));
     }
 }
diff --git a/crates/controller/src/mouse/pointer.rs b/crates/controller/src/mouse/pointer.rs
index 4d04a7472..26077a4f4 100644
--- a/crates/controller/src/mouse/pointer.rs
+++ b/crates/controller/src/mouse/pointer.rs
@@ -1,5 +1,5 @@
 use bevy::prelude::*;
-use de_core::{baseset::GameSet, gamestate::GameState, state::AppState};
+use de_core::{baseset::InputSchedule, gamestate::GameState, state::AppState};
 use de_index::SpatialQuery;
 use de_signs::UpdateBarVisibilityEvent;
 use de_terrain::TerrainCollider;
@@ -15,20 +15,19 @@ pub(super) struct PointerPlugin;
 
 impl Plugin for PointerPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(setup.in_schedule(OnEnter(AppState::InGame)))
-            .add_system(cleanup.in_schedule(OnExit(AppState::InGame)))
-            .add_system(
-                pointer_update_system
-                    .in_base_set(GameSet::Input)
-                    .run_if(in_state(GameState::Playing))
-                    .in_set(PointerSet::Update)
-                    .after(MouseSet::Position),
-            )
-            .add_system(
-                update_bar_visibility
-                    .in_base_set(GameSet::Input)
-                    .run_if(in_state(GameState::Playing))
-                    .after(PointerSet::Update),
+        app.add_systems(OnEnter(AppState::InGame), setup)
+            .add_systems(OnExit(AppState::InGame), cleanup)
+            .add_systems(
+                InputSchedule,
+                (
+                    pointer_update_system
+                        .run_if(in_state(GameState::Playing))
+                        .in_set(PointerSet::Update)
+                        .after(MouseSet::Position),
+                    update_bar_visibility
+                        .run_if(in_state(GameState::Playing))
+                        .after(PointerSet::Update),
+                ),
             );
     }
 }
diff --git a/crates/controller/src/selection/area.rs b/crates/controller/src/selection/area.rs
index 9fc9484da..81224e77a 100644
--- a/crates/controller/src/selection/area.rs
+++ b/crates/controller/src/selection/area.rs
@@ -1,6 +1,6 @@
 use bevy::prelude::*;
 use de_core::{
-    baseset::GameSet,
+    baseset::InputSchedule,
     frustum,
     gamestate::GameState,
     objects::{ObjectType, Playable},
@@ -17,9 +17,9 @@ pub(super) struct AreaPlugin;
 
 impl Plugin for AreaPlugin {
     fn build(&self, app: &mut App) {
-        app.add_event::<SelectInRectEvent>().add_system(
+        app.add_event::<SelectInRectEvent>().add_systems(
+            InputSchedule,
             select_in_area
-                .in_base_set(GameSet::Input)
                 .run_if(in_state(GameState::Playing))
                 .in_set(AreaSelectSet::SelectInArea)
                 .before(SelectionSet::Update),
@@ -32,6 +32,7 @@ pub(crate) enum AreaSelectSet {
     SelectInArea,
 }
 
+#[derive(Event)]
 pub(crate) struct SelectInRectEvent {
     rect: ScreenRect,
     mode: SelectionMode,
diff --git a/crates/controller/src/selection/bookkeeping.rs b/crates/controller/src/selection/bookkeeping.rs
index a535a880b..acfc71e04 100644
--- a/crates/controller/src/selection/bookkeeping.rs
+++ b/crates/controller/src/selection/bookkeeping.rs
@@ -1,6 +1,6 @@
 use ahash::AHashSet;
 use bevy::{ecs::system::SystemParam, prelude::*};
-use de_core::{baseset::GameSet, gamestate::GameState};
+use de_core::{baseset::InputSchedule, gamestate::GameState};
 use de_signs::{UpdateBarVisibilityEvent, UpdateLineVisibilityEvent, UpdatePoleVisibilityEvent};
 use de_terrain::MarkerVisibility;
 
@@ -13,23 +13,19 @@ impl Plugin for BookkeepingPlugin {
         app.add_event::<SelectEvent>()
             .add_event::<SelectedEvent>()
             .add_event::<DeselectedEvent>()
-            .add_system(
-                update_selection
-                    .in_base_set(GameSet::Input)
-                    .run_if(in_state(GameState::Playing))
-                    .in_set(SelectionSet::Update),
-            )
-            .add_system(
-                selected_system
-                    .in_base_set(GameSet::Input)
-                    .run_if(in_state(GameState::Playing))
-                    .after(SelectionSet::Update),
-            )
-            .add_system(
-                deselected_system
-                    .in_base_set(GameSet::Input)
-                    .run_if(in_state(GameState::Playing))
-                    .after(SelectionSet::Update),
+            .add_systems(
+                InputSchedule,
+                (
+                    update_selection
+                        .run_if(in_state(GameState::Playing))
+                        .in_set(SelectionSet::Update),
+                    selected_system
+                        .run_if(in_state(GameState::Playing))
+                        .after(SelectionSet::Update),
+                    deselected_system
+                        .run_if(in_state(GameState::Playing))
+                        .after(SelectionSet::Update),
+                ),
             );
     }
 }
@@ -39,6 +35,7 @@ pub(crate) enum SelectionSet {
     Update,
 }
 
+#[derive(Event)]
 pub(crate) struct SelectEvent {
     entities: Vec<Entity>,
     mode: SelectionMode,
@@ -72,8 +69,10 @@ impl SelectEvent {
     }
 }
 
+#[derive(Event)]
 struct SelectedEvent(Entity);
 
+#[derive(Event)]
 struct DeselectedEvent(Entity);
 
 #[derive(Component)]
diff --git a/crates/controller/src/selection/mod.rs b/crates/controller/src/selection/mod.rs
index a7cd98dfd..610c12b1a 100644
--- a/crates/controller/src/selection/mod.rs
+++ b/crates/controller/src/selection/mod.rs
@@ -11,6 +11,6 @@ pub(crate) struct SelectionPlugin;
 
 impl Plugin for SelectionPlugin {
     fn build(&self, app: &mut App) {
-        app.add_plugin(BookkeepingPlugin).add_plugin(AreaPlugin);
+        app.add_plugins((BookkeepingPlugin, AreaPlugin));
     }
 }
diff --git a/crates/core/src/baseset.rs b/crates/core/src/baseset.rs
index d2d9d83b9..2bcf6933a 100644
--- a/crates/core/src/baseset.rs
+++ b/crates/core/src/baseset.rs
@@ -1,88 +1,40 @@
-use bevy::prelude::*;
+use bevy::{app::MainScheduleOrder, ecs::schedule::ScheduleLabel, prelude::*};
 
+// TODO rename the plugin & the module
 pub struct GameSetsPlugin;
 
 impl Plugin for GameSetsPlugin {
     fn build(&self, app: &mut App) {
-        app.edit_schedule(CoreSchedule::Main, |schedule| {
-            schedule.configure_sets(
-                (
-                    GameSet::Input,
-                    GameSet::InputFlush,
-                    GameSet::PreMovement,
-                    GameSet::PreMovementFlush,
-                    GameSet::Movement,
-                    GameSet::MovementFlush,
-                    GameSet::PostMovement,
-                    GameSet::PostMovementFlush,
-                    GameSet::PreUpdate,
-                    GameSet::PreUpdateFlush,
-                    GameSet::Update,
-                    GameSet::UpdateFlush,
-                    GameSet::PostUpdate,
-                    GameSet::PostUpdateFlush,
-                )
-                    .chain(),
-            );
+        let mut main = app.world.get_resource_mut::<MainScheduleOrder>().unwrap();
 
-            schedule.configure_sets((CoreSet::StateTransitions, GameSet::Input).chain());
-            schedule.configure_sets(
-                (
-                    GameSet::InputFlush,
-                    CoreSet::FixedUpdate,
-                    GameSet::PreMovement,
-                )
-                    .chain(),
-            );
-            schedule.configure_sets((GameSet::PostUpdateFlush, CoreSet::Update).chain());
-
-            schedule.add_system(apply_system_buffers.in_base_set(GameSet::InputFlush));
-            schedule.add_system(apply_system_buffers.in_base_set(GameSet::PreMovementFlush));
-            schedule.add_system(apply_system_buffers.in_base_set(GameSet::MovementFlush));
-            schedule.add_system(apply_system_buffers.in_base_set(GameSet::PostMovementFlush));
-            schedule.add_system(apply_system_buffers.in_base_set(GameSet::PreUpdateFlush));
-            schedule.add_system(apply_system_buffers.in_base_set(GameSet::UpdateFlush));
-            schedule.add_system(apply_system_buffers.in_base_set(GameSet::PostUpdateFlush));
-        });
+        main.insert_after(First, InputSchedule);
+        main.insert_after(InputSchedule, PreMovement);
+        main.insert_after(PreMovement, Movement);
+        main.insert_after(Movement, PostMovement);
     }
 }
 
-#[derive(Debug, Hash, PartialEq, Eq, Clone, SystemSet)]
-#[system_set(base)]
-pub enum GameSet {
-    /// All user input is handled during this stage.
-    Input,
-    InputFlush,
-    /// The game state is prepared for movement stage during this stage. The
-    /// preparation includes, among other things, global path finding &
-    /// planning related updates.
-    PreMovement,
-    PreMovementFlush,
-    /// All of "game active" entity movement (changes to [`bevy::prelude::Transform`])
-    /// happens during this stage (an in no other stage).
-    ///
-    /// "Game active" entities are those which impact the game dynamics. For
-    /// example buildings, units or the terrain. Auxiliary entities, for
-    /// example building drafts, might be moved during other stages.
-    Movement,
-    MovementFlush,
-    /// This stage includes for example update to spatial index of movable
-    /// objects.
-    PostMovement,
-    PostMovementFlush,
-    /// This stage includes all necessary preparation for the game update, e.g.
-    /// insertion of components which need to be present during game update.
-    PreUpdate,
-    PreUpdateFlush,
-    /// Most of the (movement unrelated) game logic happens during this stage.
-    /// For example unit AI, attacking, object health updates and so on.
-    ///
-    /// This is the only stage during which "game active" entities are
-    /// (de)spawned.
-    Update,
-    UpdateFlush,
-    /// For example this stage includes update to spatial index necessary due
-    /// to (de)spawning of objects to the game.
-    PostUpdate,
-    PostUpdateFlush,
-}
+// TODO update nomenclature (in doc comments)
+/// All user input is handled during this stage.
+#[derive(ScheduleLabel, Clone, Debug, PartialEq, Eq, Hash)]
+pub struct InputSchedule;
+
+/// The game state is prepared for movement stage during this stage. The
+/// preparation includes, among other things, global path finding & planning
+/// related updates.
+#[derive(ScheduleLabel, Clone, Debug, PartialEq, Eq, Hash)]
+pub struct PreMovement;
+
+/// All of "game active" entity movement (changes to
+/// [`bevy::prelude::Transform`]) happens during this stage (an in no other
+/// stage).
+///
+/// "Game active" entities are those which impact the game dynamics. For
+/// example buildings, units or the terrain. Auxiliary entities, for example
+/// building drafts, might be moved during other stages.
+#[derive(ScheduleLabel, Clone, Debug, PartialEq, Eq, Hash)]
+pub struct Movement;
+
+/// This stage includes for example update to spatial index of movable objects.
+#[derive(ScheduleLabel, Clone, Debug, PartialEq, Eq, Hash)]
+pub struct PostMovement;
diff --git a/crates/core/src/cleanup.rs b/crates/core/src/cleanup.rs
index dc83e1ca2..7e2d1a574 100644
--- a/crates/core/src/cleanup.rs
+++ b/crates/core/src/cleanup.rs
@@ -6,7 +6,7 @@ pub(crate) struct CleanupPlugin;
 
 impl Plugin for CleanupPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(cleanup.in_schedule(OnExit(AppState::InGame)));
+        app.add_systems(OnExit(AppState::InGame), cleanup);
     }
 }
 
diff --git a/crates/core/src/events.rs b/crates/core/src/events.rs
index 3af9e0984..a0b326952 100644
--- a/crates/core/src/events.rs
+++ b/crates/core/src/events.rs
@@ -24,10 +24,15 @@ impl<T: Event> Default for ResendEventPlugin<T> {
 
 impl<T: Event> Plugin for ResendEventPlugin<T> {
     fn build(&self, app: &mut App) {
-        app.add_system(setup::<T>.in_schedule(OnEnter(GameState::Loading)))
-            .add_system(enqueue_events::<T>.run_if(in_state(GameState::Loading)))
-            .add_system(resend_events::<T>.in_schedule(OnEnter(GameState::Playing)))
-            .add_system(cleanup::<T>.in_schedule(OnEnter(GameState::Playing)));
+        app.add_systems(OnEnter(GameState::Loading), setup::<T>)
+            .add_systems(
+                Update,
+                enqueue_events::<T>.run_if(in_state(GameState::Loading)),
+            )
+            .add_systems(
+                OnEnter(GameState::Playing),
+                (resend_events::<T>, cleanup::<T>),
+            );
     }
 }
 
diff --git a/crates/core/src/gamestate.rs b/crates/core/src/gamestate.rs
index 3461f42ab..270ade13c 100644
--- a/crates/core/src/gamestate.rs
+++ b/crates/core/src/gamestate.rs
@@ -7,8 +7,10 @@ pub(crate) struct GameStateSetupPlugin;
 
 impl Plugin for GameStateSetupPlugin {
     fn build(&self, app: &mut App) {
-        app.add_plugin(GameStatePlugin)
-            .add_plugin(ProgressPlugin::new(GameState::Loading).continue_to(GameState::Playing));
+        app.add_plugins((
+            GameStatePlugin,
+            ProgressPlugin::new(GameState::Loading).continue_to(GameState::Playing),
+        ));
     }
 }
 
diff --git a/crates/core/src/transition.rs b/crates/core/src/transition.rs
index 1bb13554a..2d574e744 100644
--- a/crates/core/src/transition.rs
+++ b/crates/core/src/transition.rs
@@ -1,7 +1,4 @@
-use bevy::{
-    ecs::schedule::{run_enter_schedule, FreeSystemSet},
-    prelude::*,
-};
+use bevy::{ecs::schedule::run_enter_schedule, prelude::*};
 pub use paste;
 
 pub trait DeStateTransition {
@@ -14,52 +11,31 @@ pub trait DeStateTransition {
 }
 
 pub trait StateWithSet {
-    type Set: FreeSystemSet;
+    type Set: SystemSet;
 
     fn state_set() -> Self::Set;
 }
 
 impl DeStateTransition for App {
     fn add_state_with_set<S: States + StateWithSet>(&mut self) -> &mut Self {
-        self.init_resource::<State<S>>();
-        self.init_resource::<NextState<S>>();
-
-        let mut schedules = self.world.resource_mut::<Schedules>();
-
-        let Some(default_schedule) = schedules.get_mut(&*self.default_schedule_label) else {
-            let schedule_label = &self.default_schedule_label;
-            panic!("Default schedule {schedule_label:?} does not exist.")
-        };
-
-        default_schedule.add_systems(
-            (
-                run_enter_schedule::<S>.run_if(run_once()),
-                apply_state_transition::<S>.in_set(S::state_set()),
-            )
-                .chain()
-                .in_base_set(CoreSet::StateTransitions),
-        );
-
-        for variant in S::variants() {
-            default_schedule.configure_set(
-                OnUpdate(variant.clone())
-                    .in_base_set(CoreSet::Update)
-                    .run_if(in_state(variant)),
+        // TODO check if it is possible to modify apply_state_transition::<S> instead
+        self.init_resource::<State<S>>()
+            .init_resource::<NextState<S>>()
+            .add_systems(
+                StateTransition,
+                (
+                    run_enter_schedule::<S>.run_if(run_once()),
+                    apply_state_transition::<S>.in_set(S::state_set()),
+                )
+                    .chain(),
             );
-        }
-
-        // These are different for loops to avoid conflicting access to self
-        for variant in S::variants() {
-            self.add_schedule(OnEnter(variant.clone()), Schedule::new());
-            self.add_schedule(OnExit(variant), Schedule::new());
-        }
 
         self
     }
 
     fn add_child_state<P: StateWithSet, S: States + StateWithSet>(&mut self) -> &mut Self {
         self.add_state_with_set::<S>();
-        self.configure_sets((P::state_set(), S::state_set()).chain());
+        self.configure_sets(StateTransition, (P::state_set(), S::state_set()).chain());
         self
     }
 }
@@ -98,9 +74,9 @@ macro_rules! nested_state {
             impl Plugin for [<$name Plugin>] {
                 fn build(&self, app: &mut App) {
                     app.add_child_state::<$parent, $name>()
-                        .add_system(go_to_none.in_schedule(OnExit($parent::$parent_variant)))
-                        $(.add_system($enter.in_schedule(OnEnter($parent::$parent_variant))))?
-                        $(.add_system($exit.in_schedule(OnExit($parent::$parent_variant))))?;
+                        .add_systems(OnExit($parent::$parent_variant), go_to_none)
+                        $(.add_systems(OnEnter($parent::$parent_variant), $enter))?
+                        $(.add_systems(OnExit($parent::$parent_variant), $exit))?;
                 }
             }
 
diff --git a/crates/core/src/visibility.rs b/crates/core/src/visibility.rs
index f7eade1e8..832f76bb2 100644
--- a/crates/core/src/visibility.rs
+++ b/crates/core/src/visibility.rs
@@ -1,14 +1,14 @@
 use bevy::prelude::*;
 
-use crate::{baseset::GameSet, flags::Flags, state::AppState};
+use crate::{flags::Flags, state::AppState};
 
 pub(crate) struct VisibilityPlugin;
 
 impl Plugin for VisibilityPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(
+        app.add_systems(
+            PostUpdate,
             update
-                .in_base_set(GameSet::PostUpdate)
                 .run_if(in_state(AppState::InGame))
                 .in_set(VisibilitySet::Update),
         );
@@ -24,9 +24,9 @@ pub enum VisibilitySet {
 /// "visible" flag is set to true and none of "invisible" flag is true. The
 /// individual flags can be controlled independently.
 ///
-/// The system [`VisibilitySet::Update`] executed during
-/// [`GameSet::PostUpdate`] automatically updates
-/// [`bevy::render::prelude::Visibility`] of entities with this component.
+/// The system [`VisibilitySet::Update`] executed during [`PostUpdate`]
+/// automatically updates [`bevy::render::prelude::Visibility`] of entities
+/// with this component.
 #[derive(Component, Default)]
 pub struct VisibilityFlags {
     visible: Flags,
diff --git a/crates/energy/src/battery.rs b/crates/energy/src/battery.rs
index 03e693386..5b18417a7 100644
--- a/crates/energy/src/battery.rs
+++ b/crates/energy/src/battery.rs
@@ -4,7 +4,7 @@ pub(crate) struct BatteryPlugin;
 
 impl Plugin for BatteryPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(discharge_battery);
+        app.add_systems(Update, discharge_battery);
     }
 }
 
@@ -83,6 +83,7 @@ mod tests {
     use bevy::prelude::*;
     use bevy::time::TimePlugin;
 
+    use super::*;
     use crate::battery::{Battery, DEFAULT_CAPACITY, DISCHARGE_RATE};
 
     #[test]
@@ -97,9 +98,7 @@ mod tests {
             ))
             .id();
 
-        // add the plugin
-        app.add_plugin(super::BatteryPlugin);
-        app.add_plugin(TimePlugin);
+        app.add_plugins((BatteryPlugin, TimePlugin));
 
         // run the app for 1 second
         app.update();
diff --git a/crates/gui/src/body_text.rs b/crates/gui/src/body_text.rs
index 3d620dddd..352dde51f 100644
--- a/crates/gui/src/body_text.rs
+++ b/crates/gui/src/body_text.rs
@@ -30,7 +30,8 @@ impl<'w, 's> BodyTextCommands<'w, 's> for GuiCommands<'w, 's> {
                 style: Style {
                     justify_content: JustifyContent::FlexStart,
                     align_items: AlignItems::FlexStart,
-                    size: style.size,
+                    width: style.width,
+                    height: style.height,
                     margin: style.margin,
                     ..default()
                 },
diff --git a/crates/gui/src/button.rs b/crates/gui/src/button.rs
index a154f1d8a..fe57140ce 100644
--- a/crates/gui/src/button.rs
+++ b/crates/gui/src/button.rs
@@ -12,7 +12,7 @@ pub(crate) struct ButtonPlugin;
 
 impl Plugin for ButtonPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(color_system);
+        app.add_systems(Update, color_system);
     }
 }
 
@@ -36,7 +36,8 @@ impl<'w, 's> ButtonCommands<'w, 's> for GuiCommands<'w, 's> {
             style: Style {
                 justify_content: JustifyContent::Center,
                 align_items: AlignItems::Center,
-                size: style.size,
+                width: style.width,
+                height: style.height,
                 margin: style.margin,
                 ..default()
             },
@@ -90,7 +91,7 @@ type ButtonInteractions<'w, 'q> = Query<
 fn color_system(mut interactions: ButtonInteractions) {
     for (&interaction, mut color) in interactions.iter_mut() {
         match interaction {
-            Interaction::Clicked => (),
+            Interaction::Pressed => (),
             Interaction::Hovered => {
                 *color = HOVERED_BUTTON.into();
             }
diff --git a/crates/gui/src/focus.rs b/crates/gui/src/focus.rs
index 612ee7a25..dba9a1304 100644
--- a/crates/gui/src/focus.rs
+++ b/crates/gui/src/focus.rs
@@ -16,15 +16,12 @@ impl Plugin for FocusPlugin {
     fn build(&self, app: &mut App) {
         app.init_resource::<UiFocus>()
             .add_event::<SetFocusEvent>()
-            .add_system(
-                focus_system
-                    .in_base_set(CoreSet::PreUpdate)
-                    .after(UiSystem::Focus),
-            );
+            .add_systems(PreUpdate, focus_system.after(UiSystem::Focus));
     }
 }
 
 /// Send this event to (de)select an entity.
+#[derive(Event)]
 pub struct SetFocusEvent(Option<Entity>);
 
 impl SetFocusEvent {
@@ -38,7 +35,7 @@ impl SetFocusEvent {
 ///
 /// An entity can be (de)selected / (de)focused by multiple means:
 ///
-/// * Selected via [`Interaction::Clicked`].
+/// * Selected via [`Interaction::Pressed`].
 /// * (De)selected via [`SetFocusEvent`].
 /// * Deselected by despawning.
 /// * Deselected by clicking outside of it.
@@ -110,7 +107,7 @@ fn focus_system(
     }
 
     for (entity, &interaction) in interactions.iter() {
-        if matches!(interaction, Interaction::Clicked) {
+        if matches!(interaction, Interaction::Pressed) {
             current = Some(entity);
         }
     }
diff --git a/crates/gui/src/label.rs b/crates/gui/src/label.rs
index f5a4b4af0..b621c38e4 100644
--- a/crates/gui/src/label.rs
+++ b/crates/gui/src/label.rs
@@ -22,7 +22,8 @@ impl<'w, 's> LabelCommands<'w, 's> for GuiCommands<'w, 's> {
             style: Style {
                 justify_content: JustifyContent::FlexStart,
                 align_items: AlignItems::Center,
-                size: style.size,
+                width: style.width,
+                height: style.height,
                 margin: style.margin,
                 ..default()
             },
diff --git a/crates/gui/src/style.rs b/crates/gui/src/style.rs
index ccfec0a9b..b9f8d03b9 100644
--- a/crates/gui/src/style.rs
+++ b/crates/gui/src/style.rs
@@ -1,7 +1,8 @@
-use bevy::ui::{Size, UiRect};
+use bevy::ui::{UiRect, Val};
 
 #[derive(Default)]
 pub struct OuterStyle {
-    pub size: Size,
+    pub width: Val,
+    pub height: Val,
     pub margin: UiRect,
 }
diff --git a/crates/gui/src/text.rs b/crates/gui/src/text.rs
index ee0ebe640..61adb381d 100644
--- a/crates/gui/src/text.rs
+++ b/crates/gui/src/text.rs
@@ -4,7 +4,7 @@ pub(crate) struct TextPlugin;
 
 impl Plugin for TextPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(setup.run_if(not(resource_exists::<TextProps>())));
+        app.add_systems(Update, setup.run_if(not(resource_exists::<TextProps>())));
     }
 }
 
diff --git a/crates/gui/src/textbox.rs b/crates/gui/src/textbox.rs
index c16abb1ed..0fc6b1974 100644
--- a/crates/gui/src/textbox.rs
+++ b/crates/gui/src/textbox.rs
@@ -6,6 +6,7 @@ use bevy::{
     prelude::*,
     window::PrimaryWindow,
 };
+use de_core::baseset::InputSchedule;
 
 use crate::{focus::FocusedQuery, GuiCommands, OuterStyle};
 
@@ -16,9 +17,13 @@ pub(crate) struct TextBoxPlugin;
 
 impl Plugin for TextBoxPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(focus_system).add_system(
-            input_system
-                .run_if(on_event::<ReceivedCharacter>().or_else(on_event::<KeyboardInput>())),
+        app.add_systems(
+            InputSchedule,
+            (
+                focus_system,
+                input_system
+                    .run_if(on_event::<ReceivedCharacter>().or_else(on_event::<KeyboardInput>())),
+            ),
         );
     }
 }
@@ -44,8 +49,9 @@ impl<'w, 's> TextBoxCommands<'w, 's> for GuiCommands<'w, 's> {
                 padding: UiRect::horizontal(Val::Percent(2.)),
                 justify_content: JustifyContent::FlexStart,
                 align_items: AlignItems::Center,
-                overflow: Overflow::Hidden,
-                size: style.size,
+                overflow: Overflow::clip(),
+                width: style.width,
+                height: style.height,
                 margin: style.margin,
                 ..default()
             },
diff --git a/crates/gui/src/toast.rs b/crates/gui/src/toast.rs
index 60a3cfa0d..f068b767c 100644
--- a/crates/gui/src/toast.rs
+++ b/crates/gui/src/toast.rs
@@ -14,11 +14,14 @@ impl Plugin for ToastPlugin {
     fn build(&self, app: &mut App) {
         app.init_resource::<ToastQueue>()
             .add_event::<ToastEvent>()
-            .add_system(process_events.in_set(ToastSet::ProcessEvents))
-            .add_system(
-                spawn_and_despawn
-                    .run_if(not(in_state(AppState::AppLoading)))
-                    .after(ToastSet::ProcessEvents),
+            .add_systems(
+                PostUpdate,
+                (
+                    process_events.in_set(ToastSet::ProcessEvents),
+                    spawn_and_despawn
+                        .run_if(not(in_state(AppState::AppLoading)))
+                        .after(ToastSet::ProcessEvents),
+                ),
             );
     }
 }
@@ -31,6 +34,7 @@ pub enum ToastSet {
 /// Send this event to briefly display a UI toast.
 ///
 /// The events are processed by a system labeled [`ToastSet::ProcessEvents`].
+#[derive(Event)]
 pub struct ToastEvent(String);
 
 impl ToastEvent {
@@ -130,12 +134,10 @@ fn spawn(commands: &mut Commands, text_props: &TextProps, text: String) -> Entit
             position_type: PositionType::Absolute,
             justify_content: JustifyContent::Center,
             align_items: AlignItems::Center,
-            position: UiRect::new(
-                Val::Percent(20.),
-                Val::Percent(20.),
-                Val::Percent(5.),
-                Val::Percent(85.),
-            ),
+            left: Val::Percent(20.),
+            right: Val::Percent(20.),
+            top: Val::Percent(5.),
+            bottom: Val::Percent(85.),
             padding: UiRect::all(Val::Percent(1.)),
             ..default()
         },
diff --git a/crates/index/benches/ray.rs b/crates/index/benches/ray.rs
index c90b37286..6b5e97c97 100644
--- a/crates/index/benches/ray.rs
+++ b/crates/index/benches/ray.rs
@@ -124,7 +124,7 @@ fn ray_cast_benchmark(c: &mut Criterion) {
 
         for num_entities in [100, 1000, 10_000, 100_000] {
             let mut app = App::new();
-            app.add_system(cast_ray);
+            app.add_systems(Update, cast_ray);
             setup_world(&mut app.world, num_entities, max_distance);
 
             group.throughput(Throughput::Elements(1));
diff --git a/crates/index/src/systems.rs b/crates/index/src/systems.rs
index 17a1c3bdb..b17ee5b88 100644
--- a/crates/index/src/systems.rs
+++ b/crates/index/src/systems.rs
@@ -3,7 +3,7 @@
 
 use bevy::prelude::*;
 use de_core::{
-    baseset::GameSet,
+    baseset::PostMovement,
     gamestate::GameState,
     objects::{MovableSolid, ObjectType, StaticSolid},
     state::AppState,
@@ -42,23 +42,22 @@ pub(crate) struct IndexPlugin;
 
 impl Plugin for IndexPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(setup.in_schedule(OnEnter(AppState::InGame)))
-            .add_system(cleanup.in_schedule(OnExit(AppState::InGame)))
-            .add_system(
-                insert
-                    .in_base_set(GameSet::PostUpdate)
-                    .run_if(in_state(GameState::Playing))
-                    .in_set(IndexSet::Index),
-            )
-            .add_system(
-                remove
-                    .in_base_set(GameSet::PostUpdate)
-                    .run_if(in_state(GameState::Playing))
-                    .in_set(IndexSet::Index),
+        app.add_systems(OnEnter(AppState::InGame), setup)
+            .add_systems(OnExit(AppState::InGame), cleanup)
+            .add_systems(
+                PostUpdate,
+                (
+                    insert
+                        .run_if(in_state(GameState::Playing))
+                        .in_set(IndexSet::Index),
+                    remove
+                        .run_if(in_state(GameState::Playing))
+                        .in_set(IndexSet::Index),
+                ),
             )
-            .add_system(
+            .add_systems(
+                PostMovement,
                 update
-                    .in_base_set(GameSet::PostMovement)
                     .run_if(in_state(GameState::Playing))
                     .in_set(IndexSet::Index),
             );
diff --git a/crates/loader/src/map.rs b/crates/loader/src/map.rs
index 0f73c8dbf..4e691c6bf 100644
--- a/crates/loader/src/map.rs
+++ b/crates/loader/src/map.rs
@@ -29,9 +29,10 @@ pub(crate) struct MapLoaderPlugin;
 
 impl Plugin for MapLoaderPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(load_map_system.in_schedule(OnEnter(AppState::InGame)))
-            .add_system(cleanup.in_schedule(OnExit(AppState::InGame)))
-            .add_system(
+        app.add_systems(OnEnter(AppState::InGame), load_map_system)
+            .add_systems(OnExit(AppState::InGame), cleanup)
+            .add_systems(
+                Update,
                 spawn_map
                     .track_progress()
                     .run_if(in_state(GameState::Loading)),
diff --git a/crates/lobby_client/src/plugin.rs b/crates/lobby_client/src/plugin.rs
index cdc032ed2..127bb771f 100644
--- a/crates/lobby_client/src/plugin.rs
+++ b/crates/lobby_client/src/plugin.rs
@@ -20,8 +20,8 @@ impl<T: LobbyRequestCreator> Plugin for EndpointPlugin<T> {
         app.add_event::<RequestEvent<T>>()
             .add_event::<ResponseEvent<T>>()
             .init_resource::<PendingTasks<T>>()
-            .add_system(fire::<T>)
-            .add_system(poll::<T>);
+            .add_systems(PostUpdate, fire::<T>)
+            .add_systems(PreUpdate, poll::<T>);
     }
 }
 
@@ -35,6 +35,7 @@ impl<T: LobbyRequestCreator> Default for EndpointPlugin<T> {
 
 /// Use this event to make a request the Lobby API. Response the request will
 /// delivered as [`ResponseEvent`].
+#[derive(Event)]
 pub struct RequestEvent<T> {
     id: String,
     request: T,
@@ -66,6 +67,7 @@ impl<T> RequestEvent<T> {
 
 /// Event corresponding to a finished Lobby API request which might have failed
 /// or succeeded.
+#[derive(Event)]
 pub struct ResponseEvent<T>
 where
     T: LobbyRequest,
diff --git a/crates/lobby_client/src/systems.rs b/crates/lobby_client/src/systems.rs
index 889cedf29..39a196cb4 100644
--- a/crates/lobby_client/src/systems.rs
+++ b/crates/lobby_client/src/systems.rs
@@ -12,14 +12,16 @@ pub(crate) struct LobbyPlugin;
 
 impl Plugin for LobbyPlugin {
     fn build(&self, app: &mut App) {
-        app.init_resource::<Authentication>()
-            .add_system(
+        app.init_resource::<Authentication>().add_systems(
+            Update,
+            (
                 setup_client
                     .track_progress()
                     .run_if(in_state(AppState::AppLoading)),
-            )
-            .add_system(set_token::<SignInRequest>)
-            .add_system(set_token::<SignUpRequest>);
+                set_token::<SignInRequest>,
+                set_token::<SignUpRequest>,
+            ),
+        );
     }
 }
 
diff --git a/crates/menu/src/aftergame.rs b/crates/menu/src/aftergame.rs
index e2ccba3fd..31957ab07 100644
--- a/crates/menu/src/aftergame.rs
+++ b/crates/menu/src/aftergame.rs
@@ -8,8 +8,8 @@ pub(crate) struct AfterGamePlugin;
 
 impl Plugin for AfterGamePlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(setup.in_schedule(OnEnter(MenuState::AfterGame)))
-            .add_system(cleanup.in_schedule(OnEnter(MenuState::AfterGame)));
+        app.add_systems(OnEnter(MenuState::AfterGame), setup)
+            .add_systems(OnEnter(MenuState::AfterGame), cleanup);
     }
 }
 
diff --git a/crates/menu/src/create.rs b/crates/menu/src/create.rs
index dccae1da9..65576cf30 100644
--- a/crates/menu/src/create.rs
+++ b/crates/menu/src/create.rs
@@ -20,28 +20,27 @@ pub(crate) struct CreateGamePlugin;
 
 impl Plugin for CreateGamePlugin {
     fn build(&self, app: &mut App) {
-        app.add_plugin(RequestsPlugin::<CreateGameRequest>::new())
+        app.add_plugins(RequestsPlugin::<CreateGameRequest>::new())
             .add_event::<CreateGameEvent>()
-            .add_system(setup.in_schedule(OnEnter(MenuState::GameCreation)))
-            .add_system(cleanup.in_schedule(OnExit(MenuState::GameCreation)))
-            .add_system(
-                button_system
-                    .run_if(in_state(MenuState::GameCreation))
-                    .in_set(CreateSet::Buttons),
-            )
-            .add_system(
-                map_selected_system
-                    .run_if(in_state(MenuState::GameCreation))
-                    .in_set(CreateSet::MapSelected),
-            )
-            .add_system(
-                create_game_system
-                    .run_if(in_state(MenuState::GameCreation))
-                    .run_if(on_event::<CreateGameEvent>())
-                    .after(CreateSet::Buttons)
-                    .after(CreateSet::MapSelected),
-            )
-            .add_system(response_system.run_if(in_state(MenuState::GameCreation)));
+            .add_systems(OnEnter(MenuState::GameCreation), setup)
+            .add_systems(OnExit(MenuState::GameCreation), cleanup)
+            .add_systems(
+                Update,
+                (
+                    button_system
+                        .run_if(in_state(MenuState::GameCreation))
+                        .in_set(CreateSet::Buttons),
+                    map_selected_system
+                        .run_if(in_state(MenuState::GameCreation))
+                        .in_set(CreateSet::MapSelected),
+                    create_game_system
+                        .run_if(in_state(MenuState::GameCreation))
+                        .run_if(on_event::<CreateGameEvent>())
+                        .after(CreateSet::Buttons)
+                        .after(CreateSet::MapSelected),
+                    response_system.run_if(in_state(MenuState::GameCreation)),
+                ),
+            );
     }
 }
 
@@ -67,6 +66,7 @@ struct Inputs {
 #[derive(Resource)]
 struct SelectedMap(GameMap);
 
+#[derive(Event)]
 struct CreateGameEvent;
 
 fn setup(mut commands: GuiCommands, menu: Res<Menu>) {
@@ -92,7 +92,8 @@ fn setup(mut commands: GuiCommands, menu: Res<Menu>) {
     let create_id = commands
         .spawn_button(
             OuterStyle {
-                size: Size::new(Val::Percent(100.), Val::Percent(100.)),
+                width: Val::Percent(100.),
+                height: Val::Percent(100.),
                 ..default()
             },
             "Create Game",
@@ -107,7 +108,8 @@ fn column(commands: &mut GuiCommands, parent_id: Entity) -> Entity {
         .spawn(NodeBundle {
             style: Style {
                 flex_direction: FlexDirection::Column,
-                size: Size::new(Val::Percent(50.), Val::Percent(100.)),
+                width: Val::Percent(50.),
+                height: Val::Percent(100.),
                 margin: UiRect::all(Val::Auto),
                 align_items: AlignItems::Center,
                 justify_content: JustifyContent::Center,
@@ -125,7 +127,8 @@ fn row(commands: &mut GuiCommands, parent_id: Entity) -> Entity {
         .spawn(NodeBundle {
             style: Style {
                 flex_direction: FlexDirection::Row,
-                size: Size::new(Val::Percent(100.), Val::Percent(8.)),
+                width: Val::Percent(100.),
+                height: Val::Percent(8.),
                 margin: UiRect::new(
                     Val::Percent(0.),
                     Val::Percent(0.),
@@ -149,7 +152,8 @@ fn text_input(commands: &mut GuiCommands, parent_id: Entity, caption: &str) -> E
     let input_id = commands
         .spawn_text_box(
             OuterStyle {
-                size: Size::new(Val::Percent(65.), Val::Percent(100.)),
+                width: Val::Percent(65.),
+                height: Val::Percent(100.),
                 ..default()
             },
             false,
@@ -165,7 +169,8 @@ fn map_button(commands: &mut GuiCommands, parent_id: Entity) -> Entity {
     let input_id = commands
         .spawn_button(
             OuterStyle {
-                size: Size::new(Val::Percent(65.), Val::Percent(100.)),
+                width: Val::Percent(65.),
+                height: Val::Percent(100.),
                 ..default()
             },
             "-",
@@ -180,7 +185,8 @@ fn spawn_caption(commands: &mut GuiCommands, parent_id: Entity, caption: &str) {
     let caption_id = commands
         .spawn_label(
             OuterStyle {
-                size: Size::new(Val::Percent(35.), Val::Percent(100.)),
+                width: Val::Percent(35.),
+                height: Val::Percent(100.),
                 ..default()
             },
             caption,
@@ -200,7 +206,7 @@ fn button_system(
     mut create_events: EventWriter<CreateGameEvent>,
 ) {
     for (&interaction, &action) in interactions.iter() {
-        if let Interaction::Clicked = interaction {
+        if let Interaction::Pressed = interaction {
             match action {
                 ButtonAction::SelectMap => map_events.send(SelectMapEvent),
                 ButtonAction::Create => create_events.send(CreateGameEvent),
diff --git a/crates/menu/src/gamelisting.rs b/crates/menu/src/gamelisting.rs
index 911af98db..2e7ee9ceb 100644
--- a/crates/menu/src/gamelisting.rs
+++ b/crates/menu/src/gamelisting.rs
@@ -13,15 +13,18 @@ pub(crate) struct GameListingPlugin;
 
 impl Plugin for GameListingPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(setup.in_schedule(OnEnter(MenuState::GameListing)))
-            .add_system(cleanup.in_schedule(OnExit(MenuState::GameListing)))
-            .add_system(refresh_system.run_if(in_state(MenuState::GameListing)))
-            .add_system(
-                list_games_system
-                    .run_if(in_state(MenuState::GameListing))
-                    .before(ToastSet::ProcessEvents),
-            )
-            .add_system(button_system.run_if(in_state(MenuState::GameListing)));
+        app.add_systems(OnEnter(MenuState::GameListing), setup)
+            .add_systems(OnExit(MenuState::GameListing), cleanup)
+            .add_systems(
+                Update,
+                (
+                    refresh_system.run_if(in_state(MenuState::GameListing)),
+                    list_games_system
+                        .run_if(in_state(MenuState::GameListing))
+                        .before(ToastSet::ProcessEvents),
+                    button_system.run_if(in_state(MenuState::GameListing)),
+                ),
+            );
     }
 }
 
@@ -43,7 +46,8 @@ fn setup(
         .spawn(NodeBundle {
             style: Style {
                 flex_direction: FlexDirection::Column,
-                size: Size::new(Val::Percent(80.), Val::Percent(80.)),
+                width: Val::Percent(80.),
+                height: Val::Percent(80.),
                 margin: UiRect::all(Val::Auto),
                 align_items: AlignItems::Center,
                 justify_content: JustifyContent::FlexStart,
@@ -68,7 +72,8 @@ fn create_game_button(commands: &mut GuiCommands, parent_node: Entity) {
     let button_id = commands
         .spawn_button(
             OuterStyle {
-                size: Size::new(Val::Percent(100.), Val::Percent(8.)),
+                width: Val::Percent(100.),
+                height: Val::Percent(8.),
                 margin: UiRect::bottom(Val::Percent(1.)),
             },
             "Create Game",
@@ -83,7 +88,8 @@ fn table(commands: &mut GuiCommands, parent_node: Entity) -> Entity {
         .spawn(NodeBundle {
             style: Style {
                 flex_direction: FlexDirection::Column,
-                size: Size::new(Val::Percent(100.), Val::Percent(91.)),
+                width: Val::Percent(100.),
+                height: Val::Percent(91.),
                 margin: UiRect::all(Val::Auto),
                 align_items: AlignItems::Center,
                 justify_content: JustifyContent::FlexStart,
@@ -101,7 +107,8 @@ fn row(commands: &mut GuiCommands, game: &GamePartial) -> Entity {
         .spawn(NodeBundle {
             style: Style {
                 flex_direction: FlexDirection::Row,
-                size: Size::new(Val::Percent(100.), Val::Percent(8.)),
+                width: Val::Percent(100.),
+                height: Val::Percent(8.),
                 margin: UiRect::vertical(Val::Percent(0.5)),
                 align_items: AlignItems::Center,
                 justify_content: JustifyContent::FlexStart,
@@ -114,7 +121,8 @@ fn row(commands: &mut GuiCommands, game: &GamePartial) -> Entity {
     let name_id = commands
         .spawn_label(
             OuterStyle {
-                size: Size::new(Val::Percent(80.), Val::Percent(100.)),
+                width: Val::Percent(80.),
+                height: Val::Percent(100.),
                 margin: UiRect::right(Val::Percent(2.)),
             },
             format!(
@@ -131,7 +139,8 @@ fn row(commands: &mut GuiCommands, game: &GamePartial) -> Entity {
         let button_id = commands
             .spawn_button(
                 OuterStyle {
-                    size: Size::new(Val::Percent(18.), Val::Percent(100.)),
+                    width: Val::Percent(18.),
+                    height: Val::Percent(100.),
                     ..default()
                 },
                 "Join",
@@ -184,7 +193,7 @@ fn button_system(
     mut toasts: EventWriter<ToastEvent>,
 ) {
     for (&interaction, action) in interactions.iter() {
-        if let Interaction::Clicked = interaction {
+        if let Interaction::Pressed = interaction {
             match action {
                 ButtonAction::Create => next_state.set(MenuState::GameCreation),
                 ButtonAction::Join => {
diff --git a/crates/menu/src/mainmenu.rs b/crates/menu/src/mainmenu.rs
index a4c4e40a8..42c5c3b61 100644
--- a/crates/menu/src/mainmenu.rs
+++ b/crates/menu/src/mainmenu.rs
@@ -7,8 +7,8 @@ pub(crate) struct MainMenuPlugin;
 
 impl Plugin for MainMenuPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(setup.in_schedule(OnEnter(MenuState::MainMenu)))
-            .add_system(button_system.run_if(in_state(MenuState::MainMenu)));
+        app.add_systems(OnEnter(MenuState::MainMenu), setup)
+            .add_systems(Update, button_system.run_if(in_state(MenuState::MainMenu)));
     }
 }
 
@@ -23,7 +23,8 @@ fn setup(mut commands: GuiCommands, menu: Res<Menu>) {
         .spawn(NodeBundle {
             style: Style {
                 flex_direction: FlexDirection::Column,
-                size: Size::new(Val::Percent(25.), Val::Percent(100.)),
+                width: Val::Percent(25.),
+                height: Val::Percent(100.),
                 margin: UiRect::all(Val::Auto),
                 align_items: AlignItems::Center,
                 justify_content: JustifyContent::Center,
@@ -53,7 +54,8 @@ fn button(commands: &mut GuiCommands, parent: Entity, action: ButtonAction, capt
     let button = commands
         .spawn_button(
             OuterStyle {
-                size: Size::new(Val::Percent(100.), Val::Percent(8.)),
+                width: Val::Percent(100.),
+                height: Val::Percent(8.),
                 margin: UiRect::new(
                     Val::Percent(0.),
                     Val::Percent(0.),
@@ -74,7 +76,7 @@ fn button_system(
     interactions: Query<(&Interaction, &ButtonAction), Changed<Interaction>>,
 ) {
     for (&interaction, &action) in interactions.iter() {
-        if let Interaction::Clicked = interaction {
+        if let Interaction::Pressed = interaction {
             match action {
                 ButtonAction::SwithState(state) => next_state.set(state),
                 ButtonAction::Quit => exit.send(AppExit),
diff --git a/crates/menu/src/mapselection.rs b/crates/menu/src/mapselection.rs
index c2bdd2796..7ac8da9a0 100644
--- a/crates/menu/src/mapselection.rs
+++ b/crates/menu/src/mapselection.rs
@@ -21,14 +21,17 @@ impl Plugin for MapSelectionPlugin {
         app.add_state::<MapState>()
             .add_event::<SelectMapEvent>()
             .add_event::<MapSelectedEvent>()
-            .add_system(setup.in_schedule(OnEnter(MapState::On)))
-            .add_system(cleanup.in_schedule(OnExit(MapState::On)))
-            .add_system(init_buttons.run_if(in_state(MapState::On)))
-            .add_system(button_system.run_if(in_state(MapState::On)))
-            .add_system(
-                select_map_system
-                    .run_if(in_state(AppState::InMenu))
-                    .run_if(on_event::<SelectMapEvent>()),
+            .add_systems(OnEnter(MapState::On), setup)
+            .add_systems(OnExit(MapState::On), cleanup)
+            .add_systems(
+                Update,
+                (
+                    init_buttons.run_if(in_state(MapState::On)),
+                    button_system.run_if(in_state(MapState::On)),
+                    select_map_system
+                        .run_if(in_state(AppState::InMenu))
+                        .run_if(on_event::<SelectMapEvent>()),
+                ),
             );
     }
 }
@@ -41,10 +44,12 @@ enum MapState {
 }
 
 /// Send this event to display map selection on top of current UI.
+#[derive(Event)]
 pub(crate) struct SelectMapEvent;
 
 /// This event is sent after a map is selected, just before menu state is
 /// switched to a next state.
+#[derive(Event)]
 pub(crate) struct MapSelectedEvent {
     path: PathBuf,
     metadata: MapMetadata,
@@ -105,8 +110,12 @@ fn setup(mut commands: Commands) {
         .spawn(NodeBundle {
             style: Style {
                 position_type: PositionType::Absolute,
-                position: UiRect::all(Val::Percent(0.)),
-                size: Size::new(Val::Percent(100.), Val::Percent(100.)),
+                top: Val::Percent(0.),
+                bottom: Val::Percent(0.),
+                left: Val::Percent(0.),
+                right: Val::Percent(0.),
+                width: Val::Percent(100.),
+                height: Val::Percent(100.),
                 ..default()
             },
             background_color: Color::GRAY.into(),
@@ -141,7 +150,8 @@ fn init_buttons(
         .spawn(NodeBundle {
             style: Style {
                 flex_direction: FlexDirection::Column,
-                size: Size::new(Val::Percent(25.), Val::Percent(100.)),
+                width: Val::Percent(25.),
+                height: Val::Percent(100.),
                 margin: UiRect::all(Val::Auto),
                 align_items: AlignItems::Center,
                 justify_content: JustifyContent::Center,
@@ -170,7 +180,7 @@ fn button_system(
     mut events: EventWriter<MapSelectedEvent>,
 ) {
     for (&interaction, map) in interactions.iter() {
-        if let Interaction::Clicked = interaction {
+        if let Interaction::Pressed = interaction {
             next_state.set(MapState::Off);
             events.send(MapSelectedEvent::new(
                 map.path().into(),
@@ -221,7 +231,8 @@ fn map_button(commands: &mut GuiCommands, map: MapEntry) -> Entity {
     commands
         .spawn_button(
             OuterStyle {
-                size: Size::new(Val::Percent(100.), Val::Percent(8.)),
+                width: Val::Percent(100.),
+                height: Val::Percent(8.),
                 margin: UiRect::new(
                     Val::Percent(0.),
                     Val::Percent(0.),
diff --git a/crates/menu/src/menu.rs b/crates/menu/src/menu.rs
index 9177bb6e8..9bebbf5be 100644
--- a/crates/menu/src/menu.rs
+++ b/crates/menu/src/menu.rs
@@ -8,19 +8,18 @@ pub(crate) struct MenuPlugin;
 
 impl Plugin for MenuPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(setup.in_schedule(OnEnter(AppState::InMenu)))
-            .add_system(cleanup.in_schedule(OnExit(AppState::InMenu)))
-            .add_system(
-                clean_up_root
-                    .in_base_set(CoreSet::PreUpdate)
-                    .run_if(resource_exists::<Menu>()),
-            )
-            .add_system(
-                hide_show_corner
-                    .run_if(resource_exists::<Menu>())
-                    .run_if(resource_changed::<State<MenuState>>()),
-            )
-            .add_system(button_system.run_if(in_state(AppState::InMenu)));
+        app.add_systems(OnEnter(AppState::InMenu), setup)
+            .add_systems(OnExit(AppState::InMenu), cleanup)
+            .add_systems(PreUpdate, clean_up_root.run_if(resource_exists::<Menu>()))
+            .add_systems(
+                Update,
+                (
+                    hide_show_corner
+                        .run_if(resource_exists::<Menu>())
+                        .run_if(resource_changed::<State<MenuState>>()),
+                    button_system.run_if(in_state(AppState::InMenu)),
+                ),
+            );
     }
 }
 
@@ -65,7 +64,7 @@ fn hide_show_corner(
     mut visibility: Query<&mut Visibility>,
 ) {
     let mut corner_visibility = visibility.get_mut(menu.corner_node()).unwrap();
-    *corner_visibility = if state.0 == MenuState::MainMenu {
+    *corner_visibility = if state.get() == &MenuState::MainMenu {
         Visibility::Hidden
     } else {
         Visibility::Inherited
@@ -94,8 +93,12 @@ fn spawn_root_node(commands: &mut GuiCommands) -> Entity {
         .spawn(NodeBundle {
             style: Style {
                 position_type: PositionType::Absolute,
-                position: UiRect::all(Val::Percent(0.)),
-                size: Size::new(Val::Percent(100.), Val::Percent(100.)),
+                top: Val::Percent(0.),
+                bottom: Val::Percent(0.),
+                left: Val::Percent(0.),
+                right: Val::Percent(0.),
+                width: Val::Percent(100.),
+                height: Val::Percent(100.),
                 ..default()
             },
             background_color: Color::GRAY.into(),
@@ -109,12 +112,11 @@ fn spawn_corner_node(commands: &mut GuiCommands) -> Entity {
         .spawn(NodeBundle {
             style: Style {
                 position_type: PositionType::Absolute,
-                position: UiRect::new(
-                    Val::Percent(90.),
-                    Val::Percent(5.),
-                    Val::Percent(5.),
-                    Val::Percent(90.),
-                ),
+                left: Val::Percent(90.),
+                right: Val::Percent(5.),
+                top: Val::Percent(5.),
+                bottom: Val::Percent(90.),
+
                 ..default()
             },
             z_index: ZIndex::Global(1),
@@ -125,7 +127,8 @@ fn spawn_corner_node(commands: &mut GuiCommands) -> Entity {
     let close_button = commands
         .spawn_button(
             OuterStyle {
-                size: Size::new(Val::Percent(100.), Val::Percent(100.)),
+                width: Val::Percent(100.),
+                height: Val::Percent(100.),
                 ..default()
             },
             "X",
@@ -142,7 +145,7 @@ fn button_system(
     interactions: Query<(&Interaction, &ButtonAction), Changed<Interaction>>,
 ) {
     for (&interaction, &action) in interactions.iter() {
-        if let Interaction::Clicked = interaction {
+        if let Interaction::Pressed = interaction {
             match action {
                 ButtonAction::Close => next_state.set(MenuState::MainMenu),
             }
diff --git a/crates/menu/src/requests.rs b/crates/menu/src/requests.rs
index 0bd3d7e4f..9aa8f4893 100644
--- a/crates/menu/src/requests.rs
+++ b/crates/menu/src/requests.rs
@@ -27,8 +27,8 @@ where
     T: LobbyRequest,
 {
     fn build(&self, app: &mut App) {
-        app.add_system(setup::<T>.in_schedule(OnEnter(AppState::InMenu)))
-            .add_system(cleanup::<T>.in_schedule(OnExit(AppState::InMenu)));
+        app.add_systems(OnEnter(AppState::InMenu), setup::<T>)
+            .add_systems(OnExit(AppState::InMenu), cleanup::<T>);
     }
 }
 
diff --git a/crates/menu/src/signin.rs b/crates/menu/src/signin.rs
index 8e2f7f925..1d92a3700 100644
--- a/crates/menu/src/signin.rs
+++ b/crates/menu/src/signin.rs
@@ -16,26 +16,27 @@ pub(crate) struct SignInPlugin;
 
 impl Plugin for SignInPlugin {
     fn build(&self, app: &mut App) {
-        app.add_plugin(RequestsPlugin::<SignInRequest>::new())
-            .add_plugin(RequestsPlugin::<SignUpRequest>::new())
-            .add_system(setup.in_schedule(OnEnter(MenuState::SignIn)))
-            .add_system(cleanup.in_schedule(OnExit(MenuState::SignIn)))
-            .add_system(
+        app.add_plugins((
+            RequestsPlugin::<SignInRequest>::new(),
+            RequestsPlugin::<SignUpRequest>::new(),
+        ))
+        .add_systems(OnEnter(MenuState::SignIn), setup)
+        .add_systems(OnExit(MenuState::SignIn), cleanup)
+        .add_systems(
+            Update,
+            (
                 button_system
                     .run_if(resource_exists::<Inputs>())
                     .run_if(in_state(MenuState::SignIn)),
-            )
-            .add_system(
                 response_system::<SignInRequest>
                     .run_if(in_state(MenuState::SignIn))
                     .before(ToastSet::ProcessEvents),
-            )
-            .add_system(
                 response_system::<SignUpRequest>
                     .run_if(in_state(MenuState::SignIn))
                     .before(ToastSet::ProcessEvents),
-            )
-            .add_system(auth_system.run_if(in_state(MenuState::SignIn)));
+                auth_system.run_if(in_state(MenuState::SignIn)),
+            ),
+        );
     }
 }
 
@@ -80,7 +81,8 @@ fn root_column(commands: &mut GuiCommands) -> Entity {
         .spawn(NodeBundle {
             style: Style {
                 flex_direction: FlexDirection::Column,
-                size: Size::new(Val::Percent(50.), Val::Percent(100.)),
+                width: Val::Percent(50.),
+                height: Val::Percent(100.),
                 margin: UiRect::all(Val::Auto),
                 align_items: AlignItems::Center,
                 justify_content: JustifyContent::Center,
@@ -96,7 +98,8 @@ fn row(commands: &mut GuiCommands, parent: Entity) -> Entity {
         .spawn(NodeBundle {
             style: Style {
                 flex_direction: FlexDirection::Row,
-                size: Size::new(Val::Percent(100.), Val::Percent(8.)),
+                width: Val::Percent(100.),
+                height: Val::Percent(8.),
                 margin: UiRect::new(
                     Val::Percent(0.),
                     Val::Percent(0.),
@@ -118,7 +121,8 @@ fn input(commands: &mut GuiCommands, parent: Entity, caption: &str, secret: bool
     let caption = commands
         .spawn_label(
             OuterStyle {
-                size: Size::new(Val::Percent(35.), Val::Percent(100.)),
+                width: Val::Percent(35.),
+                height: Val::Percent(100.),
                 ..default()
             },
             caption,
@@ -129,7 +133,8 @@ fn input(commands: &mut GuiCommands, parent: Entity, caption: &str, secret: bool
     let input = commands
         .spawn_text_box(
             OuterStyle {
-                size: Size::new(Val::Percent(65.), Val::Percent(100.)),
+                width: Val::Percent(65.),
+                height: Val::Percent(100.),
                 ..default()
             },
             secret,
@@ -153,7 +158,8 @@ fn button(commands: &mut GuiCommands, parent: Entity, action: Action) {
     let id = commands
         .spawn_button(
             OuterStyle {
-                size: Size::new(Val::Percent(48.), Val::Percent(100.)),
+                width: Val::Percent(48.),
+                height: Val::Percent(100.),
                 ..default()
             },
             caption,
@@ -171,7 +177,7 @@ fn button_system(
     mut sign_up_sender: Sender<SignUpRequest>,
 ) {
     for (&interaction, &action) in interactions.iter() {
-        if let Interaction::Clicked = interaction {
+        if let Interaction::Pressed = interaction {
             let username = texts.text(inputs.username).unwrap().to_string();
             let password = texts.text(inputs.password).unwrap().to_string();
 
diff --git a/crates/menu/src/singleplayer.rs b/crates/menu/src/singleplayer.rs
index 97955dac0..9671ca9f9 100644
--- a/crates/menu/src/singleplayer.rs
+++ b/crates/menu/src/singleplayer.rs
@@ -17,10 +17,15 @@ pub(crate) struct SinglePlayerPlugin;
 
 impl Plugin for SinglePlayerPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(setup.in_schedule(OnEnter(MenuState::SinglePlayerGame)))
-            .add_system(cleanup.in_schedule(OnExit(MenuState::SinglePlayerGame)))
-            .add_system(button_system.run_if(in_state(MenuState::SinglePlayerGame)))
-            .add_system(map_selected_system.run_if(in_state(MenuState::SinglePlayerGame)));
+        app.add_systems(OnEnter(MenuState::SinglePlayerGame), setup)
+            .add_systems(OnExit(MenuState::SinglePlayerGame), cleanup)
+            .add_systems(
+                Update,
+                (
+                    button_system.run_if(in_state(MenuState::SinglePlayerGame)),
+                    map_selected_system.run_if(in_state(MenuState::SinglePlayerGame)),
+                ),
+            );
     }
 }
 
@@ -40,7 +45,8 @@ fn setup(mut commands: GuiCommands, menu: Res<Menu>) {
         .spawn(NodeBundle {
             style: Style {
                 flex_direction: FlexDirection::Column,
-                size: Size::new(Val::Percent(25.), Val::Percent(100.)),
+                width: Val::Percent(25.),
+                height: Val::Percent(100.),
                 margin: UiRect::all(Val::Auto),
                 align_items: AlignItems::Center,
                 justify_content: JustifyContent::Center,
@@ -69,7 +75,8 @@ fn button(commands: &mut GuiCommands, parent: Entity, action: ButtonAction, capt
     let button = commands
         .spawn_button(
             OuterStyle {
-                size: Size::new(Val::Percent(100.), Val::Percent(8.)),
+                width: Val::Percent(100.),
+                height: Val::Percent(8.),
                 margin: UiRect::new(
                     Val::Percent(0.),
                     Val::Percent(0.),
@@ -97,7 +104,7 @@ fn button_system(
     mut toasts: EventWriter<ToastEvent>,
 ) {
     for (&interaction, &action) in interactions.iter() {
-        if let Interaction::Clicked = interaction {
+        if let Interaction::Pressed = interaction {
             match action {
                 ButtonAction::StartGame => match map.0.as_ref() {
                     Some(path) => {
diff --git a/crates/movement/src/altitude.rs b/crates/movement/src/altitude.rs
index 200c61aac..c20c76bb4 100644
--- a/crates/movement/src/altitude.rs
+++ b/crates/movement/src/altitude.rs
@@ -1,6 +1,6 @@
 use bevy::prelude::*;
 use de_core::{
-    baseset::GameSet,
+    baseset::{Movement, PreMovement},
     gamestate::GameState,
     objects::{MovableSolid, ObjectType},
     state::AppState,
@@ -17,14 +17,13 @@ pub(crate) struct AltitudePlugin;
 
 impl Plugin for AltitudePlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(
-            setup_entities
-                .in_base_set(GameSet::PreMovement)
-                .run_if(in_state(AppState::InGame)),
+        app.add_systems(
+            PreMovement,
+            setup_entities.run_if(in_state(AppState::InGame)),
         )
-        .add_system(
+        .add_systems(
+            Movement,
             update
-                .in_base_set(GameSet::Movement)
                 .run_if(in_state(GameState::Playing))
                 .in_set(AltitudeSet::Update)
                 .after(RepulsionLables::Apply),
diff --git a/crates/movement/src/kinematics.rs b/crates/movement/src/kinematics.rs
index ad15a7dac..62c283e94 100644
--- a/crates/movement/src/kinematics.rs
+++ b/crates/movement/src/kinematics.rs
@@ -2,7 +2,10 @@ use std::f32::consts::{FRAC_PI_4, PI, TAU};
 
 use bevy::prelude::*;
 use de_core::{
-    baseset::GameSet, gamestate::GameState, objects::MovableSolid, projection::ToAltitude,
+    baseset::{Movement, PreMovement},
+    gamestate::GameState,
+    objects::MovableSolid,
+    projection::ToAltitude,
     state::AppState,
 };
 
@@ -17,14 +20,13 @@ pub(crate) struct KinematicsPlugin;
 
 impl Plugin for KinematicsPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(
-            setup_entities
-                .in_base_set(GameSet::PreMovement)
-                .run_if(in_state(AppState::InGame)),
+        app.add_systems(
+            PreMovement,
+            setup_entities.run_if(in_state(AppState::InGame)),
         )
-        .add_system(
+        .add_systems(
+            Movement,
             kinematics
-                .in_base_set(GameSet::Movement)
                 .run_if(in_state(GameState::Playing))
                 .in_set(KinematicsSet::Kinematics)
                 .before(MovementSet::UpdateTransform)
diff --git a/crates/movement/src/movement.rs b/crates/movement/src/movement.rs
index 0f1059f51..ba5f8d7e7 100644
--- a/crates/movement/src/movement.rs
+++ b/crates/movement/src/movement.rs
@@ -2,7 +2,10 @@ use std::marker::PhantomData;
 
 use bevy::prelude::*;
 use de_core::{
-    baseset::GameSet, gamestate::GameState, objects::MovableSolid, projection::ToAltitude,
+    baseset::{Movement, PreMovement},
+    gamestate::GameState,
+    objects::MovableSolid,
+    projection::ToAltitude,
     state::AppState,
 };
 use de_map::size::MapBounds;
@@ -14,14 +17,13 @@ pub(crate) struct MovementPlugin;
 
 impl Plugin for MovementPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(
-            setup_entities
-                .in_base_set(GameSet::PreMovement)
-                .run_if(in_state(AppState::InGame)),
+        app.add_systems(
+            PreMovement,
+            setup_entities.run_if(in_state(AppState::InGame)),
         )
-        .add_system(
+        .add_systems(
+            Movement,
             update_transform
-                .in_base_set(GameSet::Movement)
                 .run_if(in_state(GameState::Playing))
                 .in_set(MovementSet::UpdateTransform),
         );
diff --git a/crates/movement/src/obstacles.rs b/crates/movement/src/obstacles.rs
index 8a43fac04..7092ede2f 100644
--- a/crates/movement/src/obstacles.rs
+++ b/crates/movement/src/obstacles.rs
@@ -1,6 +1,6 @@
 use bevy::prelude::*;
 use de_core::{
-    baseset::GameSet,
+    baseset::{Movement, PreMovement},
     gamestate::GameState,
     objects::{MovableSolid, ObjectType, StaticSolid},
     projection::ToFlat,
@@ -19,27 +19,23 @@ pub(crate) struct ObstaclesPlugin;
 
 impl Plugin for ObstaclesPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(
-            setup_discs
-                .in_base_set(GameSet::PreMovement)
-                .run_if(in_state(GameState::Playing)),
+        app.add_systems(
+            PreMovement,
+            (
+                setup_discs.run_if(in_state(GameState::Playing)),
+                update_discs.run_if(in_state(GameState::Playing)),
+            ),
         )
-        .add_system(
-            update_discs
-                .in_base_set(GameSet::PreMovement)
-                .run_if(in_state(GameState::Playing)),
-        )
-        .add_system(
-            update_nearby::<StaticObstacles, StaticSolid>
-                .in_base_set(GameSet::Movement)
-                .run_if(in_state(GameState::Playing))
-                .in_set(ObstaclesLables::UpdateNearby),
-        )
-        .add_system(
-            update_nearby::<MovableObstacles, MovableSolid>
-                .in_base_set(GameSet::Movement)
-                .run_if(in_state(GameState::Playing))
-                .in_set(ObstaclesLables::UpdateNearby),
+        .add_systems(
+            Movement,
+            (
+                update_nearby::<StaticObstacles, StaticSolid>
+                    .run_if(in_state(GameState::Playing))
+                    .in_set(ObstaclesLables::UpdateNearby),
+                update_nearby::<MovableObstacles, MovableSolid>
+                    .run_if(in_state(GameState::Playing))
+                    .in_set(ObstaclesLables::UpdateNearby),
+            ),
         );
     }
 }
diff --git a/crates/movement/src/pathing.rs b/crates/movement/src/pathing.rs
index 7bfd0b34e..fe2fec232 100644
--- a/crates/movement/src/pathing.rs
+++ b/crates/movement/src/pathing.rs
@@ -1,5 +1,10 @@
 use bevy::prelude::*;
-use de_core::{baseset::GameSet, gamestate::GameState, projection::ToFlat, state::AppState};
+use de_core::{
+    baseset::{Movement, PreMovement},
+    gamestate::GameState,
+    projection::ToFlat,
+    state::AppState,
+};
 use de_pathing::ScheduledPath;
 
 use crate::{
@@ -13,19 +18,16 @@ pub(crate) struct PathingPlugin;
 
 impl Plugin for PathingPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(
-            finish_paths
-                .in_base_set(GameSet::PreMovement)
-                .run_if(in_state(GameState::Playing)),
-        )
-        .add_system(
-            add_desired_velocity::<PathVelocity>
-                .in_base_set(GameSet::PreMovement)
-                .run_if(in_state(AppState::InGame)),
+        app.add_systems(
+            PreMovement,
+            (
+                finish_paths.run_if(in_state(GameState::Playing)),
+                add_desired_velocity::<PathVelocity>.run_if(in_state(AppState::InGame)),
+            ),
         )
-        .add_system(
+        .add_systems(
+            Movement,
             follow_path
-                .in_base_set(GameSet::Movement)
                 .run_if(in_state(GameState::Playing))
                 .in_set(PathingSet::FollowPath),
         );
diff --git a/crates/movement/src/repulsion.rs b/crates/movement/src/repulsion.rs
index be48496a0..6e0b2b270 100644
--- a/crates/movement/src/repulsion.rs
+++ b/crates/movement/src/repulsion.rs
@@ -1,6 +1,6 @@
 use bevy::prelude::*;
 use de_core::{
-    baseset::GameSet,
+    baseset::{Movement, PreMovement},
     gamestate::GameState,
     objects::{MovableSolid, ObjectType, StaticSolid},
     projection::ToFlat,
@@ -28,47 +28,37 @@ pub(crate) struct RepulsionPlugin;
 
 impl Plugin for RepulsionPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(
-            setup_entities
-                .in_base_set(GameSet::PreMovement)
-                .run_if(in_state(AppState::InGame)),
+        app.add_systems(
+            PreMovement,
+            (
+                setup_entities.run_if(in_state(AppState::InGame)),
+                add_desired_velocity::<RepulsionVelocity>.run_if(in_state(AppState::InGame)),
+            ),
         )
-        .add_system(
-            add_desired_velocity::<RepulsionVelocity>
-                .in_base_set(GameSet::PreMovement)
-                .run_if(in_state(AppState::InGame)),
-        )
-        .add_system(
-            repel_static
-                .in_base_set(GameSet::Movement)
-                .run_if(in_state(GameState::Playing))
-                .in_set(RepulsionLables::RepelStatic)
-                .after(ObstaclesLables::UpdateNearby)
-                .after(PathingSet::FollowPath),
-        )
-        .add_system(
-            repel_movable
-                .in_base_set(GameSet::Movement)
-                .run_if(in_state(GameState::Playing))
-                .in_set(RepulsionLables::RepelMovable)
-                .after(ObstaclesLables::UpdateNearby)
-                .after(PathingSet::FollowPath),
-        )
-        .add_system(
-            repel_bounds
-                .in_base_set(GameSet::Movement)
-                .run_if(in_state(GameState::Playing))
-                .in_set(RepulsionLables::RepelBounds)
-                .after(PathingSet::FollowPath),
-        )
-        .add_system(
-            apply
-                .in_base_set(GameSet::Movement)
-                .run_if(in_state(GameState::Playing))
-                .in_set(RepulsionLables::Apply)
-                .after(RepulsionLables::RepelStatic)
-                .after(RepulsionLables::RepelMovable)
-                .after(RepulsionLables::RepelBounds),
+        .add_systems(
+            Movement,
+            (
+                repel_static
+                    .run_if(in_state(GameState::Playing))
+                    .in_set(RepulsionLables::RepelStatic)
+                    .after(ObstaclesLables::UpdateNearby)
+                    .after(PathingSet::FollowPath),
+                repel_movable
+                    .run_if(in_state(GameState::Playing))
+                    .in_set(RepulsionLables::RepelMovable)
+                    .after(ObstaclesLables::UpdateNearby)
+                    .after(PathingSet::FollowPath),
+                repel_bounds
+                    .run_if(in_state(GameState::Playing))
+                    .in_set(RepulsionLables::RepelBounds)
+                    .after(PathingSet::FollowPath),
+                apply
+                    .run_if(in_state(GameState::Playing))
+                    .in_set(RepulsionLables::Apply)
+                    .after(RepulsionLables::RepelStatic)
+                    .after(RepulsionLables::RepelMovable)
+                    .after(RepulsionLables::RepelBounds),
+            ),
         );
     }
 }
diff --git a/crates/multiplayer/src/game.rs b/crates/multiplayer/src/game.rs
index 5a8dc5f2b..30636f63c 100644
--- a/crates/multiplayer/src/game.rs
+++ b/crates/multiplayer/src/game.rs
@@ -1,5 +1,5 @@
 use bevy::prelude::*;
-use de_core::{baseset::GameSet, player::Player};
+use de_core::{baseset::PreMovement, player::Player};
 use de_net::{FromGame, FromServer, GameOpenError, JoinError, ToGame, ToServer};
 
 use crate::{
@@ -16,22 +16,20 @@ pub(crate) struct GamePlugin;
 
 impl Plugin for GamePlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(setup.in_schedule(OnEnter(NetState::Connected)))
-            .add_system(cleanup.in_schedule(OnEnter(NetState::None)))
-            .add_system(open_or_join.in_schedule(OnEnter(NetState::Connected)))
-            .add_system(
-                process_from_server
-                    .in_base_set(GameSet::PreMovement)
-                    .run_if(on_event::<FromMainServerEvent>())
-                    .after(MessagesSet::RecvMessages),
+        app.add_systems(OnEnter(NetState::Connected), (setup, open_or_join))
+            .add_systems(OnEnter(NetState::None), cleanup)
+            .add_systems(
+                PreMovement,
+                (
+                    process_from_server
+                        .run_if(on_event::<FromMainServerEvent>())
+                        .after(MessagesSet::RecvMessages),
+                    process_from_game
+                        .run_if(on_event::<FromGameServerEvent>())
+                        .after(MessagesSet::RecvMessages),
+                ),
             )
-            .add_system(
-                process_from_game
-                    .in_base_set(GameSet::PreMovement)
-                    .run_if(on_event::<FromGameServerEvent>())
-                    .after(MessagesSet::RecvMessages),
-            )
-            .add_system(leave.in_schedule(OnEnter(NetState::ShuttingDown)));
+            .add_systems(OnEnter(NetState::ShuttingDown), leave);
     }
 }
 
@@ -147,7 +145,7 @@ fn process_from_game(
                 }
             },
             FromGame::Left => {
-                if state.0 < NetState::ShuttingDown {
+                if state.get() < &NetState::ShuttingDown {
                     fatals.send(FatalErrorEvent::new("Player was kicked from the game."));
                 }
             }
diff --git a/crates/multiplayer/src/lifecycle.rs b/crates/multiplayer/src/lifecycle.rs
index 65d71b518..8b7437d13 100644
--- a/crates/multiplayer/src/lifecycle.rs
+++ b/crates/multiplayer/src/lifecycle.rs
@@ -13,33 +13,29 @@ impl Plugin for LifecyclePlugin {
         app.add_event::<StartMultiplayerEvent>()
             .add_event::<ShutdownMultiplayerEvent>()
             .add_event::<FatalErrorEvent>()
-            .add_system(cleanup.in_schedule(OnEnter(NetState::None)))
-            .add_system(
-                finish_game
-                    .in_schedule(OnEnter(NetState::None))
-                    .run_if(in_state(AppState::InGame)),
+            .add_systems(
+                OnEnter(NetState::None),
+                (cleanup, finish_game.run_if(in_state(AppState::InGame))),
             )
-            .add_system(
-                game_left
-                    .in_schedule(OnExit(AppState::InGame))
-                    .run_if(not(in_state(NetState::None))),
+            .add_systems(
+                OnExit(AppState::InGame),
+                game_left.run_if(not(in_state(NetState::None))),
             )
-            .add_system(
-                start
-                    .run_if(in_state(NetState::None))
-                    .run_if(on_event::<StartMultiplayerEvent>()),
-            )
-            .add_system(
-                shutdown
-                    .run_if(not(
-                        in_state(NetState::None).or_else(in_state(NetState::ShuttingDown))
-                    ))
-                    .run_if(on_event::<ShutdownMultiplayerEvent>()),
-            )
-            .add_system(
-                errors
-                    .run_if(not(in_state(NetState::None)))
-                    .run_if(on_event::<FatalErrorEvent>()),
+            .add_systems(
+                Update,
+                (
+                    start
+                        .run_if(in_state(NetState::None))
+                        .run_if(on_event::<StartMultiplayerEvent>()),
+                    shutdown
+                        .run_if(not(
+                            in_state(NetState::None).or_else(in_state(NetState::ShuttingDown))
+                        ))
+                        .run_if(on_event::<ShutdownMultiplayerEvent>()),
+                    errors
+                        .run_if(not(in_state(NetState::None)))
+                        .run_if(on_event::<FatalErrorEvent>()),
+                ),
             );
     }
 }
@@ -48,6 +44,7 @@ impl Plugin for LifecyclePlugin {
 ///
 /// These events are processed only in [`crate::netstate::NetState::None`]
 /// state.
+#[derive(Event)]
 pub struct StartMultiplayerEvent {
     net_conf: NetGameConf,
 }
@@ -59,12 +56,14 @@ impl StartMultiplayerEvent {
 }
 
 /// Send this event to shutdown multiplayer functionality.
+#[derive(Event)]
 pub struct ShutdownMultiplayerEvent;
 
 /// Send this event when a fatal multiplayer event occurs. These are events
 /// which prevents further continuation of multiplayer game.
 ///
 /// An error will be displayed to the user and multiplayer will shut down.
+#[derive(Event)]
 pub(crate) struct FatalErrorEvent(String);
 
 impl FatalErrorEvent {
diff --git a/crates/multiplayer/src/messages.rs b/crates/multiplayer/src/messages.rs
index 28144456d..8b989e0cc 100644
--- a/crates/multiplayer/src/messages.rs
+++ b/crates/multiplayer/src/messages.rs
@@ -1,7 +1,7 @@
 use std::{net::SocketAddr, time::Instant};
 
 use bevy::prelude::*;
-use de_core::baseset::GameSet;
+use de_core::baseset::PreMovement;
 use de_net::{FromGame, FromServer, InPackage, PackageBuilder, Peers, ToGame, ToServer};
 
 use crate::{
@@ -20,32 +20,28 @@ impl Plugin for MessagesPlugin {
             .add_event::<ToGameServerEvent<false>>()
             .add_event::<FromMainServerEvent>()
             .add_event::<FromGameServerEvent>()
-            .add_system(setup.in_schedule(OnEnter(NetState::Connecting)))
-            .add_system(cleanup.in_schedule(OnEnter(NetState::None)))
-            .add_system(
-                message_sender::<ToMainServerEvent>
-                    .in_base_set(GameSet::PostUpdate)
-                    .run_if(on_event::<ToMainServerEvent>())
-                    .in_set(MessagesSet::SendMessages)
-                    .before(NetworkSet::SendPackages),
+            .add_systems(OnEnter(NetState::Connecting), setup)
+            .add_systems(OnEnter(NetState::None), cleanup)
+            .add_systems(
+                PostUpdate,
+                (
+                    message_sender::<ToMainServerEvent>
+                        .run_if(on_event::<ToMainServerEvent>())
+                        .in_set(MessagesSet::SendMessages)
+                        .before(NetworkSet::SendPackages),
+                    message_sender::<ToGameServerEvent<true>>
+                        .run_if(on_event::<ToGameServerEvent<true>>())
+                        .in_set(MessagesSet::SendMessages)
+                        .before(NetworkSet::SendPackages),
+                    message_sender::<ToGameServerEvent<false>>
+                        .run_if(on_event::<ToGameServerEvent<false>>())
+                        .in_set(MessagesSet::SendMessages)
+                        .before(NetworkSet::SendPackages),
+                ),
             )
-            .add_system(
-                message_sender::<ToGameServerEvent<true>>
-                    .in_base_set(GameSet::PostUpdate)
-                    .run_if(on_event::<ToGameServerEvent<true>>())
-                    .in_set(MessagesSet::SendMessages)
-                    .before(NetworkSet::SendPackages),
-            )
-            .add_system(
-                message_sender::<ToGameServerEvent<false>>
-                    .in_base_set(GameSet::PostUpdate)
-                    .run_if(on_event::<ToGameServerEvent<false>>())
-                    .in_set(MessagesSet::SendMessages)
-                    .before(NetworkSet::SendPackages),
-            )
-            .add_system(
+            .add_systems(
+                PreMovement,
                 recv_messages
-                    .in_base_set(GameSet::PreMovement)
                     .run_if(on_event::<PackageReceivedEvent>())
                     .in_set(MessagesSet::RecvMessages)
                     .after(NetworkSet::RecvPackages),
@@ -61,7 +57,7 @@ pub(crate) enum MessagesSet {
 
 trait ToMessage
 where
-    Self: Send + Sync + 'static,
+    Self: Event,
 {
     type Message: bincode::Encode;
     const PORT_TYPE: PortType;
@@ -70,6 +66,7 @@ where
     fn message(&self) -> &Self::Message;
 }
 
+#[derive(Event)]
 pub(crate) struct ToMainServerEvent(ToServer);
 
 impl From<ToServer> for ToMainServerEvent {
@@ -88,6 +85,7 @@ impl ToMessage for ToMainServerEvent {
     }
 }
 
+#[derive(Event)]
 pub(crate) struct ToGameServerEvent<const R: bool>(ToGame);
 
 impl<const R: bool> From<ToGame> for ToGameServerEvent<R> {
@@ -108,13 +106,14 @@ impl<const R: bool> ToMessage for ToGameServerEvent<R> {
 
 trait InMessageEvent
 where
-    Self: Send + Sync + 'static,
+    Self: Event,
 {
     type M;
 
     fn from_message(time: Instant, message: Self::M) -> Self;
 }
 
+#[derive(Event)]
 pub(crate) struct FromMainServerEvent(FromServer);
 
 impl FromMainServerEvent {
@@ -131,6 +130,7 @@ impl InMessageEvent for FromMainServerEvent {
     }
 }
 
+#[derive(Event)]
 pub(crate) struct FromGameServerEvent {
     time: Instant,
     message: FromGame,
diff --git a/crates/multiplayer/src/netstate.rs b/crates/multiplayer/src/netstate.rs
index 5bcdeef24..ff156f110 100644
--- a/crates/multiplayer/src/netstate.rs
+++ b/crates/multiplayer/src/netstate.rs
@@ -5,9 +5,10 @@ pub(super) struct NetStatePlugin;
 
 impl Plugin for NetStatePlugin {
     fn build(&self, app: &mut App) {
-        app.add_state::<NetState>()
-            .add_plugin(ProgressPlugin::new(NetState::Connecting).continue_to(NetState::Connected))
-            .add_plugin(ProgressPlugin::new(NetState::ShuttingDown).continue_to(NetState::None));
+        app.add_state::<NetState>().add_plugins((
+            ProgressPlugin::new(NetState::Connecting).continue_to(NetState::Connected),
+            ProgressPlugin::new(NetState::ShuttingDown).continue_to(NetState::None),
+        ));
     }
 }
 
diff --git a/crates/multiplayer/src/network.rs b/crates/multiplayer/src/network.rs
index 068ee6ecd..bc2e68ed2 100644
--- a/crates/multiplayer/src/network.rs
+++ b/crates/multiplayer/src/network.rs
@@ -5,7 +5,7 @@ use bevy::{
     prelude::*,
     tasks::{IoTaskPool, Task},
 };
-use de_core::baseset::GameSet;
+use de_core::baseset::PreMovement;
 use de_net::{
     startup, ConnErrorReceiver, InPackage, OutPackage, PackageReceiver, PackageSender, Socket,
 };
@@ -22,31 +22,31 @@ impl Plugin for NetworkPlugin {
     fn build(&self, app: &mut App) {
         app.add_event::<SendPackageEvent>()
             .add_event::<PackageReceivedEvent>()
-            .add_system(setup.in_schedule(OnEnter(NetState::Connecting)))
-            .add_system(cleanup.in_schedule(OnEnter(NetState::None)))
-            .add_system(
+            .add_systems(OnEnter(NetState::Connecting), setup)
+            .add_systems(OnEnter(NetState::None), cleanup)
+            .add_systems(
+                Update,
                 wait_for_network
                     .track_progress()
                     .run_if(resource_exists::<NetworkStartup>()),
             )
-            .add_system(
-                send_packages
-                    .in_base_set(GameSet::PostUpdate)
-                    .run_if(resource_exists::<Sender>())
-                    .run_if(on_event::<SendPackageEvent>())
-                    .in_set(NetworkSet::SendPackages),
+            .add_systems(
+                PostUpdate,
+                (
+                    send_packages
+                        .run_if(resource_exists::<Sender>())
+                        .run_if(on_event::<SendPackageEvent>())
+                        .in_set(NetworkSet::SendPackages),
+                    recv_errors
+                        .run_if(resource_exists::<Errors>())
+                        .in_set(NetworkSet::RecvErrors),
+                ),
             )
-            .add_system(
+            .add_systems(
+                PreMovement,
                 recv_packages
-                    .in_base_set(GameSet::PreMovement)
                     .run_if(resource_exists::<Receiver>())
                     .in_set(NetworkSet::RecvPackages),
-            )
-            .add_system(
-                recv_errors
-                    .in_base_set(GameSet::PostUpdate)
-                    .run_if(resource_exists::<Errors>())
-                    .in_set(NetworkSet::RecvErrors),
             );
     }
 }
@@ -63,6 +63,7 @@ pub(crate) enum NetworkSet {
 /// The network must be established before this events are sent. The events are
 /// drained and thus it is expected that the events are received only by
 /// [`self::send_packages`] system.
+#[derive(Event)]
 pub(crate) struct SendPackageEvent(OutPackage);
 
 impl From<OutPackage> for SendPackageEvent {
@@ -72,6 +73,7 @@ impl From<OutPackage> for SendPackageEvent {
 }
 
 /// This event is sent any time a new package from any source is received.
+#[derive(Event)]
 pub(crate) struct PackageReceivedEvent(InPackage);
 
 impl PackageReceivedEvent {
diff --git a/crates/multiplayer/src/stats.rs b/crates/multiplayer/src/stats.rs
index 3c91a868b..db6c3b21a 100644
--- a/crates/multiplayer/src/stats.rs
+++ b/crates/multiplayer/src/stats.rs
@@ -4,7 +4,7 @@ use std::{
 };
 
 use bevy::prelude::*;
-use de_core::baseset::GameSet;
+use de_core::baseset::PreMovement;
 use de_net::{FromGame, ToGame};
 use tracing::{debug, info, trace};
 
@@ -24,28 +24,27 @@ pub(crate) struct StatsPlugin;
 
 impl StatsPlugin {
     fn build_spec<const R: bool>(app: &mut App) {
-        app.add_system(setup_spec::<R>.in_schedule(OnEnter(NetState::Joined)))
-            .add_system(cleanup_spec::<R>.in_schedule(OnExit(NetState::Joined)))
-            .add_system(
+        app.add_systems(OnEnter(NetState::Joined), setup_spec::<R>)
+            .add_systems(OnExit(NetState::Joined), cleanup_spec::<R>)
+            .add_systems(
+                PostUpdate,
                 ping::<R>
-                    .in_base_set(GameSet::PostUpdate)
                     .run_if(in_state(NetState::Joined))
                     .before(MessagesSet::SendMessages),
             )
-            .add_system(
-                pong::<R>
-                    .in_base_set(GameSet::PreMovement)
-                    .run_if(in_state(NetState::Joined))
-                    .run_if(on_event::<FromGameServerEvent>())
-                    .in_set(StatsSet::Pong)
-                    .after(MessagesSet::RecvMessages),
-            )
-            .add_system(
-                unresolved::<R>
-                    .in_base_set(GameSet::PreMovement)
-                    .run_if(in_state(NetState::Joined))
-                    .in_set(StatsSet::Unresolved)
-                    .after(StatsSet::Pong),
+            .add_systems(
+                PreMovement,
+                (
+                    pong::<R>
+                        .run_if(in_state(NetState::Joined))
+                        .run_if(on_event::<FromGameServerEvent>())
+                        .in_set(StatsSet::Pong)
+                        .after(MessagesSet::RecvMessages),
+                    unresolved::<R>
+                        .run_if(in_state(NetState::Joined))
+                        .in_set(StatsSet::Unresolved)
+                        .after(StatsSet::Pong),
+                ),
             );
     }
 }
@@ -55,20 +54,19 @@ impl Plugin for StatsPlugin {
         Self::build_spec::<false>(app);
         Self::build_spec::<true>(app);
 
-        app.add_system(setup.in_schedule(OnEnter(NetState::Joined)))
-            .add_system(cleanup.in_schedule(OnExit(NetState::Joined)))
-            .add_system(
-                stats_tick
-                    .in_base_set(GameSet::PreMovement)
-                    .run_if(in_state(NetState::Joined))
-                    .in_set(StatsSet::StatsTick),
-            )
-            .add_system(
-                delivery_rate
-                    .in_base_set(GameSet::PreMovement)
-                    .run_if(in_state(NetState::Joined))
-                    .after(StatsSet::StatsTick)
-                    .after(StatsSet::Unresolved),
+        app.add_systems(OnEnter(NetState::Joined), setup)
+            .add_systems(OnExit(NetState::Joined), cleanup)
+            .add_systems(
+                PreMovement,
+                (
+                    stats_tick
+                        .run_if(in_state(NetState::Joined))
+                        .in_set(StatsSet::StatsTick),
+                    delivery_rate
+                        .run_if(in_state(NetState::Joined))
+                        .after(StatsSet::StatsTick)
+                        .after(StatsSet::Unresolved),
+                ),
             );
     }
 }
diff --git a/crates/objects/src/scenes.rs b/crates/objects/src/scenes.rs
index 6be0d0687..bd4402e5d 100644
--- a/crates/objects/src/scenes.rs
+++ b/crates/objects/src/scenes.rs
@@ -13,8 +13,9 @@ pub(crate) struct ScenesPlugin;
 
 impl Plugin for ScenesPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(setup.in_schedule(OnEnter(AppState::AppLoading)))
-            .add_system(
+        app.add_systems(OnEnter(AppState::AppLoading), setup)
+            .add_systems(
+                Update,
                 check_status
                     .track_progress()
                     .run_if(in_state(AppState::AppLoading)),
diff --git a/crates/objects/src/solids.rs b/crates/objects/src/solids.rs
index d2f6ae30d..c80cb32e8 100644
--- a/crates/objects/src/solids.rs
+++ b/crates/objects/src/solids.rs
@@ -4,7 +4,7 @@ use bevy::{
     asset::{AssetLoader, LoadContext, LoadedAsset},
     ecs::system::SystemParam,
     prelude::*,
-    reflect::TypeUuid,
+    reflect::{TypePath, TypeUuid},
     utils::BoxedFuture,
 };
 use de_core::{objects::ObjectType, state::AppState};
@@ -29,8 +29,9 @@ impl Plugin for SolidsPlugin {
     fn build(&self, app: &mut App) {
         app.add_asset::<SolidObject>()
             .add_asset_loader(SolidObjectLoader)
-            .add_system(setup.in_schedule(OnEnter(AppState::AppLoading)))
-            .add_system(
+            .add_systems(OnEnter(AppState::AppLoading), setup)
+            .add_systems(
+                Update,
                 check_status
                     .track_progress()
                     .run_if(in_state(AppState::AppLoading)),
@@ -64,7 +65,7 @@ impl AssetCollectionLoader for Solids {
     }
 }
 
-#[derive(TypeUuid)]
+#[derive(TypeUuid, TypePath)]
 #[uuid = "7b0690cc-951e-487b-8e69-db3119f5fb32"]
 pub struct SolidObject {
     ichnography: Ichnography,
diff --git a/crates/pathing/src/fplugin.rs b/crates/pathing/src/fplugin.rs
index 91ed76492..22177d06c 100644
--- a/crates/pathing/src/fplugin.rs
+++ b/crates/pathing/src/fplugin.rs
@@ -5,7 +5,7 @@ use bevy::{
     tasks::{AsyncComputeTaskPool, Task},
 };
 use de_core::{
-    baseset::GameSet,
+    baseset::PreMovement,
     gamestate::GameState,
     objects::{ObjectType, StaticSolid},
     state::AppState,
@@ -42,31 +42,27 @@ pub struct FinderPlugin;
 impl Plugin for FinderPlugin {
     fn build(&self, app: &mut App) {
         app.add_event::<PathFinderUpdatedEvent>()
-            .add_system(setup_loading.in_schedule(OnEnter(AppState::InGame)))
-            .add_system(setup_playing.in_schedule(OnEnter(GameState::Playing)))
-            .add_system(cleanup.in_schedule(OnExit(AppState::InGame)))
-            .add_system(
-                check_removed
-                    .in_base_set(GameSet::PostUpdate)
-                    .run_if(in_state(AppState::InGame))
-                    .in_set(FinderSet::CheckRemoved),
+            .add_systems(OnEnter(AppState::InGame), setup_loading)
+            .add_systems(OnEnter(GameState::Playing), setup_playing)
+            .add_systems(OnExit(AppState::InGame), cleanup)
+            .add_systems(
+                PostUpdate,
+                (
+                    check_removed
+                        .run_if(in_state(AppState::InGame))
+                        .in_set(FinderSet::CheckRemoved),
+                    check_updated
+                        .run_if(in_state(GameState::Playing))
+                        .in_set(FinderSet::CheckUpdated),
+                    update
+                        .run_if(in_state(GameState::Playing))
+                        .after(FinderSet::CheckUpdated)
+                        .after(FinderSet::CheckRemoved),
+                ),
             )
-            .add_system(
-                check_updated
-                    .in_base_set(GameSet::PostUpdate)
-                    .run_if(in_state(GameState::Playing))
-                    .in_set(FinderSet::CheckUpdated),
-            )
-            .add_system(
-                update
-                    .in_base_set(GameSet::PostUpdate)
-                    .run_if(in_state(GameState::Playing))
-                    .after(FinderSet::CheckUpdated)
-                    .after(FinderSet::CheckRemoved),
-            )
-            .add_system(
+            .add_systems(
+                PreMovement,
                 check_update_result
-                    .in_base_set(GameSet::PreMovement)
                     .run_if(in_state(GameState::Playing))
                     .in_set(FinderSet::UpdateFinder),
             );
@@ -84,6 +80,7 @@ pub(crate) enum FinderSet {
 ///
 /// Paths found before the event was sent may no longer be optimal or may lead
 /// through non-accessible area.
+#[derive(Event)]
 pub(crate) struct PathFinderUpdatedEvent;
 
 #[derive(Clone, Resource)]
diff --git a/crates/pathing/src/pplugin.rs b/crates/pathing/src/pplugin.rs
index 2257f1f5e..b9dd3f7a5 100644
--- a/crates/pathing/src/pplugin.rs
+++ b/crates/pathing/src/pplugin.rs
@@ -4,7 +4,10 @@ use bevy::{
     tasks::{AsyncComputeTaskPool, Task},
 };
 use de_core::{
-    baseset::GameSet, gamestate::GameState, objects::MovableSolid, projection::ToFlat,
+    baseset::{PostMovement, PreMovement},
+    gamestate::GameState,
+    objects::MovableSolid,
+    projection::ToFlat,
     state::AppState,
 };
 use futures_lite::future;
@@ -34,45 +37,40 @@ pub struct PathingPlugin;
 impl Plugin for PathingPlugin {
     fn build(&self, app: &mut App) {
         app.add_event::<UpdateEntityPathEvent>()
-            .add_system(setup.in_schedule(OnEnter(AppState::InGame)))
-            .add_system(cleanup.in_schedule(OnExit(AppState::InGame)))
-            .add_system(
-                update_existing_paths
-                    .in_base_set(GameSet::PreMovement)
-                    .run_if(in_state(GameState::Playing))
-                    .run_if(on_event::<PathFinderUpdatedEvent>())
-                    .in_set(PathingSet::UpdateExistingPaths)
-                    .after(FinderSet::UpdateFinder),
+            .add_systems(OnEnter(AppState::InGame), setup)
+            .add_systems(OnExit(AppState::InGame), cleanup)
+            .add_systems(
+                PreMovement,
+                (
+                    update_existing_paths
+                        .run_if(in_state(GameState::Playing))
+                        .run_if(on_event::<PathFinderUpdatedEvent>())
+                        .in_set(PathingSet::UpdateExistingPaths)
+                        .after(FinderSet::UpdateFinder),
+                    update_requested_paths
+                        .run_if(in_state(GameState::Playing))
+                        .in_set(PathingSet::UpdateRequestedPaths)
+                        .after(PathingSet::UpdateExistingPaths),
+                    check_path_results
+                        .run_if(in_state(GameState::Playing))
+                        // This is needed to avoid race condition in PathTarget
+                        // removal which would happen if path was not-found before
+                        // this system is run.
+                        .before(PathingSet::UpdateRequestedPaths)
+                        // This system removes finished tasks from UpdatePathsState
+                        // and inserts Scheduledpath components. When this happen,
+                        // the tasks is no longer available however the component
+                        // is not available as well until the end of the stage.
+                        //
+                        // System PathingSet::UpdateExistingPaths needs to detect
+                        // that a path is either already scheduled or being
+                        // computed. Thus this system must run after it.
+                        .after(PathingSet::UpdateExistingPaths),
+                ),
             )
-            .add_system(
-                update_requested_paths
-                    .in_base_set(GameSet::PreMovement)
-                    .run_if(in_state(GameState::Playing))
-                    .in_set(PathingSet::UpdateRequestedPaths)
-                    .after(PathingSet::UpdateExistingPaths),
-            )
-            .add_system(
-                check_path_results
-                    .in_base_set(GameSet::PreMovement)
-                    .run_if(in_state(GameState::Playing))
-                    // This is needed to avoid race condition in PathTarget
-                    // removal which would happen if path was not-found before
-                    // this system is run.
-                    .before(PathingSet::UpdateRequestedPaths)
-                    // This system removes finished tasks from UpdatePathsState
-                    // and inserts Scheduledpath components. When this happen,
-                    // the tasks is no longer available however the component
-                    // is not available as well until the end of the stage.
-                    //
-                    // System PathingSet::UpdateExistingPaths needs to detect
-                    // that a path is either already scheduled or being
-                    // computed. Thus this system must run after it.
-                    .after(PathingSet::UpdateExistingPaths),
-            )
-            .add_system(
-                remove_path_targets
-                    .in_base_set(GameSet::PostMovement)
-                    .run_if(in_state(AppState::InGame)),
+            .add_systems(
+                PostMovement,
+                remove_path_targets.run_if(in_state(AppState::InGame)),
             );
     }
 }
@@ -85,6 +83,7 @@ enum PathingSet {
 
 /// This event triggers computation of shortest path to a target and
 /// replacement / insertion of this path to the entity.
+#[derive(Event)]
 pub struct UpdateEntityPathEvent {
     entity: Entity,
     target: PathTarget,
diff --git a/crates/signs/src/bars.rs b/crates/signs/src/bars.rs
index 11f0db7fa..c4db799f5 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::TypeUuid,
+    reflect::{TypePath, TypeUuid},
     render::{
         mesh::{Indices, MeshVertexAttribute, MeshVertexBufferLayout},
         render_resource::{
@@ -14,7 +14,6 @@ use bevy::{
 };
 use de_camera::{CameraDistance, DistanceSet};
 use de_core::{
-    baseset::GameSet,
     objects::{Active, ObjectType},
     state::AppState,
     visibility::{VisibilityFlags, VisibilitySet},
@@ -37,44 +36,33 @@ pub(crate) struct BarsPlugin;
 
 impl Plugin for BarsPlugin {
     fn build(&self, app: &mut App) {
-        app.add_plugin(MaterialPlugin::<BarMaterial>::default())
+        app.add_plugins(MaterialPlugin::<BarMaterial>::default())
             .add_event::<UpdateBarValueEvent>()
             .add_event::<UpdateBarVisibilityEvent>()
-            .add_system(setup.in_schedule(OnEnter(AppState::InGame)))
-            .add_system(cleanup.in_schedule(OnExit(AppState::InGame)))
-            .add_system(
-                spawn
-                    .in_base_set(GameSet::PostUpdate)
-                    .run_if(in_state(AppState::InGame)),
-            )
-            .add_system(
-                update_value
-                    .in_base_set(GameSet::PostUpdate)
-                    .run_if(in_state(AppState::InGame)),
-            )
-            .add_system(
-                update_visibility_events
-                    .in_base_set(GameSet::PostUpdate)
-                    .run_if(in_state(AppState::InGame))
-                    .before(VisibilitySet::Update),
-            )
-            .add_system(
-                update_visibility_distance
-                    .in_base_set(GameSet::PostUpdate)
-                    .run_if(in_state(AppState::InGame))
-                    .before(VisibilitySet::Update)
-                    .after(DistanceSet::Update),
-            )
-            .add_system(
-                update_visibility_timer
-                    .in_base_set(GameSet::PostUpdate)
-                    .run_if(in_state(AppState::InGame))
-                    .before(VisibilitySet::Update),
+            .add_systems(OnEnter(AppState::InGame), setup)
+            .add_systems(OnExit(AppState::InGame), cleanup)
+            .add_systems(
+                PostUpdate,
+                (
+                    spawn.run_if(in_state(AppState::InGame)),
+                    update_value.run_if(in_state(AppState::InGame)),
+                    update_visibility_events
+                        .run_if(in_state(AppState::InGame))
+                        .before(VisibilitySet::Update),
+                    update_visibility_distance
+                        .run_if(in_state(AppState::InGame))
+                        .before(VisibilitySet::Update)
+                        .after(DistanceSet::Update),
+                    update_visibility_timer
+                        .run_if(in_state(AppState::InGame))
+                        .before(VisibilitySet::Update),
+                ),
             );
     }
 }
 
 /// An event which changes value displayed on the entity bar.
+#[derive(Event)]
 pub struct UpdateBarValueEvent {
     entity: Entity,
     value: f32,
@@ -100,6 +88,7 @@ impl UpdateBarValueEvent {
     }
 }
 
+#[derive(Event)]
 pub struct UpdateBarVisibilityEvent {
     entity: Entity,
     id: u32,
@@ -149,7 +138,7 @@ impl BarMesh {
     }
 }
 
-#[derive(AsBindGroup, TypeUuid, Debug, Clone)]
+#[derive(AsBindGroup, TypeUuid, TypePath, Debug, Clone)]
 #[uuid = "66547498-fb0d-4fb6-a8e6-c792367e53d6"]
 struct BarMaterial {
     #[uniform(0)]
diff --git a/crates/signs/src/line.rs b/crates/signs/src/line.rs
index 7cc9d8fe4..24f6b4070 100644
--- a/crates/signs/src/line.rs
+++ b/crates/signs/src/line.rs
@@ -1,8 +1,7 @@
 use ahash::AHashMap;
 use bevy::prelude::*;
-use bevy::reflect::TypeUuid;
+use bevy::reflect::{TypePath, TypeUuid};
 use bevy::render::render_resource::{AsBindGroup, ShaderRef};
-use de_core::baseset::GameSet;
 use de_core::cleanup::DespawnOnGameExit;
 use de_core::objects::Active;
 use de_core::state::AppState;
@@ -16,41 +15,34 @@ pub(crate) struct LinePlugin;
 
 impl Plugin for LinePlugin {
     fn build(&self, app: &mut App) {
-        app.add_plugin(MaterialPlugin::<LineMaterial>::default())
+        app.add_plugins(MaterialPlugin::<LineMaterial>::default())
             .add_event::<UpdateLineLocationEvent>()
             .add_event::<UpdateLineEndEvent>()
             .add_event::<UpdateLineVisibilityEvent>()
-            .add_system(setup.in_schedule(OnEnter(AppState::InGame)))
-            .add_system(cleanup.in_schedule(OnExit(AppState::InGame)))
-            .add_system(
-                update_line_end
-                    .in_base_set(GameSet::PostUpdate)
-                    .run_if(in_state(AppState::InGame))
-                    .run_if(on_event::<UpdateLineEndEvent>())
-                    .in_set(LinesSet::LineEnd),
-            )
-            .add_system(
-                update_line_location
-                    .in_base_set(GameSet::PostUpdate)
-                    .run_if(in_state(AppState::InGame))
-                    .run_if(on_event::<UpdateLineLocationEvent>())
-                    .in_set(LinesSet::LocationEvents)
-                    .after(LinesSet::LineEnd),
-            )
-            .add_system(
-                update_line_visibility
-                    .in_base_set(GameSet::PostUpdate)
-                    .run_if(in_state(AppState::InGame))
-                    .run_if(on_event::<UpdateLineVisibilityEvent>())
-                    .in_set(LinesSet::VisibilityEvents)
-                    .after(LinesSet::LocationEvents),
-            )
-            .add_system(
-                owner_despawn
-                    .in_base_set(GameSet::PostUpdate)
-                    .run_if(in_state(AppState::InGame))
-                    .in_set(LinesSet::Despawn)
-                    .after(LinesSet::VisibilityEvents),
+            .add_systems(OnEnter(AppState::InGame), setup)
+            .add_systems(OnExit(AppState::InGame), cleanup)
+            .add_systems(
+                PostUpdate,
+                (
+                    update_line_end
+                        .run_if(in_state(AppState::InGame))
+                        .run_if(on_event::<UpdateLineEndEvent>())
+                        .in_set(LinesSet::LineEnd),
+                    update_line_location
+                        .run_if(in_state(AppState::InGame))
+                        .run_if(on_event::<UpdateLineLocationEvent>())
+                        .in_set(LinesSet::LocationEvents)
+                        .after(LinesSet::LineEnd),
+                    update_line_visibility
+                        .run_if(in_state(AppState::InGame))
+                        .run_if(on_event::<UpdateLineVisibilityEvent>())
+                        .in_set(LinesSet::VisibilityEvents)
+                        .after(LinesSet::LocationEvents),
+                    owner_despawn
+                        .run_if(in_state(AppState::InGame))
+                        .in_set(LinesSet::Despawn)
+                        .after(LinesSet::VisibilityEvents),
+                ),
             );
     }
 }
@@ -64,7 +56,7 @@ enum LinesSet {
 }
 
 // Passed to the `rally_point.wgsl` shader
-#[derive(AsBindGroup, TypeUuid, Debug, Clone)]
+#[derive(AsBindGroup, TypeUuid, TypePath, Debug, Clone)]
 #[uuid = "d0fae52d-f398-4416-9b72-9039093a6c34"]
 pub struct LineMaterial {}
 
@@ -103,6 +95,7 @@ impl LineLocation {
     }
 }
 
+#[derive(Event)]
 pub struct UpdateLineVisibilityEvent {
     owner: Entity,
     visible: bool,
@@ -114,6 +107,7 @@ impl UpdateLineVisibilityEvent {
     }
 }
 
+#[derive(Event)]
 pub struct UpdateLineLocationEvent {
     owner: Entity,
     location: LineLocation,
@@ -125,6 +119,7 @@ impl UpdateLineLocationEvent {
     }
 }
 
+#[derive(Event)]
 pub struct UpdateLineEndEvent {
     owner: Entity,
     end: Vec3,
diff --git a/crates/signs/src/markers.rs b/crates/signs/src/markers.rs
index 592f04e17..059c9fbd5 100644
--- a/crates/signs/src/markers.rs
+++ b/crates/signs/src/markers.rs
@@ -1,6 +1,6 @@
 use bevy::prelude::*;
 use de_camera::{CameraDistance, DistanceSet};
-use de_core::{baseset::GameSet, state::AppState};
+use de_core::state::AppState;
 use de_terrain::MarkerVisibility;
 
 use crate::{DISTANCE_FLAG_BIT, MAX_VISIBILITY_DISTANCE};
@@ -9,9 +9,9 @@ pub(crate) struct MarkersPlugin;
 
 impl Plugin for MarkersPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(
+        app.add_systems(
+            PostUpdate,
             update_distance
-                .in_base_set(GameSet::PostUpdate)
                 .run_if(in_state(AppState::InGame))
                 .after(DistanceSet::Update),
         );
diff --git a/crates/signs/src/pole.rs b/crates/signs/src/pole.rs
index 457fb7863..22db61286 100644
--- a/crates/signs/src/pole.rs
+++ b/crates/signs/src/pole.rs
@@ -1,8 +1,8 @@
 use ahash::{AHashMap, AHashSet};
 use bevy::prelude::*;
 use de_core::{
-    baseset::GameSet, cleanup::DespawnOnGameExit, objects::ObjectType, projection::ToAltitude,
-    state::AppState, vecord::Vec2Ord,
+    cleanup::DespawnOnGameExit, objects::ObjectType, projection::ToAltitude, state::AppState,
+    vecord::Vec2Ord,
 };
 use de_objects::{AssetCollection, SceneType, Scenes};
 
@@ -15,58 +15,42 @@ impl Plugin for PolePlugin {
             .add_event::<SpawnPoleEvent>()
             .add_event::<DespawnPoleEvent>()
             .add_event::<MovePoleEvent>()
-            .add_system(setup.in_schedule(OnEnter(AppState::InGame)))
-            .add_system(cleanup.in_schedule(OnExit(AppState::InGame)))
-            .add_system(
-                location_events
-                    .in_base_set(GameSet::PostUpdate)
-                    .run_if(in_state(AppState::InGame))
-                    .in_set(PolesSet::LocationEvents),
-            )
-            .add_system(
-                visibility_events
-                    .in_base_set(GameSet::PostUpdate)
-                    .run_if(in_state(AppState::InGame))
-                    .in_set(PolesSet::VisibilityEvents),
-            )
-            .add_system(
-                despawned
-                    .in_base_set(GameSet::PostUpdate)
-                    .run_if(in_state(AppState::InGame))
-                    .in_set(PolesSet::Despawned)
-                    .after(PolesSet::LocationEvents),
-            )
-            .add_system(
-                update_poles
-                    .in_base_set(GameSet::PostUpdate)
-                    .run_if(in_state(AppState::InGame))
-                    .run_if(resource_exists_and_changed::<OwnersToPoles>())
-                    .after(PolesSet::LocationEvents)
-                    .after(PolesSet::VisibilityEvents)
-                    .after(PolesSet::Despawned)
-                    .before(PolesSet::SpawnPoles)
-                    .before(PolesSet::DespawnPoles)
-                    .before(PolesSet::MovePoles),
-            )
-            .add_system(
-                spawn_poles
-                    .in_base_set(GameSet::PostUpdate)
-                    .run_if(in_state(AppState::InGame))
-                    .run_if(on_event::<SpawnPoleEvent>())
-                    .in_set(PolesSet::SpawnPoles)
-                    .after(PolesSet::DespawnPoles),
-            )
-            .add_system(
-                despawn_poles
-                    .in_base_set(GameSet::PostUpdate)
-                    .run_if(in_state(AppState::InGame))
-                    .in_set(PolesSet::DespawnPoles),
-            )
-            .add_system(
-                move_poles
-                    .in_base_set(GameSet::PostUpdate)
-                    .run_if(in_state(AppState::InGame))
-                    .before(PolesSet::DespawnPoles),
+            .add_systems(OnEnter(AppState::InGame), setup)
+            .add_systems(OnExit(AppState::InGame), cleanup)
+            .add_systems(
+                PostUpdate,
+                (
+                    location_events
+                        .run_if(in_state(AppState::InGame))
+                        .in_set(PolesSet::LocationEvents),
+                    visibility_events
+                        .run_if(in_state(AppState::InGame))
+                        .in_set(PolesSet::VisibilityEvents),
+                    despawned
+                        .run_if(in_state(AppState::InGame))
+                        .in_set(PolesSet::Despawned)
+                        .after(PolesSet::LocationEvents),
+                    update_poles
+                        .run_if(in_state(AppState::InGame))
+                        .run_if(resource_exists_and_changed::<OwnersToPoles>())
+                        .after(PolesSet::LocationEvents)
+                        .after(PolesSet::VisibilityEvents)
+                        .after(PolesSet::Despawned)
+                        .before(PolesSet::SpawnPoles)
+                        .before(PolesSet::DespawnPoles)
+                        .before(PolesSet::MovePoles),
+                    spawn_poles
+                        .run_if(in_state(AppState::InGame))
+                        .run_if(on_event::<SpawnPoleEvent>())
+                        .in_set(PolesSet::SpawnPoles)
+                        .after(PolesSet::DespawnPoles),
+                    despawn_poles
+                        .run_if(in_state(AppState::InGame))
+                        .in_set(PolesSet::DespawnPoles),
+                    move_poles
+                        .run_if(in_state(AppState::InGame))
+                        .before(PolesSet::DespawnPoles),
+                ),
             );
     }
 }
@@ -90,6 +74,7 @@ enum PolesSet {
 /// Each pole is associated with an entity and each entity may have up to one
 /// associated pole. Note that this association is not managed via Bevy entity
 /// hierarchy, thus visibility or transformation is independent.
+#[derive(Event)]
 pub struct UpdatePoleLocationEvent {
     owner: Entity,
     location: Vec2,
@@ -102,6 +87,7 @@ impl UpdatePoleLocationEvent {
 }
 
 /// Send this event to change visibility of an existing pole.
+#[derive(Event)]
 pub struct UpdatePoleVisibilityEvent {
     owner: Entity,
     visible: bool,
@@ -124,12 +110,15 @@ struct Pole {
 
 /// Spawn a new pole at this location. There must not be a pole already at this
 /// location.
+#[derive(Event)]
 struct SpawnPoleEvent(Vec2);
 
 /// Despawn an existing pole at this location.
+#[derive(Event)]
 struct DespawnPoleEvent(Vec2);
 
 /// Move an existing pole from one location to another.
+#[derive(Event)]
 struct MovePoleEvent(Vec2, Vec2);
 
 #[derive(Default, Resource)]
diff --git a/crates/spawner/src/counter.rs b/crates/spawner/src/counter.rs
index 3205f7d87..a81f9c280 100644
--- a/crates/spawner/src/counter.rs
+++ b/crates/spawner/src/counter.rs
@@ -13,8 +13,8 @@ pub(crate) struct CounterPlugin;
 
 impl Plugin for CounterPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(setup.in_schedule(OnEnter(AppState::InGame)))
-            .add_system(cleanup.in_schedule(OnExit(AppState::InGame)));
+        app.add_systems(OnEnter(AppState::InGame), setup)
+            .add_systems(OnExit(AppState::InGame), cleanup);
     }
 }
 
diff --git a/crates/spawner/src/destroyer.rs b/crates/spawner/src/destroyer.rs
index af45fa18f..642ae2f62 100644
--- a/crates/spawner/src/destroyer.rs
+++ b/crates/spawner/src/destroyer.rs
@@ -1,5 +1,5 @@
 use bevy::prelude::*;
-use de_core::{baseset::GameSet, objects::ObjectType, player::Player, state::AppState};
+use de_core::{objects::ObjectType, player::Player, state::AppState};
 use de_objects::Health;
 
 use crate::{ObjectCounter, SpawnerSet};
@@ -8,9 +8,9 @@ pub(crate) struct DestroyerPlugin;
 
 impl Plugin for DestroyerPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(
+        app.add_systems(
+            Update,
             destroy
-                .in_base_set(GameSet::Update)
                 .run_if(in_state(AppState::InGame))
                 .in_set(SpawnerSet::Destroyer),
         );
diff --git a/crates/spawner/src/draft.rs b/crates/spawner/src/draft.rs
index 91a1248cc..1d95e7b4e 100644
--- a/crates/spawner/src/draft.rs
+++ b/crates/spawner/src/draft.rs
@@ -8,7 +8,6 @@ use bevy::pbr::NotShadowReceiver;
 use bevy::scene::SceneInstance;
 use bevy::{pbr::NotShadowCaster, prelude::*};
 use de_core::{
-    baseset::GameSet,
     gamestate::GameState,
     objects::{ActiveObjectType, BuildingType, MovableSolid, ObjectType, StaticSolid},
     projection::ToFlat,
@@ -33,30 +32,22 @@ pub(crate) struct DraftPlugin;
 
 impl Plugin for DraftPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(insert_materials.in_schedule(OnEnter(AppState::InGame)))
-            .add_system(cleanup.in_schedule(OnExit(AppState::InGame)))
-            .add_system(
-                new_draft
-                    .in_base_set(GameSet::Update)
-                    .run_if(in_state(GameState::Playing)),
-            )
-            .add_system(
-                update_draft
-                    .in_base_set(GameSet::PostUpdate)
-                    .run_if(in_state(GameState::Playing))
-                    .after(IndexSet::Index),
-            )
-            .add_system(
-                check_draft_loaded
-                    .in_base_set(GameSet::PostUpdate)
-                    .run_if(in_state(GameState::Playing))
-                    .after(IndexSet::Index),
-            )
-            .add_system(
-                update_draft_colour
-                    .in_base_set(GameSet::PostUpdate)
-                    .run_if(in_state(GameState::Playing))
-                    .after(IndexSet::Index),
+        app.add_systems(OnEnter(AppState::InGame), insert_materials)
+            .add_systems(OnExit(AppState::InGame), cleanup)
+            .add_systems(Update, new_draft.run_if(in_state(GameState::Playing)))
+            .add_systems(
+                PostUpdate,
+                (
+                    update_draft
+                        .run_if(in_state(GameState::Playing))
+                        .after(IndexSet::Index),
+                    check_draft_loaded
+                        .run_if(in_state(GameState::Playing))
+                        .after(IndexSet::Index),
+                    update_draft_colour
+                        .run_if(in_state(GameState::Playing))
+                        .after(IndexSet::Index),
+                ),
             );
     }
 }
diff --git a/crates/spawner/src/gameend.rs b/crates/spawner/src/gameend.rs
index b9029c17c..8a152a51f 100644
--- a/crates/spawner/src/gameend.rs
+++ b/crates/spawner/src/gameend.rs
@@ -1,8 +1,5 @@
 use bevy::prelude::*;
-use de_core::{
-    baseset::GameSet, gamestate::GameState, gconfig::GameConfig, gresult::GameResult,
-    state::AppState,
-};
+use de_core::{gamestate::GameState, gconfig::GameConfig, gresult::GameResult, state::AppState};
 
 use crate::ObjectCounter;
 
@@ -10,10 +7,9 @@ pub(crate) struct GameEndPlugin;
 
 impl Plugin for GameEndPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(
-            game_end_detection_system
-                .in_base_set(GameSet::PostUpdate)
-                .run_if(in_state(GameState::Playing)),
+        app.add_systems(
+            PostUpdate,
+            game_end_detection_system.run_if(in_state(GameState::Playing)),
         );
     }
 }
diff --git a/crates/spawner/src/spawner.rs b/crates/spawner/src/spawner.rs
index eb58c5f54..180ca943d 100644
--- a/crates/spawner/src/spawner.rs
+++ b/crates/spawner/src/spawner.rs
@@ -2,7 +2,6 @@
 
 use bevy::prelude::*;
 use de_core::{
-    baseset::GameSet,
     gamestate::GameState,
     gconfig::GameConfig,
     objects::{Active, ActiveObjectType, MovableSolid, ObjectType, Playable, StaticSolid},
@@ -18,11 +17,7 @@ pub(crate) struct SpawnerPlugin;
 
 impl Plugin for SpawnerPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(
-            spawn
-                .in_base_set(GameSet::Update)
-                .run_if(in_state(GameState::Playing)),
-        );
+        app.add_systems(Update, spawn.run_if(in_state(GameState::Playing)));
     }
 }
 
diff --git a/crates/terrain/src/collider.rs b/crates/terrain/src/collider.rs
index 1cfe883fd..8e1104079 100644
--- a/crates/terrain/src/collider.rs
+++ b/crates/terrain/src/collider.rs
@@ -114,7 +114,7 @@ mod test {
             commands.insert_resource(Vec3Wrap(Vec3::from(ray.point_at(intersection.toi))));
         }
 
-        app.add_system(help_system);
+        app.add_systems(Update, help_system);
 
         app.update();
 
diff --git a/crates/terrain/src/marker.rs b/crates/terrain/src/marker.rs
index eb16792ed..d5f5410d4 100644
--- a/crates/terrain/src/marker.rs
+++ b/crates/terrain/src/marker.rs
@@ -22,17 +22,16 @@ pub(crate) struct MarkerPlugin;
 
 impl Plugin for MarkerPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(
-            update_markers::<CircleMarker>
-                .in_base_set(CoreSet::PostUpdate)
-                .run_if(in_state(GameState::Playing))
-                .after(VisibilitySystems::CheckVisibility),
-        )
-        .add_system(
-            update_markers::<RectangleMarker>
-                .in_base_set(CoreSet::PostUpdate)
-                .run_if(in_state(GameState::Playing))
-                .after(VisibilitySystems::CheckVisibility),
+        app.add_systems(
+            PostUpdate,
+            (
+                update_markers::<CircleMarker>
+                    .run_if(in_state(GameState::Playing))
+                    .after(VisibilitySystems::CheckVisibility),
+                update_markers::<RectangleMarker>
+                    .run_if(in_state(GameState::Playing))
+                    .after(VisibilitySystems::CheckVisibility),
+            ),
         );
     }
 }
diff --git a/crates/terrain/src/plugin.rs b/crates/terrain/src/plugin.rs
index 68435f231..1b26214a5 100644
--- a/crates/terrain/src/plugin.rs
+++ b/crates/terrain/src/plugin.rs
@@ -6,7 +6,7 @@ use bevy::{
         texture::ImageSampler,
     },
 };
-use de_core::{baseset::GameSet, gamestate::GameState, state::AppState};
+use de_core::{gamestate::GameState, state::AppState};
 use iyes_progress::prelude::*;
 
 use crate::{shader::TerrainMaterial, terrain::Terrain};
@@ -17,18 +17,17 @@ pub(crate) struct TerrainPlugin;
 
 impl Plugin for TerrainPlugin {
     fn build(&self, app: &mut App) {
-        app.add_plugin(MaterialPlugin::<TerrainMaterial>::default())
-            .add_system(load.in_schedule(OnEnter(AppState::InGame)))
-            .add_system(cleanup.in_schedule(OnExit(AppState::InGame)))
-            .add_system(
-                setup_textures
-                    .track_progress()
-                    .in_base_set(GameSet::Update)
-                    .run_if(in_state(GameState::Loading)),
-            )
-            .add_system(
-                init.in_base_set(GameSet::Update)
-                    .run_if(in_state(AppState::InGame)),
+        app.add_plugins(MaterialPlugin::<TerrainMaterial>::default())
+            .add_systems(OnEnter(AppState::InGame), load)
+            .add_systems(OnExit(AppState::InGame), cleanup)
+            .add_systems(
+                Update,
+                (
+                    setup_textures
+                        .track_progress()
+                        .run_if(in_state(GameState::Loading)),
+                    init.run_if(in_state(AppState::InGame)),
+                ),
             );
     }
 }
diff --git a/crates/terrain/src/shader.rs b/crates/terrain/src/shader.rs
index 3d0750469..d9d3f32d0 100644
--- a/crates/terrain/src/shader.rs
+++ b/crates/terrain/src/shader.rs
@@ -2,7 +2,7 @@ use std::{cmp::Ordering, ops::Range};
 
 use bevy::{
     prelude::{Handle, Image, Material},
-    reflect::TypeUuid,
+    reflect::{TypePath, TypeUuid},
     render::render_resource::{AsBindGroup, ShaderRef, ShaderType},
 };
 use glam::{Mat3, Vec2};
@@ -14,7 +14,7 @@ pub(crate) const CIRCLE_CAPACITY: usize = 127;
 // * Keep this smaller or equal to de_core::objects::PLAYER_MAX_BUILDINGS.
 pub(crate) const RECTANGLE_CAPACITY: usize = 31;
 
-#[derive(AsBindGroup, TypeUuid, Debug, Clone)]
+#[derive(AsBindGroup, TypeUuid, TypePath, Debug, Clone)]
 #[uuid = "9e124e04-fdf1-4836-b82d-fa2f01fddb62"]
 pub struct TerrainMaterial {
     #[uniform(0)]
diff --git a/src/main.rs b/src/main.rs
index c82dd28da..a4a49204a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -62,13 +62,15 @@ fn main() {
                     })
                     .disable::<LogPlugin>(),
             )
-            .add_plugin(LogDiagnosticsPlugin {
-                debug: false,
-                wait_duration: Duration::from_secs(10),
-                filter: None,
-            })
-            .add_plugin(FrameTimeDiagnosticsPlugin)
-            .add_plugin(GamePlugin)
+            .add_plugins((
+                LogDiagnosticsPlugin {
+                    debug: false,
+                    wait_duration: Duration::from_secs(10),
+                    filter: None,
+                },
+                FrameTimeDiagnosticsPlugin,
+                GamePlugin,
+            ))
             .add_plugins(ConfigPluginGroup)
             .add_plugins(GuiPluginGroup)
             .add_plugins(LobbyClientPluginGroup)
@@ -103,7 +105,7 @@ impl Plugin for GamePlugin {
 
         #[cfg(not(target_os = "macos"))]
         {
-            app.add_system(cursor_grab_system.in_schedule(OnEnter(AppState::AppLoading)));
+            app.add_systems(OnEnter(AppState::AppLoading), cursor_grab_system);
         }
     }
 }