diff --git a/.fleet/run.json b/.fleet/run.json
new file mode 100644
index 00000000..7e743b9e
--- /dev/null
+++ b/.fleet/run.json
@@ -0,0 +1,14 @@
+{
+    "configurations": [
+        {
+            "type": "cargo",
+            "name": "Check mr_server",
+            "cargoArgs": ["clippy", "-p", "mr_server"]
+        },
+        {
+            "type": "cargo",
+            "name": "Check mr_client",
+            "cargoArgs": ["clippy", "-p", "mr_client"]
+        }
+    ]
+}
diff --git a/.run/Run mr_desktop_client.run.xml b/.run/Run mr_desktop_client.run.xml
index 564fb030..5058b9e0 100644
--- a/.run/Run mr_desktop_client.run.xml	
+++ b/.run/Run mr_desktop_client.run.xml	
@@ -2,10 +2,10 @@
   <configuration default="false" name="Run mr_desktop_client" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
     <option name="command" value="run --package mr_desktop_client" />
     <option name="workingDirectory" value="file://$PROJECT_DIR$" />
+    <option name="emulateTerminal" value="false" />
     <option name="channel" value="DEFAULT" />
     <option name="requiredFeatures" value="true" />
     <option name="allFeatures" value="false" />
-    <option name="emulateTerminal" value="false" />
     <option name="withSudo" value="false" />
     <option name="buildTarget" value="REMOTE" />
     <option name="backtrace" value="SHORT" />
diff --git a/Cargo.lock b/Cargo.lock
index e3d3564e..295a860a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "ab_glyph"
-version = "0.2.19"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5568a4aa5ba8adf5175c5c460b030e27d8893412976cc37bef0e4fbc16cfbba"
+checksum = "5110f1c78cf582855d895ecd0746b653db010cec6d9f5575293f27934d980a39"
 dependencies = [
  "ab_glyph_rasterizer",
  "owned_ttf_parser",
@@ -18,6 +18,59 @@ version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046"
 
+[[package]]
+name = "accesskit"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "704d532b1cd3d912bb37499c55a81ac748cc1afa737eedd100ba441acdd47d38"
+
+[[package]]
+name = "accesskit_consumer"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48ba8b23cfca3944012ee2e5c71c02077a400e034c720eed6bd927cb6b4d1fd9"
+dependencies = [
+ "accesskit",
+]
+
+[[package]]
+name = "accesskit_macos"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58d062544d6cc36f4213323b7cb3a0d74ddff4b0d2311ab5e7596f4278bb2cc9"
+dependencies = [
+ "accesskit",
+ "accesskit_consumer",
+ "objc2",
+ "once_cell",
+]
+
+[[package]]
+name = "accesskit_windows"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aaf5b3c3828397ee832ba4a72fb1a4ace10f781e31885f774cbd531014059115"
+dependencies = [
+ "accesskit",
+ "accesskit_consumer",
+ "arrayvec",
+ "once_cell",
+ "paste",
+ "windows 0.44.0",
+]
+
+[[package]]
+name = "accesskit_winit"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbcb615217efc79c4bed3094c4ca76c4bc554751d1da16f3ed4ba0459b1e8f31"
+dependencies = [
+ "accesskit",
+ "accesskit_macos",
+ "accesskit_windows",
+ "winit",
+]
+
 [[package]]
 name = "actix-codec"
 version = "0.5.0"
@@ -52,15 +105,15 @@ dependencies = [
 
 [[package]]
 name = "actix-http"
-version = "3.3.0"
+version = "3.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0070905b2c4a98d184c4e81025253cb192aa8a73827553f38e9410801ceb35bb"
+checksum = "c2079246596c18b4a33e274ae10c0e50613f4d32a4198e09c7b93771013fed74"
 dependencies = [
  "actix-codec",
  "actix-rt",
  "actix-service",
  "actix-utils",
- "ahash 0.7.6",
+ "ahash 0.8.3",
  "base64 0.21.0",
  "bitflags",
  "brotli",
@@ -81,12 +134,12 @@ dependencies = [
  "percent-encoding",
  "pin-project-lite",
  "rand",
- "sha1 0.10.5",
+ "sha1",
  "smallvec",
  "tokio",
  "tokio-util",
  "tracing",
- "zstd 0.12.2+zstd.1.5.2",
+ "zstd 0.12.3+zstd.1.5.2",
 ]
 
 [[package]]
@@ -96,7 +149,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "465a6172cf69b960917811022d8f29bc0b7fa1398bc4f78b3c466673db1213b6"
 dependencies = [
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -163,9 +216,9 @@ dependencies = [
 
 [[package]]
 name = "actix-web"
-version = "4.3.0"
+version = "4.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "464e0fddc668ede5f26ec1f9557a8d44eda948732f40c6b0ad79126930eb775f"
+checksum = "cd3cb42f9566ab176e1ef0b8b3a896529062b4efc6be0123046095914c4c1c96"
 dependencies = [
  "actix-codec",
  "actix-http",
@@ -198,20 +251,20 @@ dependencies = [
  "serde_urlencoded",
  "smallvec",
  "socket2",
- "time 0.3.17",
+ "time 0.3.21",
  "url",
 ]
 
 [[package]]
 name = "actix-web-codegen"
-version = "4.1.0"
+version = "4.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fa9362663c8643d67b2d5eafba49e4cb2c8a053a29ed00a0bea121f17c76b13"
+checksum = "2262160a7ae29e3415554a3f1fc04c764b1540c116aa524683208078b7a75bc9"
 dependencies = [
  "actix-router",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -229,12 +282,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
-[[package]]
-name = "adler32"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"
-
 [[package]]
 name = "aead"
 version = "0.3.2"
@@ -295,27 +342,28 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
 dependencies = [
- "getrandom 0.2.8",
+ "getrandom",
  "once_cell",
  "version_check",
 ]
 
 [[package]]
 name = "ahash"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf6ccdb167abbf410dcb915cabd428929d7f6a04980b54a11f26a39f1c7f7107"
+checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
 dependencies = [
  "cfg-if",
+ "getrandom",
  "once_cell",
  "version_check",
 ]
 
 [[package]]
 name = "aho-corasick"
-version = "0.7.20"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
+checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04"
 dependencies = [
  "memchr",
 ]
@@ -337,14 +385,14 @@ dependencies = [
 
 [[package]]
 name = "alsa"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5915f52fe2cf65e83924d037b6c5290b7cee097c6b5c8700746e6168a343fd6b"
+checksum = "8512c9117059663fb5606788fbca3619e2a91dac0e3fe516242eab1fa6be5e44"
 dependencies = [
  "alsa-sys",
  "bitflags",
  "libc",
- "nix 0.23.2",
+ "nix 0.24.3",
 ]
 
 [[package]]
@@ -358,23 +406,35 @@ dependencies = [
 ]
 
 [[package]]
-name = "android_log-sys"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85965b6739a430150bdd138e2374a98af0c3ee0d030b3bb7fc3bddff58d0102e"
-
-[[package]]
-name = "android_logger"
-version = "0.11.3"
+name = "android-activity"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8619b80c242aa7bd638b5c7ddd952addeecb71f69c75e33f1d47b2804f8f883a"
+checksum = "7c77a0045eda8b888c76ea473c2b0515ba6f471d318f8927c5c72240937035a6"
 dependencies = [
- "android_log-sys",
- "env_logger",
+ "android-properties",
+ "bitflags",
+ "cc",
+ "jni-sys",
+ "libc",
  "log",
- "once_cell",
+ "ndk",
+ "ndk-context",
+ "ndk-sys",
+ "num_enum",
 ]
 
+[[package]]
+name = "android-properties"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04"
+
+[[package]]
+name = "android_log-sys"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85965b6739a430150bdd138e2374a98af0c3ee0d030b3bb7fc3bddff58d0102e"
+
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@@ -386,9 +446,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.68"
+version = "1.0.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61"
+checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
 
 [[package]]
 name = "approx"
@@ -401,29 +461,24 @@ dependencies = [
 
 [[package]]
 name = "arboard"
-version = "2.1.1"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc120354d1b5ec6d7aaf4876b602def75595937b5e15d356eb554ab5177e08bb"
+checksum = "d6041616acea41d67c4a984709ddab1587fd0b10efe5cc563fee954d2f011854"
 dependencies = [
  "clipboard-win 4.5.0",
  "core-graphics",
- "image 0.23.14",
+ "image",
  "log",
  "objc",
  "objc-foundation",
  "objc_id",
+ "once_cell",
  "parking_lot 0.12.1",
  "thiserror",
  "winapi",
  "x11rb",
 ]
 
-[[package]]
-name = "arrayvec"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
-
 [[package]]
 name = "arrayvec"
 version = "0.7.2"
@@ -442,13 +497,52 @@ dependencies = [
  "libloading",
 ]
 
+[[package]]
+name = "asn1-rs"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0"
+dependencies = [
+ "asn1-rs-derive",
+ "asn1-rs-impl",
+ "displaydoc",
+ "nom",
+ "num-traits",
+ "rusticata-macros",
+ "thiserror",
+ "time 0.3.21",
+]
+
+[[package]]
+name = "asn1-rs-derive"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "synstructure",
+]
+
+[[package]]
+name = "asn1-rs-impl"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "async-channel"
 version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833"
 dependencies = [
- "concurrent-queue 2.1.0",
+ "concurrent-queue",
  "event-listener",
  "futures-core",
 ]
@@ -465,13 +559,13 @@ dependencies = [
 
 [[package]]
 name = "async-executor"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b"
+checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb"
 dependencies = [
  "async-lock",
  "async-task",
- "concurrent-queue 2.1.0",
+ "concurrent-queue",
  "fastrand",
  "futures-lite",
  "slab",
@@ -491,32 +585,31 @@ dependencies = [
 
 [[package]]
 name = "async-io"
-version = "1.12.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c374dda1ed3e7d8f0d9ba58715f924862c63eae6849c92d3a18e7fbde9e2794"
+checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af"
 dependencies = [
  "async-lock",
  "autocfg",
- "concurrent-queue 2.1.0",
+ "cfg-if",
+ "concurrent-queue",
  "futures-lite",
- "libc",
  "log",
  "parking",
  "polling",
+ "rustix",
  "slab",
  "socket2",
  "waker-fn",
- "windows-sys 0.42.0",
 ]
 
 [[package]]
 name = "async-lock"
-version = "2.6.0"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8101efe8695a6c17e02911402145357e718ac92d3ff88ae8419e84b1707b685"
+checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7"
 dependencies = [
  "event-listener",
- "futures-lite",
 ]
 
 [[package]]
@@ -533,9 +626,9 @@ dependencies = [
 
 [[package]]
 name = "async-process"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6381ead98388605d0d9ff86371043b5aa922a3905824244de40dc263a14fcba4"
+checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9"
 dependencies = [
  "async-io",
  "async-lock",
@@ -544,47 +637,48 @@ dependencies = [
  "cfg-if",
  "event-listener",
  "futures-lite",
- "libc",
+ "rustix",
  "signal-hook",
- "windows-sys 0.42.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "async-stream"
-version = "0.3.3"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dad5c83079eae9969be7fadefe640a1c566901f05ff91ab221de4b6f68d9507e"
+checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
 dependencies = [
  "async-stream-impl",
  "futures-core",
+ "pin-project-lite",
 ]
 
 [[package]]
 name = "async-stream-impl"
-version = "0.3.3"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27"
+checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.15",
 ]
 
 [[package]]
 name = "async-task"
-version = "4.3.0"
+version = "4.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524"
+checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae"
 
 [[package]]
 name = "async-trait"
-version = "0.1.63"
+version = "0.1.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eff18d764974428cf3a9328e23fc5c986f5fbed46e6cd4cdf42544df5d297ec1"
+checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.15",
 ]
 
 [[package]]
@@ -595,7 +689,7 @@ checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c"
 dependencies = [
  "futures",
  "pharos",
- "rustc_version 0.4.0",
+ "rustc_version",
 ]
 
 [[package]]
@@ -609,15 +703,15 @@ dependencies = [
 
 [[package]]
 name = "atomic-waker"
-version = "1.1.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "debc29dde2e69f9e47506b525f639ed42300fc014a3e007832592448fa8e4599"
+checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3"
 
 [[package]]
 name = "atomic_refcell"
-version = "0.1.9"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "857253367827bd9d0fd973f0ef15506a96e79e41b0ad7aa691203a4e3214f6c8"
+checksum = "79d6dc922a2792b006573f60b2648076355daeae5ce9cb59507e5908c9625d31"
 
 [[package]]
 name = "autocfg"
@@ -627,9 +721,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "axum"
-version = "0.6.3"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "678c5130a507ae3a7c797f9a17393c14849300b8440eac47cdb90a5bdcb3a543"
+checksum = "f8175979259124331c1d7bf6586ee7e0da434155e4b2d48ec2c8386281d8df39"
 dependencies = [
  "async-trait",
  "axum-core",
@@ -638,7 +732,7 @@ dependencies = [
  "futures-util",
  "http",
  "http-body 0.4.5",
- "hyper 0.14.23",
+ "hyper 0.14.26",
  "itoa",
  "matchit",
  "memchr",
@@ -649,16 +743,15 @@ dependencies = [
  "serde",
  "sync_wrapper",
  "tower",
- "tower-http",
  "tower-layer",
  "tower-service",
 ]
 
 [[package]]
 name = "axum-core"
-version = "0.3.2"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cae3e661676ffbacb30f1a824089a8c9150e71017f7e1e38f2aa32009188d34"
+checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c"
 dependencies = [
  "async-trait",
  "bytes",
@@ -686,12 +779,6 @@ dependencies = [
  "rustc-demangle",
 ]
 
-[[package]]
-name = "base-x"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270"
-
 [[package]]
 name = "base16ct"
 version = "0.1.1"
@@ -718,58 +805,72 @@ checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a"
 
 [[package]]
 name = "base64ct"
-version = "1.5.3"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf"
+checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 
 [[package]]
 name = "bevy"
-version = "0.9.1"
-source = "git+https://github.com/mvlabat/bevy.git?branch=v0.9.1/muddle-run#2f9bec3b26b7f14c8f3ce1023238c2b77841f56a"
+version = "0.10.1"
+source = "git+https://github.com/mvlabat/bevy.git?branch=v0.10.1/muddle-run#991f2a949e0faaaec30efca1753585b2ffa6dabb"
 dependencies = [
  "bevy_internal",
 ]
 
 [[package]]
 name = "bevy-inspector-egui"
-version = "0.15.0"
+version = "0.18.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd4c06a380d02588eac43f8a56d2d370614fe6b2e7467041e57b064e93ec7620"
+checksum = "7bda61dd72f879e8d4b0f57e94b86bd163bf558ac2e7ddea9ea075a47bdcd9af"
 dependencies = [
- "bevy",
  "bevy-inspector-egui-derive",
+ "bevy_app",
+ "bevy_asset",
+ "bevy_core",
+ "bevy_core_pipeline",
+ "bevy_ecs",
  "bevy_egui",
- "image 0.24.5",
- "nalgebra",
+ "bevy_hierarchy",
+ "bevy_log",
+ "bevy_math",
+ "bevy_pbr",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_utils",
+ "bevy_window",
+ "egui",
+ "image",
+ "once_cell",
  "pretty-type-name",
+ "smallvec",
 ]
 
 [[package]]
 name = "bevy-inspector-egui-derive"
-version = "0.15.0"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c6a0ceb52115321ef304a5a875e975bba5bbf2ceb802e1dfa07221e8bbc8178"
+checksum = "7556c913daacbec7aa213eda82517673bf6c6b25e0d827a56efe17421ebaca35"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.15",
 ]
 
 [[package]]
-name = "bevy-inspector-egui-rapier"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61093d6ab0ae326c80ddc12c13a540f3bee247b2e214f2f39a8147124f5a09c0"
+name = "bevy_a11y"
+version = "0.10.1"
+source = "git+https://github.com/mvlabat/bevy.git?branch=v0.10.1/muddle-run#991f2a949e0faaaec30efca1753585b2ffa6dabb"
 dependencies = [
- "bevy",
- "bevy-inspector-egui",
- "bevy_rapier2d",
+ "accesskit",
+ "bevy_app",
+ "bevy_derive",
+ "bevy_ecs",
 ]
 
 [[package]]
 name = "bevy_animation"
-version = "0.9.1"
-source = "git+https://github.com/mvlabat/bevy.git?branch=v0.9.1/muddle-run#2f9bec3b26b7f14c8f3ce1023238c2b77841f56a"
+version = "0.10.1"
+source = "git+https://github.com/mvlabat/bevy.git?branch=v0.10.1/muddle-run#991f2a949e0faaaec30efca1753585b2ffa6dabb"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -785,8 +886,8 @@ dependencies = [
 
 [[package]]
 name = "bevy_app"
-version = "0.9.1"
-source = "git+https://github.com/mvlabat/bevy.git?branch=v0.9.1/muddle-run#2f9bec3b26b7f14c8f3ce1023238c2b77841f56a"
+version = "0.10.1"
+source = "git+https://github.com/mvlabat/bevy.git?branch=v0.10.1/muddle-run#991f2a949e0faaaec30efca1753585b2ffa6dabb"
 dependencies = [
  "bevy_derive",
  "bevy_ecs",
@@ -799,8 +900,8 @@ dependencies = [
 
 [[package]]
 name = "bevy_asset"
-version = "0.9.1"
-source = "git+https://github.com/mvlabat/bevy.git?branch=v0.9.1/muddle-run#2f9bec3b26b7f14c8f3ce1023238c2b77841f56a"
+version = "0.10.1"
+source = "git+https://github.com/mvlabat/bevy.git?branch=v0.10.1/muddle-run#991f2a949e0faaaec30efca1753585b2ffa6dabb"
 dependencies = [
  "anyhow",
  "bevy_app",
@@ -810,11 +911,11 @@ dependencies = [
  "bevy_reflect",
  "bevy_tasks",
  "bevy_utils",
+ "bevy_winit",
  "crossbeam-channel",
  "downcast-rs",
  "fastrand",
  "js-sys",
- "ndk-glue",
  "notify",
  "parking_lot 0.12.1",
  "serde",
@@ -826,23 +927,26 @@ dependencies = [
 
 [[package]]
 name = "bevy_audio"
-version = "0.9.1"
-source = "git+https://github.com/mvlabat/bevy.git?branch=v0.9.1/muddle-run#2f9bec3b26b7f14c8f3ce1023238c2b77841f56a"
+version = "0.10.1"
+source = "git+https://github.com/mvlabat/bevy.git?branch=v0.10.1/muddle-run#991f2a949e0faaaec30efca1753585b2ffa6dabb"
 dependencies = [
  "anyhow",
  "bevy_app",
  "bevy_asset",
  "bevy_ecs",
+ "bevy_math",
  "bevy_reflect",
+ "bevy_transform",
  "bevy_utils",
+ "oboe",
  "parking_lot 0.12.1",
  "rodio",
 ]
 
 [[package]]
 name = "bevy_core"
-version = "0.9.1"
-source = "git+https://github.com/mvlabat/bevy.git?branch=v0.9.1/muddle-run#2f9bec3b26b7f14c8f3ce1023238c2b77841f56a"
+version = "0.10.1"
+source = "git+https://github.com/mvlabat/bevy.git?branch=v0.10.1/muddle-run#991f2a949e0faaaec30efca1753585b2ffa6dabb"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -851,12 +955,13 @@ dependencies = [
  "bevy_tasks",
  "bevy_utils",
  "bytemuck",
+ "serde",
 ]
 
 [[package]]
 name = "bevy_core_pipeline"
-version = "0.9.1"
-source = "git+https://github.com/mvlabat/bevy.git?branch=v0.9.1/muddle-run#2f9bec3b26b7f14c8f3ce1023238c2b77841f56a"
+version = "0.10.1"
+source = "git+https://github.com/mvlabat/bevy.git?branch=v0.10.1/muddle-run#991f2a949e0faaaec30efca1753585b2ffa6dabb"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -874,18 +979,18 @@ dependencies = [
 
 [[package]]
 name = "bevy_derive"
-version = "0.9.1"
-source = "git+https://github.com/mvlabat/bevy.git?branch=v0.9.1/muddle-run#2f9bec3b26b7f14c8f3ce1023238c2b77841f56a"
+version = "0.10.1"
+source = "git+https://github.com/mvlabat/bevy.git?branch=v0.10.1/muddle-run#991f2a949e0faaaec30efca1753585b2ffa6dabb"
 dependencies = [
  "bevy_macro_utils",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "bevy_diagnostic"
-version = "0.9.1"
-source = "git+https://github.com/mvlabat/bevy.git?branch=v0.9.1/muddle-run#2f9bec3b26b7f14c8f3ce1023238c2b77841f56a"
+version = "0.10.1"
+source = "git+https://github.com/mvlabat/bevy.git?branch=v0.10.1/muddle-run#991f2a949e0faaaec30efca1753585b2ffa6dabb"
 dependencies = [
  "bevy_app",
  "bevy_core",
@@ -893,12 +998,12 @@ dependencies = [
  "bevy_log",
  "bevy_time",
  "bevy_utils",
+ "sysinfo",
 ]
 
 [[package]]
 name = "bevy_disturbulence"
 version = "0.1.0"
-source = "git+https://github.com/mvlabat/bevy_disturbulence.git?branch=wip#264823b4934d6534bd6620ad7b2e15ee8ddad69c"
 dependencies = [
  "bevy",
  "bytes",
@@ -915,8 +1020,8 @@ dependencies = [
 
 [[package]]
 name = "bevy_ecs"
-version = "0.9.1"
-source = "git+https://github.com/mvlabat/bevy.git?branch=v0.9.1/muddle-run#2f9bec3b26b7f14c8f3ce1023238c2b77841f56a"
+version = "0.10.1"
+source = "git+https://github.com/mvlabat/bevy.git?branch=v0.10.1/muddle-run#991f2a949e0faaaec30efca1753585b2ffa6dabb"
 dependencies = [
  "async-channel",
  "bevy_ecs_macros",
@@ -927,28 +1032,27 @@ dependencies = [
  "downcast-rs",
  "event-listener",
  "fixedbitset",
- "fxhash",
+ "rustc-hash",
  "serde",
- "smallvec",
  "thread_local",
 ]
 
 [[package]]
 name = "bevy_ecs_macros"
-version = "0.9.1"
-source = "git+https://github.com/mvlabat/bevy.git?branch=v0.9.1/muddle-run#2f9bec3b26b7f14c8f3ce1023238c2b77841f56a"
+version = "0.10.1"
+source = "git+https://github.com/mvlabat/bevy.git?branch=v0.10.1/muddle-run#991f2a949e0faaaec30efca1753585b2ffa6dabb"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "bevy_egui"
-version = "0.18.0"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93fab81b00d664b7fd09c74eadcc8ab4a608649af1fb355647cd43f95f38ec6"
+checksum = "e5e269226c4a8fb659aa3161c19925650ebe2c23021ddf4dd9ed191cf708364f"
 dependencies = [
  "arboard",
  "bevy",
@@ -959,8 +1063,8 @@ dependencies = [
 
 [[package]]
 name = "bevy_encase_derive"
-version = "0.9.1"
-source = "git+https://github.com/mvlabat/bevy.git?branch=v0.9.1/muddle-run#2f9bec3b26b7f14c8f3ce1023238c2b77841f56a"
+version = "0.10.1"
+source = "git+https://github.com/mvlabat/bevy.git?branch=v0.10.1/muddle-run#991f2a949e0faaaec30efca1753585b2ffa6dabb"
 dependencies = [
  "bevy_macro_utils",
  "encase_derive_impl",
@@ -968,8 +1072,8 @@ dependencies = [
 
 [[package]]
 name = "bevy_gilrs"
-version = "0.9.1"
-source = "git+https://github.com/mvlabat/bevy.git?branch=v0.9.1/muddle-run#2f9bec3b26b7f14c8f3ce1023238c2b77841f56a"
+version = "0.10.1"
+source = "git+https://github.com/mvlabat/bevy.git?branch=v0.10.1/muddle-run#991f2a949e0faaaec30efca1753585b2ffa6dabb"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -980,8 +1084,8 @@ dependencies = [
 
 [[package]]
 name = "bevy_gltf"
-version = "0.9.1"
-source = "git+https://github.com/mvlabat/bevy.git?branch=v0.9.1/muddle-run#2f9bec3b26b7f14c8f3ce1023238c2b77841f56a"
+version = "0.10.1"
+source = "git+https://github.com/mvlabat/bevy.git?branch=v0.10.1/muddle-run#991f2a949e0faaaec30efca1753585b2ffa6dabb"
 dependencies = [
  "anyhow",
  "base64 0.13.1",
@@ -1008,8 +1112,8 @@ dependencies = [
 
 [[package]]
 name = "bevy_hierarchy"
-version = "0.9.1"
-source = "git+https://github.com/mvlabat/bevy.git?branch=v0.9.1/muddle-run#2f9bec3b26b7f14c8f3ce1023238c2b77841f56a"
+version = "0.10.1"
+source = "git+https://github.com/mvlabat/bevy.git?branch=v0.10.1/muddle-run#991f2a949e0faaaec30efca1753585b2ffa6dabb"
 dependencies = [
  "bevy_app",
  "bevy_core",
@@ -1022,22 +1126,24 @@ dependencies = [
 
 [[package]]
 name = "bevy_input"
-version = "0.9.1"
-source = "git+https://github.com/mvlabat/bevy.git?branch=v0.9.1/muddle-run#2f9bec3b26b7f14c8f3ce1023238c2b77841f56a"
+version = "0.10.1"
+source = "git+https://github.com/mvlabat/bevy.git?branch=v0.10.1/muddle-run#991f2a949e0faaaec30efca1753585b2ffa6dabb"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
  "bevy_math",
  "bevy_reflect",
  "bevy_utils",
+ "serde",
  "thiserror",
 ]
 
 [[package]]
 name = "bevy_internal"
-version = "0.9.1"
-source = "git+https://github.com/mvlabat/bevy.git?branch=v0.9.1/muddle-run#2f9bec3b26b7f14c8f3ce1023238c2b77841f56a"
+version = "0.10.1"
+source = "git+https://github.com/mvlabat/bevy.git?branch=v0.10.1/muddle-run#991f2a949e0faaaec30efca1753585b2ffa6dabb"
 dependencies = [
+ "bevy_a11y",
  "bevy_animation",
  "bevy_app",
  "bevy_asset",
@@ -1067,13 +1173,12 @@ dependencies = [
  "bevy_utils",
  "bevy_window",
  "bevy_winit",
- "ndk-glue",
 ]
 
 [[package]]
 name = "bevy_log"
-version = "0.9.1"
-source = "git+https://github.com/mvlabat/bevy.git?branch=v0.9.1/muddle-run#2f9bec3b26b7f14c8f3ce1023238c2b77841f56a"
+version = "0.10.1"
+source = "git+https://github.com/mvlabat/bevy.git?branch=v0.10.1/muddle-run#991f2a949e0faaaec30efca1753585b2ffa6dabb"
 dependencies = [
  "android_log-sys",
  "bevy_app",
@@ -1088,18 +1193,18 @@ dependencies = [
 
 [[package]]
 name = "bevy_macro_utils"
-version = "0.9.1"
-source = "git+https://github.com/mvlabat/bevy.git?branch=v0.9.1/muddle-run#2f9bec3b26b7f14c8f3ce1023238c2b77841f56a"
+version = "0.10.1"
+source = "git+https://github.com/mvlabat/bevy.git?branch=v0.10.1/muddle-run#991f2a949e0faaaec30efca1753585b2ffa6dabb"
 dependencies = [
  "quote",
- "syn",
- "toml",
+ "syn 1.0.109",
+ "toml_edit",
 ]
 
 [[package]]
 name = "bevy_math"
-version = "0.9.1"
-source = "git+https://github.com/mvlabat/bevy.git?branch=v0.9.1/muddle-run#2f9bec3b26b7f14c8f3ce1023238c2b77841f56a"
+version = "0.10.1"
+source = "git+https://github.com/mvlabat/bevy.git?branch=v0.10.1/muddle-run#991f2a949e0faaaec30efca1753585b2ffa6dabb"
 dependencies = [
  "glam",
  "serde",
@@ -1107,17 +1212,17 @@ dependencies = [
 
 [[package]]
 name = "bevy_mikktspace"
-version = "0.9.1"
-source = "git+https://github.com/mvlabat/bevy.git?branch=v0.9.1/muddle-run#2f9bec3b26b7f14c8f3ce1023238c2b77841f56a"
+version = "0.10.1"
+source = "git+https://github.com/mvlabat/bevy.git?branch=v0.10.1/muddle-run#991f2a949e0faaaec30efca1753585b2ffa6dabb"
 dependencies = [
  "glam",
 ]
 
 [[package]]
 name = "bevy_mod_picking"
-version = "0.11.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0eb0a57d5c1ea9738b6858bb6206454b2d99265983b36ca82e5a2a0b5c9e7a1"
+checksum = "c7aa3a4ab156dbab0b0f755531e5b92bb6bcef90d1b07b374c7f7c707e6940fc"
 dependencies = [
  "bevy",
  "bevy_mod_raycast",
@@ -1125,17 +1230,17 @@ dependencies = [
 
 [[package]]
 name = "bevy_mod_raycast"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a5813c0224e31350919e5fbf5a2099c3be4c7b8c04e8584ee4dba4e87795a19"
+checksum = "cc98a75743120396c8f3e3b47bfeb7f3d39248c46a625972005e51ca4d110a2a"
 dependencies = [
  "bevy",
 ]
 
 [[package]]
 name = "bevy_pbr"
-version = "0.9.1"
-source = "git+https://github.com/mvlabat/bevy.git?branch=v0.9.1/muddle-run#2f9bec3b26b7f14c8f3ce1023238c2b77841f56a"
+version = "0.10.1"
+source = "git+https://github.com/mvlabat/bevy.git?branch=v0.10.1/muddle-run#991f2a949e0faaaec30efca1753585b2ffa6dabb"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -1155,18 +1260,18 @@ dependencies = [
 
 [[package]]
 name = "bevy_ptr"
-version = "0.9.1"
-source = "git+https://github.com/mvlabat/bevy.git?branch=v0.9.1/muddle-run#2f9bec3b26b7f14c8f3ce1023238c2b77841f56a"
+version = "0.10.1"
+source = "git+https://github.com/mvlabat/bevy.git?branch=v0.10.1/muddle-run#991f2a949e0faaaec30efca1753585b2ffa6dabb"
 
 [[package]]
 name = "bevy_puffin"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e78099dff417406d317066f596e86e19860f699521b6ad12473fbca888ff0a59"
+checksum = "bc8fb1d7fb543cdb74787b70fc7cf033fe7663f1b7fb40daeae1d693b1c8767f"
 dependencies = [
  "bevy",
  "console_error_panic_hook",
- "puffin 0.14.1",
+ "puffin 0.14.3",
  "tracing-error",
  "tracing-log",
  "tracing-subscriber",
@@ -1175,9 +1280,7 @@ dependencies = [
 
 [[package]]
 name = "bevy_rapier2d"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fe53a4fefd2d8bade79f2e5260bd206643bfcc951a3c5f86b3b7a0273eb19e0"
+version = "0.21.0"
 dependencies = [
  "bevy",
  "bitflags",
@@ -1189,8 +1292,8 @@ dependencies = [
 
 [[package]]
 name = "bevy_reflect"
-version = "0.9.1"
-source = "git+https://github.com/mvlabat/bevy.git?branch=v0.9.1/muddle-run#2f9bec3b26b7f14c8f3ce1023238c2b77841f56a"
+version = "0.10.1"
+source = "git+https://github.com/mvlabat/bevy.git?branch=v0.10.1/muddle-run#991f2a949e0faaaec30efca1753585b2ffa6dabb"
 dependencies = [
  "bevy_math",
  "bevy_ptr",
@@ -1208,23 +1311,24 @@ dependencies = [
 
 [[package]]
 name = "bevy_reflect_derive"
-version = "0.9.1"
-source = "git+https://github.com/mvlabat/bevy.git?branch=v0.9.1/muddle-run#2f9bec3b26b7f14c8f3ce1023238c2b77841f56a"
+version = "0.10.1"
+source = "git+https://github.com/mvlabat/bevy.git?branch=v0.10.1/muddle-run#991f2a949e0faaaec30efca1753585b2ffa6dabb"
 dependencies = [
  "bevy_macro_utils",
  "bit-set",
  "proc-macro2",
  "quote",
- "syn",
- "uuid 1.2.2",
+ "syn 1.0.109",
+ "uuid 1.3.2",
 ]
 
 [[package]]
 name = "bevy_render"
-version = "0.9.1"
-source = "git+https://github.com/mvlabat/bevy.git?branch=v0.9.1/muddle-run#2f9bec3b26b7f14c8f3ce1023238c2b77841f56a"
+version = "0.10.1"
+source = "git+https://github.com/mvlabat/bevy.git?branch=v0.10.1/muddle-run#991f2a949e0faaaec30efca1753585b2ffa6dabb"
 dependencies = [
  "anyhow",
+ "async-channel",
  "bevy_app",
  "bevy_asset",
  "bevy_core",
@@ -1237,6 +1341,7 @@ dependencies = [
  "bevy_mikktspace",
  "bevy_reflect",
  "bevy_render_macros",
+ "bevy_tasks",
  "bevy_time",
  "bevy_transform",
  "bevy_utils",
@@ -1246,36 +1351,38 @@ dependencies = [
  "downcast-rs",
  "encase",
  "futures-lite",
- "hex",
  "hexasphere",
- "image 0.24.5",
+ "image",
+ "ktx2",
  "naga",
  "once_cell",
  "parking_lot 0.12.1",
  "profiling",
  "regex",
+ "ruzstd 0.2.4",
  "serde",
  "smallvec",
  "thiserror",
  "thread_local",
  "wgpu",
+ "wgpu-hal",
 ]
 
 [[package]]
 name = "bevy_render_macros"
-version = "0.9.1"
-source = "git+https://github.com/mvlabat/bevy.git?branch=v0.9.1/muddle-run#2f9bec3b26b7f14c8f3ce1023238c2b77841f56a"
+version = "0.10.1"
+source = "git+https://github.com/mvlabat/bevy.git?branch=v0.10.1/muddle-run#991f2a949e0faaaec30efca1753585b2ffa6dabb"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "bevy_scene"
-version = "0.9.1"
-source = "git+https://github.com/mvlabat/bevy.git?branch=v0.9.1/muddle-run#2f9bec3b26b7f14c8f3ce1023238c2b77841f56a"
+version = "0.10.1"
+source = "git+https://github.com/mvlabat/bevy.git?branch=v0.10.1/muddle-run#991f2a949e0faaaec30efca1753585b2ffa6dabb"
 dependencies = [
  "anyhow",
  "bevy_app",
@@ -1290,13 +1397,13 @@ dependencies = [
  "ron",
  "serde",
  "thiserror",
- "uuid 1.2.2",
+ "uuid 1.3.2",
 ]
 
 [[package]]
 name = "bevy_sprite"
-version = "0.9.1"
-source = "git+https://github.com/mvlabat/bevy.git?branch=v0.9.1/muddle-run#2f9bec3b26b7f14c8f3ce1023238c2b77841f56a"
+version = "0.10.1"
+source = "git+https://github.com/mvlabat/bevy.git?branch=v0.10.1/muddle-run#991f2a949e0faaaec30efca1753585b2ffa6dabb"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -1319,13 +1426,13 @@ dependencies = [
 
 [[package]]
 name = "bevy_tasks"
-version = "0.9.1"
-source = "git+https://github.com/mvlabat/bevy.git?branch=v0.9.1/muddle-run#2f9bec3b26b7f14c8f3ce1023238c2b77841f56a"
+version = "0.10.1"
+source = "git+https://github.com/mvlabat/bevy.git?branch=v0.10.1/muddle-run#991f2a949e0faaaec30efca1753585b2ffa6dabb"
 dependencies = [
  "async-channel",
  "async-executor",
  "async-task",
- "concurrent-queue 1.2.4",
+ "concurrent-queue",
  "futures-lite",
  "once_cell",
  "wasm-bindgen-futures",
@@ -1333,8 +1440,8 @@ dependencies = [
 
 [[package]]
 name = "bevy_text"
-version = "0.9.1"
-source = "git+https://github.com/mvlabat/bevy.git?branch=v0.9.1/muddle-run#2f9bec3b26b7f14c8f3ce1023238c2b77841f56a"
+version = "0.10.1"
+source = "git+https://github.com/mvlabat/bevy.git?branch=v0.10.1/muddle-run#991f2a949e0faaaec30efca1753585b2ffa6dabb"
 dependencies = [
  "ab_glyph",
  "anyhow",
@@ -1355,33 +1462,49 @@ dependencies = [
 
 [[package]]
 name = "bevy_time"
-version = "0.9.1"
-source = "git+https://github.com/mvlabat/bevy.git?branch=v0.9.1/muddle-run#2f9bec3b26b7f14c8f3ce1023238c2b77841f56a"
+version = "0.10.1"
+source = "git+https://github.com/mvlabat/bevy.git?branch=v0.10.1/muddle-run#991f2a949e0faaaec30efca1753585b2ffa6dabb"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
  "bevy_reflect",
  "bevy_utils",
  "crossbeam-channel",
+ "serde",
+ "thiserror",
 ]
 
 [[package]]
 name = "bevy_transform"
-version = "0.9.1"
-source = "git+https://github.com/mvlabat/bevy.git?branch=v0.9.1/muddle-run#2f9bec3b26b7f14c8f3ce1023238c2b77841f56a"
+version = "0.10.1"
+source = "git+https://github.com/mvlabat/bevy.git?branch=v0.10.1/muddle-run#991f2a949e0faaaec30efca1753585b2ffa6dabb"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
  "bevy_hierarchy",
  "bevy_math",
  "bevy_reflect",
+ "serde",
+]
+
+[[package]]
+name = "bevy_transform_gizmo"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9eee913740e44abba70f1f8b811310d70ac01276d74d847b118ec82db9766fa4"
+dependencies = [
+ "bevy",
+ "bevy_mod_picking",
+ "bevy_mod_raycast",
+ "naga",
 ]
 
 [[package]]
 name = "bevy_ui"
-version = "0.9.1"
-source = "git+https://github.com/mvlabat/bevy.git?branch=v0.9.1/muddle-run#2f9bec3b26b7f14c8f3ce1023238c2b77841f56a"
+version = "0.10.1"
+source = "git+https://github.com/mvlabat/bevy.git?branch=v0.10.1/muddle-run#991f2a949e0faaaec30efca1753585b2ffa6dabb"
 dependencies = [
+ "bevy_a11y",
  "bevy_app",
  "bevy_asset",
  "bevy_core_pipeline",
@@ -1407,21 +1530,34 @@ dependencies = [
 
 [[package]]
 name = "bevy_utils"
-version = "0.9.1"
-source = "git+https://github.com/mvlabat/bevy.git?branch=v0.9.1/muddle-run#2f9bec3b26b7f14c8f3ce1023238c2b77841f56a"
+version = "0.10.1"
+source = "git+https://github.com/mvlabat/bevy.git?branch=v0.10.1/muddle-run#991f2a949e0faaaec30efca1753585b2ffa6dabb"
 dependencies = [
  "ahash 0.7.6",
- "getrandom 0.2.8",
+ "bevy_utils_proc_macros",
+ "getrandom",
  "hashbrown",
  "instant",
+ "petgraph",
+ "thiserror",
  "tracing",
- "uuid 1.2.2",
+ "uuid 1.3.2",
+]
+
+[[package]]
+name = "bevy_utils_proc_macros"
+version = "0.10.1"
+source = "git+https://github.com/mvlabat/bevy.git?branch=v0.10.1/muddle-run#991f2a949e0faaaec30efca1753585b2ffa6dabb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "bevy_window"
-version = "0.9.1"
-source = "git+https://github.com/mvlabat/bevy.git?branch=v0.9.1/muddle-run#2f9bec3b26b7f14c8f3ce1023238c2b77841f56a"
+version = "0.10.1"
+source = "git+https://github.com/mvlabat/bevy.git?branch=v0.10.1/muddle-run#991f2a949e0faaaec30efca1753585b2ffa6dabb"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -1429,23 +1565,29 @@ dependencies = [
  "bevy_math",
  "bevy_reflect",
  "bevy_utils",
- "raw-window-handle 0.5.0",
+ "raw-window-handle",
+ "serde",
 ]
 
 [[package]]
 name = "bevy_winit"
-version = "0.9.1"
-source = "git+https://github.com/mvlabat/bevy.git?branch=v0.9.1/muddle-run#2f9bec3b26b7f14c8f3ce1023238c2b77841f56a"
+version = "0.10.1"
+source = "git+https://github.com/mvlabat/bevy.git?branch=v0.10.1/muddle-run#991f2a949e0faaaec30efca1753585b2ffa6dabb"
 dependencies = [
+ "accesskit_winit",
  "approx",
+ "bevy_a11y",
  "bevy_app",
+ "bevy_derive",
  "bevy_ecs",
+ "bevy_hierarchy",
  "bevy_input",
  "bevy_math",
  "bevy_utils",
  "bevy_window",
  "crossbeam-channel",
- "raw-window-handle 0.5.0",
+ "once_cell",
+ "raw-window-handle",
  "wasm-bindgen",
  "web-sys",
  "winit",
@@ -1462,9 +1604,9 @@ dependencies = [
 
 [[package]]
 name = "bindgen"
-version = "0.61.0"
+version = "0.64.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a022e58a142a46fea340d68012b9201c094e93ec3d033a944a24f8fd4a4f09a"
+checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4"
 dependencies = [
  "bitflags",
  "cexpr",
@@ -1477,7 +1619,7 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -1504,18 +1646,6 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
-[[package]]
-name = "bitvec"
-version = "0.19.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55f93d0ef3363c364d5976646a38f04cf67cfe1d4c8d160cdea02cab2c116b33"
-dependencies = [
- "funty",
- "radium",
- "tap",
- "wyz",
-]
-
 [[package]]
 name = "block"
 version = "0.1.6"
@@ -1533,9 +1663,9 @@ dependencies = [
 
 [[package]]
 name = "block-buffer"
-version = "0.10.3"
+version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
 dependencies = [
  "generic-array",
 ]
@@ -1556,11 +1686,30 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
 
+[[package]]
+name = "block-sys"
+version = "0.1.0-beta.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fa55741ee90902547802152aaf3f8e5248aab7e21468089560d4c8840561146"
+dependencies = [
+ "objc-sys",
+]
+
+[[package]]
+name = "block2"
+version = "0.2.0-alpha.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42"
+dependencies = [
+ "block-sys",
+ "objc2-encode",
+]
+
 [[package]]
 name = "blocking"
-version = "1.3.0"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c67b173a56acffd6d2326fb7ab938ba0b00a71480e14902b2591c87bc5741e8"
+checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65"
 dependencies = [
  "async-channel",
  "async-lock",
@@ -1568,6 +1717,7 @@ dependencies = [
  "atomic-waker",
  "fastrand",
  "futures-lite",
+ "log",
 ]
 
 [[package]]
@@ -1593,28 +1743,28 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.12.0"
+version = "3.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
+checksum = "3c6ed94e98ecff0c12dd1b04c15ec0d7d9458ca8fe806cea6f12954efe74c63b"
 
 [[package]]
 name = "bytemuck"
-version = "1.13.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c041d3eab048880cb0b86b256447da3f18859a163c3b8d8893f4e6368abe6393"
+checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea"
 dependencies = [
  "bytemuck_derive",
 ]
 
 [[package]]
 name = "bytemuck_derive"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aca418a974d83d40a0c1f0c5cba6ff4bc28d8df099109ca459a2118d40b6322"
+checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.15",
 ]
 
 [[package]]
@@ -1625,30 +1775,24 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
 [[package]]
 name = "bytes"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c"
+checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
 
 [[package]]
 name = "bytestring"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7f83e57d9154148e355404702e2694463241880b939570d7c97c014da7a69a1"
+checksum = "238e4886760d98c4f899360c834fa93e62cf7f721ac3c2da375cbdf4b8679aae"
 dependencies = [
  "bytes",
 ]
 
-[[package]]
-name = "cache-padded"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c"
-
 [[package]]
 name = "cc"
-version = "1.0.78"
+version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d"
+checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
 dependencies = [
  "jobserver",
 ]
@@ -1676,7 +1820,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
 dependencies = [
- "nom 7.1.3",
+ "nom",
 ]
 
 [[package]]
@@ -1693,9 +1837,9 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
 
 [[package]]
 name = "chrono"
-version = "0.4.23"
+version = "0.4.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f"
+checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b"
 dependencies = [
  "iana-time-zone",
  "js-sys",
@@ -1718,9 +1862,9 @@ dependencies = [
 
 [[package]]
 name = "clang-sys"
-version = "1.4.0"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3"
+checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f"
 dependencies = [
  "glob",
  "libc",
@@ -1760,37 +1904,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "cocoa"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a"
-dependencies = [
- "bitflags",
- "block",
- "cocoa-foundation",
- "core-foundation",
- "core-graphics",
- "foreign-types",
- "libc",
- "objc",
-]
-
-[[package]]
-name = "cocoa-foundation"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318"
-dependencies = [
- "bitflags",
- "block",
- "core-foundation",
- "core-graphics-types",
- "foreign-types",
- "libc",
- "objc",
-]
-
 [[package]]
 name = "codespan-reporting"
 version = "0.11.1"
@@ -1807,6 +1920,12 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
+[[package]]
+name = "com-rs"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642"
+
 [[package]]
 name = "combine"
 version = "4.6.6"
@@ -1819,18 +1938,9 @@ dependencies = [
 
 [[package]]
 name = "concurrent-queue"
-version = "1.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c"
-dependencies = [
- "cache-padded",
-]
-
-[[package]]
-name = "concurrent-queue"
-version = "2.1.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e"
+checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c"
 dependencies = [
  "crossbeam-utils",
 ]
@@ -1847,15 +1957,15 @@ dependencies = [
 
 [[package]]
 name = "const-oid"
-version = "0.9.1"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cec318a675afcb6a1ea1d4340e2d377e56e47c266f28043ceccbf4412ddfdd3b"
+checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913"
 
 [[package]]
 name = "const_panic"
-version = "0.2.7"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58baae561b85ca19b3122a9ddd35c8ec40c3bcd14fe89921824eae73f7baffbf"
+checksum = "6051f239ecec86fde3410901ab7860d458d160371533842974fc61f96d15879b"
 
 [[package]]
 name = "convert_case"
@@ -1870,7 +1980,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb"
 dependencies = [
  "percent-encoding",
- "time 0.3.17",
+ "time 0.3.21",
  "version_check",
 ]
 
@@ -1880,15 +1990,21 @@ version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
 dependencies = [
- "core-foundation-sys",
+ "core-foundation-sys 0.8.4",
  "libc",
 ]
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.3"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
+checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
 
 [[package]]
 name = "core-graphics"
@@ -1917,53 +2033,54 @@ dependencies = [
 
 [[package]]
 name = "coreaudio-rs"
-version = "0.10.0"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11894b20ebfe1ff903cbdc52259693389eea03b94918a2def2c30c3bf227ad88"
+checksum = "cb17e2d1795b1996419648915df94bc7103c28f7b48062d7acf4652fc371b2ff"
 dependencies = [
  "bitflags",
+ "core-foundation-sys 0.6.2",
  "coreaudio-sys",
 ]
 
 [[package]]
 name = "coreaudio-sys"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a9444b94b8024feecc29e01a9706c69c1e26bfee480221c90764200cfd778fb"
+checksum = "f034b2258e6c4ade2f73bf87b21047567fb913ee9550837c2316d139b0262b24"
 dependencies = [
  "bindgen",
 ]
 
 [[package]]
 name = "cpal"
-version = "0.14.2"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f342c1b63e185e9953584ff2199726bf53850d96610a310e3aca09e9405a2d0b"
+checksum = "6d959d90e938c5493000514b446987c07aed46c668faaa7d34d6c7a67b1a578c"
 dependencies = [
  "alsa",
- "core-foundation-sys",
+ "core-foundation-sys 0.8.4",
  "coreaudio-rs",
+ "dasp_sample",
  "jni 0.19.0",
  "js-sys",
  "libc",
- "mach",
- "ndk 0.7.0",
+ "mach2",
+ "ndk",
  "ndk-context",
  "oboe",
  "once_cell",
  "parking_lot 0.12.1",
- "stdweb",
- "thiserror",
  "wasm-bindgen",
+ "wasm-bindgen-futures",
  "web-sys",
- "windows 0.37.0",
+ "windows 0.46.0",
 ]
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.5"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320"
+checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58"
 dependencies = [
  "libc",
 ]
@@ -1985,9 +2102,9 @@ dependencies = [
 
 [[package]]
 name = "crc"
-version = "3.0.0"
+version = "3.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53757d12b596c16c78b83458d732a5d1a17ab3f53f2f7412f6fb57cc8a140ab3"
+checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe"
 dependencies = [
  "crc-catalog 2.2.0",
 ]
@@ -2029,9 +2146,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.6"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521"
+checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
 dependencies = [
  "cfg-if",
  "crossbeam-utils",
@@ -2039,9 +2156,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc"
+checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
 dependencies = [
  "cfg-if",
  "crossbeam-epoch",
@@ -2050,14 +2167,14 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.13"
+version = "0.9.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a"
+checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695"
 dependencies = [
  "autocfg",
  "cfg-if",
  "crossbeam-utils",
- "memoffset 0.7.1",
+ "memoffset 0.8.0",
  "scopeguard",
 ]
 
@@ -2073,9 +2190,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.14"
+version = "0.8.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f"
+checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b"
 dependencies = [
  "cfg-if",
 ]
@@ -2087,7 +2204,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef"
 dependencies = [
  "generic-array",
- "rand_core 0.6.4",
+ "rand_core",
  "subtle",
  "zeroize",
 ]
@@ -2121,30 +2238,25 @@ dependencies = [
  "cipher",
 ]
 
-[[package]]
-name = "cty"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35"
-
 [[package]]
 name = "curve25519-dalek"
-version = "3.2.0"
+version = "4.0.0-rc.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61"
+checksum = "03d928d978dbec61a1167414f5ec534f24bea0d7a0d24dd9b6233d3d8223e585"
 dependencies = [
- "byteorder",
- "digest 0.9.0",
- "rand_core 0.5.1",
+ "cfg-if",
+ "fiat-crypto",
+ "packed_simd_2",
+ "platforms",
  "subtle",
  "zeroize",
 ]
 
 [[package]]
 name = "cxx"
-version = "1.0.87"
+version = "1.0.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b61a7545f753a88bcbe0a70de1fcc0221e10bfc752f576754fa91e663db1622e"
+checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93"
 dependencies = [
  "cc",
  "cxxbridge-flags",
@@ -2154,9 +2266,9 @@ dependencies = [
 
 [[package]]
 name = "cxx-build"
-version = "1.0.87"
+version = "1.0.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f464457d494b5ed6905c63b0c4704842aba319084a0a3561cdc1359536b53200"
+checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b"
 dependencies = [
  "cc",
  "codespan-reporting",
@@ -2164,31 +2276,31 @@ dependencies = [
  "proc-macro2",
  "quote",
  "scratch",
- "syn",
+ "syn 2.0.15",
 ]
 
 [[package]]
 name = "cxxbridge-flags"
-version = "1.0.87"
+version = "1.0.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43c7119ce3a3701ed81aca8410b9acf6fc399d2629d057b87e2efa4e63a3aaea"
+checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb"
 
 [[package]]
 name = "cxxbridge-macro"
-version = "1.0.87"
+version = "1.0.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65e07508b90551e610910fa648a1878991d367064997a596135b86df30daf07e"
+checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.15",
 ]
 
 [[package]]
 name = "d3d12"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "827914e1f53b1e0e025ecd3d967a7836b7bcb54520f90e21ef8df7b4d88a2759"
+checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da"
 dependencies = [
  "bitflags",
  "libloading",
@@ -2217,12 +2329,12 @@ dependencies = [
 
 [[package]]
 name = "darling"
-version = "0.14.2"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0dd3cd20dc6b5a876612a6e5accfe7f3dd883db6d07acfbf14c128f61550dfa"
+checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850"
 dependencies = [
- "darling_core 0.14.2",
- "darling_macro 0.14.2",
+ "darling_core 0.14.4",
+ "darling_macro 0.14.4",
 ]
 
 [[package]]
@@ -2236,7 +2348,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -2250,21 +2362,21 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "darling_core"
-version = "0.14.2"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a784d2ccaf7c98501746bf0be29b2022ba41fd62a2e622af997a03e9f972859f"
+checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0"
 dependencies = [
  "fnv",
  "ident_case",
  "proc-macro2",
  "quote",
  "strsim",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -2275,7 +2387,7 @@ checksum = "29b5acf0dea37a7f66f7b25d2c5e93fd46f8f6968b1a5d7a3e02e97768afc95a"
 dependencies = [
  "darling_core 0.12.4",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -2286,20 +2398,26 @@ checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
 dependencies = [
  "darling_core 0.13.4",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "darling_macro"
-version = "0.14.2"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e"
+checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e"
 dependencies = [
- "darling_core 0.14.2",
+ "darling_core 0.14.4",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
+[[package]]
+name = "dasp_sample"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f"
+
 [[package]]
 name = "data-encoding"
 version = "2.3.3"
@@ -2313,17 +2431,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d"
 dependencies = [
  "serde",
- "uuid 1.2.2",
-]
-
-[[package]]
-name = "deflate"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174"
-dependencies = [
- "adler32",
- "byteorder",
+ "uuid 1.3.2",
 ]
 
 [[package]]
@@ -2336,53 +2444,18 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "der-oid-macro"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4cccf60bb98c0fca115a581f894aed0e43fa55bf289fdac5599bec440bb4fd6"
-dependencies = [
- "nom 6.1.2",
- "num-bigint",
- "num-traits",
- "syn",
-]
-
-[[package]]
-name = "der-oid-macro"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c73af209b6a5dc8ca7cbaba720732304792cddc933cfea3d74509c2b1ef2f436"
-dependencies = [
- "num-bigint",
- "num-traits",
- "syn",
-]
-
 [[package]]
 name = "der-parser"
-version = "5.1.2"
+version = "8.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d7ededb7525bb4114bc209685ce7894edc2965f4914312a1ea578a645a237f0"
+checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e"
 dependencies = [
- "der-oid-macro 0.4.0",
- "nom 6.1.2",
+ "asn1-rs",
+ "displaydoc",
+ "nom",
  "num-bigint",
  "num-traits",
- "rusticata-macros 3.2.0",
-]
-
-[[package]]
-name = "der-parser"
-version = "6.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cddf120f700b411b2b02ebeb7f04dc0b7c8835909a6c2f52bf72ed0dd3433b2"
-dependencies = [
- "der-oid-macro 0.5.0",
- "nom 7.1.3",
- "num-bigint",
- "num-traits",
- "rusticata-macros 4.1.0",
+ "rusticata-macros",
 ]
 
 [[package]]
@@ -2403,7 +2476,7 @@ dependencies = [
  "darling 0.12.4",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -2413,7 +2486,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "58a94ace95092c5acb1e97a7e846b310cfbd499652f72297da7493f618a98d73"
 dependencies = [
  "derive_builder_core",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -2425,8 +2498,8 @@ dependencies = [
  "convert_case",
  "proc-macro2",
  "quote",
- "rustc_version 0.4.0",
- "syn",
+ "rustc_version",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -2444,7 +2517,7 @@ version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
 dependencies = [
- "block-buffer 0.10.3",
+ "block-buffer 0.10.4",
  "const-oid",
  "crypto-common",
  "subtle",
@@ -2500,18 +2573,23 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "discard"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0"
-
 [[package]]
 name = "dispatch"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
 
+[[package]]
+name = "displaydoc"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.15",
+]
+
 [[package]]
 name = "docker_dummy"
 version = "0.1.0"
@@ -2523,9 +2601,9 @@ source = "git+https://github.com/mvlabat/dotenv.git#bb021fe8b984b56366244a7cb12e
 
 [[package]]
 name = "dotenvy"
-version = "0.15.6"
+version = "0.15.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03d8c417d7a8cb362e0c37e5d815f5eb7c37f79ff93707329d5a194e42e54ca0"
+checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
 
 [[package]]
 name = "downcast-rs"
@@ -2535,9 +2613,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
 
 [[package]]
 name = "dyn-clone"
-version = "1.0.10"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9b0705efd4599c15a38151f4721f7bc388306f61084d3bfd50bd07fbca5cb60"
+checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30"
 
 [[package]]
 name = "ecdsa"
@@ -2553,29 +2631,41 @@ dependencies = [
 
 [[package]]
 name = "ecolor"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b601108bca3af7650440ace4ca55b2daf52c36f2635be3587d77b16efd8d0691"
+checksum = "1f99fe3cac305af9d6d92971af60d0f7ea4d783201ef1673571567b6699964d9"
 dependencies = [
  "bytemuck",
 ]
 
 [[package]]
 name = "egui"
-version = "0.20.1"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65a5e883a316e53866977450eecfbcac9c48109c2ab3394af29feb83fcde4ea9"
+checksum = "6412a21e0bde7c0918f7fb44bbbb86b5e1f88e63c026a4e747cc7af02f76dfbe"
 dependencies = [
- "ahash 0.8.2",
+ "ahash 0.8.3",
  "epaint",
  "nohash-hasher",
 ]
 
+[[package]]
+name = "egui_logger"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74b27c6133cf52de7403d62dae1516b21a876df30f4ff59f7c1f7025f1fef1f0"
+dependencies = [
+ "egui",
+ "log",
+ "once_cell",
+ "regex",
+]
+
 [[package]]
 name = "either"
-version = "1.8.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
+checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
 dependencies = [
  "serde",
 ]
@@ -2595,7 +2685,7 @@ dependencies = [
  "group",
  "hkdf",
  "pkcs8",
- "rand_core 0.6.4",
+ "rand_core",
  "sec1",
  "subtle",
  "zeroize",
@@ -2603,18 +2693,18 @@ dependencies = [
 
 [[package]]
 name = "emath"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5277249c8c3430e7127e4f2c40a77485e7baf11ae132ce9b3253a8ed710df0a0"
+checksum = "b8ecd80612937e0267909d5351770fe150004e24dab93954f69ca62eecd3f77e"
 dependencies = [
  "bytemuck",
 ]
 
 [[package]]
 name = "encase"
-version = "0.4.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48ec50086547d597b5c871a78399ec04a14828a6a5c445a61ed4687c540edec6"
+checksum = "e6591f13a63571c4821802eb5b10fd1155b1290bce87086440003841c8c3909b"
 dependencies = [
  "const_panic",
  "encase_derive",
@@ -2624,29 +2714,29 @@ dependencies = [
 
 [[package]]
 name = "encase_derive"
-version = "0.4.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dda93e9714c7683c474f49a461a2ae329471d2bda43c4302d41c6d8339579e92"
+checksum = "4f1da6deed1f8b6f5909616ffa695f63a5de54d6a0f084fa715c70c8ed3abac9"
 dependencies = [
  "encase_derive_impl",
 ]
 
 [[package]]
 name = "encase_derive_impl"
-version = "0.4.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec27b639e942eb0297513b81cc6d87c50f6c77dc8c37af00a39ed5db3b9657ee"
+checksum = "ae489d58959f3c4cdd1250866a05acfb341469affe4fced71aff3ba228be1693"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.31"
+version = "0.8.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b"
+checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394"
 dependencies = [
  "cfg-if",
 ]
@@ -2666,12 +2756,12 @@ dependencies = [
 
 [[package]]
 name = "epaint"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de14b65fe5e423e0058f77a8beb2c863b056d0566d6c4ce0d097aa5814cb705a"
+checksum = "12e78b5c58a1f7f621f9d546add2adce20636422c9b251e29f749e8a2f713c95"
 dependencies = [
  "ab_glyph",
- "ahash 0.8.2",
+ "ahash 0.8.3",
  "atomic_refcell",
  "bytemuck",
  "ecolor",
@@ -2682,22 +2772,22 @@ dependencies = [
 
 [[package]]
 name = "erased-serde"
-version = "0.3.24"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4ca605381c017ec7a5fef5e548f1cfaa419ed0f6df6367339300db74c92aa7d"
+checksum = "4f2b0c2380453a92ea8b6c8e5f64ecaafccddde8ceab55ff7a8ac1029f894569"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "errno"
-version = "0.2.8"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
+checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
 dependencies = [
  "errno-dragonfly",
  "libc",
- "winapi",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -2722,9 +2812,9 @@ dependencies = [
 
 [[package]]
 name = "euclid"
-version = "0.22.7"
+version = "0.22.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b52c2ef4a78da0ba68fbe1fd920627411096d2ac478f7f4c9f3a54ba6705bade"
+checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787"
 dependencies = [
  "num-traits",
 ]
@@ -2737,33 +2827,60 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
 [[package]]
 name = "fastrand"
-version = "1.8.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499"
+checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
 dependencies = [
  "instant",
 ]
 
+[[package]]
+name = "fdeflate"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10"
+dependencies = [
+ "simd-adler32",
+]
+
 [[package]]
 name = "ff"
 version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160"
 dependencies = [
- "rand_core 0.6.4",
+ "rand_core",
  "subtle",
 ]
 
 [[package]]
-name = "filetime"
-version = "0.2.19"
+name = "fiat-crypto"
+version = "0.1.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77"
+
+[[package]]
+name = "filetime"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall 0.2.16",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "findshlibs"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9"
+checksum = "40b9e59cd0f7e0806cca4be089683ecb6434e602038df21fe6bf6711b2f07f64"
 dependencies = [
- "cfg-if",
+ "cc",
+ "lazy_static",
  "libc",
- "redox_syscall",
- "windows-sys 0.42.0",
+ "winapi",
 ]
 
 [[package]]
@@ -2774,12 +2891,12 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flate2"
-version = "1.0.25"
+version = "1.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
+checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743"
 dependencies = [
  "crc32fast",
- "miniz_oxide 0.6.2",
+ "miniz_oxide 0.7.1",
 ]
 
 [[package]]
@@ -2821,17 +2938,11 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "funty"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7"
-
 [[package]]
 name = "futures"
-version = "0.3.25"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0"
+checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2844,9 +2955,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.25"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed"
+checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -2854,15 +2965,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.25"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac"
+checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.25"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2"
+checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -2882,15 +2993,15 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.25"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb"
+checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
 
 [[package]]
 name = "futures-lite"
-version = "1.12.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48"
+checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
 dependencies = [
  "fastrand",
  "futures-core",
@@ -2903,32 +3014,32 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.25"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d"
+checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.15",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.25"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9"
+checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
 
 [[package]]
 name = "futures-task"
-version = "0.3.25"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea"
+checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
 
 [[package]]
 name = "futures-util"
-version = "0.3.25"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6"
+checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2953,9 +3064,9 @@ dependencies = [
 
 [[package]]
 name = "generic-array"
-version = "0.14.6"
+version = "0.14.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
 dependencies = [
  "typenum",
  "version_check",
@@ -2973,20 +3084,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.8"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
+checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -3007,22 +3107,22 @@ dependencies = [
 
 [[package]]
 name = "gilrs"
-version = "0.10.1"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d0342acdc7b591d171212e17c9350ca02383b86d5f9af33c6e3598e03a6c57e"
+checksum = "62fd19844d0eb919aca41d3e4ea0e0b6bf60e1e827558b101c269015b8f5f27a"
 dependencies = [
  "fnv",
  "gilrs-core",
  "log",
- "uuid 1.2.2",
+ "uuid 1.3.2",
  "vec_map",
 ]
 
 [[package]]
 name = "gilrs-core"
-version = "0.5.2"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6789d356476c3280a4e15365d23f62b4b4f1bcdac81fdd552f65807bce4666dd"
+checksum = "fd745b0cb1a207756e8fabacf5623066ad6aa543ea0be4bab34e897e6bbe24f9"
 dependencies = [
  "core-foundation",
  "io-kit-sys",
@@ -3030,25 +3130,25 @@ dependencies = [
  "libc",
  "libudev-sys",
  "log",
- "nix 0.25.1",
- "uuid 1.2.2",
+ "nix 0.26.2",
+ "uuid 1.3.2",
  "vec_map",
  "wasm-bindgen",
  "web-sys",
- "windows 0.43.0",
+ "windows 0.48.0",
 ]
 
 [[package]]
 name = "gimli"
-version = "0.27.1"
+version = "0.27.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "221996f774192f0f718773def8201c4ae31f02616a54ccfc2d358bb0e5cefdec"
+checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4"
 
 [[package]]
 name = "glam"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12f597d56c1bd55a811a1be189459e8fad2bbc272616375602443bdfb37fa774"
+checksum = "8e4afd9ad95555081e109fe1d21f2a30c691b5f0919c67dfa690a2e1eb6bd51c"
 dependencies = [
  "bytemuck",
  "serde",
@@ -3062,9 +3162,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
 [[package]]
 name = "glow"
-version = "0.11.2"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8bd5877156a19b8ac83a29b2306fe20537429d318f3ff0a1a2119f8d9c61919"
+checksum = "4e007a07a24de5ecae94160f141029e9a347282cfe25d1d58d85d845cf3130f1"
 dependencies = [
  "js-sys",
  "slotmap",
@@ -3074,32 +3174,33 @@ dependencies = [
 
 [[package]]
 name = "gltf"
-version = "1.0.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00e0a0eace786193fc83644907097285396360e9e82e30f81a21e9b1ba836a3e"
+checksum = "1fd7703af6975def3b32573c60aaa5ebfebfab5d879da1e1315d87155ba57bcd"
 dependencies = [
  "byteorder",
  "gltf-json",
  "lazy_static",
+ "urlencoding",
 ]
 
 [[package]]
 name = "gltf-derive"
-version = "1.0.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdd53d6e284bb2bf02a6926e4cc4984978c1990914d6cd9deae4e31cf37cd113"
+checksum = "67b33dbe598480111e3b2e5a1e9a7e52ad5df0f836e04b8c80fc96f52a9c9f2e"
 dependencies = [
  "inflections",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "gltf-json"
-version = "1.0.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9949836a9ec5e7f83f76fb9bbcbc77f254a577ebbdb0820867bc11979ef97cad"
+checksum = "5511a759d99beeeef064bd6f81e207c77e3a3431c7499d7590929e35de371f31"
 dependencies = [
  "gltf-derive",
  "serde",
@@ -3120,9 +3221,9 @@ dependencies = [
 
 [[package]]
 name = "gpu-alloc"
-version = "0.5.3"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fc59e5f710e310e76e6707f86c561dd646f69a8876da9131703b2f717de818d"
+checksum = "22beaafc29b38204457ea030f6fb7a84c9e4dd1b86e311ba0542533453d87f62"
 dependencies = [
  "bitflags",
  "gpu-alloc-types",
@@ -3137,6 +3238,19 @@ dependencies = [
  "bitflags",
 ]
 
+[[package]]
+name = "gpu-allocator"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce95f9e2e11c2c6fadfce42b5af60005db06576f231f5c92550fdded43c423e8"
+dependencies = [
+ "backtrace",
+ "log",
+ "thiserror",
+ "winapi",
+ "windows 0.44.0",
+]
+
 [[package]]
 name = "gpu-descriptor"
 version = "0.2.3"
@@ -3164,7 +3278,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7"
 dependencies = [
  "ff",
- "rand_core 0.6.4",
+ "rand_core",
  "subtle",
 ]
 
@@ -3180,9 +3294,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.15"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4"
+checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21"
 dependencies = [
  "bytes",
  "fnv",
@@ -3203,26 +3317,6 @@ version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
 
-[[package]]
-name = "hash32"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67"
-dependencies = [
- "byteorder",
-]
-
-[[package]]
-name = "hash32-derive"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59d2aba832b60be25c1b169146b27c64115470981b128ed84c8db18c1b03c6ff"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
@@ -3242,6 +3336,21 @@ dependencies = [
  "hashbrown",
 ]
 
+[[package]]
+name = "hassle-rs"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90601c6189668c7345fc53842cb3f3a3d872203d523be1b3cb44a36a3e62fb85"
+dependencies = [
+ "bitflags",
+ "com-rs",
+ "libc",
+ "libloading",
+ "thiserror",
+ "widestring",
+ "winapi",
+]
+
 [[package]]
 name = "headers"
 version = "0.3.8"
@@ -3255,7 +3364,7 @@ dependencies = [
  "http",
  "httpdate",
  "mime",
- "sha1 0.10.5",
+ "sha1",
 ]
 
 [[package]]
@@ -3269,9 +3378,9 @@ dependencies = [
 
 [[package]]
 name = "heck"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 dependencies = [
  "unicode-segmentation",
 ]
@@ -3285,6 +3394,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "hermit-abi"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
+
 [[package]]
 name = "hex"
 version = "0.4.3"
@@ -3293,9 +3408,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hexasphere"
-version = "8.0.0"
+version = "8.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "619ce654558681d7d0a7809e1b20249c7032ff13ee6baa7bb7ff64f7f28a906a"
+checksum = "bd41d443f978bfa380a6dad58b62a08c43bcb960631f13e9d015b911eaf73588"
 dependencies = [
  "glam",
  "once_cell",
@@ -3348,9 +3463,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "0.2.8"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
+checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
 dependencies = [
  "bytes",
  "fnv",
@@ -3404,9 +3519,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "0.14.23"
+version = "0.14.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c"
+checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -3428,9 +3543,9 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "1.0.0-rc.2"
+version = "1.0.0-rc.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "289cfdbf735dea222b0ec6a10224b4d9552c7662bb451d4589cbfda3d407d1a3"
+checksum = "7b75264b2003a3913f118d35c586e535293b3e22e41f074930762929d071e092"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -3455,7 +3570,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6ee5d7a8f718585d1c3c61dfde28ef5b0bb14734b4db13f5ada856cdc6c612b"
 dependencies = [
  "http",
- "hyper 0.14.23",
+ "hyper 0.14.26",
  "linked_hash_set",
  "once_cell",
  "openssl",
@@ -3473,7 +3588,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c"
 dependencies = [
  "http",
- "hyper 0.14.23",
+ "hyper 0.14.26",
  "rustls 0.20.8",
  "tokio",
  "tokio-rustls",
@@ -3485,7 +3600,7 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
 dependencies = [
- "hyper 0.14.23",
+ "hyper 0.14.26",
  "pin-project-lite",
  "tokio",
  "tokio-io-timeout",
@@ -3498,7 +3613,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
 dependencies = [
  "bytes",
- "hyper 0.14.23",
+ "hyper 0.14.26",
  "native-tls",
  "tokio",
  "tokio-native-tls",
@@ -3506,16 +3621,16 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.53"
+version = "0.1.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765"
+checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c"
 dependencies = [
  "android_system_properties",
- "core-foundation-sys",
+ "core-foundation-sys 0.8.4",
  "iana-time-zone-haiku",
  "js-sys",
  "wasm-bindgen",
- "winapi",
+ "windows 0.48.0",
 ]
 
 [[package]]
@@ -3546,40 +3661,24 @@ dependencies = [
 
 [[package]]
 name = "image"
-version = "0.23.14"
+version = "0.24.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1"
+checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a"
 dependencies = [
  "bytemuck",
  "byteorder",
  "color_quant",
- "num-iter",
- "num-rational 0.3.2",
+ "num-rational",
  "num-traits",
- "png 0.16.8",
+ "png",
  "tiff",
 ]
 
-[[package]]
-name = "image"
-version = "0.24.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69b7ea949b537b0fd0af141fff8c77690f2ce96f4f41f042ccb6c69c6c965945"
-dependencies = [
- "bytemuck",
- "byteorder",
- "color_quant",
- "num-rational 0.4.1",
- "num-traits",
- "png 0.17.7",
- "scoped_threadpool",
-]
-
 [[package]]
 name = "indexmap"
-version = "1.9.2"
+version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
 dependencies = [
  "autocfg",
  "hashbrown",
@@ -3626,40 +3725,41 @@ dependencies = [
 
 [[package]]
 name = "io-kit-sys"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7789f7f3c9686f96164f5109d69152de759e76e284f736bd57661c6df5091919"
+checksum = "9b2d4429acc1deff0fbdece0325b4997bdb02b2c245ab7023fd5deca0f6348de"
 dependencies = [
- "core-foundation-sys",
- "mach",
+ "core-foundation-sys 0.8.4",
+ "mach2",
 ]
 
 [[package]]
 name = "io-lifetimes"
-version = "1.0.4"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e"
+checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220"
 dependencies = [
+ "hermit-abi 0.3.1",
  "libc",
- "windows-sys 0.42.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "ipnet"
-version = "2.7.1"
+version = "2.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146"
+checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f"
 
 [[package]]
 name = "is-terminal"
-version = "0.4.2"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189"
+checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f"
 dependencies = [
- "hermit-abi",
+ "hermit-abi 0.3.1",
  "io-lifetimes",
  "rustix",
- "windows-sys 0.42.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -3673,27 +3773,29 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.5"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
+checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
 
 [[package]]
-name = "iyes_loopless"
-version = "0.9.1"
+name = "jni"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c47fd2cbdb1d7f295c25e6bfccfd78a84b6eef3055bc9f01b34ae861721b01ee"
+checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec"
 dependencies = [
- "bevy_app",
- "bevy_ecs",
- "bevy_time",
- "bevy_utils",
+ "cesu8",
+ "combine",
+ "jni-sys",
+ "log",
+ "thiserror",
+ "walkdir",
 ]
 
 [[package]]
 name = "jni"
-version = "0.19.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec"
+checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c"
 dependencies = [
  "cesu8",
  "combine",
@@ -3705,16 +3807,18 @@ dependencies = [
 
 [[package]]
 name = "jni"
-version = "0.20.0"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c"
+checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97"
 dependencies = [
  "cesu8",
+ "cfg-if",
  "combine",
  "jni-sys",
  "log",
  "thiserror",
  "walkdir",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
@@ -3725,24 +3829,24 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
 
 [[package]]
 name = "jobserver"
-version = "0.1.25"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b"
+checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "jpeg-decoder"
-version = "0.1.22"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2"
+checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e"
 
 [[package]]
 name = "js-sys"
-version = "0.3.60"
+version = "0.3.62"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47"
+checksum = "68c16e1bfd491478ab155fd8b4896b86f9ede344949b641e61501e07c2b8b4d5"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -3768,7 +3872,7 @@ dependencies = [
  "base64ct",
  "chrono",
  "hmac 0.12.1",
- "rand_core 0.6.4",
+ "rand_core",
  "rsa",
  "serde",
  "serde_cbor",
@@ -3846,6 +3950,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "ktx2"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87d65e08a9ec02e409d27a0139eaa6b9756b4d81fe7cde71f6941a83730ce838"
+dependencies = [
+ "bitflags",
+]
+
 [[package]]
 name = "kube"
 version = "0.77.0"
@@ -3872,7 +3985,7 @@ dependencies = [
  "futures",
  "http",
  "http-body 0.4.5",
- "hyper 0.14.23",
+ "hyper 0.14.26",
  "hyper-openssl",
  "hyper-timeout",
  "jsonpath_lib",
@@ -3916,11 +4029,11 @@ version = "0.77.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "93ef49d30d03c5de8041e2ab5dc421d671d6225ffd53975571d4a5b18d5e50fb"
 dependencies = [
- "darling 0.14.2",
+ "darling 0.14.4",
  "proc-macro2",
  "quote",
  "serde_json",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -3955,24 +4068,11 @@ dependencies = [
  "tinyvec",
 ]
 
-[[package]]
-name = "lexical-core"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe"
-dependencies = [
- "arrayvec 0.5.2",
- "bitflags",
- "cfg-if",
- "ryu",
- "static_assertions",
-]
-
 [[package]]
 name = "libc"
-version = "0.2.139"
+version = "0.2.144"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
+checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1"
 
 [[package]]
 name = "libloading"
@@ -3984,6 +4084,12 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "libm"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a"
+
 [[package]]
 name = "libm"
 version = "0.2.6"
@@ -4026,9 +4132,9 @@ dependencies = [
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.1.4"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
+checksum = "ece97ea872ece730aed82664c424eb4c8291e1ff2480247ccf7409044bc6479f"
 
 [[package]]
 name = "local-channel"
@@ -4044,14 +4150,14 @@ dependencies = [
 
 [[package]]
 name = "local-ip-address"
-version = "0.5.1"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "faa9d02443a1741e9f51dafdfcbffb3863b2a89c457d762b40337d6c5153ef81"
+checksum = "2815836665de176ba66deaa449ada98fdf208d84730d1a84a22cbeed6151a6fa"
 dependencies = [
  "libc",
  "neli",
  "thiserror",
- "windows-sys 0.42.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -4080,10 +4186,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "mach"
-version = "0.3.2"
+name = "mach2"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa"
+checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8"
 dependencies = [
  "libc",
 ]
@@ -4120,10 +4226,11 @@ checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40"
 
 [[package]]
 name = "matrixmultiply"
-version = "0.3.2"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "add85d4dd35074e6fedc608f8c8f513a3548619a9024b751949ef0e8e45a4d84"
+checksum = "090126dc04f95dc0d1c1c91f61bdd474b3930ca064c1edc8a849da2c6cbe1e77"
 dependencies = [
+ "autocfg",
  "rawpointer",
 ]
 
@@ -4153,9 +4260,9 @@ dependencies = [
 
 [[package]]
 name = "memoffset"
-version = "0.7.1"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
+checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1"
 dependencies = [
  "autocfg",
 ]
@@ -4176,9 +4283,9 @@ dependencies = [
 
 [[package]]
 name = "mime"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
 [[package]]
 name = "minimal-lexical"
@@ -4188,42 +4295,33 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435"
-dependencies = [
- "adler32",
-]
-
-[[package]]
-name = "miniz_oxide"
-version = "0.4.4"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
+checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
 dependencies = [
  "adler",
- "autocfg",
 ]
 
 [[package]]
 name = "miniz_oxide"
-version = "0.6.2"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
 dependencies = [
  "adler",
+ "simd-adler32",
 ]
 
 [[package]]
 name = "mio"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de"
+checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9"
 dependencies = [
  "libc",
  "log",
  "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.42.0",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
@@ -4241,23 +4339,23 @@ dependencies = [
  "base64 0.20.0",
  "bevy",
  "bevy-inspector-egui",
- "bevy-inspector-egui-rapier",
  "bevy_disturbulence",
  "bevy_egui",
  "bevy_mod_picking",
+ "bevy_puffin",
  "bevy_rapier2d",
  "chrono",
  "clipboard",
  "directories",
+ "egui_logger",
  "futures",
- "hyper 1.0.0-rc.2",
- "iyes_loopless",
+ "hyper 1.0.0-rc.3",
  "js-sys",
  "jwt-compact",
  "mr_messages_lib",
  "mr_shared_lib",
  "mr_utils_lib",
- "puffin 0.14.1",
+ "puffin 0.14.3",
  "puffin_egui",
  "rand",
  "rapier2d",
@@ -4269,6 +4367,9 @@ dependencies = [
  "sha2 0.10.6",
  "tokio",
  "tokio-tungstenite",
+ "tracing-error",
+ "tracing-log",
+ "tracing-subscriber",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
@@ -4298,7 +4399,7 @@ dependencies = [
  "anyhow",
  "env_logger",
  "futures",
- "hyper 0.14.23",
+ "hyper 0.14.26",
  "k8s-openapi",
  "kube",
  "log",
@@ -4313,7 +4414,7 @@ dependencies = [
  "serde_json",
  "tokio",
  "tokio-tungstenite",
- "uuid 1.2.2",
+ "uuid 1.3.2",
 ]
 
 [[package]]
@@ -4328,7 +4429,7 @@ dependencies = [
  "serde_json",
  "serde_urlencoded",
  "serde_with",
- "uuid 1.2.2",
+ "uuid 1.3.2",
 ]
 
 [[package]]
@@ -4376,7 +4477,6 @@ dependencies = [
  "bevy",
  "bevy_disturbulence",
  "bevy_rapier2d",
- "iyes_loopless",
  "jwt-compact",
  "k8s-openapi",
  "kube",
@@ -4392,7 +4492,7 @@ dependencies = [
  "serde",
  "serde_json",
  "tokio",
- "uuid 1.2.2",
+ "uuid 1.3.2",
 ]
 
 [[package]]
@@ -4407,11 +4507,10 @@ dependencies = [
  "chrono",
  "crossbeam-channel",
  "futures-lite",
- "iyes_loopless",
  "konst",
  "names",
  "num",
- "puffin 0.13.3",
+ "puffin 0.14.3",
  "rand",
  "rapier2d",
  "serde",
@@ -4447,16 +4546,16 @@ dependencies = [
  "mr_build_dotenv",
  "mr_client_lib",
  "mr_utils_lib",
- "uuid 1.2.2",
+ "uuid 1.3.2",
  "wasm-bindgen",
  "web-sys",
 ]
 
 [[package]]
 name = "naga"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "262d2840e72dbe250e8cf2f522d080988dfca624c4112c096238a4845f591707"
+checksum = "5eafe22a23b797c9bc227c6c896419b26b5bb88fa903417a3adaed08778850d5"
 dependencies = [
  "bit-set",
  "bitflags",
@@ -4476,8 +4575,9 @@ dependencies = [
 
 [[package]]
 name = "naia-client-socket"
-version = "0.13.1"
-source = "git+https://github.com/mvlabat/naia.git?branch=muddle-run#1a654ac6850facd781ac53a1168db4ed815eaa0a"
+version = "0.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23af121227b4cdeb29f1aa3b326dee280b7e76c457678ff6234a6f15f76c7ae9"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -4494,8 +4594,9 @@ dependencies = [
 
 [[package]]
 name = "naia-server-socket"
-version = "0.13.0"
-source = "git+https://github.com/mvlabat/naia.git?branch=muddle-run#1a654ac6850facd781ac53a1168db4ed815eaa0a"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f169830be8915c1baac5ca2579a27d654809ba195811a07c528338f2b2e1b5a"
 dependencies = [
  "async-dup",
  "futures-channel",
@@ -4511,8 +4612,9 @@ dependencies = [
 
 [[package]]
 name = "naia-socket-shared"
-version = "0.10.1"
-source = "git+https://github.com/mvlabat/naia.git?branch=muddle-run#1a654ac6850facd781ac53a1168db4ed815eaa0a"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ba45e4f2b3d5aa7811e906811f298d234e02f9a2918edee4885b4b9b4030f3c"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -4524,16 +4626,16 @@ dependencies = [
 
 [[package]]
 name = "nalgebra"
-version = "0.31.4"
+version = "0.32.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20bd243ab3dbb395b39ee730402d2e5405e448c75133ec49cc977762c4cba3d1"
+checksum = "d68d47bba83f9e2006d117a9a33af1524e655516b8919caac694427a6fb1e511"
 dependencies = [
  "approx",
  "glam",
  "matrixmultiply",
  "nalgebra-macros",
  "num-complex",
- "num-rational 0.4.1",
+ "num-rational",
  "num-traits",
  "serde",
  "simba",
@@ -4542,13 +4644,13 @@ dependencies = [
 
 [[package]]
 name = "nalgebra-macros"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01fcc0b8149b4632adc89ac3b7b31a12fb6099a0317a4eb2ebff574ef7de7218"
+checksum = "d232c68884c0c99810a5a4d333ef7e47689cfd0edc85efc9e54e1e6bf5212766"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -4582,80 +4684,28 @@ dependencies = [
 name = "natord"
 version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "308d96db8debc727c3fd9744aac51751243420e46edf401010908da7f8d5e57c"
-
-[[package]]
-name = "ndk"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4"
-dependencies = [
- "bitflags",
- "jni-sys",
- "ndk-sys 0.3.0",
- "num_enum",
- "thiserror",
-]
-
-[[package]]
-name = "ndk"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0"
-dependencies = [
- "bitflags",
- "jni-sys",
- "ndk-sys 0.4.1+23.1.7779620",
- "num_enum",
- "raw-window-handle 0.5.0",
- "thiserror",
-]
-
-[[package]]
-name = "ndk-context"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
-
-[[package]]
-name = "ndk-glue"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0434fabdd2c15e0aab768ca31d5b7b333717f03cf02037d5a0a3ff3c278ed67f"
-dependencies = [
- "android_logger",
- "libc",
- "log",
- "ndk 0.7.0",
- "ndk-context",
- "ndk-macro",
- "ndk-sys 0.4.1+23.1.7779620",
- "once_cell",
- "parking_lot 0.12.1",
-]
-
-[[package]]
-name = "ndk-macro"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c"
-dependencies = [
- "darling 0.13.4",
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
-]
+checksum = "308d96db8debc727c3fd9744aac51751243420e46edf401010908da7f8d5e57c"
 
 [[package]]
-name = "ndk-sys"
-version = "0.3.0"
+name = "ndk"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97"
+checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0"
 dependencies = [
+ "bitflags",
  "jni-sys",
+ "ndk-sys",
+ "num_enum",
+ "raw-window-handle",
+ "thiserror",
 ]
 
+[[package]]
+name = "ndk-context"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
+
 [[package]]
 name = "ndk-sys"
 version = "0.4.1+23.1.7779620"
@@ -4667,19 +4717,34 @@ dependencies = [
 
 [[package]]
 name = "neli"
-version = "0.5.3"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9053554eb5dcb7e10d9cdab1206965bde870eed5d0d341532ca035e3ba221508"
+checksum = "1100229e06604150b3becd61a4965d5c70f3be1759544ea7274166f4be41ef43"
 dependencies = [
  "byteorder",
  "libc",
+ "log",
+ "neli-proc-macros",
+]
+
+[[package]]
+name = "neli-proc-macros"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c168194d373b1e134786274020dae7fc5513d565ea2ebb9bc9ff17ffb69106d4"
+dependencies = [
+ "either",
+ "proc-macro2",
+ "quote",
+ "serde",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "nix"
-version = "0.22.3"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf"
+checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c"
 dependencies = [
  "bitflags",
  "cc",
@@ -4690,12 +4755,11 @@ dependencies = [
 
 [[package]]
 name = "nix"
-version = "0.23.2"
+version = "0.24.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c"
+checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
 dependencies = [
  "bitflags",
- "cc",
  "cfg-if",
  "libc",
  "memoffset 0.6.5",
@@ -4703,14 +4767,14 @@ dependencies = [
 
 [[package]]
 name = "nix"
-version = "0.25.1"
+version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4"
+checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"
 dependencies = [
- "autocfg",
  "bitflags",
  "cfg-if",
  "libc",
+ "static_assertions",
 ]
 
 [[package]]
@@ -4719,19 +4783,6 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
 
-[[package]]
-name = "nom"
-version = "6.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2"
-dependencies = [
- "bitvec",
- "funty",
- "lexical-core",
- "memchr",
- "version_check",
-]
-
 [[package]]
 name = "nom"
 version = "7.1.3"
@@ -4744,9 +4795,9 @@ dependencies = [
 
 [[package]]
 name = "notify"
-version = "5.0.0"
+version = "5.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed2c66da08abae1c024c01d635253e402341b4060a12e99b31c7594063bf490a"
+checksum = "58ea850aa68a06e48fdb069c0ec44d0d64c8dbffa49bf3b6f7f0a901fdea1ba9"
 dependencies = [
  "bitflags",
  "crossbeam-channel",
@@ -4757,6 +4808,15 @@ dependencies = [
  "libc",
  "mio",
  "walkdir",
+ "windows-sys 0.42.0",
+]
+
+[[package]]
+name = "ntapi"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4"
+dependencies = [
  "winapi",
 ]
 
@@ -4780,7 +4840,7 @@ dependencies = [
  "num-complex",
  "num-integer",
  "num-iter",
- "num-rational 0.4.1",
+ "num-rational",
  "num-traits",
 ]
 
@@ -4803,7 +4863,7 @@ checksum = "2399c9463abc5f909349d8aa9ba080e0b88b3ce2885389b60b993f39b1a56905"
 dependencies = [
  "byteorder",
  "lazy_static",
- "libm",
+ "libm 0.2.6",
  "num-integer",
  "num-iter",
  "num-traits",
@@ -4830,7 +4890,7 @@ checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -4854,17 +4914,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "num-rational"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
 [[package]]
 name = "num-rational"
 version = "0.4.1"
@@ -4884,7 +4933,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
 dependencies = [
  "autocfg",
- "libm",
+ "libm 0.2.6",
 ]
 
 [[package]]
@@ -4893,29 +4942,29 @@ version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
 dependencies = [
- "hermit-abi",
+ "hermit-abi 0.2.6",
  "libc",
 ]
 
 [[package]]
 name = "num_enum"
-version = "0.5.7"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9"
+checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
 dependencies = [
  "num_enum_derive",
 ]
 
 [[package]]
 name = "num_enum_derive"
-version = "0.5.7"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce"
+checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -4939,6 +4988,32 @@ dependencies = [
  "objc_id",
 ]
 
+[[package]]
+name = "objc-sys"
+version = "0.2.0-beta.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7"
+
+[[package]]
+name = "objc2"
+version = "0.3.0-beta.3.patch-leaks.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e01640f9f2cb1220bbe80325e179e532cb3379ebcd1bf2279d703c19fe3a468"
+dependencies = [
+ "block2",
+ "objc-sys",
+ "objc2-encode",
+]
+
+[[package]]
+name = "objc2-encode"
+version = "2.0.0-pre.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512"
+dependencies = [
+ "objc-sys",
+]
+
 [[package]]
 name = "objc_exception"
 version = "0.1.2"
@@ -4968,12 +5043,12 @@ dependencies = [
 
 [[package]]
 name = "oboe"
-version = "0.4.6"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27f63c358b4fa0fbcfefd7c8be5cfc39c08ce2389f5325687e7762a48d30a5c1"
+checksum = "8868cc237ee02e2d9618539a23a8d228b9bb3fc2e7a5b11eed3831de77c395d0"
 dependencies = [
- "jni 0.19.0",
- "ndk 0.6.0",
+ "jni 0.20.0",
+ "ndk",
  "ndk-context",
  "num-derive",
  "num-traits",
@@ -4982,9 +5057,9 @@ dependencies = [
 
 [[package]]
 name = "oboe-sys"
-version = "0.4.5"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3370abb7372ed744232c12954d920d1a40f1c4686de9e79e800021ef492294bd"
+checksum = "7f44155e7fb718d3cfddcf70690b2b51ac4412f347cd9e4fbe511abe9cd7b5f2"
 dependencies = [
  "cc",
 ]
@@ -5000,27 +5075,18 @@ dependencies = [
 
 [[package]]
 name = "oid-registry"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6aae73e474f83beacd8ae2179e328e03d63d9223949d97e1b7c108059a34715"
-dependencies = [
- "der-parser 5.1.2",
-]
-
-[[package]]
-name = "oid-registry"
-version = "0.2.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe554cb2393bc784fd678c82c84cc0599c31ceadc7f03a594911f822cb8d1815"
+checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff"
 dependencies = [
- "der-parser 6.0.1",
+ "asn1-rs",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.17.0"
+version = "1.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
+checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
 
 [[package]]
 name = "opaque-debug"
@@ -5030,9 +5096,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
 name = "openssl"
-version = "0.10.45"
+version = "0.10.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1"
+checksum = "01b8574602df80f7b85fdfc5392fa884a4e3b3f4f35402c070ab34c3d3f78d56"
 dependencies = [
  "bitflags",
  "cfg-if",
@@ -5045,13 +5111,13 @@ dependencies = [
 
 [[package]]
 name = "openssl-macros"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.15",
 ]
 
 [[package]]
@@ -5062,11 +5128,10 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.80"
+version = "0.9.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7"
+checksum = "8e17f59264b2809d77ae94f0e1ebabc434773f370d6ca667bd223ea10e06cc7e"
 dependencies = [
- "autocfg",
  "cc",
  "libc",
  "pkg-config",
@@ -5079,6 +5144,15 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "978aa494585d3ca4ad74929863093e87cac9790d81fe7aba2b3dc2890643a0fc"
 
+[[package]]
+name = "orbclient"
+version = "0.3.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "221d488cd70617f1bd599ed8ceb659df2147d9393717954d82a0f5e8032a6ab1"
+dependencies = [
+ "redox_syscall 0.3.5",
+]
+
 [[package]]
 name = "ordered-float"
 version = "2.10.0"
@@ -5090,9 +5164,9 @@ dependencies = [
 
 [[package]]
 name = "os_info"
-version = "3.5.1"
+version = "3.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4750134fb6a5d49afc80777394ad5d95b04bc12068c6abb92fae8f43817270f"
+checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e"
 dependencies = [
  "log",
  "serde",
@@ -5107,9 +5181,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
 [[package]]
 name = "owned_ttf_parser"
-version = "0.18.0"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a5f3c7ca08b6879e7965fb25e24d1f5eeb32ea73f9ad99b3854778a38c57e93"
+checksum = "706de7e2214113d63a8238d1910463cfce781129a6f263d13fdb09ff64355ba4"
 dependencies = [
  "ttf-parser",
 ]
@@ -5125,11 +5199,21 @@ dependencies = [
  "sha2 0.10.6",
 ]
 
+[[package]]
+name = "packed_simd_2"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1914cd452d8fccd6f9db48147b29fd4ae05bea9dc5d9ad578509f72415de282"
+dependencies = [
+ "cfg-if",
+ "libm 0.1.4",
+]
+
 [[package]]
 name = "parking"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72"
+checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e"
 
 [[package]]
 name = "parking_lot"
@@ -5149,7 +5233,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
 dependencies = [
  "lock_api",
- "parking_lot_core 0.9.6",
+ "parking_lot_core 0.9.7",
 ]
 
 [[package]]
@@ -5161,32 +5245,32 @@ dependencies = [
  "cfg-if",
  "instant",
  "libc",
- "redox_syscall",
+ "redox_syscall 0.2.16",
  "smallvec",
  "winapi",
 ]
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.6"
+version = "0.9.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf"
+checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall",
+ "redox_syscall 0.2.16",
  "smallvec",
- "windows-sys 0.42.0",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
 name = "parry2d"
-version = "0.11.1"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2451e4bf2c6ba705bf584f94bb51772e22977e37c82575ce2445dd797eb35a9"
+checksum = "62cf99dd4c1e7e6425ecea8a4a0d8682dbf1861332d3e7803d576ed6fc64fa67"
 dependencies = [
  "approx",
- "arrayvec 0.7.2",
+ "arrayvec",
  "bitflags",
  "downcast-rs",
  "either",
@@ -5203,9 +5287,9 @@ dependencies = [
 
 [[package]]
 name = "paste"
-version = "1.0.11"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba"
+checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79"
 
 [[package]]
 name = "peeking_take_while"
@@ -5230,9 +5314,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
 
 [[package]]
 name = "petgraph"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143"
+checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4"
 dependencies = [
  "fixedbitset",
  "indexmap",
@@ -5245,7 +5329,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414"
 dependencies = [
  "futures",
- "rustc_version 0.4.0",
+ "rustc_version",
 ]
 
 [[package]]
@@ -5265,7 +5349,7 @@ checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -5304,46 +5388,43 @@ dependencies = [
 
 [[package]]
 name = "pkg-config"
-version = "0.3.26"
+version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
+checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
 
 [[package]]
-name = "png"
-version = "0.16.8"
+name = "platforms"
+version = "3.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6"
-dependencies = [
- "bitflags",
- "crc32fast",
- "deflate",
- "miniz_oxide 0.3.7",
-]
+checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630"
 
 [[package]]
 name = "png"
-version = "0.17.7"
+version = "0.17.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638"
+checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa"
 dependencies = [
  "bitflags",
  "crc32fast",
+ "fdeflate",
  "flate2",
- "miniz_oxide 0.6.2",
+ "miniz_oxide 0.7.1",
 ]
 
 [[package]]
 name = "polling"
-version = "2.5.2"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22122d5ec4f9fe1b3916419b76be1e80bcb93f618d071d2edf841b137b2a2bd6"
+checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce"
 dependencies = [
  "autocfg",
+ "bitflags",
  "cfg-if",
+ "concurrent-queue",
  "libc",
  "log",
- "wepoll-ffi",
- "windows-sys 0.42.0",
+ "pin-project-lite",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -5374,35 +5455,34 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
 [[package]]
 name = "pretty-type-name"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8815d101cfb4cb491154896bdab292a395a7ac9ab185a9941a2f5be0135900d"
+checksum = "f0f73cdaf19b52e6143685c3606206e114a4dfa969d6b14ec3894c88eb38bd4b"
 
 [[package]]
 name = "proc-macro-crate"
-version = "1.2.1"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
 dependencies = [
  "once_cell",
- "thiserror",
- "toml",
+ "toml_edit",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.50"
+version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2"
+checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "profiling"
-version = "1.0.7"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74605f360ce573babfe43964cbe520294dcb081afbf8c108fc6e23036b4da2df"
+checksum = "332cd62e95873ea4f41f3dfd6bbbfc5b52aec892d7e8d534197c4720a0bbbab2"
 dependencies = [
  "profiling-procmacros",
  "tracing",
@@ -5410,19 +5490,19 @@ dependencies = [
 
 [[package]]
 name = "profiling-procmacros"
-version = "1.0.7"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a1e2417ef905b8ad94215f8a607bd2d0f5d13d416d18dca4a530811e8a0674c"
+checksum = "a10adb8d151bb1280afb8bed41ae5db26be1b056964947133c7525b0bf39c0b0"
 dependencies = [
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "prost"
-version = "0.11.6"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21dc42e00223fc37204bd4aa177e69420c604ca4a183209a8f9de30c6d934698"
+checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd"
 dependencies = [
  "bytes",
  "prost-derive",
@@ -5430,15 +5510,15 @@ dependencies = [
 
 [[package]]
 name = "prost-derive"
-version = "0.11.6"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bda8c0881ea9f722eb9629376db3d0b903b462477c1aafcb0566610ac28ac5d"
+checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4"
 dependencies = [
  "anyhow",
  "itertools",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -5453,9 +5533,9 @@ dependencies = [
 
 [[package]]
 name = "puffin"
-version = "0.14.1"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d633fe876f6d56ff298ae16841fce0071ae998caf4b39b4321d55a161ad6a3c"
+checksum = "a7b2c7a01f569fb03e2ff1f5376537f294001447bd23ce75ca51054fcd223fe4"
 dependencies = [
  "anyhow",
  "bincode",
@@ -5463,42 +5543,36 @@ dependencies = [
  "instant",
  "once_cell",
  "parking_lot 0.12.1",
- "ruzstd",
+ "ruzstd 0.3.1",
  "serde",
  "zstd 0.11.2+zstd.1.5.2",
 ]
 
 [[package]]
 name = "puffin_egui"
-version = "0.19.1"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec6059cdf8b1d27596006f60b2fed19bb47e5ed24b8ca8805f6b93f35264acdc"
+checksum = "aae0f32cd6669a59e3feb7798d6b7e889295bed2d1f9f8622a3ee5804fc80d3f"
 dependencies = [
  "egui",
  "indexmap",
  "instant",
  "natord",
  "once_cell",
- "puffin 0.14.1",
- "time 0.3.17",
+ "puffin 0.14.3",
+ "time 0.3.21",
  "vec1",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.23"
+version = "1.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
+checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500"
 dependencies = [
  "proc-macro2",
 ]
 
-[[package]]
-name = "radium"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8"
-
 [[package]]
 name = "radsort"
 version = "0.1.0"
@@ -5513,7 +5587,7 @@ checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
  "libc",
  "rand_chacha",
- "rand_core 0.6.4",
+ "rand_core",
 ]
 
 [[package]]
@@ -5523,16 +5597,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
 dependencies = [
  "ppv-lite86",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom 0.1.16",
+ "rand_core",
 ]
 
 [[package]]
@@ -5541,23 +5606,23 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.8",
+ "getrandom",
 ]
 
 [[package]]
 name = "range-alloc"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63e935c45e09cc6dcf00d2f0b2d630a58f4095320223d47fc68918722f0538b6"
+checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab"
 
 [[package]]
 name = "rapier2d"
-version = "0.16.1"
+version = "0.17.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32b1c1ed75065adaf01adb8c46a1dad3922fb28de8225dc981481e3584f3af07"
+checksum = "f94d294a9b96694c14888dd0e8ce77620dcc4f2f49264109ef835fa5e2285b84"
 dependencies = [
  "approx",
- "arrayvec 0.7.2",
+ "arrayvec",
  "bit-vec",
  "bitflags",
  "crossbeam",
@@ -5574,21 +5639,9 @@ dependencies = [
 
 [[package]]
 name = "raw-window-handle"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41"
-dependencies = [
- "cty",
-]
-
-[[package]]
-name = "raw-window-handle"
-version = "0.5.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed7e3d950b66e19e0c372f3fa3fbbcf85b1746b571f74e0c2af6042a5c93420a"
-dependencies = [
- "cty",
-]
+checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9"
 
 [[package]]
 name = "rawpointer"
@@ -5598,14 +5651,14 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
 
 [[package]]
 name = "rcgen"
-version = "0.8.14"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5911d1403f4143c9d56a702069d593e8d0f3fab880a85e103604d0893ea31ba7"
+checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b"
 dependencies = [
- "chrono",
  "pem",
  "ring",
- "x509-parser 0.12.0",
+ "time 0.3.21",
+ "x509-parser 0.14.0",
  "yasna",
 ]
 
@@ -5624,26 +5677,35 @@ dependencies = [
  "bitflags",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+dependencies = [
+ "bitflags",
+]
+
 [[package]]
 name = "redox_users"
 version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
 dependencies = [
- "getrandom 0.2.8",
- "redox_syscall",
+ "getrandom",
+ "redox_syscall 0.2.16",
  "thiserror",
 ]
 
 [[package]]
 name = "regex"
-version = "1.7.1"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
+checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax",
+ "regex-syntax 0.7.1",
 ]
 
 [[package]]
@@ -5652,23 +5714,20 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
 dependencies = [
- "regex-syntax",
+ "regex-syntax 0.6.29",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.28"
+version = "0.6.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
-name = "remove_dir_all"
-version = "0.5.3"
+name = "regex-syntax"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
-dependencies = [
- "winapi",
-]
+checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c"
 
 [[package]]
 name = "renderdoc-sys"
@@ -5678,9 +5737,9 @@ checksum = "f1382d1f0a252c4bf97dc20d979a2fdd05b024acd7c2ed0f7595d7817666a157"
 
 [[package]]
 name = "reqwest"
-version = "0.11.14"
+version = "0.11.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21eed90ec8570952d53b772ecf8f206aa1ec9a3d76b2521c56c42973f2d91ee9"
+checksum = "13293b639a097af28fc8a90f22add145a9c954e49d77da06263d58cf44d5fb91"
 dependencies = [
  "base64 0.21.0",
  "bytes",
@@ -5690,7 +5749,7 @@ dependencies = [
  "h2",
  "http",
  "http-body 0.4.5",
- "hyper 0.14.23",
+ "hyper 0.14.26",
  "hyper-rustls",
  "hyper-tls",
  "ipnet",
@@ -5752,9 +5811,9 @@ checksum = "e5864e7ef1a6b7bcf1d6ca3f655e65e724ed3b52546a0d0a663c991522f552ea"
 
 [[package]]
 name = "rodio"
-version = "0.16.0"
+version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb10b653d5ec0e9411a2e7d46e2c7f4046fd87d35b9955bd73ba4108d69072b5"
+checksum = "bdf1d4dea18dff2e9eb6dca123724f8b60ef44ad74a9ad283cdfe025df7e73fa"
 dependencies = [
  "cpal",
  "lewton",
@@ -5785,7 +5844,7 @@ dependencies = [
  "num-traits",
  "pkcs1",
  "pkcs8",
- "rand_core 0.6.4",
+ "rand_core",
  "signature",
  "smallvec",
  "subtle",
@@ -5794,9 +5853,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.21"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 
 [[package]]
 name = "rustc-hash"
@@ -5804,31 +5863,13 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
-[[package]]
-name = "rustc_version"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-dependencies = [
- "semver 0.9.0",
-]
-
 [[package]]
 name = "rustc_version"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
 dependencies = [
- "semver 1.0.16",
-]
-
-[[package]]
-name = "rusticata-macros"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbbee512c633ecabd4481c40111b6ded03ddd9ab10ba6caa5a74e14c889921ad"
-dependencies = [
- "nom 6.1.2",
+ "semver",
 ]
 
 [[package]]
@@ -5837,21 +5878,21 @@ version = "4.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632"
 dependencies = [
- "nom 7.1.3",
+ "nom",
 ]
 
 [[package]]
 name = "rustix"
-version = "0.36.7"
+version = "0.37.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03"
+checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d"
 dependencies = [
  "bitflags",
  "errno",
  "io-lifetimes",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.42.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -5890,15 +5931,25 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.11"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70"
+checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06"
 
 [[package]]
 name = "ruzstd"
-version = "0.3.0"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8cada0ef59efa6a5f4dc5e491f93d9f31e3fc7758df421ff1de8a706338e1100"
+dependencies = [
+ "byteorder",
+ "twox-hash",
+]
+
+[[package]]
+name = "ruzstd"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffae8df4aa221781b715c27bbed0fac16b6f1e2643efb7af8a24dfc78d444493"
+checksum = "9a15e661f0f9dac21f3494fe5d23a6338c0ac116a2d22c2b63010acd89467ffe"
 dependencies = [
  "byteorder",
  "thiserror",
@@ -5915,16 +5966,16 @@ dependencies = [
  "futures-util",
  "http",
  "prost",
- "time 0.3.17",
+ "time 0.3.21",
  "tokio",
  "tonic",
 ]
 
 [[package]]
 name = "ryu"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
+checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
 
 [[package]]
 name = "safe_arch"
@@ -5944,6 +5995,17 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "sandbox"
+version = "0.1.0"
+dependencies = [
+ "bevy",
+ "bevy-inspector-egui",
+ "bevy_egui",
+ "bevy_mod_picking",
+ "bevy_transform_gizmo",
+]
+
 [[package]]
 name = "schannel"
 version = "0.1.21"
@@ -5955,9 +6017,9 @@ dependencies = [
 
 [[package]]
 name = "schemars"
-version = "0.8.11"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a5fb6c61f29e723026dc8e923d94c694313212abbecbbe5f55a7748eec5b307"
+checksum = "02c613288622e5f0c3fdc5dbd4db1c5fbe752746b1d1a56a0630b78fd00de44f"
 dependencies = [
  "dyn-clone",
  "schemars_derive",
@@ -5967,22 +6029,16 @@ dependencies = [
 
 [[package]]
 name = "schemars_derive"
-version = "0.8.11"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f188d036977451159430f3b8dc82ec76364a42b7e289c2b18a9a18f4470058e9"
+checksum = "109da1e6b197438deb6db99952990c7f959572794b80ff93707d55a232545e7c"
 dependencies = [
  "proc-macro2",
  "quote",
  "serde_derive_internals",
- "syn",
+ "syn 1.0.109",
 ]
 
-[[package]]
-name = "scoped_threadpool"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8"
-
 [[package]]
 name = "scopeguard"
 version = "1.1.0"
@@ -5991,9 +6047,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
 [[package]]
 name = "scratch"
-version = "1.0.3"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2"
+checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
 
 [[package]]
 name = "sct"
@@ -6041,13 +6097,13 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "2.8.0"
+version = "2.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645926f31b250a2dca3c232496c2d898d91036e45ca0e97e0e2390c54e11be36"
+checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254"
 dependencies = [
  "bitflags",
  "core-foundation",
- "core-foundation-sys",
+ "core-foundation-sys 0.8.4",
  "libc",
  "security-framework-sys",
 ]
@@ -6058,42 +6114,27 @@ version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4"
 dependencies = [
- "core-foundation-sys",
+ "core-foundation-sys 0.8.4",
  "libc",
 ]
 
 [[package]]
 name = "semver"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-dependencies = [
- "semver-parser",
-]
-
-[[package]]
-name = "semver"
-version = "1.0.16"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a"
-
-[[package]]
-name = "semver-parser"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
+checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
 
 [[package]]
 name = "send_wrapper"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "930c0acf610d3fdb5e2ab6213019aaa04e227ebe9547b0649ba599b16d788bd7"
+checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
 
 [[package]]
 name = "sentry"
-version = "0.29.1"
+version = "0.29.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17ad137b9df78294b98cab1a650bef237cc6c950e82e5ce164655e674d07c5cc"
+checksum = "c6f8ce69326daef9d845c3fd17149bd3dbd7caf5dc65dbbad9f5441a40ee407f"
 dependencies = [
  "httpdate",
  "native-tls",
@@ -6101,6 +6142,7 @@ dependencies = [
  "sentry-backtrace",
  "sentry-contexts",
  "sentry-core",
+ "sentry-debug-images",
  "sentry-panic",
  "tokio",
  "ureq",
@@ -6108,9 +6150,9 @@ dependencies = [
 
 [[package]]
 name = "sentry-backtrace"
-version = "0.29.1"
+version = "0.29.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afe4800806552aab314129761d5d3b3d422284eca3de2ab59e9fd133636cbd3d"
+checksum = "3ed6c0254d4cce319800609aa0d41b486ee57326494802045ff27434fc9a2030"
 dependencies = [
  "backtrace",
  "once_cell",
@@ -6120,23 +6162,23 @@ dependencies = [
 
 [[package]]
 name = "sentry-contexts"
-version = "0.29.1"
+version = "0.29.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a42938426670f6e7974989cd1417837a96dd8bbb01567094f567d6acb360bf88"
+checksum = "d3277dc5d2812562026f2095c7841f3d61bbe6789159b7da54f41d540787f818"
 dependencies = [
  "hostname",
  "libc",
  "os_info",
- "rustc_version 0.4.0",
+ "rustc_version",
  "sentry-core",
  "uname",
 ]
 
 [[package]]
 name = "sentry-core"
-version = "0.29.1"
+version = "0.29.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4df9b9d8de2658a1ecd4e45f7b06c80c5dd97b891bfbc7c501186189b7e9bbdf"
+checksum = "b5acbd3da4255938cf0384b6b140e6c07ff65919c26e4d7a989d8d90ee88fa91"
 dependencies = [
  "once_cell",
  "rand",
@@ -6145,11 +6187,22 @@ dependencies = [
  "serde_json",
 ]
 
+[[package]]
+name = "sentry-debug-images"
+version = "0.29.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "745358c78d3a64361de3659c101fa1ec6eb95bdabf7c88ce274c84338687f07c"
+dependencies = [
+ "findshlibs",
+ "once_cell",
+ "sentry-core",
+]
+
 [[package]]
 name = "sentry-panic"
-version = "0.29.1"
+version = "0.29.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0af37b8500f273e511ebd6eb0d342ff7937d64ce3f134764b2b4653112d48cb4"
+checksum = "beebc7aedbd3aa470cd19caad208a5efe6c48902595c0d111a193d8ce4f7bd15"
 dependencies = [
  "sentry-backtrace",
  "sentry-core",
@@ -6157,26 +6210,26 @@ dependencies = [
 
 [[package]]
 name = "sentry-types"
-version = "0.29.1"
+version = "0.29.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccc95faa4078768a6bf8df45e2b894bbf372b3dbbfb364e9429c1c58ab7545c6"
+checksum = "10d8587b12c0b8211bb3066979ee57af6e8657e23cf439dc6c8581fd86de24e8"
 dependencies = [
  "debugid",
- "getrandom 0.2.8",
+ "getrandom",
  "hex",
  "serde",
  "serde_json",
  "thiserror",
- "time 0.3.17",
+ "time 0.3.21",
  "url",
- "uuid 1.2.2",
+ "uuid 1.3.2",
 ]
 
 [[package]]
 name = "serde"
-version = "1.0.152"
+version = "1.0.163"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
+checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
 dependencies = [
  "serde_derive",
 ]
@@ -6214,13 +6267,13 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.152"
+version = "1.0.163"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
+checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.15",
 ]
 
 [[package]]
@@ -6231,14 +6284,14 @@ checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.91"
+version = "1.0.96"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883"
+checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
 dependencies = [
  "indexmap",
  "itoa",
@@ -6277,7 +6330,7 @@ dependencies = [
  "darling 0.13.4",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -6299,19 +6352,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6"
 dependencies = [
  "block-buffer 0.9.0",
- "cfg-if",
- "cpufeatures",
- "digest 0.9.0",
- "opaque-debug",
-]
-
-[[package]]
-name = "sha1"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770"
-dependencies = [
- "sha1_smol",
+ "cfg-if",
+ "cpufeatures",
+ "digest 0.9.0",
+ "opaque-debug",
 ]
 
 [[package]]
@@ -6325,12 +6369,6 @@ dependencies = [
  "digest 0.10.6",
 ]
 
-[[package]]
-name = "sha1_smol"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
-
 [[package]]
 name = "sha2"
 version = "0.9.9"
@@ -6372,9 +6410,9 @@ checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
 
 [[package]]
 name = "signal-hook"
-version = "0.3.14"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d"
+checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9"
 dependencies = [
  "libc",
  "signal-hook-registry",
@@ -6382,9 +6420,9 @@ dependencies = [
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
+checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
 dependencies = [
  "libc",
 ]
@@ -6396,14 +6434,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
 dependencies = [
  "digest 0.10.6",
- "rand_core 0.6.4",
+ "rand_core",
 ]
 
 [[package]]
 name = "simba"
-version = "0.7.3"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f3fd720c48c53cace224ae62bef1bbff363a70c68c4802a78b5cc6159618176"
+checksum = "061507c94fc6ab4ba1c9a0305018408e312e17c041eb63bef8aa726fa33aceae"
 dependencies = [
  "approx",
  "num-complex",
@@ -6412,6 +6450,12 @@ dependencies = [
  "wide",
 ]
 
+[[package]]
+name = "simd-adler32"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f"
+
 [[package]]
 name = "simple-mutex"
 version = "1.1.5"
@@ -6423,9 +6467,9 @@ dependencies = [
 
 [[package]]
 name = "slab"
-version = "0.4.7"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
+checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
 dependencies = [
  "autocfg",
 ]
@@ -6473,9 +6517,9 @@ checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831"
 
 [[package]]
 name = "socket2"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd"
+checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
 dependencies = [
  "libc",
  "winapi",
@@ -6483,9 +6527,9 @@ dependencies = [
 
 [[package]]
 name = "spade"
-version = "2.1.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1190e0e8f4eb17fc3dbb2d20e1142676e56aaac3daede39f64a3302d687b80f3"
+checksum = "88e65803986868d2372c582007c39ba89936a36ea5f236bf7a7728dc258f04f9"
 dependencies = [
  "num-traits",
  "optional",
@@ -6526,15 +6570,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c12bc9199d1db8234678b7051747c07f517cdcf019262d1847b94ec8b1aee3e"
 dependencies = [
  "itertools",
- "nom 7.1.3",
+ "nom",
  "unicode_categories",
 ]
 
 [[package]]
 name = "sqlx"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9249290c05928352f71c077cc44a464d880c63f26f7534728cca008e135c0428"
+checksum = "f8de3b03a925878ed54a954f621e64bf55a3c1bd29652d0d1a17830405350188"
 dependencies = [
  "sqlx-core",
  "sqlx-macros",
@@ -6542,9 +6586,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-core"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcbc16ddba161afc99e14d1713a453747a2b07fc097d2009f4c300ec99286105"
+checksum = "fa8241483a83a3f33aa5fff7e7d9def398ff9990b2752b6c6112b83c6d246029"
 dependencies = [
  "ahash 0.7.6",
  "atoi",
@@ -6553,7 +6597,7 @@ dependencies = [
  "byteorder",
  "bytes",
  "chrono",
- "crc 3.0.0",
+ "crc 3.0.1",
  "crossbeam-queue",
  "dirs",
  "dotenvy",
@@ -6579,7 +6623,7 @@ dependencies = [
  "rand",
  "serde",
  "serde_json",
- "sha1 0.10.5",
+ "sha1",
  "sha2 0.10.6",
  "smallvec",
  "sqlformat",
@@ -6593,9 +6637,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-macros"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b850fa514dc11f2ee85be9d055c512aa866746adfacd1cb42d867d68e6a5b0d9"
+checksum = "9966e64ae989e7e575b19d7265cb79d7fc3cbbdf179835cb0d716f294c2049c9"
 dependencies = [
  "dotenvy",
  "either",
@@ -6609,15 +6653,15 @@ dependencies = [
  "sha2 0.10.6",
  "sqlx-core",
  "sqlx-rt",
- "syn",
+ "syn 1.0.109",
  "url",
 ]
 
 [[package]]
 name = "sqlx-rt"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24c5b2d25fa654cc5f841750b8e1cdedbe21189bf9a9382ee90bfa9dd3562396"
+checksum = "804d3f245f894e61b1e6263c84b23ca675d96753b5abfd5cc8597d86806e8024"
 dependencies = [
  "native-tls",
  "once_cell",
@@ -6631,55 +6675,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
-[[package]]
-name = "stdweb"
-version = "0.4.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5"
-dependencies = [
- "discard",
- "rustc_version 0.2.3",
- "stdweb-derive",
- "stdweb-internal-macros",
- "stdweb-internal-runtime",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "stdweb-derive"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
-dependencies = [
- "proc-macro2",
- "quote",
- "serde",
- "serde_derive",
- "syn",
-]
-
-[[package]]
-name = "stdweb-internal-macros"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11"
-dependencies = [
- "base-x",
- "proc-macro2",
- "quote",
- "serde",
- "serde_derive",
- "serde_json",
- "sha1 0.6.1",
- "syn",
-]
-
-[[package]]
-name = "stdweb-internal-runtime"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0"
-
 [[package]]
 name = "str-buf"
 version = "1.0.6"
@@ -6716,9 +6711,20 @@ checksum = "8fb1df15f412ee2e9dfc1c504260fa695c1c3f10fe9f4a6ee2d2184d7d6450e2"
 
 [[package]]
 name = "syn"
-version = "1.0.107"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
+checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6727,9 +6733,9 @@ dependencies = [
 
 [[package]]
 name = "sync_wrapper"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20518fe4a4c9acf048008599e464deb21beeae3d3578418951a189c235a7a9a8"
+checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
 
 [[package]]
 name = "synstructure"
@@ -6739,41 +6745,46 @@ checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
  "unicode-xid",
 ]
 
 [[package]]
-name = "taffy"
-version = "0.1.0"
+name = "sysinfo"
+version = "0.28.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec27dea659b100d489dffa57cf0efc6d7bfefb119af817b92cc14006c0b214e3"
+checksum = "b4c2f3ca6693feb29a89724516f016488e9aafc7f37264f898593ee4b942f31b"
 dependencies = [
- "arrayvec 0.7.2",
- "hash32",
- "hash32-derive",
- "num-traits",
- "typenum",
+ "cfg-if",
+ "core-foundation-sys 0.8.4",
+ "libc",
+ "ntapi",
+ "once_cell",
+ "winapi",
 ]
 
 [[package]]
-name = "tap"
-version = "1.0.1"
+name = "taffy"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
+checksum = "3540ec65df399929a04a485feb50144475735920cc47eaf8eba09c70b1df4055"
+dependencies = [
+ "arrayvec",
+ "num-traits",
+ "slotmap",
+]
 
 [[package]]
 name = "tempfile"
-version = "3.3.0"
+version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
+checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998"
 dependencies = [
  "cfg-if",
  "fastrand",
- "libc",
- "redox_syscall",
- "remove_dir_all",
- "winapi",
+ "redox_syscall 0.3.5",
+ "rustix",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
@@ -6787,41 +6798,42 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.38"
+version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
+checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.38"
+version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
+checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.15",
 ]
 
 [[package]]
 name = "thread_local"
-version = "1.1.4"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180"
+checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
 dependencies = [
+ "cfg-if",
  "once_cell",
 ]
 
 [[package]]
 name = "tiff"
-version = "0.6.1"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a53f4706d65497df0c4349241deddf35f84cee19c87ed86ea8ca590f4464437"
+checksum = "7449334f9ff2baf290d55d73983a7d6fa15e01198faef72af07e2a8db851e471"
 dependencies = [
+ "flate2",
  "jpeg-decoder",
- "miniz_oxide 0.4.4",
  "weezl",
 ]
 
@@ -6838,9 +6850,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.17"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376"
+checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc"
 dependencies = [
  "itoa",
  "serde",
@@ -6850,15 +6862,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
+checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
 
 [[package]]
 name = "time-macros"
-version = "0.2.6"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2"
+checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b"
 dependencies = [
  "time-core",
 ]
@@ -6880,20 +6892,19 @@ dependencies = [
 
 [[package]]
 name = "tinyvec_macros"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.24.2"
+version = "1.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a12a59981d9e3c38d216785b0c37399f6e415e8d0712047620f189371b0bb"
+checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105"
 dependencies = [
  "autocfg",
  "bytes",
  "libc",
- "memchr",
  "mio",
  "num_cpus",
  "parking_lot 0.12.1",
@@ -6901,7 +6912,7 @@ dependencies = [
  "signal-hook-registry",
  "socket2",
  "tokio-macros",
- "windows-sys 0.42.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -6916,20 +6927,20 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "1.8.2"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8"
+checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.15",
 ]
 
 [[package]]
 name = "tokio-native-tls"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b"
+checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
 dependencies = [
  "native-tls",
  "tokio",
@@ -6960,9 +6971,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.11"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce"
+checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -6983,9 +6994,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.4"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740"
+checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d"
 dependencies = [
  "bytes",
  "futures-core",
@@ -6996,12 +7007,20 @@ dependencies = [
 ]
 
 [[package]]
-name = "toml"
-version = "0.5.11"
+name = "toml_datetime"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
+
+[[package]]
+name = "toml_edit"
+version = "0.19.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
+checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13"
 dependencies = [
- "serde",
+ "indexmap",
+ "toml_datetime",
+ "winnow",
 ]
 
 [[package]]
@@ -7020,7 +7039,7 @@ dependencies = [
  "h2",
  "http",
  "http-body 0.4.5",
- "hyper 0.14.23",
+ "hyper 0.14.26",
  "hyper-timeout",
  "percent-encoding",
  "pin-project",
@@ -7071,7 +7090,6 @@ dependencies = [
  "http-body 0.4.5",
  "http-range-header",
  "pin-project-lite",
- "tower",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -7108,7 +7126,7 @@ source = "git+https://github.com/mvlabat/tracing.git?branch=muddle-run#f7614bd00
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -7186,9 +7204,9 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
 
 [[package]]
 name = "ttf-parser"
-version = "0.18.1"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633"
+checksum = "44dcf002ae3b32cd25400d6df128c5babec3927cd1eb7ce813cfff20eb6c3746"
 
 [[package]]
 name = "tungstenite"
@@ -7203,7 +7221,7 @@ dependencies = [
  "httparse",
  "log",
  "rand",
- "sha1 0.10.5",
+ "sha1",
  "thiserror",
  "url",
  "utf-8",
@@ -7251,15 +7269,15 @@ dependencies = [
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.10"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58"
+checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.6"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
+checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
 
 [[package]]
 name = "unicode-normalization"
@@ -7272,9 +7290,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.10.0"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a"
+checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
 
 [[package]]
 name = "unicode-width"
@@ -7335,6 +7353,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "urlencoding"
+version = "2.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9"
+
 [[package]]
 name = "utf-8"
 version = "0.7.6"
@@ -7347,16 +7371,16 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
 dependencies = [
- "getrandom 0.2.8",
+ "getrandom",
 ]
 
 [[package]]
 name = "uuid"
-version = "1.2.2"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c"
+checksum = "4dad5567ad0cf5b760e5665964bec1b47dfd077ba8a2544b513f3556d3d239a2"
 dependencies = [
- "getrandom 0.2.8",
+ "getrandom",
  "serde",
 ]
 
@@ -7407,12 +7431,11 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
 
 [[package]]
 name = "walkdir"
-version = "2.3.2"
+version = "2.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
+checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
 dependencies = [
  "same-file",
- "winapi",
  "winapi-util",
 ]
 
@@ -7426,12 +7449,6 @@ dependencies = [
  "try-lock",
 ]
 
-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
 [[package]]
 name = "wasi"
 version = "0.10.0+wasi-snapshot-preview1"
@@ -7446,9 +7463,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.83"
+version = "0.2.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
+checksum = "5b6cb788c4e39112fbe1822277ef6fb3c55cd86b95cb3d3c4c1c9597e4ac74b4"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -7456,24 +7473,24 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.83"
+version = "0.2.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142"
+checksum = "35e522ed4105a9d626d885b35d62501b30d9666283a5c8be12c14a8bdafe7822"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.15",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.33"
+version = "0.4.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d"
+checksum = "083abe15c5d88556b77bdf7aef403625be9e327ad37c62c4e4129af740168163"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -7483,9 +7500,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.83"
+version = "0.2.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810"
+checksum = "358a79a0cb89d21db8120cbfb91392335913e4890665b1a7981d9e956903b434"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -7493,22 +7510,22 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.83"
+version = "0.2.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
+checksum = "4783ce29f09b9d93134d41297aded3a712b7b979e9c6f28c32cb88c973a94869"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.15",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.83"
+version = "0.2.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
+checksum = "a901d592cafaa4d711bc324edfaff879ac700b19c3dfd60058d2b445be2691eb"
 
 [[package]]
 name = "wasm-timer"
@@ -7525,11 +7542,22 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "wayland-scanner"
+version = "0.29.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "xml-rs",
+]
+
 [[package]]
 name = "web-sys"
-version = "0.3.60"
+version = "0.3.62"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f"
+checksum = "16b5f940c7edfdc6d12126d98c9ef4d1b3d470011c47c76a6581df47ad9ba721"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -7537,20 +7565,19 @@ dependencies = [
 
 [[package]]
 name = "webbrowser"
-version = "0.8.4"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e74f5ff7786c4c21f61ba8e30ea29c9745f06fca0a4a02d083b3c662583399e8"
+checksum = "b692165700260bbd40fbc5ff23766c03e339fbaca907aeea5cb77bf0a553ca83"
 dependencies = [
  "core-foundation",
  "dirs",
- "jni 0.20.0",
+ "jni 0.21.1",
  "log",
  "ndk-context",
  "objc",
- "raw-window-handle 0.5.0",
+ "raw-window-handle",
  "url",
  "web-sys",
- "windows 0.43.0",
 ]
 
 [[package]]
@@ -7590,7 +7617,7 @@ checksum = "3eb099cbcb47caf79f8f59e0c6cbc8a187954cd467f2b30953827d4df56aff73"
 dependencies = [
  "async-io",
  "byteorder",
- "crc 3.0.0",
+ "crc 3.0.1",
  "futures-channel",
  "futures-core",
  "futures-util",
@@ -7602,8 +7629,9 @@ dependencies = [
 
 [[package]]
 name = "webrtc-unreliable-client"
-version = "0.1.3"
-source = "git+https://github.com/mvlabat/webrtc-unreliable-client.git?branch=muddle-run#3db715a450af3f88b76469734e453c7265b4e9cd"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73939c822971e4dcdc0dfdc5ca9b3e910244a4761acba12ca6470526c1f73e10"
 dependencies = [
  "aes",
  "aes-gcm",
@@ -7615,7 +7643,7 @@ dependencies = [
  "bytes",
  "ccm",
  "crc 2.1.0",
- "der-parser 5.1.2",
+ "der-parser",
  "derive_builder",
  "elliptic-curve",
  "hmac 0.10.1",
@@ -7626,7 +7654,7 @@ dependencies = [
  "p256",
  "parking_lot 0.11.2",
  "rand",
- "rand_core 0.6.4",
+ "rand_core",
  "rcgen",
  "regex",
  "reqwest",
@@ -7647,7 +7675,7 @@ dependencies = [
  "webpki 0.21.4",
  "winapi",
  "x25519-dalek",
- "x509-parser 0.9.2",
+ "x509-parser 0.15.0",
 ]
 
 [[package]]
@@ -7656,27 +7684,20 @@ version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb"
 
-[[package]]
-name = "wepoll-ffi"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "wgpu"
-version = "0.14.2"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81f643110d228fd62a60c5ed2ab56c4d5b3704520bd50561174ec4ec74932937"
+checksum = "d745a1b6d91d85c33defbb29f0eee0450e1d2614d987e14bf6baf26009d132d7"
 dependencies = [
- "arrayvec 0.7.2",
+ "arrayvec",
+ "cfg-if",
  "js-sys",
  "log",
  "naga",
  "parking_lot 0.12.1",
- "raw-window-handle 0.5.0",
+ "profiling",
+ "raw-window-handle",
  "smallvec",
  "static_assertions",
  "wasm-bindgen",
@@ -7689,21 +7710,20 @@ dependencies = [
 
 [[package]]
 name = "wgpu-core"
-version = "0.14.2"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6000d1284ef8eec6076fd5544a73125fd7eb9b635f18dceeb829d826f41724ca"
+checksum = "7131408d940e335792645a98f03639573b0480e9e2e7cddbbab74f7c6d9f3fff"
 dependencies = [
- "arrayvec 0.7.2",
+ "arrayvec",
  "bit-vec",
  "bitflags",
- "cfg_aliases",
  "codespan-reporting",
  "fxhash",
  "log",
  "naga",
  "parking_lot 0.12.1",
  "profiling",
- "raw-window-handle 0.5.0",
+ "raw-window-handle",
  "smallvec",
  "thiserror",
  "web-sys",
@@ -7713,12 +7733,12 @@ dependencies = [
 
 [[package]]
 name = "wgpu-hal"
-version = "0.14.1"
+version = "0.15.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cc320a61acb26be4f549c9b1b53405c10a223fbfea363ec39474c32c348d12f"
+checksum = "bdcf61a283adc744bb5453dd88ea91f3f86d5ca6b027661c6c73c7734ae0288b"
 dependencies = [
  "android_system_properties",
- "arrayvec 0.7.2",
+ "arrayvec",
  "ash",
  "bit-set",
  "bitflags",
@@ -7729,9 +7749,12 @@ dependencies = [
  "fxhash",
  "glow",
  "gpu-alloc",
+ "gpu-allocator",
  "gpu-descriptor",
+ "hassle-rs",
  "js-sys",
  "khronos-egl",
+ "libc",
  "libloading",
  "log",
  "metal",
@@ -7740,7 +7763,7 @@ dependencies = [
  "parking_lot 0.12.1",
  "profiling",
  "range-alloc",
- "raw-window-handle 0.5.0",
+ "raw-window-handle",
  "renderdoc-sys",
  "smallvec",
  "thiserror",
@@ -7752,18 +7775,20 @@ dependencies = [
 
 [[package]]
 name = "wgpu-types"
-version = "0.14.1"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb6b28ef22cac17b9109b25b3bf8c9a103eeb293d7c5f78653979b09140375f6"
+checksum = "32444e121b0bd00cb02c0de32fde457a9491bd44e03e7a5db6df9b1da2f6f110"
 dependencies = [
  "bitflags",
+ "js-sys",
+ "web-sys",
 ]
 
 [[package]]
 name = "whoami"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45dbc71f0cdca27dc261a9bd37ddec174e4a0af2b900b890f378460f745426e3"
+checksum = "2c70234412ca409cc04e864e89523cb0fc37f5e1344ebed5a3ebf4192b6b9f68"
 dependencies = [
  "wasm-bindgen",
  "web-sys",
@@ -7771,14 +7796,20 @@ dependencies = [
 
 [[package]]
 name = "wide"
-version = "0.7.5"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae41ecad2489a1655c8ef8489444b0b113c0a0c795944a3572a0931cf7d2525c"
+checksum = "b689b6c49d6549434bf944e6b0f39238cf63693cb7a147e9d887507fffa3b223"
 dependencies = [
  "bytemuck",
  "safe_arch",
 ]
 
+[[package]]
+name = "widestring"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983"
+
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -7821,43 +7852,53 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windows"
-version = "0.37.0"
+version = "0.44.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57b543186b344cc61c85b5aab0d2e3adf4e0f99bc076eff9aa5927bcc0b8a647"
+checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b"
 dependencies = [
- "windows_aarch64_msvc 0.37.0",
- "windows_i686_gnu 0.37.0",
- "windows_i686_msvc 0.37.0",
- "windows_x86_64_gnu 0.37.0",
- "windows_x86_64_msvc 0.37.0",
+ "windows-implement",
+ "windows-interface",
+ "windows-targets 0.42.2",
 ]
 
 [[package]]
 name = "windows"
-version = "0.43.0"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04662ed0e3e5630dfa9b26e4cb823b817f1a9addda855d973a9458c236556244"
+checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25"
 dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc 0.42.1",
- "windows_i686_gnu 0.42.1",
- "windows_i686_msvc 0.42.1",
- "windows_x86_64_gnu 0.42.1",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc 0.42.1",
+ "windows-targets 0.42.2",
 ]
 
 [[package]]
-name = "windows-sys"
-version = "0.36.1"
+name = "windows"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+dependencies = [
+ "windows-targets 0.48.0",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.44.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ce87ca8e3417b02dc2a8a22769306658670ec92d78f1bd420d6310a67c245c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.44.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
+checksum = "853f69a591ecd4f810d29f17e902d40e349fb05b0b11fff63b08b826bfe39c7f"
 dependencies = [
- "windows_aarch64_msvc 0.36.1",
- "windows_i686_gnu 0.36.1",
- "windows_i686_msvc 0.36.1",
- "windows_x86_64_gnu 0.36.1",
- "windows_x86_64_msvc 0.36.1",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -7866,125 +7907,156 @@ version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
 dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc 0.42.1",
- "windows_i686_gnu 0.42.1",
- "windows_i686_msvc 0.42.1",
- "windows_x86_64_gnu 0.42.1",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc 0.42.1",
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
 ]
 
 [[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.1"
+name = "windows-sys"
+version = "0.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+dependencies = [
+ "windows-targets 0.42.2",
+]
 
 [[package]]
-name = "windows_aarch64_msvc"
-version = "0.36.1"
+name = "windows-sys"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.0",
+]
 
 [[package]]
-name = "windows_aarch64_msvc"
-version = "0.37.0"
+name = "windows-targets"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2623277cb2d1c216ba3b578c0f3cf9cdebeddb6e66b1b218bb33596ea7769c3a"
+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+dependencies = [
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
+]
 
 [[package]]
-name = "windows_aarch64_msvc"
-version = "0.42.1"
+name = "windows-targets"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
+checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.0",
+ "windows_aarch64_msvc 0.48.0",
+ "windows_i686_gnu 0.48.0",
+ "windows_i686_msvc 0.48.0",
+ "windows_x86_64_gnu 0.48.0",
+ "windows_x86_64_gnullvm 0.48.0",
+ "windows_x86_64_msvc 0.48.0",
+]
 
 [[package]]
-name = "windows_i686_gnu"
-version = "0.36.1"
+name = "windows_aarch64_gnullvm"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
 
 [[package]]
-name = "windows_i686_gnu"
-version = "0.37.0"
+name = "windows_aarch64_gnullvm"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3925fd0b0b804730d44d4b6278c50f9699703ec49bcd628020f46f4ba07d9e1"
+checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
 
 [[package]]
-name = "windows_i686_gnu"
-version = "0.42.1"
+name = "windows_aarch64_msvc"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
 
 [[package]]
-name = "windows_i686_msvc"
-version = "0.36.1"
+name = "windows_aarch64_msvc"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
+checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
 
 [[package]]
-name = "windows_i686_msvc"
-version = "0.37.0"
+name = "windows_i686_gnu"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce907ac74fe331b524c1298683efbf598bb031bc84d5e274db2083696d07c57c"
+checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.42.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
 
 [[package]]
-name = "windows_x86_64_gnu"
-version = "0.36.1"
+name = "windows_i686_msvc"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
+checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.37.0"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2babfba0828f2e6b32457d5341427dcbb577ceef556273229959ac23a10af33d"
+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.42.1"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
+checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.42.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
 
 [[package]]
-name = "windows_x86_64_msvc"
-version = "0.36.1"
+name = "windows_x86_64_gnullvm"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
+checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.37.0"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4dd6dc7df2d84cf7b33822ed5b86318fb1781948e9663bacd047fc9dd52259d"
+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.42.1"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
+checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
 
 [[package]]
 name = "winit"
-version = "0.27.5"
+version = "0.28.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb796d6fbd86b2fd896c9471e6f04d39d750076ebe5680a3958f00f5ab97657c"
+checksum = "94c9651471cd576737671fbf7081edfea43de3e06846dd9bd4e49ea803c9f55f"
 dependencies = [
+ "android-activity",
  "bitflags",
- "cocoa",
+ "cfg_aliases",
  "core-foundation",
  "core-graphics",
  "dispatch",
@@ -7992,20 +8064,29 @@ dependencies = [
  "libc",
  "log",
  "mio",
- "ndk 0.7.0",
- "ndk-glue",
- "objc",
+ "ndk",
+ "objc2",
  "once_cell",
- "parking_lot 0.12.1",
+ "orbclient",
  "percent-encoding",
- "raw-window-handle 0.4.3",
- "raw-window-handle 0.5.0",
+ "raw-window-handle",
+ "redox_syscall 0.3.5",
  "wasm-bindgen",
+ "wayland-scanner",
  "web-sys",
- "windows-sys 0.36.1",
+ "windows-sys 0.45.0",
  "x11-dl",
 ]
 
+[[package]]
+name = "winnow"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "winreg"
 version = "0.10.1"
@@ -8017,15 +8098,16 @@ dependencies = [
 
 [[package]]
 name = "ws_stream_wasm"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47ca1ab42f5afed7fc332b22b6e932ca5414b209465412c8cdf0ad23bc0de645"
+checksum = "7999f5f4217fe3818726b66257a4475f71e74ffd190776ad053fa159e50737f5"
 dependencies = [
  "async_io_stream",
  "futures",
  "js-sys",
+ "log",
  "pharos",
- "rustc_version 0.4.0",
+ "rustc_version",
  "send_wrapper",
  "thiserror",
  "wasm-bindgen",
@@ -8033,12 +8115,6 @@ dependencies = [
  "web-sys",
 ]
 
-[[package]]
-name = "wyz"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214"
-
 [[package]]
 name = "x11-clipboard"
 version = "0.3.3"
@@ -8061,61 +8137,72 @@ dependencies = [
 
 [[package]]
 name = "x11rb"
-version = "0.9.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e99be55648b3ae2a52342f9a870c0e138709a3493261ce9b469afe6e4df6d8a"
+checksum = "592b4883219f345e712b3209c62654ebda0bb50887f330cbd018d0f654bfd507"
 dependencies = [
  "gethostname",
- "nix 0.22.3",
+ "nix 0.24.3",
  "winapi",
  "winapi-wsapoll",
+ "x11rb-protocol",
+]
+
+[[package]]
+name = "x11rb-protocol"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56b245751c0ac9db0e006dc812031482784e434630205a93c73cfefcaabeac67"
+dependencies = [
+ "nix 0.24.3",
 ]
 
 [[package]]
 name = "x25519-dalek"
-version = "2.0.0-pre.1"
+version = "2.0.0-rc.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5da623d8af10a62342bcbbb230e33e58a63255a58012f8653c578e54bab48df"
+checksum = "fabd6e16dd08033932fc3265ad4510cc2eab24656058a6dcb107ffe274abcc95"
 dependencies = [
  "curve25519-dalek",
- "rand_core 0.6.4",
+ "rand_core",
+ "serde",
  "zeroize",
 ]
 
 [[package]]
 name = "x509-parser"
-version = "0.9.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64abca276c58f8341ddc13fd4bd6ae75993cc669043f5b34813c90f7dff04771"
+checksum = "e0ecbeb7b67ce215e40e3cc7f2ff902f94a223acf44995934763467e7b1febc8"
 dependencies = [
+ "asn1-rs",
  "base64 0.13.1",
- "chrono",
  "data-encoding",
- "der-parser 5.1.2",
+ "der-parser",
  "lazy_static",
- "nom 6.1.2",
- "oid-registry 0.1.5",
- "rusticata-macros 3.2.0",
- "rustversion",
+ "nom",
+ "oid-registry",
+ "ring",
+ "rusticata-macros",
  "thiserror",
+ "time 0.3.21",
 ]
 
 [[package]]
 name = "x509-parser"
-version = "0.12.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffc90836a84cb72e6934137b1504d0cae304ef5d83904beb0c8d773bbfe256ed"
+checksum = "bab0c2f54ae1d92f4fcb99c0b7ccf0b1e3451cbd395e5f115ccbdbcb18d4f634"
 dependencies = [
- "base64 0.13.1",
- "chrono",
+ "asn1-rs",
  "data-encoding",
- "der-parser 6.0.1",
+ "der-parser",
  "lazy_static",
- "nom 7.1.3",
- "oid-registry 0.2.0",
- "ring",
- "rusticata-macros 4.1.0",
+ "nom",
+ "oid-registry",
+ "rusticata-macros",
  "thiserror",
+ "time 0.3.21",
 ]
 
 [[package]]
@@ -8134,6 +8221,12 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a"
 
+[[package]]
+name = "xml-rs"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1fcc45bb67e8bd9c33ada4b861bccfe2506e726169f7c1081b95841b3758eb3"
+
 [[package]]
 name = "yaml-rust"
 version = "0.4.5"
@@ -8145,32 +8238,31 @@ dependencies = [
 
 [[package]]
 name = "yasna"
-version = "0.4.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e262a29d0e61ccf2b6190d7050d4b237535fc76ce4c1210d9caa316f71dffa75"
+checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd"
 dependencies = [
- "chrono",
+ "time 0.3.21",
 ]
 
 [[package]]
 name = "zeroize"
-version = "1.5.7"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f"
+checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
 dependencies = [
  "zeroize_derive",
 ]
 
 [[package]]
 name = "zeroize_derive"
-version = "1.3.3"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c"
+checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
- "synstructure",
+ "syn 2.0.15",
 ]
 
 [[package]]
@@ -8184,11 +8276,11 @@ dependencies = [
 
 [[package]]
 name = "zstd"
-version = "0.12.2+zstd.1.5.2"
+version = "0.12.3+zstd.1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9262a83dc741c0b0ffec209881b45dbc232c21b02a2b9cb1adb93266e41303d"
+checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806"
 dependencies = [
- "zstd-safe 6.0.2+zstd.1.5.2",
+ "zstd-safe 6.0.5+zstd.1.5.4",
 ]
 
 [[package]]
@@ -8203,9 +8295,9 @@ dependencies = [
 
 [[package]]
 name = "zstd-safe"
-version = "6.0.2+zstd.1.5.2"
+version = "6.0.5+zstd.1.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6cf39f730b440bab43da8fb5faf5f254574462f73f260f85f7987f32154ff17"
+checksum = "d56d9e60b4b1758206c238a10165fbcae3ca37b01744e394c463463f6529d23b"
 dependencies = [
  "libc",
  "zstd-sys",
@@ -8213,9 +8305,9 @@ dependencies = [
 
 [[package]]
 name = "zstd-sys"
-version = "2.0.5+zstd.1.5.2"
+version = "2.0.8+zstd.1.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edc50ffce891ad571e9f9afe5039c4837bede781ac4bb13052ed7ae695518596"
+checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c"
 dependencies = [
  "cc",
  "libc",
diff --git a/Cargo.toml b/Cargo.toml
index a922f747..6f1c19ee 100755
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,6 +12,7 @@ members = [
     "bins/server",
     "bins/matchmaker",
     "bins/persistence",
+    "bins/sandbox",
 ]
 resolver = "2"
 
@@ -23,26 +24,58 @@ opt-level = 1
 
 [patch.crates-io]
 dotenv = { git = "https://github.com/mvlabat/dotenv.git" }
-bevy = { git = "https://github.com/mvlabat/bevy.git", branch = "v0.9.1/muddle-run" }
-bevy_app = { git = "https://github.com/mvlabat/bevy.git", branch = "v0.9.1/muddle-run" }
-bevy_ecs = { git = "https://github.com/mvlabat/bevy.git", branch = "v0.9.1/muddle-run" }
-bevy_time = { git = "https://github.com/mvlabat/bevy.git", branch = "v0.9.1/muddle-run" }
-bevy_utils = { git = "https://github.com/mvlabat/bevy.git", branch = "v0.9.1/muddle-run" }
+bevy = { git = "https://github.com/mvlabat/bevy.git", branch = "v0.10.1/muddle-run" }
+bevy_a11y = { git = "https://github.com/mvlabat/bevy.git", branch = "v0.10.1/muddle-run" }
+bevy_animation = { git = "https://github.com/mvlabat/bevy.git", branch = "v0.10.1/muddle-run" }
+bevy_app = { git = "https://github.com/mvlabat/bevy.git", branch = "v0.10.1/muddle-run" }
+bevy_asset = { git = "https://github.com/mvlabat/bevy.git", branch = "v0.10.1/muddle-run" }
+bevy_audio = { git = "https://github.com/mvlabat/bevy.git", branch = "v0.10.1/muddle-run" }
+bevy_core = { git = "https://github.com/mvlabat/bevy.git", branch = "v0.10.1/muddle-run" }
+bevy_core_pipeline = { git = "https://github.com/mvlabat/bevy.git", branch = "v0.10.1/muddle-run" }
+bevy_derive = { git = "https://github.com/mvlabat/bevy.git", branch = "v0.10.1/muddle-run" }
+bevy_diagnostic = { git = "https://github.com/mvlabat/bevy.git", branch = "v0.10.1/muddle-run" }
+bevy_ecs = { git = "https://github.com/mvlabat/bevy.git", branch = "v0.10.1/muddle-run" }
+bevy_encase_derive = { git = "https://github.com/mvlabat/bevy.git", branch = "v0.10.1/muddle-run" }
+bevy_gilrs = { git = "https://github.com/mvlabat/bevy.git", branch = "v0.10.1/muddle-run" }
+bevy_gltf = { git = "https://github.com/mvlabat/bevy.git", branch = "v0.10.1/muddle-run" }
+bevy_hierarchy = { git = "https://github.com/mvlabat/bevy.git", branch = "v0.10.1/muddle-run" }
+bevy_input = { git = "https://github.com/mvlabat/bevy.git", branch = "v0.10.1/muddle-run" }
+bevy_internal = { git = "https://github.com/mvlabat/bevy.git", branch = "v0.10.1/muddle-run" }
+bevy_log = { git = "https://github.com/mvlabat/bevy.git", branch = "v0.10.1/muddle-run" }
+bevy_macro_utils = { git = "https://github.com/mvlabat/bevy.git", branch = "v0.10.1/muddle-run" }
+bevy_math = { git = "https://github.com/mvlabat/bevy.git", branch = "v0.10.1/muddle-run" }
+bevy_mikktspace = { git = "https://github.com/mvlabat/bevy.git", branch = "v0.10.1/muddle-run" }
+bevy_pbr = { git = "https://github.com/mvlabat/bevy.git", branch = "v0.10.1/muddle-run" }
+bevy_ptr = { git = "https://github.com/mvlabat/bevy.git", branch = "v0.10.1/muddle-run" }
+bevy_reflect = { git = "https://github.com/mvlabat/bevy.git", branch = "v0.10.1/muddle-run" }
+bevy_render = { git = "https://github.com/mvlabat/bevy.git", branch = "v0.10.1/muddle-run" }
+bevy_scene = { git = "https://github.com/mvlabat/bevy.git", branch = "v0.10.1/muddle-run" }
+bevy_sprite = { git = "https://github.com/mvlabat/bevy.git", branch = "v0.10.1/muddle-run" }
+bevy_tasks = { git = "https://github.com/mvlabat/bevy.git", branch = "v0.10.1/muddle-run" }
+bevy_text = { git = "https://github.com/mvlabat/bevy.git", branch = "v0.10.1/muddle-run" }
+bevy_time = { git = "https://github.com/mvlabat/bevy.git", branch = "v0.10.1/muddle-run" }
+bevy_transform = { git = "https://github.com/mvlabat/bevy.git", branch = "v0.10.1/muddle-run" }
+bevy_ui = { git = "https://github.com/mvlabat/bevy.git", branch = "v0.10.1/muddle-run" }
+bevy_utils = { git = "https://github.com/mvlabat/bevy.git", branch = "v0.10.1/muddle-run" }
+bevy_window = { git = "https://github.com/mvlabat/bevy.git", branch = "v0.10.1/muddle-run" }
+bevy_winit = { git = "https://github.com/mvlabat/bevy.git", branch = "v0.10.1/muddle-run" }
+
+
 #bevy_rapier2d = { git = "https://github.com/mvlabat/bevy_rapier.git", branch = "reorder-updates" }
 #parry2d = { git = "https://github.com/dimforge/parry", rev = "5c957b9" }
 #rapier2d = { git = "https://github.com/dimforge/rapier.git", rev = "3a2f5f7cf5e21cfa5a3cc687caa8f4fbc3c04984" }
 #puffin = { git = "https://github.com/EmbarkStudios/puffin.git", rev = "4616fee7fb8a143afdf0821587ba531e4f3671e9" }
 #puffin_egui = { git = "https://github.com/EmbarkStudios/puffin.git", rev = "4616fee7fb8a143afdf0821587ba531e4f3671e9" }
-#bevy_rapier2d = { path = "../bevy_rapier/bevy_rapier2d" }
+bevy_rapier2d = { path = "../bevy_rapier/bevy_rapier2d" }
 #bevy_puffin = { path = "../bevy_puffin" }
 #bevy = { path = "../bevy" }
 #bevy_egui = { path = "../bevy_egui" }
 #egui = { path = "../egui/egui" }
 
-naia-client-socket = { git = "https://github.com/mvlabat/naia.git", branch = "muddle-run" }
-naia-server-socket = { git = "https://github.com/mvlabat/naia.git", branch = "muddle-run" }
-naia-socket-shared = { git = "https://github.com/mvlabat/naia.git", branch = "muddle-run" }
-webrtc-unreliable-client = { git = "https://github.com/mvlabat/webrtc-unreliable-client.git", branch = "muddle-run" }
+#naia-client-socket = { git = "https://github.com/mvlabat/naia.git", branch = "muddle-run" }
+#naia-server-socket = { git = "https://github.com/mvlabat/naia.git", branch = "muddle-run" }
+#naia-socket-shared = { git = "https://github.com/mvlabat/naia.git", branch = "muddle-run" }
+#webrtc-unreliable-client = { git = "https://github.com/mvlabat/webrtc-unreliable-client.git", branch = "muddle-run" }
 #bevy_disturbulence = { path = "../bevy_disturbulence" }
 #naia-client-socket = { path = "../naia/socket/client" }
 #naia-server-socket = { path = "../naia/socket/server" }
@@ -59,3 +92,6 @@ tracing-subscriber = { git = "https://github.com/mvlabat/tracing.git", branch =
 
 #[patch.'https://github.com/bevyengine/bevy']
 #bevy = { git = "https://github.com/bevyengine/bevy//" }
+
+[patch.'https://github.com/mvlabat/bevy_disturbulence']
+bevy_disturbulence = { path = "../bevy_disturbulence" }
diff --git a/bins/desktop_client/Cargo.toml b/bins/desktop_client/Cargo.toml
index c923680c..9c9a1ec5 100644
--- a/bins/desktop_client/Cargo.toml
+++ b/bins/desktop_client/Cargo.toml
@@ -10,8 +10,8 @@ edition = "2021"
 mr_client_lib = { path = "../../libs/client_lib", features = ["profiler"] }
 mr_utils_lib = { path = "../../libs/utils_lib", features = ["bevy_logging"] }
 
-bevy = "0.9.1"
-bevy_puffin = "0.3"
+bevy = "0.10"
+bevy_puffin = "0.4"
 sentry = "0.29.1"
 
 [build-dependencies]
diff --git a/bins/desktop_client/src/main.rs b/bins/desktop_client/src/main.rs
index 326fb225..3b886dd8 100644
--- a/bins/desktop_client/src/main.rs
+++ b/bins/desktop_client/src/main.rs
@@ -1,11 +1,13 @@
-use bevy::{log, log::LogPlugin, prelude::*};
-use mr_client_lib::{MuddleClientConfig, MuddleClientPlugin, DEFAULT_SERVER_PORT};
+use bevy::{log, log::LogPlugin, prelude::*, window::WindowResolution};
+use mr_client_lib::{
+    MuddleClientConfig, MuddleClientPlugin, MuddleTracePlugin, DEFAULT_SERVER_PORT,
+};
 use mr_utils_lib::try_parse_from_env;
 use std::net::SocketAddr;
 
 fn main() {
     let mut app = App::new();
-    app.add_plugin(bevy_puffin::PuffinTracePlugin::new().with_scopes_off());
+    app.add_plugin(MuddleTracePlugin);
 
     mr_utils_lib::env::load_env();
 
@@ -23,18 +25,17 @@ fn main() {
         server_addr: server_addr(),
     })
     // Window and rendering.
-    .insert_resource(Msaa { samples: 4 })
+    .insert_resource(Msaa::Sample4)
     .add_plugins(
         DefaultPlugins
             .build()
             .disable::<LogPlugin>()
             .set(WindowPlugin {
-                window: WindowDescriptor {
+                primary_window: Some(Window {
                     title: "Muddle Run".to_owned(),
-                    width: 1024.0,
-                    height: 768.0,
+                    resolution: WindowResolution::new(1024.0, 768.0),
                     ..Default::default()
-                },
+                }),
                 ..Default::default()
             }),
     )
diff --git a/bins/sandbox/Cargo.toml b/bins/sandbox/Cargo.toml
new file mode 100644
index 00000000..2295476d
--- /dev/null
+++ b/bins/sandbox/Cargo.toml
@@ -0,0 +1,13 @@
+[package]
+name = "sandbox"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+bevy = "0.10"
+bevy_egui = "0.20"
+bevy-inspector-egui = "0.18"
+bevy_mod_picking = "0.12"
+bevy_transform_gizmo = "0.6"
diff --git a/bins/sandbox/src/main.rs b/bins/sandbox/src/main.rs
new file mode 100644
index 00000000..bca82c18
--- /dev/null
+++ b/bins/sandbox/src/main.rs
@@ -0,0 +1,106 @@
+use crate::road::{
+    mesh::RoadMesh,
+    systems::{edit_road, sync_mesh},
+    ControlPointIndex, Road, RoadModel, SelectedRoad,
+};
+use bevy::{
+    pbr::{NotShadowCaster, NotShadowReceiver},
+    prelude::*,
+    render::view::RenderLayers,
+};
+
+mod road;
+
+fn main() {
+    App::new()
+        .add_plugins(DefaultPlugins)
+        .add_plugins(bevy_mod_picking::DefaultPickingPlugins)
+        .add_plugin(bevy_egui::EguiPlugin)
+        .add_plugin(bevy_inspector_egui::quick::WorldInspectorPlugin::new())
+        .add_plugin(bevy_transform_gizmo::TransformGizmoPlugin::default())
+        .add_system(edit_road)
+        .add_system(sync_mesh)
+        .add_startup_system(setup)
+        .run();
+}
+
+/// set up a simple 3D scene
+fn setup(
+    mut commands: Commands,
+    mut meshes: ResMut<Assets<Mesh>>,
+    mut materials: ResMut<Assets<StandardMaterial>>,
+) {
+    let control_point_mesh = meshes.add(
+        shape::Icosphere {
+            radius: 0.5,
+            subdivisions: 32,
+        }
+        .try_into()
+        .unwrap(),
+    );
+    let control_point_material = materials.add(Color::rgb(0.8, 0.7, 0.6).into());
+
+    // control points
+    let control_points = vec![
+        Vec3::new(-6.0, 2.5, -15.0),
+        Vec3::new(0.0, 0.5, -7.0),
+        Vec3::new(0.0, 0.5, 2.0),
+        Vec3::new(-0.5, 0.7, 7.0),
+    ];
+    let road_entity = commands
+        .spawn((
+            PbrBundle {
+                mesh: meshes.add(Mesh::from(RoadMesh {
+                    edge_ring_count: 8,
+                    model: RoadModel {
+                        control_points: control_points.clone(),
+                    },
+                })),
+                material: materials.add(Color::rgb(0.45, 0.75, 0.60).into()),
+                ..default()
+            },
+            Road { edge_ring_count: 8 },
+        ))
+        .with_children(|builder| {
+            for (i, control_point) in control_points.iter().enumerate() {
+                builder.spawn((
+                    PbrBundle {
+                        mesh: control_point_mesh.clone(),
+                        material: control_point_material.clone(),
+                        transform: Transform::from_translation(*control_point),
+                        ..default()
+                    },
+                    ControlPointIndex(i),
+                    bevy_mod_picking::PickableBundle::default(),
+                    bevy_transform_gizmo::GizmoTransformable,
+                    NotShadowCaster,
+                    NotShadowReceiver,
+                    RenderLayers::layer(12),
+                ));
+            }
+        })
+        .id();
+
+    commands.insert_resource(SelectedRoad(road_entity));
+
+    // light
+    commands.spawn(PointLightBundle {
+        point_light: PointLight {
+            intensity: 4000.0,
+            range: 75.0,
+            shadows_enabled: true,
+            radius: 20.0,
+            ..default()
+        },
+        transform: Transform::from_xyz(4.0, 13.0, 4.0),
+        ..default()
+    });
+    // camera
+    commands
+        .spawn(Camera3dBundle {
+            transform: Transform::from_xyz(-6.0, 25.5, 6.0).looking_at(Vec3::ZERO, Vec3::Y),
+            ..default()
+        })
+        .insert(bevy_mod_picking::PickingCameraBundle::default())
+        .insert(bevy_transform_gizmo::GizmoPickSource::default());
+}
diff --git a/bins/sandbox/src/road/mesh.rs b/bins/sandbox/src/road/mesh.rs
new file mode 100644
index 00000000..6f62693a
--- /dev/null
+++ b/bins/sandbox/src/road/mesh.rs
@@ -0,0 +1,180 @@
+use crate::road::RoadModel;
+use bevy::{
+    prelude::*,
+    reflect::Array,
+    render::mesh::{Indices, PrimitiveTopology},
+};
+
+pub struct RoadMesh {
+    pub edge_ring_count: usize,
+    pub model: RoadModel,
+}
+
+impl From<RoadMesh> for Mesh {
+    fn from(value: RoadMesh) -> Self {
+        assert!(value.edge_ring_count >= 2);
+
+        let mut positions = Vec::new();
+        let mut normals = Vec::new();
+        let mut uvs = Vec::new();
+        let mut indices = Vec::new();
+
+        let ring_vertices = Road2dMesh::vertices();
+        let ring_line_indices = Road2dMesh::line_indices();
+
+        for ring_i in 0..value.edge_ring_count {
+            // Vertices.
+            let t = ring_i as f32 / (value.edge_ring_count - 1) as f32;
+            let bezier_point = value.model.get_bezier_point(t);
+            for vertex in &ring_vertices {
+                positions.push(
+                    *bezier_point
+                        .local_to_world_point(vertex.point.extend(0.0))
+                        .as_ref(),
+                );
+                normals.push(
+                    *bezier_point
+                        .local_to_world_vector(vertex.normal.extend(0.0))
+                        .as_ref(),
+                );
+                uvs.push([0.0, 0.0]);
+            }
+        }
+
+        for ring_i in 0..value.edge_ring_count - 1 {
+            // Triangle indices.
+            let root_i = ring_i * ring_vertices.len();
+            let root_i_next = (ring_i + 1) * ring_vertices.len();
+            for line_i in (0..ring_line_indices.len()).into_iter().step_by(2) {
+                let line_index_a = ring_line_indices[line_i];
+                let line_index_b = ring_line_indices[line_i + 1];
+                let current_a = root_i + line_index_a;
+                let current_b = root_i + line_index_b;
+                let next_a = root_i_next + line_index_a;
+                let next_b = root_i_next + line_index_b;
+                indices.push(current_a as u32);
+                indices.push(next_a as u32);
+                indices.push(next_b as u32);
+                indices.push(next_b as u32);
+                indices.push(current_b as u32);
+                indices.push(current_a as u32);
+            }
+        }
+
+        let mut mesh = Mesh::new(PrimitiveTopology::TriangleList);
+        mesh.set_indices(Some(Indices::U32(indices)));
+        mesh.insert_attribute(Mesh::ATTRIBUTE_POSITION, positions);
+        mesh.insert_attribute(Mesh::ATTRIBUTE_NORMAL, normals);
+        mesh.insert_attribute(Mesh::ATTRIBUTE_UV_0, uvs);
+        mesh
+    }
+}
+
+pub struct Road2dMesh;
+
+impl Road2dMesh {
+    pub fn vertices() -> [RoadVertex; 16] {
+        [
+            RoadVertex {
+                point: Vec2::new(3.0, 0.0),
+                normal: Vec2::new(0.0, 1.0),
+                u: 0.0,
+            },
+            RoadVertex {
+                point: Vec2::new(3.0, 0.0),
+                normal: Vec2::new(-0.70710678118, 0.70710678118),
+                u: 0.0,
+            },
+            RoadVertex {
+                point: Vec2::new(4.0, 1.0),
+                normal: Vec2::new(-0.70710678118, 0.70710678118),
+                u: 0.0,
+            },
+            RoadVertex {
+                point: Vec2::new(4.0, 1.0),
+                normal: Vec2::new(0.0, 1.0),
+                u: 0.0,
+            },
+            RoadVertex {
+                point: Vec2::new(5.0, 1.0),
+                normal: Vec2::new(0.0, 1.0),
+                u: 0.0,
+            },
+            RoadVertex {
+                point: Vec2::new(5.0, 1.0),
+                normal: Vec2::new(1.0, 0.0),
+                u: 0.0,
+            },
+            RoadVertex {
+                point: Vec2::new(5.0, -1.0),
+                normal: Vec2::new(1.0, 0.0),
+                u: 0.0,
+            },
+            RoadVertex {
+                point: Vec2::new(5.0, -1.0),
+                normal: Vec2::new(0.0, -1.0),
+                u: 0.0,
+            },
+            RoadVertex {
+                point: Vec2::new(-5.0, -1.0),
+                normal: Vec2::new(0.0, -1.0),
+                u: 0.0,
+            },
+            RoadVertex {
+                point: Vec2::new(-5.0, -1.0),
+                normal: Vec2::new(-1.0, 0.0),
+                u: 0.0,
+            },
+            RoadVertex {
+                point: Vec2::new(-5.0, 1.0),
+                normal: Vec2::new(-1.0, 0.0),
+                u: 0.0,
+            },
+            RoadVertex {
+                point: Vec2::new(-5.0, 1.0),
+                normal: Vec2::new(0.0, 1.0),
+                u: 0.0,
+            },
+            RoadVertex {
+                point: Vec2::new(-4.0, 1.0),
+                normal: Vec2::new(0.0, 1.0),
+                u: 0.0,
+            },
+            RoadVertex {
+                point: Vec2::new(-4.0, 1.0),
+                normal: Vec2::new(0.70710678118, 0.70710678118),
+                u: 0.0,
+            },
+            RoadVertex {
+                point: Vec2::new(-3.0, 0.0),
+                normal: Vec2::new(-0.70710678118, 0.70710678118),
+                u: 0.0,
+            },
+            RoadVertex {
+                point: Vec2::new(-3.0, 0.0),
+                normal: Vec2::new(0.0, 1.0),
+                u: 0.0,
+            },
+        ]
+    }
+
+    #[rustfmt::skip]
+    pub fn line_indices() -> [usize; 16] {
+        [
+            15, 0,
+            1, 2,
+            3, 4,
+            5, 6,
+            7, 8,
+            9, 10,
+            11, 12,
+            13, 14,
+        ]
+    }
+}
+
+pub struct RoadVertex {
+    pub point: Vec2,
+    pub normal: Vec2,
+    pub u: f32,
+}
diff --git a/bins/sandbox/src/road/mod.rs b/bins/sandbox/src/road/mod.rs
new file mode 100644
index 00000000..9fe68f6d
--- /dev/null
+++ b/bins/sandbox/src/road/mod.rs
@@ -0,0 +1,72 @@
+pub mod mesh;
+pub mod systems;
+
+use bevy::prelude::*;
+
+#[derive(Resource, Deref, DerefMut)]
+pub struct SelectedRoad(pub Entity);
+
+#[derive(Component, Clone)]
+pub struct Road {
+    pub edge_ring_count: usize,
+}
+
+#[derive(Component, Clone)]
+pub struct ControlPointIndex(pub usize);
+
+#[derive(Component)]
+pub struct VisualiseT {
+    pub value: f32,
+}
+
+pub struct OrientedPoint {
+    pub pos: Vec3,
+    pub rot: Quat,
+}
+
+impl OrientedPoint {
+    pub fn new(pos: Vec3, rot: Quat) -> Self {
+        Self { pos, rot }
+    }
+
+    pub fn from_forward(pos: Vec3, forward: Vec3) -> Self {
+        let up = Vec3::Y;
+        let right = up.cross(forward).normalize();
+        let up = forward.cross(right);
+        let rot = Quat::from_mat3(&Mat3::from_cols(right, up, forward));
+        Self::new(pos, rot)
+    }
+
+    pub fn local_to_world_point(&self, local: Vec3) -> Vec3 {
+        self.pos + self.rot * local
+    }
+
+    pub fn local_to_world_vector(&self, local: Vec3) -> Vec3 {
+        self.rot * local
+    }
+}
+
+pub struct RoadModel {
+    pub control_points: Vec<Vec3>,
+}
+
+impl RoadModel {
+    fn get_bezier_point(&self, t: f32) -> OrientedPoint {
+        assert!(self.control_points.len() > 1);
+
+        let mut control_points = self.control_points.clone();
+
+        while control_points.len() > 2 {
+            let mut new_control_points = Vec::with_capacity(control_points.len() - 1);
+            for i in 1..control_points.len() {
+                new_control_points.push(control_points[i - 1].lerp(control_points[i], t));
+            }
+            control_points = new_control_points;
+        }
+
+        let pos = control_points[0].lerp(control_points[1], t);
+        let tangent = (control_points[1] - control_points[0]).normalize_or_zero();
+
+        OrientedPoint::from_forward(pos, tangent)
+    }
+}
diff --git a/bins/sandbox/src/road/systems.rs b/bins/sandbox/src/road/systems.rs
new file mode 100644
index 00000000..8c9d5863
--- /dev/null
+++ b/bins/sandbox/src/road/systems.rs
@@ -0,0 +1,133 @@
+use crate::road::{mesh::RoadMesh, ControlPointIndex, Road, RoadModel, SelectedRoad};
+use bevy::prelude::*;
+use bevy_egui::{egui, egui::Widget, EguiContexts};
+use bevy_mod_picking::Selection;
+
+pub fn edit_road(
+    mut egui: EguiContexts,
+    selected_road: Res<SelectedRoad>,
+    mut road_segment_query: Query<(&Children, &mut Road)>,
+    mut control_points_query: Query<(
+        Entity,
+        &ControlPointIndex,
+        &mut Transform,
+        &Selection,
+        &mut Interaction,
+    )>,
+) {
+    let ctx = egui.ctx_mut();
+
+    let Ok((children, mut road)) = road_segment_query.get_mut(**selected_road) else {
+        return;
+    };
+
+    let mut control_points = children
+        .into_iter()
+        .filter_map(|child| control_points_query.get(*child).ok())
+        .map(
+            |(entity, control_point_index, transform, selection, interaction)| {
+                (
+                    entity,
+                    control_point_index.clone(),
+                    transform.clone(),
+                    *selection,
+                    interaction.clone(),
+                )
+            },
+        )
+        .collect::<Vec<_>>();
+    control_points.sort_by(|(_, a, _, _, _), (_, b, _, _, _)| a.0.cmp(&b.0));
+
+    egui::Window::new("Road").show(ctx, |ui| {
+        let mut edge_ring_count = road.edge_ring_count;
+        ui.horizontal(|ui| {
+            ui.label("edge ring count: ");
+            egui::widgets::Slider::new(&mut edge_ring_count, 2..=64)
+                .fixed_decimals(0)
+                .ui(ui);
+        });
+
+        if edge_ring_count != road.edge_ring_count {
+            road.edge_ring_count = edge_ring_count;
+        }
+
+        ui.label("Control points:");
+        for (entity, _, control_point_transform, _selection, _interaction) in &mut control_points {
+            ui.horizontal(|ui| {
+                ui.label("x:");
+                egui::widgets::Slider::new(
+                    &mut control_point_transform.translation.x,
+                    -15.0..=15.0,
+                )
+                .ui(ui);
+                ui.label("y:");
+                egui::widgets::Slider::new(
+                    &mut control_point_transform.translation.y,
+                    -15.0..=15.0,
+                )
+                .ui(ui);
+                ui.label("z:");
+                egui::widgets::Slider::new(
+                    &mut control_point_transform.translation.z,
+                    -15.0..=15.0,
+                )
+                .ui(ui);
+            });
+            if control_point_transform.translation
+                != control_points_query
+                    .get_component::<Transform>(*entity)
+                    .unwrap()
+                    .translation
+            {
+                control_points_query
+                    .get_component_mut::<Transform>(*entity)
+                    .unwrap()
+                    .translation = control_point_transform.translation;
+            }
+        }
+    });
+}
+
+pub fn sync_mesh(
+    mut meshes: ResMut<Assets<Mesh>>,
+    changed_control_points: Query<&Parent, (Changed<Transform>, With<ControlPointIndex>)>,
+    changed_roads: Query<Entity, Or<(Changed<Children>, Changed<Road>)>>,
+    control_points_query: Query<(&ControlPointIndex, &Transform)>,
+    mut road_segments: Query<(&Children, &Road, &mut Handle<Mesh>)>,
+) {
+    let mut changed_road_entities = Vec::new();
+    changed_road_entities.append(&mut changed_control_points.iter().map(|p| p.get()).collect());
+    changed_road_entities.append(&mut changed_road_entities.iter().cloned().collect());
+    changed_road_entities.append(&mut changed_roads.iter().collect());
+
+    changed_road_entities.sort();
+    changed_road_entities.dedup();
+
+    for road_entity in changed_road_entities {
+        let Ok((road_segment_children, road, mut mesh_handle)) =
+            road_segments.get_mut(road_entity) else {
+            continue;
+        };
+        let mut control_points = road_segment_children
+            .into_iter()
+            .filter_map(|child| control_points_query.get(*child).ok())
+            .collect::<Vec<_>>();
+        control_points.sort_by(|(a, _), (b, _)| a.0.cmp(&b.0));
+        for i in 0..control_points.len() {
+            assert_eq!(control_points[i].0 .0, i);
+        }
+
+        let control_points: Vec<_> = control_points
+            .iter()
+            .map(|(_, transform)| transform.translation)
+            .collect();
+
+        *mesh_handle = meshes.set(
+            mesh_handle.clone_weak(),
+            Mesh::from(RoadMesh {
+                edge_ring_count: road.edge_ring_count,
+                model: RoadModel { control_points },
+            }),
+        )
+    }
+}
diff --git a/bins/server/Cargo.toml b/bins/server/Cargo.toml
index 79306280..f88c5030 100644
--- a/bins/server/Cargo.toml
+++ b/bins/server/Cargo.toml
@@ -13,7 +13,7 @@ default = []
 mr_server_lib = { path = "../../libs/server_lib" }
 mr_utils_lib = { path = "../../libs/utils_lib", features = ["bevy_logging"] }
 
-bevy = { version = "0.9.1", default-features = false }
+bevy = { version = "0.10", default-features = false }
 rymder = { version = "0.6.0", features = ["player-tracking"] }
 sentry = "0.29.1"
 tokio = { version = "1.24", features = ["sync"] }
diff --git a/bins/web_client/Cargo.toml b/bins/web_client/Cargo.toml
index bd455fca..d53eb59d 100644
--- a/bins/web_client/Cargo.toml
+++ b/bins/web_client/Cargo.toml
@@ -16,7 +16,7 @@ crate-type = ["cdylib", "rlib"]
 mr_client_lib = { path = "../../libs/client_lib", features = ["web"] }
 mr_utils_lib = { path = "../../libs/utils_lib", features = ["bevy_logging"] }
 
-bevy = "0.9.1"
+bevy = "0.10"
 console_error_panic_hook = "0.1.7"
 log = "0.4.17"
 uuid = "1.2"
diff --git a/bins/web_client/src/lib.rs b/bins/web_client/src/lib.rs
index ab8dacc8..2544d4e0 100755
--- a/bins/web_client/src/lib.rs
+++ b/bins/web_client/src/lib.rs
@@ -1,13 +1,20 @@
 #![allow(clippy::unused_unit)]
 
-use bevy::prelude::*;
-use mr_client_lib::{MuddleClientConfig, MuddleClientPlugin, DEFAULT_SERVER_PORT};
+use bevy::{prelude::*, window::PrimaryWindow};
+use mr_client_lib::{
+    MuddleClientConfig, MuddleClientPlugin, MuddleTracePlugin, DEFAULT_SERVER_PORT,
+};
 use mr_utils_lib::try_parse_from_env;
 use std::net::SocketAddr;
 use wasm_bindgen::prelude::*;
 
 #[wasm_bindgen(start)]
 pub fn main() {
+    let mut app = App::new();
+    app.add_plugin(MuddleTracePlugin);
+
+    egui_logger::init().unwrap();
+
     App::new()
         .insert_resource(MuddleClientConfig {
             persistence_url: try_parse_from_env!("MUDDLE_PUBLIC_PERSISTENCE_URL"),
@@ -17,18 +24,15 @@ pub fn main() {
             matchmaker_url: try_parse_from_env!("MUDDLE_MATCHMAKER_URL"),
             server_addr: server_addr(),
         })
-        .insert_resource(Msaa { samples: 4 })
-        .add_plugins(bevy::DefaultPlugins)
+        .insert_resource(Msaa::Sample4)
+        .add_plugins(DefaultPlugins)
         .add_plugin(MuddleClientPlugin)
         .add_system(resize_canvas)
         .run();
 }
 
-fn resize_canvas(mut windows: ResMut<Windows>) {
-    let window = match windows.get_primary_mut() {
-        Some(window) => window,
-        None => return,
-    };
+fn resize_canvas(mut windows: Query<&'static mut Window, With<PrimaryWindow>>) {
+    let Ok(mut window) = windows.get_single_mut() else { return };
 
     let js_window = web_sys::window().expect("no global `window` exists");
 
@@ -45,7 +49,7 @@ fn resize_canvas(mut windows: ResMut<Windows>) {
 
     #[allow(clippy::float_cmp)]
     if window.width() != width || window.height() != height {
-        window.set_resolution(width, height);
+        window.resolution.set(width, height);
     }
 }
 
diff --git a/libs/client_lib/Cargo.toml b/libs/client_lib/Cargo.toml
index f090d6f9..2e7fb232 100644
--- a/libs/client_lib/Cargo.toml
+++ b/libs/client_lib/Cargo.toml
@@ -14,27 +14,31 @@ profiler = ["puffin", "puffin_egui", "mr_shared_lib/profiler"]
 [dependencies]
 anyhow = "1.0"
 base64 = "0.20.0-alpha.1"
-bevy = "0.9.1"
-bevy_egui = "0.18"
-bevy-inspector-egui = "0.15.0"
-bevy-inspector-egui-rapier = { version = "0.9", features = ["rapier2d"] }
-bevy_mod_picking = "0.11"
+bevy = "0.10"
+bevy_egui = "0.20"
+bevy-inspector-egui = "0.18"
+#bevy-inspector-egui-rapier = { version = "0.9", features = ["rapier2d"] }
+bevy_mod_picking = "0.12"
 bevy_disturbulence = { git = "https://github.com/mvlabat/bevy_disturbulence.git", branch = "wip", features = ["client"] }
-bevy_rapier2d = { version = "0.19", features = ["wasm-bindgen"] }
+bevy_puffin = "0.4.0"
+bevy_rapier2d = { version = "0.21", features = ["wasm-bindgen"] }
 chrono = "0.4.23"
+egui_logger = "0.3.0"
 futures = "0.3.25"
-iyes_loopless = "0.9"
 jwt-compact = { version = "0.6", features = ["std", "clock", "with_rsa"], default-features = false }
 puffin = { version = "0.14", optional = true }
-puffin_egui = { version = "0.19", optional = true }
+puffin_egui = { version = "0.20", optional = true }
 rand = "0.8"
-rapier2d = "0.16"
+rapier2d = "0.17"
 reqwest = { version = "0.11", features = ["json"] }
 serde = "1.0"
 serde_json = "1.0"
 serde_urlencoded = "0.7"
 sha2 = "0.10"
 tokio = { version = "1.24", features = ["rt", "sync"] }
+tracing-subscriber = {version = "0.3", features = ["registry", "env-filter"]}
+tracing-log = "0.1"
+tracing-error = "0.2"
 url = { version = "2.3", features = ["serde"] }
 wasm-timer = "0.2"
 webbrowser = "0.8"
diff --git a/libs/client_lib/src/camera.rs b/libs/client_lib/src/camera.rs
index b4ed66e7..f9a7f413 100644
--- a/libs/client_lib/src/camera.rs
+++ b/libs/client_lib/src/camera.rs
@@ -1,17 +1,24 @@
 use crate::{
     components::{CameraPivotDirection, CameraPivotTag},
+    ui::side_panel::OccupiedScreenSpace,
     CurrentPlayerNetId, MainCameraPivotEntity,
 };
 use bevy::{
     ecs::{
+        component::Component,
         entity::Entity,
         query::{Changed, With},
-        system::{Commands, Query, RemovedComponents, Res, SystemParam},
+        removal_detection::RemovedComponents,
+        system::{Commands, Query, Res, SystemParam},
     },
     hierarchy::{BuildChildren, Parent},
     log,
+    math::Vec3,
+    prelude::{Deref, DerefMut},
+    render::camera::Projection,
     time::Time,
     transform::components::Transform,
+    window::{PrimaryWindow, Window},
 };
 use mr_shared_lib::{
     game::components::{PlayerTag, Position, Spawned},
@@ -20,6 +27,12 @@ use mr_shared_lib::{
     GameTime, PLAYER_RADIUS,
 };
 
+pub const CAMERA_TARGET: Vec3 = Vec3::ZERO;
+
+/// Camera transform which is unaffected by UI side panels.
+#[derive(Component, Deref, DerefMut)]
+pub struct OriginalCameraTransform(pub Transform);
+
 const CAMERA_MOVEMENT_SPEED: f32 = 4.0;
 
 pub type SpawnedOrDespawnedPlayers<'w, 's> = Query<
@@ -36,13 +49,44 @@ pub struct ReattachCameraQueries<'w, 's> {
     all_entities: Query<'w, 's, Entity>,
 }
 
+pub fn update_camera_transform_system(
+    occupied_screen_space: Res<OccupiedScreenSpace>,
+    windows: Query<&Window, With<PrimaryWindow>>,
+    mut camera_query: Query<(&Projection, &mut Transform, &OriginalCameraTransform)>,
+) {
+    let (camera_projection, mut transform, original_camera_transform) =
+        match camera_query.get_single_mut() {
+            Ok((Projection::Perspective(projection), transform, original_camera_transform)) => {
+                (projection, transform, original_camera_transform)
+            }
+            _ => unreachable!(),
+        };
+
+    let distance_to_target = (CAMERA_TARGET - original_camera_transform.translation).length();
+    let frustum_height = 2.0 * distance_to_target * (camera_projection.fov * 0.5).tan();
+    let frustum_width = frustum_height * camera_projection.aspect_ratio;
+
+    let window = windows.single();
+
+    let left_taken = 0.0;
+    let right_taken = 0.0;
+    let top_taken = 0.0;
+    let bottom_taken = occupied_screen_space.bottom / window.height();
+    transform.translation = original_camera_transform.translation
+        + transform.rotation.mul_vec3(Vec3::new(
+            (right_taken - left_taken) * frustum_width * 0.5,
+            (top_taken - bottom_taken) * frustum_height * 0.5,
+            0.0,
+        ));
+}
+
 pub fn reattach_camera_system(
     mut commands: Commands,
     time: Res<GameTime>,
     main_camera_pivot: Res<MainCameraPivotEntity>,
     current_player_net_id: Res<CurrentPlayerNetId>,
     player_registry: Res<EntityRegistry<PlayerNetId>>,
-    despawned_player_events: RemovedComponents<PlayerTag>,
+    mut despawned_player_events: RemovedComponents<PlayerTag>,
     queries: ReattachCameraQueries,
 ) {
     #[cfg(feature = "profiler")]
@@ -107,7 +151,7 @@ pub fn reattach_camera_system(
         (failed_to_deattach || current_player_net_id.0.is_none()),
     ) {
         log::debug!("Freeing camera pivot");
-        main_camera_pivot_commands.insert(Transform::from_xyz(0.0, 0.0, 0.0));
+        main_camera_pivot_commands.insert(Transform::IDENTITY);
         // If an entity was removed with `World::despawn` (that's what happens when we
         // restart the game), calling `remove_parent` will panic.
         if queries.all_entities.contains(camera_pivot_parent.get()) {
diff --git a/libs/client_lib/src/init_app_systems.rs b/libs/client_lib/src/init_app_systems.rs
index 3d516711..9af90b87 100644
--- a/libs/client_lib/src/init_app_systems.rs
+++ b/libs/client_lib/src/init_app_systems.rs
@@ -1,4 +1,5 @@
 use crate::{
+    camera::{OriginalCameraTransform, CAMERA_TARGET},
     components::{CameraPivotDirection, CameraPivotTag},
     MainCameraEntity, MainCameraPivotEntity,
 };
@@ -6,7 +7,8 @@ use bevy::{
     core_pipeline::core_3d::Camera3dBundle,
     ecs::{
         entity::Entity,
-        system::{Commands, Local},
+        schedule::NextState,
+        system::{Commands, Local, ResMut},
     },
     hierarchy::BuildChildren,
     log,
@@ -14,13 +16,13 @@ use bevy::{
     pbr::{PbrBundle, PointLight, PointLightBundle},
     transform::components::{GlobalTransform, Transform},
 };
-use iyes_loopless::state::NextState;
 use mr_shared_lib::{client::assets::MuddleAssets, AppState};
 
 /// This system is needed for the web version. As assets loading is blocking
 /// there, we need to trigger loading shaders before we join a game.
 pub fn load_shaders_system(
     mut commands: Commands,
+    mut next_app_state: ResMut<NextState<AppState>>,
     assets: MuddleAssets,
     mut frames_skipped: Local<u8>,
     mut entities_to_clean_up: Local<Vec<Entity>>,
@@ -36,7 +38,7 @@ pub fn load_shaders_system(
             commands.entity(entity).despawn();
         }
         log::info!("Changing the app state to {:?}", AppState::MainMenu);
-        commands.insert_resource(NextState(AppState::MainMenu));
+        next_app_state.set(AppState::MainMenu);
         return;
     }
 
@@ -64,12 +66,14 @@ pub fn basic_scene_system(mut commands: Commands) {
         ..Default::default()
     });
     // Camera.
+    let camera_transform = Transform::from_translation(Vec3::new(-3.0, -14.0, 14.0))
+        .looking_at(CAMERA_TARGET, Vec3::Z);
     let main_camera_entity = commands
         .spawn(Camera3dBundle {
-            transform: Transform::from_translation(Vec3::new(-3.0, -14.0, 14.0))
-                .looking_at(Vec3::default(), Vec3::Z),
+            transform: camera_transform,
             ..Default::default()
         })
+        .insert(OriginalCameraTransform(camera_transform))
         .insert(bevy_mod_picking::PickingCameraBundle::default())
         .id();
     let main_camera_pivot_entity = commands
diff --git a/libs/client_lib/src/input.rs b/libs/client_lib/src/input.rs
index b9752401..165656e9 100644
--- a/libs/client_lib/src/input.rs
+++ b/libs/client_lib/src/input.rs
@@ -9,9 +9,9 @@ use bevy::{
     prelude::*,
     render::camera::CameraProjection,
     utils::Instant,
+    window::PrimaryWindow,
 };
-use bevy_egui::EguiContext;
-use bevy_inspector_egui::WorldInspectorParams;
+use bevy_egui::EguiContexts;
 use mr_shared_lib::{
     game::{components::Spawned, level::LevelObject},
     messages::{EntityNetId, PlayerNetId, SpawnLevelObjectRequest},
@@ -19,7 +19,6 @@ use mr_shared_lib::{
     registry::EntityRegistry,
     GameTime, COMPONENT_FRAMEBUFFER_LIMIT,
 };
-use std::marker::PhantomData;
 
 const SWITCH_ROLE_COOLDOWN_SECS: u64 = 1;
 
@@ -84,31 +83,27 @@ pub struct PlayerUpdatesParams<'w, 's> {
 
 #[derive(SystemParam)]
 pub struct UiParams<'w, 's> {
-    egui_context: ResMut<'w, EguiContext>,
+    egui_contexts: EguiContexts<'w, 's>,
     debug_ui_state: ResMut<'w, DebugUiState>,
-    #[system_param(ignore)]
-    marker: PhantomData<&'s ()>,
 }
 
 pub fn track_input_events_system(
     mut input_events: InputEvents,
     time: Res<GameTime>,
     mut ui_params: UiParams,
-    mut world_inspector_params: ResMut<WorldInspectorParams>,
     mut player_updates_params: PlayerUpdatesParams,
     mut mouse_position: ResMut<MouseScreenPosition>,
     keyboard_input: Res<Input<KeyCode>>,
 ) {
     #[cfg(feature = "profiler")]
     puffin::profile_function!();
-    if ui_params.egui_context.ctx_mut().wants_keyboard_input() {
+    if ui_params.egui_contexts.ctx_mut().wants_keyboard_input() {
         return;
     }
 
     process_hotkeys(
         &keyboard_input,
         &mut ui_params.debug_ui_state,
-        &mut world_inspector_params,
         &mut player_updates_params,
     );
 
@@ -146,6 +141,11 @@ pub fn track_input_events_system(
             time.frame_number,
             COMPONENT_FRAMEBUFFER_LIMIT,
         );
+        log::trace!(
+            "Inserting direction update: {} (frame: {})",
+            direction,
+            time.frame_number
+        );
         direction_updates.insert(
             time.frame_number,
             Some(PlayerDirectionUpdate {
@@ -167,7 +167,7 @@ pub fn track_input_events_system(
     }
 
     // Absolute cursor position (in window coordinates).
-    if let Some(ev) = input_events.cursor.iter().next_back() {
+    if let Some(ev) = input_events.cursor.iter().last() {
         mouse_position.0 = ev.position;
     }
 
@@ -182,7 +182,7 @@ pub fn track_input_events_system(
 }
 
 pub fn cast_mouse_ray_system(
-    windows: Res<Windows>,
+    primary_window_query: Query<&'static Window, With<PrimaryWindow>>,
     mouse_position: Res<MouseScreenPosition>,
     main_camera_entity: Res<MainCameraEntity>,
     cameras: Query<(&GlobalTransform, &Camera, &Projection)>,
@@ -191,7 +191,9 @@ pub fn cast_mouse_ray_system(
 ) {
     #[cfg(feature = "profiler")]
     puffin::profile_function!();
-    let window = windows.iter().next().expect("expected a window");
+    let window = primary_window_query
+        .get_single()
+        .expect("expected a window");
     let (camera_transform, _camera, camera_projection) = cameras
         .get(main_camera_entity.0)
         .expect("expected a main camera");
@@ -220,12 +222,10 @@ pub fn cast_mouse_ray_system(
 fn process_hotkeys(
     keyboard_input: &Input<KeyCode>,
     debug_ui_state: &mut DebugUiState,
-    world_inspector_params: &mut WorldInspectorParams,
     player_updates_params: &mut PlayerUpdatesParams,
 ) {
     if keyboard_input.just_pressed(KeyCode::Period) {
         debug_ui_state.show = !debug_ui_state.show;
-        world_inspector_params.enabled = debug_ui_state.show;
         #[cfg(feature = "profiler")]
         puffin::set_scopes_on(debug_ui_state.show);
     }
diff --git a/libs/client_lib/src/lib.rs b/libs/client_lib/src/lib.rs
index af56eff4..2658a2eb 100644
--- a/libs/client_lib/src/lib.rs
+++ b/libs/client_lib/src/lib.rs
@@ -3,9 +3,12 @@
 #![allow(clippy::only_used_in_recursion)]
 
 pub use net::DEFAULT_SERVER_PORT;
+pub use plugins::logging::MuddleTracePlugin;
 
 use crate::{
-    camera::{move_free_camera_pivot_system, reattach_camera_system},
+    camera::{
+        move_free_camera_pivot_system, reattach_camera_system, update_camera_transform_system,
+    },
     config_storage::OfflineAuthConfig,
     game_events::process_scheduled_spawns_system,
     init_app_systems::load_shaders_system,
@@ -18,7 +21,8 @@ use crate::{
     },
     ui::{
         builder_ui::{EditedLevelObject, EditedObjectUpdate},
-        debug_ui::update_debug_ui_state_system,
+        debug_ui::{update_debug_ui_state_system, DebugUiState},
+        side_panel::OccupiedScreenSpace,
     },
     visuals::{
         control_builder_visibility_system, process_control_points_input_system,
@@ -30,23 +34,24 @@ use bevy::{
     diagnostic::FrameTimeDiagnosticsPlugin,
     ecs::{
         entity::Entity,
-        schedule::{IntoSystemDescriptor, ShouldRun, SystemStage},
-        system::{Commands, IntoSystem, Local, Res, ResMut, Resource, SystemParam},
+        schedule::{
+            common_conditions::{in_state, not},
+            Condition, IntoSystemConfig, IntoSystemConfigs, NextState, State, SystemSet,
+        },
+        system::{IntoSystem, Local, Res, ResMut, Resource, SystemParam},
     },
     log,
     time::Time,
     utils::{HashMap, Instant},
 };
 use bevy_egui::EguiPlugin;
-use bevy_inspector_egui::{WorldInspectorParams, WorldInspectorPlugin};
-use bevy_inspector_egui_rapier::InspectableRapierPlugin;
-use iyes_loopless::prelude::*;
+use bevy_inspector_egui::quick::WorldInspectorPlugin;
 use mr_shared_lib::{
     framebuffer::{FrameNumber, Framebuffer},
     game::client_factories::VisibilitySettings,
     messages::{EntityNetId, PlayerNetId},
     net::{ConnectionState, ConnectionStatus, MessageId},
-    AppState, GameSessionState, GameTime, MuddleSharedPlugin, SimulationTime,
+    AppState, GameSessionState, GameTime, MuddleSharedPlugin, MuddleSystemConfigs, SimulationTime,
     COMPONENT_FRAMEBUFFER_LIMIT, SIMULATIONS_PER_SECOND, TICKS_PER_NETWORK_BROADCAST,
 };
 use std::{marker::PhantomData, net::SocketAddr};
@@ -60,6 +65,7 @@ mod helpers;
 mod init_app_systems;
 mod input;
 mod net;
+mod plugins;
 mod ui;
 mod utils;
 mod visuals;
@@ -69,6 +75,12 @@ const TICKING_SPEED_FACTOR: u16 = 100;
 
 pub struct MuddleClientPlugin;
 
+#[derive(Debug, Hash, PartialEq, Eq, Clone, SystemSet)]
+pub enum ClientSet {
+    ProcessIoMessages,
+    BuilderSystems,
+}
+
 impl Plugin for MuddleClientPlugin {
     fn build(&self, app: &mut App) {
         let config_server_addr = app
@@ -79,33 +91,40 @@ impl Plugin for MuddleClientPlugin {
             .unwrap_or_else(|| SocketAddr::new(DEFAULT_SERVER_IP_ADDR, DEFAULT_SERVER_PORT))
             .to_string();
 
-        let input_stage = SystemStage::single_threaded()
-            .with_system(maintain_connection_system.run_not_in_state(AppState::Loading))
+        let input_set = (
+            maintain_connection_system.run_if(not(in_state(AppState::Loading))),
             // Processing network events should happen before tracking input:
             // we rely on resetting current's player inputs on each delta update message (event).
-            .with_system(process_network_events_system.after(maintain_connection_system))
-            .with_system(input::track_input_events_system.after(process_network_events_system))
-            .with_system(input::cast_mouse_ray_system.after(input::track_input_events_system));
-        let broadcast_updates_stage = SystemStage::single_threaded()
-            .with_system(send_network_updates_system)
-            .with_system(send_requests_system);
-        let post_tick_stage = SystemStage::single_threaded()
-            .with_system(control_builder_visibility_system)
-            .with_system(update_player_sensor_materials_system)
-            .with_system(reattach_camera_system)
-            .with_system(move_free_camera_pivot_system.after(reattach_camera_system))
-            .with_system(pause_simulation_system)
-            .with_system(update_debug_ui_state_system.after(pause_simulation_system))
-            .with_system(control_ticking_speed_system.after(pause_simulation_system))
-            .with_system(fill_actual_frames_ahead_system.after(control_ticking_speed_system));
+            process_network_events_system.after(maintain_connection_system),
+            input::track_input_events_system.after(process_network_events_system),
+            input::cast_mouse_ray_system.after(input::track_input_events_system),
+        )
+            .into_configs();
+        let broadcast_updates_set =
+            (send_network_updates_system, send_requests_system).into_configs();
+        let post_tick_set = (
+            control_builder_visibility_system,
+            update_player_sensor_materials_system,
+            reattach_camera_system,
+            move_free_camera_pivot_system.after(reattach_camera_system),
+            pause_simulation_system,
+            update_debug_ui_state_system.after(pause_simulation_system),
+            control_ticking_speed_system.after(pause_simulation_system),
+            fill_actual_frames_ahead_system.after(control_ticking_speed_system),
+        )
+            .into_configs();
 
         app.add_plugin(bevy_mod_picking::PickingPlugin)
             .add_plugin(FrameTimeDiagnosticsPlugin)
             .add_plugin(EguiPlugin)
-            .add_plugin(InspectableRapierPlugin)
-            .add_plugin(WorldInspectorPlugin::new())
-            .init_resource::<WindowInnerSize>()
+            // TODO: re-enable once Bevy 0.10 support is released.
+            // .add_plugin(bevy_inspector_egui_rapier::InspectableRapierPlugin)
+            .add_plugin(
+                WorldInspectorPlugin::new()
+                    .run_if(|debug_ui_state: Res<DebugUiState>| debug_ui_state.show),
+            )
             .init_resource::<input::MouseScreenPosition>()
+            .init_resource::<OccupiedScreenSpace>()
             .insert_resource(ui::main_menu_ui::MainMenuUiState::new(config_server_addr))
             .add_event::<EditedObjectUpdate>()
             // Startup systems.
@@ -113,55 +132,54 @@ impl Plugin for MuddleClientPlugin {
             .add_startup_system(init_app_systems::basic_scene_system)
             .add_startup_system(read_offline_auth_config_system)
             // Loading the app.
-            .add_system(load_shaders_system.run_in_state(AppState::Loading))
+            .add_system(load_shaders_system.run_if(in_state(AppState::Loading)))
             // Game.
             .add_plugin(MuddleSharedPlugin::new(
-                IntoSystem::into_system(net_adaptive_run_criteria),
-                input_stage,
-                SystemStage::single_threaded(),
-                broadcast_updates_stage,
-                post_tick_stage,
+                MuddleSystemConfigs {
+                    main_run_criteria: IntoSystem::into_system(net_adaptive_run_criteria),
+                    input_set,
+                    post_game_set: ().into_configs(),
+                    broadcast_updates_set,
+                    post_tick_set,
+                },
                 None,
             ))
             .add_system(process_scheduled_spawns_system)
             // Egui.
             .add_startup_system(ui::set_ui_scale_factor_system)
+            .add_system(update_camera_transform_system)
             .add_system(ui::debug_ui::update_debug_visibility_system)
             .add_system(ui::debug_ui::debug_ui_system)
-            .add_system(ui::debug_ui::profiler_ui_system)
-            .add_system(ui::overlay_ui::app_loading_ui.run_in_state(AppState::Loading))
+            .add_system(ui::side_panel::side_panels_ui_system)
+            .add_system(ui::overlay_ui::app_loading_ui.run_if(in_state(AppState::Loading)))
             .add_system(
                 ui::overlay_ui::connection_status_overlay_system
-                    .run_not_in_state(AppState::Loading),
+                    .run_if(not(in_state(AppState::Loading))),
             )
             .add_system(ui::debug_ui::inspect_object_system)
             .add_system(
-                ui::player_ui::leaderboard_ui_system.run_not_in_state(GameSessionState::Loading),
+                ui::player_ui::leaderboard_ui_system
+                    .run_if(not(in_state(GameSessionState::Loading))),
+            )
+            .add_system(
+                ui::player_ui::help_ui_system.run_if(not(in_state(GameSessionState::Loading))),
             )
-            .add_system(ui::player_ui::help_ui_system.run_not_in_state(GameSessionState::Loading))
             .add_startup_system(ui::main_menu_ui::init_menu_auth_state_system)
-            .add_system_set(
-                ui::main_menu_ui::process_io_messages_system_set().label("process_io_messages"),
+            .add_systems(
+                ui::main_menu_ui::process_io_messages_system_set()
+                    .in_set(ClientSet::ProcessIoMessages),
             )
             .add_system(
                 ui::main_menu_ui::main_menu_ui_system
-                    .run_in_state(AppState::MainMenu)
-                    .run_if_not(has_server_to_connect)
-                    .after("process_io_messages"),
+                    .run_if(in_state(AppState::MainMenu).and_then(not(has_server_to_connect)))
+                    .after(ClientSet::ProcessIoMessages),
             )
             // Builder mode systems.
-            .add_system_set(ui::builder_ui::builder_system_set().label("builder_system_set"))
+            .add_systems(ui::builder_ui::builder_system_set().in_set(ClientSet::BuilderSystems))
             // Add to the system set above after fixing https://github.com/mvlabat/muddle-run/issues/46.
-            .add_system(process_control_points_input_system.after("builder_system_set"))
-            .add_system(spawn_control_points_system.after("builder_system_set"));
-
-        // There's also `GameSessionState`, which is added by `MuddleSharedPlugin`.
-        app.add_state(AppState::Loading);
+            .add_system(process_control_points_input_system.after(ClientSet::BuilderSystems))
+            .add_system(spawn_control_points_system.after(ClientSet::BuilderSystems));
 
-        app.world
-            .get_resource_mut::<WorldInspectorParams>()
-            .unwrap()
-            .enabled = false;
         app.init_resource::<InitialRtt>();
         app.init_resource::<EstimatedServerTime>();
         app.init_resource::<GameTicksPerSecond>();
@@ -194,12 +212,6 @@ pub struct MuddleClientConfig {
     pub server_addr: Option<SocketAddr>,
 }
 
-#[derive(Resource, Default)]
-pub struct WindowInnerSize {
-    pub width: usize,
-    pub height: usize,
-}
-
 #[derive(Resource, Default)]
 pub struct ExpectedFramesAhead {
     pub frames: FrameNumber,
@@ -235,7 +247,7 @@ pub struct EstimatedServerTime {
 
 /// If an incoming delta update comes later or earlier than `server_frame` (from
 /// the `SimulationTime` resource), we update this value to let the clocks sync
-/// so that a clien receives updates in time before the simulation.
+/// so that a client receives updates in time before the simulation.
 /// See the `sync_clock` function.
 #[derive(Resource, Default)]
 pub struct DelayServerTime {
@@ -310,8 +322,8 @@ pub struct MainCameraPivotEntity(pub Entity);
 pub struct MainCameraEntity(pub Entity);
 
 fn pause_simulation_system(
-    mut commands: Commands,
-    game_state: Res<CurrentState<GameSessionState>>,
+    mut next_game_session_state: ResMut<NextState<GameSessionState>>,
+    game_session_state: Res<State<GameSessionState>>,
     connection_state: Res<ConnectionState>,
     game_time: Res<GameTime>,
     estimated_server_time: Res<EstimatedServerTime>,
@@ -326,24 +338,26 @@ fn pause_simulation_system(
         .saturating_sub(estimated_server_time.frame_number.value())
         < COMPONENT_FRAMEBUFFER_LIMIT / 2;
 
-    if let GameSessionState::Paused = game_state.0 {
+    if let GameSessionState::Paused = game_session_state.0 {
         if is_connected && has_server_updates {
             log::info!(
                 "Changing the game session state to {:?}",
                 GameSessionState::Playing
             );
-            commands.insert_resource(NextState(GameSessionState::Playing));
+            next_game_session_state.set(GameSessionState::Playing);
             return;
         }
     }
 
     // We can pause the game only when we are actually playing (not loading).
-    if matches!(game_state.0, GameSessionState::Playing) && (!is_connected || !has_server_updates) {
+    if matches!(game_session_state.0, GameSessionState::Playing)
+        && (!is_connected || !has_server_updates)
+    {
         log::info!(
             "Changing the game session state to {:?}",
             GameSessionState::Paused
         );
-        commands.insert_resource(NextState(GameSessionState::Paused));
+        next_game_session_state.set(GameSessionState::Paused);
     }
 }
 
@@ -467,8 +481,8 @@ fn net_adaptive_run_criteria(
     mut state: Local<NetAdaptiveRunCriteriaState>,
     time: Res<Time>,
     game_ticks_per_second: Res<GameTicksPerSecond>,
-    game_state: Res<CurrentState<GameSessionState>>,
-) -> ShouldRun {
+    game_state: Res<State<GameSessionState>>,
+) -> bool {
     #[cfg(feature = "profiler")]
     puffin::profile_function!();
     // See `control_ticking_speed` for the rate value changes.
@@ -499,16 +513,16 @@ fn net_adaptive_run_criteria(
             let threshold_secs = 0.05;
             if secs_being_in_loop > threshold_secs {
                 state.started_looping_at = None;
-                ShouldRun::Yes
+                true
             } else {
-                ShouldRun::YesAndCheckAgain
+                true
             }
         } else {
             state.started_looping_at = Some(Instant::now());
-            ShouldRun::YesAndCheckAgain
+            true
         }
     } else {
         state.started_looping_at = None;
-        ShouldRun::No
+        false
     }
 }
diff --git a/libs/client_lib/src/net/mod.rs b/libs/client_lib/src/net/mod.rs
index fa428b55..1e8ef241 100644
--- a/libs/client_lib/src/net/mod.rs
+++ b/libs/client_lib/src/net/mod.rs
@@ -14,7 +14,6 @@ use auth::{AuthMessage, AuthRequest};
 use bevy::{ecs::system::SystemParam, log, prelude::*, utils::Instant};
 use bevy_disturbulence::{IncomingTrySendError, NetworkError, NetworkEvent, NetworkResource};
 use futures::{select, FutureExt};
-use iyes_loopless::state::NextState;
 use mr_messages_lib::{GameServerState, MatchmakerMessage, MatchmakerRequest, Server};
 use mr_shared_lib::{
     framebuffer::{FrameNumber, Framebuffer},
@@ -416,7 +415,7 @@ pub fn process_network_events_system(
                     // thought that `Handshake` probably comes with less edge-cases, since we
                     // always get it before starting the game.
                     log::info!("Changing the app state to {:?}", AppState::Playing);
-                    commands.insert_resource(NextState(AppState::Playing));
+                    commands.insert_resource(NextState(Some(AppState::Playing)));
                     // On game start, `GameSessionState::Loading` is likely current state as
                     // well, we rely on `iyes_loopless` behaviour to run the
                     // enter stage regardless of whether current state
@@ -425,7 +424,7 @@ pub fn process_network_events_system(
                         "Changing the game session state to {:?}",
                         GameSessionState::Loading
                     );
-                    commands.insert_resource(NextState(GameSessionState::Loading));
+                    commands.insert_resource(NextState(Some(GameSessionState::Loading)));
                 }
                 UnreliableServerMessage::DeltaUpdate(update) => {
                     let mut skip_update = false;
@@ -452,7 +451,7 @@ pub fn process_network_events_system(
                                     update_params.game_time.frame_number,
                                     err
                                 );
-                                skip_update = true;
+                                // skip_update = true;
                             }
                             Err(
                                 err @ AcknowledgeError::Inconsistent
@@ -733,6 +732,9 @@ pub fn maintain_connection_system(
     #[cfg(feature = "profiler")]
     puffin::profile_function!();
 
+    // If the connection with a game server is established, we send a disconnect
+    // "request" to the matchmaker connection handler (as we no longer need to
+    // be connected to the matchmaker).
     if matches!(
         network_params.connection_state.status(),
         ConnectionStatus::Connected
@@ -747,6 +749,7 @@ pub fn maintain_connection_system(
         }
     }
 
+    // Read matchmaker status changes and update `matchmaker_state` accordingly.
     let mut matchmaker = matchmaker_params
         .matchmaker_state
         .zip(matchmaker_params.main_menu_ui_channels);
@@ -773,16 +776,17 @@ pub fn maintain_connection_system(
     // TODO: if a client isn't getting any updates, we may also want to pause the
     //  game and wait for some time for a server to respond.
 
+    // Determine if a connection has timed out.
     let connection_has_timed_out = Instant::now().duration_since(
         network_params
             .connection_state
             .last_valid_message_received_at,
     ) > Duration::from_millis(CONNECTION_TIMEOUT_MILLIS);
-
     if connection_has_timed_out && !connection_is_uninitialized {
         log::warn!("Connection timeout, resetting");
     }
 
+    // Determine if a client is lagging behind.
     let (newest_acknowledged_incoming_packet, _) =
         network_params.connection_state.incoming_acknowledgments();
     let is_falling_behind = matches!(
@@ -795,7 +799,6 @@ pub fn maintain_connection_system(
             false
         }
     });
-
     if is_falling_behind && !connection_is_uninitialized {
         log::warn!(
             "The client is falling behind, resetting (newest acknowledged frame: {}, current frame: {})",
@@ -804,6 +807,9 @@ pub fn maintain_connection_system(
         );
     }
 
+    // If a connection has timeout, or a client is lagging behind to much, or we are
+    // disconnecting for another reason (initiated by a server, for example), reset
+    // the connection and other relevant state.
     if !connection_is_uninitialized && connection_has_timed_out
         || is_falling_behind
         || matches!(
@@ -818,7 +824,10 @@ pub fn maintain_connection_system(
             .set_status(ConnectionStatus::Uninitialized);
     }
 
+    // Re-initialise the connection with a game server.
     if network_params.net.connections.is_empty() {
+        // If there is a matchmaker server but we are disconnected from it, don't
+        // reconnect to a game server, but reconnect to the matchmaker instead.
         if let Some((matchmaker_state, matchmaker_channels)) = matchmaker.as_mut() {
             if matches!(matchmaker_state.status, TcpConnectionStatus::Disconnected) {
                 log::trace!("Requesting a connection to the matchmaker");
@@ -830,7 +839,7 @@ pub fn maintain_connection_system(
             }
         } else if !*initialised_server_to_connect_without_matchmaker {
             // We want to init the connection to a server only once.
-            // If a client disconnects, they'll be able to re-connect via the main menu.
+            // If a client disconnects, they'll be able to reconnect via the main menu.
             *initialised_server_to_connect_without_matchmaker = true;
             let server_socket_addr = client_config
                 .server_addr
@@ -923,7 +932,11 @@ pub fn send_network_updates_system(
             // TODO: deduplicate updates (the same code is written for server).
             for (frame_number, &direction) in player_direction
                 .buffer
-                .iter_with_interpolation()
+                // If the RTT between client and server is really small, first unacknowledged frame
+                // might be the frame we've just simulated. Also, when we run several frames in a
+                // row before rendering, that means that we haven't processed input updates for
+                // the subsequent frames too, hence the extrapolation.
+                .iter_with_extrapolation(first_unacknowledged_frame)
                 // TODO: should client always send redundant inputs or only the current ones (unless
                 // packet loss is detected)?
                 .skip_while(|(frame_number, _)| *frame_number < first_unacknowledged_frame)
@@ -945,6 +958,7 @@ pub fn send_network_updates_system(
         acknowledgments: network_params.connection_state.incoming_acknowledgments(),
         inputs,
     });
+    log::trace!("Broadcasting {:?} (frame: {})", message, time.frame_number);
     let result = network_params.net.send_message(
         connection_handle,
         Message {
diff --git a/libs/client_lib/src/plugins/logging.rs b/libs/client_lib/src/plugins/logging.rs
new file mode 100644
index 00000000..56fd9dc9
--- /dev/null
+++ b/libs/client_lib/src/plugins/logging.rs
@@ -0,0 +1,166 @@
+use bevy::{
+    app::{App, CoreSet, Plugin},
+    ecs::{schedule::IntoSystemConfig, system::Resource},
+    log,
+    utils::tracing::Metadata,
+};
+use std::{collections::VecDeque, io::LineWriter, panic};
+use tracing_log::LogTracer;
+use tracing_subscriber::{fmt::MakeWriter, prelude::*, registry::Registry, EnvFilter};
+
+const MAX_ENTRIES_COUNT: usize = 10_000;
+
+struct MakeChannelWriter {
+    tx: tokio::sync::mpsc::UnboundedSender<LogEntry>,
+}
+
+impl<'a> MakeWriter<'a> for MakeChannelWriter {
+    type Writer = LineWriter<ChannelWriter>;
+
+    fn make_writer(&'a self) -> Self::Writer {
+        LineWriter::new(ChannelWriter::new(self.tx.clone(), log::Level::INFO))
+    }
+
+    fn make_writer_for(&'a self, meta: &Metadata<'_>) -> Self::Writer {
+        LineWriter::new(ChannelWriter::new(self.tx.clone(), *meta.level()))
+    }
+}
+
+struct ChannelWriter {
+    tx: tokio::sync::mpsc::UnboundedSender<LogEntry>,
+    level: log::Level,
+}
+
+pub struct LogEntry {
+    pub message: String,
+    pub level: log::Level,
+    pub timestamp: String,
+}
+
+impl ChannelWriter {
+    pub fn new(tx: tokio::sync::mpsc::UnboundedSender<LogEntry>, level: log::Level) -> Self {
+        Self { tx, level }
+    }
+}
+
+impl std::io::Write for ChannelWriter {
+    fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
+        let s = String::from_utf8_lossy(&buf).to_string();
+        let (timestamp, message) = s.split_once(self.level.as_str()).unwrap_or(("", &s));
+        self.tx
+            .send(LogEntry {
+                message: message.to_owned(),
+                level: self.level,
+                timestamp: timestamp.to_owned(),
+            })
+            .map_err(|_err| {
+                std::io::Error::new(std::io::ErrorKind::BrokenPipe, "channel receiver dropped")
+            })?;
+        Ok(buf.len())
+    }
+
+    fn flush(&mut self) -> std::io::Result<()> {
+        Ok(())
+    }
+}
+
+#[derive(Resource)]
+pub struct LogsReceiver {
+    rx: tokio::sync::mpsc::UnboundedReceiver<LogEntry>,
+    buf: VecDeque<LogEntry>,
+}
+
+impl LogsReceiver {
+    fn new(rx: tokio::sync::mpsc::UnboundedReceiver<LogEntry>, max_entries_count: usize) -> Self {
+        Self {
+            rx,
+            buf: VecDeque::with_capacity(max_entries_count),
+        }
+    }
+
+    pub fn receive(&mut self) {
+        loop {
+            match self.rx.try_recv() {
+                Ok(log_string) => {
+                    if self.buf.len() == self.buf.capacity() {
+                        self.buf.pop_front();
+                    }
+                    self.buf.push_back(log_string);
+                }
+                Err(_err) => break,
+            }
+        }
+    }
+
+    pub fn entires(&self) -> &VecDeque<LogEntry> {
+        &self.buf
+    }
+}
+
+/// A plugin that sets up `puffin` and configures it as a `tracing-subscriber`
+/// layer. It also adds a in-memory subscriber to display logs in Egui.
+///
+/// Note that this plugin can't be used with Bevy's default `LogPlugin`.
+pub struct MuddleTracePlugin;
+
+impl Plugin for MuddleTracePlugin {
+    fn build(&self, app: &mut App) {
+        #[cfg(feature = "profiler")]
+        app.add_system(bevy_puffin::new_frame_system.in_base_set(CoreSet::First));
+
+        {
+            let old_handler = panic::take_hook();
+            panic::set_hook(Box::new(move |infos| {
+                println!("{}", tracing_error::SpanTrace::capture());
+                old_handler(infos);
+            }));
+        }
+
+        let finished_subscriber;
+        let filter_layer = EnvFilter::try_from_default_env()
+            .or_else(|_| EnvFilter::try_new("info,wgpu=error"))
+            .unwrap();
+
+        let (tx, rx) = tokio::sync::mpsc::unbounded_channel();
+        app.insert_resource(LogsReceiver::new(rx, MAX_ENTRIES_COUNT));
+        let subscriber = Registry::default().with(filter_layer);
+
+        #[cfg(feature = "profiler")]
+        let subscriber = subscriber.with(bevy_puffin::PuffinLayer::new());
+
+        let subscriber = subscriber
+            .with(
+                tracing_subscriber::fmt::Layer::default()
+                    .with_ansi(false)
+                    .with_writer(MakeChannelWriter { tx }),
+            )
+            .with(tracing_error::ErrorLayer::default());
+
+        #[cfg(not(target_arch = "wasm32"))]
+        {
+            let fmt_layer = tracing_subscriber::fmt::Layer::default();
+            finished_subscriber = subscriber.with(fmt_layer);
+        }
+
+        #[cfg(target_arch = "wasm32")]
+        {
+            console_error_panic_hook::set_once();
+            finished_subscriber = subscriber.with(tracing_wasm::WASMLayer::new(
+                tracing_wasm::WASMLayerConfig::default(),
+            ));
+        }
+
+        let logger_already_set = LogTracer::init().is_err();
+        let subscriber_already_set =
+            bevy::utils::tracing::subscriber::set_global_default(finished_subscriber).is_err();
+
+        match (logger_already_set, subscriber_already_set) {
+            (true, true) => log::warn!(
+                "Could not set global logger and tracing subscriber for bevy_puffin as they are already set. Consider disabling LogPlugin or re-ordering plugin initialization."
+            ),
+            (true, _) => log::warn!("Could not set global logger as it is already set. Consider disabling LogPlugin."),
+            (_, true) => log::warn!("Could not set global tracing subscriber as it is already set. Consider disabling LogPlugin."),
+            _ => (),
+        }
+    }
+}
diff --git a/libs/client_lib/src/plugins/mod.rs b/libs/client_lib/src/plugins/mod.rs
new file mode 100644
index 00000000..31348d2f
--- /dev/null
+++ b/libs/client_lib/src/plugins/mod.rs
@@ -0,0 +1 @@
+pub mod logging;
diff --git a/libs/client_lib/src/ui/builder_ui.rs b/libs/client_lib/src/ui/builder_ui.rs
index 947d127e..c93e0095 100644
--- a/libs/client_lib/src/ui/builder_ui.rs
+++ b/libs/client_lib/src/ui/builder_ui.rs
@@ -9,7 +9,7 @@ use bevy::{
         entity::Entity,
         event::{EventReader, EventWriter},
         query::WorldQuery,
-        schedule::{IntoSystemDescriptor, ShouldRun, SystemSet},
+        schedule::{IntoSystemConfig, IntoSystemConfigs, SystemConfigs},
         system::{Local, Query, Res, ResMut, Resource, SystemParam},
     },
     input::{mouse::MouseButton, Input},
@@ -20,7 +20,7 @@ use bevy::{
 };
 use bevy_egui::{
     egui::{self, Ui},
-    EguiContext,
+    EguiContexts,
 };
 use mr_shared_lib::{
     framebuffer::FrameNumber,
@@ -112,35 +112,45 @@ pub struct EditedObjectUpdate {
     pub new: Entity,
 }
 
-pub fn builder_system_set() -> SystemSet {
-    SystemSet::new()
-        .with_run_criteria(builder_run_criteria)
-        .with_system(builder_ui_system)
-        .with_system(process_builder_mouse_input_system.after(builder_ui_system))
+pub fn builder_system_set() -> SystemConfigs {
+    (
+        deselect_edited_object,
+        builder_ui_system.run_if(builder_run_criteria),
+        process_builder_mouse_input_system
+            .after(builder_ui_system)
+            .run_if(builder_run_criteria),
+    )
+        .into_configs()
 }
 
-pub fn builder_run_criteria(
-    player_params: PlayerParams,
-    mut edited_level_object: ResMut<EditedLevelObject>,
-) -> ShouldRun {
+pub fn builder_run_criteria(player_params: PlayerParams) -> bool {
     #[cfg(feature = "profiler")]
     puffin::profile_function!();
     let player = match player_params.current_player() {
         Some(player) => player,
         None => {
-            edited_level_object.deselect();
-            return ShouldRun::No;
+            return false;
         }
     };
-    if !matches!(player.role, PlayerRole::Builder) {
+    matches!(player.role, PlayerRole::Builder)
+}
+
+pub fn deselect_edited_object(
+    player_params: PlayerParams,
+    mut edited_level_object: ResMut<EditedLevelObject>,
+) {
+    #[cfg(feature = "profiler")]
+    puffin::profile_function!();
+    if player_params
+        .current_player()
+        .map_or(true, |player| !matches!(player.role, PlayerRole::Builder))
+    {
         edited_level_object.deselect();
-        return ShouldRun::No;
     }
-    ShouldRun::Yes
 }
 
 pub fn builder_ui_system(
-    mut egui_context: ResMut<EguiContext>,
+    mut egui_contexts: EguiContexts,
     mut builder_ui_state: Local<BuilderUiState>,
     mouse_input: MouseInput<(), ()>,
     mut level_object_correlations: ResMut<LevelObjectCorrelations>,
@@ -149,7 +159,7 @@ pub fn builder_ui_system(
 ) {
     #[cfg(feature = "profiler")]
     puffin::profile_function!();
-    let ctx = egui_context.ctx_mut();
+    let ctx = egui_contexts.ctx_mut();
 
     // Picking a level object if we received a confirmation from the server about an
     // object created by us.
@@ -344,7 +354,7 @@ pub fn builder_ui_system(
 }
 
 pub fn process_builder_mouse_input_system(
-    mut egui_context: ResMut<EguiContext>,
+    mut egui_contexts: EguiContexts,
     mut mouse_input: MouseInput<(), ()>,
     mut level_objects: LevelObjects,
     mut object_update: EventReader<EditedObjectUpdate>,
@@ -363,7 +373,7 @@ pub fn process_builder_mouse_input_system(
     }
 
     // Picking a level object with a mouse.
-    if !egui_context.ctx_mut().wants_pointer_input() {
+    if !egui_contexts.ctx_mut().wants_pointer_input() {
         mouse_input.mouse_entity_picker.process_input(&mut None);
     }
 
@@ -404,7 +414,7 @@ pub fn process_builder_mouse_input_system(
             && mouse_input
                 .mouse_button_input
                 .just_pressed(MouseButton::Left)
-            && !egui_context.ctx_mut().is_pointer_over_area()
+            && !egui_contexts.ctx_mut().is_pointer_over_area()
         {
             *is_being_placed = false;
         }
diff --git a/libs/client_lib/src/ui/debug_ui.rs b/libs/client_lib/src/ui/debug_ui.rs
index 0f06da52..6f4235b1 100644
--- a/libs/client_lib/src/ui/debug_ui.rs
+++ b/libs/client_lib/src/ui/debug_ui.rs
@@ -7,8 +7,7 @@ use bevy::{
     ecs::system::SystemParam,
     prelude::*,
 };
-use bevy_egui::{egui, egui::epaint::RectShape, EguiContext};
-use iyes_loopless::state::CurrentState;
+use bevy_egui::{egui, egui::epaint::RectShape, EguiContexts};
 use mr_shared_lib::{
     client::components::DebugUiVisibility,
     framebuffer::FrameNumber,
@@ -30,7 +29,7 @@ use std::{collections::VecDeque, marker::PhantomData};
 
 #[derive(SystemParam)]
 pub struct DebugData<'w, 's> {
-    game_state: Res<'w, CurrentState<GameSessionState>>,
+    game_state: Res<'w, State<GameSessionState>>,
     time: Res<'w, SimulationTime>,
     current_ticks_per_second: Res<'w, GameTicksPerSecond>,
     delay_server_time: Res<'w, DelayServerTime>,
@@ -73,7 +72,11 @@ pub fn update_debug_visibility_system(
     visibility_settings.debug = debug_ui_state.show;
     if *debug_ui_was_shown != debug_ui_state.show {
         for mut visible in debug_ui_visible.iter_mut() {
-            visible.is_visible = debug_ui_state.show;
+            *visible = if debug_ui_state.show {
+                Visibility::Inherited
+            } else {
+                Visibility::Hidden
+            };
         }
     }
     *debug_ui_was_shown = debug_ui_state.show;
@@ -103,36 +106,14 @@ pub fn update_debug_ui_state_system(
     debug_ui_state.jitter_millis = debug_data.connection_state.jitter_millis() as usize;
 }
 
-pub fn profiler_ui_system(
-    // ResMut is intentional, to avoid fighting over the Mutex from different systems.
-    mut egui_context: ResMut<EguiContext>,
-    debug_ui_state: Res<DebugUiState>,
-) {
-    #[cfg(feature = "profiler")]
-    puffin::profile_function!();
-    let ctx = egui_context.ctx_mut();
-
-    if !debug_ui_state.show {
-        return;
-    }
-
-    egui::Window::new("Profiler")
-        .default_size([1024.0, 600.0])
-        .show(ctx, |_ui| {
-            #[cfg(feature = "profiler")]
-            puffin_egui::profiler_ui(_ui)
-        });
-}
-
 pub fn debug_ui_system(
-    // ResMut is intentional, to avoid fighting over the Mutex from different systems.
-    mut egui_context: ResMut<EguiContext>,
+    mut egui_contexts: EguiContexts,
     mut debug_ui_state: ResMut<DebugUiState>,
     diagnostics: Res<Diagnostics>,
 ) {
     #[cfg(feature = "profiler")]
     puffin::profile_function!();
-    let ctx = egui_context.ctx_mut();
+    let ctx = egui_contexts.ctx_mut();
 
     if let Some(fps_diagnostic) = diagnostics.get(FrameTimeDiagnosticsPlugin::FPS) {
         debug_ui_state.fps_history_len = fps_diagnostic.get_max_history_length();
@@ -226,9 +207,8 @@ pub struct InspectObjectQueries<'w, 's> {
 }
 
 pub fn inspect_object_system(
-    // ResMut is intentional, to avoid fighting over the Mutex from different systems.
     debug_ui_state: Res<DebugUiState>,
-    mut egui_context: ResMut<EguiContext>,
+    mut egui_contexts: EguiContexts,
     mut mouse_entity_picker: MouseEntityPicker<(), ()>,
     queries: InspectObjectQueries,
 ) {
@@ -238,7 +218,7 @@ pub fn inspect_object_system(
         return;
     }
 
-    let ctx = egui_context.ctx_mut();
+    let ctx = egui_contexts.ctx_mut();
     if !ctx.is_pointer_over_area() {
         mouse_entity_picker.process_input(&mut None);
     }
@@ -319,7 +299,7 @@ fn graph(
     let rect = rect.shrink(4.0);
     let line_stroke = Stroke::new(1.0, Color32::from_additive_luminance(128));
 
-    if let Some(mouse_pos) = ui.input().pointer.hover_pos() {
+    if let Some(mouse_pos) = ui.input(|i| i.pointer.hover_pos()) {
         if rect.contains(mouse_pos) {
             let y = mouse_pos.y;
             shapes.push(Shape::line_segment(
@@ -328,14 +308,16 @@ fn graph(
             ));
             let value = remap(y, rect.bottom_up_range(), 0.0..=graph_top_value);
             let text = format!("{value:.1}");
-            shapes.push(Shape::text(
-                &ui.fonts(),
-                pos2(rect.left(), y),
-                egui::Align2::LEFT_BOTTOM,
-                text,
-                TextStyle::Monospace.resolve(ui.style()),
-                Color32::WHITE,
-            ));
+            shapes.push(ui.fonts(|fonts| {
+                Shape::text(
+                    fonts,
+                    pos2(rect.left(), y),
+                    egui::Align2::LEFT_BOTTOM,
+                    text,
+                    TextStyle::Monospace.resolve(ui.style()),
+                    Color32::WHITE,
+                )
+            }));
         }
     }
 
diff --git a/libs/client_lib/src/ui/main_menu_ui.rs b/libs/client_lib/src/ui/main_menu_ui.rs
index a9af89ee..12e2d9b5 100644
--- a/libs/client_lib/src/ui/main_menu_ui.rs
+++ b/libs/client_lib/src/ui/main_menu_ui.rs
@@ -12,19 +12,19 @@ use crate::{
 };
 use bevy::{
     ecs::{
-        schedule::SystemSet,
-        system::{Res, ResMut, Resource, SystemParam},
+        query::With,
+        schedule::{IntoSystemConfigs, SystemConfigs},
+        system::{Query, Res, ResMut, Resource, SystemParam},
     },
     log,
     utils::{HashMap, Instant, Uuid},
-    window::Windows,
+    window::{PrimaryWindow, Window},
 };
 use bevy_egui::{
     egui,
     egui::{Ui, Widget},
-    EguiContext,
+    EguiContexts,
 };
-use iyes_loopless::prelude::*;
 use mr_messages_lib::{
     GameServerState, GetLevelResponse, GetLevelsRequest, GetLevelsUserFilter, InitLevel,
     LevelsListItem, LinkAccountLoginMethod, MatchmakerMessage, MatchmakerRequest, PaginationParams,
@@ -207,8 +207,10 @@ impl InputField {
     }
 }
 
+#[derive(Default)]
 pub enum AuthUiScreen {
     RefreshAuth,
+    #[default]
     SignIn,
     SignUp,
     LinkAccount,
@@ -216,12 +218,6 @@ pub enum AuthUiScreen {
     GoogleOpenID,
 }
 
-impl Default for AuthUiScreen {
-    fn default() -> Self {
-        Self::SignIn
-    }
-}
-
 pub struct MatchmakerUiState {
     observed_no_ready_servers_at: Option<Instant>,
     servers: HashMap<String, Server>,
@@ -343,24 +339,23 @@ pub struct Configs<'w, 's> {
 
 #[derive(SystemParam)]
 pub struct UiContext<'w, 's> {
-    egui_context: ResMut<'w, EguiContext>,
-    windows: Res<'w, Windows>,
-    #[system_param(ignore)]
-    _marker: PhantomData<&'s ()>,
+    egui_contexts: EguiContexts<'w, 's>,
+    windows: Query<'w, 's, &'static Window, With<PrimaryWindow>>,
 }
 
-pub fn process_io_messages_system_set() -> SystemSet {
-    ConditionSet::new()
-        .run_if(matchmaker_is_initialised)
-        .with_system(process_auth_messages_system)
-        .with_system(process_matchmaker_messages_system)
-        .with_system(process_persistence_messages_system)
-        .into()
+pub fn process_io_messages_system_set() -> SystemConfigs {
+    (
+        process_auth_messages_system,
+        process_matchmaker_messages_system,
+        process_persistence_messages_system,
+    )
+        .into_configs()
+        .distributive_run_if(matchmaker_is_initialised)
 }
 
 pub fn matchmaker_is_initialised(
-    matchmaker_state: Option<ResMut<MatchmakerState>>,
-    main_menu_ui_channels: Option<ResMut<MainMenuUiChannels>>,
+    matchmaker_state: Option<Res<MatchmakerState>>,
+    main_menu_ui_channels: Option<Res<MainMenuUiChannels>>,
 ) -> bool {
     // If matchmaker address is not configured (which means that the state and the
     // channels aren't initialized either), we don't want to render the main menu.
@@ -406,13 +401,13 @@ pub fn main_menu_ui_system(
         }
     }
 
-    let screen_height = ui_context.windows.get_primary().unwrap().height();
+    let screen_height = ui_context.windows.single().height();
 
     let window_width = 400.0;
     let window_height = 600.0;
     let offset_y = (200.0 - (200.0 + window_height - screen_height).max(0.0)).max(0.0);
 
-    let ctx = ui_context.egui_context.ctx_mut();
+    let ctx = ui_context.egui_contexts.ctx_mut();
     egui::CentralPanel::default()
         .frame(egui::Frame::none().fill(egui::Color32::from_black_alpha(200)))
         .show(ctx, |ui| {
diff --git a/libs/client_lib/src/ui/mod.rs b/libs/client_lib/src/ui/mod.rs
index c082d085..7e73bc01 100644
--- a/libs/client_lib/src/ui/mod.rs
+++ b/libs/client_lib/src/ui/mod.rs
@@ -1,6 +1,9 @@
 use bevy::{
-    ecs::system::{Res, ResMut},
-    window::Windows,
+    ecs::{
+        query::With,
+        system::{Query, ResMut},
+    },
+    window::{PrimaryWindow, Window},
 };
 use bevy_egui::{
     egui::{self, Ui},
@@ -13,11 +16,15 @@ pub mod debug_ui;
 pub mod main_menu_ui;
 pub mod overlay_ui;
 pub mod player_ui;
+pub mod side_panel;
 
 mod widgets;
 
-pub fn set_ui_scale_factor_system(mut egui_settings: ResMut<EguiSettings>, windows: Res<Windows>) {
-    if let Some(window) = windows.get_primary() {
+pub fn set_ui_scale_factor_system(
+    mut egui_settings: ResMut<EguiSettings>,
+    primary_window_query: Query<&Window, With<PrimaryWindow>>,
+) {
+    if let Ok(window) = primary_window_query.get_single() {
         if window.scale_factor() % 2.0 > 0.0 {
             egui_settings.scale_factor = 1.0 / window.scale_factor();
         }
diff --git a/libs/client_lib/src/ui/overlay_ui.rs b/libs/client_lib/src/ui/overlay_ui.rs
index 2226869e..e59bdf90 100644
--- a/libs/client_lib/src/ui/overlay_ui.rs
+++ b/libs/client_lib/src/ui/overlay_ui.rs
@@ -3,25 +3,27 @@ use crate::{
     ui::widgets::list_menu::{button_panel, PanelButton},
 };
 use bevy::{
-    ecs::system::{Res, ResMut},
+    ecs::{
+        schedule::State,
+        system::{Res, ResMut},
+    },
     log,
-    prelude::Commands,
+    prelude::NextState,
 };
-use bevy_egui::{egui, EguiContext};
-use iyes_loopless::state::{CurrentState, NextState};
+use bevy_egui::{egui, EguiContexts};
 use mr_shared_lib::{
     messages::DisconnectReason,
     net::{ConnectionState, ConnectionStatus},
     AppState, GameSessionState,
 };
 
-pub fn app_loading_ui(mut egui_context: ResMut<EguiContext>) {
+pub fn app_loading_ui(mut egui_contexts: EguiContexts) {
     let window_width = 400.0;
     let window_height = 100.0;
 
     egui::CentralPanel::default()
         .frame(egui::Frame::none().fill(egui::Color32::from_rgb(47, 47, 47)))
-        .show(egui_context.ctx_mut(), |ui| {
+        .show(egui_contexts.ctx_mut(), |ui| {
             ui.style_mut().spacing.window_margin = egui::style::Margin::same(0.0);
             egui::Window::new("app loading ui")
                 .frame(egui::Frame::window(ui.style()))
@@ -50,9 +52,10 @@ pub fn app_loading_ui(mut egui_context: ResMut<EguiContext>) {
 }
 
 pub fn connection_status_overlay_system(
-    mut commands: Commands,
-    game_session_state: Res<CurrentState<GameSessionState>>,
-    mut egui_context: ResMut<EguiContext>,
+    mut next_app_state: ResMut<NextState<AppState>>,
+    mut next_game_session_state: ResMut<NextState<GameSessionState>>,
+    game_session_state: Res<State<GameSessionState>>,
+    mut egui_contexts: EguiContexts,
     mut connection_state: ResMut<ConnectionState>,
     mut server_to_connect: ResMut<ServerToConnect>,
 ) {
@@ -74,7 +77,7 @@ pub fn connection_status_overlay_system(
     let window_width = 400.0;
     let window_height = 100.0;
 
-    let ctx = egui_context.ctx_mut();
+    let ctx = egui_contexts.ctx_mut();
     egui::CentralPanel::default()
         .frame(egui::Frame::none().fill(egui::Color32::from_black_alpha(200)))
         .show(ctx, |ui| {
@@ -123,12 +126,12 @@ pub fn connection_status_overlay_system(
                         connection_state
                             .set_status(ConnectionStatus::Disconnecting(DisconnectReason::Aborted));
                         log::info!("Changing the app state to {:?}", AppState::MainMenu);
-                        commands.insert_resource(NextState(AppState::MainMenu));
+                        next_app_state.set(AppState::MainMenu);
                         log::info!(
                             "Changing the game session state to {:?}",
                             GameSessionState::Loading
                         );
-                        commands.insert_resource(NextState(GameSessionState::Loading));
+                        next_game_session_state.set(GameSessionState::Loading);
                     }
                 });
         });
diff --git a/libs/client_lib/src/ui/player_ui.rs b/libs/client_lib/src/ui/player_ui.rs
index b30c7f60..fd419ab9 100644
--- a/libs/client_lib/src/ui/player_ui.rs
+++ b/libs/client_lib/src/ui/player_ui.rs
@@ -1,16 +1,16 @@
 use crate::helpers::PlayerParams;
 use bevy::{
-    ecs::system::{Local, Res, ResMut},
+    ecs::system::{Local, Res},
     input::{keyboard::KeyCode, Input},
 };
-use bevy_egui::{egui, EguiContext};
+use bevy_egui::{egui, EguiContexts};
 use mr_shared_lib::{
     messages::RespawnPlayerReason, player::PlayerRole, GameTime, SIMULATIONS_PER_SECOND,
 };
 
 pub fn help_ui_system(
     time: Res<GameTime>,
-    mut egui_context: ResMut<EguiContext>,
+    mut egui_contexts: EguiContexts,
     player_params: PlayerParams,
 ) {
     #[cfg(feature = "profiler")]
@@ -24,7 +24,7 @@ pub fn help_ui_system(
         .resizable(false)
         .anchor(egui::Align2::CENTER_BOTTOM, egui::Vec2::new(0.0, -40.0))
         .fixed_size(egui::Vec2::new(window_width, window_height))
-        .show(egui_context.ctx_mut(), |ui| {
+        .show(egui_contexts.ctx_mut(), |ui| {
             let current_player = player_params.current_player();
 
             ui.centered_and_justified(|ui| {
@@ -58,7 +58,7 @@ impl Default for LeaderboardState {
 pub fn leaderboard_ui_system(
     mut state: Local<LeaderboardState>,
     keyboard_input: Res<Input<KeyCode>>,
-    mut egui_context: ResMut<EguiContext>,
+    mut egui_contexts: EguiContexts,
     player_params: PlayerParams,
 ) {
     #[cfg(feature = "profiler")]
@@ -75,7 +75,7 @@ pub fn leaderboard_ui_system(
         .collapsible(false)
         .resizable(false)
         .anchor(egui::Align2::RIGHT_TOP, egui::Vec2::new(-35.0, 35.0))
-        .show(egui_context.ctx_mut(), |ui| {
+        .show(egui_contexts.ctx_mut(), |ui| {
             egui::Grid::new("stats board")
                 .min_col_width(13.0)
                 .show(ui, |ui| {
diff --git a/libs/client_lib/src/ui/side_panel.rs b/libs/client_lib/src/ui/side_panel.rs
new file mode 100644
index 00000000..a7299a35
--- /dev/null
+++ b/libs/client_lib/src/ui/side_panel.rs
@@ -0,0 +1,68 @@
+use crate::{plugins::logging::LogsReceiver, ui::widgets::logs_viewer::LogsViewer};
+use bevy::ecs::system::{Local, ResMut, Resource, Res};
+use bevy_egui::{egui, EguiContexts};
+use crate::ui::debug_ui::DebugUiState;
+
+#[derive(Default, Resource)]
+pub struct OccupiedScreenSpace {
+    pub bottom: f32,
+}
+
+#[derive(Default, Copy, Clone, Eq, PartialEq)]
+pub enum BottomPanelTabs {
+    #[default]
+    Logs,
+    Profiler,
+}
+
+#[derive(Default)]
+pub struct SidePanelsState {
+    active_bottom_panel_tab: BottomPanelTabs,
+}
+
+pub fn side_panels_ui_system(
+    debug_ui_state: Res<DebugUiState>,
+    mut side_panels_state: Local<SidePanelsState>,
+    mut contexts: EguiContexts,
+    mut logs_receiver: ResMut<LogsReceiver>,
+    mut occupied_screen_space: ResMut<OccupiedScreenSpace>,
+) {
+    if !debug_ui_state.show {
+        occupied_screen_space.bottom = 0.0;
+        return;
+    }
+
+    logs_receiver.receive();
+    let ctx = contexts.ctx_mut();
+
+    occupied_screen_space.bottom = egui::TopBottomPanel::bottom("bottom_panel")
+        .resizable(true)
+        .show(ctx, |ui| {
+            ui.add_space(5.0);
+            ui.horizontal(|ui| {
+                ui.selectable_value(
+                    &mut side_panels_state.active_bottom_panel_tab,
+                    BottomPanelTabs::Logs,
+                    "Logs",
+                );
+                ui.selectable_value(
+                    &mut side_panels_state.active_bottom_panel_tab,
+                    BottomPanelTabs::Profiler,
+                    "Profiler",
+                );
+            });
+            ui.separator();
+
+            match side_panels_state.active_bottom_panel_tab {
+                BottomPanelTabs::Logs => {
+                    LogsViewer::new(logs_receiver.entires()).show(ui);
+                }
+                BottomPanelTabs::Profiler => {
+                    puffin_egui::profiler_ui(ui);
+                }
+            }
+        })
+        .response
+        .rect
+        .height();
+}
diff --git a/libs/client_lib/src/ui/widgets/list_menu.rs b/libs/client_lib/src/ui/widgets/list_menu.rs
index 24778993..01a01319 100644
--- a/libs/client_lib/src/ui/widgets/list_menu.rs
+++ b/libs/client_lib/src/ui/widgets/list_menu.rs
@@ -128,7 +128,7 @@ where
         };
 
         let ctx = ui.ctx();
-        let item_height = ctx.memory().data.get_temp::<MenuListItemState>(self.id);
+        let item_height = ctx.memory_mut(|m| m.data.get_temp::<MenuListItemState>(self.id));
 
         let item_height = item_height.map_or_else(
             || {
@@ -136,7 +136,7 @@ where
                     height: COLLAPSED_HEIGHT,
                 };
                 let height = state.animated_height(ctx, self.id, self.is_selected);
-                ctx.memory().data.insert_temp(self.id, state);
+                ctx.memory_mut(|m| m.data.insert_temp(self.id, state));
                 height
             },
             |state| state.animated_height(ctx, self.id, self.is_selected),
@@ -214,21 +214,22 @@ where
         );
 
         if let Some(actual_collapsing_height) = actual_collapsing_height {
-            ui.ctx().memory().data.insert_temp(
-                self.id,
-                MenuListItemState {
-                    height: COLLAPSED_HEIGHT + actual_collapsing_height,
-                },
-            );
+            ui.ctx().memory_mut(|m| {
+                m.data.insert_temp(
+                    self.id,
+                    MenuListItemState {
+                        height: COLLAPSED_HEIGHT + actual_collapsing_height,
+                    },
+                )
+            });
         };
 
-        let mut ctx_output = ui.ctx().output();
-        if self.is_hoverable
-            && response.hovered()
-            && ctx_output.cursor_icon == egui::CursorIcon::Default
-        {
-            ctx_output.cursor_icon = egui::CursorIcon::PointingHand;
-        }
+        ui.ctx().output_mut(|o| {
+            if self.is_hoverable && response.hovered() && o.cursor_icon == egui::CursorIcon::Default
+            {
+                o.cursor_icon = egui::CursorIcon::PointingHand;
+            }
+        });
 
         MenuListItemResponse {
             item: response,
diff --git a/libs/client_lib/src/ui/widgets/logs_viewer.rs b/libs/client_lib/src/ui/widgets/logs_viewer.rs
new file mode 100644
index 00000000..263bedfd
--- /dev/null
+++ b/libs/client_lib/src/ui/widgets/logs_viewer.rs
@@ -0,0 +1,45 @@
+use crate::plugins::logging::LogEntry;
+use bevy::log;
+use bevy_egui::egui;
+use std::collections::VecDeque;
+
+pub struct LogsViewer<'a> {
+    entries: &'a VecDeque<LogEntry>,
+}
+
+impl<'a> LogsViewer<'a> {
+    pub fn new(entries: &'a VecDeque<LogEntry>) -> Self {
+        Self { entries }
+    }
+
+    pub fn show(self, ui: &mut egui::Ui) {
+        let log_entries = self.entries;
+
+        let text_style = egui::TextStyle::Body;
+        let row_height = ui.text_style_height(&text_style);
+        let total_rows = self.entries.len();
+        egui::ScrollArea::both()
+            .stick_to_bottom(true)
+            .auto_shrink([false; 2])
+            .show_rows(ui, row_height, total_rows, |ui, row_range| {
+                for row in row_range {
+                    let entry = &log_entries[row];
+                    // Get rid of spacing between rows (caused by `horizontal`) to avoid issues with
+                    // `show_rows` (due to mismatching `row_height`).
+                    ui.style_mut().spacing.interact_size.y = 0.0;
+                    ui.horizontal(|ui| {
+                        ui.label(entry.timestamp.trim());
+                        let color = match entry.level {
+                            log::Level::TRACE => egui::Color32::GRAY,
+                            log::Level::DEBUG => egui::Color32::BLUE,
+                            log::Level::INFO => egui::Color32::WHITE,
+                            log::Level::WARN => egui::Color32::GOLD,
+                            log::Level::ERROR => egui::Color32::RED,
+                        };
+                        ui.colored_label(color, entry.level.as_str());
+                        ui.label(entry.message.trim());
+                    });
+                }
+            });
+    }
+}
diff --git a/libs/client_lib/src/ui/widgets/mod.rs b/libs/client_lib/src/ui/widgets/mod.rs
index ff739d2a..d5892993 100644
--- a/libs/client_lib/src/ui/widgets/mod.rs
+++ b/libs/client_lib/src/ui/widgets/mod.rs
@@ -1,2 +1,3 @@
 pub mod list_menu;
+pub mod logs_viewer;
 pub mod sortable;
diff --git a/libs/client_lib/src/ui/widgets/sortable.rs b/libs/client_lib/src/ui/widgets/sortable.rs
index 6308880f..2b76857e 100644
--- a/libs/client_lib/src/ui/widgets/sortable.rs
+++ b/libs/client_lib/src/ui/widgets/sortable.rs
@@ -104,24 +104,25 @@ pub fn sortable_list<
     );
 
     let list_id = Id::new(list_id);
-    let mut memory = ui.memory();
-    let sortable_list_data = memory
-        .data
-        .get_temp_mut_or_default::<SortableListData<T>>(list_id);
 
-    let current_list_set = sortable_list_data
-        .list
-        .iter()
-        .cloned()
-        .collect::<HashSet<_>>();
-    let list_set = list.iter().cloned().collect::<HashSet<_>>();
-    if current_list_set != list_set {
-        sortable_list_data.dragged_item = None;
-        sortable_list_data.list = list.clone();
-    }
+    let mut sortable_list_data = ui.memory_mut(|m| {
+        let sortable_list_data = m
+            .data
+            .get_temp_mut_or_default::<SortableListData<T>>(list_id);
+
+        let current_list_set = sortable_list_data
+            .list
+            .iter()
+            .cloned()
+            .collect::<HashSet<_>>();
+        let list_set = list.iter().cloned().collect::<HashSet<_>>();
+        if current_list_set != list_set {
+            sortable_list_data.dragged_item = None;
+            sortable_list_data.list = list.clone();
+        }
 
-    let mut sortable_list_data = sortable_list_data.clone();
-    drop(memory);
+        sortable_list_data.clone()
+    });
 
     let mut list_item_rects = Vec::new();
 
@@ -129,11 +130,13 @@ pub fn sortable_list<
     let padding = ui.spacing().button_padding;
     let available_width = ui.available_width();
 
-    let cross_galley = ui.fonts().layout_no_wrap(
-        cross_text.to_owned(),
-        egui::TextStyle::Button.resolve(ui.style()),
-        ui.visuals().text_color(),
-    );
+    let cross_galley = ui.fonts(|f| {
+        f.layout_no_wrap(
+            cross_text.to_owned(),
+            egui::TextStyle::Button.resolve(ui.style()),
+            ui.visuals().text_color(),
+        )
+    });
     let total_extra = egui::Vec2::new(cross_galley.size().x, 0.0)
         + padding * 2.0
         + egui::Vec2::new(padding.x, 0.0) * 2.0;
@@ -155,7 +158,8 @@ pub fn sortable_list<
         if is_dragged_item {
             let dragged_item = sortable_list_data.dragged_item.as_ref().unwrap();
             let rect_delta = dragged_item.initial_rect.min - rect.min;
-            let delta = ui.input().pointer.interact_pos().unwrap() - dragged_item.initial_drag_pos
+            let delta = ui.input(|i| i.pointer.interact_pos().unwrap())
+                - dragged_item.initial_drag_pos
                 + rect_delta;
             rect.min += delta;
             rect.max += delta;
@@ -168,12 +172,14 @@ pub fn sortable_list<
                 egui::Sense::hover()
             };
 
-            let label_galley = ui.fonts().layout(
-                list_item.label.clone(),
-                egui::TextStyle::Button.resolve(ui.style()),
-                ui.visuals().text_color(),
-                available_width - total_extra.x,
-            );
+            let label_galley = ui.fonts(|f| {
+                f.layout(
+                    list_item.label.clone(),
+                    egui::TextStyle::Button.resolve(ui.style()),
+                    ui.visuals().text_color(),
+                    available_width - total_extra.x,
+                )
+            });
 
             let shrank_rect = rect.shrink2(padding);
             let cross_rect = egui::Rect::from_min_size(
@@ -200,7 +206,7 @@ pub fn sortable_list<
                 is_dragged_item = true;
                 sortable_list_data.dragged_item = Some(DraggedItem {
                     id: list_item.id,
-                    initial_drag_pos: ui.input().pointer.interact_pos().unwrap(),
+                    initial_drag_pos: ui.input(|i| i.pointer.interact_pos().unwrap()),
                     initial_rect: rect,
                 });
             }
@@ -225,11 +231,13 @@ pub fn sortable_list<
                 egui::Color32::from_rgb(140, 30, 30)
             };
 
-            let cross_galley = ui.fonts().layout_no_wrap(
-                cross_text.to_owned(),
-                egui::TextStyle::Button.resolve(ui.style()),
-                cross_color,
-            );
+            let cross_galley = ui.fonts(|f| {
+                f.layout_no_wrap(
+                    cross_text.to_owned(),
+                    egui::TextStyle::Button.resolve(ui.style()),
+                    cross_color,
+                )
+            });
 
             let paint_item_job = PaintItemJob {
                 rect,
@@ -246,7 +254,7 @@ pub fn sortable_list<
             }
 
             if !interacting_with_cross && item_response.hovered() && list_item.sortable {
-                ui.output().cursor_icon = egui::CursorIcon::Grab;
+                ui.output_mut(|o| o.cursor_icon = egui::CursorIcon::Grab);
             }
         }
     }
@@ -255,7 +263,7 @@ pub fn sortable_list<
         sortable_list_data.list.remove(i);
     }
 
-    if !ui.memory().is_anything_being_dragged() {
+    if !ui.memory(|m| m.is_anything_being_dragged()) {
         sortable_list_data.dragged_item = None;
     }
 
@@ -274,7 +282,7 @@ pub fn sortable_list<
             delayed_paint_job.paint(ui);
         }
 
-        ui.output().cursor_icon = egui::CursorIcon::Grabbing;
+        ui.output_mut(|o| o.cursor_icon = egui::CursorIcon::Grabbing);
     }
 
     ui.separator();
@@ -285,9 +293,10 @@ pub fn sortable_list<
         edited = true;
     }
 
-    ui.memory()
-        .data
-        .insert_temp::<SortableListData<T>>(list_id, sortable_list_data);
+    ui.memory_mut(|m| {
+        m.data
+            .insert_temp::<SortableListData<T>>(list_id, sortable_list_data)
+    });
 
     edited
 }
diff --git a/libs/client_lib/src/visuals.rs b/libs/client_lib/src/visuals.rs
index bc921eb5..a6abed04 100644
--- a/libs/client_lib/src/visuals.rs
+++ b/libs/client_lib/src/visuals.rs
@@ -65,7 +65,11 @@ pub fn control_builder_visibility_system(
                 if let Some(level_object) = level_params.level_object_by_entity(entity) {
                     match level_object.desc {
                         LevelObjectDesc::RoutePoint(_) => {
-                            visible.is_visible = is_builder;
+                            *visible = if is_builder {
+                                Visibility::Inherited
+                            } else {
+                                Visibility::Hidden
+                            };
                         }
                         LevelObjectDesc::Plane(_) | LevelObjectDesc::Cube(_) => {}
                     }
@@ -82,9 +86,13 @@ pub fn control_builder_visibility_system(
             if (transform.translation.x - parent_transform.translation.x).abs() < f32::EPSILON
                 && (transform.translation.y - parent_transform.translation.y).abs() < f32::EPSILON
             {
-                visible.is_visible = false
+                *visible = Visibility::Hidden;
             } else {
-                visible.is_visible = is_builder;
+                *visible = if is_builder {
+                    Visibility::Inherited
+                } else {
+                    Visibility::Hidden
+                };
             }
         }
 
diff --git a/libs/server_lib/Cargo.toml b/libs/server_lib/Cargo.toml
index 682c0c98..3e548235 100644
--- a/libs/server_lib/Cargo.toml
+++ b/libs/server_lib/Cargo.toml
@@ -12,17 +12,16 @@ profiler = ["puffin", "mr_shared_lib/profiler"]
 
 [dependencies]
 anyhow = "1.0"
-bevy = { version = "0.9.1", default-features = false }
+bevy = { version = "0.10", default-features = false }
 bevy_disturbulence = { git = "https://github.com/mvlabat/bevy_disturbulence.git", branch = "wip", features = ["server"] }
-bevy_rapier2d = "0.19"
-iyes_loopless = "0.9"
+bevy_rapier2d = "0.21"
 jwt-compact = { version = "0.6", features = ["std", "clock", "with_rsa"], default-features = false }
 kube = "0.77.0"
 local-ip-address = "0.5"
 k8s-openapi = { version = "0.16.0", default-features = false, features = ["v1_23"] }
 puffin = { version = "0.13", optional = true }
 rand = "0.8.4"
-rapier2d = "0.16"
+rapier2d = "0.17"
 reqwest = "0.11"
 rymder = "0.6.0"
 serde = "1.0"
diff --git a/libs/server_lib/src/lib.rs b/libs/server_lib/src/lib.rs
index 6ae3ebd0..a12cc497 100644
--- a/libs/server_lib/src/lib.rs
+++ b/libs/server_lib/src/lib.rs
@@ -1,5 +1,5 @@
 #![feature(hash_drain_filter)]
-#![feature(once_cell)]
+#![feature(lazy_cell)]
 
 pub use crate::net::watch_agones_updates;
 pub use mr_shared_lib::{game::PlayerEventSender, player::PlayerEvent};
@@ -22,12 +22,7 @@ use crate::{
         process_update_level_object_requests_system,
     },
 };
-use bevy::{
-    log,
-    prelude::*,
-    time::{FixedTimestep, TimePlugin},
-};
-use iyes_loopless::prelude::*;
+use bevy::{log, prelude::*, time::TimePlugin};
 use kube::Client;
 use mr_messages_lib::{InitLevel, LevelData};
 use mr_shared_lib::{
@@ -43,7 +38,7 @@ use mr_shared_lib::{
     },
     player::{PlayerRole, Players},
     registry::IncrementId,
-    AppState, GameSessionState, LevelObjectsToSpawnToLoad, MuddleSharedPlugin,
+    AppState, GameSessionState, LevelObjectsToSpawnToLoad, MuddleSharedPlugin, MuddleSystemConfigs,
     SIMULATIONS_PER_SECOND,
 };
 use mr_utils_lib::kube_discovery;
@@ -110,7 +105,9 @@ pub struct MuddleServerPlugin;
 impl Plugin for MuddleServerPlugin {
     fn build(&self, app: &mut App) {
         // The minimal set of Bevy plugins needed for the game logic.
-        app.add_plugin(CorePlugin::default());
+        app.add_plugin(TaskPoolPlugin::default());
+        app.add_plugin(TypeRegistrationPlugin::default());
+        app.add_plugin(FrameCountPlugin::default());
         app.add_plugin(TimePlugin::default());
         app.add_plugin(TransformPlugin::default());
         app.add_plugin(bevy::diagnostic::DiagnosticsPlugin::default());
@@ -159,42 +156,58 @@ impl Plugin for MuddleServerPlugin {
 
         app.add_system(process_idle_timeout);
 
-        let input_stage = SystemStage::parallel()
-            .with_system(process_scheduled_spawns_system)
-            .with_system(process_network_events_system)
-            .with_system(process_player_input_updates_system.after(process_network_events_system))
-            .with_system(process_switch_role_requests_system.after(process_network_events_system))
+        let input_set = (
+            process_scheduled_spawns_system,
+            process_network_events_system,
+            process_player_input_updates_system.after(process_network_events_system),
+            process_switch_role_requests_system.after(process_network_events_system),
             // It's ok to run the following in random order since object updates aren't possible
             // on the client before an authoritative confirmation that an object has been spawned.
-            .with_system(
-                process_spawn_level_object_requests_system.after(process_network_events_system),
-            )
-            .with_system(
-                process_update_level_object_requests_system.after(process_network_events_system),
-            )
-            .with_system(
-                process_despawn_level_object_requests_system.after(process_network_events_system),
-            );
-        let post_game_stage = SystemStage::single_threaded()
-            .with_system(process_player_events_system)
-            .with_system(save_level_system);
-        let broadcast_updates_stage = SystemStage::single_threaded()
-            .with_system(broadcast_disconnected_players_system)
-            .with_system(send_network_updates_system.run_in_state(GameSessionState::Playing));
+            process_spawn_level_object_requests_system.after(process_network_events_system),
+            process_update_level_object_requests_system.after(process_network_events_system),
+            process_despawn_level_object_requests_system.after(process_network_events_system),
+        )
+            .into_configs();
+        let post_game_set = (process_player_events_system, save_level_system).into_configs();
+        let broadcast_updates_set = (
+            broadcast_disconnected_players_system,
+            send_network_updates_system.run_if(in_state(GameSessionState::Playing)),
+        )
+            .into_configs();
 
         // Game.
+        let mut timer = Timer::from_seconds(1.0 / SIMULATIONS_PER_SECOND, TimerMode::Repeating);
         app.add_plugin(MuddleSharedPlugin::new(
-            FixedTimestep::steps_per_second(SIMULATIONS_PER_SECOND as f64),
-            input_stage,
-            post_game_stage,
-            broadcast_updates_stage,
-            SystemStage::single_threaded(),
+            MuddleSystemConfigs {
+                main_run_criteria: IntoSystem::into_system(
+                    move |mut prev_times_finished_this_tick: Local<u32>,
+                          mut prev_last_update: Local<Option<Instant>>,
+                          time: Res<Time>| {
+                        if *prev_times_finished_this_tick == 0
+                            && *prev_last_update != time.last_update()
+                        {
+                            timer.tick(time.delta());
+                            *prev_times_finished_this_tick = timer.times_finished_this_tick();
+                            *prev_last_update = time.last_update();
+                        }
+                        if *prev_times_finished_this_tick == 0 {
+                            return false;
+                        }
+                        *prev_times_finished_this_tick -= 1;
+                        true
+                    },
+                ),
+                input_set,
+                post_game_set,
+                broadcast_updates_set,
+                post_tick_set: IntoSystemConfigs::into_configs(()),
+            },
             None,
         ));
 
         // We override the initial state for server as we aren't using the loading state
         // atm.
-        app.insert_resource(CurrentState(AppState::Playing));
+        app.insert_resource(State(AppState::Playing));
 
         app.init_resource::<EntityNetIdCounter>();
         app.init_resource::<PlayerNetIdCounter>();
diff --git a/libs/server_lib/src/net.rs b/libs/server_lib/src/net.rs
index 69b5152b..37a6e7d4 100644
--- a/libs/server_lib/src/net.rs
+++ b/libs/server_lib/src/net.rs
@@ -768,7 +768,7 @@ fn disconnect_players(
                         frame_number: time.frame_number,
                         reason: DespawnReason::Disconnect,
                     });
-                let mut player = players
+                let player = players
                     .get_mut(&player_net_id)
                     .expect("Expected a registered player with an existing player_net_id");
                 player.is_connected = false;
diff --git a/libs/shared_lib/Cargo.toml b/libs/shared_lib/Cargo.toml
index 45fe30d9..b019619b 100644
--- a/libs/shared_lib/Cargo.toml
+++ b/libs/shared_lib/Cargo.toml
@@ -12,21 +12,20 @@ web = ["chrono/wasmbind"]
 profiler = ["puffin", "bevy/trace"]
 
 [dependencies]
-bevy = { version = "0.9.1", default-features = false }
-bevy_egui = { version = "0.18", optional = true }
-bevy_mod_picking = { version = "0.11", optional = true }
+bevy = { version = "0.10", default-features = false }
+bevy_egui = { version = "0.20", optional = true }
+bevy_mod_picking = { version = "0.12", optional = true }
 bevy_disturbulence = { git = "https://github.com/mvlabat/bevy_disturbulence.git", branch = "wip" }
-bevy_rapier2d = { version = "0.19", features = ["wasm-bindgen", "serde-serialize"] }
+bevy_rapier2d = { version = "0.21", features = ["wasm-bindgen", "serde-serialize"] }
 chrono = "0.4.19"
 crossbeam-channel = "0.5.5"
 futures-lite = "1.12.0"
-iyes_loopless = "0.9"
 konst = "0.2.13"
 names = { version = "0.14.0", default-features = false }
 num = "0.4.0"
-puffin = { version = "0.13", optional = true }
+puffin = { version = "0.14", optional = true }
 rand = "0.8.4"
-rapier2d = "0.16.1"
+rapier2d = "0.17"
 serde = "1.0"
 serde_json = "1.0"
 thiserror = "1.0.30"
diff --git a/libs/shared_lib/src/client/assets.rs b/libs/shared_lib/src/client/assets.rs
index e29d60a9..40fb1929 100644
--- a/libs/shared_lib/src/client/assets.rs
+++ b/libs/shared_lib/src/client/assets.rs
@@ -95,14 +95,20 @@ pub fn init_muddle_assets_system(
             .add(with_blend_alpha_mode(Color::rgb(0.5, 0.492, 0.816).into())),
     });
     commands.insert_resource(MuddleMeshes {
-        player_sensor: meshes.add(Mesh::from(Icosphere {
-            radius: PLAYER_SENSOR_RADIUS,
-            subdivisions: 16,
-        })),
-        control_point: meshes.add(Mesh::from(Icosphere {
-            radius: 0.15,
-            subdivisions: 32,
-        })),
+        player_sensor: meshes.add(
+            Mesh::try_from(Icosphere {
+                radius: PLAYER_SENSOR_RADIUS,
+                subdivisions: 16,
+            })
+            .unwrap(),
+        ),
+        control_point: meshes.add(
+            Mesh::try_from(Icosphere {
+                radius: 0.15,
+                subdivisions: 32,
+            })
+            .unwrap(),
+        ),
     });
 }
 
diff --git a/libs/shared_lib/src/framebuffer.rs b/libs/shared_lib/src/framebuffer.rs
index 28663dbb..a40a8b09 100644
--- a/libs/shared_lib/src/framebuffer.rs
+++ b/libs/shared_lib/src/framebuffer.rs
@@ -178,6 +178,8 @@ impl<T: Default + std::fmt::Debug> Framebuffer<T> {
         let frame_len = FrameNumber::new(self.buffer.len() as u16);
         assert!(self.can_insert(frame_number), "Inserting for a frame {} would remove future history (start_frame: {}, limit: {}, len: {})", frame_number, self.start_frame, self.limit, frame_len);
 
+        // If the inserted frame is earlier than the buffer start, we fill all the
+        // elements in-between with default values.
         if frame_number < self.start_frame {
             for _ in frame_number + FrameNumber::new(1)..self.start_frame {
                 self.buffer.push_front(T::default());
@@ -187,19 +189,30 @@ impl<T: Default + std::fmt::Debug> Framebuffer<T> {
             return;
         }
 
-        let frame_len = FrameNumber::new(self.buffer.len() as u16);
-        let end_frame = self.start_frame + frame_len - FrameNumber::new(1);
+        let buffer_len = FrameNumber::new(self.buffer.len() as u16);
+        let end_frame = self.start_frame + buffer_len - FrameNumber::new(1);
+        // If the buffer is empty, it's just the first insert, so we can also mark
+        // `start_frame` respectively.
         if self.buffer.is_empty() {
             self.start_frame = frame_number;
             self.push(value);
-        } else if frame_number >= end_frame + self.limit {
+        }
+        // If we insert far ahead into the future (more than the buffer limit), we clean the buffer,
+        // insert the element and mark the new start frame.
+        else if frame_number >= end_frame + self.limit {
             self.buffer.clear();
             self.start_frame = frame_number;
             self.push(value);
-        } else if frame_number <= end_frame {
-            let offset = frame_len - FrameNumber::new(1) - (end_frame - frame_number);
+        }
+        // If the inserted frame is between `start_frame` and `end_frame`, we just replace
+        // an existing element.
+        else if frame_number <= end_frame {
+            let offset = buffer_len - FrameNumber::new(1) - (end_frame - frame_number);
             self.buffer[offset.value() as usize] = value;
-        } else {
+        }
+        // If the inserted frame is in the future but within the limits, we append default values
+        // until we reach the target frame and then do the insertion.
+        else {
             for _ in end_frame + FrameNumber::new(1)..frame_number {
                 self.push(T::default());
             }
diff --git a/libs/shared_lib/src/game/client_factories.rs b/libs/shared_lib/src/game/client_factories.rs
index 2da5b869..c555d5ed 100644
--- a/libs/shared_lib/src/game/client_factories.rs
+++ b/libs/shared_lib/src/game/client_factories.rs
@@ -87,8 +87,10 @@ impl<'w, 's> ClientFactory<'w, 's> for PlayerSensorClientFactory {
             .insert(PbrBundle {
                 mesh: deps.assets.meshes.player_sensor.clone(),
                 material: deps.assets.materials.player_sensor_normal.clone(),
-                visibility: Visibility {
-                    is_visible: deps.visibility_settings.debug,
+                visibility: if deps.visibility_settings.debug {
+                    Visibility::Inherited
+                } else {
+                    Visibility::Hidden
                 },
                 ..Default::default()
             })
@@ -204,12 +206,10 @@ impl<'w, 's> ClientFactory<'w, 's> for PlaneClientFactory {
         };
 
         commands.insert(PbrBundle {
-            visibility: Visibility {
-                is_visible: if input.is_ghost {
-                    deps.visibility_settings.ghosts
-                } else {
-                    true
-                },
+            visibility: if !input.is_ghost || deps.visibility_settings.ghosts {
+                Visibility::Inherited
+            } else {
+                Visibility::Hidden
             },
             mesh: deps.meshes.add(mesh),
             material: {
@@ -262,12 +262,10 @@ impl<'w, 's> ClientFactory<'w, 's> for CubeClientFactory {
             1.0
         };
         commands.insert(PbrBundle {
-            visibility: Visibility {
-                is_visible: if input.is_ghost {
-                    deps.visibility_settings.ghosts
-                } else {
-                    true
-                },
+            visibility: if !input.is_ghost || deps.visibility_settings.ghosts {
+                Visibility::Inherited
+            } else {
+                Visibility::Hidden
             },
             mesh: deps.meshes.add(Mesh::from(shape::Cube {
                 size: input.desc.size * 2.0 * ghost_size_multiplier,
@@ -326,12 +324,12 @@ impl<'w, 's> ClientFactory<'w, 's> for RoutePointClientFactory {
             1.0
         };
         commands.insert(PbrBundle {
-            visibility: Visibility {
-                is_visible: if input.is_ghost {
-                    deps.visibility_settings.ghosts
-                } else {
-                    deps.visibility_settings.route_points
-                },
+            visibility: if input.is_ghost && deps.visibility_settings.ghosts
+                || !input.is_ghost && deps.visibility_settings.route_points
+            {
+                Visibility::Inherited
+            } else {
+                Visibility::Hidden
             },
             mesh: deps.meshes.add(Mesh::from(Pyramid {
                 height: ROUTE_POINT_HEIGHT * ghost_size_multiplier,
diff --git a/libs/shared_lib/src/game/collisions.rs b/libs/shared_lib/src/game/collisions.rs
index c4feeed2..e0f48932 100644
--- a/libs/shared_lib/src/game/collisions.rs
+++ b/libs/shared_lib/src/game/collisions.rs
@@ -15,7 +15,8 @@ use bevy::{
         entity::Entity,
         event::{EventReader, EventWriter},
         query::QueryEntityError,
-        system::{In, Query, RemovedComponents, Res, SystemParam},
+        removal_detection::RemovedComponents,
+        system::{In, Query, Res, SystemParam},
     },
     log,
     utils::HashSet,
@@ -44,7 +45,7 @@ pub fn process_collision_events_system(
     mut collision_events: EventReader<CollisionEvent>,
     mut collision_logic_changed_events: EventReader<CollisionLogicChanged>,
     mut queries: CollisionQueries,
-    removed_level_objects: RemovedComponents<LevelObjectTag>,
+    mut removed_level_objects: RemovedComponents<LevelObjectTag>,
     level_object_server_ghost_parents: Query<&LevelObjectServerGhostParent>,
     level: LevelParams,
 ) -> Vec<Entity> {
diff --git a/libs/shared_lib/src/game/movement.rs b/libs/shared_lib/src/game/movement.rs
index 1708df72..dbf2c297 100644
--- a/libs/shared_lib/src/game/movement.rs
+++ b/libs/shared_lib/src/game/movement.rs
@@ -223,7 +223,8 @@ pub struct SimulatedObjectQuery<'w> {
 }
 
 /// Exclude objects that won't affect a local player by simulations if a client
-/// is correcting mispredictions.
+/// is correcting mispredictions (i.e. other players, server time "ghosts" of
+/// level objects).
 pub fn isolate_client_mispredicted_world_system(
     time: Res<SimulationTime>,
     mut objects: Query<SimulatedObjectQuery, Without<PlayerFrameSimulated>>,
diff --git a/libs/shared_lib/src/game/spawn.rs b/libs/shared_lib/src/game/spawn.rs
index c7459bc8..a0a679e4 100644
--- a/libs/shared_lib/src/game/spawn.rs
+++ b/libs/shared_lib/src/game/spawn.rs
@@ -39,7 +39,6 @@ use bevy_rapier2d::{
     prelude::CollisionGroups,
     rapier::geometry::ColliderShape,
 };
-use iyes_loopless::state::NextState;
 use std::fmt::Debug;
 
 #[derive(WorldQuery)]
@@ -546,7 +545,7 @@ pub fn update_level_objects_system(
                 "Changing the game session state to {:?}",
                 GameSessionState::Playing
             );
-            commands.insert_resource(NextState(GameSessionState::Playing));
+            commands.insert_resource(NextState(Some(GameSessionState::Playing)));
             commands.remove_resource::<LevelObjectsToSpawnToLoad>();
         }
     }
diff --git a/libs/shared_lib/src/lib.rs b/libs/shared_lib/src/lib.rs
index ebb804f0..105c11e2 100644
--- a/libs/shared_lib/src/lib.rs
+++ b/libs/shared_lib/src/lib.rs
@@ -38,16 +38,19 @@ use crate::{
     registry::EntityRegistry,
 };
 use bevy::{
-    ecs::{event::Events, schedule::ShouldRun, system::IntoSystem},
+    ecs::{
+        event::Events,
+        schedule::{ScheduleLabel, SystemConfigs},
+        system::IntoSystem,
+    },
     log,
     prelude::*,
 };
 use bevy_disturbulence::{NetworkingPlugin, SocketConfig};
 use bevy_rapier2d::{
     pipeline::CollisionEvent,
-    plugin::{PhysicsStages, RapierConfiguration, RapierPhysicsPlugin, TimestepMode},
+    plugin::{PhysicsSet, RapierConfiguration, RapierPhysicsPlugin, TimestepMode},
 };
-use iyes_loopless::prelude::*;
 use messages::{EntityNetId, PlayerNetId};
 use std::sync::Mutex;
 
@@ -65,34 +68,54 @@ pub mod server;
 pub mod util;
 pub mod wrapped_counter;
 
-// Constants.
-pub mod stage {
-    pub const WRITE_INPUT_UPDATES: &str = "mr_shared_write_input_updates";
-    pub const APP_STATE_TRANSITION: &str = "mr_shared_app_state_transition";
-    pub const GAME_SESSION_STATE_TRANSITION: &str = "mr_shared_game_session_state_transition";
-    pub const READ_INPUT_UPDATES: &str = "mr_shared_read_input_updates";
-    // Here, between `WRITE_INPUT_UPDATES` and `BROADCAST_UPDATES` runs the main
-    // schedule, which also includes the `SIMULATION_SCHEDULE` (running the game
-    // logic and physics).
-    // ...
-    pub const MAIN_SCHEDULE: &str = "mr_shared_main_schedule";
-    pub const SIMULATION_SCHEDULE: &str = "mr_shared_simulation_schedule";
-    // ...
-    pub const BROADCAST_UPDATES: &str = "mr_shared_broadcast_updates";
-    pub const POST_SIMULATIONS: &str = "mr_shared_post_simulations";
-    pub const POST_TICK: &str = "mr_shared_post_tick";
-
-    // Stages of the `SIMULATION_SCHEDULE`:
-    pub const SPAWN: &str = "mr_shared_spawn";
-    pub const PRE_GAME: &str = "mr_shared_pre_game";
-    pub const FINALIZE_PHYSICS: &str = "mr_shared_finalize_physics";
-    pub const GAME: &str = "mr_shared_game";
-    pub const PHYSICS: &str = "mr_shared_physics";
-    pub const POST_PHYSICS: &str = "mr_shared_post_physics";
-    pub const POST_GAME: &str = "mr_shared_post_game";
-    pub const SIMULATION_FINAL: &str = "mr_shared_simulation_final";
+#[derive(Debug, Hash, PartialEq, Eq, Clone, SystemSet)]
+enum AppSet {
+    ResetWorld,
+    WriteInputUpdates,
+    MainSchedule,
+}
+
+#[derive(Debug, Hash, PartialEq, Eq, Clone, SystemSet)]
+#[system_set(base)]
+enum MainSet {
+    First,
+    SimulationSchedule,
+    BroadcastUpdates,
+    PostSimulation,
+    PostTick,
+    Last,
 }
 
+#[derive(Debug, Hash, PartialEq, Eq, Clone, SystemSet)]
+#[system_set(base)]
+enum SimulationSet {
+    Spawn,
+    PreGame,
+    Game,
+    GamePhysics,
+    PostGamePhysics,
+    PostGame,
+    Last,
+}
+
+/// Copy of the bevy_rapier's `PhysicsSet`.
+/// We need a copy to turn it not into a base set.
+#[derive(Debug, Hash, PartialEq, Eq, Clone, SystemSet)]
+enum PhysicsSimulationSet {
+    First,
+    SyncBackend,
+    SyncBackendFlush,
+    StepSimulation,
+    Writeback,
+    Last,
+}
+
+#[derive(Debug, Hash, PartialEq, Eq, Clone, ScheduleLabel)]
+pub struct MainSchedule;
+
+#[derive(Debug, Hash, PartialEq, Eq, Clone, ScheduleLabel)]
+pub struct SimulationSchedule;
+
 pub const GHOST_SIZE_MULTIPLIER: f32 = 1.001;
 pub const PLAYER_RADIUS: f32 = 0.35;
 pub const PLAYER_SENSOR_RADIUS: f32 = 0.05;
@@ -107,9 +130,13 @@ pub const SIMULATIONS_PER_SECOND: f32 = {
         Some(konst::unwrap_ctx!(parser.parse_u16()).0)
     }
 
-    std::option_env!("SIMULATIONS_PER_SECOND")
-        .and_then(parse)
-        .unwrap_or(SIMULATIONS_PER_SECOND_DEFAULT) as f32
+    (match match std::option_env!("SIMULATIONS_PER_SECOND") {
+        Some(v) => parse(v),
+        None => None,
+    } {
+        Some(v) => v,
+        None => SIMULATIONS_PER_SECOND_DEFAULT,
+    }) as f32
 };
 pub const LAG_COMPENSATED_FRAMES: FrameNumber = {
     let v = (MAX_LAG_COMPENSATION_MILLIS as f32 / (1000.0 / SIMULATIONS_PER_SECOND)) as u16;
@@ -118,44 +145,46 @@ pub const LAG_COMPENSATED_FRAMES: FrameNumber = {
 
 const SIMULATIONS_PER_SECOND_DEFAULT: u16 = 120;
 
-#[derive(Debug, Hash, PartialEq, Eq, Clone, SystemLabel)]
-pub enum PhysicsSystemSetLabel {
-    SyncBackend,
-    StepSimulation,
-    Writeback,
-    DetectDespawn,
+pub struct MuddleSharedPlugin<S: System<In = (), Out = bool>> {
+    system_configs: Mutex<Option<MuddleSystemConfigs<S>>>,
+    socket_config: Option<SocketConfig>,
 }
 
-pub struct MuddleSharedPlugin<S: System<In = (), Out = ShouldRun>> {
-    main_run_criteria: Mutex<Option<S>>,
-    input_stage: Mutex<Option<SystemStage>>,
-    post_game_stage: Mutex<Option<SystemStage>>,
-    broadcast_updates_stage: Mutex<Option<SystemStage>>,
-    post_tick_stage: Mutex<Option<SystemStage>>,
-    socket_config: Option<SocketConfig>,
+pub struct MuddleSystemConfigs<S: System<In = (), Out = bool>> {
+    pub main_run_criteria: S,
+    pub input_set: SystemConfigs,
+    pub post_game_set: SystemConfigs,
+    pub broadcast_updates_set: SystemConfigs,
+    pub post_tick_set: SystemConfigs,
 }
 
-impl<S: System<In = (), Out = ShouldRun>> MuddleSharedPlugin<S> {
+impl<S: System<In = (), Out = bool>> MuddleSharedPlugin<S> {
     pub fn new(
-        main_run_criteria: S,
-        input_stage: SystemStage,
-        post_game_stage: SystemStage,
-        broadcast_updates_stage: SystemStage,
-        post_tick_stage: SystemStage,
+        system_configs: MuddleSystemConfigs<S>,
         socket_config: Option<SocketConfig>,
     ) -> Self {
         Self {
-            main_run_criteria: Mutex::new(Some(main_run_criteria)),
-            input_stage: Mutex::new(Some(input_stage)),
-            post_game_stage: Mutex::new(Some(post_game_stage)),
-            broadcast_updates_stage: Mutex::new(Some(broadcast_updates_stage)),
-            post_tick_stage: Mutex::new(Some(post_tick_stage)),
+            system_configs: Mutex::new(Some(system_configs)),
             socket_config,
         }
     }
 }
 
-impl<S: System<In = (), Out = ShouldRun>> Plugin for MuddleSharedPlugin<S> {
+fn create_looping_schedule_with_criteria_system<Marker>(
+    init_world: &mut World,
+    schedule: impl ScheduleLabel + Clone,
+    run_criteria_system: impl IntoSystem<(), bool, Marker>,
+) -> impl FnMut(&mut World) {
+    let mut run_criteria_system = IntoSystem::into_system(run_criteria_system);
+    run_criteria_system.initialize(init_world);
+    move |world: &mut World| {
+        while run_criteria_system.run((), world) {
+            world.run_schedule(schedule.clone());
+        }
+    }
+}
+
+impl<S: System<In = (), Out = bool>> Plugin for MuddleSharedPlugin<S> {
     fn build(&self, app: &mut App) {
         app.add_plugin(RapierPhysicsPlugin::<()>::default().with_default_system_setup(false));
         app.insert_resource(RapierConfiguration {
@@ -166,212 +195,243 @@ impl<S: System<In = (), Out = ShouldRun>> Plugin for MuddleSharedPlugin<S> {
             },
             ..RapierConfiguration::default()
         });
+        // Note: `AppState` initialisation is overwritten by `mr_server`.
+        app.add_state::<AppState>();
+        app.add_state::<GameSessionState>();
         app.add_plugin(NetworkingPlugin {
             socket_config: self.socket_config.clone().unwrap_or_default(),
             ..NetworkingPlugin::default()
         });
 
-        let mut main_run_criteria = self
-            .main_run_criteria
-            .lock()
-            .expect("Can't initialize the plugin more than once");
-        let mut input_stage = self
-            .input_stage
-            .lock()
-            .expect("Can't initialize the plugin more than once");
-        let mut post_game_stage = self
-            .post_game_stage
-            .lock()
-            .expect("Can't initialize the plugin more than once");
-        let mut broadcast_updates_stage = self
-            .broadcast_updates_stage
-            .lock()
-            .expect("Can't initialize the plugin more than once");
-        let mut post_tick_stage = self
-            .post_tick_stage
+        let MuddleSystemConfigs {
+            mut main_run_criteria,
+            input_set,
+            post_game_set,
+            broadcast_updates_set,
+            post_tick_set,
+        } = self
+            .system_configs
             .lock()
+            .expect("Can't initialize the plugin more than once")
+            .take()
             .expect("Can't initialize the plugin more than once");
 
-        let simulation_schedule = Schedule::default()
-            .with_run_criteria(IntoSystem::into_system(simulation_tick_run_criteria))
-            .with_stage(
-                stage::SPAWN,
-                SystemStage::single_threaded()
-                    .with_system(Events::<CollisionEvent>::update_system)
-                    .with_system(Events::<PlayerFinish>::update_system)
-                    .with_system(Events::<PlayerDeath>::update_system)
-                    .with_system(switch_player_role_system)
-                    .with_system(despawn_players_system.after(switch_player_role_system))
-                    .with_system(despawn_level_objects_system)
-                    // Updating level objects might despawn entities completely if they are
-                    // updated with replacement. Running it before `despawn_level_objects` might
-                    // result into an edge-case where changes to the `Spawned` component are not
-                    // propagated.
-                    .with_system(update_level_objects_system.after(despawn_level_objects_system))
-                    // Adding components to an entity if there's a command to remove it the queue
-                    // will lead to crash. Executing this system before `update_level_objects` helps
-                    // to avoid this scenario.
-                    .with_system(poll_calculating_shapes_system.before(update_level_objects_system))
-                    .with_system(
-                        maintain_available_spawn_areas_system.after(update_level_objects_system),
-                    )
-                    .with_system(
-                        spawn_players_system
-                            .after(despawn_players_system)
-                            .after(maintain_available_spawn_areas_system),
-                    ),
-            )
-            .with_stage(
-                stage::PRE_GAME,
-                SystemStage::single_threaded()
-                    .with_system(update_level_object_movement_route_settings_system),
-            )
-            .with_stage(
-                stage::GAME,
-                SystemStage::single_threaded()
-                    .with_system(isolate_client_mispredicted_world_system)
-                    .with_system(player_movement_system)
-                    .with_system(process_objects_route_graph_system)
-                    .with_system(
-                        load_object_positions_system.after(process_objects_route_graph_system),
-                    ),
+        let mut simulation_schedule = Schedule::new();
+        simulation_schedule.configure_sets(
+            (
+                SimulationSet::Spawn,
+                SimulationSet::PreGame,
+                SimulationSet::Game,
+                SimulationSet::GamePhysics,
+                SimulationSet::PostGamePhysics,
+                SimulationSet::PostGame,
+                SimulationSet::Last,
             )
-            .with_stage(
-                stage::PHYSICS,
-                SystemStage::single_threaded()
-                    .with_system_set(
-                        RapierPhysicsPlugin::<()>::get_systems(PhysicsStages::SyncBackend)
-                            .label(PhysicsSystemSetLabel::SyncBackend),
-                    )
-                    .with_system_set(
-                        RapierPhysicsPlugin::<()>::get_systems(PhysicsStages::StepSimulation)
-                            .label(PhysicsSystemSetLabel::StepSimulation)
-                            .after(PhysicsSystemSetLabel::SyncBackend),
-                    )
-                    .with_system_set(
-                        RapierPhysicsPlugin::<()>::get_systems(PhysicsStages::Writeback)
-                            .label(PhysicsSystemSetLabel::Writeback)
-                            .after(PhysicsSystemSetLabel::StepSimulation),
-                    ),
+                .chain(),
+        );
+
+        // `SimulationSet::Spawn` base set systems.
+        let spawn_set = (
+            Events::<CollisionEvent>::update_system,
+            Events::<PlayerFinish>::update_system,
+            Events::<PlayerDeath>::update_system,
+            switch_player_role_system,
+            despawn_players_system.after(switch_player_role_system),
+            despawn_level_objects_system,
+            // Adding components to an entity if there's a command to remove it the queue
+            // will lead to crash. Executing this system before `update_level_objects` helps
+            // to avoid this scenario.
+            poll_calculating_shapes_system.before(update_level_objects_system),
+            // Updating level objects might despawn entities completely if they are
+            // updated with replacement. Running it before `despawn_level_objects` might
+            // result into an edge-case where changes to the `Spawned` component are not
+            // propagated.
+            update_level_objects_system.after(despawn_level_objects_system),
+            maintain_available_spawn_areas_system.after(update_level_objects_system),
+            spawn_players_system
+                .after(despawn_players_system)
+                .after(maintain_available_spawn_areas_system),
+        );
+        simulation_schedule.add_systems(spawn_set.in_base_set(SimulationSet::Spawn));
+
+        // `SimulationSet::PreGame` base set systems.
+        simulation_schedule.add_systems(
+            (
+                apply_system_buffers,
+                update_level_object_movement_route_settings_system,
+                apply_system_buffers,
             )
-            .with_stage(
-                stage::POST_PHYSICS,
-                SystemStage::single_threaded()
-                    .with_system(
-                        process_collision_events_system
-                            .pipe(process_players_with_new_collisions_system),
-                    )
-                    .with_system(sync_position_system)
-                    .with_system_set(RapierPhysicsPlugin::<()>::get_systems(
-                        PhysicsStages::DetectDespawn,
-                    )),
+                .chain()
+                .in_base_set(SimulationSet::PreGame),
+        );
+
+        // `SimulationSet::Game` base set systems.
+        let game_set = (
+            isolate_client_mispredicted_world_system,
+            player_movement_system,
+            process_objects_route_graph_system,
+            load_object_positions_system.after(process_objects_route_graph_system),
+        );
+        simulation_schedule.add_systems(game_set.in_base_set(SimulationSet::Game));
+
+        // `SimulationSet::GamePhysics` base set systems.
+        simulation_schedule.add_system(apply_system_buffers.in_set(PhysicsSimulationSet::First));
+        simulation_schedule.configure_sets(
+            (
+                PhysicsSimulationSet::SyncBackend,
+                PhysicsSimulationSet::SyncBackendFlush,
+                PhysicsSimulationSet::StepSimulation,
+                PhysicsSimulationSet::Writeback,
+                PhysicsSimulationSet::Last,
             )
-            .with_stage(
-                stage::POST_GAME,
-                post_game_stage
-                    .take()
-                    .expect("Can't initialize the plugin more than once"),
+                .chain()
+                .in_base_set(SimulationSet::GamePhysics),
+        );
+        simulation_schedule.add_systems(
+            RapierPhysicsPlugin::<()>::get_systems(PhysicsSet::SyncBackend)
+                .in_set(PhysicsSimulationSet::SyncBackend),
+        );
+        simulation_schedule.add_systems(
+            RapierPhysicsPlugin::<()>::get_systems(PhysicsSet::SyncBackendFlush)
+                .in_set(PhysicsSimulationSet::SyncBackendFlush),
+        );
+        simulation_schedule.add_systems(
+            RapierPhysicsPlugin::<()>::get_systems(PhysicsSet::StepSimulation)
+                .in_set(PhysicsSimulationSet::StepSimulation),
+        );
+        simulation_schedule.add_systems(
+            RapierPhysicsPlugin::<()>::get_systems(PhysicsSet::Writeback)
+                .in_set(PhysicsSimulationSet::Writeback),
+        );
+        simulation_schedule.add_system(apply_system_buffers.in_set(PhysicsSimulationSet::Last));
+
+        // `SimulationSet::PostGamePhysics` base set systems.
+        simulation_schedule.add_systems(
+            (
+                process_collision_events_system.pipe(process_players_with_new_collisions_system),
+                sync_position_system,
             )
-            .with_stage(
-                stage::SIMULATION_FINAL,
-                SystemStage::single_threaded().with_system(tick_simulation_frame_system),
-            );
-
-        let main_schedule = Schedule::default()
-            .with_run_criteria(
-                main_run_criteria
-                    .take()
-                    .expect("Can't initialize the plugin more than once"),
+                .in_base_set(SimulationSet::PostGamePhysics),
+        );
+
+        // `SimulationSet::PostGame` base set systems.
+        simulation_schedule.add_systems(post_game_set.in_base_set(SimulationSet::PostGame));
+
+        // `SimulationSet::Last` base set systems.
+        simulation_schedule.add_systems(
+            (tick_simulation_frame_system, apply_system_buffers).in_base_set(SimulationSet::Last),
+        );
+
+        let mut main_schedule = Schedule::new();
+        main_schedule.configure_sets(
+            (
+                MainSet::First,
+                MainSet::SimulationSchedule,
+                MainSet::BroadcastUpdates,
+                MainSet::PostSimulation,
+                MainSet::PostTick,
+                MainSet::Last,
             )
-            .with_stage(stage::SIMULATION_SCHEDULE, simulation_schedule)
-            .with_stage(
-                stage::BROADCAST_UPDATES,
-                broadcast_updates_stage
-                    .take()
-                    .expect("Can't initialize the plugin more than once")
-                    .with_run_criteria(game_tick_run_criteria(TICKS_PER_NETWORK_BROADCAST)),
+                .chain(),
+        );
+
+        // `MainSet::First` base set systems.
+        main_schedule.add_systems(
+            (
+                apply_state_transition::<AppState>,
+                apply_state_transition::<GameSessionState>,
             )
-            .with_stage(
-                stage::POST_SIMULATIONS,
-                SystemStage::single_threaded()
-                    // If the game is loading, these systems won't run (as the simulation schedule
-                    // isn't run), but we still need as spawning level objects is part of loading.
-                    .with_system(
-                        poll_calculating_shapes_system
-                            .run_in_state(GameSessionState::Loading)
-                            .label("poll_shapes"),
-                    )
-                    .with_system(
-                        update_level_objects_system
-                            .run_in_state(GameSessionState::Loading)
-                            .label("update_level_objects")
-                            .after("poll_shapes"),
-                    )
-                    .with_system(
-                        tick_game_frame_system
-                            .run_not_in_state(GameSessionState::Paused)
-                            .after("update_level_objects"),
-                    )
-                    .with_system(process_spawned_entities_system.after(tick_game_frame_system))
-                    // Removing disconnected players doesn't depend on ticks, so it's fine to have
-                    // in unordered.
-                    .with_system(remove_disconnected_players_system),
+                .in_base_set(MainSet::First),
+        );
+
+        // `MainSet::SimulationSchedule` base set systems.
+        main_schedule.add_system(
+            create_looping_schedule_with_criteria_system(
+                &mut app.world,
+                SimulationSchedule,
+                simulation_tick_run_criteria,
             )
-            .with_stage(
-                stage::POST_TICK,
-                post_tick_stage
-                    .take()
-                    .expect("Can't initialize the plugin more than once")
-                    .with_system_set(RapierPhysicsPlugin::<()>::get_systems(
-                        PhysicsStages::DetectDespawn,
-                    )),
-            );
-
-        app.add_stage_before(CoreStage::Update, stage::MAIN_SCHEDULE, main_schedule);
-        app.add_stage_before(
-            stage::MAIN_SCHEDULE,
-            stage::READ_INPUT_UPDATES,
-            SystemStage::single_threaded()
-                .with_system(read_movement_updates_system.run_in_state(GameSessionState::Playing)),
+            .in_base_set(MainSet::SimulationSchedule),
         );
-        // We predefine every enter/exit stage to mark them as single-threaded.
-        // Atm, Bevy suffers from from the scheduler overhead to plan running systems in
-        // parallel, which negates the parallelisation.
-        app.add_stage_before(
-            stage::READ_INPUT_UPDATES,
-            stage::GAME_SESSION_STATE_TRANSITION,
-            StateTransitionStage::new(GameSessionState::Loading)
-                .with_enter_stage(
-                    GameSessionState::Loading,
-                    SystemStage::single_threaded().with_system(reset_game_world_system.at_start()),
-                )
-                .with_exit_stage(GameSessionState::Loading, SystemStage::single_threaded())
-                .with_enter_stage(GameSessionState::Playing, SystemStage::single_threaded())
-                .with_exit_stage(GameSessionState::Playing, SystemStage::single_threaded())
-                .with_enter_stage(GameSessionState::Paused, SystemStage::single_threaded())
-                .with_exit_stage(GameSessionState::Paused, SystemStage::single_threaded()),
+
+        // `MainSet::BroadcastUpdates` base set systems.
+        main_schedule.add_systems(
+            broadcast_updates_set
+                .distributive_run_if(game_tick_run_criteria(TICKS_PER_NETWORK_BROADCAST))
+                .in_base_set(MainSet::BroadcastUpdates),
         );
-        app.add_stage_before(
-            stage::GAME_SESSION_STATE_TRANSITION,
-            stage::APP_STATE_TRANSITION,
-            StateTransitionStage::new(AppState::Loading)
-                .with_enter_stage(AppState::Loading, SystemStage::single_threaded())
-                .with_exit_stage(AppState::Loading, SystemStage::single_threaded())
-                .with_enter_stage(AppState::MainMenu, SystemStage::single_threaded())
-                .with_exit_stage(AppState::MainMenu, SystemStage::single_threaded())
-                .with_enter_stage(AppState::Playing, SystemStage::single_threaded())
-                .with_exit_stage(AppState::Playing, SystemStage::single_threaded()),
+
+        // `MainSet::PostSimulation` base set systems.
+        let post_simulation_set = (
+            // These systems are also present in the simulation set.
+            // If the game is loading, the simulation set isn't run, but we
+            // still need these systems as spawning level objects is
+            // part of loading.
+            poll_calculating_shapes_system.run_if(in_state(GameSessionState::Loading)),
+            update_level_objects_system.run_if(in_state(GameSessionState::Loading)),
+            tick_game_frame_system.run_if(not(in_state(GameSessionState::Paused))),
+            process_spawned_entities_system.after(tick_game_frame_system),
+            // Removing disconnected players doesn't depend on ticks, so it's
+            // fine to have it unordered.
+            remove_disconnected_players_system,
         );
-        app.add_stage_before(
-            stage::READ_INPUT_UPDATES,
-            stage::WRITE_INPUT_UPDATES,
-            input_stage
-                .take()
-                .expect("Can't initialize the plugin more than once"),
+        main_schedule.add_systems(post_simulation_set.in_base_set(MainSet::PostSimulation));
+
+        // `MainSet::PostTick` base set systems.
+        main_schedule.add_systems(post_tick_set.in_base_set(MainSet::PostTick));
+
+        // `MainSet::Last` base set systems.
+        main_schedule.add_systems(
+            (
+                bevy_rapier2d::plugin::systems::sync_removals,
+                apply_system_buffers,
+            )
+                .chain()
+                .in_base_set(MainSet::Last),
         );
 
+        app.add_schedule(MainSchedule, main_schedule);
+        app.add_schedule(SimulationSchedule, simulation_schedule);
+
         app.add_startup_system(network_setup_system);
 
+        app.configure_sets(
+            (
+                AppSet::ResetWorld,
+                AppSet::WriteInputUpdates,
+                AppSet::MainSchedule,
+            )
+                .chain()
+                .in_base_set(CoreSet::Update),
+        );
+        app.add_systems(
+            (
+                apply_system_buffers,
+                reset_game_world_system.run_if(
+                    state_changed::<GameSessionState>()
+                        .and_then(in_state(GameSessionState::Loading)),
+                ),
+            )
+                .chain()
+                .in_set(AppSet::ResetWorld),
+        );
+        app.add_systems(input_set.in_set(AppSet::WriteInputUpdates));
+        main_run_criteria.initialize(&mut app.world);
+        let run_main_schedule_system = create_looping_schedule_with_criteria_system(
+            &mut app.world,
+            MainSchedule,
+            main_run_criteria,
+        );
+        app.add_systems(
+            (
+                apply_system_buffers,
+                read_movement_updates_system.run_if(in_state(GameSessionState::Playing)),
+                run_main_schedule_system,
+            )
+                .chain()
+                .in_set(AppSet::MainSchedule),
+        );
+
         #[cfg(feature = "client")]
         app.add_startup_system(client::assets::init_muddle_assets_system);
 
@@ -401,13 +461,14 @@ impl<S: System<In = (), Out = ShouldRun>> Plugin for MuddleSharedPlugin<S> {
     }
 }
 
-#[derive(Clone, Debug, Eq, PartialEq, Hash)]
+#[derive(Clone, Debug, Eq, PartialEq, Hash, Default, States)]
 pub enum AppState {
     /// Currently, this state is used only for clients.
     /// We use this state to spawn dummy PBR entities to trigger shaders
     /// loading. This is useful for browsers in the first place, as loading
     /// shaders is blocking there and freezes the app (so a loading screen
     /// should be shown).
+    #[default]
     Loading,
     /// This state is used when a client is launched in the mode when going
     /// through the authentication and matchmaking menus is required before
@@ -417,25 +478,14 @@ pub enum AppState {
     Playing,
 }
 
-impl Default for AppState {
-    fn default() -> Self {
-        Self::Loading
-    }
-}
-
-#[derive(Clone, Debug, Eq, PartialEq, Hash)]
+#[derive(Default, Clone, Debug, Eq, PartialEq, Hash, States)]
 pub enum GameSessionState {
+    #[default]
     Loading,
     Playing,
     Paused,
 }
 
-impl Default for GameSessionState {
-    fn default() -> Self {
-        Self::Loading
-    }
-}
-
 /// The resource is added when a client/server starts spawning level objects on
 /// loading the level. When every level object is spawned, the counter reaches
 /// zero. After that, we remove the resource and switch `GameSessionState` to
@@ -590,43 +640,44 @@ pub struct GameTickRunCriteriaState {
     last_tick: FrameNumber,
 }
 
-fn game_tick_run_criteria(ticks_per_step: u16) -> impl System<In = (), Out = ShouldRun> {
-    IntoSystem::into_system(
-        move |mut state: Local<GameTickRunCriteriaState>, time: Res<GameTime>| -> ShouldRun {
-            let ticks_per_step = FrameNumber::new(ticks_per_step);
-            #[cfg(feature = "profiler")]
-            puffin::profile_function!();
-            if state.last_generation != Some(time.session) {
-                state.last_generation = Some(time.session);
-                state.last_tick = time.frame_number - ticks_per_step;
-            }
+fn game_tick_run_criteria(
+    ticks_per_step: u16,
+) -> impl FnMut(Local<GameTickRunCriteriaState>, Res<GameTime>) -> bool + Clone {
+    move |mut state: Local<GameTickRunCriteriaState>, time: Res<GameTime>| -> bool {
+        let ticks_per_step = FrameNumber::new(ticks_per_step);
+        #[cfg(feature = "profiler")]
+        puffin::profile_function!();
+        if state.last_generation != Some(time.session) {
+            state.last_generation = Some(time.session);
+            state.last_tick = time.frame_number - ticks_per_step;
+        }
 
-            if state.last_tick + ticks_per_step <= time.frame_number {
-                trace!("Run and loop a game schedule (game {})", time.frame_number);
-                let ticks_per_step = ticks_per_step;
-                state.last_tick += ticks_per_step;
-                ShouldRun::YesAndCheckAgain
-            } else {
-                trace!("Don't run a game schedule (game {})", time.frame_number);
-                ShouldRun::No
-            }
-        },
-    )
+        if state.last_tick + ticks_per_step <= time.frame_number {
+            log::trace!("Run and loop a game schedule (game {})", time.frame_number);
+            let ticks_per_step = ticks_per_step;
+            state.last_tick += ticks_per_step;
+            true
+        } else {
+            log::trace!("Don't run a game schedule (game {})", time.frame_number);
+            false
+        }
+    }
 }
 
 #[derive(Default, Clone)]
 pub struct SimulationTickRunCriteriaState {
     last_game_frame: Option<FrameNumber>,
+    last_game_state: GameSessionState,
     last_player_frame: FrameNumber,
     last_server_frame: FrameNumber,
 }
 
 fn simulation_tick_run_criteria(
     mut state: Local<SimulationTickRunCriteriaState>,
-    game_state: Res<CurrentState<GameSessionState>>,
+    game_state: Res<State<GameSessionState>>,
     game_time: Res<GameTime>,
     simulation_time: Res<SimulationTime>,
-) -> ShouldRun {
+) -> bool {
     #[cfg(feature = "profiler")]
     puffin::profile_function!();
     // Checking that a game frame has changed helps us to avoid the panicking in
@@ -636,12 +687,14 @@ fn simulation_tick_run_criteria(
     } else if state.last_player_frame == simulation_time.player_frame
         && state.last_server_frame == simulation_time.server_frame
         && game_state.0 == GameSessionState::Playing
+        && game_state.0 == state.last_game_state
     {
         panic!(
             "Simulation frame hasn't advanced: {}, {}",
             simulation_time.player_frame, simulation_time.server_frame
         );
     }
+    state.last_game_state = game_state.0.clone();
     state.last_player_frame = simulation_time.player_frame;
     state.last_server_frame = simulation_time.server_frame;
 
@@ -654,7 +707,7 @@ fn simulation_tick_run_criteria(
             game_time.frame_number,
             *game_state
         );
-        ShouldRun::YesAndCheckAgain
+        true
     } else {
         trace!(
             "Don't run a simulation schedule (simulation: {}, game: {}, state: {:?})",
@@ -662,7 +715,7 @@ fn simulation_tick_run_criteria(
             game_time.frame_number,
             *game_state
         );
-        ShouldRun::No
+        false
     }
 }
 
diff --git a/libs/shared_lib/src/wrapped_counter.rs b/libs/shared_lib/src/wrapped_counter.rs
index acac99df..2e048358 100644
--- a/libs/shared_lib/src/wrapped_counter.rs
+++ b/libs/shared_lib/src/wrapped_counter.rs
@@ -42,14 +42,6 @@ where
         *self = WrappedCounter::add(self, Self::new(1.as_())).0;
         old
     }
-
-    pub fn add_signed(&self, rhs: i16) -> Self {
-        if rhs > 0 {
-            self.add(Self::new(rhs.unsigned_abs().as_())).0
-        } else {
-            self.sub(Self::new(rhs.unsigned_abs().as_()))
-        }
-    }
 }
 
 impl<T: Integer> std::fmt::Display for WrappedCounter<T> {
diff --git a/libs/utils_lib/Cargo.toml b/libs/utils_lib/Cargo.toml
index b8d457ed..bb7a4aaf 100644
--- a/libs/utils_lib/Cargo.toml
+++ b/libs/utils_lib/Cargo.toml
@@ -11,7 +11,7 @@ jwks = ["anyhow", "headers", "jwt-compact", "reqwest", "tokio"]
 
 [dependencies]
 anyhow = { version = "1.0", optional = true }
-bevy = { version = "0.9.1", optional = true, default-features = false }
+bevy = { version = "0.10", optional = true, default-features = false }
 dotenv = "0.15.0"
 headers = { version = "0.3.5", optional = true }
 jwt-compact = { version = "0.6", optional = true, features = ["std", "clock", "with_rsa"], default-features = false }