diff --git a/Cargo.lock b/Cargo.lock
index ca6fb62eab..aba0cae359 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "ab_glyph"
-version = "0.2.21"
+version = "0.2.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5110f1c78cf582855d895ecd0746b653db010cec6d9f5575293f27934d980a39"
+checksum = "b1061f3ff92c2f65800df1f12fc7b4ff44ee14783104187dd04dfee6f11b0fd2"
 dependencies = [
  "ab_glyph_rasterizer",
  "owned_ttf_parser",
@@ -20,24 +20,28 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046"
 
 [[package]]
 name = "accesskit"
-version = "0.10.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "704d532b1cd3d912bb37499c55a81ac748cc1afa737eedd100ba441acdd47d38"
+checksum = "76eb1adf08c5bcaa8490b9851fd53cca27fa9880076f178ea9d29f05196728a8"
+dependencies = [
+ "enumn",
+ "serde",
+]
 
 [[package]]
 name = "accesskit_consumer"
-version = "0.14.1"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48ba8b23cfca3944012ee2e5c71c02077a400e034c720eed6bd927cb6b4d1fd9"
+checksum = "04bb4d9e4772fe0d47df57d0d5dbe5d85dd05e2f37ae1ddb6b105e76be58fb00"
 dependencies = [
  "accesskit",
 ]
 
 [[package]]
 name = "accesskit_macos"
-version = "0.6.2"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58d062544d6cc36f4213323b7cb3a0d74ddff4b0d2311ab5e7596f4278bb2cc9"
+checksum = "134d0acf6acb667c89d3332999b1a5df4edbc8d6113910f392ebb73f2b03bb56"
 dependencies = [
  "accesskit",
  "accesskit_consumer",
@@ -47,23 +51,23 @@ dependencies = [
 
 [[package]]
 name = "accesskit_windows"
-version = "0.13.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aaf5b3c3828397ee832ba4a72fb1a4ace10f781e31885f774cbd531014059115"
+checksum = "9eac0a7f2d7cd7a93b938af401d3d8e8b7094217989a7c25c55a953023436e31"
 dependencies = [
  "accesskit",
  "accesskit_consumer",
  "arrayvec",
  "once_cell",
  "paste",
- "windows 0.44.0",
+ "windows 0.48.0",
 ]
 
 [[package]]
 name = "accesskit_winit"
-version = "0.12.4"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbcb615217efc79c4bed3094c4ca76c4bc554751d1da16f3ed4ba0459b1e8f31"
+checksum = "825d23acee1bd6d25cbaa3ca6ed6e73faf24122a774ec33d52c5c86c6ab423c0"
 dependencies = [
  "accesskit",
  "accesskit_macos",
@@ -73,9 +77,9 @@ dependencies = [
 
 [[package]]
 name = "addr2line"
-version = "0.19.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
 dependencies = [
  "gimli",
 ]
@@ -86,17 +90,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
-[[package]]
-name = "ahash"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
-dependencies = [
- "getrandom 0.2.10",
- "once_cell",
- "version_check",
-]
-
 [[package]]
 name = "ahash"
 version = "0.8.3"
@@ -104,42 +97,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
 dependencies = [
  "cfg-if",
+ "getrandom 0.2.10",
  "once_cell",
+ "serde",
  "version_check",
 ]
 
 [[package]]
 name = "aho-corasick"
-version = "0.7.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "aho-corasick"
-version = "1.0.2"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
-name = "aligned-vec"
-version = "0.5.0"
+name = "allocator-api2"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1"
+checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
 
 [[package]]
 name = "alsa"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8512c9117059663fb5606788fbca3619e2a91dac0e3fe516242eab1fa6be5e44"
+checksum = "e2562ad8dcf0f789f65c6fdaad8a8a9708ed6b488e649da28c01656ad66b8b47"
 dependencies = [
  "alsa-sys",
- "bitflags",
+ "bitflags 1.3.2",
  "libc",
  "nix 0.24.3",
 ]
@@ -156,12 +142,12 @@ dependencies = [
 
 [[package]]
 name = "android-activity"
-version = "0.4.1"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c77a0045eda8b888c76ea473c2b0515ba6f471d318f8927c5c72240937035a6"
+checksum = "64529721f27c2314ced0890ce45e469574a73e5e6fdd6e9da1860eb29285f5e0"
 dependencies = [
  "android-properties",
- "bitflags",
+ "bitflags 1.3.2",
  "cc",
  "jni-sys",
  "libc",
@@ -169,7 +155,7 @@ dependencies = [
  "ndk",
  "ndk-context",
  "ndk-sys",
- "num_enum",
+ "num_enum 0.6.1",
 ]
 
 [[package]]
@@ -178,17 +164,11 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04"
 
-[[package]]
-name = "android-tzdata"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
-
 [[package]]
 name = "android_log-sys"
-version = "0.2.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85965b6739a430150bdd138e2374a98af0c3ee0d030b3bb7fc3bddff58d0102e"
+checksum = "5ecc8056bf6ab9892dcd53216c83d1597487d7dacac16c8df6b877d127df9937"
 
 [[package]]
 name = "android_system_properties"
@@ -201,9 +181,15 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.71"
+version = "1.0.75"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
+
+[[package]]
+name = "append-only-vec"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
+checksum = "f3cb8f874ecf419dd8165d0279746de966cb8966636d028845e3bd65d519812a"
 
 [[package]]
 name = "approx"
@@ -216,9 +202,9 @@ dependencies = [
 
 [[package]]
 name = "arboard"
-version = "3.2.0"
+version = "3.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6041616acea41d67c4a984709ddab1587fd0b10efe5cc563fee954d2f011854"
+checksum = "ac57f2b058a76363e357c056e4f74f1945bf734d37b8b3ef49066c4787dde0fc"
 dependencies = [
  "clipboard-win",
  "core-graphics",
@@ -227,8 +213,7 @@ dependencies = [
  "objc",
  "objc-foundation",
  "objc_id",
- "once_cell",
- "parking_lot 0.12.1",
+ "parking_lot",
  "thiserror",
  "winapi",
  "x11rb",
@@ -236,9 +221,9 @@ dependencies = [
 
 [[package]]
 name = "arrayvec"
-version = "0.7.2"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
+checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "ash"
@@ -246,79 +231,48 @@ version = "0.37.3+1.3.251"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a"
 dependencies = [
- "libloading",
+ "libloading 0.7.4",
 ]
 
 [[package]]
 name = "async-channel"
-version = "1.8.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833"
+checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
 dependencies = [
  "concurrent-queue",
- "event-listener",
+ "event-listener 2.5.3",
  "futures-core",
 ]
 
 [[package]]
 name = "async-executor"
-version = "1.5.1"
+version = "1.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb"
+checksum = "2c1da3ae8dabd9c00f453a329dfe1fb28da3c0a72e2478cdcd93171740c20499"
 dependencies = [
  "async-lock",
  "async-task",
  "concurrent-queue",
- "fastrand",
- "futures-lite",
- "slab",
-]
-
-[[package]]
-name = "async-io"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af"
-dependencies = [
- "async-lock",
- "autocfg",
- "cfg-if",
- "concurrent-queue",
+ "fastrand 2.0.1",
  "futures-lite",
- "log",
- "parking",
- "polling",
- "rustix",
  "slab",
- "socket2 0.4.9",
- "waker-fn",
 ]
 
 [[package]]
 name = "async-lock"
-version = "2.7.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7"
+checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b"
 dependencies = [
- "event-listener",
+ "event-listener 2.5.3",
 ]
 
 [[package]]
 name = "async-task"
-version = "4.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae"
-
-[[package]]
-name = "async-timer"
-version = "0.7.4"
+version = "4.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba5fa6ed76cb2aa820707b4eb9ec46f42da9ce70b0eafab5e5e34942b38a44d5"
-dependencies = [
- "libc",
- "wasm-bindgen",
- "winapi",
-]
+checksum = "b9441c6b2fe128a7c2bf680a44c34d0df31ce09e5b7e401fcca3faa483dbc921"
 
 [[package]]
 name = "atomic-arena"
@@ -327,19 +281,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5450eca8ce5abcfd5520727e975ebab30ccca96030550406b0ca718b224ead10"
 
 [[package]]
-name = "atomic-polyfill"
-version = "0.1.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3ff7eb3f316534d83a8a2c3d1674ace8a5a71198eba31e2e2b597833f699b28"
-dependencies = [
- "critical-section",
-]
-
-[[package]]
-name = "atomic_refcell"
-version = "0.1.10"
+name = "atomicell"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79d6dc922a2792b006573f60b2648076355daeae5ce9cb59507e5908c9625d31"
+checksum = "157342dd84c64f16899b4b16c1fb2cce54b887990362aac3c590b3d13810890f"
 
 [[package]]
 name = "autocfg"
@@ -349,107 +294,39 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "backtrace"
-version = "0.3.67"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca"
+checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
 dependencies = [
  "addr2line",
  "cc",
  "cfg-if",
  "libc",
- "miniz_oxide 0.6.2",
+ "miniz_oxide",
  "object",
  "rustc-demangle",
 ]
 
 [[package]]
 name = "base64"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
-
-[[package]]
-name = "base64"
-version = "0.21.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"
-
-[[package]]
-name = "better-bae"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c42256f0525b8d9cb8e6573ba850478df93ba34ddd7bf64eeb47ff19a8422bc5"
-dependencies = [
- "better-bae-macros",
- "proc-macro2",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "better-bae-macros"
-version = "0.1.9"
+version = "0.21.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b0f3144c211af9910842422e6835938ff01895bca8c143e28dcebdd23eb2dbc"
-dependencies = [
- "heck",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
+checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2"
 
 [[package]]
 name = "bevy"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b93f906133305915d63f04108e6873c1b93a6605fe374b8f3391f6bda093e396"
+checksum = "91c6d3ec4f89e85294dc97334c5b271ddc301fdf67ac9bb994fe44d9273e6ed7"
 dependencies = [
  "bevy_internal",
 ]
 
-[[package]]
-name = "bevy-inspector-egui"
-version = "0.18.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bda61dd72f879e8d4b0f57e94b86bd163bf558ac2e7ddea9ea075a47bdcd9af"
-dependencies = [
- "bevy-inspector-egui-derive",
- "bevy_app",
- "bevy_asset",
- "bevy_core",
- "bevy_core_pipeline",
- "bevy_ecs",
- "bevy_egui",
- "bevy_hierarchy",
- "bevy_log",
- "bevy_math",
- "bevy_reflect",
- "bevy_render",
- "bevy_utils",
- "bevy_window",
- "egui",
- "image",
- "once_cell",
- "pretty-type-name",
- "smallvec",
-]
-
-[[package]]
-name = "bevy-inspector-egui-derive"
-version = "0.18.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7556c913daacbec7aa213eda82517673bf6c6b25e0d827a56efe17421ebaca35"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.18",
-]
-
 [[package]]
 name = "bevy_a11y"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "037c4063f7dac1a5d596eb47f40782a04ca5838dc4274dbbadc90eb81efe5169"
+checksum = "132c9e35a77c5395951f6d25fa2c52ee92296353426df4f961e60f3ff47e2e42"
 dependencies = [
  "accesskit",
  "bevy_app",
@@ -459,13 +336,14 @@ dependencies = [
 
 [[package]]
 name = "bevy_app"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01db46963eb9486f7884121527ec69751d0e448f9e1d5329e80ea3424118a31a"
+checksum = "f557a7d59e1e16892d7544fc37316506ee598cb5310ef0365125a30783c11531"
 dependencies = [
  "bevy_derive",
  "bevy_ecs",
  "bevy_reflect",
+ "bevy_tasks",
  "bevy_utils",
  "downcast-rs",
  "wasm-bindgen",
@@ -474,11 +352,12 @@ dependencies = [
 
 [[package]]
 name = "bevy_asset"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98609b4b0694a23bde0628aed626644967991f167aad9db2afb68dacb0017540"
+checksum = "9714af523da4cdf58c42a317e5ed40349708ad954a18533991fd64c8ae0a6f68"
 dependencies = [
  "anyhow",
+ "async-channel",
  "bevy_app",
  "bevy_diagnostic",
  "bevy_ecs",
@@ -489,10 +368,9 @@ dependencies = [
  "bevy_winit",
  "crossbeam-channel",
  "downcast-rs",
- "fastrand",
+ "fastrand 1.9.0",
  "js-sys",
- "notify",
- "parking_lot 0.12.1",
+ "parking_lot",
  "serde",
  "thiserror",
  "wasm-bindgen",
@@ -500,35 +378,11 @@ dependencies = [
  "web-sys",
 ]
 
-[[package]]
-name = "bevy_console"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16918632c7af076b9c82617dddc9f63e8647c50a4dc83867bba75eafc29eee87"
-dependencies = [
- "bevy",
- "bevy_console_derive",
- "bevy_egui",
- "clap",
-]
-
-[[package]]
-name = "bevy_console_derive"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bfc5e1962775c30fff70367f6aa7526190a4fe8495a6ae4a3d939bd889fee1e"
-dependencies = [
- "better-bae",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "bevy_core"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ee53d7b4691b57207d72e996992c995a53f3e8d21ca7151ca3956d9ce7d232e"
+checksum = "3d5272321be5fcf5ce2fb16023bc825bb10dfcb71611117296537181ce950f48"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -537,17 +391,17 @@ dependencies = [
  "bevy_tasks",
  "bevy_utils",
  "bytemuck",
- "serde",
 ]
 
 [[package]]
 name = "bevy_core_pipeline"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "093ae5ced77251602ad6e43521e2acc1a5570bf85b80f232f1a7fdd43b50f8d8"
+checksum = "67382fa9c96ce4f4e5833ed7cedd9886844a8f3284b4a717bd4ac738dcdea0c3"
 dependencies = [
  "bevy_app",
  "bevy_asset",
+ "bevy_core",
  "bevy_derive",
  "bevy_ecs",
  "bevy_math",
@@ -555,27 +409,27 @@ dependencies = [
  "bevy_render",
  "bevy_transform",
  "bevy_utils",
- "bitflags",
+ "bitflags 2.4.0",
  "radsort",
  "serde",
 ]
 
 [[package]]
 name = "bevy_derive"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dff0add5ab4a6b2b7e86e18f9043bb48b6386faa3b56abaa0ed97a3d669a1992"
+checksum = "a44e4e2784a81430199e4157e02903a987a32127c773985506f020e7d501b62e"
 dependencies = [
  "bevy_macro_utils",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.38",
 ]
 
 [[package]]
 name = "bevy_diagnostic"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64c778422643b0adee9e82abbd07e1e906eb9947c274a9b18e0f7fbf137d4c34"
+checksum = "6babb230dc383c98fdfc9603e3a7a2a49e1e2879dbe8291059ef37dca897932e"
 dependencies = [
  "bevy_app",
  "bevy_core",
@@ -588,18 +442,18 @@ dependencies = [
 
 [[package]]
 name = "bevy_dylib"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5256c735e1e1587f9eab08b9268fcd881fc2e6403d75a89580582ed35cc79193"
+checksum = "22ea11f830028e1c9d37f8bc88c5873f1c4c0346661209c2ba015f899c51863c"
 dependencies = [
  "bevy_internal",
 ]
 
 [[package]]
 name = "bevy_ecs"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bed2f74687ccf13046c0f8e3b00dc61d7e656877b4a1380cf04635bb74d8e586"
+checksum = "266144b36df7e834d5198049e037ecdf2a2310a76ce39ed937d1b0a6a2c4e8c6"
 dependencies = [
  "async-channel",
  "bevy_ecs_macros",
@@ -608,30 +462,30 @@ dependencies = [
  "bevy_tasks",
  "bevy_utils",
  "downcast-rs",
- "event-listener",
+ "event-listener 2.5.3",
  "fixedbitset",
  "rustc-hash",
  "serde",
+ "thiserror",
  "thread_local",
 ]
 
 [[package]]
 name = "bevy_ecs_macros"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a97fd126a0db7b30fb1833614b3a657b44ac88485741c33b2780e25de0f96d78"
+checksum = "7157a9c3be038d5008ee3f114feb6cf6b39c1d3d32ee21a7cacb8f81fccdfa80"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.38",
 ]
 
 [[package]]
 name = "bevy_egui"
-version = "0.20.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5e269226c4a8fb659aa3161c19925650ebe2c23021ddf4dd9ed191cf708364f"
+version = "0.21.0"
+source = "git+https://github.com/zicklag/bevy_egui?branch=feat/egui-0.23#aeb3d7f1eaaacc67cf3966974d1e31f31e8fad62"
 dependencies = [
  "arboard",
  "bevy",
@@ -642,65 +496,54 @@ dependencies = [
 
 [[package]]
 name = "bevy_encase_derive"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c086ebdc1f5522787d63772943277cc74a279445fb65db4d58c2c5330654648e"
+checksum = "d0ac0f55ad6bca1be7b0f35bbd5fc95ed3d31e4e9db158fee8e5327f59006001"
 dependencies = [
  "bevy_macro_utils",
  "encase_derive_impl",
 ]
 
 [[package]]
-name = "bevy_fluent"
-version = "0.6.1"
+name = "bevy_gilrs"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a1eecb75ba4f874fa7fe8d6c659a534d7738bcece6d92c016c21ee0092cc03d"
+checksum = "65f4d79c55829f8016014593a42453f61a564ffb06ef79460d25696ccdfac67b"
 dependencies = [
- "anyhow",
- "bevy",
- "fluent",
- "fluent-langneg",
- "fluent_content",
- "globset",
- "indexmap",
- "intl-memoizer",
- "ron",
- "serde",
- "serde_yaml",
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_input",
+ "bevy_log",
+ "bevy_time",
+ "bevy_utils",
+ "gilrs",
  "thiserror",
- "tracing",
- "unic-langid",
- "uuid",
-]
-
-[[package]]
-name = "bevy_framepace"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1825c5a485aa2a2ffd91cc1faa1f4d621c804a893ead88cafedbe1ed6c51d34"
-dependencies = [
- "bevy",
- "spin_sleep",
 ]
 
 [[package]]
-name = "bevy_gilrs"
-version = "0.10.1"
+name = "bevy_gizmos"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f32eb07e8c9ea4be7195ccec10d8f9ad70200f3ae2e13adc4b84df9f50bb1c6"
+checksum = "e286a3e7276431963f4aa29165ea5429fa7dbbc6d5c5ba0c531e7dd44ecc88a2"
 dependencies = [
  "bevy_app",
+ "bevy_asset",
+ "bevy_core",
+ "bevy_core_pipeline",
  "bevy_ecs",
- "bevy_input",
+ "bevy_math",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_sprite",
+ "bevy_transform",
  "bevy_utils",
- "gilrs",
 ]
 
 [[package]]
 name = "bevy_hierarchy"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d04099865a13d1fd8bf3c044a80148cb3d23bfe8c3d5f082dda2ce091d85532"
+checksum = "103f8f58416ac6799b8c7f0b418f1fac9eba44fa924df3b0e16b09256b897e3d"
 dependencies = [
  "bevy_app",
  "bevy_core",
@@ -713,24 +556,23 @@ dependencies = [
 
 [[package]]
 name = "bevy_input"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a15d40aa636bb656967ac16ca36066ab7a7bb9179e1b0390c5705e54208e8fd7"
+checksum = "ffbd935401101ac8003f3c3aea70788c65ad03f7a32716a10608bedda7a648bc"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
  "bevy_math",
  "bevy_reflect",
  "bevy_utils",
- "serde",
  "thiserror",
 ]
 
 [[package]]
 name = "bevy_internal"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "862b11931c5874cb00778ffb715fc526ee49e52a493d3bcf50e8010f301858b3"
+checksum = "e0e35a9b2bd29aa784b3cc416bcbf2a298f69f00ca51fd042ea39d9af7fad37e"
 dependencies = [
  "bevy_a11y",
  "bevy_app",
@@ -741,6 +583,7 @@ dependencies = [
  "bevy_diagnostic",
  "bevy_ecs",
  "bevy_gilrs",
+ "bevy_gizmos",
  "bevy_hierarchy",
  "bevy_input",
  "bevy_log",
@@ -759,31 +602,17 @@ dependencies = [
  "bevy_winit",
 ]
 
-[[package]]
-name = "bevy_kira_audio"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "468257f6c7980d847aba0e9b6c9e4ff4045598510637d6e484b5f290c00a1f92"
-dependencies = [
- "anyhow",
- "bevy",
- "kira",
- "parking_lot 0.12.1",
- "thiserror",
-]
-
 [[package]]
 name = "bevy_log"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25980c90ceaad34d09a53291e72ca56fcc754a974cd4654fffcf5b68b283b7a7"
+checksum = "07dcc615ff4f617b06c3f9522fca3c55d56f9644db293318f8ab68fcdea5d4fe"
 dependencies = [
  "android_log-sys",
  "bevy_app",
  "bevy_ecs",
  "bevy_utils",
  "console_error_panic_hook",
- "tracing-error",
  "tracing-log",
  "tracing-subscriber",
  "tracing-wasm",
@@ -791,20 +620,21 @@ dependencies = [
 
 [[package]]
 name = "bevy_macro_utils"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b2fee53b2497cdc3bffff2ddf52afa751242424a5fd0d51d227d4dab081d0d9"
+checksum = "23ddc18d489b4e57832d4958cde7cd2f349f0ad91e5892ac9e2f2ee16546b981"
 dependencies = [
  "quote",
- "syn 1.0.109",
+ "rustc-hash",
+ "syn 2.0.38",
  "toml_edit",
 ]
 
 [[package]]
 name = "bevy_math"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da6a1109d06fe947990db032e719e162414cf9bf7a478dcc52742f1c7136c42a"
+checksum = "78286a81fead796dc4b45ab14f4f02fe29a94423d3587bcfef872b2a8e0a474b"
 dependencies = [
  "glam",
  "serde",
@@ -812,18 +642,18 @@ dependencies = [
 
 [[package]]
 name = "bevy_mikktspace"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39106bc2ee21fce9496d2e15e0ba7925dff63e3eae10f7c1fc0094b56ad9f2bb"
+checksum = "6cfc2a21ea47970a9b1f0f4735af3256a8f204815bd756110051d10f9d909497"
 dependencies = [
  "glam",
 ]
 
 [[package]]
 name = "bevy_pbr"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f507cef55812aa70c2ec2b30fb996eb285fa7497d974cf03f76ec49c77fbe27"
+checksum = "63ca796a619e61cd43a0a3b11fde54644f7f0732a1fba1eef5d406248c6eba85"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -836,16 +666,17 @@ dependencies = [
  "bevy_transform",
  "bevy_utils",
  "bevy_window",
- "bitflags",
+ "bitflags 2.4.0",
  "bytemuck",
+ "naga_oil",
  "radsort",
 ]
 
 [[package]]
 name = "bevy_prototype_lyon"
-version = "0.8.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "799f9bc78cdef67d8dbecd06d2147d30732cdc74eb5e15edacf76ff2069b3d9f"
+checksum = "9e347c16caede05dc5f774ba388cefeef0ab558a5601fc6b5ffd6606bef77308"
 dependencies = [
  "bevy",
  "lyon_algorithms",
@@ -855,15 +686,15 @@ dependencies = [
 
 [[package]]
 name = "bevy_ptr"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b88451d4c5a353bff67dbaa937b6886efd26ae114769c17f2b35099c7a4de"
+checksum = "72c7586401a46f7d8e436028225c1df5288f2e0082d066b247a82466fea155c6"
 
 [[package]]
 name = "bevy_reflect"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc3979471890e336f3ba87961ef3ecd45c331cf2cb2f582c885e541af228b48"
+checksum = "0778197a1eb3e095a71417c74b7152ede02975cdc95b5ea4ddc5251ed00a2eb5"
 dependencies = [
  "bevy_math",
  "bevy_ptr",
@@ -873,31 +704,32 @@ dependencies = [
  "erased-serde",
  "glam",
  "once_cell",
- "parking_lot 0.12.1",
+ "parking_lot",
  "serde",
  "smallvec",
+ "smol_str",
  "thiserror",
 ]
 
 [[package]]
 name = "bevy_reflect_derive"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bc7ea7c9bc2c531eb29ba5619976613d6680453ff5dd4a7fcd08848e8bec5ad"
+checksum = "342a4b2d09db22c48607d23ad59a056aff1ee004549050a51d490d375ba29528"
 dependencies = [
  "bevy_macro_utils",
  "bit-set",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.38",
  "uuid",
 ]
 
 [[package]]
 name = "bevy_render"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee1e126226f0a4d439bf82fe07c1104f894a6a365888e3eba7356f9647e77a83"
+checksum = "39df4824b760928c27afc7b00fb649c7a63c9d76661ab014ff5c86537ee906cb"
 dependencies = [
  "anyhow",
  "async-channel",
@@ -918,43 +750,46 @@ dependencies = [
  "bevy_transform",
  "bevy_utils",
  "bevy_window",
- "bitflags",
+ "bitflags 2.4.0",
+ "bytemuck",
  "codespan-reporting",
  "downcast-rs",
  "encase",
  "futures-lite",
  "hexasphere",
  "image",
+ "js-sys",
  "naga",
- "once_cell",
- "parking_lot 0.12.1",
- "profiling",
+ "naga_oil",
+ "parking_lot",
  "regex",
  "serde",
  "smallvec",
  "thiserror",
  "thread_local",
+ "wasm-bindgen",
+ "web-sys",
  "wgpu",
  "wgpu-hal",
 ]
 
 [[package]]
 name = "bevy_render_macros"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "652f8c4d9577c6e6a8b3dfd8a4ce331e8b6ecdbb99636a4b2701dec50104d6bc"
+checksum = "0bd08c740aac73363e32fb45af869b10cec65bcb76fe3e6cd0f8f7eebf4c36c9"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.38",
 ]
 
 [[package]]
 name = "bevy_scene"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1de59637d27726251091120ce6f63917328ffd60aaccbda4d65a615873aff631"
+checksum = "bd47e1263506153bef3a8be97fe2d856f206d315668c4f97510ca6cc181d9681"
 dependencies = [
  "anyhow",
  "bevy_app",
@@ -973,22 +808,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "bevy_simple_tilemap"
-version = "0.11.0"
+name = "bevy_sprite"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9090ffe7460a6c7e66f2bbe80919d5d03cbdd161c9facb523fbf3b7816258e7"
-dependencies = [
- "bevy",
- "bitflags",
- "bytemuck",
- "rayon",
-]
-
-[[package]]
-name = "bevy_sprite"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c110358fe3651a5796fd1c07989635680738f5b5c7e9b8a463dd50d12bb78410"
+checksum = "68a8ca824fad75c6ef74cfbbba0a4ce3ccc435fa23d6bf3f003f260548813397"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -1001,7 +824,7 @@ dependencies = [
  "bevy_render",
  "bevy_transform",
  "bevy_utils",
- "bitflags",
+ "bitflags 2.4.0",
  "bytemuck",
  "fixedbitset",
  "guillotiere",
@@ -1011,68 +834,55 @@ dependencies = [
 
 [[package]]
 name = "bevy_tasks"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3de86364316e151aeb0897eaaa917c3ad5ee5ef1471a939023cf7f2d5ab76955"
+checksum = "c73bbb847c83990d3927005090df52f8ac49332e1643d2ad9aac3cd2974e66bf"
 dependencies = [
  "async-channel",
  "async-executor",
  "async-task",
  "concurrent-queue",
  "futures-lite",
- "once_cell",
  "wasm-bindgen-futures",
 ]
 
 [[package]]
 name = "bevy_time"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3edbd605df1bced312eb9888d6be3d5a5fcac3d4140038bbe3233d218399eef"
+checksum = "3d58d6dbae9c8225d8c0e0f04d2c5dbb71d22adc01ecd5ab3cebc364139e4a6d"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
  "bevy_reflect",
  "bevy_utils",
  "crossbeam-channel",
- "serde",
  "thiserror",
 ]
 
 [[package]]
 name = "bevy_transform"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24383dfb97d8a14b17721ecfdf58556eff5ea9a4b2a3d91accf2b472783880b0"
+checksum = "3b9b0ac0149a57cd846cb357a35fc99286f9848e53d4481954608ac9552ed2d4"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
  "bevy_hierarchy",
  "bevy_math",
  "bevy_reflect",
- "serde",
-]
-
-[[package]]
-name = "bevy_tweening"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7adaf4294484caea3707d280198ad06dd53b9e9adbb0816618c7edce11c990d6"
-dependencies = [
- "bevy",
- "interpolation",
 ]
 
 [[package]]
 name = "bevy_utils"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a88ebbca55d360d72e9fe78df0d22e25cd419933c9559e79dae2757f7c4d066"
+checksum = "08d9484e32434ea84dc548cff246ce0c6f756c1336f5ea03f24ac120a48595c7"
 dependencies = [
- "ahash 0.7.6",
+ "ahash",
  "bevy_utils_proc_macros",
  "getrandom 0.2.10",
- "hashbrown",
+ "hashbrown 0.14.1",
  "instant",
  "petgraph",
  "thiserror",
@@ -1082,20 +892,20 @@ dependencies = [
 
 [[package]]
 name = "bevy_utils_proc_macros"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "630b92e32fa5cd7917c7d4fdbf63a90af958b01e096239f71bc4f8f3cf40c0d2"
+checksum = "5391b242c36f556db01d5891444730c83aa9dd648b6a8fd2b755d22cb3bddb57"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.38",
 ]
 
 [[package]]
 name = "bevy_window"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad31234754268fbe12050290b0496e2296252a16995a38f94bfb9680a4f09fda"
+checksum = "bd584c0da7c4ada6557b09f57f30fb7cff21ccedc641473fc391574b4c9b7944"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -1104,14 +914,13 @@ dependencies = [
  "bevy_reflect",
  "bevy_utils",
  "raw-window-handle",
- "serde",
 ]
 
 [[package]]
 name = "bevy_winit"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf17bd6330f7e633b7c56754c776511a8f52cde4bf54c0278f34d7527548f253"
+checksum = "bfdc044abdb95790c20053e6326760f0a2985f0dcd78613d397bf35f16039d53"
 dependencies = [
  "accesskit_winit",
  "approx",
@@ -1122,32 +931,23 @@ dependencies = [
  "bevy_hierarchy",
  "bevy_input",
  "bevy_math",
+ "bevy_tasks",
  "bevy_utils",
  "bevy_window",
  "crossbeam-channel",
- "once_cell",
  "raw-window-handle",
  "wasm-bindgen",
  "web-sys",
  "winit",
 ]
 
-[[package]]
-name = "bincode"
-version = "1.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "bindgen"
-version = "0.64.0"
+version = "0.68.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4"
+checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078"
 dependencies = [
- "bitflags",
+ "bitflags 2.4.0",
  "cexpr",
  "clang-sys",
  "lazy_static",
@@ -1158,7 +958,7 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "syn 1.0.109",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -1177,27 +977,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
 
 [[package]]
-name = "bitfield"
-version = "0.14.0"
+name = "bitflags"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d7e60934ceec538daadb9d8432424ed043a904d8e0243f3c6446bce549a46ac"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
-name = "bitfield-rle"
-version = "0.2.0"
+name = "bitflags"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f8acc105b7bd3ed61e4bb7ad3e3b3f2a8da72205b2e0408cf71a499e8f57dd0"
+checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
 dependencies = [
- "failure",
- "varinteger",
+ "serde",
 ]
 
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
 [[package]]
 name = "bitset-core"
 version = "0.1.1"
@@ -1222,6 +1015,15 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
 
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
 [[package]]
 name = "block-sys"
 version = "0.1.0-beta.1"
@@ -1243,221 +1045,221 @@ dependencies = [
 
 [[package]]
 name = "bones_asset"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31f4623b77d4b881819e64baaf26089013f926a441605ea7659e4b67d35e15d5"
-dependencies = [
- "bevy_asset",
- "bones_bevy_utils",
- "bones_ecs",
- "serde",
- "type_ulid",
- "ulid",
-]
-
-[[package]]
-name = "bones_bevy_asset"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b9dfcf33aee19b7c61cc5a01293504acc5e683163177255eea51b6aeff88656"
+version = "0.3.0"
+source = "git+https://github.com/fishfolk/bones#2335ab66e4f98534dc01ea60ccb5479bb79817b2"
 dependencies = [
- "bevy_app",
- "bevy_asset",
- "bevy_reflect",
- "bevy_utils",
- "bones_bevy_asset_macros",
- "bones_bevy_utils",
- "bones_lib",
- "glam",
+ "anyhow",
+ "append-only-vec",
+ "async-channel",
+ "bevy_tasks",
+ "bones_schema",
+ "bones_utils",
+ "bs58",
+ "dashmap",
+ "ehttp",
+ "erased-serde",
+ "event-listener 3.0.0",
+ "notify",
+ "once_cell",
+ "paste",
+ "path-absolutize",
+ "semver",
  "serde",
  "serde_json",
  "serde_yaml",
- "type_ulid",
- "uuid",
-]
-
-[[package]]
-name = "bones_bevy_asset_macros"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09c56106e7019deb3a4d187866752d458203e768bf92c0696fa4b89cba18e9e2"
-dependencies = [
- "proc-macro2",
- "quote",
- "regex",
- "syn 1.0.109",
+ "sha2",
+ "tracing",
  "ulid",
 ]
 
 [[package]]
 name = "bones_bevy_renderer"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76a2aa16fad0d8ef2ced59837faeef7d30184a21820af5335d9743f9804e263c"
+version = "0.3.0"
+source = "git+https://github.com/fishfolk/bones#2335ab66e4f98534dc01ea60ccb5479bb79817b2"
 dependencies = [
+ "anyhow",
  "bevy",
+ "bevy_egui",
  "bevy_prototype_lyon",
- "bevy_simple_tilemap",
- "bones_bevy_asset",
- "bones_lib",
+ "bones_framework",
+ "directories 5.0.1",
  "glam",
  "serde",
- "serde_json",
  "serde_yaml",
- "type_ulid",
-]
-
-[[package]]
-name = "bones_bevy_utils"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c224bf3211ef9716225c90ab920a65815cae034e56e8c0369138e441aeabd824"
-dependencies = [
- "bevy_ecs",
- "type_ulid",
+ "web-sys",
 ]
 
 [[package]]
 name = "bones_ecs"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84fa22a3c0fc8a0d5c6fafa015ca9755afa3f266936b7be7ee2bbd21f88e04a1"
+version = "0.3.0"
+source = "git+https://github.com/fishfolk/bones#2335ab66e4f98534dc01ea60ccb5479bb79817b2"
 dependencies = [
- "aligned-vec",
  "anyhow",
- "atomic_refcell",
- "bevy_derive",
+ "atomicell",
  "bitset-core",
- "bytemuck",
- "either",
- "fxhash",
- "itertools",
- "serde",
+ "bones_schema",
+ "bones_utils",
+ "glam",
+ "paste",
  "thiserror",
- "type_ulid",
 ]
 
 [[package]]
-name = "bones_input"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34b3a885f63adcce7a2097a035c603775652f10582d6b086db62a94445074412"
+name = "bones_framework"
+version = "0.3.0"
+source = "git+https://github.com/fishfolk/bones#2335ab66e4f98534dc01ea60ccb5479bb79817b2"
 dependencies = [
- "bevy",
- "bones_bevy_utils",
+ "bones_asset",
+ "bones_lib",
+ "bones_schema",
+ "csscolorparser",
+ "egui",
+ "fluent",
+ "fluent-langneg",
  "glam",
+ "hex",
+ "image",
  "instant",
- "type_ulid",
+ "intl-memoizer",
+ "kira",
+ "noise",
+ "serde",
+ "serde_yaml",
+ "sys-locale",
+ "thiserror",
+ "tracing",
+ "ttf-parser",
+ "unic-langid",
 ]
 
 [[package]]
 name = "bones_lib"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efd1d4185abb6b6f310ed6511153562e627f616b0ec76aebd97d0c674bf49b9b"
+version = "0.3.0"
+source = "git+https://github.com/fishfolk/bones#2335ab66e4f98534dc01ea60ccb5479bb79817b2"
 dependencies = [
- "bones_asset",
- "bones_bevy_utils",
  "bones_ecs",
- "bones_input",
- "bones_render",
- "noise",
- "serde",
- "type_ulid",
+ "instant",
 ]
 
 [[package]]
-name = "bones_matchmaker_proto"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cb89199db04718aa7165cc62e1602a4427a477e79b8c5813f5a42b261d99ec3"
+name = "bones_schema"
+version = "0.3.0"
+source = "git+https://github.com/fishfolk/bones#2335ab66e4f98534dc01ea60ccb5479bb79817b2"
 dependencies = [
+ "append-only-vec",
+ "bones_schema_macros",
+ "bones_utils",
+ "erased-serde",
+ "glam",
+ "humantime",
+ "paste",
  "serde",
+ "sptr",
+ "ulid",
 ]
 
 [[package]]
-name = "bones_render"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5110ce96de5d5474f48a1770ea54a60a5fdfc2de94b9ebdf5f2d7263453b8d0e"
+name = "bones_schema_macros"
+version = "0.3.0"
+source = "git+https://github.com/fishfolk/bones#2335ab66e4f98534dc01ea60ccb5479bb79817b2"
 dependencies = [
- "bevy_render",
- "bevy_transform",
- "bones_asset",
- "bones_bevy_utils",
- "bones_ecs",
- "glam",
- "hex",
- "serde",
- "thiserror",
- "type_ulid",
+ "proc-macro2",
+ "quote",
+ "venial",
 ]
 
 [[package]]
-name = "bstr"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5"
+name = "bones_utils"
+version = "0.3.0"
+source = "git+https://github.com/fishfolk/bones#2335ab66e4f98534dc01ea60ccb5479bb79817b2"
 dependencies = [
- "memchr",
+ "bevy_ptr",
+ "bones_utils_macros",
+ "branches",
+ "futures-lite",
+ "fxhash",
+ "getrandom 0.2.10",
+ "hashbrown 0.14.1",
+ "instant",
+ "maybe-owned",
+ "parking_lot",
  "serde",
+ "smallvec",
+ "turborand",
+ "ulid",
+ "ustr",
 ]
 
 [[package]]
-name = "bumpalo"
-version = "3.13.0"
+name = "bones_utils_macros"
+version = "0.3.0"
+source = "git+https://github.com/fishfolk/bones#2335ab66e4f98534dc01ea60ccb5479bb79817b2"
+dependencies = [
+ "quote",
+ "venial",
+]
+
+[[package]]
+name = "branches"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
+checksum = "7958fb9748a08a6f46ef773e87c43997a844709bc293b4c3de48135debaf9d2a"
 
 [[package]]
-name = "byte-pool"
-version = "0.2.4"
+name = "bs58"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2f1b21189f50b5625efa6227cf45e9d4cfdc2e73582df2b879e9689e78a7158"
+checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896"
 dependencies = [
- "crossbeam-queue",
- "stable_deref_trait",
+ "tinyvec",
 ]
 
+[[package]]
+name = "bumpalo"
+version = "3.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
+
 [[package]]
 name = "bytemuck"
-version = "1.13.1"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea"
+checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6"
 dependencies = [
  "bytemuck_derive",
 ]
 
 [[package]]
 name = "bytemuck_derive"
-version = "1.4.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192"
+checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.18",
+ "syn 2.0.38",
 ]
 
 [[package]]
 name = "byteorder"
-version = "1.4.3"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
+checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
 
 [[package]]
 name = "cc"
-version = "1.0.79"
+version = "1.0.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
 dependencies = [
  "jobserver",
+ "libc",
 ]
 
 [[package]]
@@ -1487,18 +1289,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
 
-[[package]]
-name = "chrono"
-version = "0.4.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
-dependencies = [
- "android-tzdata",
- "js-sys",
- "num-traits",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "clang-sys"
 version = "1.6.1"
@@ -1507,44 +1297,7 @@ checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f"
 dependencies = [
  "glob",
  "libc",
- "libloading",
-]
-
-[[package]]
-name = "clap"
-version = "4.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce38afc168d8665cfc75c7b1dd9672e50716a137f433f070991619744a67342a"
-dependencies = [
- "bitflags",
- "clap_derive",
- "clap_lex",
- "is-terminal",
- "once_cell",
- "strsim",
- "termcolor",
-]
-
-[[package]]
-name = "clap_derive"
-version = "4.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fddf67631444a3a3e3e5ac51c36a5e01335302de677bd78759eaa90ab1f46644"
-dependencies = [
- "heck",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "033f6b7a4acb1f358c742aaca805c939ee73b4c6209ae4318ec7aca81c42e646"
-dependencies = [
- "os_str_bytes",
+ "libloading 0.7.4",
 ]
 
 [[package]]
@@ -1558,12 +1311,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "cobs"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15"
-
 [[package]]
 name = "codespan-reporting"
 version = "0.11.1"
@@ -1598,9 +1345,9 @@ dependencies = [
 
 [[package]]
 name = "concurrent-queue"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c"
+checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400"
 dependencies = [
  "crossbeam-utils",
 ]
@@ -1621,22 +1368,31 @@ version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6051f239ecec86fde3410901ab7860d458d160371533842974fc61f96d15879b"
 
+[[package]]
+name = "const_soft_float"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87ca1caa64ef4ed453e68bb3db612e51cf1b2f5b871337f0fcab1c8f87cc3dff"
+
+[[package]]
+name = "constgebra"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edd23e864550e6dafc1e41ac78ce4f1ccddc8672b40c403524a04ff3f0518420"
+dependencies = [
+ "const_soft_float",
+]
+
 [[package]]
 name = "core-foundation"
 version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
 dependencies = [
- "core-foundation-sys 0.8.4",
+ "core-foundation-sys",
  "libc",
 ]
 
-[[package]]
-name = "core-foundation-sys"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"
-
 [[package]]
 name = "core-foundation-sys"
 version = "0.8.4"
@@ -1649,7 +1405,7 @@ version = "0.22.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "core-foundation",
  "core-graphics-types",
  "foreign-types",
@@ -1658,32 +1414,31 @@ dependencies = [
 
 [[package]]
 name = "core-graphics-types"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b"
+checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "core-foundation",
- "foreign-types",
  "libc",
 ]
 
 [[package]]
 name = "coreaudio-rs"
-version = "0.11.2"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb17e2d1795b1996419648915df94bc7103c28f7b48062d7acf4652fc371b2ff"
+checksum = "321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace"
 dependencies = [
- "bitflags",
- "core-foundation-sys 0.6.2",
+ "bitflags 1.3.2",
+ "core-foundation-sys",
  "coreaudio-sys",
 ]
 
 [[package]]
 name = "coreaudio-sys"
-version = "0.2.12"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f034b2258e6c4ade2f73bf87b21047567fb913ee9550837c2316d139b0262b24"
+checksum = "d8478e5bdad14dce236b9898ea002eabfa87cbe14f0aa538dbe3b6a4bec4332d"
 dependencies = [
  "bindgen",
 ]
@@ -1695,7 +1450,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6d959d90e938c5493000514b446987c07aed46c668faaa7d34d6c7a67b1a578c"
 dependencies = [
  "alsa",
- "core-foundation-sys 0.8.4",
+ "core-foundation-sys",
  "coreaudio-rs",
  "dasp_sample",
  "jni 0.19.0",
@@ -1706,13 +1461,22 @@ dependencies = [
  "ndk-context",
  "oboe",
  "once_cell",
- "parking_lot 0.12.1",
+ "parking_lot",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
  "windows 0.46.0",
 ]
 
+[[package]]
+name = "cpufeatures"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "crc32fast"
 version = "1.3.2"
@@ -1722,12 +1486,6 @@ dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "critical-section"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52"
-
 [[package]]
 name = "crossbeam"
 version = "0.8.2"
@@ -1765,14 +1523,14 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.14"
+version = "0.9.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695"
+checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
 dependencies = [
  "autocfg",
  "cfg-if",
  "crossbeam-utils",
- "memoffset 0.8.0",
+ "memoffset 0.9.0",
  "scopeguard",
 ]
 
@@ -1788,13 +1546,23 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.15"
+version = "0.8.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b"
+checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
 dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
 [[package]]
 name = "csscolorparser"
 version = "0.6.2"
@@ -1810,11 +1578,24 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da"
 dependencies = [
- "bitflags",
- "libloading",
+ "bitflags 1.3.2",
+ "libloading 0.7.4",
  "winapi",
 ]
 
+[[package]]
+name = "dashmap"
+version = "5.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
+dependencies = [
+ "cfg-if",
+ "hashbrown 0.14.1",
+ "lock_api",
+ "once_cell",
+ "parking_lot_core",
+]
+
 [[package]]
 name = "dasp_sample"
 version = "0.11.0"
@@ -1822,14 +1603,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f"
 
 [[package]]
-name = "derive_more"
-version = "0.99.17"
+name = "data-encoding"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
+checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"
+
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
+ "block-buffer",
+ "crypto-common",
+]
+
+[[package]]
+name = "directories"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72d337a64190607d4fcca2cb78982c5dd57f4916e19696b48a575fa746b6cb0f"
+dependencies = [
+ "libc",
+ "winapi",
 ]
 
 [[package]]
@@ -1867,7 +1663,16 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.18",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "document-features"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e493c573fce17f00dcab13b6ac057994f3ce17d1af4dc39bfd482b83c6eb6157"
+dependencies = [
+ "litrs",
 ]
 
 [[package]]
@@ -1878,54 +1683,74 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
 
 [[package]]
 name = "ecolor"
-version = "0.21.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f99fe3cac305af9d6d92971af60d0f7ea4d783201ef1673571567b6699964d9"
+checksum = "cfdf4e52dbbb615cfd30cf5a5265335c217b5fd8d669593cea74a517d9c605af"
 dependencies = [
  "bytemuck",
+ "serde",
 ]
 
 [[package]]
 name = "egui"
-version = "0.21.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6412a21e0bde7c0918f7fb44bbbb86b5e1f88e63c026a4e747cc7af02f76dfbe"
+checksum = "8bd69fed5fcf4fbb8225b24e80ea6193b61e17a625db105ef0c4d71dde6eb8b7"
 dependencies = [
- "ahash 0.8.3",
+ "accesskit",
+ "ahash",
  "epaint",
  "nohash-hasher",
+ "serde",
 ]
 
 [[package]]
 name = "egui_extras"
-version = "0.21.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f051342e97dfa2445107cb7d2e720617f5c840199b5cb4fe0ffcf481fcf5cce"
+checksum = "68ffe3fe5c00295f91c2a61a74ee271c32f74049c94ba0b1cea8f26eb478bc07"
 dependencies = [
  "egui",
+ "enum-map",
+ "log",
  "serde",
 ]
 
+[[package]]
+name = "ehttp"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f88f45662356f96afc7d9e2bc9910ad8352ee01417f7c69b8b16a53c8767a75d"
+dependencies = [
+ "document-features",
+ "js-sys",
+ "ureq",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
 [[package]]
 name = "either"
-version = "1.8.1"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
+checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
 
 [[package]]
 name = "emath"
-version = "0.21.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8ecd80612937e0267909d5351770fe150004e24dab93954f69ca62eecd3f77e"
+checksum = "1ef2b29de53074e575c18b694167ccbe6e5191f7b25fe65175a0d905a32eeec0"
 dependencies = [
  "bytemuck",
+ "serde",
 ]
 
 [[package]]
 name = "encase"
-version = "0.5.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6591f13a63571c4821802eb5b10fd1155b1290bce87086440003841c8c3909b"
+checksum = "8fce2eeef77fd4a293a54b62aa00ac9daebfbcda4bf8998c5a815635b004aa1c"
 dependencies = [
  "const_panic",
  "encase_derive",
@@ -1935,77 +1760,94 @@ dependencies = [
 
 [[package]]
 name = "encase_derive"
-version = "0.5.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f1da6deed1f8b6f5909616ffa695f63a5de54d6a0f084fa715c70c8ed3abac9"
+checksum = "0e520cde08cbf4f7cc097f61573ec06ce467019803de8ae82fb2823fa1554a0e"
 dependencies = [
  "encase_derive_impl",
 ]
 
 [[package]]
 name = "encase_derive_impl"
-version = "0.5.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae489d58959f3c4cdd1250866a05acfb341469affe4fced71aff3ba228be1693"
+checksum = "3fe2568f851fd6144a45fa91cfed8fe5ca8fc0b56ba6797bfc1ed2771b90e37c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.38",
 ]
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.32"
+version = "0.8.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394"
+checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
-name = "epaint"
-version = "0.21.0"
+name = "enum-map"
+version = "2.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12e78b5c58a1f7f621f9d546add2adce20636422c9b251e29f749e8a2f713c95"
+checksum = "c188012f8542dee7b3996e44dd89461d64aa471b0a7c71a1ae2f595d259e96e5"
 dependencies = [
- "ab_glyph",
- "ahash 0.8.3",
- "atomic_refcell",
- "bytemuck",
- "ecolor",
- "emath",
- "nohash-hasher",
- "parking_lot 0.12.1",
+ "enum-map-derive",
+ "serde",
 ]
 
 [[package]]
-name = "erased-serde"
-version = "0.3.25"
+name = "enum-map-derive"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f2b0c2380453a92ea8b6c8e5f64ecaafccddde8ceab55ff7a8ac1029f894569"
+checksum = "04d0b288e3bb1d861c4403c1774a6f7a798781dfc519b3647df2a3dd4ae95f25"
 dependencies = [
- "serde",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
 ]
 
 [[package]]
-name = "errno"
-version = "0.3.1"
+name = "enumn"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
+checksum = "c2ad8cef1d801a4686bfd8919f0b30eac4c8e48968c437a6405ded4fb5272d2b"
 dependencies = [
- "errno-dragonfly",
- "libc",
- "windows-sys 0.48.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
 ]
 
 [[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
+name = "epaint"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
+checksum = "58067b840d009143934d91d8dcb8ded054d8301d7c11a517ace0a99bb1e1595e"
 dependencies = [
- "cc",
- "libc",
+ "ab_glyph",
+ "ahash",
+ "bytemuck",
+ "ecolor",
+ "emath",
+ "nohash-hasher",
+ "parking_lot",
+ "serde",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "erased-serde"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c"
+dependencies = [
+ "serde",
 ]
 
 [[package]]
@@ -2034,25 +1876,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
 [[package]]
-name = "failure"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86"
-dependencies = [
- "backtrace",
- "failure_derive",
-]
-
-[[package]]
-name = "failure_derive"
-version = "0.1.8"
+name = "event-listener"
+version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
+checksum = "29e56284f00d94c1bc7fd3c77027b4623c88c1f53d8d2394c6199f2921dea325"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "synstructure",
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
 ]
 
 [[package]]
@@ -2064,6 +1895,12 @@ dependencies = [
  "instant",
 ]
 
+[[package]]
+name = "fastrand"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
+
 [[package]]
 name = "fdeflate"
 version = "0.3.0"
@@ -2075,13 +1912,13 @@ dependencies = [
 
 [[package]]
 name = "filetime"
-version = "0.2.21"
+version = "0.2.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153"
+checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.2.16",
+ "redox_syscall 0.3.5",
  "windows-sys 0.48.0",
 ]
 
@@ -2093,12 +1930,12 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flate2"
-version = "1.0.26"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743"
+checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
 dependencies = [
  "crc32fast",
- "miniz_oxide 0.7.1",
+ "miniz_oxide",
 ]
 
 [[package]]
@@ -2112,9 +1949,9 @@ dependencies = [
 
 [[package]]
 name = "fluent"
-version = "0.16.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61f69378194459db76abd2ce3952b790db103ceb003008d3d50d97c41ff847a7"
+checksum = "bc4d7142005e2066e4844caf9f271b93fc79836ee96ec85057b8c109687e629a"
 dependencies = [
  "fluent-bundle",
  "unic-langid",
@@ -2138,43 +1975,20 @@ dependencies = [
 
 [[package]]
 name = "fluent-langneg"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c4ad0989667548f06ccd0e306ed56b61bd4d35458d54df5ec7587c0e8ed5e94"
-dependencies = [
- "unic-langid",
-]
-
-[[package]]
-name = "fluent-syntax"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0abed97648395c902868fee9026de96483933faa54ea3b40d652f7dfe61ca78"
-dependencies = [
- "thiserror",
-]
-
-[[package]]
-name = "fluent_content"
-version = "0.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38dc4630a89c85160410fd062826b505218a0ca68121f92d9fbd9a0e71c1a148"
-dependencies = [
- "fluent",
- "fluent-langneg",
- "intl-memoizer",
- "thiserror",
- "tracing",
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c4ad0989667548f06ccd0e306ed56b61bd4d35458d54df5ec7587c0e8ed5e94"
+dependencies = [
  "unic-langid",
 ]
 
 [[package]]
-name = "flume"
-version = "0.10.14"
+name = "fluent-syntax"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577"
+checksum = "c0abed97648395c902868fee9026de96483933faa54ea3b40d652f7dfe61ca78"
 dependencies = [
- "spin 0.9.8",
+ "thiserror",
 ]
 
 [[package]]
@@ -2222,48 +2036,12 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
-[[package]]
-name = "futures"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
-dependencies = [
- "futures-core",
- "futures-sink",
-]
-
 [[package]]
 name = "futures-core"
 version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
 
-[[package]]
-name = "futures-executor"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
 [[package]]
 name = "futures-io"
 version = "0.3.28"
@@ -2276,7 +2054,7 @@ version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
 dependencies = [
- "fastrand",
+ "fastrand 1.9.0",
  "futures-core",
  "futures-io",
  "memchr",
@@ -2285,47 +2063,6 @@ dependencies = [
  "waker-fn",
 ]
 
-[[package]]
-name = "futures-macro"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.18",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
-
-[[package]]
-name = "futures-task"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
-
-[[package]]
-name = "futures-util"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-macro",
- "futures-sink",
- "futures-task",
- "memchr",
- "pin-project-lite",
- "pin-utils",
- "slab",
-]
-
 [[package]]
 name = "fxhash"
 version = "0.2.1"
@@ -2336,16 +2073,13 @@ dependencies = [
 ]
 
 [[package]]
-name = "generator"
-version = "0.7.5"
+name = "generic-array"
+version = "0.14.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
 dependencies = [
- "cc",
- "libc",
- "log",
- "rustversion",
- "windows 0.48.0",
+ "typenum",
+ "version_check",
 ]
 
 [[package]]
@@ -2382,22 +2116,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "ggrs"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1419c3c38e579884b075b99a8ade2ca507e87a2bde81940c6fe4aea895696831"
-dependencies = [
- "bincode",
- "bitfield-rle",
- "bytemuck",
- "instant",
- "js-sys",
- "parking_lot 0.11.2",
- "rand 0.8.5",
- "serde",
-]
-
 [[package]]
 name = "gilrs"
 version = "0.10.2"
@@ -2413,9 +2131,9 @@ dependencies = [
 
 [[package]]
 name = "gilrs-core"
-version = "0.5.5"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd745b0cb1a207756e8fabacf5623066ad6aa543ea0be4bab34e897e6bbe24f9"
+checksum = "5ccc99e9b8d63ffcaa334c4babfa31f46e156618a11f63efb6e8e6bcb37b830d"
 dependencies = [
  "core-foundation",
  "io-kit-sys",
@@ -2423,28 +2141,28 @@ dependencies = [
  "libc",
  "libudev-sys",
  "log",
- "nix 0.26.2",
+ "nix 0.26.4",
  "uuid",
  "vec_map",
  "wasm-bindgen",
  "web-sys",
- "windows 0.48.0",
+ "windows 0.51.1",
 ]
 
 [[package]]
 name = "gimli"
-version = "0.27.2"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4"
+checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
 
 [[package]]
 name = "glam"
-version = "0.23.0"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e4afd9ad95555081e109fe1d21f2a30c691b5f0919c67dfa690a2e1eb6bd51c"
+checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945"
 dependencies = [
  "bytemuck",
- "num-traits",
+ "mint",
  "serde",
 ]
 
@@ -2454,24 +2172,11 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
-[[package]]
-name = "globset"
-version = "0.4.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc"
-dependencies = [
- "aho-corasick 0.7.20",
- "bstr",
- "fnv",
- "log",
- "regex",
-]
-
 [[package]]
 name = "glow"
-version = "0.12.2"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "807edf58b70c0b5b2181dd39fe1839dbdb3ba02645630dc5f753e23da307f762"
+checksum = "ca0fe580e4b60a8ab24a868bc08e2f03cbcb20d3d676601fa909386713333728"
 dependencies = [
  "js-sys",
  "slotmap",
@@ -2485,7 +2190,7 @@ version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "22beaafc29b38204457ea030f6fb7a84c9e4dd1b86e311ba0542533453d87f62"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "gpu-alloc-types",
 ]
 
@@ -2495,7 +2200,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 ]
 
 [[package]]
@@ -2513,22 +2218,22 @@ dependencies = [
 
 [[package]]
 name = "gpu-descriptor"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b0c02e1ba0bdb14e965058ca34e09c020f8e507a760df1121728e0aef68d57a"
+checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c"
 dependencies = [
- "bitflags",
+ "bitflags 2.4.0",
  "gpu-descriptor-types",
- "hashbrown",
+ "hashbrown 0.14.1",
 ]
 
 [[package]]
 name = "gpu-descriptor-types"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "363e3677e55ad168fef68cf9de3a4a310b53124c5e784c53a1d70e92d23f2126"
+checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c"
 dependencies = [
- "bitflags",
+ "bitflags 2.4.0",
 ]
 
 [[package]]
@@ -2542,65 +2247,37 @@ dependencies = [
 ]
 
 [[package]]
-name = "hash32"
-version = "0.2.1"
+name = "hashbrown"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67"
-dependencies = [
- "byteorder",
-]
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
 [[package]]
 name = "hashbrown"
-version = "0.12.3"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12"
 dependencies = [
- "ahash 0.7.6",
+ "ahash",
+ "allocator-api2",
  "serde",
 ]
 
 [[package]]
 name = "hassle-rs"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90601c6189668c7345fc53842cb3f3a3d872203d523be1b3cb44a36a3e62fb85"
+checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "com-rs",
  "libc",
- "libloading",
+ "libloading 0.7.4",
  "thiserror",
  "widestring",
  "winapi",
 ]
 
-[[package]]
-name = "heapless"
-version = "0.7.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743"
-dependencies = [
- "atomic-polyfill",
- "hash32",
- "rustc_version",
- "serde",
- "spin 0.9.8",
- "stable_deref_trait",
-]
-
-[[package]]
-name = "heck"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
-
-[[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"
@@ -2609,12 +2286,12 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hexasphere"
-version = "8.1.0"
+version = "9.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd41d443f978bfa380a6dad58b62a08c43bcb960631f13e9d015b911eaf73588"
+checksum = "7cb3df16a7bcb1b5bc092abd55e14f77ca70aea14445026e264586fc62889a10"
 dependencies = [
+ "constgebra",
  "glam",
- "once_cell",
 ]
 
 [[package]]
@@ -2658,21 +2335,11 @@ dependencies = [
  "unicode-normalization",
 ]
 
-[[package]]
-name = "if-addrs"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbc0fa01ffc752e9dbc72818cdb072cd028b86be5e09dd04c5a643704fe101a9"
-dependencies = [
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "image"
-version = "0.24.6"
+version = "0.24.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a"
+checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711"
 dependencies = [
  "bytemuck",
  "byteorder",
@@ -2690,17 +2357,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
 dependencies = [
  "autocfg",
- "hashbrown",
+ "hashbrown 0.12.3",
  "serde",
 ]
 
+[[package]]
+name = "indexmap"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.14.1",
+]
+
 [[package]]
 name = "inotify"
 version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "inotify-sys",
  "libc",
 ]
@@ -2726,12 +2403,6 @@ dependencies = [
  "web-sys",
 ]
 
-[[package]]
-name = "interpolation"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3b7357d2bbc5ee92f8e899ab645233e43d21407573cceb37fed8bc3dede2c02"
-
 [[package]]
 name = "intl-memoizer"
 version = "0.5.1"
@@ -2757,33 +2428,10 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b2d4429acc1deff0fbdece0325b4997bdb02b2c245ab7023fd5deca0f6348de"
 dependencies = [
- "core-foundation-sys 0.8.4",
+ "core-foundation-sys",
  "mach2",
 ]
 
-[[package]]
-name = "io-lifetimes"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
-dependencies = [
- "hermit-abi",
- "libc",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "is-terminal"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f"
-dependencies = [
- "hermit-abi",
- "io-lifetimes",
- "rustix",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "itertools"
 version = "0.10.5"
@@ -2795,9 +2443,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.6"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
+checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
 
 [[package]]
 name = "jni"
@@ -2851,9 +2499,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
 
 [[package]]
 name = "jobserver"
-version = "0.1.26"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2"
+checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d"
 dependencies = [
  "libc",
 ]
@@ -2866,9 +2514,9 @@ checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e"
 
 [[package]]
 name = "js-sys"
-version = "0.3.63"
+version = "0.3.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790"
+checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -2877,96 +2525,28 @@ dependencies = [
 name = "jumpy"
 version = "0.7.0"
 dependencies = [
- "anyhow",
  "async-channel",
- "async-timer",
- "bevy",
- "bevy-inspector-egui",
- "bevy_console",
  "bevy_dylib",
- "bevy_egui",
- "bevy_fluent",
- "bevy_framepace",
- "bevy_kira_audio",
- "bevy_tweening",
- "bitfield",
- "bones_bevy_asset",
+ "bevy_tasks",
  "bones_bevy_renderer",
- "bones_lib",
- "bones_matchmaker_proto",
- "byte-pool",
- "bytemuck",
- "bytes",
- "chrono",
- "clap",
- "console_error_panic_hook",
- "directories",
- "downcast-rs",
+ "bones_framework",
+ "directories 1.0.2",
  "egui_extras",
- "either",
- "fluent",
- "fluent_content",
- "futures-lite",
- "getrandom 0.2.10",
- "ggrs",
- "js-sys",
- "jumpy_core",
- "leafwing-input-manager",
- "log",
- "mdns-sd",
- "mimalloc",
- "normalize-path",
- "numquant",
- "once_cell",
- "peg",
- "ping-rs",
- "postcard",
- "puffin",
- "puffin_egui",
- "quinn",
- "quinn_runtime_bevy",
- "rand 0.8.5",
- "rcgen",
- "rustls",
- "serde",
- "serde_yaml",
- "smallvec",
- "thiserror",
- "tracing",
- "tracing-core",
- "tracing-log",
- "tracing-subscriber",
- "tracing-tracy",
- "tracing-wasm",
- "turborand",
- "type_ulid",
- "unic-langid",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "jumpy_core"
-version = "0.7.0"
-dependencies = [
- "bevy",
- "bones_bevy_asset",
- "bones_lib",
- "bytemuck",
- "csscolorparser",
- "glam",
  "humantime-serde",
- "indexmap",
+ "indexmap 2.0.2",
  "nalgebra",
+ "once_cell",
  "ordered-float",
+ "peg",
  "petgraph",
  "puffin",
  "rapier2d",
  "serde",
+ "serde_yaml",
  "shiftnanigans",
+ "thiserror",
  "tracing",
  "turborand",
- "type_ulid",
 ]
 
 [[package]]
@@ -2976,27 +2556,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3"
 dependencies = [
  "libc",
- "libloading",
+ "libloading 0.7.4",
  "pkg-config",
 ]
 
 [[package]]
 name = "kira"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e53aef6f6ec851da68a0ad6d6283bd99ea1a9164f38fd7ac353e28ccd6f5cda"
+version = "0.8.5"
+source = "git+https://github.com/zicklag/kira.git?branch=feat/sync#e587b155e862567677c114d0d6fc2963be37c14b"
 dependencies = [
  "atomic-arena",
  "cpal",
+ "glam",
+ "mint",
  "ringbuf",
  "symphonia",
 ]
 
 [[package]]
 name = "kqueue"
-version = "1.0.7"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c8fc60ba15bf51257aa9807a48a61013db043fcf3a78cb0d916e8e396dcad98"
+checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c"
 dependencies = [
  "kqueue-sys",
  "libc",
@@ -3004,11 +2585,11 @@ dependencies = [
 
 [[package]]
 name = "kqueue-sys"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587"
+checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "libc",
 ]
 
@@ -3024,39 +2605,11 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
-[[package]]
-name = "leafwing-input-manager"
-version = "0.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ca8bb439a17e3a964829170cd0252ad54d25a22cb9eb07ec888a7c923d94e05"
-dependencies = [
- "bevy",
- "derive_more",
- "fixedbitset",
- "itertools",
- "leafwing_input_manager_macros",
- "once_cell",
- "petitset",
- "serde",
-]
-
-[[package]]
-name = "leafwing_input_manager_macros"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11aefabfcc9ef0a78bc97eea053d2f1bb050d5278a4134bdc1b769064a90064a"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "libc"
-version = "0.2.146"
+version = "0.2.149"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b"
+checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
 
 [[package]]
 name = "libloading"
@@ -3069,20 +2622,20 @@ dependencies = [
 ]
 
 [[package]]
-name = "libm"
-version = "0.2.7"
+name = "libloading"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4"
+checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161"
+dependencies = [
+ "cfg-if",
+ "windows-sys 0.48.0",
+]
 
 [[package]]
-name = "libmimalloc-sys"
-version = "0.1.33"
+name = "libm"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4ac0e912c8ef1b735e92369695618dc5b1819f5a7bf3f167301a3ba1cea515e"
-dependencies = [
- "cc",
- "libc",
-]
+checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
 
 [[package]]
 name = "libudev-sys"
@@ -3095,10 +2648,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "linux-raw-sys"
-version = "0.3.8"
+name = "litrs"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
+checksum = "f9275e0933cf8bb20f008924c0cb07a0692fe54d8064996520bf998de9eb79aa"
 
 [[package]]
 name = "lock_api"
@@ -3112,22 +2665,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.18"
+version = "0.4.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de"
-
-[[package]]
-name = "loom"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5"
-dependencies = [
- "cfg-if",
- "generator",
- "scoped-tls",
- "tracing",
- "tracing-subscriber",
-]
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
 
 [[package]]
 name = "lyon_algorithms"
@@ -3152,9 +2692,9 @@ dependencies = [
 
 [[package]]
 name = "lyon_path"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7da8358c012e5651e4619cfd0b5b75c0f77866181a01b0909aab4bae14adf660"
+checksum = "ca507745ba7ccbc76e5c44e7b63b1a29d2b0d6126f375806a5bbaf657c7d6c45"
 dependencies = [
  "lyon_geom",
  "num-traits",
@@ -3195,36 +2735,30 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
 dependencies = [
- "regex-automata",
+ "regex-automata 0.1.10",
 ]
 
 [[package]]
 name = "matrixmultiply"
-version = "0.3.7"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "090126dc04f95dc0d1c1c91f61bdd474b3930ca064c1edc8a849da2c6cbe1e77"
+checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2"
 dependencies = [
  "autocfg",
  "rawpointer",
 ]
 
 [[package]]
-name = "mdns-sd"
-version = "0.7.3"
+name = "maybe-owned"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "411616191b060924bcee8ef7d2f56f186386c8808a9e5db5d9f4ebd25bdeaa97"
-dependencies = [
- "flume",
- "if-addrs",
- "polling",
- "socket2 0.4.9",
-]
+checksum = "4facc753ae494aeb6e3c22f839b158aebd4f9270f55cd3c79906c45476c47ab4"
 
 [[package]]
 name = "memchr"
-version = "2.5.0"
+version = "2.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
 
 [[package]]
 name = "memoffset"
@@ -3237,9 +2771,9 @@ dependencies = [
 
 [[package]]
 name = "memoffset"
-version = "0.8.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1"
+checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
 dependencies = [
  "autocfg",
 ]
@@ -3250,7 +2784,7 @@ version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "block",
  "core-graphics-types",
  "foreign-types",
@@ -3258,30 +2792,12 @@ dependencies = [
  "objc",
 ]
 
-[[package]]
-name = "mimalloc"
-version = "0.1.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e2894987a3459f3ffb755608bd82188f8ed00d0ae077f1edea29c068d639d98"
-dependencies = [
- "libmimalloc-sys",
-]
-
 [[package]]
 name = "minimal-lexical"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
-[[package]]
-name = "miniz_oxide"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
-dependencies = [
- "adler",
-]
-
 [[package]]
 name = "miniz_oxide"
 version = "0.7.1"
@@ -3292,6 +2808,12 @@ dependencies = [
  "simd-adler32",
 ]
 
+[[package]]
+name = "mint"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff"
+
 [[package]]
 name = "mio"
 version = "0.8.8"
@@ -3306,18 +2828,17 @@ dependencies = [
 
 [[package]]
 name = "naga"
-version = "0.11.1"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c3d4269bcb7d50121097702fde1afb75f4ea8083aeb7a55688dcf289a853271"
+checksum = "bbcc2e0513220fd2b598e6068608d4462db20322c0e77e47f6f488dfcfc279cb"
 dependencies = [
  "bit-set",
- "bitflags",
+ "bitflags 1.3.2",
  "codespan-reporting",
  "hexf-parse",
- "indexmap",
+ "indexmap 1.9.3",
  "log",
  "num-traits",
- "petgraph",
  "pp-rs",
  "rustc-hash",
  "spirv",
@@ -3326,11 +2847,31 @@ dependencies = [
  "unicode-xid",
 ]
 
+[[package]]
+name = "naga_oil"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8be942a5c21c58b9b0bf4d9b99db3634ddb7a916f8e1d1d0b71820cc4150e56b"
+dependencies = [
+ "bit-set",
+ "codespan-reporting",
+ "data-encoding",
+ "indexmap 1.9.3",
+ "naga",
+ "once_cell",
+ "regex",
+ "regex-syntax 0.6.29",
+ "rustc-hash",
+ "thiserror",
+ "tracing",
+ "unicode-ident",
+]
+
 [[package]]
 name = "nalgebra"
-version = "0.32.2"
+version = "0.32.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d68d47bba83f9e2006d117a9a33af1524e655516b8919caac694427a6fb1e511"
+checksum = "307ed9b18cc2423f29e83f84fd23a8e73628727990181f18641a8b5dc2ab1caa"
 dependencies = [
  "approx",
  "glam",
@@ -3345,31 +2886,25 @@ dependencies = [
 
 [[package]]
 name = "nalgebra-macros"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d232c68884c0c99810a5a4d333ef7e47689cfd0edc85efc9e54e1e6bf5212766"
+checksum = "91761aed67d03ad966ef783ae962ef9bbaca728d2dd7ceb7939ec110fffad998"
 dependencies = [
  "proc-macro2",
  "quote",
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "natord"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "308d96db8debc727c3fd9744aac51751243420e46edf401010908da7f8d5e57c"
-
 [[package]]
 name = "ndk"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "jni-sys",
  "ndk-sys",
- "num_enum",
+ "num_enum 0.5.11",
  "raw-window-handle",
  "thiserror",
 ]
@@ -3395,7 +2930,7 @@ version = "0.24.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "cfg-if",
  "libc",
  "memoffset 0.6.5",
@@ -3403,14 +2938,13 @@ dependencies = [
 
 [[package]]
 name = "nix"
-version = "0.26.2"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"
+checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "cfg-if",
  "libc",
- "static_assertions",
 ]
 
 [[package]]
@@ -3440,28 +2974,23 @@ dependencies = [
  "minimal-lexical",
 ]
 
-[[package]]
-name = "normalize-path"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf22e319b2e3cb517350572e3b70c6822e0a520abfb5c78f690e829a73e8d9f2"
-
 [[package]]
 name = "notify"
-version = "5.2.0"
+version = "6.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "729f63e1ca555a43fe3efa4f3efdf4801c479da85b432242a7b726f353c88486"
+checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d"
 dependencies = [
- "bitflags",
+ "bitflags 2.4.0",
  "crossbeam-channel",
  "filetime",
  "fsevent-sys",
  "inotify",
  "kqueue",
  "libc",
+ "log",
  "mio",
  "walkdir",
- "windows-sys 0.45.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -3485,9 +3014,9 @@ dependencies = [
 
 [[package]]
 name = "num-complex"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d"
+checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214"
 dependencies = [
  "num-traits",
 ]
@@ -3526,31 +3055,30 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.15"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
 dependencies = [
  "autocfg",
  "libm",
 ]
 
 [[package]]
-name = "num_cpus"
-version = "1.16.0"
+name = "num_enum"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
 dependencies = [
- "hermit-abi",
- "libc",
+ "num_enum_derive 0.5.11",
 ]
 
 [[package]]
 name = "num_enum"
-version = "0.5.11"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
+checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1"
 dependencies = [
- "num_enum_derive",
+ "num_enum_derive 0.6.1",
 ]
 
 [[package]]
@@ -3566,10 +3094,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "numquant"
-version = "0.2.0"
+name = "num_enum_derive"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54809e43d79aa532432c0d03c6adf62fdd96f2e152b90cef6cd9a316c3da4d99"
+checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
 
 [[package]]
 name = "objc"
@@ -3638,9 +3172,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.30.4"
+version = "0.32.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385"
+checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
 dependencies = [
  "memchr",
 ]
@@ -3674,12 +3208,6 @@ version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
 
-[[package]]
-name = "openssl-probe"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
-
 [[package]]
 name = "option-ext"
 version = "0.2.0"
@@ -3694,28 +3222,22 @@ checksum = "978aa494585d3ca4ad74929863093e87cac9790d81fe7aba2b3dc2890643a0fc"
 
 [[package]]
 name = "orbclient"
-version = "0.3.45"
+version = "0.3.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "221d488cd70617f1bd599ed8ceb659df2147d9393717954d82a0f5e8032a6ab1"
+checksum = "8378ac0dfbd4e7895f2d2c1f1345cab3836910baf3a300b000d04250f0c8428f"
 dependencies = [
  "redox_syscall 0.3.5",
 ]
 
 [[package]]
 name = "ordered-float"
-version = "3.7.0"
+version = "3.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fc2dbde8f8a79f2102cc474ceb0ad68e3b80b85289ea62389b60e66777e4213"
+checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc"
 dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "os_str_bytes"
-version = "6.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac"
-
 [[package]]
 name = "overload"
 version = "0.1.1"
@@ -3733,20 +3255,9 @@ dependencies = [
 
 [[package]]
 name = "parking"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e"
-
-[[package]]
-name = "parking_lot"
-version = "0.11.2"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
-dependencies = [
- "instant",
- "lock_api",
- "parking_lot_core 0.8.6",
-]
+checksum = "e52c774a4c39359c1d1c52e43f73dd91a75a614652c825408eec30c95a9b2067"
 
 [[package]]
 name = "parking_lot"
@@ -3755,21 +3266,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
 dependencies = [
  "lock_api",
- "parking_lot_core 0.9.8",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
-dependencies = [
- "cfg-if",
- "instant",
- "libc",
- "redox_syscall 0.2.16",
- "smallvec",
- "winapi",
+ "parking_lot_core",
 ]
 
 [[package]]
@@ -3782,21 +3279,21 @@ dependencies = [
  "libc",
  "redox_syscall 0.3.5",
  "smallvec",
- "windows-targets 0.48.0",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
 name = "parry2d"
-version = "0.13.4"
+version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62cf99dd4c1e7e6425ecea8a4a0d8682dbf1861332d3e7803d576ed6fc64fa67"
+checksum = "104ae65232e20477a98f9f1e75ca9850eae24a2ea846a2b1a0af03ad752136ce"
 dependencies = [
  "approx",
  "arrayvec",
- "bitflags",
+ "bitflags 1.3.2",
  "downcast-rs",
  "either",
- "indexmap",
+ "indexmap 1.9.3",
  "nalgebra",
  "num-derive",
  "num-traits",
@@ -3809,9 +3306,27 @@ dependencies = [
 
 [[package]]
 name = "paste"
-version = "1.0.12"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
+
+[[package]]
+name = "path-absolutize"
+version = "3.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4af381fe79fa195b4909485d99f73a80792331df0625188e707854f0b3383f5"
+dependencies = [
+ "path-dedot",
+]
+
+[[package]]
+name = "path-dedot"
+version = "3.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79"
+checksum = "07ba0ad7e047712414213ff67533e6dd477af0a4e1d14fb52343e53d30ea9397"
+dependencies = [
+ "once_cell",
+]
 
 [[package]]
 name = "peeking_take_while"
@@ -3821,9 +3336,9 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
 
 [[package]]
 name = "peg"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a07f2cafdc3babeebc087e499118343442b742cc7c31b4d054682cc598508554"
+checksum = "400bcab7d219c38abf8bd7cc2054eb9bbbd4312d66f6a5557d572a203f646f61"
 dependencies = [
  "peg-macros",
  "peg-runtime",
@@ -3831,9 +3346,9 @@ dependencies = [
 
 [[package]]
 name = "peg-macros"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a90084dc05cf0428428e3d12399f39faad19b0909f64fb9170c9fdd6d9cd49b"
+checksum = "46e61cce859b76d19090f62da50a9fe92bab7c2a5f09e183763559a2ac392c90"
 dependencies = [
  "peg-runtime",
  "proc-macro2",
@@ -3842,18 +3357,9 @@ dependencies = [
 
 [[package]]
 name = "peg-runtime"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fa00462b37ead6d11a82c9d568b26682d78e0477dc02d1966c013af80969739"
-
-[[package]]
-name = "pem"
-version = "1.1.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8"
-dependencies = [
- "base64 0.13.1",
-]
+checksum = "36bae92c60fa2398ce4678b98b2c4b5a7c61099961ca1fa305aec04a9ad28922"
 
 [[package]]
 name = "percent-encoding"
@@ -3863,343 +3369,139 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
 
 [[package]]
 name = "petgraph"
-version = "0.6.3"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4"
+checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
 dependencies = [
  "fixedbitset",
- "indexmap",
-]
-
-[[package]]
-name = "petitset"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b1a50d821a2526af6d5756c23c68e453532a986e361a3e12c9cc7fe61d862ac"
-dependencies = [
- "serde",
+ "indexmap 2.0.2",
 ]
 
 [[package]]
 name = "phf"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c"
-dependencies = [
- "phf_macros",
- "phf_shared",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf"
-dependencies = [
- "phf_shared",
- "rand 0.8.5",
-]
-
-[[package]]
-name = "phf_macros"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92aacdc5f16768709a569e913f7451034034178b05bdc8acda226659a3dccc66"
-dependencies = [
- "phf_generator",
- "phf_shared",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676"
-dependencies = [
- "siphasher",
-]
-
-[[package]]
-name = "pin-project"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.18",
-]
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
-
-[[package]]
-name = "pin-utils"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-
-[[package]]
-name = "ping-rs"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d873f038f84371f9c7fa13f6afea4d5f1fbcd5070ba8eb7af2a6d41c768eff8b"
-dependencies = [
- "futures",
- "mio",
- "paste",
- "socket2 0.4.9",
- "windows 0.43.0",
-]
-
-[[package]]
-name = "pkg-config"
-version = "0.3.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
-
-[[package]]
-name = "png"
-version = "0.17.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa"
-dependencies = [
- "bitflags",
- "crc32fast",
- "fdeflate",
- "flate2",
- "miniz_oxide 0.7.1",
-]
-
-[[package]]
-name = "polling"
-version = "2.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce"
-dependencies = [
- "autocfg",
- "bitflags",
- "cfg-if",
- "concurrent-queue",
- "libc",
- "log",
- "pin-project-lite",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "postcard"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfa512cd0d087cc9f99ad30a1bf64795b67871edbead083ffc3a4dfafa59aa00"
-dependencies = [
- "cobs",
- "heapless",
- "serde",
-]
-
-[[package]]
-name = "pp-rs"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb458bb7f6e250e6eb79d5026badc10a3ebb8f9a15d1fff0f13d17c71f4d6dee"
-dependencies = [
- "unicode-xid",
-]
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
-
-[[package]]
-name = "pretty-type-name"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0f73cdaf19b52e6143685c3606206e114a4dfa969d6b14ec3894c88eb38bd4b"
-
-[[package]]
-name = "proc-macro-crate"
-version = "1.3.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
+checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
 dependencies = [
- "once_cell",
- "toml_edit",
+ "phf_macros",
+ "phf_shared",
 ]
 
 [[package]]
-name = "proc-macro-error"
-version = "1.0.4"
+name = "phf_generator"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
 dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "version_check",
+ "phf_shared",
+ "rand 0.8.5",
 ]
 
 [[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
+name = "phf_macros"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b"
 dependencies = [
+ "phf_generator",
+ "phf_shared",
  "proc-macro2",
  "quote",
- "version_check",
+ "syn 2.0.38",
 ]
 
 [[package]]
-name = "proc-macro2"
-version = "1.0.59"
+name = "phf_shared"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b"
+checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
 dependencies = [
- "unicode-ident",
+ "siphasher",
 ]
 
 [[package]]
-name = "profiling"
-version = "1.0.8"
+name = "pin-project-lite"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "332cd62e95873ea4f41f3dfd6bbbfc5b52aec892d7e8d534197c4720a0bbbab2"
-dependencies = [
- "profiling-procmacros",
- "tracing",
-]
+checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
 
 [[package]]
-name = "profiling-procmacros"
-version = "1.0.8"
+name = "pkg-config"
+version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a10adb8d151bb1280afb8bed41ae5db26be1b056964947133c7525b0bf39c0b0"
-dependencies = [
- "quote",
- "syn 1.0.109",
-]
+checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
 
 [[package]]
-name = "puffin"
-version = "0.15.0"
+name = "png"
+version = "0.17.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f99b70359a44d98fceb167734e8cc19e232fe885a547f1b622e66d8099931b6"
+checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64"
 dependencies = [
- "anyhow",
- "bincode",
- "byteorder",
- "instant",
- "js-sys",
- "once_cell",
- "parking_lot 0.12.1",
- "ruzstd",
- "serde",
- "zstd",
+ "bitflags 1.3.2",
+ "crc32fast",
+ "fdeflate",
+ "flate2",
+ "miniz_oxide",
 ]
 
 [[package]]
-name = "puffin_egui"
-version = "0.21.0"
+name = "pp-rs"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180408bd5816f172326f52cca2b9cc335ad36db5e40f46210f7d20ed847ce15c"
+checksum = "bb458bb7f6e250e6eb79d5026badc10a3ebb8f9a15d1fff0f13d17c71f4d6dee"
 dependencies = [
- "egui",
- "indexmap",
- "instant",
- "natord",
- "once_cell",
- "puffin",
- "time",
- "vec1",
+ "unicode-xid",
 ]
 
 [[package]]
-name = "quinn"
-version = "0.10.1"
+name = "ppv-lite86"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21252f1c0fc131f1b69182db8f34837e8a69737b8251dff75636a9be0518c324"
-dependencies = [
- "bytes",
- "pin-project-lite",
- "quinn-proto",
- "quinn-udp",
- "rustc-hash",
- "rustls",
- "thiserror",
- "tokio",
- "tracing",
-]
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
 [[package]]
-name = "quinn-proto"
-version = "0.10.1"
+name = "proc-macro-crate"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85af4ed6ee5a89f26a26086e9089a6643650544c025158449a3626ebf72884b3"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
 dependencies = [
- "bytes",
- "rand 0.8.5",
- "ring",
- "rustc-hash",
- "rustls",
- "rustls-native-certs",
- "slab",
- "thiserror",
- "tinyvec",
- "tracing",
+ "once_cell",
+ "toml_edit",
 ]
 
 [[package]]
-name = "quinn-udp"
-version = "0.4.0"
+name = "proc-macro2"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6df19e284d93757a9fb91d63672f7741b129246a669db09d1c0063071debc0c0"
+checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
 dependencies = [
- "bytes",
- "libc",
- "socket2 0.5.3",
- "tracing",
- "windows-sys 0.48.0",
+ "unicode-ident",
 ]
 
 [[package]]
-name = "quinn_runtime_bevy"
-version = "0.2.0"
+name = "profiling"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f89dff0959d98c9758c88826cc002e2c3d0b9dfac4139711d1f30de442f1139b"
+
+[[package]]
+name = "puffin"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07483e0846c9ad53e823f0d5f1638b6853f5bf1df212bbb8ead79ff9785de380"
+checksum = "76425abd4e1a0ad4bd6995dd974b52f414fca9974171df8e3708b3e660d05a21"
 dependencies = [
- "async-executor",
- "async-io",
- "bevy_tasks",
- "futures-lite",
- "pin-project",
- "quinn",
- "quinn-proto",
- "quinn-udp",
+ "anyhow",
+ "byteorder",
+ "cfg-if",
+ "instant",
+ "once_cell",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.28"
+version = "1.0.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
+checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
 dependencies = [
  "proc-macro2",
 ]
@@ -4311,10 +3613,10 @@ dependencies = [
  "approx",
  "arrayvec",
  "bit-vec",
- "bitflags",
+ "bitflags 1.3.2",
  "crossbeam",
  "downcast-rs",
- "indexmap",
+ "indexmap 1.9.3",
  "nalgebra",
  "num-derive",
  "num-traits",
@@ -4335,40 +3637,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
 
-[[package]]
-name = "rayon"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
-dependencies = [
- "either",
- "rayon-core",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
-dependencies = [
- "crossbeam-channel",
- "crossbeam-deque",
- "crossbeam-utils",
- "num_cpus",
-]
-
-[[package]]
-name = "rcgen"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b"
-dependencies = [
- "pem",
- "ring",
- "time",
- "yasna",
-]
-
 [[package]]
 name = "rectangle-pack"
 version = "0.4.2"
@@ -4381,7 +3649,7 @@ version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 ]
 
 [[package]]
@@ -4390,7 +3658,7 @@ version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 ]
 
 [[package]]
@@ -4406,13 +3674,14 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.8.4"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f"
+checksum = "aaac441002f822bc9705a681810a4dd2963094b9ca0ddc41cb963a4c189189ea"
 dependencies = [
- "aho-corasick 1.0.2",
+ "aho-corasick",
  "memchr",
- "regex-syntax 0.7.2",
+ "regex-automata 0.4.2",
+ "regex-syntax 0.8.2",
 ]
 
 [[package]]
@@ -4424,6 +3693,17 @@ dependencies = [
  "regex-syntax 0.6.29",
 ]
 
+[[package]]
+name = "regex-automata"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5011c7e263a695dc8ca064cddb722af1be54e517a280b12a5356f98366899e5d"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax 0.8.2",
+]
+
 [[package]]
 name = "regex-syntax"
 version = "0.6.29"
@@ -4432,15 +3712,15 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.7.2"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
 
 [[package]]
 name = "renderdoc-sys"
-version = "0.7.1"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1382d1f0a252c4bf97dc20d979a2fdd05b024acd7c2ed0f7595d7817666a157"
+checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b"
 
 [[package]]
 name = "ring"
@@ -4451,7 +3731,7 @@ dependencies = [
  "cc",
  "libc",
  "once_cell",
- "spin 0.5.2",
+ "spin",
  "untrusted",
  "web-sys",
  "winapi",
@@ -4474,13 +3754,14 @@ checksum = "e5864e7ef1a6b7bcf1d6ca3f655e65e724ed3b52546a0d0a663c991522f552ea"
 
 [[package]]
 name = "ron"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "300a51053b1cb55c80b7a9fde4120726ddf25ca241a1cbb926626f62fb136bff"
+checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94"
 dependencies = [
- "base64 0.13.1",
- "bitflags",
+ "base64",
+ "bitflags 2.4.0",
  "serde",
+ "serde_derive",
 ]
 
 [[package]]
@@ -4495,34 +3776,11 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
-[[package]]
-name = "rustc_version"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
-dependencies = [
- "semver",
-]
-
-[[package]]
-name = "rustix"
-version = "0.37.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d"
-dependencies = [
- "bitflags",
- "errno",
- "io-lifetimes",
- "libc",
- "linux-raw-sys",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "rustls"
-version = "0.21.1"
+version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c911ba11bc8433e811ce56fde130ccf32f5127cab0e0194e9c68c5a5b671791e"
+checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8"
 dependencies = [
  "log",
  "ring",
@@ -4530,65 +3788,27 @@ dependencies = [
  "sct",
 ]
 
-[[package]]
-name = "rustls-native-certs"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50"
-dependencies = [
- "openssl-probe",
- "rustls-pemfile",
- "schannel",
- "security-framework",
-]
-
-[[package]]
-name = "rustls-pemfile"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b"
-dependencies = [
- "base64 0.21.2",
-]
-
 [[package]]
 name = "rustls-webpki"
-version = "0.100.1"
+version = "0.101.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b"
+checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe"
 dependencies = [
  "ring",
  "untrusted",
 ]
 
-[[package]]
-name = "rustversion"
-version = "1.0.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f"
-
-[[package]]
-name = "ruzstd"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a15e661f0f9dac21f3494fe5d23a6338c0ac116a2d22c2b63010acd89467ffe"
-dependencies = [
- "byteorder",
- "thiserror",
- "twox-hash",
-]
-
 [[package]]
 name = "ryu"
-version = "1.0.13"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
+checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
 
 [[package]]
 name = "safe_arch"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62a7484307bd40f8f7ccbacccac730108f2cae119a3b11c74485b48aa9ea650f"
+checksum = "f398075ce1e6a179b46f51bd88d0598b92b00d3551f1a2d4ac49e771b56ac354"
 dependencies = [
  "bytemuck",
 ]
@@ -4602,26 +3822,11 @@ dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "schannel"
-version = "0.1.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3"
-dependencies = [
- "windows-sys 0.42.0",
-]
-
-[[package]]
-name = "scoped-tls"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
-
 [[package]]
 name = "scopeguard"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "sct"
@@ -4633,29 +3838,6 @@ dependencies = [
  "untrusted",
 ]
 
-[[package]]
-name = "security-framework"
-version = "2.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8"
-dependencies = [
- "bitflags",
- "core-foundation",
- "core-foundation-sys 0.8.4",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "2.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7"
-dependencies = [
- "core-foundation-sys 0.8.4",
- "libc",
-]
-
 [[package]]
 name = "self_cell"
 version = "0.10.2"
@@ -4664,35 +3846,38 @@ checksum = "1ef965a420fe14fdac7dd018862966a4c14094f900e1650bbc71ddd7d580c8af"
 
 [[package]]
 name = "semver"
-version = "1.0.17"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
+checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "serde"
-version = "1.0.163"
+version = "1.0.189"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
+checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.163"
+version = "1.0.189"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
+checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.18",
+ "syn 2.0.38",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.96"
+version = "1.0.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
+checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
 dependencies = [
  "itoa",
  "ryu",
@@ -4701,11 +3886,11 @@ dependencies = [
 
 [[package]]
 name = "serde_yaml"
-version = "0.9.21"
+version = "0.9.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9d684e3ec7de3bf5466b32bd75303ac16f0736426e5a4e0d6e489559ce1249c"
+checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574"
 dependencies = [
- "indexmap",
+ "indexmap 2.0.2",
  "itoa",
  "ryu",
  "serde",
@@ -4713,16 +3898,21 @@ dependencies = [
 ]
 
 [[package]]
-name = "sha1_smol"
-version = "1.0.0"
+name = "sha2"
+version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
 
 [[package]]
 name = "sharded-slab"
-version = "0.1.4"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
 dependencies = [
  "lazy_static",
 ]
@@ -4734,7 +3924,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9635466532d454fa020acbb12f629f1fc02fc9b4d5b39cc72ca478be37e314bc"
 dependencies = [
  "bitvec",
- "fastrand",
+ "fastrand 1.9.0",
  "itertools",
  "log",
  "nohash-hasher",
@@ -4742,9 +3932,9 @@ dependencies = [
 
 [[package]]
 name = "shlex"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
+checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380"
 
 [[package]]
 name = "simba"
@@ -4762,21 +3952,21 @@ dependencies = [
 
 [[package]]
 name = "simd-adler32"
-version = "0.3.5"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
 
 [[package]]
 name = "siphasher"
-version = "0.3.10"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"
+checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
 
 [[package]]
 name = "slab"
-version = "0.4.8"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
 dependencies = [
  "autocfg",
 ]
@@ -4792,69 +3982,39 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.10.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
+checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
 dependencies = [
  "serde",
 ]
 
 [[package]]
-name = "socket2"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "socket2"
-version = "0.5.3"
+name = "smol_str"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877"
+checksum = "74212e6bbe9a4352329b2f68ba3130c15a3f26fe88ff22dbdc6cdd58fa85e99c"
 dependencies = [
- "libc",
- "windows-sys 0.48.0",
+ "serde",
 ]
 
 [[package]]
 name = "spade"
 version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88e65803986868d2372c582007c39ba89936a36ea5f236bf7a7728dc258f04f9"
-dependencies = [
- "num-traits",
- "optional",
- "robust",
- "smallvec",
-]
-
-[[package]]
-name = "spin"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
-
-[[package]]
-name = "spin"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+checksum = "88e65803986868d2372c582007c39ba89936a36ea5f236bf7a7728dc258f04f9"
 dependencies = [
- "lock_api",
+ "num-traits",
+ "optional",
+ "robust",
+ "smallvec",
 ]
 
 [[package]]
-name = "spin_sleep"
-version = "1.1.1"
+name = "spin"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cafa7900db085f4354dbc7025e25d7a839a14360ea13b5fc4fd717f2d3b23134"
-dependencies = [
- "once_cell",
- "winapi",
-]
+checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 
 [[package]]
 name = "spirv"
@@ -4862,15 +4022,15 @@ version = "0.2.0+1.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "num-traits",
 ]
 
 [[package]]
-name = "stable_deref_trait"
-version = "1.2.0"
+name = "sptr"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a"
 
 [[package]]
 name = "static_assertions"
@@ -4884,12 +4044,6 @@ version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0"
 
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
 [[package]]
 name = "svg_fmt"
 version = "0.4.1"
@@ -4936,7 +4090,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7c73eb88fee79705268cc7b742c7bc93a7b76e092ab751d0833866970754142"
 dependencies = [
  "arrayvec",
- "bitflags",
+ "bitflags 1.3.2",
  "bytemuck",
  "lazy_static",
  "log",
@@ -4989,9 +4143,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.18"
+version = "2.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e"
+checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4999,25 +4153,22 @@ dependencies = [
 ]
 
 [[package]]
-name = "synstructure"
-version = "0.12.6"
+name = "sys-locale"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
+checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "unicode-xid",
+ "libc",
 ]
 
 [[package]]
 name = "sysinfo"
-version = "0.28.4"
+version = "0.29.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4c2f3ca6693feb29a89724516f016488e9aafc7f37264f898593ee4b942f31b"
+checksum = "0a18d114d420ada3a891e6bc8e96a2023402203296a47cdd65083377dad18ba5"
 dependencies = [
  "cfg-if",
- "core-foundation-sys 0.8.4",
+ "core-foundation-sys",
  "libc",
  "ntapi",
  "once_cell",
@@ -5032,31 +4183,31 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "termcolor"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
+checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64"
 dependencies = [
  "winapi-util",
 ]
 
 [[package]]
 name = "thiserror"
-version = "1.0.40"
+version = "1.0.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
+checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.40"
+version = "1.0.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
+checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.18",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -5071,47 +4222,20 @@ dependencies = [
 
 [[package]]
 name = "tiff"
-version = "0.8.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7449334f9ff2baf290d55d73983a7d6fa15e01198faef72af07e2a8db851e471"
+checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211"
 dependencies = [
  "flate2",
  "jpeg-decoder",
  "weezl",
 ]
 
-[[package]]
-name = "time"
-version = "0.3.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd"
-dependencies = [
- "itoa",
- "serde",
- "time-core",
- "time-macros",
-]
-
-[[package]]
-name = "time-core"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
-
-[[package]]
-name = "time-macros"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b"
-dependencies = [
- "time-core",
-]
-
 [[package]]
 name = "tinystr"
-version = "0.7.1"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ac3f5b6856e931e15e07b478e98c8045239829a65f9156d4fa7e7788197a5ef"
+checksum = "d5d0e245e80bdc9b4e5356fc45a72184abbc3861992603f515270e9340f5a219"
 dependencies = [
  "displaydoc",
 ]
@@ -5131,41 +4255,29 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
-[[package]]
-name = "tokio"
-version = "1.28.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2"
-dependencies = [
- "autocfg",
- "pin-project-lite",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "toml_datetime"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f"
+checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
 
 [[package]]
 name = "toml_edit"
-version = "0.19.10"
+version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap",
+ "indexmap 2.0.2",
  "toml_datetime",
  "winnow",
 ]
 
 [[package]]
 name = "tracing"
-version = "0.1.37"
+version = "0.1.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
+checksum = "ee2ef2af84856a50c1d430afce2fdded0a4ec7eda868db86409b4543df0797f9"
 dependencies = [
- "cfg-if",
  "pin-project-lite",
  "tracing-attributes",
  "tracing-core",
@@ -5173,35 +4285,25 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.24"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.18",
+ "syn 2.0.38",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.31"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
 dependencies = [
  "once_cell",
  "valuable",
 ]
 
-[[package]]
-name = "tracing-error"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e"
-dependencies = [
- "tracing",
- "tracing-subscriber",
-]
-
 [[package]]
 name = "tracing-log"
 version = "0.1.3"
@@ -5231,17 +4333,6 @@ dependencies = [
  "tracing-log",
 ]
 
-[[package]]
-name = "tracing-tracy"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55c48ef3e655220d4e43a6be44aa84f078c3004357251cab45f9cc15551a593e"
-dependencies = [
- "tracing-core",
- "tracing-subscriber",
- "tracy-client",
-]
-
 [[package]]
 name = "tracing-wasm"
 version = "0.2.1"
@@ -5253,31 +4344,11 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "tracy-client"
-version = "0.15.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "434ecabbda9f67eeea1eab44d52f4a20538afa3e2c2770f2efc161142b25b608"
-dependencies = [
- "loom",
- "once_cell",
- "tracy-client-sys",
-]
-
-[[package]]
-name = "tracy-client-sys"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d99f5fc382239d08b6bf05bb6206a585bfdb988c878f2499081d0f285ef7819"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "ttf-parser"
-version = "0.19.0"
+version = "0.19.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44dcf002ae3b32cd25400d6df128c5babec3927cd1eb7ce813cfff20eb6c3746"
+checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1"
 
 [[package]]
 name = "turborand"
@@ -5289,16 +4360,6 @@ dependencies = [
  "instant",
 ]
 
-[[package]]
-name = "twox-hash"
-version = "1.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
-dependencies = [
- "cfg-if",
- "static_assertions",
-]
-
 [[package]]
 name = "type-map"
 version = "0.4.0"
@@ -5308,41 +4369,20 @@ dependencies = [
  "rustc-hash",
 ]
 
-[[package]]
-name = "type_ulid"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5a87db4bdcccfb04d822e736ef808a78a7549c1486c105e371cb73b278c24ae"
-dependencies = [
- "type_ulid_macros",
- "ulid",
-]
-
-[[package]]
-name = "type_ulid_macros"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c65b0fa9e298ac8f3d2ae0593c3a2ffb78db8184b5d3c9640dfbd9a0617b6a53"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "ulid",
-]
-
 [[package]]
 name = "typenum"
-version = "1.16.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
 name = "ulid"
-version = "1.0.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13a3aaa69b04e5b66cc27309710a569ea23593612387d67daaf102e73aa974fd"
+checksum = "7e37c4b6cbcc59a8dcd09a6429fbc7890286bcbb79215cea7b38a3c4c0921d93"
 dependencies = [
  "rand 0.8.5",
+ "serde",
 ]
 
 [[package]]
@@ -5372,9 +4412,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.9"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "unicode-normalization"
@@ -5387,9 +4427,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-width"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
+checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
 
 [[package]]
 name = "unicode-xid"
@@ -5399,9 +4439,9 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
 
 [[package]]
 name = "unsafe-libyaml"
-version = "0.2.8"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1865806a559042e51ab5414598446a5871b561d21b6764f2eabb0dd481d880a6"
+checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa"
 
 [[package]]
 name = "untrusted"
@@ -5409,26 +4449,54 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
 
+[[package]]
+name = "ureq"
+version = "2.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5ccd538d4a604753ebc2f17cd9946e89b77bf87f6a8e2309667c6f2e87855e3"
+dependencies = [
+ "base64",
+ "flate2",
+ "log",
+ "once_cell",
+ "rustls",
+ "rustls-webpki",
+ "url",
+ "webpki-roots",
+]
+
 [[package]]
 name = "url"
-version = "2.4.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb"
+checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5"
 dependencies = [
  "form_urlencoded",
  "idna",
  "percent-encoding",
 ]
 
+[[package]]
+name = "ustr"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b050b13c1933490b043b8238a75bc7676cb49292f49768c9350eabb284eaeb87"
+dependencies = [
+ "ahash",
+ "byteorder",
+ "lazy_static",
+ "parking_lot",
+ "serde",
+]
+
 [[package]]
 name = "uuid"
-version = "1.3.3"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2"
+checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"
 dependencies = [
  "getrandom 0.2.10",
  "serde",
- "sha1_smol",
 ]
 
 [[package]]
@@ -5437,24 +4505,22 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
 
-[[package]]
-name = "varinteger"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ea29db9f94ff08bb619656b8120878f280526f71dc88b5262c958a510181812"
-
-[[package]]
-name = "vec1"
-version = "1.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bda7c41ca331fe9a1c278a9e7ee055f4be7f5eb1c2b72f079b4ff8b5fce9d5c"
-
 [[package]]
 name = "vec_map"
 version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
 
+[[package]]
+name = "venial"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61584a325b16f97b5b25fcc852eb9550843a251057a5e3e5992d2376f3df4bb2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+]
+
 [[package]]
 name = "version_check"
 version = "0.9.4"
@@ -5463,15 +4529,15 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "waker-fn"
-version = "1.1.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
+checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690"
 
 [[package]]
 name = "walkdir"
-version = "2.3.3"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
+checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
 dependencies = [
  "same-file",
  "winapi-util",
@@ -5491,9 +4557,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.86"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73"
+checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -5501,24 +4567,24 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.86"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb"
+checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.18",
+ "syn 2.0.38",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.36"
+version = "0.4.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e"
+checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -5528,9 +4594,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.86"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258"
+checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -5538,22 +4604,22 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.86"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8"
+checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.18",
+ "syn 2.0.38",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.86"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93"
+checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
 
 [[package]]
 name = "wayland-scanner"
@@ -5568,9 +4634,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.63"
+version = "0.3.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2"
+checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -5578,9 +4644,9 @@ dependencies = [
 
 [[package]]
 name = "webbrowser"
-version = "0.8.10"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd222aa310eb7532e3fd427a5d7db7e44bc0b0cf1c1e21139c345325511a85b6"
+checksum = "82b2391658b02c27719fc5a0a73d6e696285138e8b12fba9d4baa70451023c71"
 dependencies = [
  "core-foundation",
  "home",
@@ -5593,6 +4659,12 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "webpki-roots"
+version = "0.25.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc"
+
 [[package]]
 name = "weezl"
 version = "0.1.7"
@@ -5601,16 +4673,16 @@ checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb"
 
 [[package]]
 name = "wgpu"
-version = "0.15.1"
+version = "0.16.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d745a1b6d91d85c33defbb29f0eee0450e1d2614d987e14bf6baf26009d132d7"
+checksum = "480c965c9306872eb6255fa55e4b4953be55a8b64d57e61d7ff840d3dcc051cd"
 dependencies = [
  "arrayvec",
  "cfg-if",
  "js-sys",
  "log",
  "naga",
- "parking_lot 0.12.1",
+ "parking_lot",
  "profiling",
  "raw-window-handle",
  "smallvec",
@@ -5625,20 +4697,20 @@ dependencies = [
 
 [[package]]
 name = "wgpu-core"
-version = "0.15.1"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7131408d940e335792645a98f03639573b0480e9e2e7cddbbab74f7c6d9f3fff"
+checksum = "8f478237b4bf0d5b70a39898a66fa67ca3a007d79f2520485b8b0c3dfc46f8c2"
 dependencies = [
  "arrayvec",
  "bit-vec",
- "bitflags",
+ "bitflags 2.4.0",
  "codespan-reporting",
- "fxhash",
  "log",
  "naga",
- "parking_lot 0.12.1",
+ "parking_lot",
  "profiling",
  "raw-window-handle",
+ "rustc-hash",
  "smallvec",
  "thiserror",
  "web-sys",
@@ -5648,20 +4720,19 @@ dependencies = [
 
 [[package]]
 name = "wgpu-hal"
-version = "0.15.4"
+version = "0.16.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdcf61a283adc744bb5453dd88ea91f3f86d5ca6b027661c6c73c7734ae0288b"
+checksum = "1ecb3258078e936deee14fd4e0febe1cfe9bbb5ffef165cb60218d2ee5eb4448"
 dependencies = [
  "android_system_properties",
  "arrayvec",
  "ash",
  "bit-set",
- "bitflags",
+ "bitflags 2.4.0",
  "block",
  "core-graphics-types",
  "d3d12",
  "foreign-types",
- "fxhash",
  "glow",
  "gpu-alloc",
  "gpu-allocator",
@@ -5670,16 +4741,17 @@ dependencies = [
  "js-sys",
  "khronos-egl",
  "libc",
- "libloading",
+ "libloading 0.8.1",
  "log",
  "metal",
  "naga",
  "objc",
- "parking_lot 0.12.1",
+ "parking_lot",
  "profiling",
  "range-alloc",
  "raw-window-handle",
  "renderdoc-sys",
+ "rustc-hash",
  "smallvec",
  "thiserror",
  "wasm-bindgen",
@@ -5690,20 +4762,20 @@ dependencies = [
 
 [[package]]
 name = "wgpu-types"
-version = "0.15.2"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32444e121b0bd00cb02c0de32fde457a9491bd44e03e7a5db6df9b1da2f6f110"
+checksum = "d0c153280bb108c2979eb5c7391cb18c56642dd3c072e55f52065e13e2a1252a"
 dependencies = [
- "bitflags",
+ "bitflags 2.4.0",
  "js-sys",
  "web-sys",
 ]
 
 [[package]]
 name = "wide"
-version = "0.7.10"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40018623e2dba2602a9790faba8d33f2ebdebf4b86561b83928db735f8784728"
+checksum = "ebecebefc38ff1860b4bc47550bbfa63af5746061cf0d29fcd7fa63171602598"
 dependencies = [
  "bytemuck",
  "safe_arch",
@@ -5711,9 +4783,9 @@ dependencies = [
 
 [[package]]
 name = "widestring"
-version = "0.5.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983"
+checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8"
 
 [[package]]
 name = "winapi"
@@ -5733,9 +4805,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
 dependencies = [
  "winapi",
 ]
@@ -5755,29 +4827,12 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
-[[package]]
-name = "windows"
-version = "0.43.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04662ed0e3e5630dfa9b26e4cb823b817f1a9addda855d973a9458c236556244"
-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"
 version = "0.44.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b"
 dependencies = [
- "windows-implement",
- "windows-interface",
  "windows-targets 0.42.2",
 ]
 
@@ -5796,25 +4851,35 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
 dependencies = [
- "windows-targets 0.48.0",
+ "windows-implement",
+ "windows-interface",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
-name = "windows-implement"
-version = "0.44.0"
+name = "windows"
+version = "0.51.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce87ca8e3417b02dc2a8a22769306658670ec92d78f1bd420d6310a67c245c6"
+checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
+ "windows-core",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
-name = "windows-interface"
-version = "0.44.0"
+name = "windows-core"
+version = "0.51.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "853f69a591ecd4f810d29f17e902d40e349fb05b0b11fff63b08b826bfe39c7f"
+checksum = "5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5822,18 +4887,14 @@ dependencies = [
 ]
 
 [[package]]
-name = "windows-sys"
-version = "0.42.0"
+name = "windows-interface"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
+checksum = "e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7"
 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",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -5851,7 +4912,7 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
 dependencies = [
- "windows-targets 0.48.0",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -5871,17 +4932,17 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
 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",
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
 ]
 
 [[package]]
@@ -5892,9 +4953,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -5904,9 +4965,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -5916,9 +4977,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -5928,9 +4989,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -5940,9 +5001,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -5952,9 +5013,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -5964,18 +5025,18 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "winit"
-version = "0.28.6"
+version = "0.28.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "866db3f712fffba75d31bf0cdecf357c8aeafd158c5b7ab51dba2a2b2d47f196"
+checksum = "9596d90b45384f5281384ab204224876e8e8bf7d58366d9b795ad99aa9894b94"
 dependencies = [
  "android-activity",
- "bitflags",
+ "bitflags 1.3.2",
  "cfg_aliases",
  "core-foundation",
  "core-graphics",
@@ -6000,9 +5061,9 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.4.6"
+version = "0.5.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699"
+checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c"
 dependencies = [
  "memchr",
 ]
@@ -6051,45 +5112,6 @@ dependencies = [
 
 [[package]]
 name = "xml-rs"
-version = "0.8.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52839dc911083a8ef63efa4d039d1f58b5e409f923e44c80828f206f66e5541c"
-
-[[package]]
-name = "yasna"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd"
-dependencies = [
- "time",
-]
-
-[[package]]
-name = "zstd"
-version = "0.12.3+zstd.1.5.2"
+version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806"
-dependencies = [
- "zstd-safe",
-]
-
-[[package]]
-name = "zstd-safe"
-version = "6.0.5+zstd.1.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d56d9e60b4b1758206c238a10165fbcae3ca37b01744e394c463463f6529d23b"
-dependencies = [
- "libc",
- "zstd-sys",
-]
-
-[[package]]
-name = "zstd-sys"
-version = "2.0.8+zstd.1.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
-]
+checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a"
diff --git a/Cargo.toml b/Cargo.toml
index a79a52f7cb..311519f4d8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,103 +7,112 @@ license     = "MIT OR Apache-2.0"
 name        = "jumpy"
 version     = "0.7.0"
 
-[workspace]
-members = [".", "core"]
-
 [features]
 default = []
-# Enable to simulate horrible network latency/slowness
-debug-network-slowdown = ["async-timer", "turborand"]
-# Enable bevy tracing scopes in profiling and tracy profiler support.
-profiling-full= ["bevy/trace", "dep:tracing-tracy"]
+# # Enable to simulate horrible network latency/slowness
+# debug-network-slowdown = ["async-timer", "turborand"]
+# # Enable bevy tracing scopes in profiling and tracy profiler support.
+# profiling-full = ["bevy/trace", "dep:tracing-tracy"]
 
 [dependencies]
-bones_bevy_asset    = "0.2"
-bones_bevy_renderer = "0.2"
-bones_lib           = { version = "0.2", features = ["bevy"] }
-type_ulid           = "0.2"
-
-anyhow              = "1.0"
-async-channel       = "1.7"
-bevy_console        = "0.7"
-bevy-inspector-egui = { version = "0.18", default-features = false }
-bevy_egui           = "0.20"
-bevy_fluent         = "0.6"
-bevy_framepace      = "0.12"
-bevy_kira_audio     = { version = "0.15", features = ["ogg"], default-features = false }
-bevy_tweening       = { version = "0.7", default-features = false }
-
-async-timer            = { version = "0.7", optional = true }
-bytemuck               = "1.12"
-clap                   = { version = "4.0", features = ["derive", "env"] }
-directories            = "5.0"
-downcast-rs            = "1.2"
-egui_extras            = "0.21"
-either                 = "1.8"
-fluent                 = "0.16"
-fluent_content         = "0.0"
-futures-lite           = "1.12"
-getrandom              = { version = "0.2", features = ["js"] }
-jumpy_core             = { path = "./core" }
-leafwing-input-manager = { version = "0.9", default-features = false }
-log                    = { version = "0.4", features = ["release_max_level_debug"] }
-normalize-path         = "0.2"
-once_cell              = "1.17"
-peg                    = "0.8"
-puffin                 = { version = "0.15", features = ["web"] }
-puffin_egui            = "0.21"
-rand                   = "0.8"
-serde                  = { version = "1.0", features = ["derive"] }
-serde_yaml             = "0.9"
-thiserror              = "1.0"
-tracing                = { version = "0.1", features = ["release_max_level_debug"] }
-tracing-core           = "0.1"
-tracing-log            = "0.1"
-tracing-subscriber     = "0.3"
-unic-langid            = "0.9"
-byte-pool              = "0.2.4"
-
-[dependencies.turborand]
-features = ["atomic"]
-optional = true
-version  = "0.10"
-
-[dependencies.bevy]
-default-features = false
-features         = ["x11", "png", "filesystem_watcher", "bevy_gilrs"]
-version          = "0.10"
-
-[dependencies.tracing-tracy]
-version = "0.10.0"
-default-features = false
-features = ["enable", "system-tracing", "context-switch-tracing", "code-transfer"]
-optional = true
-
-[target.'cfg(target_arch = "wasm32")'.dependencies]
-wasm-bindgen = "0.2.83"
-web-sys      = { version = "0.3", features = ["Window", "Location", "Storage"] }
-tracing-wasm = "0.2"
-console_error_panic_hook = "0.1"
-js-sys       = "0.3"
-chrono       = { version = "0.4", default-features = false, features = ["std", "wasmbind"] }
+bones_framework     = { git = "https://github.com/fishfolk/bones" }
+bones_bevy_renderer = { git = "https://github.com/fishfolk/bones" }
+bevy_tasks          = "0.11"
+turborand           = { version = "0.10.0", features = ["atomic"] }
+tracing             = "0.1.37"
+puffin              = "0.16.0"
+petgraph            = "0.6.4"
+rapier2d            = { version = "0.17.2", features = ["debug-render", "enhanced-determinism"] }
+indexmap            = "2.0.0"
+serde               = { version = "1.0.188", features = ["derive"] }
+shiftnanigans       = "0.3.3"
+humantime-serde     = "1.1.1"
+ordered-float       = "3.9.1"
+nalgebra            = { version = "0.32", features = ["glam024"] }
+once_cell           = "1.18.0"
+async-channel       = "1.9.0"
+serde_yaml          = "0.9.25"
+thiserror           = "1.0.48"
+peg                 = "0.8.1"
+egui_extras         = { version = "0.23.0", default-features = false }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-bevy_dylib = "0.10"
-mimalloc   = { version = "0.1", default-features = false }
-# Networking deps
-bitfield               = "0.14"
-bones_matchmaker_proto = "0.2"
-bytes                  = "1.4"
-ggrs                   = { version = "0.9", features = ["sync-send"] }
-mdns-sd                = { version = "0.7", default-features = false }
-numquant               = "0.2"
-ping-rs                = "0.1"
-postcard               = { version = "1.0", features = ["alloc"] }
-quinn                  = { version = "0.10", default-features = false, features = ["tls-rustls"] }
-rcgen                  = "0.10"
-rustls                 = { version = "0.21", features = ["dangerous_configuration", "quic"] }
-smallvec               = "1.10"
-quinn_runtime_bevy     = "0.2"
+directories = "1.0"
+bevy_dylib  = "0.11"
+
+# anyhow              = "1.0"
+# async-channel       = "1.7"
+# bevy_console        = "0.7"
+# bevy-inspector-egui = { version = "0.18", default-features = false }
+# bevy_egui           = "0.21.0"
+# bevy_fluent         = "0.6"
+# bevy_framepace      = "0.12"
+# bevy_kira_audio     = { version = "0.15", features = ["ogg"], default-features = false }
+# bevy_tweening       = { version = "0.7", default-features = false }
+
+# async-timer        = { version = "0.7", optional = true }
+# bytemuck           = "1.12"
+# clap               = { version = "4.0", features = ["derive", "env"] }
+# directories        = "5.0"
+# downcast-rs        = "1.2"
+# egui_extras        = "0.22.0"
+# either             = "1.8"
+# fluent             = "0.16"
+# fluent_content     = "0.0"
+# futures-lite       = "1.12"
+# getrandom          = { version = "0.2", features = ["js"] }
+# log                = { version = "0.4", features = ["release_max_level_debug"] }
+# normalize-path     = "0.2"
+# once_cell          = "1.17"
+# peg                = "0.8"
+# puffin             = { version = "0.15", features = ["web"] }
+# puffin_egui        = "0.21"
+# rand               = "0.8"
+# serde              = { version = "1.0", features = ["derive"] }
+# serde_yaml         = "0.9"
+# thiserror          = "1.0"
+# tracing            = { version = "0.1", features = ["release_max_level_debug"] }
+# tracing-core       = "0.1"
+# tracing-log        = "0.1"
+# tracing-subscriber = "0.3"
+# unic-langid        = "0.9"
+# byte-pool          = "0.2.4"
+
+# [dependencies.turborand]
+# features = ["atomic"]
+# optional = true
+# version  = "0.10"
+
+# [dependencies.tracing-tracy]
+# version          = "0.10.0"
+# default-features = false
+# features         = ["enable", "system-tracing", "context-switch-tracing", "code-transfer"]
+# optional         = true
+
+# [target.'cfg(target_arch = "wasm32")'.dependencies]
+# wasm-bindgen             = "0.2.83"
+# web-sys                  = { version = "0.3", features = ["Window", "Location", "Storage"] }
+# tracing-wasm             = "0.2"
+# console_error_panic_hook = "0.1"
+# js-sys                   = "0.3"
+# chrono                   = { version = "0.4", default-features = false, features = ["std", "wasmbind"] }
+
+# [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+# mimalloc = { version = "0.1", default-features = false }
+# # Networking deps
+# bitfield               = "0.14"
+# bones_matchmaker_proto = "0.2"
+# bytes                  = "1.4"
+# ggrs                   = { version = "0.9", features = ["sync-send"] }
+# mdns-sd                = { version = "0.7", default-features = false }
+# numquant               = "0.2"
+# ping-rs                = "0.1"
+# postcard               = { version = "1.0", features = ["alloc"] }
+# quinn                  = { version = "0.10", default-features = false, features = ["tls-rustls"] }
+# rcgen                  = "0.11.1"
+# rustls                 = { version = "0.21", features = ["dangerous_configuration", "quic"] }
+# smallvec               = "1.10"
+# quinn_runtime_bevy     = "0.2"
 
 # Optimize dependencies even in development
 [profile.dev.package."*"]
@@ -112,13 +121,9 @@ debug         = 1 # Only keep line numbers
 opt-level     = 3
 
 # Optimize our code a little bit.
-[profile.dev.package.jumpy_core]
-codegen-units = 512
-opt-level     = 1
-
 [profile.dev]
 codegen-units = 128
-opt-level     = 1
+opt-level     = 0
 
 [profile.dev-optimized]
 debug     = 1
@@ -131,6 +136,7 @@ lto           = true
 
 [package.metadata.cargo-machete]
 ignored = [
-    "tracing", # Needed to add `release_max_level_debug` feature
-    "getrandom", # Needed to add `js` feature
+  "tracing",   # Needed to add `release_max_level_debug` feature
+  "getrandom", # Needed to add `js` feature
 ]
+
diff --git a/Cross.toml b/Cross.toml
index 1c380ea814..b2221c03cd 100644
--- a/Cross.toml
+++ b/Cross.toml
@@ -1,11 +1,11 @@
 [target.x86_64-unknown-linux-gnu]
 pre-build = [
-    "dpkg --add-architecture $CROSS_DEB_ARCH",
-    "apt-get update && apt-get install -y pkg-config libasound2-dev:$CROSS_DEB_ARCH libudev-dev:$CROSS_DEB_ARCH",
+  "dpkg --add-architecture $CROSS_DEB_ARCH",
+  "apt-get update && apt-get install -y pkg-config libasound2-dev:$CROSS_DEB_ARCH libudev-dev:$CROSS_DEB_ARCH",
 ]
 
 [target.aarch64-unknown-linux-gnu]
 pre-build = [
-    "dpkg --add-architecture $CROSS_DEB_ARCH",
-    "apt-get update && apt-get install -y pkg-config libasound2-dev:$CROSS_DEB_ARCH libudev-dev:$CROSS_DEB_ARCH",
+  "dpkg --add-architecture $CROSS_DEB_ARCH",
+  "apt-get update && apt-get install -y pkg-config libasound2-dev:$CROSS_DEB_ARCH libudev-dev:$CROSS_DEB_ARCH",
 ]
diff --git a/assets/default.core.yaml b/assets/default.core.yaml
deleted file mode 100644
index 73f806fb75..0000000000
--- a/assets/default.core.yaml
+++ /dev/null
@@ -1,77 +0,0 @@
-config:
-  respawn_invincibility_time: 2s
-
-camera:
-  default_height: 448
-  border_right: 300
-  border_left: 300
-  border_top: 50
-  border_bottom: 200
-  player_camera_box_size: [100, 250]
-  min_camera_size: [400, 500]
-  zoom_in_lerp_factor: 0.05
-  zoom_out_lerp_factor: 0.1
-  move_lerp_factor: 0.1
-
-physics:
-  terminal_velocity: 30
-  friction_lerp: 0.85
-  stop_threshold: 1.0
-  gravity: 0.6
-
-players:
-  - /player/skins/fishy/fishy.player.yaml
-  - /player/skins/pescy/pescy.player.yaml
-  - /player/skins/sharky/sharky.player.yaml
-  - /player/skins/orcy/orcy.player.yaml
-
-player_hats:
-  - /player/hats/pirate.hat.yaml
-  - /player/hats/straw.hat.yaml
-
-stable_maps:
-  - /map/levels/level_1.map.yaml
-  - /map/levels/level_2.map.yaml
-  - /map/levels/level_3.map.yaml
-  - /map/levels/level_4.map.yaml
-  - /map/levels/level_5.map.yaml
-  - /map/levels/level_6.map.yaml
-  - /map/levels/level_7.map.yaml
-  - /map/levels/level_8.map.yaml
-  - /map/levels/level_9.map.yaml
-  - /map/levels/level_10.map.yaml
-  - /map/levels/level_11.map.yaml
-  - /map/levels/level_12.map.yaml
-  - /map/levels/level_13.map.yaml
-  - /map/levels/level_14.map.yaml
-
-map_tilesets:
-  - /map/resources/default_tileset.atlas.yaml
-  - /map/resources/ground_rock.atlas.yaml
-  - /map/resources/ground_wood.atlas.yaml
-  - /map/resources/ground_metal.atlas.yaml
-  - /map/resources/ship_decorations.atlas.yaml
-  - /map/resources/coral.atlas.yaml
-
-map_elements:
-  - /elements/decoration/anemones/anemones.element.yaml
-  - /elements/decoration/seaweed/seaweed.element.yaml
-  - /elements/environment/urchin/urchin.element.yaml
-  - /elements/environment/fish_school/fish_school.element.yaml
-  - /elements/environment/crab/crab.element.yaml
-  - /elements/environment/snail/snail.element.yaml
-  - /elements/environment/player_spawner/player_spawner.element.yaml
-  - /elements/environment/sproinger/sproinger.element.yaml
-  - /elements/environment/slippery/slippery.element.yaml
-  - /elements/environment/slippery_seaweed/slippery_seaweed.element.yaml
-  - /elements/item/crate/crate.element.yaml
-  - /elements/item/grenade/grenade.element.yaml
-  - /elements/item/kick_bomb/kick_bomb.element.yaml
-  - /elements/item/mine/mine.element.yaml
-  - /elements/item/musket/musket.element.yaml
-  - /elements/item/stomp_boots/stomp_boots.element.yaml
-  - /elements/item/sword/sword.element.yaml
-  - /elements/item/sniper_rifle/sniper_rifle.element.yaml
-  - /elements/environment/coral_spikes/coral_spikes.element.yaml
-
-experimental_maps: []
diff --git a/assets/default.game.yaml b/assets/default.game.yaml
deleted file mode 100644
index 634d3664ce..0000000000
--- a/assets/default.game.yaml
+++ /dev/null
@@ -1,286 +0,0 @@
-core: default.core.yaml
-
-music:
-  title_screen: music/01 fishycuffs.ogg
-  fight:
-    - music/02 whalecome.ogg
-    - music/03 ahoy!.ogg
-    - music/04 bait the hook.ogg
-    - music/05 fire in the hole.ogg
-    - music/06 fishsticks.ogg
-    - music/07 jolly roger.ogg
-    - music/08 krill or be krilled.ogg
-    - music/09 landlubber.ogg
-  character_screen: music/10 fish bucket.ogg
-  results_screen: music/11 thar she blows!.ogg
-  credits: music/12 all hands hoay!.ogg
-
-
-main_menu:
-  title_font:
-    family: fairfax
-    color: FFFFFF
-    size: 85
-  subtitle_font:
-    family: fairfax
-    color: FFFFFF
-    size: 60
-
-  background_image:
-    image: ui/menu-background.png
-    image_size: [896, 480]
-
-  menu_width: 350
-
-default_settings:
-  matchmaking_server: matchmaker.bones.fishfolk.org:65534
-  player_controls:
-    # Gamepad controls
-    gamepad:
-      movement:
-        up: !SingleAxis
-          axis_type: !Gamepad LeftStickY
-          positive_low: 0.1
-          negative_low: -1.0
-
-        left: !SingleAxis
-          axis_type: !Gamepad LeftStickX
-          positive_low: 1.0
-          negative_low: -0.1
-
-        down: !SingleAxis
-          axis_type: !Gamepad LeftStickY
-          positive_low: 1.0
-          negative_low: -0.1
-
-        right: !SingleAxis
-          axis_type: !Gamepad LeftStickX
-          positive_low: 0.1
-          negative_low: -1.0
-      jump: !GamepadButton South
-      grab: !GamepadButton East
-      shoot: !GamepadButton West
-      slide: !GamepadButton North
-
-    # Controls for the first keyboard player ( left side )
-    keyboard1:
-      movement:
-        up: !Keyboard W
-        down: !Keyboard S
-        left: !Keyboard A
-        right: !Keyboard D
-      jump: !Keyboard Space
-      grab: !Keyboard V
-      shoot: !Keyboard C
-      slide: !Keyboard B
-
-    # Controls for the second keyboard player ( right side )
-    keyboard2:
-      movement:
-        up: !Keyboard Up
-        down: !Keyboard Down
-        left: !Keyboard Left
-        right: !Keyboard Right
-      jump: !Keyboard Comma
-      grab: !Keyboard RShift
-      shoot: !Keyboard Period
-      slide: !Keyboard Slash
-
-ui_theme:
-  scale: 0.60
-  colors:
-    positive: 3EC761
-
-  widgets:
-    border_radius: 1.5
-    default: &default
-      bg_fill: 3A4444
-      bg_stroke: &default-stroke 181425
-      text: FFFFFF
-    hovered:
-      bg_fill: 566363
-      bg_stroke: *default-stroke
-      text: FFFFFF
-    active:
-      bg_fill: 566363
-      bg_stroke: 86809B
-      text: FFFFFF
-    noninteractive:
-      bg_fill: 262B44
-      bg_stroke: 181425
-      text: FFFFFF
-    menu: *default
-  debug_window_fill: 262B44
-
-  font_families:
-    fairfax: ui/FairfaxSM.ttf
-    ark: ui/ark-pixel-16px-latin.ttf
-
-  font_styles:
-    heading:
-      family: ark
-      size: 40
-      color: FFFFFF
-    bigger:
-      family: ark
-      size: 25
-      color: FFFFFF
-    normal:
-      family: ark
-      size: 20
-      color: FFFFFF
-    smaller:
-      family: ark
-      size: 15
-      color: FFFFFF
-
-  editor:
-    icons:
-      elements:
-        image: ui/editor/Object.png
-        image_size: [64, 64]
-      tiles:
-        image: ui/editor/Tile.png
-        image_size: [64, 64]
-      collisions:
-        image: ui/editor/PointerAndMap.png
-        image_size: [64, 64]
-      select:
-        image: ui/editor/Cursor.png
-        image_size: [64, 64]
-
-  hud:
-    font:
-      family: ark
-      size: 15
-      color: FFFFFF
-
-    player_hud_width: 165
-
-    portrait_frame:
-      image: ui/panel.png
-      image_size: [32, 32]
-      border_size:
-        top: 8
-        left: 8
-        right: 8
-        bottom: 8
-
-    lifebar:
-      height: 16
-      background_image:
-        image: ui/lifebar.png
-        image_size: [19, 7]
-        border_size:
-          left: 3
-          right: 3
-          top: 3
-          bottom: 3
-        scale: 2
-      progress_image:
-        image: ui/lifebar-progress.png
-        image_size: [1, 1]
-
-  panel:
-    font_color: FFFFFF
-    padding:
-      top: 25
-      bottom: 25
-      left: 25
-      right: 25
-    border:
-      image: ui/panel.png
-      image_size: [38, 34]
-      border_size:
-        top: 11
-        bottom: 11
-        left: 12
-        right: 21
-      scale: 4
-
-  button_styles:
-    normal:
-      font:
-        family: ark
-        color: FFFFFF
-        size: 20
-      padding:
-        top: 6
-        left: 6
-        right: 6
-        bottom: 9
-      borders:
-        default:
-          image: ui/button.png
-          image_size: [14, 14]
-          border_size:
-            top: 5
-            bottom: 5
-            right: 5
-            left: 5
-          scale: 2
-        focused:
-          image: ui/button-focused.png
-          image_size: [14, 14]
-          border_size:
-            top: 5
-            bottom: 5
-            right: 5
-            left: 5
-          scale: 2
-        clicked:
-          image: ui/button-down.png
-          image_size: [14, 14]
-          border_size:
-            top: 5
-            bottom: 5
-            right: 5
-            left: 5
-          scale: 2
-
-    small:
-      font:
-        family: ark
-        color: FFFFFF
-        size: 17
-      padding:
-        top: 4
-        left: 4
-        right: 4
-        bottom: 6
-      borders:
-        default:
-          image: ui/button.png
-          image_size: [14, 14]
-          border_size:
-            top: 5
-            bottom: 5
-            right: 5
-            left: 5
-          scale: 2
-        focused:
-          image: ui/button-focused.png
-          image_size: [14, 14]
-          border_size:
-            top: 5
-            bottom: 5
-            right: 5
-            left: 5
-          scale: 2
-        clicked:
-          image: ui/button-down.png
-          image_size: [14, 14]
-          border_size:
-            top: 5
-            bottom: 5
-            right: 5
-            left: 5
-          scale: 2
-
-translations:
-  # This is the locale that we will fallback to if the selected locale doesn't have
-  # translation for a certain message.
-  default_locale: en-US
-  locales:
-    - locales/en-US/en-US.ftl.yml
-    - locales/fr-FR/fr-FR.ftl.yml
diff --git a/assets/elements/decoration/223883063-0b0fee8b-856e-456f-aac8-70c95a526885.png b/assets/elements/decoration/223883063-0b0fee8b-856e-456f-aac8-70c95a526885.png
deleted file mode 100644
index a65571f1e7..0000000000
Binary files a/assets/elements/decoration/223883063-0b0fee8b-856e-456f-aac8-70c95a526885.png and /dev/null differ
diff --git a/assets/elements/decoration/anemones/anemones.element.yaml b/assets/elements/decoration/anemones/anemones.element.yaml
index fab998cb0f..fa4f875350 100644
--- a/assets/elements/decoration/anemones/anemones.element.yaml
+++ b/assets/elements/decoration/anemones/anemones.element.yaml
@@ -4,8 +4,4 @@ editor:
   grab_size: [48, 27]
   grab_offset: [0, -12]
   show_name: false
-builtin: !AnimatedDecoration
-  start_frame: 0
-  end_frame: 4
-  fps: 6
-  atlas: ./anemones.atlas.yaml
\ No newline at end of file
+data: animated_decoration.yaml
diff --git a/assets/elements/decoration/anemones/animated_decoration.yaml b/assets/elements/decoration/anemones/animated_decoration.yaml
new file mode 100644
index 0000000000..32afae1a5a
--- /dev/null
+++ b/assets/elements/decoration/anemones/animated_decoration.yaml
@@ -0,0 +1,4 @@
+start_frame: 0
+end_frame: 4
+fps: 6
+atlas: ./anemones.atlas.yaml
diff --git a/assets/elements/decoration/seaweed/animated_decoration.yaml b/assets/elements/decoration/seaweed/animated_decoration.yaml
new file mode 100644
index 0000000000..02ff619458
--- /dev/null
+++ b/assets/elements/decoration/seaweed/animated_decoration.yaml
@@ -0,0 +1,4 @@
+start_frame: 0
+end_frame: 4
+fps: 6
+atlas: ./seaweed.atlas.yaml
diff --git a/assets/elements/decoration/seaweed/seaweed.element.yaml b/assets/elements/decoration/seaweed/seaweed.element.yaml
index dc5bc9a9df..b64c0e6d85 100644
--- a/assets/elements/decoration/seaweed/seaweed.element.yaml
+++ b/assets/elements/decoration/seaweed/seaweed.element.yaml
@@ -3,8 +3,4 @@ category: Decorations
 editor:
   grab_size: [40, 51]
   show_name: false
-builtin: !AnimatedDecoration
-  start_frame: 0
-  end_frame: 4
-  fps: 6
-  atlas: ./seaweed.atlas.yaml
+data: animated_decoration.yaml
diff --git a/assets/elements/environment/coral_spikes/coral_spikes.element.yaml b/assets/elements/environment/coral_spikes/coral_spikes.element.yaml
index 6309261ca5..2c30f0d0b6 100644
--- a/assets/elements/environment/coral_spikes/coral_spikes.element.yaml
+++ b/assets/elements/environment/coral_spikes/coral_spikes.element.yaml
@@ -4,9 +4,4 @@ editor:
   grab_size: [70, 50]
   grab_offset: [0, 0]
   show_name: false
-builtin: !Spike
-  atlas: ./coral_spikes.atlas.yaml
-  body_size: [45, 25]
-  start_frame: 0
-  end_frame: 5
-  fps: 12
+data: spike.yaml
diff --git a/assets/elements/environment/coral_spikes/spike.yaml b/assets/elements/environment/coral_spikes/spike.yaml
new file mode 100644
index 0000000000..6a1aaa5135
--- /dev/null
+++ b/assets/elements/environment/coral_spikes/spike.yaml
@@ -0,0 +1,5 @@
+atlas: ./coral_spikes.atlas.yaml
+body_size: [45, 25]
+start_frame: 0
+end_frame: 5
+fps: 12
diff --git a/assets/elements/environment/crab/crab.element.yaml b/assets/elements/environment/crab/crab.element.yaml
index 18137212fc..cc73bce0db 100644
--- a/assets/elements/environment/crab/crab.element.yaml
+++ b/assets/elements/environment/crab/crab.element.yaml
@@ -2,17 +2,4 @@ name: Crab
 category: Critters
 editor:
   grab_size: [20, 15]
-builtin: !Crab
-  atlas: ./crab.atlas.yaml
-  body_size: [17, 12]
-  walk_frames: [0, 1]
-  spawn_frames: [3, 3, 3, 3, 4, 5, 6, 7]
-  comfortable_spawn_distance: 25.0
-  comfortable_scared_distance: 100.0
-  uncomfortable_respawn_time: 15s
-  same_level_threshold: 50.0
-  walk_speed: 0.5
-  run_speed: 2.5
-  fps: 6
-  # around about 2.5 seconds (45 fix updates per second)
-  timer_delay_max: 113
+data: crab.yaml
diff --git a/assets/elements/environment/crab/crab.yaml b/assets/elements/environment/crab/crab.yaml
new file mode 100644
index 0000000000..80c349c152
--- /dev/null
+++ b/assets/elements/environment/crab/crab.yaml
@@ -0,0 +1,13 @@
+atlas: ./crab.atlas.yaml
+body_size: [17, 12]
+walk_frames: [0, 1]
+spawn_frames: [3, 3, 3, 3, 4, 5, 6, 7]
+comfortable_spawn_distance: 25.0
+comfortable_scared_distance: 100.0
+uncomfortable_respawn_time: 15s
+same_level_threshold: 50.0
+walk_speed: 0.5
+run_speed: 2.5
+fps: 6
+# around about 2.5 seconds (45 fix updates per second)
+timer_delay_max: 113
diff --git a/assets/elements/environment/fish_school/fish_school.element.yaml b/assets/elements/environment/fish_school/fish_school.element.yaml
index aab4170f9a..b9c8f8cbe6 100644
--- a/assets/elements/environment/fish_school/fish_school.element.yaml
+++ b/assets/elements/environment/fish_school/fish_school.element.yaml
@@ -2,16 +2,4 @@ name: Fish School
 category: Critters
 editor:
   grab_size: [50, 50]
-builtin: !FishSchool
-  kinds: [
-    "ArabianAngelfish.atlas.yaml",
-    "BandedButterflyFish.atlas.yaml",
-    "BlueGreenChromis.atlas.yaml",
-    "BlueTang.atlas.yaml",
-    "RoyalGramma.atlas.yaml"
-    ]
-  base_count: 3
-  count_variation: 2
-  spawn_range: 64
-  school_size: 100
-  flee_range: 15.0
\ No newline at end of file
+data: fish_school.yaml
diff --git a/assets/elements/environment/fish_school/fish_school.yaml b/assets/elements/environment/fish_school/fish_school.yaml
new file mode 100644
index 0000000000..5473f2c7c4
--- /dev/null
+++ b/assets/elements/environment/fish_school/fish_school.yaml
@@ -0,0 +1,12 @@
+kinds: [
+  "ArabianAngelfish.atlas.yaml",
+  "BandedButterflyFish.atlas.yaml",
+  "BlueGreenChromis.atlas.yaml",
+  "BlueTang.atlas.yaml",
+  "RoyalGramma.atlas.yaml"
+  ]
+base_count: 3
+count_variation: 2
+spawn_range: 64
+school_size: 100
+flee_range: 15.0
diff --git a/assets/elements/environment/player_spawner/player_spawner.element.yaml b/assets/elements/environment/player_spawner/player_spawner.element.yaml
index e4a7bcfebd..16297821d7 100644
--- a/assets/elements/environment/player_spawner/player_spawner.element.yaml
+++ b/assets/elements/environment/player_spawner/player_spawner.element.yaml
@@ -2,4 +2,4 @@ name: Player Spawner
 category: Map
 editor:
   grab_size: [32, 48]
-builtin: !PlayerSpawner
+data: player_spawner.yaml
diff --git a/assets/elements/environment/player_spawner/player_spawner.yaml b/assets/elements/environment/player_spawner/player_spawner.yaml
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/assets/elements/environment/player_spawner/player_spawner.yaml
@@ -0,0 +1 @@
+{}
diff --git a/assets/elements/environment/slippery/slippery.element.yaml b/assets/elements/environment/slippery/slippery.element.yaml
index 03c442ac4b..97aa384faa 100644
--- a/assets/elements/environment/slippery/slippery.element.yaml
+++ b/assets/elements/environment/slippery/slippery.element.yaml
@@ -3,8 +3,4 @@ category: Gameplay
 editor:
   grab_size: [33, 10]
   show_name: false
-builtin: !Slippery
-  atlas: ./slippery.atlas.yaml
-  body_size: [33, 18]
-  player_slide: 4
-  body_friction: 0.95
+data: slippery.yaml
diff --git a/assets/elements/environment/slippery/slippery.yaml b/assets/elements/environment/slippery/slippery.yaml
new file mode 100644
index 0000000000..5fa046ffe9
--- /dev/null
+++ b/assets/elements/environment/slippery/slippery.yaml
@@ -0,0 +1,4 @@
+atlas: ./slippery.atlas.yaml
+body_size: [33, 18]
+player_slide: 4
+body_friction: 0.95
diff --git a/assets/elements/environment/slippery_seaweed/slippery_seaweed.element.yaml b/assets/elements/environment/slippery_seaweed/slippery_seaweed.element.yaml
index cbdfb55417..ec08eeaece 100644
--- a/assets/elements/environment/slippery_seaweed/slippery_seaweed.element.yaml
+++ b/assets/elements/environment/slippery_seaweed/slippery_seaweed.element.yaml
@@ -3,9 +3,4 @@ category: Gameplay
 editor:
   grab_size: [40, 51]
   show_name: false
-builtin: !SlipperySeaweed
-  atlas: ./slippery_seaweed.atlas.yaml
-  body_size: [8, 8]
-  start_frame: 0
-  end_frame: 4
-  fps: 6
+data: slippery_seaweed.yaml
diff --git a/assets/elements/environment/slippery_seaweed/slippery_seaweed.yaml b/assets/elements/environment/slippery_seaweed/slippery_seaweed.yaml
new file mode 100644
index 0000000000..b530296dce
--- /dev/null
+++ b/assets/elements/environment/slippery_seaweed/slippery_seaweed.yaml
@@ -0,0 +1,5 @@
+atlas: ./slippery_seaweed.atlas.yaml
+body_size: [8, 8]
+start_frame: 0
+end_frame: 4
+fps: 6
diff --git a/assets/elements/environment/snail/snail.element.yaml b/assets/elements/environment/snail/snail.element.yaml
index 82654cc678..6454684124 100644
--- a/assets/elements/environment/snail/snail.element.yaml
+++ b/assets/elements/environment/snail/snail.element.yaml
@@ -2,14 +2,4 @@ name: Snail
 category: Critters
 editor:
   grab_size: [12, 10]
-builtin: !Snail
-  atlas: ./snail.atlas.yaml
-  fps: 6
-  body_diameter: 10
-  bounciness: 0.6
-  gravity: 0.5
-  hit_speed: 6.0
-  hide_time: 3.0
-  crawl_frames: [3, 0, 1, 2, 1, 0]
-  move_frame_indexes: [1, 2, 3]
-  hide_frames: [0, 4, 5]
+data: snail.yaml
diff --git a/assets/elements/environment/snail/snail.yaml b/assets/elements/environment/snail/snail.yaml
new file mode 100644
index 0000000000..95e34f33ae
--- /dev/null
+++ b/assets/elements/environment/snail/snail.yaml
@@ -0,0 +1,10 @@
+atlas: ./snail.atlas.yaml
+fps: 6
+body_diameter: 10
+bounciness: 0.6
+gravity: 0.5
+hit_speed: 6.0
+hide_time: 3.0
+crawl_frames: [3, 0, 1, 2, 1, 0]
+move_frame_indexes: [1, 2, 3]
+hide_frames: [0, 4, 5]
diff --git a/assets/elements/environment/sproinger/sproinger.element.yaml b/assets/elements/environment/sproinger/sproinger.element.yaml
index 6e7d77209d..9e478dbbda 100644
--- a/assets/elements/environment/sproinger/sproinger.element.yaml
+++ b/assets/elements/environment/sproinger/sproinger.element.yaml
@@ -4,9 +4,4 @@ editor:
   grab_size: [30, 10]
   grab_offset: [0, -5]
   show_name: false
-builtin: !Sproinger
-  atlas: ./sproinger.atlas.yaml
-  sound: ./jump.ogg
-  sound_volume: 0.1
-  body_size: [8, 8]
-  spring_velocity: 16
+data: sproinger.yaml
diff --git a/assets/elements/environment/sproinger/sproinger.yaml b/assets/elements/environment/sproinger/sproinger.yaml
new file mode 100644
index 0000000000..11affb327a
--- /dev/null
+++ b/assets/elements/environment/sproinger/sproinger.yaml
@@ -0,0 +1,5 @@
+atlas: ./sproinger.atlas.yaml
+sound: ./jump.ogg
+sound_volume: 0.1
+body_size: [8, 8]
+spring_velocity: 16
diff --git a/assets/elements/environment/urchin/urchin.element.yaml b/assets/elements/environment/urchin/urchin.element.yaml
index 0b41b90d61..e40cdbaac0 100644
--- a/assets/elements/environment/urchin/urchin.element.yaml
+++ b/assets/elements/environment/urchin/urchin.element.yaml
@@ -2,10 +2,4 @@ name: Urchin
 category: Decorations
 editor:
   grab_size: [20, 15]
-builtin: !Urchin
-  image: ./urchin.png
-  body_diameter: 8.0
-  bounciness: 0.6
-  spin: 0.0
-  gravity: 0.3
-  hit_speed: 6.0
\ No newline at end of file
+data: urchin.yaml
diff --git a/assets/elements/environment/urchin/urchin.yaml b/assets/elements/environment/urchin/urchin.yaml
new file mode 100644
index 0000000000..4b46f00053
--- /dev/null
+++ b/assets/elements/environment/urchin/urchin.yaml
@@ -0,0 +1,6 @@
+image: ./urchin.png
+body_diameter: 8.0
+bounciness: 0.6
+spin: 0.0
+gravity: 0.3
+hit_speed: 6.0
diff --git a/assets/elements/item/crate/crate.element.yaml b/assets/elements/item/crate/crate.element.yaml
index 2cb452b108..e7a9e44065 100644
--- a/assets/elements/item/crate/crate.element.yaml
+++ b/assets/elements/item/crate/crate.element.yaml
@@ -1,26 +1,4 @@
 name: Crate
 category: Weapons
-builtin: !Crate
-  throw_velocity: 10
-
-  atlas: ./crate.atlas.yaml
-
-  breaking_atlas: ./crate_breaking.atlas.yaml
-  breaking_anim_frames: 25
-  breaking_anim_fps: 30
-  crate_break_state_1: 0
-  crate_break_state_2: 1
-
-  # TODO: Better break sound
-  break_sound: ./fuse.ogg
-  break_sound_volume: 0.1
-
-  bounce_sound: ./land.ogg
-  bounce_sound_volume: 0.035
-
-  body_size: [36, 30]
-  grab_offset: [14, -2]
-  break_timeout: 4s
-  bounciness: 0.5
-  fin_anim: grab_2
+data: crate.yaml
 
diff --git a/assets/elements/item/crate/crate.yaml b/assets/elements/item/crate/crate.yaml
new file mode 100644
index 0000000000..63863f2370
--- /dev/null
+++ b/assets/elements/item/crate/crate.yaml
@@ -0,0 +1,22 @@
+throw_velocity: 10
+
+atlas: ./crate.atlas.yaml
+
+breaking_atlas: ./crate_breaking.atlas.yaml
+breaking_anim_frames: 25
+breaking_anim_fps: 30
+crate_break_state_1: 0
+crate_break_state_2: 1
+
+# TODO: Better break sound
+break_sound: ./fuse.ogg
+break_sound_volume: 0.1
+
+bounce_sound: ./land.ogg
+bounce_sound_volume: 0.035
+
+body_size: [36, 30]
+grab_offset: [14, -2]
+break_timeout: 4s
+bounciness: 0.5
+fin_anim: grab_2
diff --git a/assets/elements/item/grenade/grenade.element.yaml b/assets/elements/item/grenade/grenade.element.yaml
index 8dba4163ed..0e6fac210a 100644
--- a/assets/elements/item/grenade/grenade.element.yaml
+++ b/assets/elements/item/grenade/grenade.element.yaml
@@ -2,27 +2,4 @@ name: Grenade
 category: Weapons
 editor:
   grab_size: [30, 30]
-builtin: !Grenade
-  fuse_time: 4.0
-  throw_velocity: 12
-  damage_region_size: [60, 60]
-  damage_region_lifetime: 0.6
-
-  atlas: ./grenade.atlas.yaml
-
-  explosion_atlas: ./explosion.atlas.yaml
-  explosion_lifetime: 1.0
-  explosion_frames: 12
-  explosion_fps: 8
-  explosion_volume: 0.1
-  explosion_sound: ./explosion.ogg
-
-  fuse_sound_volume: 0.1
-  fuse_sound: ./fuse.ogg
-
-  body_diameter: 15
-  grab_offset: [0, -6]
-  fin_anim: grab_2
-  can_rotate: true
-  bounciness: 0.6
-  angular_velocity: 0.1
+data: grenade.yaml
diff --git a/assets/elements/item/grenade/grenade.yaml b/assets/elements/item/grenade/grenade.yaml
new file mode 100644
index 0000000000..a2ef283efd
--- /dev/null
+++ b/assets/elements/item/grenade/grenade.yaml
@@ -0,0 +1,23 @@
+fuse_time: 4.0
+throw_velocity: 12
+damage_region_size: [60, 60]
+damage_region_lifetime: 0.6
+
+atlas: ./grenade.atlas.yaml
+
+explosion_atlas: ./explosion.atlas.yaml
+explosion_lifetime: 1.0
+explosion_frames: 12
+explosion_fps: 8
+explosion_volume: 0.1
+explosion_sound: ./explosion.ogg
+
+fuse_sound_volume: 0.1
+fuse_sound: ./fuse.ogg
+
+body_diameter: 15
+grab_offset: [0, -6]
+fin_anim: grab_2
+can_rotate: true
+bounciness: 0.6
+angular_velocity: 0.1
diff --git a/assets/elements/item/kick_bomb/kick_bomb.element.yaml b/assets/elements/item/kick_bomb/kick_bomb.element.yaml
index 91f682f845..954f08d0b4 100644
--- a/assets/elements/item/kick_bomb/kick_bomb.element.yaml
+++ b/assets/elements/item/kick_bomb/kick_bomb.element.yaml
@@ -1,29 +1,3 @@
 name: Kick Bomb
 category: Weapons
-builtin: !KickBomb
-  fuse_time: 8s
-  kick_velocity: [10, 6]
-  throw_velocity: 10
-  damage_region_size: [60, 60]
-  damage_region_lifetime: 0.6
-
-  atlas: ./kick_bomb.atlas.yaml
-
-  explosion_atlas: ./explosion.atlas.yaml
-  explosion_lifetime: 1.0
-  explosion_frames: 12
-  explosion_fps: 8
-  explosion_sound: ./explosion.ogg
-  explosion_volume: 0.1
-
-  fuse_sound_volume: 0.1
-  fuse_sound: ./fuse.ogg
-
-  body_diameter: 26
-  grab_offset: [5, -2]
-  fin_anim: grab_2
-  can_rotate: true
-  bounciness: 0.6
-  angular_velocity: 0.1
-  # arm_delay: 0.02
-  arm_delay: 500ms
+data: kick_bomb.yaml
diff --git a/assets/elements/item/kick_bomb/kick_bomb.yaml b/assets/elements/item/kick_bomb/kick_bomb.yaml
new file mode 100644
index 0000000000..d346b183e9
--- /dev/null
+++ b/assets/elements/item/kick_bomb/kick_bomb.yaml
@@ -0,0 +1,26 @@
+fuse_time: 8s
+kick_velocity: [10, 6]
+throw_velocity: 10
+damage_region_size: [60, 60]
+damage_region_lifetime: 0.6
+
+atlas: ./kick_bomb.atlas.yaml
+
+explosion_atlas: ./explosion.atlas.yaml
+explosion_lifetime: 1.0
+explosion_frames: 12
+explosion_fps: 8
+explosion_sound: ./explosion.ogg
+explosion_volume: 0.1
+
+fuse_sound_volume: 0.1
+fuse_sound: ./fuse.ogg
+
+body_diameter: 26
+grab_offset: [5, -2]
+fin_anim: grab_2
+can_rotate: true
+bounciness: 0.6
+angular_velocity: 0.1
+# arm_delay: 0.02
+arm_delay: 500ms
diff --git a/assets/elements/item/mine/mine.element.yaml b/assets/elements/item/mine/mine.element.yaml
index 6201317bd6..eebcaf1f62 100644
--- a/assets/elements/item/mine/mine.element.yaml
+++ b/assets/elements/item/mine/mine.element.yaml
@@ -1,26 +1,3 @@
 name: Mine
 category: Weapons
-builtin: !Mine
-  damage_region_size: [60, 60]
-  damage_region_lifetime: 0.6
-  arm_delay: 0.5
-  throw_velocity: 9
-
-  atlas: ./mine.atlas.yaml
-
-  explosion_atlas: ./explosion.atlas.yaml
-  explosion_lifetime: 1.0
-  explosion_frames: 12
-  explosion_fps: 8
-  explosion_volume: 0.1
-  explosion_sound: ./explosion.ogg
-
-  armed_frames: 12
-  armed_fps: 15
-  arm_sound_volume: 0.1
-  arm_sound: ./arm.ogg
-
-  body_size: [34, 34]
-  grab_offset: [14, -2]
-  fin_anim: grab_2
-  bounciness: 0.3
\ No newline at end of file
+data: mine.yaml
diff --git a/assets/elements/item/mine/mine.yaml b/assets/elements/item/mine/mine.yaml
new file mode 100644
index 0000000000..d244d79f4e
--- /dev/null
+++ b/assets/elements/item/mine/mine.yaml
@@ -0,0 +1,23 @@
+damage_region_size: [60, 60]
+damage_region_lifetime: 0.6
+arm_delay: 0.5
+throw_velocity: 9
+
+atlas: ./mine.atlas.yaml
+
+explosion_atlas: ./explosion.atlas.yaml
+explosion_lifetime: 1.0
+explosion_frames: 12
+explosion_fps: 8
+explosion_volume: 0.1
+explosion_sound: ./explosion.ogg
+
+armed_frames: 12
+armed_fps: 15
+arm_sound_volume: 0.1
+arm_sound: ./arm.ogg
+
+body_size: [34, 34]
+grab_offset: [14, -2]
+fin_anim: grab_2
+bounciness: 0.3
diff --git a/assets/elements/item/musket/musket.element.yaml b/assets/elements/item/musket/musket.element.yaml
index 4a0b53e280..37186f05d6 100644
--- a/assets/elements/item/musket/musket.element.yaml
+++ b/assets/elements/item/musket/musket.element.yaml
@@ -1,26 +1,3 @@
 name: Musket
 category: Weapons
-builtin: !Musket
-  atlas: ./musket.atlas.yaml
-
-  max_ammo: 4
-  cooldown: 600ms
-  bullet_meta: ./bullet/musket.bullet.yaml
-
-  shoot_fps: 15
-  shoot_frames: 3
-  shoot_lifetime: 0.2
-  shoot_sound_volume: 0.1
-  shoot_sound: ./shoot/shoot.ogg
-  empty_shoot_sound_volume: 0.1
-  empty_shoot_sound: ./shoot/gun_empty.ogg
-  shoot_atlas: ./shoot/musket_shoot.atlas.yaml
-
-  bounciness: 0.3
-  can_rotate: true
-  body_size: [32, 8]
-  fin_anim: grab_2
-  angular_velocity: 0.1
-  throw_velocity: 6
-  grab_offset: [23, 0]
-  kickback: 0
+data: musket.yaml
diff --git a/assets/elements/item/musket/musket.yaml b/assets/elements/item/musket/musket.yaml
new file mode 100644
index 0000000000..3ad54b8fa5
--- /dev/null
+++ b/assets/elements/item/musket/musket.yaml
@@ -0,0 +1,23 @@
+atlas: ./musket.atlas.yaml
+
+max_ammo: 4
+cooldown: 600ms
+bullet_meta: ./bullet/musket.bullet.yaml
+
+shoot_fps: 15
+shoot_frames: 3
+shoot_lifetime: 0.2
+shoot_sound_volume: 0.1
+shoot_sound: ./shoot/shoot.ogg
+empty_shoot_sound_volume: 0.1
+empty_shoot_sound: ./shoot/gun_empty.ogg
+shoot_atlas: ./shoot/musket_shoot.atlas.yaml
+
+bounciness: 0.3
+can_rotate: true
+body_size: [32, 8]
+fin_anim: grab_2
+angular_velocity: 0.1
+throw_velocity: 6
+grab_offset: [23, 0]
+kickback: 0
diff --git a/assets/elements/item/sniper_rifle/musket.yaml b/assets/elements/item/sniper_rifle/musket.yaml
new file mode 100644
index 0000000000..abcda7f93a
--- /dev/null
+++ b/assets/elements/item/sniper_rifle/musket.yaml
@@ -0,0 +1,23 @@
+atlas: ./sniper_rifle.atlas.yaml
+
+max_ammo: 2
+cooldown: 300ms
+bullet_meta: ./bullet/sniper.bullet.yaml
+
+shoot_fps: 15
+shoot_frames: 3
+shoot_lifetime: 0.1
+shoot_sound_volume: 0.1
+shoot_sound: ./shoot/shoot.ogg
+empty_shoot_sound_volume: 0.1
+empty_shoot_sound: ./shoot/gun_empty.ogg
+shoot_atlas: ./shoot/sniper_shoot.atlas.yaml
+
+bounciness: 0.3
+can_rotate: true
+body_size: [32, 8]
+fin_anim: grab_2
+angular_velocity: 0.1
+throw_velocity: 6
+grab_offset: [23, 0]
+kickback: 15
diff --git a/assets/elements/item/sniper_rifle/sniper_rifle.element.yaml b/assets/elements/item/sniper_rifle/sniper_rifle.element.yaml
index 15ac035822..d25fcb32d5 100644
--- a/assets/elements/item/sniper_rifle/sniper_rifle.element.yaml
+++ b/assets/elements/item/sniper_rifle/sniper_rifle.element.yaml
@@ -1,26 +1,3 @@
 name: Sniper Rifle
 category: Weapons
-builtin: !Musket
-  atlas: ./sniper_rifle.atlas.yaml
-
-  max_ammo: 2
-  cooldown: 300ms
-  bullet_meta: ./bullet/sniper.bullet.yaml
-
-  shoot_fps: 15
-  shoot_frames: 3
-  shoot_lifetime: 0.1
-  shoot_sound_volume: 0.1
-  shoot_sound: ./shoot/shoot.ogg
-  empty_shoot_sound_volume: 0.1
-  empty_shoot_sound: ./shoot/gun_empty.ogg
-  shoot_atlas: ./shoot/sniper_shoot.atlas.yaml
-
-  bounciness: 0.3
-  can_rotate: true
-  body_size: [32, 8]
-  fin_anim: grab_2
-  angular_velocity: 0.1
-  throw_velocity: 6
-  grab_offset: [23, 0]
-  kickback: 15
+data: musket.yaml
diff --git a/assets/elements/item/stomp_boots/stomp_boots.element.yaml b/assets/elements/item/stomp_boots/stomp_boots.element.yaml
index bc19a2bcbd..f3a243840f 100644
--- a/assets/elements/item/stomp_boots/stomp_boots.element.yaml
+++ b/assets/elements/item/stomp_boots/stomp_boots.element.yaml
@@ -1,8 +1,3 @@
 name: Stomp Boots
 category: Weapons
-builtin: !StompBoots
-  map_icon: ./stomp_boots_icon.atlas.yaml
-  player_decoration: ./stomp_boots.atlas.yaml
-  
-  body_size: [32, 18]
-  grab_offset: [-8, -4]
\ No newline at end of file
+data: stomp_boots.yaml
diff --git a/assets/elements/item/stomp_boots/stomp_boots.yaml b/assets/elements/item/stomp_boots/stomp_boots.yaml
new file mode 100644
index 0000000000..028982091c
--- /dev/null
+++ b/assets/elements/item/stomp_boots/stomp_boots.yaml
@@ -0,0 +1,5 @@
+map_icon: ./stomp_boots_icon.atlas.yaml
+player_decoration: ./stomp_boots.atlas.yaml
+
+body_size: [32, 18]
+grab_offset: [-8, -4]
diff --git a/assets/elements/item/sword/sword.element.yaml b/assets/elements/item/sword/sword.element.yaml
index e8abeab79a..0ad22ab606 100644
--- a/assets/elements/item/sword/sword.element.yaml
+++ b/assets/elements/item/sword/sword.element.yaml
@@ -2,17 +2,4 @@ name: Sword
 category: Weapons
 editor:
   grab_size: [70, 20]
-builtin: !Sword
-  atlas: ./sword.atlas.yaml
-  sound: ./sword.ogg
-  sound_volume: 0.05
-  fin_anim: grab_2
-  grab_offset: [18, 26]
-  body_size: [50, 8]
-  # The minimum speed the sword must be moving to kill somebody
-  killing_speed: 7.0
-  angular_velocity: -0.04
-  can_rotate: true
-  bounciness: 0.32
-  throw_velocity: 9
-  cooldown_frames: 22
+data: sword.yaml
diff --git a/assets/elements/item/sword/sword.yaml b/assets/elements/item/sword/sword.yaml
new file mode 100644
index 0000000000..3ba4a28ab9
--- /dev/null
+++ b/assets/elements/item/sword/sword.yaml
@@ -0,0 +1,13 @@
+atlas: ./sword.atlas.yaml
+sound: ./sword.ogg
+sound_volume: 0.05
+fin_anim: grab_2
+grab_offset: [18, 26]
+body_size: [50, 8]
+# The minimum speed the sword must be moving to kill somebody
+killing_speed: 7.0
+angular_velocity: -0.04
+can_rotate: true
+bounciness: 0.32
+throw_velocity: 9
+cooldown_frames: 22
diff --git a/assets/game.yaml b/assets/game.yaml
new file mode 100644
index 0000000000..245bd2471d
--- /dev/null
+++ b/assets/game.yaml
@@ -0,0 +1,321 @@
+# music:
+#   title_screen: music/01 fishycuffs.ogg
+#   fight:
+#     - music/02 whalecome.ogg
+#     - music/03 ahoy!.ogg
+#     - music/04 bait the hook.ogg
+#     - music/05 fire in the hole.ogg
+#     - music/06 fishsticks.ogg
+#     - music/07 jolly roger.ogg
+#     - music/08 krill or be krilled.ogg
+#     - music/09 landlubber.ogg
+#   character_screen: music/10 fish bucket.ogg
+#   results_screen: music/11 thar she blows!.ogg
+#   credits: music/12 all hands hoay!.ogg
+
+
+main_menu:
+  title_font:
+    family: Fairfax SM
+    color: FFFFFF
+    size: 85
+  subtitle_font:
+    family: Fairfax SM
+    color: FFFFFF
+    size: 60
+
+  background_image:
+    image: ui/menu-background.png
+    image_size: [896, 480]
+
+  menu_width: 350
+
+default_settings:
+  matchmaking_server: matchmaker.bones.fishfolk.org:65534
+  player_controls:
+    # Gamepad controls
+    gamepad:
+      movement:
+        up: !AxisPositive LeftStickY
+        left: !AxisNegative LeftStickX
+        down: !AxisNegative LeftStickY
+        right: !AxisPositive LeftStickX
+      jump: !Button South
+      grab: !Button East
+      shoot: !Button West
+      slide: !Button North
+      pause: !Button Start
+      menu_back: !Button East
+      menu_start: !Button Start
+      menu_confirm: !Button South
+
+    # Controls for the first keyboard player ( left side )
+    keyboard1:
+      movement:
+        up: !Keyboard W
+        down: !Keyboard S
+        left: !Keyboard A
+        right: !Keyboard D
+      jump: !Keyboard Space
+      grab: !Keyboard V
+      shoot: !Keyboard C
+      slide: !Keyboard B
+      pause: !Keyboard Escape
+      menu_back: !Keyboard Escape
+      menu_start: !Keyboard Return
+      menu_confirm: !Keyboard Space
+
+    # Controls for the second keyboard player ( right side )
+    keyboard2:
+      movement:
+        up: !Keyboard Up
+        down: !Keyboard Down
+        left: !Keyboard Left
+        right: !Keyboard Right
+      jump: !Keyboard Comma
+      grab: !Keyboard ShiftRight
+      shoot: !Keyboard Period
+      slide: !Keyboard Slash
+      menu_confirm: !Keyboard Comma
+      menu_back: !Keyboard ShiftRight
+
+localization: locales/localization.yaml
+
+theme:
+  scale: 1.00
+  colors:
+    positive: 3EC761
+
+  widgets:
+    border_radius: 1.5
+    default: &default
+      bg_fill: 3A4444
+      bg_stroke: &default-stroke 181425
+      text: FFFFFF
+    hovered:
+      bg_fill: 566363
+      bg_stroke: *default-stroke
+      text: FFFFFF
+    active:
+      bg_fill: 566363
+      bg_stroke: 86809B
+      text: FFFFFF
+    noninteractive:
+      bg_fill: 262B44
+      bg_stroke: 181425
+      text: FFFFFF
+    menu: *default
+    window_fill: 262B44
+
+  fonts:
+    - ui/FairfaxSM.ttf
+    - ui/ark-pixel-16px-latin.ttf
+
+  font_styles:
+    heading:
+      family: Ark Pixel 16px latin
+      size: 40
+      color: FFFFFF
+    bigger:
+      family: Ark Pixel 16px latin
+      size: 25
+      color: FFFFFF
+    normal:
+      family: Ark Pixel 16px latin
+      size: 20
+      color: FFFFFF
+    smaller:
+      family: Ark Pixel 16px latin
+      size: 15
+      color: FFFFFF
+
+  editor:
+    icons:
+      elements:
+        image: ui/editor/Object.png
+        image_size: [64, 64]
+      tiles:
+        image: ui/editor/Tile.png
+        image_size: [64, 64]
+      collisions:
+        image: ui/editor/PointerAndMap.png
+        image_size: [64, 64]
+      select:
+        image: ui/editor/Cursor.png
+        image_size: [64, 64]
+
+  panel:
+    font_color: FFFFFF
+    padding:
+      top: 25
+      bottom: 25
+      left: 25
+      right: 25
+    border:
+      image: ui/panel.png
+      image_size: [38, 34]
+      border_size:
+        top: 11
+        bottom: 11
+        left: 12
+        right: 21
+      scale: 4
+
+  buttons:
+    normal:
+      font:
+        family: Ark Pixel 16px latin
+        color: FFFFFF
+        size: 20
+      padding:
+        top: 6
+        left: 6
+        right: 6
+        bottom: 9
+      borders:
+        default:
+          image: ui/button.png
+          image_size: [14, 14]
+          border_size:
+            top: 5
+            bottom: 5
+            right: 5
+            left: 5
+          scale: 2
+        focused:
+          image: ui/button-focused.png
+          image_size: [14, 14]
+          border_size:
+            top: 5
+            bottom: 5
+            right: 5
+            left: 5
+          scale: 2
+        clicked:
+          image: ui/button-down.png
+          image_size: [14, 14]
+          border_size:
+            top: 5
+            bottom: 5
+            right: 5
+            left: 5
+          scale: 2
+
+    small:
+      font:
+        family: Ark Pixel 16px latin
+        color: FFFFFF
+        size: 17
+      padding:
+        top: 4
+        left: 4
+        right: 4
+        bottom: 6
+      borders:
+        default:
+          image: ui/button.png
+          image_size: [14, 14]
+          border_size:
+            top: 5
+            bottom: 5
+            right: 5
+            left: 5
+          scale: 2
+        focused:
+          image: ui/button-focused.png
+          image_size: [14, 14]
+          border_size:
+            top: 5
+            bottom: 5
+            right: 5
+            left: 5
+          scale: 2
+        clicked:
+          image: ui/button-down.png
+          image_size: [14, 14]
+          border_size:
+            top: 5
+            bottom: 5
+            right: 5
+            left: 5
+          scale: 2
+
+core:
+  config:
+    respawn_invincibility_time: 2s
+
+  camera:
+    default_height: 448
+    border_right: 300
+    border_left: 300
+    border_top: 50
+    border_bottom: 200
+    player_camera_box_size: [100, 250]
+    min_camera_size: [400, 500]
+    zoom_in_lerp_factor: 0.05
+    zoom_out_lerp_factor: 0.1
+    move_lerp_factor: 0.1
+
+  physics:
+    terminal_velocity: 30
+    friction_lerp: 0.85
+    stop_threshold: 1.0
+    gravity: 0.6
+
+  players:
+    - ./player/skins/fishy/fishy.player.yaml
+    - ./player/skins/pescy/pescy.player.yaml
+    - ./player/skins/sharky/sharky.player.yaml
+    - ./player/skins/orcy/orcy.player.yaml
+
+  player_hats:
+    - /player/hats/pirate.hat.yaml
+    - /player/hats/straw.hat.yaml
+
+  stable_maps:
+    - /map/levels/level_1.map.yaml
+    - /map/levels/level_2.map.yaml
+    - /map/levels/level_3.map.yaml
+    - /map/levels/level_4.map.yaml
+    - /map/levels/level_5.map.yaml
+    - /map/levels/level_6.map.yaml
+    - /map/levels/level_7.map.yaml
+    - /map/levels/level_8.map.yaml
+    - /map/levels/level_9.map.yaml
+    - /map/levels/level_10.map.yaml
+    - /map/levels/level_11.map.yaml
+    - /map/levels/level_12.map.yaml
+    - /map/levels/level_13.map.yaml
+    - /map/levels/level_14.map.yaml
+
+  map_tilesets:
+    - /map/resources/default_tileset.atlas.yaml
+    - /map/resources/ground_rock.atlas.yaml
+    - /map/resources/ground_wood.atlas.yaml
+    - /map/resources/ground_metal.atlas.yaml
+    - /map/resources/ship_decorations.atlas.yaml
+    - /map/resources/coral.atlas.yaml
+
+  map_elements:
+    - /elements/decoration/anemones/anemones.element.yaml
+    - /elements/decoration/seaweed/seaweed.element.yaml
+    - /elements/environment/urchin/urchin.element.yaml
+    - /elements/environment/fish_school/fish_school.element.yaml
+    - /elements/environment/crab/crab.element.yaml
+    - /elements/environment/snail/snail.element.yaml
+    - /elements/environment/player_spawner/player_spawner.element.yaml
+    - /elements/environment/sproinger/sproinger.element.yaml
+    - /elements/environment/slippery/slippery.element.yaml
+    - /elements/environment/slippery_seaweed/slippery_seaweed.element.yaml
+    - /elements/item/crate/crate.element.yaml
+    - /elements/item/grenade/grenade.element.yaml
+    - /elements/item/kick_bomb/kick_bomb.element.yaml
+    - /elements/item/mine/mine.element.yaml
+    - /elements/item/musket/musket.element.yaml
+    - /elements/item/stomp_boots/stomp_boots.element.yaml
+    - /elements/item/sword/sword.element.yaml
+    - /elements/item/sniper_rifle/sniper_rifle.element.yaml
+    - /elements/environment/coral_spikes/coral_spikes.element.yaml
+
+  experimental_maps: []
+
diff --git a/assets/locales/en-US/controls.ftl b/assets/locales/en-US/controls.ftl
index 287b16320b..e6e02ce4cf 100644
--- a/assets/locales/en-US/controls.ftl
+++ b/assets/locales/en-US/controls.ftl
@@ -5,4 +5,7 @@ move-right = Move Right
 jump = Jump
 grab-drop = Grab / Drop
 shoot = Shoot
-slide = Slide
\ No newline at end of file
+slide = Slide
+menu-confirm = Menu Confirm
+menu-back = Menu Back
+menu-start = Menu Start
diff --git a/assets/locales/en-US/debug-tools.ftl b/assets/locales/en-US/debug-tools.ftl
index 4c262bc9f6..f319c8d059 100644
--- a/assets/locales/en-US/debug-tools.ftl
+++ b/assets/locales/en-US/debug-tools.ftl
@@ -9,8 +9,6 @@ pathfinding-lines = Pathfinding Lines
 network-debug = Network Debug
 networking-disabled-message = Networking not enabled on this platform.
 
-profiler = Profiler
-
 frame-diagnostics = Frame Diagnostics
 frames-per-second = Frames Per Second
 frame-time = Frame Time
diff --git a/assets/locales/en-US/en-US.ftl.yml b/assets/locales/en-US/locale.yaml
similarity index 91%
rename from assets/locales/en-US/en-US.ftl.yml
rename to assets/locales/en-US/locale.yaml
index 7dfd2075cc..c3a42d9f27 100644
--- a/assets/locales/en-US/en-US.ftl.yml
+++ b/assets/locales/en-US/locale.yaml
@@ -1,4 +1,4 @@
-locale: en-US
+locales: [en-US]
 resources:
   - branding.ftl
   - menu.ftl
diff --git a/assets/locales/en-US/settings.ftl b/assets/locales/en-US/settings.ftl
index a63c0e9257..8adb5e74c2 100644
--- a/assets/locales/en-US/settings.ftl
+++ b/assets/locales/en-US/settings.ftl
@@ -1,7 +1,13 @@
 # Controller Settings
 
 controls = Controls
-bind-input = Make an input to bind or press Escape to cancel
+bind-input =
+    Make { $binding_kind ->
+        [keyboard]  a keyboard
+        [gamepad]   a gamepad
+        *[other]    an
+    } input to bind to "{ $binding }".
+clear-binding = Clear Binding
 
 keyboard-1 = Keyboard 1
 keyboard-2 = Keyboard 2
diff --git a/assets/locales/fr-FR/fr-FR.ftl.yml b/assets/locales/fr-FR/fr-FR.ftl.yml
deleted file mode 100644
index d59f8ddb47..0000000000
--- a/assets/locales/fr-FR/fr-FR.ftl.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-locale: fr-FR
-resources:
-  - main.ftl
\ No newline at end of file
diff --git a/assets/locales/fr-FR/locale.yaml b/assets/locales/fr-FR/locale.yaml
new file mode 100644
index 0000000000..276d820eaa
--- /dev/null
+++ b/assets/locales/fr-FR/locale.yaml
@@ -0,0 +1,3 @@
+locales: [fr-FR]
+resources:
+  - main.ftl
diff --git a/assets/locales/localization.yaml b/assets/locales/localization.yaml
new file mode 100644
index 0000000000..cb859bda80
--- /dev/null
+++ b/assets/locales/localization.yaml
@@ -0,0 +1,3 @@
+locales:
+  - en-US/locale.yaml
+  - fr-FR/locale.yaml
diff --git a/assets/pack.yaml b/assets/pack.yaml
new file mode 100644
index 0000000000..2fd5e136ad
--- /dev/null
+++ b/assets/pack.yaml
@@ -0,0 +1 @@
+root: game.yaml
diff --git a/book/book.toml b/book/book.toml
index 788b898cfd..65ec66ecc7 100644
--- a/book/book.toml
+++ b/book/book.toml
@@ -1,15 +1,15 @@
 [book]
-authors = ["Carlo Supina", "Srayan Jana", "grufkork", "Micah Tigley"]
-language = "en"
+authors      = ["Carlo Supina", "Srayan Jana", "grufkork", "Micah Tigley"]
+language     = "en"
 multilingual = false
-src = "src"
-title = "Jumpy Documentation"
+src          = "src"
+title        = "Jumpy Documentation"
 
 [build]
-build-dir = "dist"
+build-dir      = "dist"
 create-missing = false
 
 [output.html]
-default-theme = "navy"
-git-repository-url = "https://github.com/fishfolk/jumpy"
+default-theme       = "navy"
+git-repository-url  = "https://github.com/fishfolk/jumpy"
 git-repository-icon = "fa-github"
diff --git a/cliff.toml b/cliff.toml
index b67557d064..bb80d4b4f7 100644
--- a/cliff.toml
+++ b/cliff.toml
@@ -38,21 +38,21 @@ filter_unconventional = false
 split_commits = false
 # regex for preprocessing the commit messages
 commit_preprocessors = [
-    { pattern = '\n.*', replace = ""}, # Discard all but the first line
+  { pattern = '\n.*', replace = "" }, # Discard all but the first line
 ]
 # regex for parsing and grouping commits
 commit_parsers = [
-    { message = "^feat", group = "Features"},
-    { message = "^fix", group = "Bug Fixes"},
-    { message = "^doc", group = "Documentation"},
-    { message = "^perf", group = "Performance"},
-    { message = "^refactor", group = "Refactor"},
-    { message = "^style", group = "Styling"},
-    { message = "^test", group = "Testing"},
-    { message = "^chore\\(release\\): prepare for", skip = true},
-    { message = "^chore", group = "Miscellaneous Tasks"},
-    { body = ".*security", group = "Security"},
-    { message = ".*", group = "Other", default_scope = "other"},
+  { message = "^feat", group = "Features" },
+  { message = "^fix", group = "Bug Fixes" },
+  { message = "^doc", group = "Documentation" },
+  { message = "^perf", group = "Performance" },
+  { message = "^refactor", group = "Refactor" },
+  { message = "^style", group = "Styling" },
+  { message = "^test", group = "Testing" },
+  { message = "^chore\\(release\\): prepare for", skip = true },
+  { message = "^chore", group = "Miscellaneous Tasks" },
+  { body = ".*security", group = "Security" },
+  { message = ".*", group = "Other", default_scope = "other" },
 
 ]
 # protect breaking changes from being skipped due to matching a skipping commit_parser
diff --git a/core/Cargo.toml b/core/Cargo.toml
deleted file mode 100644
index 0dfe1543bd..0000000000
--- a/core/Cargo.toml
+++ /dev/null
@@ -1,40 +0,0 @@
-[package]
-edition = "2021"
-license = "MIT OR Apache-2.0"
-name    = "jumpy_core"
-version = "0.7.0"
-
-[dependencies]
-bones_bevy_asset = "0.2"
-bones_lib        = { version = "0.2", features = ["serde"] }
-type_ulid        = "0.2"
-
-bytemuck        = { version = "1.12", features = ["derive"] }
-csscolorparser  = "0.6"
-glam            = { version = "0.23", features = ["bytemuck", "libm"] }
-humantime-serde = "1.0"
-indexmap        = "1.9"
-nalgebra        = { version = "0.32", features = ["convert-glam023"] }
-ordered-float   = "3.4"
-petgraph        = { version = "0.6", features = ["graphmap"], default-features = false }
-puffin          = { version = "0.15", features = ["web"] }
-rapier2d        = { version = "0.17", features = ["enhanced-determinism", "debug-render"] }
-serde           = { version = "1.0", features = ["derive"] }
-tracing         = "0.1"
-shiftnanigans   = { version = "0.3" }
-
-[dependencies.bevy]
-default-features = false
-features         = ["bevy_asset"]
-version          = "0.10"
-
-[dependencies.turborand]
-features = ["atomic"]
-version  = "0.10"
-
-[package.metadata.cargo-machete]
-ignored = [
-    "nalgebra", # Needed to add the `convert-glam023` feature
-    "humantime_serde", # false positive
-    "type_ulid", # false positive
-]
diff --git a/core/README.md b/core/README.md
deleted file mode 100644
index 8de424730b..0000000000
--- a/core/README.md
+++ /dev/null
@@ -1,86 +0,0 @@
-# Jumpy Core
-
-[`jumpy_core`][crate] contains the core Jumpy game loop. This includes things like physics, the
-player controller, the items, and pretty much everything else that happens during the play of a
-match in the game.
-
-**If you want to contribute to Jumpy's match gameplay, this is likely where you want to be.**
-
-## Overview
-
-The Jumpy core logic is fully implemented on top of [`bones_lib`][crate::external::bones_lib]
-and the Bones ECS ( [`bones_lib::ecs`][crate::external::bones_lib::ecs] ).
-
-By only interacting with `bones_lib`, we isolate the core game from the specifics of rendering and
-user input, which is handled by the `jumpy` crate.
-
-Jumpy core is primarily interacted with through the [`CoreSession`][crate::session::CoreSession]
-struct, which allows you to:
-
-- Provide user input to the game
-- Run a game frame by executing the core systems to update the state of the contained
-  [`bones_lib::ecs::World`]
-- Snapshot and restore the state of the game
-
-This means that Jumpy core has no interaction with rendering or how to collect the user input,
-keeping it focused just on the core game mechanics.
-
-Jumpy core is also designed to be deterministic, lending it well to rollback networking, as implemented in the `jumpy` crate.
-
-### Important Concepts
-
-#### Gameplay Modules
-
-The gameplay is split into different Rust modules for different aspects of the game. For instance,
-we have the [`damage`] that handles damage regions and the [`camera`] module with the camera
-controller.
-
-The modules that contain gameplay systems all have an `install()` function that adds it's systems to
-the [`CoreSession`][crate::session::CoreSession].
-
-See [`install_modules()`] for more details on how to add new systems and modules.
-
-#### Game Metadata
-
-Metadata in Jumpy core is any data that is loaded as an asset at runtime. Examples of assets
-include:
-
-- Sprites
-- Maps
-- Player animations
-- Item data
-
-Most of our metadata is loaded from YAML files, with the format being defined by Rust structs that
-derive `Serialize` and `Deserialize`.
-
-See the [`metadata`] module for more details.
-
-#### Entity Hydration
-
-Throughout [`jumpy_core`][crate] you'll see `hydrate` functions. The goal of these functions is to
-take "stub entities" that have only some of the components that they need, and then "hydrate" them
-by adding all of the remaining components that they need to work properly.
-
-For example, the [`player_spawner`][crate::elements::player_spawner] spawns players by creating an
-entity with only a [`PlayerIdx`][crate::player::PlayerIdx] and
-[`Transform`][crate::prelude::Transform] component. This creates a "player stub" that is missing all
-kinds of important components such as the sprite, collisions, etc.
-
-Later the [`hydrate_players()`][crate::player] system will run, find all of the player stubs, and
-lookup from the [`PlayerIdx`][crate::player::PlayerIdx] what sprites need to be added, etc. before
-adding all the required components to the entity.
-
-This practice of hydrating entity stubs makes it much simpler to spawn different kinds of entities
-throughout the codebase, without needing to duplicate the much more complicated logic of adding all
-of that entities required components.
-
-## 🚧 Work-in-Progress Bones Asset Handling Abstraction
-
-`bones_lib` is designed to be independent of Bevy, such that you could possibly make a renderer for
-any `bones_lib` core in any game engine you wanted, not just Bevy. This means that, ideally,
-`jumpy_core` would have no dependency on `bevy`, but right now that is not completely true.
-
-`bones_lib` is still working out how to implement it's own asset abstraction, and until it gets
-fully figured out, we do have a dependency on Bevy through the
-[`BonesBevyAsset`][crate::external::bones_bevy_asset::BonesBevyAsset] derive macro and some
-interactions necessary to access Bevy assets in the [`CoreSession`][crate::session::CoreSession].
diff --git a/core/src/lib.rs b/core/src/lib.rs
deleted file mode 100644
index fc96a98747..0000000000
--- a/core/src/lib.rs
+++ /dev/null
@@ -1,107 +0,0 @@
-#![doc = include_str!("../README.md")]
-#![doc(html_logo_url = "https://avatars.githubusercontent.com/u/87333478?s=200&v=4")]
-// This cfg_attr is needed because `rustdoc::all` includes lints not supported on stable
-#![cfg_attr(doc, allow(unknown_lints))]
-#![deny(rustdoc::all)]
-#![allow(clippy::too_many_arguments)]
-
-/// Prelude for inside the crate
-mod prelude;
-
-/// Prelude for use outside the crate
-#[doc(hidden)]
-pub mod bevy_prelude {
-    pub use {
-        crate::{
-            input::EditorInput,
-            metadata::*,
-            session::{CoreSession, CoreSessionInfo, GameSessionPlayerInfo},
-            MAX_PLAYERS,
-        },
-        bones_lib::prelude as bones,
-    };
-}
-
-/// External crate documentation.
-///
-/// This module only exists during docs builds and serves to make it eaiser to link to relevant
-/// documentation in external crates.
-#[cfg(doc)]
-pub mod external {
-    #[doc(inline)]
-    pub use bones_bevy_asset;
-    #[doc(inline)]
-    pub use bones_lib;
-}
-
-pub mod attachment;
-pub mod bullet;
-pub mod camera;
-pub mod damage;
-pub mod debug;
-pub mod editor;
-pub mod elements;
-pub mod globals;
-pub mod input;
-pub mod item;
-pub mod lifetime;
-pub mod map;
-pub mod map_constructor;
-pub mod metadata;
-pub mod physics;
-pub mod player;
-pub mod random;
-pub mod session;
-pub mod utils;
-
-/// The target fixed frames-per-second that the game sumulation runs at.
-pub const FPS: f32 = 60.0;
-/// The maximum number of players per match.
-pub const MAX_PLAYERS: usize = 4;
-
-/// Install game modules into the given [`CoreSession`][session::CoreSession].
-///
-/// Each game module should have a public install function that adds the systems needed by that
-/// module:
-///
-/// ```ignore
-/// pub fn install(session: &mut crate::session::CoreSession) {
-///      session
-///         .stages
-///         .add_system_to_stage(CoreStage::Last, camera_controller);
-/// }
-/// ```
-///
-/// The module will usually contain the Rust structs for any components related to the module as
-/// well.
-///
-/// To include the module in the game, add add a line to the body of this [`install_modules()`]
-/// function that calls your module's `install()` function:
-///
-/// ```ignore
-/// pub fn install_modules(session: &mut session::CoreSession) {
-///     // other modules...
-///     camera::install(session);
-/// }
-/// ```
-///
-/// Note that in some edge cases the order that the modules are installed can make a difference
-/// because it will change the order that the module systems are run, if two modules add systems to
-/// the same system stage.
-pub fn install_modules(session: &mut session::CoreSession) {
-    bones_lib::install(&mut session.stages);
-    physics::install(session);
-    input::install(session);
-    map::install(session);
-    player::install(session);
-    elements::install(session);
-    damage::install(session);
-    camera::install(session);
-    lifetime::install(session);
-    random::install(session);
-    debug::install(session);
-    item::install(session);
-    attachment::install(session);
-    bullet::install(session);
-    editor::install(session);
-}
diff --git a/core/src/metadata.rs b/core/src/metadata.rs
deleted file mode 100644
index fe33712a3f..0000000000
--- a/core/src/metadata.rs
+++ /dev/null
@@ -1,103 +0,0 @@
-//! Core game metadata
-
-use serde::Deserializer;
-use std::time::Duration;
-
-use crate::prelude::*;
-
-mod common;
-mod element;
-mod map;
-mod player;
-
-pub use common::*;
-pub use element::*;
-pub use map::*;
-pub use player::*;
-
-/// Resource containing the session's [`CoreMeta`].
-///
-/// This is wrapped in an [`Arc`] because it doesn't change over the course of a game, and because
-/// it makes it very cheap to clone during game snapshots.
-#[derive(::bevy::prelude::Resource, Deref, DerefMut, TypeUlid, Clone, Default, Debug)]
-#[ulid = "01GNFXQXM8FCTD1JPDTJ796A25"]
-pub struct CoreMetaArc(pub Arc<CoreMeta>);
-
-pub struct JumpyCoreAssetsPlugin;
-impl ::bevy::prelude::Plugin for JumpyCoreAssetsPlugin {
-    fn build(&self, app: &mut ::bevy::prelude::App) {
-        use bones_bevy_asset::BonesBevyAssetAppExt;
-        app.add_bones_asset::<CoreMeta>()
-            .add_bones_asset::<PlayerMeta>()
-            .add_bones_asset::<MapMeta>()
-            .add_bones_asset::<ElementMeta>()
-            .add_bones_asset::<BulletMeta>()
-            .add_bones_asset::<HatMeta>();
-    }
-}
-
-#[derive(BonesBevyAsset, Clone, Debug, Deserialize, TypeUlid, Default)]
-#[asset_id = "core"]
-#[ulid = "01GNWT2Q8EZ5CEV3MHWNMGEEA6"]
-#[serde(deny_unknown_fields)]
-pub struct CoreMeta {
-    pub camera: CameraMeta,
-    pub physics: PhysicsMeta,
-    pub config: CoreConfigMeta,
-    pub map_tilesets: Vec<Handle<Atlas>>,
-    pub players: Vec<Handle<PlayerMeta>>,
-    pub player_hats: Vec<Handle<HatMeta>>,
-    pub stable_maps: Vec<Handle<MapMeta>>,
-    pub map_elements: Vec<Handle<ElementMeta>>,
-    pub experimental_maps: Vec<Handle<MapMeta>>,
-}
-
-#[derive(BonesBevyAssetLoad, Deserialize, Clone, Debug)]
-#[serde(deny_unknown_fields)]
-#[serde(default)]
-pub struct CameraMeta {
-    pub default_height: f32,
-    pub border_top: f32,
-    pub border_bottom: f32,
-    pub border_left: f32,
-    pub border_right: f32,
-    pub move_lerp_factor: f32,
-    pub zoom_in_lerp_factor: f32,
-    pub zoom_out_lerp_factor: f32,
-    pub min_camera_size: Vec2,
-    pub player_camera_box_size: Vec2,
-}
-
-impl Default for CameraMeta {
-    fn default() -> Self {
-        Self {
-            default_height: 400.0,
-            border_top: 0.0,
-            border_bottom: 0.0,
-            border_left: 0.0,
-            border_right: 0.0,
-            move_lerp_factor: 1.0,
-            zoom_in_lerp_factor: 1.0,
-            zoom_out_lerp_factor: 1.0,
-            min_camera_size: Vec2::ZERO,
-            player_camera_box_size: Vec2::ZERO,
-        }
-    }
-}
-
-#[derive(BonesBevyAssetLoad, Deserialize, Clone, Debug, Default)]
-#[serde(deny_unknown_fields)]
-pub struct PhysicsMeta {
-    pub gravity: f32,
-    pub terminal_velocity: f32,
-    pub friction_lerp: f32,
-    pub stop_threshold: f32,
-}
-
-#[derive(BonesBevyAssetLoad, Deserialize, Clone, Debug, Default)]
-#[serde(deny_unknown_fields)]
-pub struct CoreConfigMeta {
-    #[serde(default)]
-    #[serde(with = "humantime_serde")]
-    pub respawn_invincibility_time: Duration,
-}
diff --git a/core/src/metadata/common.rs b/core/src/metadata/common.rs
deleted file mode 100644
index 1a678c6105..0000000000
--- a/core/src/metadata/common.rs
+++ /dev/null
@@ -1,57 +0,0 @@
-use super::*;
-use serde::{Deserialize, Deserializer};
-
-#[derive(Clone, Copy, Debug, Default)]
-pub struct ColorMeta(pub Color);
-
-impl bones_bevy_asset::BonesBevyAssetLoad for ColorMeta {}
-
-impl<'de> Deserialize<'de> for ColorMeta {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        deserializer.deserialize_str(ColorVisitor)
-    }
-}
-
-impl Serialize for ColorMeta {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        let [r, g, b, a] = self.0.as_rgba_f32();
-        let [r, g, b, a] = [
-            (r * 255.0) as u8,
-            (g * 255.0) as u8,
-            (b * 255.0) as u8,
-            (a * 255.0) as u8,
-        ];
-        let hex = format!("#{r:X}{g:X}{b:X}{a:X}");
-
-        serializer.serialize_str(&hex)
-    }
-}
-
-struct ColorVisitor;
-impl<'de> serde::de::Visitor<'de> for ColorVisitor {
-    type Value = ColorMeta;
-
-    fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
-        formatter.write_str("A hex-encoded RGB or RGBA color")
-    }
-
-    fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
-    where
-        E: serde::de::Error,
-    {
-        Ok(ColorMeta(
-            csscolorparser::parse(v)
-                .map(|x| {
-                    let [r, g, b, a] = x.to_array();
-                    [r as f32, g as f32, b as f32, a as f32].into()
-                })
-                .map_err(|e| E::custom(e))?,
-        ))
-    }
-}
diff --git a/core/src/metadata/element.rs b/core/src/metadata/element.rs
deleted file mode 100644
index 36b058f8e4..0000000000
--- a/core/src/metadata/element.rs
+++ /dev/null
@@ -1,320 +0,0 @@
-use std::time::Duration;
-
-use super::*;
-
-#[derive(BonesBevyAsset, TypeUlid, Deserialize, Clone, Debug, Default)]
-#[asset_id = "element"]
-#[ulid = "01GP28EQQVVQHDA0C9C4168C7W"]
-#[serde(deny_unknown_fields)]
-pub struct ElementMeta {
-    pub name: String,
-    pub category: String,
-    #[serde(default)]
-    pub builtin: BuiltinElementKind,
-
-    #[serde(default)]
-    pub editor: ElementEditorMeta,
-}
-
-#[derive(BonesBevyAssetLoad, Deserialize, Clone, Debug)]
-#[serde(deny_unknown_fields)]
-#[serde(default)]
-pub struct ElementEditorMeta {
-    /// The size of the bounding rect for the element in the editor
-    pub grab_size: Vec2,
-    /// The offset of the bounding rect for the element in the editor.
-    pub grab_offset: Vec2,
-    /// Show the element name above the bounding rect in the editor.
-    pub show_name: bool,
-}
-
-impl Default for ElementEditorMeta {
-    fn default() -> Self {
-        Self {
-            grab_size: Vec2::splat(45.0),
-            grab_offset: Vec2::ZERO,
-            show_name: true,
-        }
-    }
-}
-
-#[derive(BonesBevyAsset, Deserialize, Clone, Debug, Default, TypeUlid)]
-#[ulid = "01GR1W2B3S7DM5QEY07RSJH2G0"]
-#[asset_id = "bullet"]
-#[serde(deny_unknown_fields)]
-pub struct BulletMeta {
-    pub velocity: Vec2,
-    pub body_diameter: f32,
-    pub atlas: Handle<Atlas>,
-
-    pub lifetime: f32,
-    pub explosion_fps: f32,
-    pub explosion_volume: f64,
-    pub explosion_lifetime: f32,
-    pub explosion_frames: usize,
-    pub explosion_atlas: Handle<Atlas>,
-    pub explosion_sound: Handle<AudioSource>,
-}
-
-/// The kind of built-in
-#[derive(BonesBevyAssetLoad, Deserialize, Clone, Debug, Default)]
-#[serde(deny_unknown_fields)]
-pub enum BuiltinElementKind {
-    /// This is not a built-in item
-    #[default]
-    None,
-    /// Player spawner
-    PlayerSpawner,
-    /// Grenades item
-    Grenade {
-        body_diameter: f32,
-        fin_anim: Key,
-        grab_offset: Vec2,
-        damage_region_size: Vec2,
-        damage_region_lifetime: f32,
-        throw_velocity: f32,
-        explosion_lifetime: f32,
-        explosion_frames: usize,
-        explosion_fps: f32,
-        explosion_sound: Handle<AudioSource>,
-        explosion_volume: f64,
-        fuse_sound: Handle<AudioSource>,
-        fuse_sound_volume: f64,
-        /// The time in seconds before a grenade explodes
-        fuse_time: f32,
-        #[serde(default)]
-        can_rotate: bool,
-        /// The grenade atlas
-        atlas: Handle<Atlas>,
-        explosion_atlas: Handle<Atlas>,
-        #[serde(default)]
-        bounciness: f32,
-        #[serde(default)]
-        angular_velocity: f32,
-    },
-    /// An animated decoration such as seaweed or anemones
-    AnimatedDecoration {
-        start_frame: usize,
-        end_frame: usize,
-        fps: f32,
-        atlas: Handle<Atlas>,
-    },
-    FishSchool {
-        kinds: Vec<Handle<Atlas>>,
-        /// The default and most-likely to ocurr number of fish in a school
-        base_count: u32,
-        /// The ammount greater or less than the base number of fish that may spawn
-        count_variation: u32,
-        /// The distance from the spawn point on each axis that the individual fish in the school will be
-        /// initially spawned within
-        spawn_range: f32,
-        /// The distance that the fish wish to stay within the center of their school
-        school_size: f32,
-        // The distance a collider must be for the fish to run away
-        flee_range: f32,
-    },
-    /// A crab roaming on the ocean floor
-    Crab {
-        body_size: Vec2,
-        walk_frames: Vec<usize>,
-        spawn_frames: Vec<usize>,
-        fps: f32,
-        comfortable_spawn_distance: f32,
-        comfortable_scared_distance: f32,
-        /// How long a crab has to be away from it's spawn point before it digs into the ground and
-        /// digs back out in his spawn point.
-        #[serde(with = "humantime_serde")]
-        uncomfortable_respawn_time: Duration,
-        same_level_threshold: f32,
-        walk_speed: f32,
-        run_speed: f32,
-        // TODO: migrate this to a duration like `uncomfortable_respawn_time`.
-        timer_delay_max: u8,
-        atlas: Handle<Atlas>,
-    },
-    Snail {
-        atlas: Handle<Atlas>,
-        fps: f32,
-        body_diameter: f32,
-        bounciness: f32,
-        gravity: f32,
-        hit_speed: f32,
-        /// The animation frames for when the snail is crawling
-        crawl_frames: Vec<usize>,
-        /// The `crawl_frames` indexes in which to move the snail
-        move_frame_indexes: Vec<usize>,
-        /// The animation frames for when the snail is fleeing into its shell.
-        ///
-        /// **Note:** This is reversed for the snail coming out of its shell.
-        hide_frames: Vec<usize>,
-        hide_time: f32,
-    },
-    Urchin {
-        image: Handle<Image>,
-        body_diameter: f32,
-        hit_speed: f32,
-        gravity: f32,
-        bounciness: f32,
-        spin: f32,
-    },
-    /// This is a sproinger
-    Sproinger {
-        atlas: Handle<Atlas>,
-        sound: Handle<AudioSource>,
-        sound_volume: f64,
-        body_size: Vec2,
-        spring_velocity: f32,
-    },
-    /// This is a sword
-    Sword {
-        atlas: Handle<Atlas>,
-        sound: Handle<AudioSource>,
-        sound_volume: f64,
-        body_size: Vec2,
-        fin_anim: Key,
-        #[serde(default)]
-        grab_offset: Vec2,
-        killing_speed: f32,
-        angular_velocity: f32,
-        can_rotate: bool,
-        bounciness: f32,
-        throw_velocity: f32,
-        cooldown_frames: usize,
-    },
-    /// The throwable crate item
-    Crate {
-        atlas: Handle<Atlas>,
-
-        breaking_atlas: Handle<Atlas>,
-        breaking_anim_frames: usize,
-        breaking_anim_fps: f32,
-
-        break_sound: Handle<AudioSource>,
-        break_sound_volume: f64,
-        bounce_sound: Handle<AudioSource>,
-        bounce_sound_volume: f64,
-
-        throw_velocity: f32,
-
-        body_size: Vec2,
-        grab_offset: Vec2,
-        // How long to wait before despawning a thrown crate, if it hans't it anything yet.
-        #[serde(with = "humantime_serde")]
-        break_timeout: Duration,
-        bounciness: f32,
-        fin_anim: Key,
-        crate_break_state_1: usize,
-        crate_break_state_2: usize,
-    },
-    /// The mine item
-    Mine {
-        atlas: Handle<Atlas>,
-
-        damage_region_size: Vec2,
-        damage_region_lifetime: f32,
-        explosion_atlas: Handle<Atlas>,
-        explosion_lifetime: f32,
-        explosion_frames: usize,
-        explosion_fps: f32,
-        explosion_volume: f64,
-        explosion_sound: Handle<AudioSource>,
-
-        /// The delay after throwing the mine, before it becomes armed and will blow up on contact.
-        arm_delay: f32,
-        armed_frames: usize,
-        armed_fps: f32,
-        arm_sound_volume: f64,
-        arm_sound: Handle<AudioSource>,
-
-        throw_velocity: f32,
-        body_size: Vec2,
-        grab_offset: Vec2,
-        fin_anim: Key,
-        bounciness: f32,
-    },
-
-    StompBoots {
-        map_icon: Handle<Atlas>,
-        player_decoration: Handle<Atlas>,
-
-        body_size: Vec2,
-        grab_offset: Vec2,
-    },
-    KickBomb {
-        body_diameter: f32,
-        fin_anim: Key,
-        grab_offset: Vec2,
-        damage_region_size: Vec2,
-        damage_region_lifetime: f32,
-        kick_velocity: Vec2,
-        throw_velocity: f32,
-        explosion_lifetime: f32,
-        explosion_frames: usize,
-        explosion_fps: f32,
-        explosion_sound: Handle<AudioSource>,
-        explosion_volume: f64,
-        fuse_sound: Handle<AudioSource>,
-        fuse_sound_volume: f64,
-        /// The time in seconds before a grenade explodes
-        #[serde(with = "humantime_serde")]
-        fuse_time: Duration,
-        #[serde(default)]
-        can_rotate: bool,
-        /// The grenade atlas
-        atlas: Handle<Atlas>,
-        explosion_atlas: Handle<Atlas>,
-        #[serde(default)]
-        bounciness: f32,
-        #[serde(default)]
-        angular_velocity: f32,
-        #[serde(with = "humantime_serde")]
-        arm_delay: Duration,
-    },
-    Musket {
-        #[serde(default)]
-        grab_offset: Vec2,
-        fin_anim: Key,
-
-        body_size: Vec2,
-        bounciness: f32,
-        can_rotate: bool,
-        throw_velocity: f32,
-        angular_velocity: f32,
-        atlas: Handle<Atlas>,
-
-        max_ammo: usize,
-        #[serde(with = "humantime_serde")]
-        cooldown: Duration,
-        bullet_meta: Handle<BulletMeta>,
-        kickback: f32,
-
-        shoot_fps: f32,
-        shoot_lifetime: f32,
-        shoot_frames: usize,
-        shoot_sound_volume: f64,
-        empty_shoot_sound_volume: f64,
-        shoot_atlas: Handle<Atlas>,
-        shoot_sound: Handle<AudioSource>,
-        empty_shoot_sound: Handle<AudioSource>,
-    },
-    SlipperySeaweed {
-        atlas: Handle<Atlas>,
-        start_frame: usize,
-        end_frame: usize,
-        fps: f32,
-        body_size: Vec2,
-    },
-    Slippery {
-        atlas: Handle<Atlas>,
-        body_size: Vec2,
-        player_slide: f32,
-        body_friction: f32,
-    },
-    Spike {
-        atlas: Handle<Atlas>,
-        body_size: Vec2,
-        start_frame: usize,
-        end_frame: usize,
-        fps: f32,
-    },
-}
diff --git a/core/src/prelude.rs b/core/src/prelude.rs
deleted file mode 100644
index b75aa5a517..0000000000
--- a/core/src/prelude.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-//! Common imports used throughout the crate.
-
-pub use {
-    crate::{
-        attachment::*, bullet::*, camera::*, damage::*, debug::*, debug::*, elements::*,
-        globals::*, input::*, item::*, item::*, lifetime::*, map::*, metadata::*, physics::*,
-        player::*, session::*, utils::*, MAX_PLAYERS,
-    },
-    bones_bevy_asset::{BevyAssets, BonesBevyAsset, BonesBevyAssetLoad},
-    bones_lib::prelude::*,
-    bytemuck::{Pod, Zeroable},
-    // glam::*,
-    serde::{Deserialize, Serialize},
-    std::sync::Arc,
-    tracing::{debug, error, info, trace, warn},
-    turborand::TurboRand,
-};
diff --git a/core/src/session.rs b/core/src/session.rs
deleted file mode 100644
index fbd1d1e85d..0000000000
--- a/core/src/session.rs
+++ /dev/null
@@ -1,299 +0,0 @@
-//! [`CoreSession`] implementation: the entrypoint for using `jumpy_core`.
-
-use crate::prelude::*;
-
-/// Implementation of the Jumpy match session.
-///
-/// This encapsulates all of the game match logic, and is used to:
-///
-/// - Provide input to the game.
-/// - Snapshot/Restore the game state.
-/// - Access the session's ECS [`World`] ( for instance, to render the game ).
-///
-/// All of this is done **without** rendering anything. The game systems logic will create
-/// [`Sprite`] entities, etc. that may be read directly out of the [`world`][Self::world] field in
-/// in order to render the game.
-///
-/// The `bones_bevy_renderer` crate can be used to render the contained [`World`] in Bevy, as it is
-/// used in the `jumpy` crate and in the [`core_usage`
-/// example](https://github.com/fishfolk/jumpy/blob/main/examples/core_usage.rs).
-///
-/// ## Game Systems
-///
-/// When instantiated with [`CoreSession::new()`], the session will have all of the core game
-/// systems installed into it's [`stages`][Self::stages]. This is done by calling
-/// [`install_modules()`][crate::install_modules].
-///
-/// If you are contributing and want to add more systems to the game, you can do so by adding your
-/// module to the [`install_modules()`][crate::install_modules] function body, following the pattern
-/// of the existing modules already there.
-///
-/// ## `CoreMeta`
-///
-/// An important struct required to create a new session is the [`CoreMeta`] struct in
-/// [`CoreSessionInfo`].
-///
-/// [`CoreMeta`] contains the session's entire metadata tree, including items, maps, and player
-/// skins.
-///
-/// In `jumpy` this is loaded as a Bevy asset from YAMl files.
-///
-/// See the [`metadata`][crate::metadata] module for more details.
-pub struct CoreSession {
-    /// The ECS world for the session. Contains the whole gameplay state.
-    pub world: World,
-    /// Contains the game systems that modify the ECS `world` every frame.
-    pub stages: SystemStages,
-    /// The information necessary to initialize the session.
-    pub info: CoreSessionInfo,
-    /// The number of seconds in simulation time between frames.
-    ///
-    /// **Important Note:** This sets how much time advances in the game world whenever you call
-    /// [`advance()`][Self::advance], irrespective of how much real-life time actually elapsed
-    /// between your calls to `advance()`.
-    ///
-    /// This means that you must manually provide some sort of fixed-update logic in order to make
-    /// sure that `advance()` is called as many times per second as you desire.
-    pub time_step: f32,
-    /// Implementation detail.
-    ///
-    /// Used during [`advance()`][Self::advance] to borrow the bevy world.
-    pub scratch_world: Option<::bevy::ecs::world::World>,
-}
-
-/// Information needed to start a game session.
-#[derive(Debug, Clone)]
-pub struct CoreSessionInfo {
-    /// The core metadata.
-    pub meta: Arc<CoreMeta>,
-    /// Metadata for the selected map.
-    pub map_meta: MapMeta,
-    /// The player selections.
-    pub player_info: [Option<GameSessionPlayerInfo>; MAX_PLAYERS],
-}
-
-/// Info for a player in the [`CoreSessionInfo`] struct.
-#[derive(Debug, Clone)]
-pub struct GameSessionPlayerInfo {
-    /// The asset handle for the player skin.
-    pub player: Handle<PlayerMeta>,
-    /// The hat the player selected, if any.
-    pub hat: Option<Handle<HatMeta>>,
-    /// Whether or not the player is an AI player.
-    pub is_ai: bool,
-}
-
-impl CoreSession {
-    /// Create a new [`CoreSession`].
-    pub fn new(mut info: CoreSessionInfo) -> Self {
-        // Create session
-        let mut session = Self {
-            world: default(),
-            stages: SystemStages::with_core_stages(),
-            scratch_world: Some(::bevy::ecs::world::World::new()),
-            info: info.clone(),
-            time_step: 1.0 / crate::FPS,
-        };
-
-        // Install modules
-        crate::install_modules(&mut session);
-
-        // Initialize systems
-        for stage in &mut session.stages.stages {
-            stage.initialize(&mut session.world);
-        }
-
-        // Initialize time resource
-        session.world.init_resource::<Time>();
-        // Initialize bevy world resource with an empty bevy world
-        session.world.init_resource::<BevyWorld>();
-        // Set the map
-        session
-            .world
-            .insert_resource(LoadedMap(Arc::new(info.map_meta)));
-
-        // Set player initial character selections
-        let player_inputs = session.world.resource::<PlayerInputs>();
-        let mut player_inputs = player_inputs.borrow_mut();
-        for i in 0..MAX_PLAYERS {
-            if let Some(info) = info.player_info[i].take() {
-                player_inputs.players[i].active = true;
-                player_inputs.players[i].selected_player = info.player;
-                player_inputs.players[i].selected_hat = info.hat;
-                player_inputs.players[i].is_ai = info.is_ai;
-            }
-        }
-
-        session.set_metadata(info.meta);
-
-        session
-    }
-
-    /// Set the game metadata.
-    ///
-    /// This may be used to change game metadata in the middle of the session.
-    pub fn set_metadata(&mut self, metadata: Arc<CoreMeta>) {
-        self.world.insert_resource(CoreMetaArc(metadata));
-    }
-
-    /// Provide a closure to update the game inputs.
-    pub fn update_input<R, F: FnOnce(&mut PlayerInputs) -> R>(&mut self, update: F) -> R {
-        let inputs = self.world.resource::<PlayerInputs>();
-        let mut inputs = inputs.borrow_mut();
-
-        update(&mut inputs)
-    }
-
-    pub fn restart(&mut self) {
-        *self = Self::new(self.info.clone());
-    }
-
-    /// Run a single simulation frame
-    pub fn advance(&mut self, bevy_world: &mut ::bevy::prelude::World) {
-        puffin::profile_function!();
-
-        // Update the window resource
-        let window_resource = self.world.resource::<Window>();
-        let mut bevy_windows = bevy_world
-            .query_filtered::<&::bevy::window::Window, ::bevy::prelude::With<::bevy::window::PrimaryWindow>>();
-
-        if let Ok(window) = bevy_windows.get_single_mut(bevy_world) {
-            window_resource.borrow_mut().size = Vec2::new(window.width(), window.height());
-        }
-
-        // Make bevy world available to the bones ECS world.
-        {
-            let world_resource = self.world.resource::<BevyWorld>();
-            let mut world_resource = world_resource.borrow_mut();
-            let mut scratch_world = self.scratch_world.take().unwrap();
-            std::mem::swap(&mut scratch_world, bevy_world);
-            world_resource.0 = Some(scratch_world);
-        }
-        for stage in &mut self.stages.stages {
-            let stage_name = stage.name();
-            puffin::profile_scope!("Run Stage", stage_name);
-            stage.run(&mut self.world).unwrap();
-        }
-
-        // Advance the simulation time
-        let time_resource = self.world.resource::<Time>();
-        time_resource
-            .borrow_mut()
-            .advance_exact(std::time::Duration::from_secs_f32(self.time_step));
-
-        self.world.maintain();
-
-        // Swap the bevy world back to normal.
-        {
-            let world_resource = self.world.resource::<BevyWorld>();
-            let mut world_resource = world_resource.borrow_mut();
-            let mut scratch_world = world_resource.0.take().unwrap();
-            std::mem::swap(bevy_world, &mut scratch_world);
-            self.scratch_world = Some(scratch_world);
-        }
-
-        // Clear editor input from player inputs
-        {
-            let player_inputs = self.world.resource::<PlayerInputs>();
-            let mut player_inputs = player_inputs.borrow_mut();
-            for input in &mut player_inputs.players {
-                input.editor_input = None;
-            }
-        }
-    }
-
-    /// Export the current map metadata by scanning the world entities. This means that the export
-    /// will include any modifications to the map made at runtime ( most likely by the editor ).
-    pub fn export_map(&self) -> MapMeta {
-        let export_system =
-            move |map_meta: Res<SpawnedMapMeta>,
-                  entities: Res<Entities>,
-                  tile_layers: Comp<TileLayer>,
-                  spawned_map_layer_metas: Comp<SpawnedMapLayerMeta>,
-                  tile_collisions: Comp<TileCollisionKind>,
-                  tiles: Comp<Tile>,
-                  transforms: Comp<Transform>,
-                  element_handles: Comp<ElementHandle>| {
-                let mut layers = map_meta
-                    .layer_names
-                    .iter()
-                    .map(|name| MapLayerMeta {
-                        id: name.clone(),
-                        tilemap: default(),
-                        tiles: default(),
-                        elements: default(),
-                    })
-                    .collect::<Vec<_>>();
-
-                // Export the tile layers
-                for (_ent, (tile_layer, layer_meta)) in
-                    entities.iter_with((&tile_layers, &spawned_map_layer_metas))
-                {
-                    let layer_idx = layer_meta.layer_idx;
-                    let layer = &mut layers[layer_idx];
-                    if tile_layer.atlas.path == AssetPath::default() {
-                        // Skip layers with dummy atlases
-                        continue;
-                    }
-                    layer.tilemap = Some(tile_layer.atlas.clone());
-                    layer.tiles = tile_layer
-                        .tiles
-                        .iter()
-                        .enumerate()
-                        .filter_map(|(i, ent)| {
-                            ent.map(|ent| {
-                                let collision =
-                                    tile_collisions.get(ent).copied().unwrap_or_default();
-                                let tile = tiles.get(ent).unwrap();
-                                let i = i as u32;
-                                let y = i / map_meta.grid_size.x;
-                                let x = i - (y * map_meta.grid_size.x);
-                                MapTileMeta {
-                                    pos: UVec2::new(x, y),
-                                    idx: tile.idx as u32,
-                                    collision,
-                                }
-                            })
-                        })
-                        .collect();
-                }
-
-                // Export the entity layers
-                for (_ent, (element_handle, transform, layer_meta)) in
-                    entities.iter_with((&element_handles, &transforms, &spawned_map_layer_metas))
-                {
-                    let layer_idx = layer_meta.layer_idx;
-                    let layer = &mut layers[layer_idx];
-
-                    layer.elements.push(ElementSpawn {
-                        pos: transform.translation.truncate(),
-                        element: element_handle.0.clone(),
-                    });
-                }
-
-                // Return complete map metadata
-                Ok(MapMeta {
-                    name: map_meta.name.to_string(),
-                    background: (*map_meta.background).clone(),
-                    background_color: map_meta.background_color,
-                    grid_size: map_meta.grid_size,
-                    tile_size: map_meta.tile_size,
-                    layers,
-                })
-            };
-
-        self.world.run_initialized_system(export_system).unwrap()
-    }
-
-    /// Snapshot the world state
-    pub fn snapshot(&self) -> World {
-        self.world.clone()
-    }
-
-    /// Restore the world state
-    ///
-    /// Will write the current state to `world`.
-    pub fn restore(&mut self, world: &mut World) {
-        std::mem::swap(&mut self.world, world)
-    }
-}
diff --git a/deny.toml b/deny.toml
index b9e402f55d..62cadb29ea 100644
--- a/deny.toml
+++ b/deny.toml
@@ -4,33 +4,30 @@
 [licenses]
 unlicensed = "deny"
 allow = [
-    "MIT",
-    "Apache-2.0",
-    "Unlicense",
-    "Zlib",
-    "Apache-2.0 WITH LLVM-exception",
-    "Unicode-DFS-2016",
-    "BSD-3-Clause",
-    "BSL-1.0",
-    "MIT-0",
-    "OFL-1.1",
-    "LicenseRef-UFL-1.0",
-    "CC0-1.0",
-    "ISC",
-    "BSD-2-Clause",
-    "MPL-2.0", # TODO(zicklag): I believe MPL is fine for us, but maybe double-check this.
-    "OpenSSL",
+  "MIT",
+  "Apache-2.0",
+  "Unlicense",
+  "Zlib",
+  "Apache-2.0 WITH LLVM-exception",
+  "Unicode-DFS-2016",
+  "BSD-3-Clause",
+  "BSL-1.0",
+  "MIT-0",
+  "OFL-1.1",
+  "LicenseRef-UFL-1.0",
+  "CC0-1.0",
+  "ISC",
+  "BSD-2-Clause",
+  "BSD-2-Clause-Patent",
+  "MPL-2.0",
+  "OpenSSL",
 ]
 default = "deny"
 
 [[licenses.clarify]]
-name = "ring"
-expression = "OpenSSL"
-license-files = [
-    { path = "LICENSE", hash = 0xbd0eed23 }
-]
+name          = "ring"
+expression    = "OpenSSL"
+license-files = [{ path = "LICENSE", hash = 0xbd0eed23 }]
 
 [sources.allow-org]
-github = [
-    "fishfolk",
-]
+github = ["fishfolk"]
diff --git a/examples/core_usage.rs b/examples/core_usage.rs
deleted file mode 100644
index a656a78b8b..0000000000
--- a/examples/core_usage.rs
+++ /dev/null
@@ -1,234 +0,0 @@
-//! This is an example of running Jumpy core without the complicated wrapper presented by the
-//! `jumpy` crate.
-//!
-//! This should help demonstrate what is necessary to run a core Jumpy session using just [`bevy`]
-//! and [`bones_bevy_renderer`].
-
-use std::{sync::Arc, time::Duration};
-
-use bevy::{
-    prelude::*,
-    time::common_conditions::on_timer,
-    window::{PrimaryWindow, WindowMode},
-};
-use bevy_kira_audio::prelude::*;
-use bones_bevy_renderer::*;
-
-use jumpy_core::{
-    bevy_prelude::*, metadata::JumpyCoreAssetsPlugin, session::GameSessionPlayerInfo,
-};
-
-#[cfg(not(target_arch = "wasm32"))]
-#[global_allocator]
-static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
-
-#[derive(Deref, DerefMut, Resource)]
-struct Session(CoreSession);
-
-impl HasBonesWorld for Session {
-    fn world(&mut self) -> &mut bones_lib::prelude::World {
-        &mut self.world
-    }
-}
-
-#[derive(Debug, Hash, PartialEq, Eq, Clone, SystemSet)]
-#[system_set(base)]
-pub struct JumpyCoreUpdate;
-
-pub fn main() {
-    App::new()
-        .add_plugins(
-            DefaultPlugins
-                .set(ImagePlugin::default_nearest())
-                .set(AssetPlugin {
-                    watch_for_changes: true,
-                    ..default()
-                }),
-        )
-        .add_plugin(AudioPlugin)
-        .add_plugin(bevy::diagnostic::FrameTimeDiagnosticsPlugin)
-        .add_plugin(bevy::diagnostic::LogDiagnosticsPlugin::default())
-        .add_plugin(BonesRendererPlugin::<Session>::new())
-        .add_plugin(JumpyCoreAssetsPlugin)
-        .add_startup_system(setup)
-        .add_system(load)
-        .init_resource::<Snapshot>()
-        .add_system(snapshot_restore)
-        .configure_set(JumpyCoreUpdate.before(CoreSet::Update))
-        .add_systems(
-            (update_input, update_game, play_sounds)
-                .in_base_set(JumpyCoreUpdate)
-                .distributive_run_if(on_timer(Duration::from_secs_f32(1.0 / 60.0))),
-        )
-        .run();
-}
-
-/// Marker component for entities that are rendered for bones.
-#[derive(Component)]
-struct BevyBones;
-
-#[derive(Resource)]
-struct CoreMetaHandle(pub Handle<CoreMeta>);
-
-/// Setup the game, loading the metadata and starting the game session.
-fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
-    let handle = asset_server.load("default.core.yaml");
-
-    commands.insert_resource(CoreMetaHandle(handle));
-}
-
-/// Wait for game meta to load, and then start the game session.
-fn load(
-    mut commands: Commands,
-    session: Option<ResMut<Session>>,
-    meta_handle: Option<Res<CoreMetaHandle>>,
-    mut core_meta_assets: ResMut<Assets<CoreMeta>>,
-    map_assets: Res<Assets<MapMeta>>,
-) {
-    if session.is_some() {
-        return;
-    }
-    let Some(meta_handle) = meta_handle else {
-        return;
-    };
-    let Some(meta) = core_meta_assets.remove(&meta_handle.0)  else {
-        return;
-    };
-
-    let session = CoreSession::new(CoreSessionInfo {
-        map_meta: map_assets
-            .get(&meta.stable_maps[0].get_bevy_handle())
-            .unwrap()
-            .clone(),
-        player_info: [
-            Some(GameSessionPlayerInfo {
-                player: meta.players[0].clone(),
-                hat: Some(meta.player_hats[0].clone()),
-                is_ai: false,
-            }),
-            Some(GameSessionPlayerInfo {
-                player: meta.players[0].clone(),
-                hat: Some(meta.player_hats[1].clone()),
-                is_ai: true,
-            }),
-            None,
-            None,
-        ],
-        meta: Arc::new(meta),
-    });
-
-    commands.insert_resource(Session(session));
-}
-
-/// Update the game session input.
-fn update_input(
-    session: Option<ResMut<Session>>,
-    keyboard: Res<Input<KeyCode>>,
-    mut window_q: Query<&mut Window, With<PrimaryWindow>>,
-) {
-    let Some(mut session) = session else {
-        return;
-    };
-
-    if keyboard.just_pressed(KeyCode::F11) {
-        if let Ok(mut window) = window_q.get_single_mut() {
-            window.mode = match window.mode {
-                WindowMode::BorderlessFullscreen => WindowMode::Windowed,
-                _ => WindowMode::BorderlessFullscreen,
-            };
-        }
-    }
-
-    session.update_input(|inputs| {
-        let control = &mut inputs.players[0].control;
-
-        let jump_pressed = keyboard.pressed(KeyCode::Space);
-        control.jump_just_pressed = jump_pressed && !control.jump_pressed;
-        control.jump_pressed = jump_pressed;
-
-        let grab_pressed = keyboard.pressed(KeyCode::B);
-        control.grab_just_pressed = grab_pressed && !control.grab_pressed;
-        control.grab_pressed = grab_pressed;
-
-        let shoot_pressed = keyboard.pressed(KeyCode::V);
-        control.shoot_just_pressed = shoot_pressed && !control.shoot_pressed;
-        control.shoot_pressed = shoot_pressed;
-
-        let mut move_direction = Vec2::ZERO;
-        if keyboard.pressed(KeyCode::D) {
-            move_direction += Vec2::X;
-        }
-        if keyboard.pressed(KeyCode::A) {
-            move_direction += Vec2::NEG_X;
-        }
-        if keyboard.pressed(KeyCode::W) {
-            move_direction += Vec2::Y;
-        }
-        if keyboard.pressed(KeyCode::S) {
-            move_direction += Vec2::NEG_Y;
-        }
-        control.move_direction = move_direction.normalize_or_zero();
-    });
-}
-
-/// Update the game simulation.
-fn update_game(world: &mut World) {
-    let Some(mut session) = world.remove_resource::<Session>() else {
-        return;
-    };
-
-    // Advance the game session
-    session.advance(world);
-
-    world.insert_resource(session);
-}
-
-#[derive(Resource, Default)]
-struct Snapshot(pub Option<bones::World>);
-
-fn snapshot_restore(
-    mut snapshot: ResMut<Snapshot>,
-    keyboard: Res<Input<KeyCode>>,
-    session: Option<ResMut<Session>>,
-) {
-    let Some(mut session) = session else {
-        return;
-    };
-
-    if keyboard.just_pressed(KeyCode::F9) {
-        snapshot.0 = Some(session.snapshot());
-    }
-
-    if keyboard.just_pressed(KeyCode::F10) {
-        if let Some(mut snapshot) = snapshot.0.clone() {
-            session.restore(&mut snapshot);
-        }
-    }
-}
-
-fn play_sounds(audio: Res<bevy_kira_audio::Audio>, session: Option<Res<Session>>) {
-    let Some(session) = session else {
-        return;
-    };
-    // Get the sound queue out of the world
-    let queue = session
-        .world
-        .run_initialized_system(move |mut audio_events: bones::ResMut<bones::AudioEvents>| {
-            Ok(audio_events.queue.drain(..).collect::<Vec<_>>())
-        })
-        .unwrap();
-
-    // Play all the sounds in the queue
-    for event in queue {
-        match event {
-            bones::AudioEvent::PlaySound {
-                sound_source,
-                volume,
-            } => {
-                audio
-                    .play(sound_source.get_bevy_handle_untyped().typed())
-                    .with_volume(volume);
-            }
-        }
-    }
-}
diff --git a/rust-toolchain b/rust-toolchain
index 77c582d8d9..5e3a425662 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-1.67.0
\ No newline at end of file
+1.73.0
diff --git a/src/README.md b/src/README.md
index 30a35a6dbb..bd5a1fbf70 100644
--- a/src/README.md
+++ b/src/README.md
@@ -12,30 +12,16 @@ Jumpy is still under heavy development and the docs as well as the code will be
 incomplete. If you want to help out, feel free to fill in some missing docs or clarify something we
 didn't explain very well. We're glad to answer any questions you might have along the way!
 
-### Organization
-
-The [`main()`] function is the first function called in the game. It creates the Bevy [`App`], installs our plugins, and starts the game.
-
-All of the game logic is wrapped up in Bevy plugins. There is very often a plugin for each of the
-top-level modules. The names of our custom plugins are prefixed with `Jumpy` so that they can be
-easily recognized from 3rd party plugins that we also install. For example, we have the
-[`JumpyUiPlugin`] and the [`JumpySessionPlugin`] which reside in the [`ui`] and [`session`] modules
-respectively.
-
-Each of the modules contains it's own docs. Some of these may be simple, and others, such as the
-[`networking`] module have guide-level explanations on that facet of the game.
-
-Feel free to explore whatever seems interesting to you, and please [open an issue][gh_issue] if you
-feel like something is missing, or would like further guidance on a particular topic!
-
 #### Diagrams
 
-Throughout the docs there are diagrams to explain certain topics. These may contain clickable links, highlighted in blue, that will bring you to the relevant module or struct. We also use a convention to indicate what kind of code object it links to, based on the shape of the box.
+Throughout the docs there are diagrams to explain certain topics. These may contain clickable links,
+highlighted in blue, that will bring you to the relevant module or struct. We also use a convention to
+indicate what kind of code object it links to, based on the shape of the box.
 
 <pre class="mermaid">
 graph LR
-  ex("Example Link ( Note )"):::dotted -.-> sm(SessionManager):::code
-  click sm call docLink(jumpy/session/struct.SessionManager.html)
+  ex("Example Link ( Note )"):::dotted -.-> sm(GameMeta):::code
+  click sm call docLink(jumpy/struct.GameMeta.html)
 
   crate:::code --> module([module]):::code --> struct(struct):::code --> concept>Concept]
 </pre>
@@ -46,64 +32,14 @@ You can pan the diagram by clicking and dragging or zoom by holding `ctrl` and s
 
 ## Overall Architecture
 
-There are a few major crates that are used in Jumpy:
-
-- [Jumpy Core][::jumpy_core] - Core Gameplay Logic
-- [Bones](https://fishfolk.org/development/bones/introduction/) - Core Entity Component System & Rendering Components
-- [Bevy](https://bevyengine.org) - Rendering, Asset Loading, and User Input
-
-<pre class="mermaid">
-graph TD
-  subgraph jumpy
-    direction TB
+Jumpy has just finished a migration to the new [`bones_framework`] and some of the docs might not
+be up-to-date yet.
 
-    SessionManager(SessionManager):::code
-    bevyInput --> SessionManager
+The good news is that everything is simpler now! All of jumpy has been moved to one crate with many
+of it's more foundational features being moved into [`bones_framework`]. Additionally, Jumpy no longer
+uses Bevy or the Bevy ECS directly. The game is fully built on Bones with Bevy being used in the
+background, but only for rendering.
 
-    click SessionManager call docLink(jumpy/session/struct.SessionManager.html)
-    ui([ui]):::code
-    click ui call docLink(jumpy/ui/index.html)
-    editor([editor]):::code
-    click editor call docLink(jumpy/ui/editor/index.html)
-    localization([localization]):::code
-    click localization call docLink(jumpy/localization/index.html)
-    networking([networking]):::code
-    click networking call docLink(jumpy/networking/index.html)
+An explanation post and more up-to-date docs are comming soon!
 
-    subgraph jumpy_core
-      CoreSession(CoreSession):::code
-      click CoreSession call docLink(jumpy_core/session/struct.CoreSession.html)
-      gameplaySystems>Gameplay Systems]
-      CoreSession --> gameplaySystems
-    end
-    SessionManager --> CoreSession
-    SessionManager -.- networking
-
-    gameplaySystems -- Update --> World
-
-    subgraph bones
-      World(World):::code
-      click World href "https://fishfolk.github.io/bones/rustdoc/bones_ecs/struct.World.html"
-      renderingComponents("Rendering / Audio
-          Components"):::dotted
-      renderingComponents -.- World
-    end
-
-    World -- Sound State --> bevy_kira_audio:::code
-    World -- World State --> bones_bevy_renderer:::code
-    click bevy_kira_audio href "https://docs.rs/bevy_kira_audio/latest/bevy_kira_audio/"
-    click bones_bevy_renderer href "https://fishfolk.github.io/bones/rustdoc/bones_bevy_renderer/index.html"
-
-    ui --> bevyRenderer
-    editor -.- ui
-    localization -.- ui
-
-    bones_bevy_renderer --> bevyRenderer
-
-    subgraph bevy
-      bevyInput[\"User Input
-      Assets"/]
-      bevyRenderer[/Renderer\]
-    end
-  end
-</pre>
+[`bones_framework`]: https://fishfolk.github.io/bones/rustdoc/bones_framework/index.html
diff --git a/src/assets.rs b/src/assets.rs
deleted file mode 100644
index 6bbf13c34a..0000000000
--- a/src/assets.rs
+++ /dev/null
@@ -1,55 +0,0 @@
-//! Custom asset loaders and handle types.
-
-use bevy::{
-    asset::{AssetLoader, LoadedAsset},
-    reflect::TypeUuid,
-};
-use bevy_egui::egui;
-use bones_bevy_asset::BonesBevyAssetAppExt;
-
-use crate::{metadata::GameMeta, prelude::*};
-
-#[doc(hidden)]
-mod asset_handle;
-pub use asset_handle::AssetHandle;
-
-/// Asset plugin.
-pub struct JumpyAssetPlugin;
-
-impl Plugin for JumpyAssetPlugin {
-    fn build(&self, app: &mut App) {
-        app.add_bones_asset::<GameMeta>()
-            .add_asset::<EguiFont>()
-            .add_asset_loader(EguiFontLoader);
-    }
-}
-
-/// Asset type containing [`egui::FontData`][crate::external::egui::FontData].
-#[derive(Debug, Clone, TypeUuid)]
-#[uuid = "421c9e38-89be-43ff-a293-6fea65abf946"]
-pub struct EguiFont(pub egui::FontData);
-
-/// Bevy asset loader for [`EguiFont`] assets.
-pub struct EguiFontLoader;
-
-impl AssetLoader for EguiFontLoader {
-    fn load<'a>(
-        &'a self,
-        bytes: &'a [u8],
-        load_context: &'a mut bevy::asset::LoadContext,
-    ) -> bevy::utils::BoxedFuture<'a, Result<(), anyhow::Error>> {
-        Box::pin(async move {
-            let path = load_context.path();
-            let data = egui::FontData::from_owned(bytes.to_vec());
-            trace!(?path, "Loaded font asset");
-
-            load_context.set_default_asset(LoadedAsset::new(EguiFont(data)));
-
-            Ok(())
-        })
-    }
-
-    fn extensions(&self) -> &[&str] {
-        &["ttf"]
-    }
-}
diff --git a/src/assets/asset_handle.rs b/src/assets/asset_handle.rs
deleted file mode 100644
index 7b355a225d..0000000000
--- a/src/assets/asset_handle.rs
+++ /dev/null
@@ -1,131 +0,0 @@
-use std::{
-    path::{Path, PathBuf},
-    sync::Arc,
-};
-
-use bevy::asset::{Asset, AssetPath};
-use bones_bevy_asset::BonesBevyAssetLoad;
-use normalize_path::NormalizePath;
-
-use crate::prelude::*;
-
-/// A wrapper around [`Handle<T>`] that also contains the
-/// [`AssetPath`][crate::external::bevy::asset::AssetPath] used to load the asset.
-///
-/// Unlike [`Handle<T>`], this type is serializable and deserializable and can be sent over the
-/// network.
-///
-/// > **ℹ️ Note:** When deserializing an [`AssetHandle`] you will always get a **weak** handle.
-#[derive(Component)]
-pub struct AssetHandle<T: Asset> {
-    pub inner: Handle<T>,
-    pub asset_path: Arc<AssetPath<'static>>,
-}
-
-impl<T: Asset> Default for AssetHandle<T> {
-    fn default() -> Self {
-        Self {
-            inner: Default::default(),
-            asset_path: Arc::new("<dummy_path>".into()),
-        }
-    }
-}
-
-impl<T: Asset> Clone for AssetHandle<T> {
-    fn clone(&self) -> Self {
-        Self {
-            inner: self.inner.clone(),
-            asset_path: self.asset_path.clone(),
-        }
-    }
-}
-
-impl<T: Asset> std::fmt::Debug for AssetHandle<T> {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("AssetHandle")
-            .field("handle", &self.inner)
-            .field("asset_path", &self.asset_path)
-            .finish()
-    }
-}
-
-impl<T: Asset> std::ops::Deref for AssetHandle<T> {
-    type Target = Handle<T>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.inner
-    }
-}
-
-impl<T: Asset> AssetHandle<T> {
-    pub fn new(asset_path: AssetPath<'static>, handle: Handle<T>) -> Self {
-        Self {
-            asset_path: Arc::new(asset_path),
-            inner: handle,
-        }
-    }
-
-    pub fn clone_weak(&self) -> Self {
-        Self {
-            inner: self.inner.clone_weak(),
-            asset_path: self.asset_path.clone(),
-        }
-    }
-}
-
-impl<T: Asset> Serialize for AssetHandle<T> {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        self.asset_path.serialize(serializer)
-    }
-}
-
-impl<'de, T: Asset> Deserialize<'de> for AssetHandle<T> {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        let asset_path = String::deserialize(deserializer)?;
-        let asset_path: AssetPath = asset_path.into();
-        let handle = Handle::<T>::weak(asset_path.get_id().into());
-
-        Ok(Self {
-            inner: handle,
-            asset_path: Arc::new(asset_path),
-        })
-    }
-}
-
-impl<T: Asset> BonesBevyAssetLoad for AssetHandle<T> {
-    fn load(
-        &mut self,
-        load_context: &mut bevy::asset::LoadContext,
-        dependencies: &mut Vec<bevy::asset::AssetPath<'static>>,
-    ) {
-        let base_path = load_context.path();
-        let new_path = get_normalized_relative_path(base_path, self.asset_path.path());
-        let new_path = AssetPath::new(new_path, self.asset_path.label().map(|x| x.to_owned()));
-        dependencies.push(new_path.clone());
-        self.asset_path = Arc::new(new_path);
-
-        self.inner = load_context.get_handle(self.asset_path.get_id());
-    }
-}
-
-/// Calculate an asset's full path relative to another asset
-fn get_normalized_relative_path(base_path: &Path, relative_path: &Path) -> PathBuf {
-    let is_relative = !relative_path.starts_with("/");
-
-    let path = if is_relative {
-        let base = base_path.parent().unwrap_or_else(|| Path::new(""));
-        base.join(relative_path)
-    } else {
-        Path::new(relative_path)
-            .strip_prefix("/")
-            .unwrap()
-            .to_owned()
-    };
-    path.normalize()
-}
diff --git a/src/audio.rs b/src/audio.rs
deleted file mode 100644
index 551cdf590b..0000000000
--- a/src/audio.rs
+++ /dev/null
@@ -1,195 +0,0 @@
-//! Audio & music plugin.
-//!
-//! Audio playback in Jumpy is powered by [`bevy_kira_audio`]. This module sets up the audio plugin,
-//! and installs our [`MusicChannel`] and [`EffectsChannel`] for playing music and sound effects.
-//!
-//! Also in this module is the [`music_system`] which handles playing the right music in different
-//! game states.
-//!
-//! Game sounds are _not_ handled here. Game sounds events are created in
-//! [`jumpy_core`][::jumpy_core] and then processed and sent to the effects channel by the
-//! [`play_sounds()`][crate::session::play_sounds] system.
-//!
-//! [`bevy_kira_audio`]: https://docs.rs/bevy_kira_audio
-
-use std::time::Duration;
-
-use bevy_kira_audio::{
-    AudioApp, AudioChannel, AudioControl, AudioInstance, AudioSource, PlaybackState,
-};
-use rand::{seq::SliceRandom, thread_rng};
-
-use crate::{main_menu::MenuPage, metadata::GameMeta, prelude::*};
-
-/// Audio & Music plugin.
-pub struct JumpyAudioPlugin;
-
-impl Plugin for JumpyAudioPlugin {
-    fn build(&self, app: &mut App) {
-        app.add_plugin(bevy_kira_audio::AudioPlugin)
-            .init_resource::<MusicState>()
-            .init_resource::<ShuffledPlaylist>()
-            .add_audio_channel::<MusicChannel>()
-            .add_audio_channel::<EffectsChannel>()
-            .add_startup_system(setup_audio_defaults)
-            .add_system(music_system.run_if(resource_exists::<GameMeta>()));
-    }
-}
-
-/// Marker struct for the music audio channel.
-#[derive(Resource)]
-pub struct MusicChannel;
-
-/// Marker struct for the effects audio channel.
-#[derive(Resource)]
-pub struct EffectsChannel;
-
-/// The music playback state.
-#[derive(Resource, Clone, Debug, Default)]
-pub enum MusicState {
-    /// Music is not playing.
-    #[default]
-    None,
-    /// Playing the main menu music.
-    MainMenu(Handle<AudioInstance>),
-    /// Playing the character select music.
-    CharacterSelect(Handle<AudioInstance>),
-    /// Playing the credits music.
-    Credits(Handle<AudioInstance>),
-    /// Playing the fight music.
-    Fight {
-        /// The handle to the audio instance.
-        instance: Handle<AudioInstance>,
-        /// The index of the song in the shuffled playlist.
-        idx: usize,
-    },
-}
-
-impl MusicState {
-    /// Get the current audio instance, if one is contained.
-    fn current_instance(&self) -> Option<&Handle<AudioInstance>> {
-        match self {
-            MusicState::None => None,
-            MusicState::MainMenu(i) => Some(i),
-            MusicState::CharacterSelect(i) => Some(i),
-            MusicState::Credits(i) => Some(i),
-            MusicState::Fight { instance, .. } => Some(instance),
-        }
-    }
-}
-
-/// Bevy resource containing the in-game music playlist shuffled.
-#[derive(Resource, Deref, DerefMut, Clone, Debug, Default)]
-pub struct ShuffledPlaylist(pub Vec<AssetHandle<AudioSource>>);
-
-/// Sets the default music and effects volume.
-///
-/// TODO: make this configurable in the settings menu.
-fn setup_audio_defaults(
-    music: Res<AudioChannel<MusicChannel>>,
-    effects: Res<AudioChannel<EffectsChannel>>,
-) {
-    music.set_volume(0.22);
-    effects.set_volume(0.1);
-}
-
-/// The amount of time to spend fading the music in and out.
-const MUSIC_FADE_DURATION: Duration = Duration::from_millis(500);
-
-/// System that plays music according to the game mode.
-fn music_system(
-    game: Res<GameMeta>,
-    mut shuffled_fight_music: ResMut<ShuffledPlaylist>,
-    mut music_state: ResMut<MusicState>,
-    mut audio_instances: ResMut<Assets<AudioInstance>>,
-    music: Res<AudioChannel<MusicChannel>>,
-    engine_state: Res<State<EngineState>>,
-    menu_page: Res<MenuPage>,
-) {
-    if shuffled_fight_music.is_empty() || engine_state.is_changed() {
-        let mut songs = game.music.fight.clone();
-        songs.shuffle(&mut thread_rng());
-        **shuffled_fight_music = songs;
-    }
-
-    match engine_state.0 {
-        EngineState::LoadingPlatformStorage | EngineState::LoadingGameData => (),
-        EngineState::InGame => {
-            if let MusicState::Fight { instance, idx } = &mut *music_state {
-                let inst = audio_instances.get(instance).unwrap();
-                if let PlaybackState::Stopped = inst.state() {
-                    *idx += 1;
-                    *idx %= shuffled_fight_music.len();
-
-                    *instance = music
-                        .play(shuffled_fight_music[*idx].inner.clone_weak())
-                        .linear_fade_in(MUSIC_FADE_DURATION)
-                        .handle();
-                }
-            } else {
-                if let Some(instance) = music_state.current_instance() {
-                    let instance = audio_instances.get_mut(instance).unwrap();
-                    instance.stop(AudioTween::linear(MUSIC_FADE_DURATION));
-                }
-
-                if let Some(song) = shuffled_fight_music.get(0) {
-                    *music_state = MusicState::Fight {
-                        instance: music
-                            .play(song.inner.clone_weak())
-                            .linear_fade_in(MUSIC_FADE_DURATION)
-                            .looped()
-                            .handle(),
-                        idx: 0,
-                    };
-                }
-            }
-        }
-        EngineState::MainMenu => match &*menu_page {
-            MenuPage::PlayerSelect | MenuPage::MapSelect { .. } | MenuPage::NetworkGame => {
-                if !matches!(*music_state, MusicState::CharacterSelect(..)) {
-                    if let Some(instance) = music_state.current_instance() {
-                        let instance = audio_instances.get_mut(instance).unwrap();
-                        instance.stop(AudioTween::linear(MUSIC_FADE_DURATION));
-                    }
-                    *music_state = MusicState::CharacterSelect(
-                        music
-                            .play(game.music.character_screen.inner.clone_weak())
-                            .linear_fade_in(MUSIC_FADE_DURATION)
-                            .looped()
-                            .handle(),
-                    );
-                }
-            }
-            MenuPage::Home | MenuPage::Settings => {
-                if !matches!(*music_state, MusicState::MainMenu(..)) {
-                    if let Some(instance) = music_state.current_instance() {
-                        let instance = audio_instances.get_mut(instance).unwrap();
-                        instance.stop(AudioTween::linear(MUSIC_FADE_DURATION));
-                    }
-                    *music_state = MusicState::MainMenu(
-                        music
-                            .play(game.music.title_screen.inner.clone_weak())
-                            .linear_fade_in(MUSIC_FADE_DURATION)
-                            .looped()
-                            .handle(),
-                    );
-                }
-            }
-            MenuPage::Credits => {
-                if !matches!(*music_state, MusicState::Credits(..)) {
-                    if let Some(instance) = music_state.current_instance() {
-                        let instance = audio_instances.get_mut(instance).unwrap();
-                        instance.stop(AudioTween::linear(MUSIC_FADE_DURATION));
-                    }
-                    *music_state = MusicState::Credits(
-                        music
-                            .play(game.music.credits.inner.clone_weak())
-                            .linear_fade_in(MUSIC_FADE_DURATION)
-                            .looped()
-                            .handle(),
-                    );
-                }
-            }
-        },
-    }
-}
diff --git a/src/bevy_states.rs b/src/bevy_states.rs
deleted file mode 100644
index dd64fff279..0000000000
--- a/src/bevy_states.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-//! Bevy [`States`] used in the game.
-//!
-//! We have three different Bevy state types. The [`EngineState`] is the "parent" or "main" state.
-//! We take advantage of the ability to have multiple different kinds of states in Bevy and have
-//! [`InGameState`] and [`GameEditorState`] represent the game pause state and editor visibility
-//! when the [`EngineState`] is set to [`EngineState::InGame`].
-
-use crate::prelude::*;
-
-/// Bevy [`States`] related to the top-level state of the game.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize, States, Default)]
-pub enum EngineState {
-    /// The initial state: the game is loading it's platform-specific [`Storage`].
-    #[default]
-    LoadingPlatformStorage,
-    /// The game is in the process of loading assets and processing the metadata.
-    ///
-    /// See also: [`load_game()`][loading::GameLoader::load].
-    LoadingGameData,
-    /// The game is on the main menu.
-    ///
-    /// This includes other sub-menus such as player/map selection, and settings menus, etc.
-    MainMenu,
-    /// There is a game match being played.
-    ///
-    /// This includes when you are editing a map, which has a game match going during editing.
-    InGame,
-}
-
-/// Bevy [`States`] that are relevant while the [`EngineState::InGame`] state is active.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize, States, Default)]
-pub enum InGameState {
-    /// The game match is playing.
-    #[default]
-    Playing,
-    /// The game is paused.
-    Paused,
-}
-
-/// Bevy [`States`] tracking the editor visibility, relevant only while the [`EngineState::InGame`]
-/// state is active.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize, States, Default)]
-pub enum GameEditorState {
-    /// The editor is hidden.
-    #[default]
-    Hidden,
-    /// The editor is visible.
-    Visible,
-}
diff --git a/src/camera.rs b/src/camera.rs
deleted file mode 100644
index bb3af4bfea..0000000000
--- a/src/camera.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-//! Utilities for the menu camera.
-//!
-//! The in-game camera is not dealt with here because it will created and managed automatically by
-//! [`bones_bevy_renderer`].
-//!
-//! [`bones_bevy_renderer`]: https://docs.rs/bones_bevy_renderer
-
-use bevy::render::camera::ScalingMode;
-
-use crate::prelude::*;
-
-/// Marker component added to the camera that is used to render the main menu.
-#[derive(Reflect, Component, Default)]
-#[reflect(Component, Default)]
-pub struct MenuCamera;
-
-/// Helper function to spawn the menu camera.
-///
-/// Called in [`loading::GameLoader::load()`].
-pub fn spawn_menu_camera(commands: &mut Commands, core: &CoreMeta) -> Entity {
-    commands
-        .spawn((
-            Name::new("Menu Camera"),
-            MenuCamera,
-            Camera2dBundle {
-                // Note: This is different than just omitting this transform field because
-                // Camera2DBundle's default transform is not the same as Transform::default().
-                transform: default(),
-                projection: OrthographicProjection {
-                    scaling_mode: ScalingMode::FixedVertical(core.camera.default_height),
-                    ..default()
-                },
-                ..default()
-            },
-        ))
-        .id()
-}
diff --git a/src/config.rs b/src/config.rs
deleted file mode 100644
index ed6ebfcc16..0000000000
--- a/src/config.rs
+++ /dev/null
@@ -1,149 +0,0 @@
-//! Jumpy startup configuration parsing.
-//!
-//! The [`EngineConfig`] contains the minimal configuration necessary when starting up the game
-//! initially. This includes the asset dir and the log level.
-//!
-//! [`EngineConfig`] is parsed from commandline arguments or environment variables on native
-//! platforms, and from the query string on web.
-
-use once_cell::sync::Lazy;
-
-/// The name of the environment variable used to set the asset dir.
-pub const ASSET_DIR_ENV_VAR: &str = "JUMPY_ASSET_DIR";
-
-/// The default log level string.
-const DEFAULT_LOG_LEVEL: &str = "info,wgpu=error,bevy_fluent=warn,symphonia_core=warn,symphonia_format_ogg=warn,symphonia_bundle_mp3=warn";
-
-/// The loaded engine config is stored in this static.
-///
-/// It is a lazy static, but the first thing that [`main()`][crate::main()] does is load it so it
-/// will be loaded for the duration of the game's execution.
-pub static ENGINE_CONFIG: Lazy<EngineConfig> = Lazy::new(|| {
-    #[cfg(not(target_arch = "wasm32"))]
-    return <EngineConfig as clap::Parser>::parse();
-
-    #[cfg(target_arch = "wasm32")]
-    return EngineConfig::from_web_params();
-});
-
-/// Jumpy game startup configuration.
-#[derive(Clone, Debug, clap::Parser)]
-#[command(author, version, about)]
-pub struct EngineConfig {
-    /// Hot reload assets
-    #[arg(short = 'R', long)]
-    pub hot_reload: bool,
-
-    /// Sets the sync test distance during local play.
-    ///
-    /// This is useful for developers for testing game rollback determinism without having to start
-    /// a network game.
-    #[arg(short = 'C', long, default_value = "0")]
-    pub sync_test_check_distance: usize,
-
-    /// The directory to load assets from
-    #[arg(short, long, env = ASSET_DIR_ENV_VAR)]
-    pub asset_dir: Option<String>,
-
-    /// The .game.yaml asset to load at startup
-    #[arg(default_value = "default.game.yaml")]
-    pub game_asset: String,
-
-    /// Set the log level
-    ///
-    /// May additionally specify log levels for specific modules as a comma-separated list of
-    /// `module=level` items.
-    #[arg(short = 'l', long, default_value = DEFAULT_LOG_LEVEL)]
-    pub log_level: String,
-}
-
-impl EngineConfig {
-    #[cfg(target_arch = "wasm32")]
-    pub fn from_web_params() -> Self {
-        if let Some(query) = web_sys::window().and_then(|w| w.location().search().ok()) {
-            let mut config = Self::web_default();
-
-            if let Some(asset_dir) = parse_url_query_string(&query, "asset_url") {
-                config.asset_dir = Some(asset_dir.into());
-            }
-
-            if let Some(game_asset) = parse_url_query_string(&query, "game_asset") {
-                config.game_asset = game_asset.into();
-            }
-
-            if let Some(log_level) = parse_url_query_string(&query, "log_level") {
-                config.log_level = log_level.into();
-            }
-
-            config
-        } else {
-            Self::web_default()
-        }
-    }
-
-    #[cfg(target_arch = "wasm32")]
-    fn web_default() -> Self {
-        // Note: It's unfortunate that we have to manually synchronize this with the defaults set
-        // with structopt. If we find a way around that we should use it.
-        Self {
-            hot_reload: false,
-            asset_dir: None,
-            game_asset: "default.game.yaml".into(),
-            log_level: DEFAULT_LOG_LEVEL.into(),
-            sync_test_check_distance: 0,
-        }
-    }
-}
-
-#[cfg(any(target_arch = "wasm32", test))]
-/// Parse the query string as returned by `web_sys::window()?.location().search()?` and get a
-/// specific key out of it.
-pub fn parse_url_query_string<'a>(query: &'a str, search_key: &str) -> Option<&'a str> {
-    let query_string = query.strip_prefix('?')?;
-
-    for pair in query_string.split('&') {
-        let (key, value) = if let Some(idx) = pair.find('=') {
-            let key = &pair[0..idx];
-            let value = &pair[(idx + 1)..];
-
-            (key, value)
-        } else {
-            (pair, "")
-        };
-
-        if key == search_key {
-            return Some(value);
-        }
-    }
-
-    None
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn test_parse_url_query_string() {
-        assert_eq!(
-            Some("info"),
-            parse_url_query_string("?RUST_LOG=info", "RUST_LOG")
-        );
-        assert_eq!(
-            Some("debug"),
-            parse_url_query_string("?RUST_LOG=debug&hello=world&foo=bar", "RUST_LOG")
-        );
-        assert_eq!(
-            Some("debug,wgpu=warn"),
-            parse_url_query_string("?RUST_LOG=debug,wgpu=warn&hello=world&foo=bar", "RUST_LOG")
-        );
-        assert_eq!(
-            Some("trace"),
-            parse_url_query_string("?hello=world&RUST_LOG=trace&foo=bar", "RUST_LOG")
-        );
-        assert_eq!(
-            None,
-            parse_url_query_string("?hello=world&foo=bar", "RUST_LOG")
-        );
-    }
-}
diff --git a/src/console.rs b/src/console.rs
deleted file mode 100644
index a591a15ef4..0000000000
--- a/src/console.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-use std::io;
-
-use async_channel::{Receiver, Sender};
-use bevy::prelude::default;
-#[allow(unused_imports)]
-use bevy::prelude::{App, EventWriter, IntoSystemConfig, Plugin, Res, Resource};
-use byte_pool::BytePool;
-use once_cell::sync::Lazy;
-
-use bevy_console::{ConsolePlugin, ConsoleSet, PrintConsoleLine};
-
-/// Sender and receiver for console log messages.
-///
-/// Messages should be allocated out of the [`CONSOLE_LOG_BUFFER].
-pub struct ConsoleLogChannel {
-    pub receiver: Receiver<byte_pool::Block<'static>>,
-    pub sender: Sender<byte_pool::Block<'static>>,
-}
-impl Default for ConsoleLogChannel {
-    fn default() -> Self {
-        let (sender, receiver) = async_channel::unbounded();
-        Self { sender, receiver }
-    }
-}
-
-/// [`ConsoleLogChannel`] static for sending and receiving console log messages.
-pub static CONSOLE_LOG_CHANNEL: Lazy<ConsoleLogChannel> = Lazy::new(default);
-/// Static buffer pool for log messages to avoid re-allocating every time we send a message over the
-/// channel.
-pub static CONSOLE_LOG_BUFFER: Lazy<BytePool> = Lazy::new(default);
-
-/// Used by `tracing_subscriber::fmt::Layer` to write to `SharedLogBuffer`.
-#[derive(Default)]
-pub struct ConsoleLogBufferWriter;
-
-impl std::io::Write for ConsoleLogBufferWriter {
-    fn write(&mut self, val: &[u8]) -> io::Result<usize> {
-        let mut buf = CONSOLE_LOG_BUFFER.alloc(val.len());
-        buf.copy_from_slice(val);
-        CONSOLE_LOG_CHANNEL.sender.try_send(buf).unwrap();
-        Ok(val.len())
-    }
-
-    // Not needed
-    fn flush(&mut self) -> io::Result<()> {
-        Ok(())
-    }
-}
-
-/// System consuming messages from shared buffer and sending to console.
-fn print_console_logs(mut writer: EventWriter<PrintConsoleLine>) {
-    while let Ok(message) = CONSOLE_LOG_CHANNEL.receiver.try_recv() {
-        let console_line = String::from_utf8(message.to_vec()).unwrap();
-
-        writer.send(PrintConsoleLine {
-            line: console_line.into(),
-        });
-    }
-}
-
-/// Plugin enabling a development console, activated by default with the 'grave' key: `
-/// `ConsoleConfiguration` resource may be specified to change settings and regiser consoole commands.
-pub struct JumpyConsolePlugin;
-
-impl Plugin for JumpyConsolePlugin {
-    fn build(&self, app: &mut App) {
-        app.add_plugin(ConsolePlugin)
-            // This resource may optionally be added by User to register commands or change settings.
-            //
-            //  .insert_resource(ConsoleConfiguration {
-            //      ..Default::default()
-            // })
-            .add_system(print_console_logs.after(ConsoleSet::ConsoleUI));
-    }
-}
diff --git a/src/core.rs b/src/core.rs
new file mode 100644
index 0000000000..62bb261781
--- /dev/null
+++ b/src/core.rs
@@ -0,0 +1,160 @@
+pub mod attachment;
+pub mod audio;
+pub mod bullet;
+pub mod camera;
+pub mod damage;
+pub mod debug;
+pub mod editor;
+pub mod elements;
+pub mod globals;
+pub mod input;
+pub mod item;
+pub mod lifetime;
+pub mod map;
+pub mod map_constructor;
+pub mod metadata;
+pub mod physics;
+pub mod player;
+pub mod random;
+pub mod utils;
+
+/// The target fixed frames-per-second that the game sumulation runs at.
+pub const FPS: f32 = 60.0;
+
+/// The maximum number of players per match.
+pub const MAX_PLAYERS: usize = 4;
+
+use std::time::Duration;
+
+use crate::{prelude::*, settings::PlayerControlMapping};
+
+pub mod prelude {
+    pub use super::{
+        attachment::*, audio::*, bullet::*, camera::*, damage::*, debug::*, editor::*, editor::*,
+        elements::prelude::*, elements::prelude::*, globals::*, input::*, item::*, lifetime::*,
+        map::*, map_constructor::*, metadata::*, physics::*, player::*, random::*, utils::*, FPS,
+        MAX_PLAYERS,
+    };
+}
+
+pub fn game_plugin(game: &mut Game) {
+    PlayerMeta::schema();
+    AudioSource::schema();
+    HatMeta::schema();
+    MapMeta::schema();
+    game.install_plugin(elements::game_plugin)
+        .install_plugin(bullet::game_plugin)
+        .init_shared_resource::<AssetServer>();
+}
+
+pub struct MatchPlugin {
+    pub map: MapMeta,
+    pub player_info: [PlayerInput; MAX_PLAYERS],
+}
+
+pub struct MatchPlayerInfo {
+    /// If control_source is `None` then the player is an AI.
+    pub control_source: Option<ControlSource>,
+    /// The player skin that has been selected.
+    pub selected_player: Handle<PlayerMeta>,
+}
+
+impl SessionPlugin for MatchPlugin {
+    fn install(self, session: &mut Session) {
+        session
+            .install_plugin(DefaultSessionPlugin)
+            .install_plugin(audio::session_plugin);
+
+        physics::install(session);
+        input::install(session);
+        map::install(session);
+        player::plugin(session);
+        elements::session_plugin(session);
+        damage::install(session);
+        camera::install(session);
+        lifetime::install(session);
+        random::plugin(session);
+        debug::plugin(session);
+        item::install(session);
+        attachment::install(session);
+        bullet::session_plugin(session);
+        editor::install(session);
+
+        session.world.insert_resource(LoadedMap(Arc::new(self.map)));
+        session.world.insert_resource(MatchInputs {
+            players: self.player_info,
+        });
+        session.runner = Box::<JumpyDefaultMatchRunner>::default();
+    }
+}
+
+#[derive(Default)]
+pub struct JumpyDefaultMatchRunner {
+    /// The jumpy match runner has it's own input collector instead of using the global one, because
+    /// it needs different `just_[input]` behavior due to it running on a fixed update.
+    pub input_collector: PlayerInputCollector,
+    pub accumulator: f64,
+    pub last_run: Option<Instant>,
+}
+
+impl SessionRunner for JumpyDefaultMatchRunner {
+    fn step(&mut self, frame_start: Instant, world: &mut World, stages: &mut SystemStages) {
+        pub const STEP: f64 = 1.0 / FPS as f64;
+        let last_run = self.last_run.unwrap_or(frame_start);
+        let delta = (frame_start - last_run).as_secs_f64();
+
+        {
+            let keyboard = world.resource::<KeyboardInputs>();
+            let gamepad = world.resource::<GamepadInputs>();
+            self.input_collector.update(
+                &world.resource::<PlayerControlMapping>(),
+                &keyboard,
+                &gamepad,
+            );
+        }
+
+        let mut run = || {
+            // Advance the world time
+            world
+                .resource_mut::<Time>()
+                .advance_exact(Duration::from_secs_f64(STEP));
+
+            let input = self.input_collector.get();
+            {
+                let mut player_inputs = world.resource_mut::<MatchInputs>();
+                (0..MAX_PLAYERS).for_each(|i| {
+                    let player_input = &mut player_inputs.players[i];
+                    let Some(source) = &player_input.control_source else {
+                        return;
+                    };
+                    player_input.control = *input.get(source).unwrap();
+                });
+            }
+
+            // Advance the simulation
+            stages.run(world);
+        };
+
+        self.accumulator += delta;
+
+        let loop_start = Instant::now();
+        loop {
+            if self.accumulator >= STEP {
+                let loop_too_long = (Instant::now() - loop_start).as_secs_f64() > STEP;
+
+                if loop_too_long {
+                    warn!("Frame took too long: couldn't keep up with fixed update.");
+                    self.accumulator = 0.0;
+                    break;
+                } else {
+                    self.accumulator -= STEP;
+                    run()
+                }
+            } else {
+                break;
+            }
+        }
+
+        self.last_run = Some(frame_start);
+    }
+}
diff --git a/core/src/attachment.rs b/src/core/attachment.rs
similarity index 90%
rename from core/src/attachment.rs
rename to src/core/attachment.rs
index 2ac6e8eee0..910f3314c3 100644
--- a/core/src/attachment.rs
+++ b/src/core/attachment.rs
@@ -7,7 +7,7 @@
 //! sure that, for example, a held item will bob up and down with the player.
 use crate::prelude::*;
 
-pub fn install(session: &mut CoreSession) {
+pub fn install(session: &mut Session) {
     session
         .stages
         .add_system_to_stage(CoreStage::Last, update_player_body_attachments)
@@ -24,8 +24,7 @@ pub fn install(session: &mut CoreSession) {
 /// Attachments have special behavior built-in for attaching to other [`Sprite`] or [`AtlasSprite`]
 /// entities. When attached to a sprite, the attached item will automatically flip it's offset when
 /// the sprite is flipped, and will also synchronize it's own flip value, if it has a sprite component.
-#[derive(Clone, Copy, TypeUlid, Debug)]
-#[ulid = "01GQJQ07Z0S07B7EWDA4HW938Q"]
+#[derive(Clone, Copy, HasSchema, Debug, Default)]
 pub struct Attachment {
     /// The entity to attach to.
     pub entity: Entity,
@@ -122,8 +121,7 @@ pub fn update_attachments(
 /// This is similar to the [`Attachment`] component, but it is special in the way that it will
 /// follow the body as it bobs up and down in animations such as standing and walking. This makes it
 /// useful for things like hats, etc., that will stick to the player's body.
-#[derive(Clone, TypeUlid)]
-#[ulid = "01GQQSZS823YZS2RBAPFNBKB8B"]
+#[derive(Clone, HasSchema, Default)]
 pub struct PlayerBodyAttachment {
     /// The player to attach to.
     pub player: Entity,
@@ -154,8 +152,7 @@ impl PlayerBodyAttachment {
 /// This is used by the [`update_player_body_attachments`] system internally.
 ///
 /// It keeps track whether or not an entity had a [`PlayerBodyAttachment`] on the last frame.
-#[derive(Clone, Copy, TypeUlid)]
-#[ulid = "01GQQWDPHAJKNM686ZY425V4XF"]
+#[derive(Clone, Copy, HasSchema, Default)]
 struct HadPlayerBodyAttachmentMarker;
 
 /// System that updates entities with the [`PlayerBodyAttachment`] component.
@@ -166,28 +163,26 @@ fn update_player_body_attachments(
     animated_sprites: Comp<AnimatedSprite>,
     animation_banks: Comp<AnimationBankSprite>,
     player_body_attachments: Comp<PlayerBodyAttachment>,
-    player_inputs: Res<PlayerInputs>,
+    player_inputs: Res<MatchInputs>,
     player_indexes: Comp<PlayerIdx>,
-    player_assets: BevyAssets<PlayerMeta>,
+    assets: Res<AssetServer>,
 ) {
     for (ent, body_attachment) in entities.iter_with(&player_body_attachments) {
         let player_ent = body_attachment.player;
         let player_idx = player_indexes.get(player_ent).unwrap();
-        let player_handle = &player_inputs.players[player_idx.0].selected_player;
-        let Some(meta) = player_assets.get(&player_handle.get_bevy_handle()) else {
-            continue;
-        };
+        let player_handle = player_inputs.players[player_idx.0 as usize].selected_player;
+        let meta = assets.get(player_handle);
         let player_sprite = animated_sprites.get(player_ent).unwrap();
         let current_frame = player_sprite.index;
         let current_anim = animation_banks.get(player_ent).unwrap().current;
 
-        let current_body_offset = meta.layers.body.animations.offsets[&current_anim][current_frame]
-            .body
-            + if body_attachment.head {
-                meta.layers.body.animations.offsets[&current_anim][current_frame].head
-            } else {
-                Vec2::ZERO
-            };
+        let current_body_offset =
+            meta.layers.body.animations.offsets[&current_anim][current_frame as usize].body
+                + if body_attachment.head {
+                    meta.layers.body.animations.offsets[&current_anim][current_frame as usize].head
+                } else {
+                    Vec2::ZERO
+                };
 
         player_body_attachment_markers.insert(ent, HadPlayerBodyAttachmentMarker);
         attachments.insert(
diff --git a/src/core/audio.rs b/src/core/audio.rs
new file mode 100644
index 0000000000..c79bfd4d00
--- /dev/null
+++ b/src/core/audio.rs
@@ -0,0 +1,70 @@
+use std::collections::VecDeque;
+
+use bones_framework::prelude::kira::sound::static_sound::StaticSoundSettings;
+
+use crate::prelude::*;
+
+pub fn session_plugin(session: &mut Session) {
+    session.add_system_to_stage(Last, play_sounds);
+}
+
+/// Resource containing the audio event queue.
+#[derive(Default, HasSchema, Clone, Debug)]
+pub struct AudioEvents {
+    /// List of audio events that haven't been handled by the audio system yet.
+    pub queue: VecDeque<AudioEvent>,
+}
+
+impl AudioEvents {
+    /// Add an event to the audio event queue.
+    pub fn send(&mut self, event: AudioEvent) {
+        self.queue.push_back(event);
+    }
+
+    /// Play a sound.
+    ///
+    /// Shortcut for sending an [`AudioEvent`] with [`send()`][Self::send].
+    pub fn play(&mut self, sound_source: Handle<AudioSource>, volume: f64) {
+        self.queue.push_back(AudioEvent::PlaySound {
+            sound_source,
+            volume,
+        })
+    }
+}
+
+/// An audio event that may be sent to the [`AudioEvents`] resource.
+#[derive(Clone, Debug)]
+pub enum AudioEvent {
+    /// Play a sound.
+    PlaySound {
+        /// The handle to the sound to play.
+        sound_source: Handle<AudioSource>,
+        /// The volume to play the sound at.
+        volume: f64,
+    },
+}
+
+fn play_sounds(
+    audio: Res<AudioManager>,
+    mut audio_events: ResMut<AudioEvents>,
+    assets: Res<AssetServer>,
+) {
+    // Play all the sounds in the queue
+    for event in audio_events.queue.drain(..) {
+        match event {
+            AudioEvent::PlaySound {
+                sound_source,
+                volume,
+            } => {
+                if let Err(e) = audio.borrow_mut().play(
+                    assets
+                        .get(sound_source)
+                        .0
+                        .with_settings(StaticSoundSettings::default().volume(volume)),
+                ) {
+                    warn!("Error playing sound: {e}");
+                };
+            }
+        }
+    }
+}
diff --git a/core/src/bullet.rs b/src/core/bullet.rs
similarity index 80%
rename from core/src/bullet.rs
rename to src/core/bullet.rs
index 2db35625ab..7c6c3128d2 100644
--- a/core/src/bullet.rs
+++ b/src/core/bullet.rs
@@ -2,13 +2,15 @@
 //!
 //! These components are used for things like the musket and sniper rifle bullets.
 
-use crate::{
-    physics::collisions::{Actor, Collider, TileCollisionKind},
-    prelude::*,
-};
+use crate::prelude::*;
+
+pub fn game_plugin(game: &mut Game) {
+    BulletMeta::schema();
+    game.init_shared_resource::<AssetServer>();
+}
 
 /// Install this module.
-pub fn install(session: &mut CoreSession) {
+pub fn session_plugin(session: &mut Session) {
     session
         .stages
         .add_system_to_stage(CoreStage::PreUpdate, hydrate)
@@ -16,8 +18,7 @@ pub fn install(session: &mut CoreSession) {
 }
 
 /// Bullet component.
-#[derive(Clone, Debug, TypeUlid, Copy)]
-#[ulid = "01GQX3KM2A4WPV2NKJNG85TJ3P"]
+#[derive(Clone, Debug, HasSchema, Default, Copy)]
 pub struct Bullet {
     /// The direction that the bullet is moving on the X axis.
     pub direction: f32,
@@ -25,9 +26,25 @@ pub struct Bullet {
     pub owner: Entity,
 }
 
+#[derive(HasSchema, Clone, Debug, Default)]
+#[type_data(metadata_asset("bullet"))]
+#[repr(C)]
+pub struct BulletMeta {
+    pub velocity: Vec2,
+    pub body_diameter: f32,
+    pub atlas: Handle<Atlas>,
+
+    pub lifetime: f32,
+    pub explosion_fps: f32,
+    pub explosion_volume: f64,
+    pub explosion_lifetime: f32,
+    pub explosion_frames: u32,
+    pub explosion_atlas: Handle<Atlas>,
+    pub explosion_sound: Handle<AudioSource>,
+}
+
 /// Component containing the bullet's metadata handle.
-#[derive(Deref, DerefMut, TypeUlid, Clone)]
-#[ulid = "01GR1WH27X84VX22G0JY9J71PC"]
+#[derive(Deref, DerefMut, HasSchema, Default, Clone)]
 pub struct BulletHandle(pub Handle<BulletMeta>);
 
 /// Hydrate bullets.
@@ -37,8 +54,8 @@ fn hydrate(
     mut colliders: CompMut<Collider>,
     mut lifetimes: CompMut<Lifetime>,
     mut atlas_sprites: CompMut<AtlasSprite>,
-    bullet_assets: BevyAssets<BulletMeta>,
     bullet_handles: Comp<BulletHandle>,
+    assets: Res<AssetServer>,
 ) {
     // We consider all entities with bullet handles, but that don't have physics actors on them to
     // be non-hydrated.
@@ -52,17 +69,15 @@ fn hydrate(
 
     for entity in bullets {
         let bullet_handle = bullet_handles.get(entity).unwrap();
-        let Some(bullet_meta) = bullet_assets.get(&bullet_handle.get_bevy_handle()) else {
-                continue;
-            };
+        let bullet_meta = assets.get(bullet_handle.0);
 
         let BulletMeta {
             atlas,
             body_diameter,
             ..
-        } = &bullet_meta;
+        } = &*bullet_meta;
 
-        atlas_sprites.insert(entity, AtlasSprite::new(atlas.clone()));
+        atlas_sprites.insert(entity, AtlasSprite::new(*atlas));
 
         // Setup custom collider
         actors.insert(entity, Actor);
@@ -85,20 +100,17 @@ fn update(
     entities: Res<Entities>,
     mut commands: Commands,
     bullet_handles: Comp<BulletHandle>,
-    bullet_assets: BevyAssets<BulletMeta>,
-
     player_indexes: Comp<PlayerIdx>,
     collision_world: CollisionWorld,
     mut transforms: CompMut<Transform>,
     mut bullets: CompMut<Bullet>,
-    mut audio_events: ResMut<AudioEvents>,
+    mut audio_events: ResMutInit<AudioEvents>,
     invincibles: CompMut<Invincibility>,
     mut emote_regions: CompMut<EmoteRegion>,
+    asset_server: Res<AssetServer>,
 ) {
     for (entity, (bullet, bullet_handle)) in entities.iter_with((&mut bullets, &bullet_handles)) {
-        let Some(bullet_meta) = bullet_assets.get(&bullet_handle.get_bevy_handle()) else {
-            continue;
-        };
+        let bullet_meta = asset_server.get(bullet_handle.0);
 
         let BulletMeta {
             velocity,
@@ -110,7 +122,7 @@ fn update(
             explosion_frames,
             explosion_lifetime,
             ..
-        } = bullet_meta;
+        } = &*bullet_meta;
 
         // Move bullet
         let position = {
@@ -146,7 +158,7 @@ fn update(
 
         // Bullet hit something
         if hit_player || hit_solid {
-            audio_events.play(explosion_sound.clone(), *explosion_volume);
+            audio_events.play(*explosion_sound, *explosion_volume);
 
             let mut explosion_transform = *transforms.get(entity).unwrap();
             explosion_transform.translation.z += 1.0;
@@ -154,10 +166,10 @@ fn update(
             let explosion_fps = *explosion_fps;
             let explosion_frames = *explosion_frames;
             let explosion_lifetime = *explosion_lifetime;
-            let explosion_atlas = explosion_atlas.clone();
+            let explosion_atlas = *explosion_atlas;
 
             commands.add(
-                move |mut entities: ResMut<Entities>,
+                move |mut entities: ResMutInit<Entities>,
                       mut transforms: CompMut<Transform>,
                       mut lifetimes: CompMut<Lifetime>,
                       mut sprites: CompMut<AtlasSprite>,
@@ -172,7 +184,7 @@ fn update(
                         sprites.insert(
                             ent,
                             AtlasSprite {
-                                atlas: explosion_atlas.clone(),
+                                atlas: explosion_atlas,
                                 ..default()
                             },
                         );
diff --git a/core/src/camera.rs b/src/core/camera.rs
similarity index 90%
rename from core/src/camera.rs
rename to src/core/camera.rs
index 71b4ad2b59..8e6ade06ed 100644
--- a/core/src/camera.rs
+++ b/src/core/camera.rs
@@ -3,7 +3,7 @@
 use crate::prelude::*;
 
 /// Install this module.
-pub fn install(session: &mut CoreSession) {
+pub fn install(session: &mut Session) {
     session
         .stages
         .add_system_to_stage(CoreStage::Last, camera_controller);
@@ -13,8 +13,7 @@ pub fn install(session: &mut CoreSession) {
 }
 
 /// A sprite that is spawned as a part of the parallax background.
-#[derive(Clone, TypeUlid)]
-#[ulid = "01GPP1V3PCENFWC8H6H705ST80"]
+#[derive(Clone, HasSchema, Default)]
 pub struct ParallaxBackgroundSprite {
     /// The sprite with `idx` of `0` will be centered, with indexes increasing and decreasing
     /// representing repeated tiles to the right and left respectively.
@@ -24,8 +23,7 @@ pub struct ParallaxBackgroundSprite {
 }
 
 /// The state of the camera.
-#[derive(Clone, Debug, TypeUlid, Default)]
-#[ulid = "01GPV6M1KY0GBRQVJ3WG5CSBBS"]
+#[derive(Clone, Debug, HasSchema, Default)]
 pub struct CameraState {
     /// A rectangle around the player that is larger than the player, and will always move to
     /// contain the player. The camra will seek to contain this rectangle, instead of the player
@@ -42,7 +40,7 @@ pub struct CameraState {
 
 /// Implemenets the camera controller.
 fn camera_controller(
-    game_meta: Res<CoreMetaArc>,
+    meta: Root<GameMeta>,
     entities: Res<Entities>,
     map: Res<LoadedMap>,
     mut cameras: CompMut<Camera>,
@@ -53,10 +51,13 @@ fn camera_controller(
     bodies: Comp<KinematicBody>,
     window: Res<Window>,
 ) {
-    let meta = &game_meta.camera;
+    let meta = &meta.core.camera;
 
-    let Some((_ent, (camera, camera_shake, camera_state))) = entities.iter_with((&mut cameras, &mut camera_shakes, &mut camera_states)).next() else {
-        return
+    let Some((_ent, (camera, camera_shake, camera_state))) = entities
+        .iter_with((&mut cameras, &mut camera_shakes, &mut camera_states))
+        .next()
+    else {
+        return;
     };
     if camera_state.disable_controller {
         return;
@@ -69,7 +70,7 @@ fn camera_controller(
         let camera_box_size = meta.player_camera_box_size;
 
         // Get the player's camera box
-        let camera_box = &mut camera_state.player_camera_rects[player_idx.0];
+        let camera_box = &mut camera_state.player_camera_rects[player_idx.0 as usize];
 
         // If it's not be initialized.
         if camera_box.min == Vec2::ZERO && camera_box.max == Vec2::ZERO {
@@ -106,25 +107,31 @@ fn camera_controller(
 
     let viewport_size = camera
         .viewport
+        .option()
         .map(|x| x.size.as_vec2())
         .unwrap_or(window.size);
     let viewport_aspect = viewport_size.x / viewport_size.y;
     let default_height = meta.default_height;
-    let mut scale = camera.height / default_height;
+    let camera_height = if let CameraSize::FixedHeight(height) = &camera.size {
+        *height
+    } else {
+        400.0
+    };
+    let mut scale = camera_height / default_height;
     let default_width = viewport_aspect * default_height;
     let map_size = map.grid_size.as_vec2() * map.tile_size;
 
     let mut min = Vec2::new(f32::MAX, f32::MAX);
     let mut max = Vec2::new(f32::MIN, f32::MIN);
 
-    let players: Vec<usize> = entities
+    let players: Vec<u32> = entities
         .iter_with(&player_indexes)
         .map(|x| x.1 .0)
         .collect();
     let player_count = players.len();
 
     for player_idx in players {
-        let rect = camera_state.player_camera_rects[player_idx];
+        let rect = camera_state.player_camera_rects[player_idx as usize];
 
         min = (rect.min - vec2(meta.border_left, meta.border_bottom))
             .min(min)
@@ -161,7 +168,7 @@ fn camera_controller(
 
     let delta = camera_pos.truncate() - middle_point;
     let dist = delta * meta.move_lerp_factor;
-    camera.height = scale * default_height;
+    camera.size = CameraSize::FixedHeight(scale * default_height);
     *camera_pos -= dist.extend(0.0);
 }
 
diff --git a/core/src/damage.rs b/src/core/damage.rs
similarity index 92%
rename from core/src/damage.rs
rename to src/core/damage.rs
index 94598860e8..23797527db 100644
--- a/core/src/damage.rs
+++ b/src/core/damage.rs
@@ -4,8 +4,10 @@
 
 use crate::prelude::*;
 
+use super::utils::Rect;
+
 /// Install this module.
-pub fn install(session: &mut CoreSession) {
+pub fn install(session: &mut Session) {
     session
         .stages
         .add_system_to_stage(CoreStage::PostUpdate, kill_players_in_damage_region);
@@ -15,8 +17,7 @@ pub fn install(session: &mut CoreSession) {
 ///
 /// While this _might_ change in the future, damage regions will kill players immediately, so there
 /// is no "damage" field.
-#[derive(Debug, Clone, Default, TypeUlid)]
-#[ulid = "01GP1X5MBXZNEC4Y0WF5AKCA3Z"]
+#[derive(Debug, Clone, Default, HasSchema)]
 pub struct DamageRegion {
     /// The size of the damage region in pixels
     pub size: Vec2,
@@ -32,8 +33,7 @@ impl DamageRegion {
 /// A component that may be added to a damage region entity to indicate the triggering entity.
 ///
 /// If this entity is a player, it will not be harmed by the damage region.
-#[derive(Debug, Clone, TypeUlid)]
-#[ulid = "01GP1X4NM7GMEKKZ4FEZ1RK3T0"]
+#[derive(Debug, Clone, HasSchema, Default)]
 pub struct DamageRegionOwner(pub Entity);
 
 /// System that will eliminate players that are intersecting with a damage region.
diff --git a/core/src/debug.rs b/src/core/debug.rs
similarity index 89%
rename from core/src/debug.rs
rename to src/core/debug.rs
index d910f40423..00450efcaa 100644
--- a/core/src/debug.rs
+++ b/src/core/debug.rs
@@ -4,7 +4,7 @@ use crate::prelude::*;
 use rapier2d::prelude as rapier;
 
 /// Install this module.
-pub fn install(session: &mut CoreSession) {
+pub fn plugin(session: &mut Session) {
     session
         .stages
         .add_system_to_stage(CoreStage::Last, debug_render_colliders)
@@ -13,8 +13,7 @@ pub fn install(session: &mut CoreSession) {
 }
 
 /// Resource configuring various debugging settings.
-#[derive(Copy, Clone, TypeUlid, Default)]
-#[ulid = "01GQG8DR27S5A5S4CR84NE7CXH"]
+#[derive(Copy, Clone, HasSchema, Default)]
 pub struct DebugSettings {
     /// Whether or not to render kinematic collider shapes.
     pub show_kinematic_colliders: bool,
@@ -25,8 +24,8 @@ pub struct DebugSettings {
 }
 
 /// Resource containing the physics debug line entity.
-#[derive(TypeUlid)]
-#[ulid = "01GRYZGG44HPZB3X0N2MT7RMT2"]
+#[derive(HasSchema)]
+#[schema(no_default)]
 pub struct RapierDebugContext {
     path_entity: Entity,
     debug_pipeline: rapier::DebugRenderPipeline,
@@ -74,12 +73,9 @@ impl Clone for RapierDebugContext {
 
 impl FromWorld for RapierDebugContext {
     fn from_world(world: &mut World) -> Self {
-        let entities = world.resource::<Entities>();
-        let mut entities = entities.borrow_mut();
-        let path_entity = entities.create();
+        let path_entity = world.resource_mut::<Entities>().create();
 
-        let transforms = world.components.get::<Transform>();
-        let mut transforms = transforms.borrow_mut();
+        let mut transforms = world.components.get_mut::<Transform>().unwrap();
         transforms.insert(
             path_entity,
             Transform::from_translation(vec3(0.0, 0.0, -1.0)),
@@ -94,11 +90,11 @@ impl FromWorld for RapierDebugContext {
 
 /// Renders debug lines for rapier colliders.
 fn debug_render_colliders(
-    settings: Res<DebugSettings>,
+    settings: ResInit<DebugSettings>,
     mut collision_world: CollisionWorld,
     transforms: Comp<Transform>,
     mut paths: CompMut<Path2d>,
-    mut debug_context: ResMut<RapierDebugContext>,
+    mut debug_context: ResMutInit<RapierDebugContext>,
 ) {
     if settings.show_kinematic_colliders {
         // TODO: It's unfortunate that we are doing an extra sync here, just for debug rendering. We
@@ -136,7 +132,7 @@ fn debug_render_colliders(
 
 /// Renders debug lines for damage regions.
 fn debug_render_damage_regions(
-    settings: Res<DebugSettings>,
+    settings: ResInit<DebugSettings>,
     entities: Res<Entities>,
     regions: Comp<DamageRegion>,
     transforms: Comp<Transform>,
@@ -167,7 +163,7 @@ fn debug_render_damage_regions(
         for (ent, (region, transform)) in entities.iter_with((&regions, &transforms)) {
             paths.insert(
                 ent,
-                path_for_region(transform.rotation.to_euler(glam::EulerRot::XYZ).2, region),
+                path_for_region(transform.rotation.to_euler(EulerRot::XYZ).2, region),
             );
         }
     } else {
@@ -179,7 +175,7 @@ fn debug_render_damage_regions(
 
 /// Renders debug lines for emote regions.
 fn debug_render_emote_regions(
-    settings: Res<DebugSettings>,
+    settings: ResInit<DebugSettings>,
     entities: Res<Entities>,
     regions: Comp<EmoteRegion>,
     transforms: Comp<Transform>,
@@ -211,7 +207,7 @@ fn debug_render_emote_regions(
         for (ent, (region, transform)) in entities.iter_with((&regions, &transforms)) {
             paths.insert(
                 ent,
-                path_for_region(transform.rotation.to_euler(glam::EulerRot::XYZ).2, region),
+                path_for_region(transform.rotation.to_euler(EulerRot::XYZ).2, region),
             );
         }
     } else {
diff --git a/core/src/editor.rs b/src/core/editor.rs
similarity index 84%
rename from core/src/editor.rs
rename to src/core/editor.rs
index e24ad98897..aacf9ebefc 100644
--- a/core/src/editor.rs
+++ b/src/core/editor.rs
@@ -2,13 +2,11 @@
 //!
 //! Allows you to edit the game map while the game is running.
 
-use crate::impl_system_param;
-use crate::map_constructor::shiftnanigans::ShiftnanigansMapConstructor;
-use crate::map_constructor::MapConstructor;
-use crate::{map::z_depth_for_map_layer, prelude::*};
+use crate::core::map_constructor::{shiftnanigans::ShiftnanigansMapConstructor, MapConstructor};
+use crate::prelude::*;
 
 /// Install this module.
-pub fn install(session: &mut CoreSession) {
+pub fn install(session: &mut Session) {
     session
         .stages
         .add_system_to_stage(CoreStage::PreUpdate, handle_editor_input);
@@ -21,12 +19,12 @@ impl_system_param! {
     /// running. This can be used both for manual map editing, and by algorithms for generating or
     /// randomizing maps.
     ///
-    /// Map generators implement the [`MapConstructor`][crate::map_constructor::MapConstructor]
+    /// Map generators implement the [`MapConstructor`][crate::core::map_constructor::MapConstructor]
     /// trait, which is given a [`MapManager`] to make its changes with.
     pub struct MapManager<'a> {
         commands: Commands<'a>,
-        entities: ResMut<'a, Entities>,
-        spawned_map_meta: ResMut<'a, SpawnedMapMeta>,
+        entities: ResMutInit<'a, Entities>,
+        spawned_map_meta: ResMutInit<'a, SpawnedMapMeta>,
         element_handles: CompMut<'a, ElementHandle>,
         transforms: CompMut<'a, Transform>,
         spawned_map_layer_metas: CompMut<'a, SpawnedMapLayerMeta>,
@@ -45,12 +43,12 @@ impl<'a> MapManager<'a> {
         &mut self,
         element_meta_handle: &Handle<ElementMeta>,
         translation: &Vec2,
-        layer_index: usize,
+        layer_index: u32,
     ) {
         let entity = self.entities.create();
         // TODO remove element handles as the underlying elements are removed
         self.element_handles
-            .insert(entity, ElementHandle(element_meta_handle.clone()));
+            .insert(entity, ElementHandle(*element_meta_handle));
         let z_depth = z_depth_for_map_layer(layer_index);
         self.transforms.insert(
             entity,
@@ -64,9 +62,9 @@ impl<'a> MapManager<'a> {
         );
     }
     /// Create a new layer with the given name.
-    pub fn create_layer(&mut self, name: String) {
+    pub fn create_layer(&mut self, name: Ustr) {
         let entity = self.entities.create();
-        let layer_index = self.spawned_map_meta.layer_names.len();
+        let layer_index = self.spawned_map_meta.layer_names.len() as u32;
         self.spawned_map_meta.layer_names = self
             .spawned_map_meta
             .layer_names
@@ -95,8 +93,8 @@ impl<'a> MapManager<'a> {
         );
     }
     /// Delete the layer with the given index.
-    pub fn delete_layer(&mut self, layer_index: usize) {
-        let layer_count = self.spawned_map_meta.layer_names.len();
+    pub fn delete_layer(&mut self, layer_index: u32) {
+        let layer_count = self.spawned_map_meta.layer_names.len() as u32;
         let layers_to_decrement = layer_count - layer_index;
         self.spawned_map_meta.layer_names = self
             .spawned_map_meta
@@ -105,7 +103,13 @@ impl<'a> MapManager<'a> {
             .iter()
             .cloned()
             .enumerate()
-            .filter_map(|(i, name)| if i == layer_index { None } else { Some(name) })
+            .filter_map(|(i, name)| {
+                if i as u32 == layer_index {
+                    None
+                } else {
+                    Some(name)
+                }
+            })
             .collect();
         let mut to_kill = Vec::new();
         self.entities
@@ -130,7 +134,7 @@ impl<'a> MapManager<'a> {
         });
     }
     /// Rename the layer with the given index.
-    pub fn rename_layer(&mut self, layer_index: usize, name: &str) {
+    pub fn rename_layer(&mut self, layer_index: u32, name: &str) {
         self.spawned_map_meta.layer_names = self
             .spawned_map_meta
             .layer_names
@@ -138,7 +142,13 @@ impl<'a> MapManager<'a> {
             .iter()
             .cloned()
             .enumerate()
-            .map(|(i, n)| if i == layer_index { name.to_owned() } else { n })
+            .map(|(i, n)| {
+                if i as u32 == layer_index {
+                    ustr(name)
+                } else {
+                    n
+                }
+            })
             .collect();
     }
     /// Move an element to a new position on the map.
@@ -152,7 +162,7 @@ impl<'a> MapManager<'a> {
         if let Some(element_kill_callback) = self.element_kill_callbacks.get(entity) {
             let system = element_kill_callback.system.clone();
             self.commands
-                .add(move |world: &World| (system.lock().unwrap().run)(world).unwrap());
+                .add(move |world: &World| (system.lock().unwrap().run)(world, ()));
         } else if self.spawner_manager.is_entity_a_spawner(entity) {
             // if the entity is a spawner, there are specific rules around how child entities may be killed
             self.spawner_manager.kill_spawner_entity(
@@ -166,14 +176,14 @@ impl<'a> MapManager<'a> {
         }
     }
     /// Set the tilemap for the given layer.
-    pub fn set_layer_tilemap(&mut self, layer_index: usize, tilemap: &Option<Handle<Atlas>>) {
+    pub fn set_layer_tilemap(&mut self, layer_index: u32, tilemap: &Option<Handle<Atlas>>) {
         if let Some((_, (tile_layer, _))) = self
             .entities
             .iter_with((&mut self.tile_layers, &self.spawned_map_layer_metas))
             .find(|x| x.1 .1.layer_idx == layer_index)
         {
             if let Some(handle) = tilemap {
-                tile_layer.atlas = handle.clone();
+                tile_layer.atlas = *handle;
             } else {
                 tile_layer.atlas = default();
             }
@@ -182,9 +192,9 @@ impl<'a> MapManager<'a> {
     /// Set the tile index of a tile on the given layer.
     pub fn set_tile(
         &mut self,
-        layer_index: usize,
+        layer_index: u32,
         position: UVec2,
-        tilemap_tile_index: &Option<usize>,
+        tilemap_tile_index: &Option<u32>,
         tile_collision_kind: TileCollisionKind,
     ) {
         if let Some((_, (tile_layer, _))) = self
@@ -236,7 +246,7 @@ impl<'a> MapManager<'a> {
         };
     }
     /// Swap the position of two layers.
-    pub fn swap_layer(&mut self, layer_index: usize, is_downward: bool) {
+    pub fn swap_layer(&mut self, layer_index: u32, is_downward: bool) {
         let origin_layer_index = layer_index;
         let other_layer_index = if is_downward {
             origin_layer_index + 1
@@ -244,7 +254,7 @@ impl<'a> MapManager<'a> {
             origin_layer_index - 1
         };
         let mut layer_names = self.spawned_map_meta.layer_names.to_vec();
-        layer_names.swap(origin_layer_index, other_layer_index);
+        layer_names.swap(origin_layer_index as usize, other_layer_index as usize);
         self.spawned_map_meta.layer_names = layer_names.into_iter().collect();
 
         for (_, (transform, layer_meta)) in self
@@ -261,8 +271,8 @@ impl<'a> MapManager<'a> {
         }
     }
     /// Rename the map.
-    pub fn rename_map(&mut self, name: String) {
-        self.spawned_map_meta.name = name.into();
+    pub fn rename_map(&mut self, name: &str) {
+        self.spawned_map_meta.name = ustr(name);
     }
     /// Get the size of the map.
     pub fn get_size(&self) -> UVec2 {
@@ -274,17 +284,12 @@ impl<'a> MapManager<'a> {
     }
     /// Clear all the tiles on the map.
     pub fn clear_tiles(&mut self) {
-        let empty_tile: Option<usize> = Option::None;
+        let empty_tile: Option<u32> = Option::None;
         for y in 0..self.spawned_map_meta.grid_size.y {
             for x in 0..self.spawned_map_meta.grid_size.x {
                 let position = UVec2 { x, y };
-                for layer_index in 0..self.spawned_map_meta.layer_names.len() {
-                    self.set_tile(
-                        layer_index,
-                        position,
-                        &empty_tile,
-                        crate::physics::TileCollisionKind::Empty,
-                    );
+                for layer_index in 0..self.spawned_map_meta.layer_names.len() as u32 {
+                    self.set_tile(layer_index, position, &empty_tile, TileCollisionKind::Empty);
                 }
             }
         }
@@ -305,7 +310,7 @@ impl<'a> MapManager<'a> {
 }
 
 /// Handles user input comming from the editor and makes the required changes to the map.
-fn handle_editor_input(player_inputs: Res<PlayerInputs>, mut map_manager: MapManager) {
+fn handle_editor_input(player_inputs: Res<MatchInputs>, mut map_manager: MapManager) {
     for player in &player_inputs.players {
         if let Some(editor_input) = &player.editor_input {
             match editor_input {
@@ -314,18 +319,18 @@ fn handle_editor_input(player_inputs: Res<PlayerInputs>, mut map_manager: MapMan
                     translation,
                     layer,
                 } => {
-                    map_manager.create_element(handle, translation, *layer as usize);
+                    map_manager.create_element(handle, translation, *layer as u32);
                 }
                 EditorInput::CreateLayer { id } => {
-                    map_manager.create_layer(id.clone());
+                    map_manager.create_layer(ustr(id));
                 }
                 EditorInput::DeleteLayer { layer } => {
-                    map_manager.delete_layer(*layer as usize);
+                    map_manager.delete_layer(*layer as u32);
                 }
                 EditorInput::RenameLayer {
                     layer,
                     name: new_name,
-                } => map_manager.rename_layer(*layer as usize, new_name),
+                } => map_manager.rename_layer(*layer as u32, new_name),
                 EditorInput::MoveEntity { entity, pos } => {
                     map_manager.move_element(*entity, pos);
                 }
@@ -333,7 +338,7 @@ fn handle_editor_input(player_inputs: Res<PlayerInputs>, mut map_manager: MapMan
                     map_manager.delete_element(*entity);
                 }
                 EditorInput::SetTilemap { layer, handle } => {
-                    map_manager.set_layer_tilemap(*layer as usize, handle);
+                    map_manager.set_layer_tilemap(*layer as u32, handle);
                 }
                 EditorInput::SetTile {
                     layer,
@@ -341,13 +346,13 @@ fn handle_editor_input(player_inputs: Res<PlayerInputs>, mut map_manager: MapMan
                     tilemap_tile_idx,
                     collision,
                 } => {
-                    map_manager.set_tile(*layer as usize, *pos, tilemap_tile_idx, *collision);
+                    map_manager.set_tile(*layer as u32, *pos, tilemap_tile_idx, *collision);
                 }
                 EditorInput::MoveLayer { layer, down } => {
-                    map_manager.swap_layer(*layer as usize, *down)
+                    map_manager.swap_layer(*layer as u32, *down)
                 }
                 EditorInput::RenameMap { name } => {
-                    map_manager.rename_map(name.clone());
+                    map_manager.rename_map(name);
                 }
                 EditorInput::RandomizeTiles {
                     tile_layers,
diff --git a/core/src/elements.rs b/src/core/elements.rs
similarity index 69%
rename from core/src/elements.rs
rename to src/core/elements.rs
index 02c9dfe61d..6f28374646 100644
--- a/core/src/elements.rs
+++ b/src/core/elements.rs
@@ -4,11 +4,6 @@
 
 use std::sync::Mutex;
 
-use ::bevy::{
-    prelude::Resource,
-    utils::{HashMap, Uuid},
-};
-
 use crate::{impl_system_param, prelude::*};
 
 pub mod crab;
@@ -29,9 +24,47 @@ pub mod stomp_boots;
 pub mod sword;
 pub mod urchin;
 
+pub mod prelude {
+    pub use super::{
+        crab::*, crate_item::*, decoration::*, fish_school::*, grenade::*, kick_bomb::*, mine::*,
+        musket::*, player_spawner::*, slippery::*, slippery_seaweed::*, snail::*, spike::*,
+        sproinger::*, stomp_boots::*, sword::*, urchin::*, *,
+    };
+}
+
+#[derive(HasSchema, Default, Clone, Debug)]
+#[type_data(metadata_asset("element"))]
+#[repr(C)]
+pub struct ElementMeta {
+    pub name: Ustr,
+    pub category: Ustr,
+    pub data: Handle<SchemaBox>,
+    pub editor: ElementEditorMeta,
+}
+
+#[derive(HasSchema, Deserialize, Clone, Debug)]
+#[repr(C)]
+pub struct ElementEditorMeta {
+    /// The size of the bounding rect for the element in the editor
+    pub grab_size: Vec2,
+    /// The offset of the bounding rect for the element in the editor.
+    pub grab_offset: Vec2,
+    /// Show the element name above the bounding rect in the editor.
+    pub show_name: bool,
+}
+
+impl Default for ElementEditorMeta {
+    fn default() -> Self {
+        Self {
+            grab_size: Vec2::splat(45.0),
+            grab_offset: Vec2::ZERO,
+            show_name: true,
+        }
+    }
+}
+
 /// Marker component added to map elements that have been hydrated.
-#[derive(Clone, TypeUlid)]
-#[ulid = "01GP42Q5GCY5Y4JC7SQ1YRHYKN"]
+#[derive(Clone, HasSchema, Default)]
 pub struct MapElementHydrated;
 
 /// Component that contains the [`Entity`] to de-hydrate when the entity with this component is out
@@ -39,31 +72,28 @@ pub struct MapElementHydrated;
 ///
 /// This is useful for map elements that spawn items: when the item falls off the map, it should
 /// de-hydrate it's spawner, so that the spawner will re-spawn the item in it's default state.
-#[derive(Clone, TypeUlid, Deref, DerefMut)]
-#[ulid = "01GP9NY0Y50Y2A8M4A7E9NN8VE"]
+#[derive(Clone, HasSchema, Default, Deref, DerefMut)]
 pub struct DehydrateOutOfBounds(pub Entity);
 
 /// Component containing an element's metadata handle.
-#[derive(Clone, TypeUlid, Deref, DerefMut, Default)]
-#[ulid = "01GP421CHN323T2614F19PA5E9"]
+#[derive(Clone, Copy, HasSchema, Default, Deref, DerefMut)]
 pub struct ElementHandle(pub Handle<ElementMeta>);
 
-#[derive(Clone, TypeUlid)]
-#[ulid = "01GP584Z9WN5P0RG2A82MV93P1"]
+#[derive(Clone, HasSchema)]
+#[schema(no_default)]
 pub struct ElementKillCallback {
-    pub system: Arc<Mutex<System>>,
+    pub system: Arc<Mutex<StaticSystem<(), ()>>>,
 }
 
 impl ElementKillCallback {
-    pub fn new<Args>(system: impl IntoSystem<Args, ()>) -> Self {
+    pub fn new<Args>(system: impl IntoSystem<Args, (), (), Sys = StaticSystem<(), ()>>) -> Self {
         ElementKillCallback {
             system: Arc::new(Mutex::new(system.system())),
         }
     }
 }
 
-#[derive(Clone, TypeUlid)]
-#[ulid = "01H0AQGTZCVZJXPF2KSR73TQTR"]
+#[derive(Clone, HasSchema)]
 pub struct Spawner {
     /// The group identifier where all of the elements are meant to be shared between them
     pub group_identifier: String,
@@ -72,7 +102,7 @@ pub struct Spawner {
 impl Default for Spawner {
     fn default() -> Self {
         Self {
-            group_identifier: Uuid::new_v4().to_string(),
+            group_identifier: Ulid::create().to_string(),
         }
     }
 }
@@ -80,7 +110,7 @@ impl Default for Spawner {
 impl Spawner {
     pub fn new() -> Self {
         Spawner {
-            group_identifier: Uuid::new_v4().to_string(),
+            group_identifier: Ulid::create().to_string(),
         }
     }
     pub fn new_grouped(group_identifier: String) -> Self {
@@ -88,8 +118,7 @@ impl Spawner {
     }
 }
 
-#[derive(Resource, TypeUlid, Clone, Default)]
-#[ulid = "01H11SA5GRF6Y6N20XKB8JR5TE"]
+#[derive(HasSchema, Default, Clone)]
 pub struct SpawnerEntities {
     pub entities_per_spawner_group_identifier: HashMap<String, Vec<Entity>>,
 }
@@ -97,13 +126,14 @@ pub struct SpawnerEntities {
 impl_system_param! {
     pub struct SpawnerManager<'a> {
         spawners: CompMut<'a, Spawner>,
-        spawner_entities: ResMut<'a, SpawnerEntities>,
+        spawner_entities: ResMutInit<'a, SpawnerEntities>,
     }
 }
 
 impl<'a> SpawnerManager<'a> {
-    /// Stores the spawned elements as having been spawned by the provided entity, finding an existing spawner element, if it exists, to group these spawned elements with.
-    pub fn create_grouped_spawner<T: EcsData + TypeUlid>(
+    /// Stores the spawned elements as having been spawned by the provided entity, finding an
+    /// existing spawner element, if it exists, to group these spawned elements with.
+    pub fn create_grouped_spawner<T: HasSchema>(
         &mut self,
         entity: Entity,
         mut spawned_elements: Vec<Entity>,
@@ -149,11 +179,11 @@ impl<'a> SpawnerManager<'a> {
         self.spawners.insert(entity, spawner);
     }
     /// Stores the spawned elements as having come from the same group of spawners as the spawner_elements.
-    pub fn insert_spawned_entity_into_grouped_spawner<T: EcsData + TypeUlid>(
+    pub fn insert_spawned_entity_into_grouped_spawner<T: HasSchema>(
         &mut self,
         spawned_entity: Entity,
         spawner_elements: &Comp<T>,
-        entities: &ResMut<Entities>,
+        entities: &ResMutInit<Entities>,
     ) {
         let (_, (_, spawner)) = entities
             .iter_with((spawner_elements, &self.spawners))
@@ -165,11 +195,11 @@ impl<'a> SpawnerManager<'a> {
             .push(spawned_entity);
     }
     /// Removes that spawned entity from the spawner entities resource
-    pub fn remove_spawned_entity_from_grouped_spawner<T: EcsData + TypeUlid>(
+    pub fn remove_spawned_entity_from_grouped_spawner<T: HasSchema>(
         &mut self,
         spawned_entity: Entity,
         spawner_elements: &Comp<T>,
-        entities: &ResMut<Entities>,
+        entities: &ResMutInit<Entities>,
     ) {
         let (_, (_, spawner)) = entities
             .iter_with((spawner_elements, &self.spawners))
@@ -188,7 +218,7 @@ impl<'a> SpawnerManager<'a> {
     pub fn kill_spawner_entity(
         &mut self,
         spawner_entity: Entity,
-        entities: &mut ResMut<Entities>,
+        entities: &mut ResMutInit<Entities>,
         element_kill_callbacks: &Comp<ElementKillCallback>,
         commands: &mut Commands,
     ) {
@@ -213,8 +243,7 @@ impl<'a> SpawnerManager<'a> {
                     if let Some(element_kill_callback) = element_kill_callbacks.get(spawned_entity)
                     {
                         let system = element_kill_callback.system.clone();
-                        commands
-                            .add(move |world: &World| (system.lock().unwrap().run)(world).unwrap());
+                        commands.add(move |world: &World| (system.lock().unwrap().run)(world, ()));
                     } else {
                         entities.kill(spawned_entity);
                     }
@@ -227,34 +256,54 @@ impl<'a> SpawnerManager<'a> {
     }
 }
 
-pub fn install(session: &mut CoreSession) {
-    session
-        .stages
-        .add_system_to_stage(CoreStage::First, handle_out_of_bounds_items);
-
-    decoration::install(session);
-    urchin::install(session);
-    player_spawner::install(session);
-    sproinger::install(session);
-    sword::install(session);
-    grenade::install(session);
-    crab::install(session);
-    snail::install(session);
-    fish_school::install(session);
-    kick_bomb::install(session);
-    mine::install(session);
-    musket::install(session);
-    stomp_boots::install(session);
-    crate_item::install(session);
-    slippery_seaweed::install(session);
-    slippery::install(session);
-    spike::install(session);
+/// Helper macro to install element game and session plugins
+macro_rules! install_plugins {
+    ($($module:ident),* $(,)?) => {
+        pub fn session_plugin(session: &mut Session) {
+            session
+                .stages
+                .add_system_to_stage(CoreStage::First, handle_out_of_bounds_items);
+
+            $(
+                session.install_plugin($module::session_plugin);
+            )*
+        }
+
+        pub fn game_plugin(game: &mut Game) {
+            ElementMeta::schema();
+            game.init_shared_resource::<AssetServer>();
+
+            $(
+                game.install_plugin($module::game_plugin);
+            )*
+        }
+    };
 }
 
+install_plugins!(
+    decoration,
+    urchin,
+    player_spawner,
+    sproinger,
+    sword,
+    grenade,
+    crab,
+    snail,
+    fish_school,
+    kick_bomb,
+    mine,
+    musket,
+    stomp_boots,
+    crate_item,
+    slippery_seaweed,
+    slippery,
+    spike,
+);
+
 fn handle_out_of_bounds_items(
     mut commands: Commands,
     mut hydrated: CompMut<MapElementHydrated>,
-    entities: ResMut<Entities>,
+    entities: ResMutInit<Entities>,
     transforms: CompMut<Transform>,
     spawners: Comp<DehydrateOutOfBounds>,
     map: Res<LoadedMap>,
@@ -262,7 +311,7 @@ fn handle_out_of_bounds_items(
     for (item_ent, (transform, spawner)) in entities.iter_with((&transforms, &spawners)) {
         if map.is_out_of_bounds(&transform.translation) {
             hydrated.remove(**spawner);
-            commands.add(move |mut entities: ResMut<Entities>| {
+            commands.add(move |mut entities: ResMutInit<Entities>| {
                 entities.kill(item_ent);
             });
         }
diff --git a/core/src/elements/crab.rs b/src/core/elements/crab.rs
similarity index 83%
rename from core/src/elements/crab.rs
rename to src/core/elements/crab.rs
index 862943b586..db9ed41890 100644
--- a/core/src/elements/crab.rs
+++ b/src/core/elements/crab.rs
@@ -1,14 +1,40 @@
-use crate::{prelude::*, random::GlobalRng};
+use crate::prelude::*;
 
-pub fn install(session: &mut CoreSession) {
+/// A crab roaming on the ocean floor
+#[derive(HasSchema, Default, Debug, Clone)]
+#[type_data(metadata_asset("crab"))]
+#[repr(C)]
+pub struct CrabMeta {
+    pub body_size: Vec2,
+    pub walk_frames: SVec<u32>,
+    pub spawn_frames: SVec<u32>,
+    pub fps: f32,
+    pub comfortable_spawn_distance: f32,
+    pub comfortable_scared_distance: f32,
+    /// How long a crab has to be away from it's spawn point before it digs into the ground and
+    /// digs back out in his spawn point.
+    pub uncomfortable_respawn_time: Duration,
+    pub same_level_threshold: f32,
+    pub walk_speed: f32,
+    pub run_speed: f32,
+    // TODO: migrate this to a duration like `uncomfortable_respawn_time`.
+    pub timer_delay_max: u8,
+    pub atlas: Handle<Atlas>,
+}
+
+pub fn session_plugin(session: &mut Session) {
     session
         .stages
         .add_system_to_stage(CoreStage::PreUpdate, hydrate)
         .add_system_to_stage(CoreStage::PostUpdate, update_crabs);
 }
 
-#[derive(Default, Clone, TypeUlid, Debug, Copy)]
-#[ulid = "01GQ0HN03T4KVTB95CDZ6YG48G"]
+pub fn game_plugin(game: &mut Game) {
+    CrabMeta::schema();
+    game.init_shared_resource::<AssetServer>();
+}
+
+#[derive(Default, Clone, HasSchema, Debug, Copy)]
 pub enum CrabState {
     #[default]
     Paused,
@@ -28,8 +54,7 @@ impl CrabState {
     }
 }
 
-#[derive(TypeUlid, Clone, Default)]
-#[ulid = "01GQ0J08W112T1JVB0QJ42HJSE"]
+#[derive(HasSchema, Clone, Default)]
 pub struct CrabCritter {
     state: CrabState,
     start_pos: Vec2,
@@ -39,18 +64,18 @@ pub struct CrabCritter {
 }
 
 fn hydrate(
-    game_meta: Res<CoreMetaArc>,
-    mut entities: ResMut<Entities>,
+    game_meta: Root<GameMeta>,
+    mut entities: ResMutInit<Entities>,
     mut hydrated: CompMut<MapElementHydrated>,
     mut despawns: CompMut<DehydrateOutOfBounds>,
     mut element_handles: CompMut<ElementHandle>,
-    element_assets: BevyAssets<ElementMeta>,
     mut crabs: CompMut<CrabCritter>,
     mut atlas_sprites: CompMut<AtlasSprite>,
     mut bodies: CompMut<KinematicBody>,
     mut transforms: CompMut<Transform>,
     mut animated_sprites: CompMut<AnimatedSprite>,
     mut spawner_manager: SpawnerManager,
+    assets: Res<AssetServer>,
 ) {
     let mut not_hydrated_bitset = hydrated.bitset().clone();
     not_hydrated_bitset.bit_not();
@@ -62,18 +87,16 @@ fn hydrate(
 
     for spawner_ent in spawner_entities {
         let transform = *transforms.get(spawner_ent).unwrap();
-        let element_handle = element_handles.get(spawner_ent).unwrap();
-        let Some(element_meta) = element_assets.get(&element_handle.get_bevy_handle()) else {
-            continue;
-        };
+        let element_handle = *element_handles.get(spawner_ent).unwrap();
+        let element_meta = assets.get(element_handle.0);
 
-        if let BuiltinElementKind::Crab {
+        if let Ok(CrabMeta {
             atlas,
             body_size,
             spawn_frames,
             uncomfortable_respawn_time,
             ..
-        } = &element_meta.builtin
+        }) = assets.get(element_meta.data).try_cast_ref()
         {
             hydrated.insert(spawner_ent, MapElementHydrated);
 
@@ -91,16 +114,16 @@ fn hydrate(
                     ),
                 },
             );
-            atlas_sprites.insert(entity, AtlasSprite::new(atlas.clone()));
+            atlas_sprites.insert(entity, AtlasSprite::new(*atlas));
             transforms.insert(entity, transform);
-            element_handles.insert(entity, element_handle.clone());
+            element_handles.insert(entity, element_handle);
             hydrated.insert(entity, MapElementHydrated);
             despawns.insert(entity, DehydrateOutOfBounds(spawner_ent));
 
             bodies.insert(
                 entity,
                 KinematicBody {
-                    gravity: game_meta.physics.gravity,
+                    gravity: game_meta.core.physics.gravity,
                     has_mass: true,
                     has_friction: true,
                     shape: ColliderShape::Rectangle { size: *body_size },
@@ -136,16 +159,15 @@ fn update_crabs(
     mut commands: Commands,
     spawners: Comp<DehydrateOutOfBounds>,
     element_handles: Comp<ElementHandle>,
-    element_assets: BevyAssets<ElementMeta>,
+    assets: Res<AssetServer>,
 ) {
     for (entity, (crab, element_handle, spawner)) in
         entities.iter_with((&mut crabs, &element_handles, &spawners))
     {
-        let Some(element_meta) = element_assets.get(&element_handle.get_bevy_handle()) else {
-            continue;
-        };
+        let element_meta = assets.get(element_handle.0);
 
-        let BuiltinElementKind::Crab {
+        let asset = assets.get(element_meta.data);
+        let CrabMeta {
             fps,
             run_speed,
             walk_speed,
@@ -156,9 +178,7 @@ fn update_crabs(
             same_level_threshold,
             timer_delay_max,
             ..
-        } = &element_meta.builtin else {
-            unreachable!();
-        };
+        } = asset.cast_ref();
 
         let body = bodies.get_mut(entity).unwrap();
         let sprite = sprites.get_mut(entity).unwrap();
@@ -176,7 +196,7 @@ fn update_crabs(
             if finished_playing(animated_sprite).unwrap() {
                 crab.state = CrabState::Spawning;
                 hydrated.remove(**spawner);
-                commands.add(move |mut entities: ResMut<Entities>| entities.kill(entity));
+                commands.add(move |mut entities: ResMutInit<Entities>| entities.kill(entity));
             }
             continue;
         } else if body.is_on_ground && crab.respawn_timer.finished() {
@@ -323,5 +343,6 @@ fn finished_playing(
         repeat,
     }: &AnimatedSprite,
 ) -> Option<bool> {
-    (!repeat).then(|| *index == frames.len() - 1 && *timer > 1.0 / fps.max(f32::MIN_POSITIVE))
+    (!repeat)
+        .then(|| *index == frames.len() as u32 - 1 && *timer > 1.0 / fps.max(f32::MIN_POSITIVE))
 }
diff --git a/core/src/elements/crate_item.rs b/src/core/elements/crate_item.rs
similarity index 79%
rename from core/src/elements/crate_item.rs
rename to src/core/elements/crate_item.rs
index a181c47d32..177d25cd08 100644
--- a/core/src/elements/crate_item.rs
+++ b/src/core/elements/crate_item.rs
@@ -1,8 +1,39 @@
-use crate::{physics::collisions::TileCollisionKind, prelude::*};
+use crate::prelude::*;
 
-use std::time::Duration;
+/// The throwable crate item
+#[derive(HasSchema, Default, Debug, Clone)]
+#[type_data(metadata_asset("crate"))]
+#[repr(C)]
+pub struct CrateMeta {
+    pub atlas: Handle<Atlas>,
 
-pub fn install(session: &mut CoreSession) {
+    pub breaking_atlas: Handle<Atlas>,
+    pub breaking_anim_frames: u32,
+    pub breaking_anim_fps: f32,
+
+    pub break_sound: Handle<AudioSource>,
+    pub break_sound_volume: f64,
+    pub bounce_sound: Handle<AudioSource>,
+    pub bounce_sound_volume: f64,
+
+    pub throw_velocity: f32,
+
+    pub body_size: Vec2,
+    pub grab_offset: Vec2,
+    // How long to wait before despawning a thrown crate, if it hans't it anything yet.
+    pub break_timeout: Duration,
+    pub bounciness: f32,
+    pub fin_anim: Ustr,
+    pub crate_break_state_1: u32,
+    pub crate_break_state_2: u32,
+}
+
+pub fn game_plugin(game: &mut Game) {
+    CrateMeta::schema();
+    game.init_shared_resource::<AssetServer>();
+}
+
+pub fn session_plugin(session: &mut Session) {
     session
         .stages
         .add_system_to_stage(CoreStage::PreUpdate, hydrate_crates)
@@ -10,12 +41,10 @@ pub fn install(session: &mut CoreSession) {
         .add_system_to_stage(CoreStage::PostUpdate, update_thrown_crates);
 }
 
-#[derive(Clone, TypeUlid)]
-#[ulid = "01GREP3MZXY4A14PQ8GRKS0RVY"]
+#[derive(Clone, HasSchema, Default)]
 struct IdleCrate;
 
-#[derive(Clone, TypeUlid)]
-#[ulid = "01GREP80RJSH9T9MWC88CG2G03"]
+#[derive(Clone, HasSchema, Default)]
 struct ThrownCrate {
     owner: Entity,
     damage_delay: Timer,
@@ -25,11 +54,11 @@ struct ThrownCrate {
 }
 
 fn hydrate_crates(
-    game_meta: Res<CoreMetaArc>,
-    mut entities: ResMut<Entities>,
+    game_meta: Root<GameMeta>,
+    mut entities: ResMutInit<Entities>,
     mut hydrated: CompMut<MapElementHydrated>,
     mut element_handles: CompMut<ElementHandle>,
-    element_assets: BevyAssets<ElementMeta>,
+    assets: Res<AssetServer>,
     mut idle_crates: CompMut<IdleCrate>,
     mut atlas_sprites: CompMut<AtlasSprite>,
     mut animated_sprites: CompMut<AnimatedSprite>,
@@ -51,12 +80,11 @@ fn hydrate_crates(
 
     for spawner_entity in spawner_entities {
         let transform = *transforms.get(spawner_entity).unwrap();
-        let element_handle = element_handles.get(spawner_entity).unwrap();
-        let Some(element_meta) = element_assets.get(&element_handle.get_bevy_handle()) else{
-            continue;
-        };
+        let element_handle = *element_handles.get(spawner_entity).unwrap();
+        let element_meta = assets.get(element_handle.0);
 
-        let BuiltinElementKind::Crate{
+        let asset = assets.get(element_meta.data);
+        let Ok(CrateMeta {
             atlas,
             fin_anim,
             grab_offset,
@@ -64,7 +92,8 @@ fn hydrate_crates(
             throw_velocity,
             bounciness,
             ..
-        } = &element_meta.builtin else{
+        }) = asset.try_cast_ref()
+        else {
             continue;
         };
 
@@ -82,10 +111,10 @@ fn hydrate_crates(
                 grab_offset: *grab_offset,
             },
         );
-        atlas_sprites.insert(entity, AtlasSprite::new(atlas.clone()));
+        atlas_sprites.insert(entity, AtlasSprite::new(*atlas));
         respawn_points.insert(entity, DehydrateOutOfBounds(spawner_entity));
         transforms.insert(entity, transform);
-        element_handles.insert(entity, element_handle.clone());
+        element_handles.insert(entity, element_handle);
         hydrated.insert(entity, MapElementHydrated);
         animated_sprites.insert(entity, default());
         bodies.insert(
@@ -95,7 +124,7 @@ fn hydrate_crates(
                 has_mass: true,
                 can_rotate: false,
                 has_friction: true,
-                gravity: game_meta.physics.gravity,
+                gravity: game_meta.core.physics.gravity,
                 bounciness: *bounciness,
                 ..default()
             },
@@ -107,7 +136,7 @@ fn hydrate_crates(
 fn update_idle_crates(
     entities: Res<Entities>,
     mut items_used: CompMut<ItemUsed>,
-    element_assets: BevyAssets<ElementMeta>,
+    assets: Res<AssetServer>,
     element_handles: Comp<ElementHandle>,
     idle_crates: CompMut<IdleCrate>,
     player_inventories: PlayerInventories,
@@ -116,13 +145,10 @@ fn update_idle_crates(
     for (entity, (_le_crate, element_handle)) in
         entities.iter_with((&idle_crates, &element_handles))
     {
-        let Some(element_meta) = element_assets.get(&element_handle.get_bevy_handle()) else {
-            continue;
-        };
+        let element_meta = assets.get(element_handle.0);
 
-        let BuiltinElementKind::Crate{
-            break_timeout,..
-        } = &element_meta.builtin else {
+        let asset = assets.get(element_meta.data);
+        let Ok(CrateMeta { break_timeout, .. }) = asset.try_cast_ref() else {
             continue;
         };
 
@@ -161,7 +187,7 @@ fn update_idle_crates(
 fn update_thrown_crates(
     entities: Res<Entities>,
     mut hydrated: CompMut<MapElementHydrated>,
-    element_assets: BevyAssets<ElementMeta>,
+    assets: Res<AssetServer>,
     element_handles: Comp<ElementHandle>,
     mut thrown_crates: CompMut<ThrownCrate>,
     mut commands: Commands,
@@ -169,7 +195,7 @@ fn update_thrown_crates(
     players: Comp<PlayerIdx>,
     collision_world: CollisionWorld,
     mut bodies: CompMut<KinematicBody>,
-    mut audio_events: ResMut<AudioEvents>,
+    mut audio_events: ResMutInit<AudioEvents>,
     transforms: Comp<Transform>,
     spawners: Comp<DehydrateOutOfBounds>,
     invincibles: CompMut<Invincibility>,
@@ -185,11 +211,10 @@ fn update_thrown_crates(
             &spawners,
         ))
     {
-        let Some(element_meta) = element_assets.get(&element_handle.get_bevy_handle()) else {
-           continue;
-        };
+        let element_meta = assets.get(element_handle.0);
 
-        let BuiltinElementKind::Crate{
+        let asset = assets.get(element_meta.data);
+        let Ok(CrateMeta {
             breaking_anim_frames,
             breaking_atlas,
             breaking_anim_fps,
@@ -200,7 +225,8 @@ fn update_thrown_crates(
             crate_break_state_1,
             crate_break_state_2,
             ..
-        } = &element_meta.builtin else {
+        }) = asset.try_cast_ref()
+        else {
             continue;
         };
 
@@ -223,14 +249,14 @@ fn update_thrown_crates(
         if colliding_with_tile && !thrown_crate.was_colliding {
             thrown_crate.was_colliding = true;
             thrown_crate.crate_break_state += 1;
-            audio_events.play(bounce_sound.clone(), *bounce_sound_volume);
+            audio_events.play(*bounce_sound, *bounce_sound_volume);
         } else if !colliding_with_tile {
             thrown_crate.was_colliding = false;
         }
 
         match thrown_crate.crate_break_state {
             1 => {
-                atlas_sprite.atlas = breaking_atlas.clone();
+                atlas_sprite.atlas = *breaking_atlas;
                 atlas_sprite.index = *crate_break_state_1;
             }
             3 => {
@@ -273,26 +299,20 @@ fn update_thrown_crates(
 
             let breaking_anim_frames = *breaking_anim_frames;
             let breaking_anim_fps = *breaking_anim_fps;
-            let atlas = breaking_atlas.clone();
+            let atlas = *breaking_atlas;
 
-            audio_events.play(break_sound.clone(), *break_sound_volume);
+            audio_events.play(*break_sound, *break_sound_volume);
 
             commands.add(
-                move |mut entities: ResMut<Entities>,
+                move |mut entities: ResMutInit<Entities>,
                       mut transforms: CompMut<Transform>,
                       mut animated_sprites: CompMut<AnimatedSprite>,
                       mut lifetimes: CompMut<Lifetime>,
                       mut atlas_sprites: CompMut<AtlasSprite>| {
-                    let pos = transforms.get(entity).unwrap();
+                    let pos = *transforms.get(entity).unwrap();
                     entities.kill(entity);
                     let breaking_anim_ent = entities.create();
-                    atlas_sprites.insert(
-                        breaking_anim_ent,
-                        AtlasSprite {
-                            atlas: atlas.clone(),
-                            ..default()
-                        },
-                    );
+                    atlas_sprites.insert(breaking_anim_ent, AtlasSprite { atlas, ..default() });
                     animated_sprites.insert(
                         breaking_anim_ent,
                         AnimatedSprite {
@@ -303,7 +323,7 @@ fn update_thrown_crates(
                         },
                     );
                     lifetimes.insert(breaking_anim_ent, Lifetime::new(1.0));
-                    transforms.insert(breaking_anim_ent, *pos);
+                    transforms.insert(breaking_anim_ent, pos);
                 },
             );
         }
diff --git a/core/src/elements/decoration.rs b/src/core/elements/decoration.rs
similarity index 64%
rename from core/src/elements/decoration.rs
rename to src/core/elements/decoration.rs
index b12ec02bf4..08ee2f411a 100644
--- a/core/src/elements/decoration.rs
+++ b/src/core/elements/decoration.rs
@@ -1,6 +1,22 @@
 use crate::prelude::*;
 
-pub fn install(session: &mut CoreSession) {
+/// An animated decoration such as seaweed or anemones
+#[derive(HasSchema, Default, Debug, Clone)]
+#[type_data(metadata_asset("animated_decoration"))]
+#[repr(C)]
+pub struct AnimatedDecorationMeta {
+    pub start_frame: u32,
+    pub end_frame: u32,
+    pub fps: f32,
+    pub atlas: Handle<Atlas>,
+}
+
+pub fn game_plugin(game: &mut Game) {
+    AnimatedDecorationMeta::schema();
+    game.init_shared_resource::<AssetServer>();
+}
+
+pub fn session_plugin(session: &mut Session) {
     session
         .stages
         .add_system_to_stage(CoreStage::First, hydrate);
@@ -10,7 +26,7 @@ fn hydrate(
     entities: Res<Entities>,
     mut hydrated: CompMut<MapElementHydrated>,
     element_handles: Comp<ElementHandle>,
-    element_assets: BevyAssets<ElementMeta>,
+    assets: Res<AssetServer>,
     mut atlas_sprites: CompMut<AtlasSprite>,
     mut animated_sprites: CompMut<AnimatedSprite>,
 ) {
@@ -20,22 +36,20 @@ fn hydrate(
 
     for entity in entities.iter_with_bitset(&not_hydrated_bitset) {
         let element_handle = element_handles.get(entity).unwrap();
-        let Some(element_meta) = element_assets.get(&element_handle.get_bevy_handle()) else {
-            continue;
-        };
+        let element_meta = assets.get(element_handle.0);
 
-        if let BuiltinElementKind::AnimatedDecoration {
+        if let Ok(AnimatedDecorationMeta {
             start_frame,
             end_frame,
             fps,
             atlas,
-        } = &element_meta.builtin
+        }) = assets.get(element_meta.data).try_cast_ref()
         {
             hydrated.insert(entity, MapElementHydrated);
             atlas_sprites.insert(
                 entity,
                 AtlasSprite {
-                    atlas: atlas.clone(),
+                    atlas: *atlas,
                     ..default()
                 },
             );
diff --git a/core/src/elements/fish_school.rs b/src/core/elements/fish_school.rs
similarity index 86%
rename from core/src/elements/fish_school.rs
rename to src/core/elements/fish_school.rs
index dfa0b1e051..c43c0ee5e5 100644
--- a/core/src/elements/fish_school.rs
+++ b/src/core/elements/fish_school.rs
@@ -1,22 +1,42 @@
-use std::time::Duration;
+use crate::prelude::*;
+
+#[derive(HasSchema, Default, Debug, Clone)]
+#[type_data(metadata_asset("fish_school"))]
+#[repr(C)]
+pub struct FishSchoolMeta {
+    pub kinds: SVec<Handle<Atlas>>,
+    /// The default and most-likely to ocurr number of fish in a school
+    pub base_count: u32,
+    /// The ammount greater or less than the base number of fish that may spawn
+    pub count_variation: u32,
+    /// The distance from the spawn point on each axis that the individual fish in the school will be
+    /// initially spawned within
+    pub spawn_range: f32,
+    /// The distance that the fish wish to stay within the center of their school
+    pub school_size: f32,
+    // The distance a collider must be for the fish to run away
+    pub flee_range: f32,
+}
 
-use crate::{prelude::*, random::GlobalRng};
+pub fn game_plugin(game: &mut Game) {
+    FishSchoolMeta::schema();
+    game.init_shared_resource::<AssetServer>();
+}
 
-pub fn install(session: &mut CoreSession) {
+pub fn session_plugin(session: &mut Session) {
     session
         .stages
         .add_system_to_stage(CoreStage::PreUpdate, hydrate)
         .add_system_to_stage(CoreStage::PostUpdate, update_fish_schools);
 }
 
-#[derive(Default, Clone, TypeUlid, Debug, Deref, DerefMut)]
-#[ulid = "01GTF48H2WEFC3GSED8V7JNN0K"]
+#[derive(Default, Clone, HasSchema, Debug, Deref, DerefMut)]
 pub struct FishSchool {
     fish: Vec<Entity>,
 }
 
-#[derive(Clone, TypeUlid, Debug)]
-#[ulid = "01GTF49M4WVD4B3G8W9QVV2JCX"]
+#[derive(Clone, HasSchema, Debug)]
+#[schema(no_default)]
 pub struct Fish {
     state: FishState,
     state_timer: Timer,
@@ -30,10 +50,10 @@ pub enum FishState {
 
 pub fn hydrate(
     rng: Res<GlobalRng>,
-    mut entities: ResMut<Entities>,
+    mut entities: ResMutInit<Entities>,
     mut hydrated: CompMut<MapElementHydrated>,
     mut element_handles: CompMut<ElementHandle>,
-    element_assets: BevyAssets<ElementMeta>,
+    assets: Res<AssetServer>,
     mut fish_schools: CompMut<FishSchool>,
     mut fishes: CompMut<Fish>,
     mut transforms: CompMut<Transform>,
@@ -53,18 +73,16 @@ pub fn hydrate(
 
     for spawner_ent in spawner_entities {
         let transform = *transforms.get(spawner_ent).unwrap();
-        let element_handle = element_handles.get(spawner_ent).unwrap();
-        let Some(element_meta) = element_assets.get(&element_handle.get_bevy_handle()) else {
-            continue;
-        };
-        if let BuiltinElementKind::FishSchool {
+        let element_handle = *element_handles.get(spawner_ent).unwrap();
+        let element_meta = assets.get(element_handle.0);
+        if let Ok(FishSchoolMeta {
             kinds,
             base_count,
             count_variation,
             spawn_range,
             flee_range,
             ..
-        } = &element_meta.builtin
+        }) = assets.get(element_meta.data).try_cast_ref()
         {
             // We can use the spawner entity itself for our
             // school because there is no respawning.
@@ -72,7 +90,7 @@ pub fn hydrate(
 
             hydrated.insert(fish_school_ent, MapElementHydrated);
             transforms.insert(fish_school_ent, transform);
-            element_handles.insert(fish_school_ent, element_handle.clone());
+            element_handles.insert(fish_school_ent, element_handle);
 
             let mut fish_ents = Vec::new();
 
@@ -133,11 +151,11 @@ pub fn hydrate(
                         ..default()
                     },
                 );
-                atlas_sprites.insert(fish_ent, AtlasSprite::new(atlas.clone()));
+                atlas_sprites.insert(fish_ent, AtlasSprite::new(*atlas));
                 animated_sprites.insert(
                     fish_ent,
                     AnimatedSprite {
-                        frames: Arc::new([0, 1, 2, 3]),
+                        frames: [0, 1, 2, 3].into_iter().collect(),
                         fps: 6.0,
                         repeat: true,
                         ..default()
@@ -164,7 +182,7 @@ pub fn update_fish_schools(
     fish_schools: Comp<FishSchool>,
     mut fishes: CompMut<Fish>,
     element_handles: CompMut<ElementHandle>,
-    element_assets: BevyAssets<ElementMeta>,
+    assets: Res<AssetServer>,
     mut atlas_sprites: CompMut<AtlasSprite>,
     mut transforms: CompMut<Transform>,
     collision_world: CollisionWorld,
@@ -172,21 +190,20 @@ pub fn update_fish_schools(
 ) {
     for (school_ent, school) in entities.iter_with(&fish_schools) {
         let element_handle = element_handles.get(school_ent).unwrap();
-        let Some(element_meta) = element_assets.get(&element_handle.get_bevy_handle()) else {
+        let element_meta = assets.get(element_handle.0);
+        let asset = assets.get(element_meta.data);
+        let Ok(FishSchoolMeta { school_size, .. }) = asset.try_cast_ref() else {
             continue;
         };
-        let BuiltinElementKind::FishSchool {
-            school_size,
-            ..
-        } = &element_meta.builtin
-        else { continue };
 
         let transform = transforms.get(school_ent).unwrap();
         let mut fish_transforms = school
             .fish
             .iter()
             .map(|entity| transforms.get(*entity).unwrap());
-        let Some(fish_transform) = fish_transforms.next() else {continue};
+        let Some(fish_transform) = fish_transforms.next() else {
+            continue;
+        };
 
         let mut school_bounds_min = fish_transform.translation.xy();
         let mut school_bounds_max = fish_transform.translation.xy();
@@ -303,7 +320,7 @@ pub fn update_fish_schools(
                     .output();
 
                     sprite.flip_x = from.x > to.x;
-                    sprite.index = (4.0 * lerp_progress).floor() as usize;
+                    sprite.index = (4.0 * lerp_progress).floor() as u32;
 
                     pos = from.lerp(*to, lerp_progress);
                 }
diff --git a/core/src/elements/grenade.rs b/src/core/elements/grenade.rs
similarity index 78%
rename from core/src/elements/grenade.rs
rename to src/core/elements/grenade.rs
index 9e86f39e69..4caa4e988e 100644
--- a/core/src/elements/grenade.rs
+++ b/src/core/elements/grenade.rs
@@ -1,7 +1,39 @@
 use crate::prelude::*;
-use std::time::Duration;
 
-pub fn install(session: &mut CoreSession) {
+/// Grenades item
+#[derive(HasSchema, Default, Debug, Clone)]
+#[type_data(metadata_asset("grenade"))]
+#[repr(C)]
+pub struct GrenadeMeta {
+    pub body_diameter: f32,
+    pub fin_anim: Ustr,
+    pub grab_offset: Vec2,
+    pub damage_region_size: Vec2,
+    pub damage_region_lifetime: f32,
+    pub throw_velocity: f32,
+    pub explosion_lifetime: f32,
+    pub explosion_frames: u32,
+    pub explosion_fps: f32,
+    pub explosion_sound: Handle<AudioSource>,
+    pub explosion_volume: f64,
+    pub fuse_sound: Handle<AudioSource>,
+    pub fuse_sound_volume: f64,
+    /// The time in seconds before a grenade explodes
+    pub fuse_time: f32,
+    pub can_rotate: bool,
+    /// The grenade atlas
+    pub atlas: Handle<Atlas>,
+    pub explosion_atlas: Handle<Atlas>,
+    pub bounciness: f32,
+    pub angular_velocity: f32,
+}
+
+pub fn game_plugin(game: &mut Game) {
+    GrenadeMeta::schema();
+    game.init_shared_resource::<AssetServer>();
+}
+
+pub fn session_plugin(session: &mut Session) {
     session
         .stages
         .add_system_to_stage(CoreStage::PreUpdate, hydrate)
@@ -9,13 +41,10 @@ pub fn install(session: &mut CoreSession) {
         .add_system_to_stage(CoreStage::PostUpdate, update_idle_grenades);
 }
 
-#[derive(Clone, TypeUlid, Debug, Copy)]
-#[ulid = "01GPRSBWQ3X0QJC37BDDQXDN84"]
+#[derive(Clone, HasSchema, Debug, Copy, Default)]
 pub struct IdleGrenade;
 
-// #[derive(Clone, TypeUlid, Debug, Copy)]
-#[derive(Clone, TypeUlid, Debug)]
-#[ulid = "01GPY9N9CBR6EFJX0RS2H2K58J"]
+#[derive(Clone, HasSchema, Debug, Default)]
 pub struct LitGrenade {
     /// The owner of the grenade.
     pub owner: Entity,
@@ -24,11 +53,11 @@ pub struct LitGrenade {
 }
 
 fn hydrate(
-    game_meta: Res<CoreMetaArc>,
-    mut entities: ResMut<Entities>,
+    game_meta: Root<GameMeta>,
+    mut entities: ResMutInit<Entities>,
     mut hydrated: CompMut<MapElementHydrated>,
     mut element_handles: CompMut<ElementHandle>,
-    element_assets: BevyAssets<ElementMeta>,
+    assets: Res<AssetServer>,
     mut idle_grenades: CompMut<IdleGrenade>,
     mut atlas_sprites: CompMut<AtlasSprite>,
     mut animated_sprites: CompMut<AnimatedSprite>,
@@ -50,12 +79,10 @@ fn hydrate(
 
     for spawner_ent in spawner_entities {
         let transform = *transforms.get(spawner_ent).unwrap();
-        let element_handle = element_handles.get(spawner_ent).unwrap();
-        let Some(element_meta) = element_assets.get(&element_handle.get_bevy_handle()) else {
-            continue;
-        };
+        let element_handle = *element_handles.get(spawner_ent).unwrap();
+        let element_meta = assets.get(element_handle.0);
 
-        if let BuiltinElementKind::Grenade {
+        if let Ok(GrenadeMeta {
             atlas,
             fin_anim,
             grab_offset,
@@ -65,7 +92,7 @@ fn hydrate(
             throw_velocity,
             angular_velocity,
             ..
-        } = &element_meta.builtin
+        }) = assets.get(element_meta.data).try_cast_ref()
         {
             hydrated.insert(spawner_ent, MapElementHydrated);
 
@@ -84,10 +111,10 @@ fn hydrate(
                     grab_offset: *grab_offset,
                 },
             );
-            atlas_sprites.insert(entity, AtlasSprite::new(atlas.clone()));
+            atlas_sprites.insert(entity, AtlasSprite::new(*atlas));
             respawn_points.insert(entity, DehydrateOutOfBounds(spawner_ent));
             transforms.insert(entity, transform);
-            element_handles.insert(entity, element_handle.clone());
+            element_handles.insert(entity, element_handle);
             hydrated.insert(entity, MapElementHydrated);
             animated_sprites.insert(entity, default());
             bodies.insert(
@@ -100,7 +127,7 @@ fn hydrate(
                     has_friction: true,
                     can_rotate: *can_rotate,
                     bounciness: *bounciness,
-                    gravity: game_meta.physics.gravity,
+                    gravity: game_meta.core.physics.gravity,
                     ..default()
                 },
             );
@@ -114,24 +141,24 @@ fn update_idle_grenades(
     entities: Res<Entities>,
     items_used: Comp<ItemUsed>,
     element_handles: Comp<ElementHandle>,
-    element_assets: BevyAssets<ElementMeta>,
-    mut audio_events: ResMut<AudioEvents>,
+    assets: Res<AssetServer>,
+    mut audio_events: ResMutInit<AudioEvents>,
     mut idle_grenades: CompMut<IdleGrenade>,
     mut animated_sprites: CompMut<AnimatedSprite>,
 ) {
     for (entity, (_grenade, element_handle)) in
         entities.iter_with((&mut idle_grenades, &element_handles))
     {
-        let Some(element_meta) = element_assets.get(&element_handle.get_bevy_handle()) else {
-            continue;
-        };
+        let element_meta = assets.get(element_handle.0);
 
-        let BuiltinElementKind::Grenade {
+        let asset = assets.get(element_meta.data);
+        let Ok(GrenadeMeta {
             fuse_sound,
             fuse_sound_volume,
             fuse_time,
             ..
-        } = &element_meta.builtin else {
+        }) = asset.try_cast_ref()
+        else {
             unreachable!();
         };
         let fuse_time = *fuse_time;
@@ -139,12 +166,12 @@ fn update_idle_grenades(
         if items_used.get(entity).is_some() {
             // Animate Grenade
             let animated_sprite = animated_sprites.get_mut(entity).unwrap();
-            animated_sprite.frames = Arc::from([3, 4, 5]);
+            animated_sprite.frames = [3, 4, 5].into_iter().collect();
             animated_sprite.repeat = true;
             animated_sprite.fps = 8.0;
 
             // Play that hissss sound
-            audio_events.play(fuse_sound.clone(), *fuse_sound_volume);
+            audio_events.play(*fuse_sound, *fuse_sound_volume);
 
             commands.add(
                 move |mut lit: CompMut<LitGrenade>,
@@ -177,23 +204,21 @@ fn update_lit_grenades(
     transforms: CompMut<Transform>,
     element_handles: Comp<ElementHandle>,
     spawners: Comp<DehydrateOutOfBounds>,
-    mut audio_events: ResMut<AudioEvents>,
+    mut audio_events: ResMutInit<AudioEvents>,
     mut lit_grenades: CompMut<LitGrenade>,
     player_inventories: PlayerInventories,
-    element_assets: BevyAssets<ElementMeta>,
+    assets: Res<AssetServer>,
     mut emote_regions: CompMut<EmoteRegion>,
     mut player_layers: CompMut<PlayerLayers>,
     mut hydrated: CompMut<MapElementHydrated>,
-    mut trauma_events: ResMut<CameraTraumaEvents>,
+    mut trauma_events: ResMutInit<CameraTraumaEvents>,
 ) {
     for (entity, (grenade, element_handle, spawner)) in
         entities.iter_with((&mut lit_grenades, &element_handles, &spawners))
     {
-        let Some(element_meta) = element_assets.get(&element_handle.get_bevy_handle()) else {
-            continue;
-        };
-
-        let BuiltinElementKind::Grenade {
+        let element_meta = assets.get(element_handle.0);
+        let asset = assets.get(element_meta.data);
+        let Ok(GrenadeMeta {
             explosion_sound,
             explosion_volume,
             damage_region_lifetime,
@@ -204,7 +229,8 @@ fn update_lit_grenades(
             explosion_frames,
             fin_anim,
             ..
-        } = &element_meta.builtin else {
+        }) = asset.try_cast_ref()
+        else {
             unreachable!();
         };
 
@@ -243,7 +269,7 @@ fn update_lit_grenades(
 
         // If it's time to explode
         if grenade.fuse_time.finished() {
-            audio_events.play(explosion_sound.clone(), *explosion_volume);
+            audio_events.play(*explosion_sound, *explosion_volume);
 
             trauma_events.send(5.0);
 
@@ -257,11 +283,11 @@ fn update_lit_grenades(
             let damage_region_size = *damage_region_size;
             let damage_region_lifetime = *damage_region_lifetime;
             let explosion_lifetime = *explosion_lifetime;
-            let explosion_atlas = explosion_atlas.clone();
+            let explosion_atlas = *explosion_atlas;
             let explosion_fps = *explosion_fps;
             let explosion_frames = *explosion_frames;
             commands.add(
-                move |mut entities: ResMut<Entities>,
+                move |mut entities: ResMutInit<Entities>,
                       mut transforms: CompMut<Transform>,
                       mut damage_regions: CompMut<DamageRegion>,
                       mut lifetimes: CompMut<Lifetime>,
@@ -287,7 +313,7 @@ fn update_lit_grenades(
                     sprites.insert(
                         ent,
                         AtlasSprite {
-                            atlas: explosion_atlas.clone(),
+                            atlas: explosion_atlas,
                             ..default()
                         },
                     );
diff --git a/core/src/elements/kick_bomb.rs b/src/core/elements/kick_bomb.rs
similarity index 79%
rename from core/src/elements/kick_bomb.rs
rename to src/core/elements/kick_bomb.rs
index 7eefab0982..f9dfaa2a61 100644
--- a/core/src/elements/kick_bomb.rs
+++ b/src/core/elements/kick_bomb.rs
@@ -1,6 +1,40 @@
 use crate::prelude::*;
 
-pub fn install(session: &mut CoreSession) {
+#[derive(HasSchema, Default, Debug, Clone)]
+#[type_data(metadata_asset("kick_bomb"))]
+#[repr(C)]
+pub struct KickBombMeta {
+    pub body_diameter: f32,
+    pub fin_anim: Ustr,
+    pub grab_offset: Vec2,
+    pub damage_region_size: Vec2,
+    pub damage_region_lifetime: f32,
+    pub kick_velocity: Vec2,
+    pub throw_velocity: f32,
+    pub explosion_lifetime: f32,
+    pub explosion_frames: u32,
+    pub explosion_fps: f32,
+    pub explosion_sound: Handle<AudioSource>,
+    pub explosion_volume: f64,
+    pub fuse_sound: Handle<AudioSource>,
+    pub fuse_sound_volume: f64,
+    /// The time in seconds before a grenade explodes
+    pub fuse_time: Duration,
+    pub can_rotate: bool,
+    /// The grenade atlas
+    pub atlas: Handle<Atlas>,
+    pub explosion_atlas: Handle<Atlas>,
+    pub bounciness: f32,
+    pub angular_velocity: f32,
+    pub arm_delay: Duration,
+}
+
+pub fn game_plugin(game: &mut Game) {
+    KickBombMeta::schema();
+    game.init_shared_resource::<AssetServer>();
+}
+
+pub fn session_plugin(session: &mut Session) {
     session
         .stages
         .add_system_to_stage(CoreStage::PreUpdate, hydrate)
@@ -8,28 +42,26 @@ pub fn install(session: &mut CoreSession) {
         .add_system_to_stage(CoreStage::PostUpdate, update_idle_kick_bombs);
 }
 
-#[derive(Clone, TypeUlid, Debug, Copy)]
-#[ulid = "01GQ0ZWBNA8HZRXYKZXCT05CXT"]
+#[derive(Clone, HasSchema, Default, Debug, Copy)]
 pub struct IdleKickBomb;
 
-#[derive(Clone, TypeUlid, Debug)]
-#[ulid = "01GQ0ZWFYZSHJPESPY9QPSTARR"]
+#[derive(Clone, HasSchema, Default, Debug)]
 pub struct LitKickBomb {
     arm_delay: Timer,
     fuse_time: Timer,
 }
 
 fn hydrate(
-    game_meta: Res<CoreMetaArc>,
+    game_meta: Root<GameMeta>,
     mut items: CompMut<Item>,
     mut item_throws: CompMut<ItemThrow>,
     mut item_grabs: CompMut<ItemGrab>,
-    mut entities: ResMut<Entities>,
+    mut entities: ResMutInit<Entities>,
     mut bodies: CompMut<KinematicBody>,
     mut transforms: CompMut<Transform>,
     mut idle_bombs: CompMut<IdleKickBomb>,
     mut atlas_sprites: CompMut<AtlasSprite>,
-    element_assets: BevyAssets<ElementMeta>,
+    assets: Res<AssetServer>,
     mut hydrated: CompMut<MapElementHydrated>,
     mut element_handles: CompMut<ElementHandle>,
     mut animated_sprites: CompMut<AnimatedSprite>,
@@ -46,12 +78,10 @@ fn hydrate(
 
     for spawner_ent in spawner_entities {
         let transform = *transforms.get(spawner_ent).unwrap();
-        let element_handle = element_handles.get(spawner_ent).unwrap();
-        let Some(element_meta) = element_assets.get(&element_handle.get_bevy_handle()) else {
-            continue;
-        };
+        let element_handle = *element_handles.get(spawner_ent).unwrap();
+        let element_meta = assets.get(element_handle.0);
 
-        if let BuiltinElementKind::KickBomb {
+        if let Ok(KickBombMeta {
             atlas,
             fin_anim,
             grab_offset,
@@ -61,7 +91,7 @@ fn hydrate(
             throw_velocity,
             angular_velocity,
             ..
-        } = &element_meta.builtin
+        }) = assets.get(element_meta.data).try_cast_ref()
         {
             hydrated.insert(spawner_ent, MapElementHydrated);
 
@@ -80,10 +110,10 @@ fn hydrate(
                 },
             );
             idle_bombs.insert(entity, IdleKickBomb);
-            atlas_sprites.insert(entity, AtlasSprite::new(atlas.clone()));
+            atlas_sprites.insert(entity, AtlasSprite::new(*atlas));
             respawn_points.insert(entity, DehydrateOutOfBounds(spawner_ent));
             transforms.insert(entity, transform);
-            element_handles.insert(entity, element_handle.clone());
+            element_handles.insert(entity, element_handle);
             hydrated.insert(entity, MapElementHydrated);
             animated_sprites.insert(entity, default());
             bodies.insert(
@@ -92,7 +122,7 @@ fn hydrate(
                     shape: ColliderShape::Circle {
                         diameter: *body_diameter,
                     },
-                    gravity: game_meta.physics.gravity,
+                    gravity: game_meta.core.physics.gravity,
                     has_mass: true,
                     has_friction: true,
                     can_rotate: *can_rotate,
@@ -109,26 +139,26 @@ fn update_idle_kick_bombs(
     entities: Res<Entities>,
     mut commands: Commands,
     mut items_used: CompMut<ItemUsed>,
-    mut audio_events: ResMut<AudioEvents>,
+    mut audio_events: ResMutInit<AudioEvents>,
     element_handles: Comp<ElementHandle>,
     mut idle_bombs: CompMut<IdleKickBomb>,
-    element_assets: BevyAssets<ElementMeta>,
+    assets: Res<AssetServer>,
     mut animated_sprites: CompMut<AnimatedSprite>,
 ) {
     for (entity, (_kick_bomb, element_handle)) in
         entities.iter_with((&mut idle_bombs, &element_handles))
     {
-        let Some(element_meta) = element_assets.get(&element_handle.get_bevy_handle()) else {
-            continue;
-        };
+        let element_meta = assets.get(element_handle.0);
 
-        let BuiltinElementKind::KickBomb {
+        let asset = assets.get(element_meta.data);
+        let Ok(KickBombMeta {
             fuse_sound,
             fuse_sound_volume,
             arm_delay,
             fuse_time,
             ..
-        } = &element_meta.builtin else {
+        }) = asset.try_cast_ref()
+        else {
             unreachable!();
         };
 
@@ -136,10 +166,10 @@ fn update_idle_kick_bombs(
         let fuse_time = *fuse_time;
 
         if items_used.get(entity).is_some() {
-            audio_events.play(fuse_sound.clone(), *fuse_sound_volume);
+            audio_events.play(*fuse_sound, *fuse_sound_volume);
             items_used.remove(entity);
             let animated_sprite = animated_sprites.get_mut(entity).unwrap();
-            animated_sprite.frames = Arc::from([3, 4, 5]);
+            animated_sprite.frames = [3, 4, 5].into_iter().collect();
             animated_sprite.repeat = true;
             animated_sprite.fps = 8.0;
             commands.add(
@@ -161,12 +191,12 @@ fn update_idle_kick_bombs(
 fn update_lit_kick_bombs(
     entities: Res<Entities>,
     element_handles: Comp<ElementHandle>,
-    element_assets: BevyAssets<ElementMeta>,
+    assets: Res<AssetServer>,
 
     collision_world: CollisionWorld,
     player_indexes: Comp<PlayerIdx>,
-    mut audio_events: ResMut<AudioEvents>,
-    mut trauma_events: ResMut<CameraTraumaEvents>,
+    mut audio_events: ResMutInit<AudioEvents>,
+    mut trauma_events: ResMutInit<CameraTraumaEvents>,
     mut lit_grenades: CompMut<LitKickBomb>,
     mut sprites: CompMut<AtlasSprite>,
     mut bodies: CompMut<KinematicBody>,
@@ -183,11 +213,9 @@ fn update_lit_kick_bombs(
     for (entity, (kick_bomb, element_handle, spawner)) in
         entities.iter_with((&mut lit_grenades, &element_handles, &spawners))
     {
-        let Some(element_meta) = element_assets.get(&element_handle.get_bevy_handle()) else {
-            continue;
-        };
-
-        let BuiltinElementKind::KickBomb {
+        let element_meta = assets.get(element_handle.0);
+        let asset = assets.get(element_meta.data);
+        let Ok(KickBombMeta {
             grab_offset,
             explosion_sound,
             explosion_volume,
@@ -200,7 +228,8 @@ fn update_lit_kick_bombs(
             explosion_frames,
             fin_anim,
             ..
-        } = &element_meta.builtin else {
+        }) = asset.try_cast_ref()
+        else {
             unreachable!();
         };
 
@@ -264,7 +293,7 @@ fn update_lit_kick_bombs(
 
         // If it's time to explode
         if kick_bomb.fuse_time.finished() || should_explode {
-            audio_events.play(explosion_sound.clone(), *explosion_volume);
+            audio_events.play(*explosion_sound, *explosion_volume);
 
             trauma_events.send(7.5);
 
@@ -278,11 +307,11 @@ fn update_lit_kick_bombs(
             let damage_region_size = *damage_region_size;
             let damage_region_lifetime = *damage_region_lifetime;
             let explosion_lifetime = *explosion_lifetime;
-            let explosion_atlas = explosion_atlas.clone();
+            let explosion_atlas = *explosion_atlas;
             let explosion_fps = *explosion_fps;
             let explosion_frames = *explosion_frames;
             commands.add(
-                move |mut entities: ResMut<Entities>,
+                move |mut entities: ResMutInit<Entities>,
                       mut transforms: CompMut<Transform>,
                       mut damage_regions: CompMut<DamageRegion>,
                       mut lifetimes: CompMut<Lifetime>,
@@ -308,7 +337,7 @@ fn update_lit_kick_bombs(
                     sprites.insert(
                         ent,
                         AtlasSprite {
-                            atlas: explosion_atlas.clone(),
+                            atlas: explosion_atlas,
                             ..default()
                         },
                     );
diff --git a/core/src/elements/mine.rs b/src/core/elements/mine.rs
similarity index 76%
rename from core/src/elements/mine.rs
rename to src/core/elements/mine.rs
index a548a15d6a..fc645b15f7 100644
--- a/core/src/elements/mine.rs
+++ b/src/core/elements/mine.rs
@@ -1,7 +1,41 @@
 use crate::prelude::*;
-use std::time::Duration;
 
-pub fn install(session: &mut CoreSession) {
+/// The mine item
+#[derive(HasSchema, Default, Debug, Clone)]
+#[type_data(metadata_asset("mine"))]
+#[repr(C)]
+pub struct MineMeta {
+    pub atlas: Handle<Atlas>,
+
+    pub damage_region_size: Vec2,
+    pub damage_region_lifetime: f32,
+    pub explosion_atlas: Handle<Atlas>,
+    pub explosion_lifetime: f32,
+    pub explosion_frames: u32,
+    pub explosion_fps: f32,
+    pub explosion_volume: f64,
+    pub explosion_sound: Handle<AudioSource>,
+
+    /// The delay after throwing the mine, before it becomes armed and will blow up on contact.
+    pub arm_delay: f32,
+    pub armed_frames: u32,
+    pub armed_fps: f32,
+    pub arm_sound_volume: f64,
+    pub arm_sound: Handle<AudioSource>,
+
+    pub throw_velocity: f32,
+    pub body_size: Vec2,
+    pub grab_offset: Vec2,
+    pub fin_anim: Ustr,
+    pub bounciness: f32,
+}
+
+pub fn game_plugin(game: &mut Game) {
+    MineMeta::schema();
+    game.init_shared_resource::<AssetServer>();
+}
+
+pub fn session_plugin(session: &mut Session) {
     session
         .stages
         .add_system_to_stage(CoreStage::PreUpdate, hydrate)
@@ -9,23 +43,21 @@ pub fn install(session: &mut CoreSession) {
         .add_system_to_stage(CoreStage::PostUpdate, update_idle_mines);
 }
 
-#[derive(Clone, TypeUlid, Debug, Copy)]
-#[ulid = "01GPRSBWQ3X0QJC37BDDQXDNF3"]
+#[derive(Clone, HasSchema, Default, Debug, Copy)]
 pub struct IdleMine;
 
-#[derive(Clone, TypeUlid, Debug)]
-#[ulid = "01GPRSBWQ3X0QJC37BDQXDNASF"]
+#[derive(Clone, HasSchema, Default, Debug)]
 pub struct ThrownMine {
     // The mine won't explode until this timer finishes.
     arm_delay: Timer,
 }
 
 fn hydrate(
-    game_meta: Res<CoreMetaArc>,
-    mut entities: ResMut<Entities>,
+    game_meta: Root<GameMeta>,
+    mut entities: ResMutInit<Entities>,
     mut hydrated: CompMut<MapElementHydrated>,
     mut element_handles: CompMut<ElementHandle>,
-    element_assets: BevyAssets<ElementMeta>,
+    assets: Res<AssetServer>,
     mut idle_mines: CompMut<IdleMine>,
     mut atlas_sprites: CompMut<AtlasSprite>,
     mut animated_sprites: CompMut<AnimatedSprite>,
@@ -47,12 +79,10 @@ fn hydrate(
 
     for spawner_ent in spawner_entities {
         let transform = *transforms.get(spawner_ent).unwrap();
-        let element_handle = element_handles.get(spawner_ent).unwrap();
-        let Some(element_meta) = element_assets.get(&element_handle.get_bevy_handle()) else {
-            continue;
-        };
+        let element_handle = *element_handles.get(spawner_ent).unwrap();
+        let element_meta = assets.get(element_handle.0);
 
-        if let BuiltinElementKind::Mine {
+        if let Ok(MineMeta {
             atlas,
             fin_anim,
             grab_offset,
@@ -60,14 +90,14 @@ fn hydrate(
             bounciness,
             throw_velocity,
             ..
-        } = &element_meta.builtin
+        }) = assets.get(element_meta.data).try_cast_ref()
         {
             hydrated.insert(spawner_ent, MapElementHydrated);
 
             let entity = entities.create();
             items.insert(entity, Item);
             idle_mines.insert(entity, IdleMine);
-            atlas_sprites.insert(entity, AtlasSprite::new(atlas.clone()));
+            atlas_sprites.insert(entity, AtlasSprite::new(*atlas));
             item_throws.insert(entity, ItemThrow::strength(*throw_velocity));
             item_grabs.insert(
                 entity,
@@ -79,7 +109,7 @@ fn hydrate(
             );
             respawn_points.insert(entity, DehydrateOutOfBounds(spawner_ent));
             transforms.insert(entity, transform);
-            element_handles.insert(entity, element_handle.clone());
+            element_handles.insert(entity, element_handle);
             hydrated.insert(entity, MapElementHydrated);
             animated_sprites.insert(entity, default());
             bodies.insert(
@@ -89,7 +119,7 @@ fn hydrate(
                     has_mass: true,
                     has_friction: true,
                     bounciness: *bounciness,
-                    gravity: game_meta.physics.gravity,
+                    gravity: game_meta.core.physics.gravity,
                     ..default()
                 },
             );
@@ -101,7 +131,7 @@ fn hydrate(
 fn update_idle_mines(
     entities: Res<Entities>,
     element_handles: Comp<ElementHandle>,
-    element_assets: BevyAssets<ElementMeta>,
+    assets: Res<AssetServer>,
     mut idle_mines: CompMut<IdleMine>,
     mut items_used: CompMut<ItemUsed>,
     player_inventories: PlayerInventories,
@@ -109,13 +139,10 @@ fn update_idle_mines(
 ) {
     for (entity, (_mine, element_handle)) in entities.iter_with((&mut idle_mines, &element_handles))
     {
-        let Some(element_meta) = element_assets.get(&element_handle.get_bevy_handle()) else {
-            continue;
-        };
+        let element_meta = assets.get(element_handle.0);
 
-        let BuiltinElementKind::Mine {
-            arm_delay,..
-             } = &element_meta.builtin else {
+        let asset = assets.get(element_meta.data);
+        let Ok(MineMeta { arm_delay, .. }) = asset.try_cast_ref() else {
             unreachable!();
         };
         let arm_delay = *arm_delay;
@@ -149,9 +176,9 @@ fn update_idle_mines(
 fn update_thrown_mines(
     entities: Res<Entities>,
     element_handles: Comp<ElementHandle>,
-    element_assets: BevyAssets<ElementMeta>,
-    mut audio_events: ResMut<AudioEvents>,
-    mut trauma_events: ResMut<CameraTraumaEvents>,
+    assets: Res<AssetServer>,
+    mut audio_events: ResMutInit<AudioEvents>,
+    mut trauma_events: ResMutInit<CameraTraumaEvents>,
     mut thrown_mines: CompMut<ThrownMine>,
     mut animated_sprites: CompMut<AnimatedSprite>,
     mut hydrated: CompMut<MapElementHydrated>,
@@ -173,11 +200,10 @@ fn update_thrown_mines(
         &mut animated_sprites,
         &spawners,
     )) {
-        let Some(element_meta) = element_assets.get(&element_handle.get_bevy_handle()) else {
-            continue;
-        };
+        let element_meta = assets.get(element_handle.0);
 
-        let BuiltinElementKind::Mine {
+        let asset = assets.get(element_meta.data);
+        let Ok(MineMeta {
             explosion_fps,
             explosion_frames,
             explosion_sound,
@@ -186,14 +212,20 @@ fn update_thrown_mines(
             armed_frames,
             armed_fps,
             damage_region_size,
-            damage_region_lifetime, explosion_volume, arm_sound_volume, explosion_lifetime, .. } = &element_meta.builtin else {
+            damage_region_lifetime,
+            explosion_volume,
+            arm_sound_volume,
+            explosion_lifetime,
+            ..
+        }) = asset.try_cast_ref()
+        else {
             unreachable!();
         };
 
         thrown_mine.arm_delay.tick(time.delta());
 
         if thrown_mine.arm_delay.just_finished() {
-            audio_events.play(arm_sound.clone(), *arm_sound_volume);
+            audio_events.play(*arm_sound, *arm_sound_volume);
 
             sprite.frames = (0..*armed_frames).collect();
             sprite.fps = *armed_fps;
@@ -219,7 +251,7 @@ fn update_thrown_mines(
                 ));
             }
 
-            audio_events.play(explosion_sound.clone(), *explosion_volume);
+            audio_events.play(*explosion_sound, *explosion_volume);
 
             hydrated.remove(**spawner);
 
@@ -227,11 +259,11 @@ fn update_thrown_mines(
             let damage_region_size = *damage_region_size;
             let damage_region_lifetime = *damage_region_lifetime;
             let explosion_lifetime = *explosion_lifetime;
-            let explosion_atlas = explosion_atlas.clone();
+            let explosion_atlas = *explosion_atlas;
             let explosion_fps = *explosion_fps;
             let explosion_frames = *explosion_frames;
             commands.add(
-                move |mut entities: ResMut<Entities>,
+                move |mut entities: ResMutInit<Entities>,
                       mut transforms: CompMut<Transform>,
                       mut damage_regions: CompMut<DamageRegion>,
                       mut lifetimes: CompMut<Lifetime>,
@@ -261,7 +293,7 @@ fn update_thrown_mines(
                     sprites.insert(
                         ent,
                         AtlasSprite {
-                            atlas: explosion_atlas.clone(),
+                            atlas: explosion_atlas,
                             ..default()
                         },
                     );
diff --git a/core/src/elements/musket.rs b/src/core/elements/musket.rs
similarity index 78%
rename from core/src/elements/musket.rs
rename to src/core/elements/musket.rs
index f1ebc2751e..95f4011c88 100644
--- a/core/src/elements/musket.rs
+++ b/src/core/elements/musket.rs
@@ -1,27 +1,58 @@
-use std::time::Duration;
-
 use crate::prelude::*;
 
-pub fn install(session: &mut CoreSession) {
+#[derive(HasSchema, Default, Debug, Clone)]
+#[type_data(metadata_asset("musket"))]
+#[repr(C)]
+pub struct MusketMeta {
+    pub grab_offset: Vec2,
+    pub fin_anim: Ustr,
+
+    pub body_size: Vec2,
+    pub bounciness: f32,
+    pub can_rotate: bool,
+    pub throw_velocity: f32,
+    pub angular_velocity: f32,
+    pub atlas: Handle<Atlas>,
+
+    pub max_ammo: u32,
+    pub cooldown: Duration,
+    pub bullet_meta: Handle<BulletMeta>,
+    pub kickback: f32,
+
+    pub shoot_fps: f32,
+    pub shoot_lifetime: f32,
+    pub shoot_frames: u32,
+    pub shoot_sound_volume: f64,
+    pub empty_shoot_sound_volume: f64,
+    pub shoot_atlas: Handle<Atlas>,
+    pub shoot_sound: Handle<AudioSource>,
+    pub empty_shoot_sound: Handle<AudioSource>,
+}
+
+pub fn game_plugin(game: &mut Game) {
+    MusketMeta::schema();
+    game.init_shared_resource::<AssetServer>();
+}
+
+pub fn session_plugin(session: &mut Session) {
     session
         .stages
         .add_system_to_stage(CoreStage::PreUpdate, hydrate)
         .add_system_to_stage(CoreStage::PostUpdate, update);
 }
 
-#[derive(Clone, Debug, TypeUlid, Default)]
-#[ulid = "01GQWRRV9HV52X9JAYYF1AFFS7"]
+#[derive(Clone, Debug, HasSchema, Default)]
 pub struct Musket {
-    pub ammo: usize,
+    pub ammo: u32,
     pub cooldown: Timer,
 }
 
 fn hydrate(
-    game_meta: Res<CoreMetaArc>,
-    mut entities: ResMut<Entities>,
+    game_meta: Root<GameMeta>,
+    mut entities: ResMutInit<Entities>,
     mut hydrated: CompMut<MapElementHydrated>,
     mut element_handles: CompMut<ElementHandle>,
-    element_assets: BevyAssets<ElementMeta>,
+    assets: Res<AssetServer>,
     mut muskets: CompMut<Musket>,
     mut atlas_sprites: CompMut<AtlasSprite>,
     mut bodies: CompMut<KinematicBody>,
@@ -42,12 +73,10 @@ fn hydrate(
 
     for spawner_ent in spawner_entities {
         let transform = *transforms.get(spawner_ent).unwrap();
-        let element_handle = element_handles.get(spawner_ent).unwrap();
-        let Some(element_meta) = element_assets.get(&element_handle.get_bevy_handle()) else {
-                continue;
-            };
+        let element_handle = *element_handles.get(spawner_ent).unwrap();
+        let element_meta = assets.get(element_handle.0);
 
-        if let BuiltinElementKind::Musket {
+        if let Ok(MusketMeta {
             atlas,
             fin_anim,
             grab_offset,
@@ -58,7 +87,7 @@ fn hydrate(
             throw_velocity,
             angular_velocity,
             ..
-        } = &element_meta.builtin
+        }) = assets.get(element_meta.data).try_cast_ref()
         {
             hydrated.insert(spawner_ent, MapElementHydrated);
 
@@ -85,10 +114,10 @@ fn hydrate(
                     cooldown: Timer::new(Duration::from_millis(0), TimerMode::Once),
                 },
             );
-            atlas_sprites.insert(entity, AtlasSprite::new(atlas.clone()));
+            atlas_sprites.insert(entity, AtlasSprite::new(*atlas));
             respawn_points.insert(entity, DehydrateOutOfBounds(spawner_ent));
             transforms.insert(entity, transform);
-            element_handles.insert(entity, element_handle.clone());
+            element_handles.insert(entity, element_handle);
             hydrated.insert(entity, MapElementHydrated);
             bodies.insert(
                 entity,
@@ -98,7 +127,7 @@ fn hydrate(
                     has_friction: true,
                     can_rotate: *can_rotate,
                     bounciness: *bounciness,
-                    gravity: game_meta.physics.gravity,
+                    gravity: game_meta.core.physics.gravity,
                     ..default()
                 },
             );
@@ -111,12 +140,12 @@ fn update(
     entities: Res<Entities>,
     mut commands: Commands,
     element_handles: Comp<ElementHandle>,
-    element_assets: BevyAssets<ElementMeta>,
+    assets: Res<AssetServer>,
 
     mut muskets: CompMut<Musket>,
     transforms: CompMut<Transform>,
     mut sprites: CompMut<AtlasSprite>,
-    mut audio_events: ResMut<AudioEvents>,
+    mut audio_events: ResMutInit<AudioEvents>,
 
     player_inventories: PlayerInventories,
     mut items_used: CompMut<ItemUsed>,
@@ -126,11 +155,10 @@ fn update(
     mut bodies: CompMut<KinematicBody>,
 ) {
     for (entity, (musket, element_handle)) in entities.iter_with((&mut muskets, &element_handles)) {
-        let Some(element_meta) = element_assets.get(&element_handle.get_bevy_handle()) else {
-            continue;
-        };
+        let element_meta = assets.get(element_handle.0);
 
-        let BuiltinElementKind::Musket {
+        let asset = assets.get(element_meta.data);
+        let Ok(MusketMeta {
             max_ammo,
             shoot_fps,
             shoot_atlas,
@@ -144,7 +172,8 @@ fn update(
             empty_shoot_sound_volume,
             kickback,
             ..
-        } = &element_meta.builtin else {
+        }) = asset.try_cast_ref()
+        else {
             unreachable!();
         };
 
@@ -165,14 +194,14 @@ fn update(
             if item_used && musket.cooldown.finished() {
                 // Empty
                 if musket.ammo.eq(&0) {
-                    audio_events.play(empty_shoot_sound.clone(), *empty_shoot_sound_volume);
+                    audio_events.play(*empty_shoot_sound, *empty_shoot_sound_volume);
                     continue;
                 }
 
                 // Reset fire cooldown and subtract ammo
                 musket.cooldown = Timer::new(*cooldown, TimerMode::Once);
                 musket.ammo = musket.ammo.saturating_sub(1).clamp(0, musket.ammo);
-                audio_events.play(shoot_sound.clone(), *shoot_sound_volume);
+                audio_events.play(*shoot_sound, *shoot_sound_volume);
 
                 let player_sprite = sprites.get_mut(player).unwrap();
                 let player_flip_x = player_sprite.flip_x;
@@ -189,12 +218,12 @@ fn update(
                 let shoot_fps = *shoot_fps;
                 let shoot_frames = *shoot_frames;
                 let shoot_lifetime = *shoot_lifetime;
-                let shoot_atlas = shoot_atlas.clone();
+                let shoot_atlas = *shoot_atlas;
 
-                let bullet_meta = bullet_meta.clone();
+                let bullet_meta = *bullet_meta;
 
                 commands.add(
-                    move |mut entities: ResMut<Entities>,
+                    move |mut entities: ResMutInit<Entities>,
                           mut lifetimes: CompMut<Lifetime>,
                           mut sprites: CompMut<AtlasSprite>,
                           mut transforms: CompMut<Transform>,
@@ -209,7 +238,7 @@ fn update(
                                 ent,
                                 AtlasSprite {
                                     flip_x: player_flip_x,
-                                    atlas: shoot_atlas.clone(),
+                                    atlas: shoot_atlas,
                                     ..default()
                                 },
                             );
@@ -237,7 +266,7 @@ fn update(
                                 },
                             );
                             transforms.insert(ent, shoot_animation_transform);
-                            bullet_handles.insert(ent, BulletHandle(bullet_meta.clone()));
+                            bullet_handles.insert(ent, BulletHandle(bullet_meta));
                         }
                     },
                 );
@@ -252,7 +281,7 @@ fn update(
     }
 }
 
-fn musket_drop(entity: Entity, max_ammo: usize) -> System {
+fn musket_drop(entity: Entity, max_ammo: u32) -> StaticSystem<(), ()> {
     (move |mut muskets: CompMut<Musket>| {
         // Reload musket
         muskets.get_mut(entity).unwrap().ammo = max_ammo;
diff --git a/core/src/elements/player_spawner.rs b/src/core/elements/player_spawner.rs
similarity index 72%
rename from core/src/elements/player_spawner.rs
rename to src/core/elements/player_spawner.rs
index 22f59a28c3..b471c0dc40 100644
--- a/core/src/elements/player_spawner.rs
+++ b/src/core/elements/player_spawner.rs
@@ -1,6 +1,17 @@
-use crate::{prelude::*, MAX_PLAYERS};
+use crate::prelude::*;
 
-pub fn install(session: &mut CoreSession) {
+/// Player spawner element
+#[derive(HasSchema, Default, Debug, Clone, Copy)]
+#[type_data(metadata_asset("player_spawner"))]
+#[repr(C)]
+pub struct PlayerSpawnerMeta;
+
+pub fn game_plugin(game: &mut Game) {
+    PlayerSpawnerMeta::schema();
+    game.init_shared_resource::<AssetServer>();
+}
+
+pub fn session_plugin(session: &mut Session) {
     session
         .stages
         .add_system_to_stage(CoreStage::First, hydrate)
@@ -8,20 +19,20 @@ pub fn install(session: &mut CoreSession) {
 }
 
 /// Marker component for player spawners.
-#[derive(Clone, Debug, TypeUlid)]
-#[ulid = "01GP4YT7VARRVHFWJ46HNSN09P"]
+#[derive(Clone, Debug, HasSchema, Default)]
+#[type_data(metadata_asset("player_spawner"))]
+#[repr(C)]
 pub struct PlayerSpawner;
 
 /// Resource that stores the next spawner to use when spawning a player.
-#[derive(Clone, Debug, TypeUlid, Default)]
-#[ulid = "01GP4YVEQGVQATG3KSPC0SD37N"]
+#[derive(Clone, Debug, HasSchema, Default)]
 pub struct CurrentSpawner(pub usize);
 
 fn hydrate(
     entities: Res<Entities>,
     mut hydrated: CompMut<MapElementHydrated>,
     element_handles: Comp<ElementHandle>,
-    element_assets: BevyAssets<ElementMeta>,
+    assets: Res<AssetServer>,
     mut player_spawners: CompMut<PlayerSpawner>,
     mut spawner_manager: SpawnerManager,
 ) {
@@ -31,11 +42,9 @@ fn hydrate(
 
     for entity in entities.iter_with_bitset(&not_hydrated_bitset) {
         let element_handle = element_handles.get(entity).unwrap();
-        let Some(element_meta) = element_assets.get(&element_handle.get_bevy_handle()) else {
-            continue;
-        };
+        let element_meta = assets.get(element_handle.0);
 
-        if let BuiltinElementKind::PlayerSpawner = &element_meta.builtin {
+        if let Ok(PlayerSpawner) = assets.get(element_meta.data).try_cast_ref() {
             hydrated.insert(entity, MapElementHydrated);
             player_spawners.insert(entity, PlayerSpawner);
 
@@ -45,12 +54,12 @@ fn hydrate(
 }
 
 fn update(
-    mut entities: ResMut<Entities>,
-    mut current_spawner: ResMut<CurrentSpawner>,
+    mut entities: ResMutInit<Entities>,
+    mut current_spawner: ResMutInit<CurrentSpawner>,
     player_spawners: Comp<PlayerSpawner>,
     mut player_indexes: CompMut<PlayerIdx>,
     mut transforms: CompMut<Transform>,
-    player_inputs: Res<PlayerInputs>,
+    player_inputs: Res<MatchInputs>,
     mut spawner_manager: SpawnerManager,
 ) {
     let alive_players = entities
@@ -63,8 +72,8 @@ fn update(
         .collect::<Vec<_>>();
 
     // For every player
-    for i in 0..MAX_PLAYERS {
-        let player = &player_inputs.players[i];
+    for i in 0..MAX_PLAYERS as u32 {
+        let player = &player_inputs.players[i as usize];
 
         // If the player is active, but not alive
         if player.active && !alive_players.contains(&i) {
@@ -72,7 +81,9 @@ fn update(
             current_spawner.0 += 1;
             current_spawner.0 %= spawn_points.len().max(1);
 
-            let Some(mut spawn_point) = spawn_points.get(current_spawner.0).copied() else { return };
+            let Some(mut spawn_point) = spawn_points.get(current_spawner.0).copied() else {
+                return;
+            };
 
             // Make sure each player spawns at a different z level ( give enough room for 10 players
             // to fit between map layers )
diff --git a/core/src/elements/slippery.rs b/src/core/elements/slippery.rs
similarity index 74%
rename from core/src/elements/slippery.rs
rename to src/core/elements/slippery.rs
index 6ed70e0bb6..732d4460f3 100644
--- a/core/src/elements/slippery.rs
+++ b/src/core/elements/slippery.rs
@@ -1,14 +1,28 @@
 use crate::prelude::*;
 
-pub fn install(session: &mut CoreSession) {
+#[derive(HasSchema, Default, Debug, Clone)]
+#[type_data(metadata_asset("slippery"))]
+#[repr(C)]
+pub struct SlipperyMeta {
+    pub atlas: Handle<Atlas>,
+    pub body_size: Vec2,
+    pub player_slide: f32,
+    pub body_friction: f32,
+}
+
+pub fn game_plugin(game: &mut Game) {
+    SlipperyMeta::schema();
+    game.init_shared_resource::<AssetServer>();
+}
+
+pub fn session_plugin(session: &mut Session) {
     session
         .stages
         .add_system_to_stage(CoreStage::PreUpdate, hydrate)
         .add_system_to_stage(CoreStage::PreUpdate, update);
 }
 
-#[derive(Clone, Debug, TypeUlid, Default)]
-#[ulid = "01GTF77BGTAPJNTYEXKP6A2862"]
+#[derive(Clone, Debug, HasSchema, Default)]
 pub struct Slippery {
     pub player_slide: f32,
     pub body_friction: f32,
@@ -18,7 +32,7 @@ fn hydrate(
     entities: Res<Entities>,
     mut hydrated: CompMut<MapElementHydrated>,
     element_handles: Comp<ElementHandle>,
-    element_assets: BevyAssets<ElementMeta>,
+    assets: Res<AssetServer>,
     mut slippery: CompMut<Slippery>,
     mut atlas_sprites: CompMut<AtlasSprite>,
     mut bodies: CompMut<KinematicBody>,
@@ -29,19 +43,17 @@ fn hydrate(
 
     for entity in entities.iter_with_bitset(&not_hydrated_bitset) {
         let element_handle = element_handles.get(entity).unwrap();
-        let Some(element_meta) = element_assets.get(&element_handle.get_bevy_handle()) else {
-            continue;
-        };
+        let element_meta = assets.get(element_handle.0);
 
-        if let BuiltinElementKind::Slippery {
+        if let Ok(SlipperyMeta {
             atlas,
             body_size,
             player_slide,
             body_friction,
-        } = &element_meta.builtin
+        }) = assets.get(element_meta.data).try_cast_ref()
         {
             hydrated.insert(entity, MapElementHydrated);
-            atlas_sprites.insert(entity, AtlasSprite::new(atlas.clone()));
+            atlas_sprites.insert(entity, AtlasSprite::new(*atlas));
             bodies.insert(
                 entity,
                 KinematicBody {
diff --git a/core/src/elements/slippery_seaweed.rs b/src/core/elements/slippery_seaweed.rs
similarity index 72%
rename from core/src/elements/slippery_seaweed.rs
rename to src/core/elements/slippery_seaweed.rs
index 94771fc879..4f136d3f00 100644
--- a/core/src/elements/slippery_seaweed.rs
+++ b/src/core/elements/slippery_seaweed.rs
@@ -1,21 +1,36 @@
 use crate::prelude::*;
 
-pub fn install(session: &mut CoreSession) {
+#[derive(HasSchema, Default, Debug, Clone)]
+#[type_data(metadata_asset("slippery_seaweed"))]
+#[repr(C)]
+pub struct SlipperySeaweedMeta {
+    pub atlas: Handle<Atlas>,
+    pub start_frame: u32,
+    pub end_frame: u32,
+    pub fps: f32,
+    pub body_size: Vec2,
+}
+
+pub fn game_plugin(game: &mut Game) {
+    SlipperySeaweedMeta::schema();
+    game.init_shared_resource::<AssetServer>();
+}
+
+pub fn session_plugin(session: &mut Session) {
     session
         .stages
         .add_system_to_stage(CoreStage::PreUpdate, hydrate)
         .add_system_to_stage(PlayerStateStage, update);
 }
 
-#[derive(Clone, Debug, TypeUlid, Default)]
-#[ulid = "01GSWXSJEQXEC0TMWVBHVMHG65"]
+#[derive(Clone, Debug, HasSchema, Default)]
 pub struct SlipperySeaweed;
 
 fn hydrate(
     entities: Res<Entities>,
     mut hydrated: CompMut<MapElementHydrated>,
     element_handles: Comp<ElementHandle>,
-    element_assets: BevyAssets<ElementMeta>,
+    assets: Res<AssetServer>,
     mut slippery_seaweeds: CompMut<SlipperySeaweed>,
     mut atlas_sprites: CompMut<AtlasSprite>,
     mut animated_sprites: CompMut<AnimatedSprite>,
@@ -27,20 +42,18 @@ fn hydrate(
 
     for entity in entities.iter_with_bitset(&not_hydrated_bitset) {
         let element_handle = element_handles.get(entity).unwrap();
-        let Some(element_meta) = element_assets.get(&element_handle.get_bevy_handle()) else {
-            continue;
-        };
+        let element_meta = assets.get(element_handle.0);
 
-        if let BuiltinElementKind::SlipperySeaweed {
+        if let Ok(SlipperySeaweedMeta {
             atlas,
             body_size,
             start_frame,
             end_frame,
             fps,
-        } = &element_meta.builtin
+        }) = assets.get(element_meta.data).try_cast_ref()
         {
             hydrated.insert(entity, MapElementHydrated);
-            atlas_sprites.insert(entity, AtlasSprite::new(atlas.clone()));
+            atlas_sprites.insert(entity, AtlasSprite::new(*atlas));
             animated_sprites.insert(
                 entity,
                 AnimatedSprite {
@@ -75,7 +88,7 @@ pub fn update(
                 .actor_collisions(p_ent)
                 .contains(&seaweed_ent)
             {
-                state.current = key!("core::incapacitated");
+                state.current = "core::incapacitated".into();
                 continue;
             }
         }
diff --git a/core/src/elements/snail.rs b/src/core/elements/snail.rs
similarity index 73%
rename from core/src/elements/snail.rs
rename to src/core/elements/snail.rs
index 37a44ea375..5549cb3d04 100644
--- a/core/src/elements/snail.rs
+++ b/src/core/elements/snail.rs
@@ -1,32 +1,56 @@
-use std::collections::HashMap;
-
 use crate::prelude::*;
 
-pub fn install(session: &mut CoreSession) {
+#[derive(HasSchema, Default, Debug, Clone)]
+#[type_data(metadata_asset("snail"))]
+#[repr(C)]
+pub struct SnailMeta {
+    pub atlas: Handle<Atlas>,
+    pub fps: f32,
+    pub body_diameter: f32,
+    pub bounciness: f32,
+    pub gravity: f32,
+    pub hit_speed: f32,
+    /// The animation frames for when the snail is crawling
+    pub crawl_frames: SVec<u32>,
+    /// The `crawl_frames` indexes in which to move the snail
+    pub move_frame_indexes: SVec<u32>,
+    /// The animation frames for when the snail is fleeing into its shell.
+    ///
+    /// **Note:** This is reversed for the snail coming out of its shell.
+    pub hide_frames: SVec<u32>,
+    pub hide_time: f32,
+}
+
+pub fn game_plugin(game: &mut Game) {
+    SnailMeta::schema();
+    game.init_shared_resource::<AssetServer>();
+}
+
+pub fn session_plugin(session: &mut Session) {
     session
         .stages
         .add_system_to_stage(CoreStage::PreUpdate, hydrate)
         .add_system_to_stage(CoreStage::PostUpdate, update_snails);
 }
 
-#[derive(Clone, TypeUlid, Debug, Copy)]
-#[ulid = "01GTA646V5SESHBAP325MNT22Y"]
+#[derive(Clone, HasSchema, Debug, Copy, Default)]
 pub enum Snail {
     Hiding(f32),
+    #[default]
     UnHiding,
     Moving {
         attempted_x: Option<f32>,
         frame_timer: f32,
-        anim_index: usize,
+        anim_index: u32,
     },
 }
 
 fn hydrate(
-    mut entities: ResMut<Entities>,
+    mut entities: ResMutInit<Entities>,
     mut hydrated: CompMut<MapElementHydrated>,
     mut dehrydate_bounds: CompMut<DehydrateOutOfBounds>,
     mut element_handles: CompMut<ElementHandle>,
-    element_assets: BevyAssets<ElementMeta>,
+    assets: Res<AssetServer>,
     mut snails: CompMut<Snail>,
     mut atlas_sprites: CompMut<AtlasSprite>,
     mut animated_sprites: CompMut<AnimatedSprite>,
@@ -45,12 +69,10 @@ fn hydrate(
 
     for spawner_ent in spawner_entities {
         let transform = *transforms.get(spawner_ent).unwrap();
-        let element_handle = element_handles.get(spawner_ent).unwrap();
-        let Some(element_meta) = element_assets.get(&element_handle.get_bevy_handle()) else {
-            continue;
-        };
+        let element_handle = *element_handles.get(spawner_ent).unwrap();
+        let element_meta = assets.get(element_handle.0);
 
-        if let BuiltinElementKind::Snail {
+        if let Ok(SnailMeta {
             atlas,
             fps,
             body_diameter,
@@ -59,14 +81,14 @@ fn hydrate(
             hide_time,
             hide_frames,
             ..
-        } = &element_meta.builtin
+        }) = assets.get(element_meta.data).try_cast_ref()
         {
             hydrated.insert(spawner_ent, MapElementHydrated);
 
             let entity = entities.create();
             snails.insert(entity, Snail::Hiding(*hide_time));
             transforms.insert(entity, transform);
-            element_handles.insert(entity, element_handle.clone());
+            element_handles.insert(entity, element_handle);
             hydrated.insert(entity, MapElementHydrated);
             dehrydate_bounds.insert(entity, DehydrateOutOfBounds(spawner_ent));
 
@@ -83,14 +105,14 @@ fn hydrate(
                     ..default()
                 },
             );
-            atlas_sprites.insert(entity, AtlasSprite::new(atlas.clone()));
+            atlas_sprites.insert(entity, AtlasSprite::new(*atlas));
             animated_sprites.insert(entity, default());
 
-            let mut animations = HashMap::new();
+            let mut animations = SMap::default();
 
-            animations.insert(key!("disabled"), default());
+            animations.insert("disabled".into(), default());
             animations.insert(
-                key!("hide"),
+                "hide".into(),
                 AnimatedSprite {
                     frames: hide_frames.iter().cloned().collect(),
                     fps: *fps,
@@ -99,7 +121,7 @@ fn hydrate(
                 },
             );
             animations.insert(
-                key!("unhide"),
+                "unhide".into(),
                 AnimatedSprite {
                     frames: hide_frames.iter().rev().cloned().collect(),
                     fps: *fps,
@@ -110,9 +132,9 @@ fn hydrate(
             animation_banks.insert(
                 entity,
                 AnimationBankSprite {
-                    current: key!("hide"),
-                    animations: Arc::new(animations),
-                    last_animation: key!("hide"),
+                    current: "hide".into(),
+                    animations,
+                    last_animation: "hide".into(),
                 },
             );
             spawner_manager.create_spawner(spawner_ent, vec![entity])
@@ -126,21 +148,20 @@ fn update_snails(
     mut sprites: CompMut<AtlasSprite>,
     mut animated_sprites: CompMut<AnimatedSprite>,
     mut animation_banks: CompMut<AnimationBankSprite>,
-    frame_time: Res<FrameTime>,
+    time: Res<Time>,
     mut bodies: CompMut<KinematicBody>,
     mut transforms: CompMut<Transform>,
     element_handles: Comp<ElementHandle>,
-    element_assets: BevyAssets<ElementMeta>,
+    assets: Res<AssetServer>,
     damage_regions: CompMut<DamageRegion>,
 ) {
     for (entity, (snail, element_handle, body, sprite)) in
         entities.iter_with((&mut snails, &element_handles, &mut bodies, &mut sprites))
     {
-        let Some(element_meta) = element_assets.get(&element_handle.get_bevy_handle()) else {
-            continue;
-        };
+        let element_meta = assets.get(element_handle.0);
 
-        let BuiltinElementKind::Snail {
+        let asset = assets.get(element_meta.data);
+        let Ok(SnailMeta {
             fps,
             bounciness,
             hide_time,
@@ -149,11 +170,16 @@ fn update_snails(
             move_frame_indexes,
             hide_frames,
             ..
-        } = &element_meta.builtin else {
+        }) = asset.try_cast_ref()
+        else {
             unreachable!();
         };
-        let Some(animated_sprite) = animated_sprites.get_mut(entity) else { continue };
-        let Some(animation_bank) = animation_banks.get_mut(entity) else { continue };
+        let Some(animated_sprite) = animated_sprites.get_mut(entity) else {
+            continue;
+        };
+        let Some(animation_bank) = animation_banks.get_mut(entity) else {
+            continue;
+        };
 
         let mut hit = false;
 
@@ -178,7 +204,7 @@ fn update_snails(
                 if hit {
                     *snail = Snail::Hiding(0.0);
                     body.bounciness = *bounciness;
-                    animation_bank.current = key!("hide");
+                    animation_bank.current = "hide".into();
                 }
             }
             _ => {}
@@ -193,19 +219,19 @@ fn update_snails(
                     *time += 1.0 / crate::FPS;
                     if *time >= *hide_time {
                         *snail = Snail::UnHiding;
-                        animation_bank.current = key!("unhide");
+                        animation_bank.current = "unhide".into();
                     }
                 }
             }
             Snail::UnHiding => {
-                if animated_sprite.index == hide_frames.len() - 1 {
+                if animated_sprite.index == hide_frames.len() as u32 - 1 {
                     *snail = Snail::Moving {
                         attempted_x: None,
                         frame_timer: 0.0,
                         anim_index: 0,
                     };
                     sprite.index = 0;
-                    animation_bank.current = key!("disabled");
+                    animation_bank.current = "disabled".into();
                     body.bounciness = 0.0;
                 }
             }
@@ -220,18 +246,18 @@ fn update_snails(
                     if attempted_x != &translation.x {
                         *snail = Snail::Hiding(*hide_time);
                         body.bounciness = *bounciness;
-                        animation_bank.current = key!("hide");
+                        animation_bank.current = "hide".into();
                         sprite.flip_x = !sprite.flip_x;
                         continue;
                     }
                 }
 
-                *frame_timer += **frame_time;
+                *frame_timer += time.delta_seconds();
 
                 if *frame_timer > 1.0 / fps.max(f32::MIN_POSITIVE) {
                     *frame_timer = 0.0;
-                    *anim_index = (*anim_index + 1) % crawl_frames.len();
-                    sprite.index = crawl_frames[*anim_index];
+                    *anim_index = (*anim_index + 1) % crawl_frames.len() as u32;
+                    sprite.index = crawl_frames[*anim_index as usize];
 
                     if move_frame_indexes.iter().any(|i| i == anim_index) {
                         let next_x = translation.x - 1.0 * if sprite.flip_x { -1.0 } else { 1.0 };
diff --git a/core/src/elements/spike.rs b/src/core/elements/spike.rs
similarity index 76%
rename from core/src/elements/spike.rs
rename to src/core/elements/spike.rs
index 644258adf8..e85f5c23ae 100644
--- a/core/src/elements/spike.rs
+++ b/src/core/elements/spike.rs
@@ -1,21 +1,36 @@
 use crate::prelude::*;
 
-pub fn install(session: &mut CoreSession) {
+#[derive(HasSchema, Default, Debug, Clone)]
+#[type_data(metadata_asset("spike"))]
+#[repr(C)]
+pub struct SpikeMeta {
+    pub atlas: Handle<Atlas>,
+    pub body_size: Vec2,
+    pub start_frame: u32,
+    pub end_frame: u32,
+    pub fps: f32,
+}
+
+pub fn game_plugin(game: &mut Game) {
+    SpikeMeta::schema();
+    game.init_shared_resource::<AssetServer>();
+}
+
+pub fn session_plugin(session: &mut Session) {
     session
         .stages
         .add_system_to_stage(CoreStage::PreUpdate, hydrate)
         .add_system_to_stage(CoreStage::PostUpdate, update);
 }
 
-#[derive(Clone, Debug, TypeUlid, Default)]
-#[ulid = "01H3DBQHJGFKT8G81BMEMN9FN6"]
+#[derive(Clone, Debug, HasSchema, Default)]
 pub struct Spike;
 
 fn hydrate(
     entities: Res<Entities>,
     mut hydrated: CompMut<MapElementHydrated>,
     element_handles: Comp<ElementHandle>,
-    element_assets: BevyAssets<ElementMeta>,
+    assets: Res<AssetServer>,
     mut spikes: CompMut<Spike>,
     mut atlas_sprites: CompMut<AtlasSprite>,
     mut bodies: CompMut<KinematicBody>,
@@ -27,21 +42,19 @@ fn hydrate(
 
     for entity in entities.iter_with_bitset(&not_hydrated_bitset) {
         let element_handle = element_handles.get(entity).unwrap();
-        let Some(element_meta) = element_assets.get(&element_handle.get_bevy_handle()) else {
-            continue;
-        };
+        let element_meta = assets.get(element_handle.0);
 
-        if let BuiltinElementKind::Spike {
+        if let Ok(SpikeMeta {
             atlas,
             body_size,
             start_frame,
             end_frame,
             fps,
             ..
-        } = &element_meta.builtin
+        }) = assets.get(element_meta.data).try_cast_ref()
         {
             hydrated.insert(entity, MapElementHydrated);
-            atlas_sprites.insert(entity, AtlasSprite::new(atlas.clone()));
+            atlas_sprites.insert(entity, AtlasSprite::new(*atlas));
             animated_sprites.insert(
                 entity,
                 AnimatedSprite {
diff --git a/core/src/elements/sproinger.rs b/src/core/elements/sproinger.rs
similarity index 75%
rename from core/src/elements/sproinger.rs
rename to src/core/elements/sproinger.rs
index 492aba10f1..3ac870bcf9 100644
--- a/core/src/elements/sproinger.rs
+++ b/src/core/elements/sproinger.rs
@@ -1,14 +1,30 @@
 use crate::prelude::*;
 
-pub fn install(session: &mut CoreSession) {
+#[derive(HasSchema, Default, Debug, Clone)]
+#[type_data(metadata_asset("sproinger"))]
+#[repr(C)]
+/// This is a sproinger
+pub struct SproingerMeta {
+    pub atlas: Handle<Atlas>,
+    pub sound: Handle<AudioSource>,
+    pub sound_volume: f64,
+    pub body_size: Vec2,
+    pub spring_velocity: f32,
+}
+
+pub fn game_plugin(game: &mut Game) {
+    SproingerMeta::schema();
+    game.init_shared_resource::<AssetServer>();
+}
+
+pub fn session_plugin(session: &mut Session) {
     session
         .stages
         .add_system_to_stage(CoreStage::PreUpdate, hydrate)
         .add_system_to_stage(CoreStage::PostUpdate, update);
 }
 
-#[derive(Clone, Debug, TypeUlid, Default)]
-#[ulid = "01GP9K01SC9YDTQBYK16EK7ZYD"]
+#[derive(Clone, Debug, HasSchema, Default)]
 pub struct Sproinger {
     pub frame: u32,
     pub sproinging: bool,
@@ -18,11 +34,11 @@ fn hydrate(
     entities: Res<Entities>,
     mut hydrated: CompMut<MapElementHydrated>,
     element_handles: Comp<ElementHandle>,
-    element_assets: BevyAssets<ElementMeta>,
+    assets: Res<AssetServer>,
     mut sproingers: CompMut<Sproinger>,
     mut atlas_sprites: CompMut<AtlasSprite>,
     mut bodies: CompMut<KinematicBody>,
-    mut nav_graph: ResMut<NavGraph>,
+    mut nav_graph: ResMutInit<NavGraph>,
     transforms: Comp<Transform>,
     map: Res<LoadedMap>,
 ) {
@@ -33,17 +49,15 @@ fn hydrate(
     let mut new_sproingers = Vec::new();
     for entity in entities.iter_with_bitset(&not_hydrated_bitset) {
         let element_handle = element_handles.get(entity).unwrap();
-        let Some(element_meta) = element_assets.get(&element_handle.get_bevy_handle()) else {
-            continue;
-        };
+        let element_meta = assets.get(element_handle.0);
 
-        if let BuiltinElementKind::Sproinger {
+        if let Ok(SproingerMeta {
             atlas, body_size, ..
-        } = &element_meta.builtin
+        }) = assets.get(element_meta.data).try_cast_ref()
         {
             new_sproingers.push(entity);
             hydrated.insert(entity, MapElementHydrated);
-            atlas_sprites.insert(entity, AtlasSprite::new(atlas.clone()));
+            atlas_sprites.insert(entity, AtlasSprite::new(*atlas));
             bodies.insert(
                 entity,
                 KinematicBody {
@@ -81,25 +95,25 @@ fn hydrate(
 fn update(
     entities: Res<Entities>,
     element_handles: Comp<ElementHandle>,
-    element_assets: BevyAssets<ElementMeta>,
+    assets: Res<AssetServer>,
     mut sproingers: CompMut<Sproinger>,
     mut atlas_sprites: CompMut<AtlasSprite>,
     mut bodies: CompMut<KinematicBody>,
     collision_world: CollisionWorld,
-    mut audio_events: ResMut<AudioEvents>,
+    mut audio_events: ResMutInit<AudioEvents>,
 ) {
     for (entity, (sproinger, sprite)) in entities.iter_with((&mut sproingers, &mut atlas_sprites)) {
         let element_handle = element_handles.get(entity).unwrap();
-        let Some(element_meta) = element_assets.get(&element_handle.get_bevy_handle()) else {
-            continue;
-        };
+        let element_meta = assets.get(element_handle.0);
 
-        let BuiltinElementKind::Sproinger {
+        let asset = assets.get(element_meta.data);
+        let Ok(SproingerMeta {
             sound,
             sound_volume,
             spring_velocity,
             ..
-        } = &element_meta.builtin else {
+        }) = asset.try_cast_ref()
+        else {
             unreachable!();
         };
 
@@ -122,7 +136,7 @@ fn update(
         for collider_ent in collision_world.actor_collisions(entity) {
             if let Some(body) = bodies.get_mut(collider_ent) {
                 if body.velocity.y < *spring_velocity - body.gravity {
-                    audio_events.play(sound.clone(), *sound_volume);
+                    audio_events.play(*sound, *sound_volume);
                     body.velocity.y = *spring_velocity;
                     sproinger.sproinging = true;
                 }
diff --git a/core/src/elements/stomp_boots.rs b/src/core/elements/stomp_boots.rs
similarity index 80%
rename from core/src/elements/stomp_boots.rs
rename to src/core/elements/stomp_boots.rs
index 6c822d7259..19a271482e 100644
--- a/core/src/elements/stomp_boots.rs
+++ b/src/core/elements/stomp_boots.rs
@@ -1,6 +1,22 @@
 use crate::prelude::*;
 
-pub fn install(session: &mut CoreSession) {
+#[derive(HasSchema, Default, Debug, Clone)]
+#[type_data(metadata_asset("stomp_boots"))]
+#[repr(C)]
+pub struct StompBootsMeta {
+    pub map_icon: Handle<Atlas>,
+    pub player_decoration: Handle<Atlas>,
+
+    pub body_size: Vec2,
+    pub grab_offset: Vec2,
+}
+
+pub fn game_plugin(game: &mut Game) {
+    StompBootsMeta::schema();
+    game.init_shared_resource::<AssetServer>();
+}
+
+pub fn session_plugin(session: &mut Session) {
     session
         .stages
         .add_system_to_stage(CoreStage::PreUpdate, hydrate)
@@ -10,20 +26,18 @@ pub fn install(session: &mut CoreSession) {
 
 /// Marker component added to things ( presumably players, but not necessarily! ) that are wearing
 /// stomp boots
-#[derive(Debug, Clone, Copy, Default, TypeUlid)]
-#[ulid = "01GR0P6HDCXJA6P2VNN8E1TH6Q"]
+#[derive(Debug, Clone, Copy, Default, HasSchema)]
 pub struct WearingStompBoots;
 
-#[derive(Copy, Clone, Debug, TypeUlid)]
-#[ulid = "01GR0G9X4TME8E7NG0Z3DD26QW"]
+#[derive(Copy, Clone, Debug, HasSchema, Default)]
 pub struct StompBoots;
 
 fn hydrate(
-    game_meta: Res<CoreMetaArc>,
-    mut entities: ResMut<Entities>,
+    game_meta: Root<GameMeta>,
+    mut entities: ResMutInit<Entities>,
     mut hydrated: CompMut<MapElementHydrated>,
     mut element_handles: CompMut<ElementHandle>,
-    element_assets: BevyAssets<ElementMeta>,
+    assets: Res<AssetServer>,
     mut stomp_boots: CompMut<StompBoots>,
     mut atlas_sprites: CompMut<AtlasSprite>,
     mut bodies: CompMut<KinematicBody>,
@@ -44,17 +58,15 @@ fn hydrate(
 
     for spawner_ent in spawner_entities {
         let transform = *transforms.get(spawner_ent).unwrap();
-        let element_handle = element_handles.get(spawner_ent).unwrap();
-        let Some(element_meta) = element_assets.get(&element_handle.get_bevy_handle()) else {
-            continue;
-        };
+        let element_handle = *element_handles.get(spawner_ent).unwrap();
+        let element_meta = assets.get(element_handle.0);
 
-        if let BuiltinElementKind::StompBoots {
+        if let Ok(StompBootsMeta {
             grab_offset,
             body_size,
             map_icon,
             ..
-        } = &element_meta.builtin
+        }) = assets.get(element_meta.data).try_cast_ref()
         {
             hydrated.insert(spawner_ent, MapElementHydrated);
 
@@ -64,16 +76,16 @@ fn hydrate(
             item_grabs.insert(
                 entity,
                 ItemGrab {
-                    fin_anim: key!("grab_2"),
+                    fin_anim: "grab_2".into(),
                     sync_animation: false,
                     grab_offset: *grab_offset,
                 },
             );
             stomp_boots.insert(entity, StompBoots);
-            atlas_sprites.insert(entity, AtlasSprite::new(map_icon.clone()));
+            atlas_sprites.insert(entity, AtlasSprite::new(*map_icon));
             respawn_points.insert(entity, DehydrateOutOfBounds(spawner_ent));
             transforms.insert(entity, transform);
-            element_handles.insert(entity, element_handle.clone());
+            element_handles.insert(entity, element_handle);
             hydrated.insert(entity, MapElementHydrated);
             bodies.insert(
                 entity,
@@ -81,7 +93,7 @@ fn hydrate(
                     shape: ColliderShape::Rectangle { size: *body_size },
                     has_mass: true,
                     has_friction: true,
-                    gravity: game_meta.physics.gravity,
+                    gravity: game_meta.core.physics.gravity,
                     ..default()
                 },
             );
@@ -93,7 +105,7 @@ fn hydrate(
 fn update(
     entities: Res<Entities>,
     element_handles: Comp<ElementHandle>,
-    element_assets: BevyAssets<ElementMeta>,
+    assets: Res<AssetServer>,
     mut stomp_boots: CompMut<StompBoots>,
     items_used: Comp<ItemUsed>,
     player_inventories: PlayerInventories,
@@ -105,14 +117,13 @@ fn update(
     for (entity, (_stomp_boots, element_handle, spawner)) in
         entities.iter_with((&mut stomp_boots, &element_handles, &spawners))
     {
-        let Some(element_meta) = element_assets.get(&element_handle.get_bevy_handle()) else {
-            continue;
-        };
+        let element_meta = assets.get(element_handle.0);
 
-        let BuiltinElementKind::StompBoots {
-            player_decoration,
-            ..
-        } = &element_meta.builtin else {
+        let asset = assets.get(element_meta.data);
+        let Ok(StompBootsMeta {
+            player_decoration, ..
+        }) = asset.try_cast_ref()
+        else {
             unreachable!();
         };
 
@@ -123,13 +134,13 @@ fn update(
         {
             // If the item is being used
             let is_item_used = items_used.get(entity).is_some();
-            let player_decoration = player_decoration.clone();
+            let player_decoration = *player_decoration;
 
             if is_item_used {
                 hydrated.remove(**spawner);
                 inventoris.insert(player, Inventory(None));
                 commands.add(
-                    move |mut entities: ResMut<Entities>,
+                    move |mut entities: ResMutInit<Entities>,
                           mut sprites: CompMut<AtlasSprite>,
                           mut attachments: CompMut<Attachment>,
                           mut transforms: CompMut<Transform>,
@@ -144,7 +155,7 @@ fn update(
                             sync_animation: true,
                         };
                         attachments.insert(attachment_ent, attachment);
-                        sprites.insert(attachment_ent, AtlasSprite::new(player_decoration.clone()));
+                        sprites.insert(attachment_ent, AtlasSprite::new(player_decoration));
                         transforms.insert(attachment_ent, Transform::default());
                         wearing_stomp_boots.insert(player, WearingStompBoots);
                     },
diff --git a/core/src/elements/sword.rs b/src/core/elements/sword.rs
similarity index 85%
rename from core/src/elements/sword.rs
rename to src/core/elements/sword.rs
index 32e8f8f5f4..b769041513 100644
--- a/core/src/elements/sword.rs
+++ b/src/core/elements/sword.rs
@@ -1,16 +1,37 @@
-use std::time::Duration;
+use crate::prelude::*;
 
-use crate::{damage::DamageRegion, prelude::*};
+/// This is a sword
+#[derive(HasSchema, Default, Debug, Clone)]
+#[type_data(metadata_asset("sword"))]
+#[repr(C)]
+pub struct SwordMeta {
+    pub atlas: Handle<Atlas>,
+    pub sound: Handle<AudioSource>,
+    pub sound_volume: f64,
+    pub body_size: Vec2,
+    pub fin_anim: Ustr,
+    pub grab_offset: Vec2,
+    pub killing_speed: f32,
+    pub angular_velocity: f32,
+    pub can_rotate: bool,
+    pub bounciness: f32,
+    pub throw_velocity: f32,
+    pub cooldown_frames: u32,
+}
+
+pub fn game_plugin(game: &mut Game) {
+    SwordMeta::schema();
+    game.init_shared_resource::<AssetServer>();
+}
 
-pub fn install(session: &mut CoreSession) {
+pub fn session_plugin(session: &mut Session) {
     session
         .stages
         .add_system_to_stage(CoreStage::PreUpdate, hydrate)
         .add_system_to_stage(CoreStage::PostUpdate, update);
 }
 
-#[derive(Copy, Clone, Debug, TypeUlid, Default)]
-#[ulid = "01GP9NA6ZQGMC0YY9K2XFJH9KA"]
+#[derive(Copy, Clone, Debug, HasSchema, Default)]
 pub struct Sword {
     pub state: SwordState,
     pub dropped_time: f32,
@@ -21,19 +42,19 @@ pub enum SwordState {
     #[default]
     Idle,
     Swinging {
-        frame: usize,
+        frame: u32,
     },
     Cooldown {
-        frame: usize,
+        frame: u32,
     },
 }
 
 fn hydrate(
-    game_meta: Res<CoreMetaArc>,
-    mut entities: ResMut<Entities>,
+    game_meta: Root<GameMeta>,
+    mut entities: ResMutInit<Entities>,
     mut hydrated: CompMut<MapElementHydrated>,
     mut element_handles: CompMut<ElementHandle>,
-    element_assets: BevyAssets<ElementMeta>,
+    assets: Res<AssetServer>,
     mut swords: CompMut<Sword>,
     mut atlas_sprites: CompMut<AtlasSprite>,
     mut bodies: CompMut<KinematicBody>,
@@ -54,12 +75,10 @@ fn hydrate(
 
     for spawner_ent in spawner_entities {
         let transform = *transforms.get(spawner_ent).unwrap();
-        let element_handle = element_handles.get(spawner_ent).unwrap();
-        let Some(element_meta) = element_assets.get(&element_handle.get_bevy_handle()) else {
-            continue;
-        };
+        let element_handle = *element_handles.get(spawner_ent).unwrap();
+        let element_meta = assets.get(element_handle.0);
 
-        if let BuiltinElementKind::Sword {
+        if let Ok(SwordMeta {
             atlas,
             fin_anim,
             grab_offset,
@@ -69,7 +88,7 @@ fn hydrate(
             throw_velocity,
             angular_velocity,
             ..
-        } = &element_meta.builtin
+        }) = assets.get(element_meta.data).try_cast_ref()
         {
             hydrated.insert(spawner_ent, MapElementHydrated);
 
@@ -90,10 +109,10 @@ fn hydrate(
                 },
             );
             swords.insert(entity, Sword::default());
-            atlas_sprites.insert(entity, AtlasSprite::new(atlas.clone()));
+            atlas_sprites.insert(entity, AtlasSprite::new(*atlas));
             respawn_points.insert(entity, DehydrateOutOfBounds(spawner_ent));
             transforms.insert(entity, transform);
-            element_handles.insert(entity, element_handle.clone());
+            element_handles.insert(entity, element_handle);
             hydrated.insert(entity, MapElementHydrated);
             bodies.insert(
                 entity,
@@ -103,7 +122,7 @@ fn hydrate(
                     has_friction: true,
                     can_rotate: *can_rotate,
                     bounciness: *bounciness,
-                    gravity: game_meta.physics.gravity,
+                    gravity: game_meta.core.physics.gravity,
                     ..default()
                 },
             );
@@ -112,16 +131,15 @@ fn hydrate(
     }
 }
 
-#[derive(Clone, TypeUlid, Default, Deref, DerefMut)]
-#[ulid = "01GP9W74TET7QMND26S7G7NCA9"]
+#[derive(Clone, HasSchema, Default, Deref, DerefMut)]
 struct PendingDamageRegions(Vec<(Vec2, Vec2, Entity)>);
 
 fn update(
     entities: Res<Entities>,
     element_handles: Comp<ElementHandle>,
-    element_assets: BevyAssets<ElementMeta>,
+    assets: Res<AssetServer>,
     collision_world: CollisionWorld,
-    mut audio_events: ResMut<AudioEvents>,
+    mut audio_events: ResMutInit<AudioEvents>,
     mut swords: CompMut<Sword>,
     mut sprites: CompMut<AtlasSprite>,
     bodies: CompMut<KinematicBody>,
@@ -134,14 +152,12 @@ fn update(
     invincibles: CompMut<Invincibility>,
 ) {
     for (entity, (sword, element_handle)) in entities.iter_with((&mut swords, &element_handles)) {
-        let Some(element_meta) = element_assets.get(&element_handle.get_bevy_handle()) else {
-            continue;
-        };
+        let element_meta = assets.get(element_handle.0);
 
         // Helper to spawn a damage region for the sword attack
         let mut spawn_damage_region = |pos: Vec3, size: Vec2, owner: Entity| {
             commands.add(
-                move |mut entities: ResMut<Entities>,
+                move |mut entities: ResMutInit<Entities>,
                       mut transforms: CompMut<Transform>,
                       mut emote_regions: CompMut<EmoteRegion>,
                       mut damage_regions: CompMut<DamageRegion>,
@@ -169,13 +185,15 @@ fn update(
             );
         };
 
-        let BuiltinElementKind::Sword {
+        let asset = assets.get(element_meta.data);
+        let Ok(SwordMeta {
             cooldown_frames,
             sound,
             sound_volume,
             killing_speed,
             ..
-        } = &element_meta.builtin else {
+        }) = asset.try_cast_ref()
+        else {
             unreachable!();
         };
 
@@ -277,7 +295,7 @@ fn update(
                 if matches!(sword.state, SwordState::Idle) {
                     sprite.index = 8;
                     sword.state = SwordState::Swinging { frame: 0 };
-                    audio_events.play(sound.clone(), *sound_volume);
+                    audio_events.play(*sound, *sound_volume);
                 }
             }
         } else {
@@ -308,7 +326,7 @@ fn update(
     }
 }
 
-fn sword_drop(entity: Entity) -> System {
+fn sword_drop(entity: Entity) -> StaticSystem<(), ()> {
     (move |mut swords: CompMut<Sword>, mut sprites: CompMut<AtlasSprite>| {
         // Put sword in rest position
         sprites.get_mut(entity).unwrap().index = 0;
diff --git a/core/src/elements/urchin.rs b/src/core/elements/urchin.rs
similarity index 74%
rename from core/src/elements/urchin.rs
rename to src/core/elements/urchin.rs
index 67bda2d217..f6f657722f 100644
--- a/core/src/elements/urchin.rs
+++ b/src/core/elements/urchin.rs
@@ -1,22 +1,38 @@
 use crate::prelude::*;
 
-pub fn install(session: &mut CoreSession) {
+#[derive(HasSchema, Default, Debug, Clone)]
+#[type_data(metadata_asset("urchin"))]
+#[repr(C)]
+pub struct UrchinMeta {
+    pub image: Handle<Image>,
+    pub body_diameter: f32,
+    pub hit_speed: f32,
+    pub gravity: f32,
+    pub bounciness: f32,
+    pub spin: f32,
+}
+
+pub fn game_plugin(game: &mut Game) {
+    UrchinMeta::schema();
+    game.init_shared_resource::<AssetServer>();
+}
+
+pub fn session_plugin(session: &mut Session) {
     session
         .stages
         .add_system_to_stage(CoreStage::PreUpdate, hydrate)
         .add_system_to_stage(CoreStage::PostUpdate, update_urchins);
 }
 
-#[derive(Default, Clone, TypeUlid, Debug, Copy)]
-#[ulid = "01GT7TBHRZCC1BR7T1PCR5KA4T"]
+#[derive(Default, Clone, HasSchema, Debug, Copy)]
 pub struct Urchin;
 
 fn hydrate(
-    mut entities: ResMut<Entities>,
+    mut entities: ResMutInit<Entities>,
     mut hydrated: CompMut<MapElementHydrated>,
     mut dehrydate_bounds: CompMut<DehydrateOutOfBounds>,
     mut element_handles: CompMut<ElementHandle>,
-    element_assets: BevyAssets<ElementMeta>,
+    assets: Res<AssetServer>,
     mut urchins: CompMut<Urchin>,
     mut sprites: CompMut<Sprite>,
     mut bodies: CompMut<KinematicBody>,
@@ -33,18 +49,16 @@ fn hydrate(
 
     for spawner_ent in spawner_entities {
         let transform = *transforms.get(spawner_ent).unwrap();
-        let element_handle = element_handles.get(spawner_ent).unwrap();
-        let Some(element_meta) = element_assets.get(&element_handle.get_bevy_handle()) else {
-            continue;
-        };
+        let element_handle = *element_handles.get(spawner_ent).unwrap();
+        let element_meta = assets.get(element_handle.0);
 
-        if let BuiltinElementKind::Urchin {
+        if let Ok(UrchinMeta {
             image,
             body_diameter,
             bounciness,
             gravity,
             ..
-        } = &element_meta.builtin
+        }) = assets.get(element_meta.data).try_cast_ref()
         {
             hydrated.insert(spawner_ent, MapElementHydrated);
 
@@ -53,12 +67,12 @@ fn hydrate(
             sprites.insert(
                 entity,
                 Sprite {
-                    image: image.clone(),
+                    image: *image,
                     ..Default::default()
                 },
             );
             transforms.insert(entity, transform);
-            element_handles.insert(entity, element_handle.clone());
+            element_handles.insert(entity, element_handle);
             hydrated.insert(entity, MapElementHydrated);
             dehrydate_bounds.insert(entity, DehydrateOutOfBounds(spawner_ent));
 
@@ -88,20 +102,17 @@ fn update_urchins(
     transforms: Comp<Transform>,
     damage_regions: Comp<DamageRegion>,
     element_handles: Comp<ElementHandle>,
-    element_assets: BevyAssets<ElementMeta>,
+    assets: Res<AssetServer>,
 ) {
     for (entity, (_urchin, transform, element_handle)) in
         entities.iter_with((&mut urchins, &transforms, &element_handles))
     {
-        let Some(element_meta) = element_assets.get(&element_handle.get_bevy_handle()) else {
-            continue;
-        };
-
-        let BuiltinElementKind::Urchin {
-            hit_speed,
-            spin,
-            ..
-        } = &element_meta.builtin else {
+        let element_meta = assets.get(element_handle.0);
+        let asset = assets.get(element_meta.data);
+        let Ok(UrchinMeta {
+            hit_speed, spin, ..
+        }) = asset.try_cast_ref()
+        else {
             unreachable!();
         };
 
diff --git a/core/src/globals.rs b/src/core/globals.rs
similarity index 100%
rename from core/src/globals.rs
rename to src/core/globals.rs
diff --git a/core/src/input.rs b/src/core/input.rs
similarity index 66%
rename from core/src/input.rs
rename to src/core/input.rs
index 5dfd979645..1326973b6d 100644
--- a/core/src/input.rs
+++ b/src/core/input.rs
@@ -1,81 +1,59 @@
 //! Player and editor input types.
 
+use std::array;
+
 use crate::{prelude::*, MAX_PLAYERS};
 
-pub fn install(session: &mut CoreSession) {
-    session.world.init_resource::<PlayerInputs>();
+pub fn install(session: &mut Session) {
+    session.world.init_resource::<MatchInputs>();
 }
 
 /// The inputs for each player in this simulation frame.
-#[derive(Clone, Debug, TypeUlid)]
-#[ulid = "01GP233N26N8DQAAS1WDGYM14X"]
-pub struct PlayerInputs {
-    pub players: Vec<PlayerInput>,
+#[derive(Clone, Debug, HasSchema)]
+pub struct MatchInputs {
+    pub players: [PlayerInput; MAX_PLAYERS],
 }
 
-impl Default for PlayerInputs {
+impl Default for MatchInputs {
     fn default() -> Self {
         Self {
-            players: vec![default(); MAX_PLAYERS],
-            // has_updated: false,
+            players: array::from_fn(|_| default()),
         }
     }
 }
 
 /// Player input, not just controls, but also other status that comes from the player, such as the
 /// selected player and whether the player is actually active.
-#[derive(Default, Clone, Debug, TypeUlid)]
-#[ulid = "01GP2356AYJ5NW8GJ3WF0TCCY3"]
+#[derive(Default, Clone, Debug, HasSchema)]
 pub struct PlayerInput {
-    /// The player is currently "connected" and actively providing input.
+    /// Whether or not the player is present.
     pub active: bool,
+    /// The selected player skin.
     pub selected_player: Handle<PlayerMeta>,
+    /// The selected player hat.
     pub selected_hat: Option<Handle<HatMeta>>,
     /// The player control input
     pub control: PlayerControl,
-    /// The player control input from the last fixed update
-    pub previous_control: PlayerControl,
     /// The editor inputs the player is making, if any.
     pub editor_input: Option<EditorInput>,
-    /// Whether or not this is an AI player.
-    pub is_ai: bool,
-}
-
-/// Player control input state
-#[derive(Default, Clone, Debug)]
-#[repr(C)]
-pub struct PlayerControl {
-    pub move_direction: Vec2,
-    pub just_moved: bool,
-    pub moving: bool,
-
-    pub jump_pressed: bool,
-    pub jump_just_pressed: bool,
-
-    pub shoot_pressed: bool,
-    pub shoot_just_pressed: bool,
-
-    pub grab_pressed: bool,
-    pub grab_just_pressed: bool,
-
-    pub slide_pressed: bool,
-    pub slide_just_pressed: bool,
+    /// If this is [`None`] it means the player is an AI.
+    pub control_source: Option<ControlSource>,
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct TileLayer {
-    pub layer_index: usize,
+pub struct LocatedTileLayer {
+    pub layer_index: u32,
     pub located_tiles: Vec<(UVec2, u32, TileCollisionKind)>,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
+#[derive(Clone, HasSchema, Default, Debug)]
 pub struct ElementLayer {
-    pub layer_index: usize,
+    pub layer_index: u32,
     pub located_elements: Vec<(Vec2, Handle<ElementMeta>)>,
 }
 
 /// The editor inputs that a player may make.
-#[derive(Clone, Debug, Serialize, Deserialize)]
+#[derive(Clone, Debug)]
 pub enum EditorInput {
     /// Spawn an element onto the map.
     SpawnElement {
@@ -131,7 +109,7 @@ pub enum EditorInput {
         /// The position of the tile to set
         pos: UVec2,
         /// The index in the tilemap to set the tile, or [`None`] to delete the tile.
-        tilemap_tile_idx: Option<usize>,
+        tilemap_tile_idx: Option<u32>,
         /// The tile collision kind
         collision: TileCollisionKind,
     },
@@ -139,7 +117,7 @@ pub enum EditorInput {
         name: String,
     },
     RandomizeTiles {
-        tile_layers: Vec<TileLayer>,
+        tile_layers: Vec<LocatedTileLayer>,
         element_layers: Vec<ElementLayer>,
         tile_size: Vec2,
     },
diff --git a/core/src/item.rs b/src/core/item.rs
similarity index 82%
rename from core/src/item.rs
rename to src/core/item.rs
index 513f200b6e..398700c5d0 100644
--- a/core/src/item.rs
+++ b/src/core/item.rs
@@ -2,9 +2,9 @@
 //!
 //! An item is anything in the game that can be picked up by the player.
 
-use crate::prelude::{player_spawner::PlayerSpawner, *};
+use crate::prelude::*;
 
-pub fn install(session: &mut CoreSession) {
+pub fn install(session: &mut Session) {
     session
         .stages
         .add_system_to_stage(CoreStage::Last, grab_items)
@@ -14,13 +14,11 @@ pub fn install(session: &mut CoreSession) {
 /// Marker component for items.
 ///
 /// Items are any entity that players can pick up and use.
-#[derive(Clone, Copy, TypeUlid)]
-#[ulid = "01GP4DBSEB3R6ZNBNNTSY36GW4"]
+#[derive(Clone, Copy, HasSchema, Default)]
 pub struct Item;
 
 /// An intventory component, indicating another entity that the player is carrying.
-#[derive(Clone, TypeUlid, Default, Deref, DerefMut)]
-#[ulid = "01GP4D6M2QBSKZMEZMM22YGG41"]
+#[derive(Clone, HasSchema, Default, Deref, DerefMut)]
 pub struct Inventory(pub Option<Entity>);
 
 /// A helper struct containing a player-inventory pair that indicates the given player is holding
@@ -45,50 +43,46 @@ impl<'a> SystemParam for PlayerInventories<'a> {
     }
 
     fn get_state(world: &World) -> Self::State {
-        world
-            .run_initialized_system(
-                |entities: Res<Entities>,
-                 player_indexes: Comp<PlayerIdx>,
-                 inventories: Comp<Inventory>| {
-                    let mut player_inventories = [None; MAX_PLAYERS];
-                    for (player, (idx, inventory)) in
-                        entities.iter_with((&player_indexes, &inventories))
-                    {
-                        if let Some(inventory) = inventory.0 {
-                            player_inventories[idx.0] = Some(Inv { player, inventory });
-                        }
+        world.run_initialized_system(
+            |entities: Res<Entities>,
+             player_indexes: Comp<PlayerIdx>,
+             inventories: Comp<Inventory>| {
+                let mut player_inventories = [None; MAX_PLAYERS];
+                for (player, (idx, inventory)) in
+                    entities.iter_with((&player_indexes, &inventories))
+                {
+                    if let Some(inventory) = inventory.0 {
+                        player_inventories[idx.0 as usize] = Some(Inv { player, inventory });
                     }
+                }
 
-                    Ok(player_inventories)
-                },
-            )
-            .unwrap()
+                player_inventories
+            },
+            (),
+        )
     }
 
-    fn borrow<'s>(state: &mut Self::State) -> Self::Param<'_> {
+    fn borrow<'s>(_world: &'s World, state: &'s mut Self::State) -> Self::Param<'s> {
         PlayerInventories(state)
     }
 }
 
 /// Marker component added to items when they are dropped.
-#[derive(Clone, Copy, TypeUlid)]
-#[ulid = "01GP4DH23M7M2CXVWADPZHW54F"]
+#[derive(Clone, Copy, HasSchema, Default)]
 pub struct ItemDropped {
     /// The player that dropped the item
     pub player: Entity,
 }
 
 /// Marker component added to items when they are grabbed.
-#[derive(Clone, Copy, TypeUlid)]
-#[ulid = "01GP4DJ2RPYTDPKSKEK8JKK9VT"]
+#[derive(Clone, Copy, HasSchema, Default)]
 pub struct ItemGrabbed {
     /// The player that grabbed the item
     pub player: Entity,
 }
 
 /// Marker component added to items when they are used.
-#[derive(Clone, Copy, TypeUlid)]
-#[ulid = "01GP4DJ84TFB8Z7H9VY7Y0R47H"]
+#[derive(Clone, Copy, HasSchema, Default)]
 pub struct ItemUsed {
     /// The player that used the item
     pub owner: Entity,
@@ -99,10 +93,9 @@ pub struct ItemUsed {
 /// Mainly handled by the [`grab_items`] system which consumes the
 /// [`ItemGrabbed`] components for entities which have this component.
 /// [`Item`] is required for the system to take affect.
-#[derive(Clone, Copy, TypeUlid)]
-#[ulid = "01GTJHWG4C2AW6KCY0P11MZ1KW"]
+#[derive(Clone, HasSchema, Default)]
 pub struct ItemGrab {
-    pub fin_anim: Key,
+    pub fin_anim: Ustr,
     pub grab_offset: Vec2,
     pub sync_animation: bool,
 }
@@ -151,8 +144,7 @@ pub fn grab_items(
 /// Mainly handled by the [`throw_dropped_items`] system which consumes the
 /// [`ItemDropped`] components for entities which have this component.
 /// [`Item`] is required for the system to take affect.
-#[derive(Clone, TypeUlid)]
-#[ulid = "01GSGE6N4TSEMQ1DKDP5Y66TE4"]
+#[derive(Clone, HasSchema)]
 pub struct ItemThrow {
     normal: Vec2,
     fast: Vec2,
@@ -162,7 +154,13 @@ pub struct ItemThrow {
     roll: Vec2,
     spin: f32,
     /// An optional system value that gets run once on throw.
-    system: Option<Arc<AtomicRefCell<System>>>,
+    system: Option<Arc<AtomicCell<StaticSystem<(), ()>>>>,
+}
+
+impl Default for ItemThrow {
+    fn default() -> Self {
+        Self::base()
+    }
 }
 
 impl ItemThrow {
@@ -202,9 +200,12 @@ impl ItemThrow {
         Self { spin, ..self }
     }
 
-    pub fn with_system<Args>(self, system: impl IntoSystem<Args, ()>) -> Self {
+    pub fn with_system<Args, I>(self, system: I) -> Self
+    where
+        I: IntoSystem<Args, (), (), Sys = StaticSystem<(), ()>>,
+    {
         Self {
-            system: Some(Arc::new(AtomicRefCell::new(system.system()))),
+            system: Some(Arc::new(AtomicCell::new(system.system()))),
             ..self
         }
     }
@@ -239,7 +240,7 @@ pub fn throw_dropped_items(
     entities: Res<Entities>,
     item_throws: Comp<ItemThrow>,
     items: Comp<Item>,
-    player_inputs: Res<PlayerInputs>,
+    player_inputs: Res<MatchInputs>,
     player_indexes: Comp<PlayerIdx>,
     mut items_dropped: CompMut<ItemDropped>,
     mut bodies: CompMut<KinematicBody>,
@@ -256,7 +257,7 @@ pub fn throw_dropped_items(
     {
         if let Some(ItemDropped { player }) = items_dropped.get(entity).cloned() {
             if let Some(system) = item_throw.system.clone() {
-                commands.add(move |world: &World| (system.borrow_mut().run)(world).unwrap());
+                commands.add(move |world: &World| (system.borrow_mut().run)(world, ()));
             }
             items_dropped.remove(entity);
             attachments.remove(entity);
@@ -272,7 +273,7 @@ pub fn throw_dropped_items(
             let throw_velocity = item_throw.velocity_from_control(
                 &player_inputs
                     .players
-                    .get(player_indexes.get(player).unwrap().0)
+                    .get(player_indexes.get(player).unwrap().0 as usize)
                     .unwrap()
                     .control,
             );
diff --git a/core/src/lifetime.rs b/src/core/lifetime.rs
similarity index 85%
rename from core/src/lifetime.rs
rename to src/core/lifetime.rs
index d8d02a140d..c78ac121ec 100644
--- a/core/src/lifetime.rs
+++ b/src/core/lifetime.rs
@@ -2,9 +2,9 @@
 
 use std::time::Duration;
 
-use crate::{prelude::*, FPS};
+use crate::{core::FPS, prelude::*};
 
-pub fn install(session: &mut CoreSession) {
+pub fn install(session: &mut Session) {
     session
         .stages
         .add_system_to_stage(CoreStage::PostUpdate, lifetime_system)
@@ -18,8 +18,7 @@ pub fn install(session: &mut CoreSession) {
 /// > later, after it was spawned.
 /// >
 /// > Also, the age and lifetime are public, subject to other system's modification.
-#[derive(Copy, Clone, Default, TypeUlid)]
-#[ulid = "01GP9SS1WH06QC352CZ8BKSTZE"]
+#[derive(Copy, Clone, Default, HasSchema)]
 pub struct Lifetime {
     /// How long the entity should be allowed to live in seconds.
     pub lifetime: f32,
@@ -37,7 +36,7 @@ impl Lifetime {
 }
 
 /// Despawns entities that have an expired lifetime
-fn lifetime_system(mut entities: ResMut<Entities>, mut lifetimes: CompMut<Lifetime>) {
+fn lifetime_system(mut entities: ResMutInit<Entities>, mut lifetimes: CompMut<Lifetime>) {
     let mut to_kill = Vec::new();
     for (entity, lifetime) in &mut entities.iter_with(&mut lifetimes) {
         lifetime.age += 1.0 / FPS;
@@ -53,8 +52,7 @@ fn lifetime_system(mut entities: ResMut<Entities>, mut lifetimes: CompMut<Lifeti
 /// A timer that can be used to make an entity invincible for a certain amount of time
 ///
 /// This is a general purpose invinvibility timer, but will serve as our spawn protection timer.
-#[derive(Clone, Default, TypeUlid, Debug)]
-#[ulid = "01GV3P99HFCZSC2MMXHA9394EJ"]
+#[derive(Clone, Default, HasSchema, Debug)]
 pub struct Invincibility(Timer);
 
 impl Invincibility {
@@ -66,7 +64,7 @@ impl Invincibility {
 fn invincibility(
     time: Res<Time>,
     mut commands: Commands,
-    entities: ResMut<Entities>,
+    entities: ResMutInit<Entities>,
     mut invincibles: CompMut<Invincibility>,
 ) {
     for (player_ent, invincible) in &mut entities.iter_with(&mut invincibles) {
diff --git a/core/src/map.rs b/src/core/map.rs
similarity index 88%
rename from core/src/map.rs
rename to src/core/map.rs
index 0b40e92a15..e8dfdae104 100644
--- a/core/src/map.rs
+++ b/src/core/map.rs
@@ -5,11 +5,10 @@ use std::{
     collections::VecDeque,
 };
 
-use ::bevy::utils::HashSet;
+use super::physics::collisions::{CollisionWorld, TileCollisionKind};
+use crate::prelude::*;
 
-use crate::prelude::{collisions::TileCollisionKind, *};
-
-pub fn install(session: &mut CoreSession) {
+pub fn install(session: &mut Session) {
     session
         .stages
         .add_system_to_stage(CoreStage::First, spawn_map)
@@ -17,13 +16,11 @@ pub fn install(session: &mut CoreSession) {
 }
 
 /// Resource containing the map metadata for this game session.
-#[derive(Clone, TypeUlid, Deref, DerefMut, Default)]
-#[ulid = "01GP2H6K9H3JEEMXFCKV4TGMWZ"]
+#[derive(Clone, HasSchema, Deref, DerefMut, Default)]
 pub struct LoadedMap(pub Arc<MapMeta>);
 
 /// Resource indicating whether the map has been spawned.
-#[derive(Clone, TypeUlid, Default, Deref, DerefMut)]
-#[ulid = "01GP3Z38HKE37JB6GRHHPPTY38"]
+#[derive(Clone, HasSchema, Default, Deref, DerefMut)]
 pub struct MapSpawned(pub bool);
 
 /// The Z depth of the deepest map layer.
@@ -32,7 +29,7 @@ pub const MAP_LAYERS_MIN_DEPTH: f32 = -900.0;
 pub const MAP_LAYERS_GAP_DEPTH: f32 = 10.0;
 
 /// Helper for getting the z-depth of the map layer with the given index.
-pub fn z_depth_for_map_layer(layer_idx: usize) -> f32 {
+pub fn z_depth_for_map_layer(layer_idx: u32) -> f32 {
     // We start map layers at -900 and for ever layer we place a gap of 10 units in between
     MAP_LAYERS_MIN_DEPTH + layer_idx as f32 * MAP_LAYERS_GAP_DEPTH
 }
@@ -40,15 +37,14 @@ pub fn z_depth_for_map_layer(layer_idx: usize) -> f32 {
 /// Resource containing essential the map metadata for the map once spawned. This allows the
 /// complete map metadata to be re-constructed from the world after the map has been spawned and
 /// potentially modified.
-#[derive(TypeUlid, Clone)]
-#[ulid = "01GSR8V683B3EH5QAB2PMGN9J7"]
+#[derive(HasSchema, Clone)]
 pub struct SpawnedMapMeta {
-    pub name: Arc<str>,
+    pub name: Ustr,
     pub background: Arc<BackgroundMeta>,
-    pub background_color: ColorMeta,
+    pub background_color: Color,
     pub grid_size: UVec2,
     pub tile_size: Vec2,
-    pub layer_names: Arc<[String]>,
+    pub layer_names: Arc<[Ustr]>,
 }
 
 impl Default for SpawnedMapMeta {
@@ -68,16 +64,14 @@ impl Default for SpawnedMapMeta {
 ///
 /// This is used when exporting the world to `MapMeta` to decide which layer to put an element or
 /// tile layer in.
-#[derive(TypeUlid, Clone, Copy, Default)]
-#[ulid = "01GSR8GSRJHGTJ8J9Y38W7C5S3"]
+#[derive(HasSchema, Clone, Copy, Default)]
 pub struct SpawnedMapLayerMeta {
     /// The layer index of the layer that the element belongs to in the map.
-    pub layer_idx: usize,
+    pub layer_idx: u32,
 }
 
 /// The map navigation graph resource.
-#[derive(Clone, Debug, Deref, DerefMut, TypeUlid, Default)]
-#[ulid = "01GQWP4QG11NBVX3M289TXAK6W"]
+#[derive(Clone, Debug, Deref, DerefMut, HasSchema, Default)]
 pub struct NavGraph(pub Arc<NavGraphInner>);
 
 /// The inner graph type of [`NavGraph`].
@@ -126,17 +120,17 @@ impl From<NavNode> for IVec2 {
 }
 impl std::cmp::Ord for NavNode {
     fn cmp(&self, other: &Self) -> std::cmp::Ordering {
-        self.partial_cmp(other).unwrap()
-    }
-}
-impl std::cmp::PartialOrd for NavNode {
-    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
         let xcmp = self.0.x.cmp(&other.0.x);
-        Some(if xcmp == std::cmp::Ordering::Equal {
+        if xcmp == std::cmp::Ordering::Equal {
             self.0.y.cmp(&other.0.y)
         } else {
             xcmp
-        })
+        }
+    }
+}
+impl std::cmp::PartialOrd for NavNode {
+    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+        Some(self.cmp(other))
     }
 }
 
@@ -151,10 +145,10 @@ pub struct NavGraphEdge {
 
 fn spawn_map(
     mut commands: Commands,
-    mut entities: ResMut<Entities>,
-    mut clear_color: ResMut<ClearColor>,
+    mut entities: ResMutInit<Entities>,
+    mut clear_color: ResMutInit<ClearColor>,
     map: Res<LoadedMap>,
-    mut map_spawned: ResMut<MapSpawned>,
+    mut map_spawned: ResMutInit<MapSpawned>,
     mut tiles: CompMut<Tile>,
     mut tile_layers: CompMut<TileLayer>,
     mut transforms: CompMut<Transform>,
@@ -162,12 +156,12 @@ fn spawn_map(
     mut tile_collisions: CompMut<TileCollisionKind>,
     mut parallax_bg_sprites: CompMut<ParallaxBackgroundSprite>,
     mut sprites: CompMut<Sprite>,
-    mut nav_graph: ResMut<NavGraph>,
+    mut nav_graph: ResMutInit<NavGraph>,
     mut cameras: CompMut<Camera>,
     mut camera_shakes: CompMut<CameraShake>,
     mut camera_states: CompMut<CameraState>,
     mut spawned_map_layer_metas: CompMut<SpawnedMapLayerMeta>,
-    mut spawned_map_meta: ResMut<SpawnedMapMeta>,
+    mut spawned_map_meta: ResMutInit<SpawnedMapMeta>,
 ) {
     if map_spawned.0 {
         return;
@@ -175,12 +169,12 @@ fn spawn_map(
 
     // Fill in the spawned map metadata
     *spawned_map_meta = SpawnedMapMeta {
-        name: map.name.clone().into(),
+        name: map.name,
         background: Arc::new(map.background.clone()),
         background_color: map.background_color,
         grid_size: map.grid_size,
         tile_size: map.tile_size,
-        layer_names: map.layers.iter().map(|x| x.id.to_string()).collect(),
+        layer_names: map.layers.iter().map(|x| x.id).collect(),
     };
 
     // Spawn the camera
@@ -190,7 +184,7 @@ fn spawn_map(
             ent,
             CameraShake {
                 center: (map.tile_size * (map.grid_size / 2).as_vec2()).extend(0.0),
-                ..CameraShake::new(2.0, glam::vec2(20.0, 20.0), 1.0, 1.0)
+                ..CameraShake::new(2.0, vec2(20.0, 20.0), 1.0, 1.0)
             },
         );
         cameras.insert(ent, default());
@@ -199,7 +193,7 @@ fn spawn_map(
     }
 
     map_spawned.0 = true;
-    **clear_color = map.background_color.0;
+    **clear_color = map.background_color;
 
     // Load the navigation graph
     nav_graph.0 = create_nav_graph(&map);
@@ -211,7 +205,7 @@ fn spawn_map(
             sprites.insert(
                 ent,
                 Sprite {
-                    image: layer.image.clone(),
+                    image: layer.image,
                     ..default()
                 },
             );
@@ -228,43 +222,43 @@ fn spawn_map(
 
     // Load tiles
     for (layer_idx, layer) in map.layers.iter().enumerate() {
+        let layer_idx = layer_idx as u32;
         let layer_z = z_depth_for_map_layer(layer_idx);
-        let mut tile_layer = TileLayer::new(
-            map.grid_size,
-            map.tile_size,
-            // Just use a dummy atlas if one is not specified
-            layer.tilemap.clone().unwrap_or_default(),
-        );
 
-        for tile_meta in &layer.tiles {
-            let tile_ent = entities.create();
-            tile_layer.set(tile_meta.pos, Some(tile_ent));
-            tiles.insert(
-                tile_ent,
-                Tile {
-                    idx: tile_meta.idx as usize,
-                    ..default()
-                },
-            );
-            // TODO: Due to a bug in the way that collisions are handled in the
-            // `physics/collisions.rs` file, having an empty collision isn't equivalent to not
-            // having a collision component.
-            //
-            // We should fix this so that we can insert an empty tile collision kind and have that
-            // work properly. For now, though, just not adding the tile collider component behaves
-            // properly.
-            if tile_meta.collision != TileCollisionKind::Empty {
-                tile_collisions.insert(tile_ent, tile_meta.collision);
+        if let Set(tilemap) = layer.tilemap {
+            let mut tile_layer = TileLayer::new(map.grid_size, map.tile_size, tilemap);
+
+            for tile_meta in &layer.tiles {
+                let tile_ent = entities.create();
+                tile_layer.set(tile_meta.pos, Some(tile_ent));
+                tiles.insert(
+                    tile_ent,
+                    Tile {
+                        idx: tile_meta.idx,
+                        ..default()
+                    },
+                );
+                // TODO: Due to a bug in the way that collisions are handled in the
+                // `physics/collisions.rs` file, having an empty collision isn't equivalent to not
+                // having a collision component.
+                //
+                // We should fix this so that we can insert an empty tile collision kind and have that
+                // work properly. For now, though, just not adding the tile collider component behaves
+                // properly.
+                if tile_meta.collision != TileCollisionKind::Empty {
+                    tile_collisions.insert(tile_ent, tile_meta.collision);
+                }
             }
+            let layer_ent = entities.create();
+            spawned_map_layer_metas.insert(layer_ent, SpawnedMapLayerMeta { layer_idx });
+            tile_layers.insert(layer_ent, tile_layer);
+            transforms.insert(
+                layer_ent,
+                Transform::from_translation(Vec3::new(0.0, 0.0, layer_z)),
+            );
         }
-        let layer_ent = entities.create();
-        spawned_map_layer_metas.insert(layer_ent, SpawnedMapLayerMeta { layer_idx });
-        tile_layers.insert(layer_ent, tile_layer);
-        transforms.insert(
-            layer_ent,
-            Transform::from_translation(Vec3::new(0.0, 0.0, layer_z)),
-        );
 
+        // Spawn the elements
         for element_meta in &layer.elements {
             let element_ent = entities.create();
 
@@ -273,7 +267,7 @@ fn spawn_map(
                 element_ent,
                 Transform::from_translation(element_meta.pos.extend(layer_z)),
             );
-            element_handles.insert(element_ent, ElementHandle(element_meta.element.clone()));
+            element_handles.insert(element_ent, ElementHandle(element_meta.element));
         }
     }
 
diff --git a/core/src/map_constructor.rs b/src/core/map_constructor.rs
similarity index 92%
rename from core/src/map_constructor.rs
rename to src/core/map_constructor.rs
index 41ea4bcabc..4ae0c5cffb 100644
--- a/core/src/map_constructor.rs
+++ b/src/core/map_constructor.rs
@@ -3,7 +3,7 @@
 //! Map constructors are algorithms that can be used to create or edit game maps, usually through
 //! the jumpy editor.
 
-use crate::editor::MapManager;
+use super::editor::MapManager;
 
 pub mod shiftnanigans;
 
diff --git a/core/src/map_constructor/shiftnanigans.rs b/src/core/map_constructor/shiftnanigans.rs
similarity index 96%
rename from core/src/map_constructor/shiftnanigans.rs
rename to src/core/map_constructor/shiftnanigans.rs
index f422d0cfca..e3c0236825 100644
--- a/core/src/map_constructor/shiftnanigans.rs
+++ b/src/core/map_constructor/shiftnanigans.rs
@@ -3,15 +3,10 @@
 use std::{cell::RefCell, rc::Rc};
 
 use super::MapConstructor;
-use crate::{
-    editor::MapManager,
-    input::{ElementLayer, TileLayer},
-    metadata::ElementMeta,
-    physics::TileCollisionKind,
+use crate::prelude::*;
+use ::shiftnanigans::pixel_board::{
+    pixel_board_randomizer::PixelBoardRandomizer, Pixel, PixelBoard,
 };
-use bones_lib::prelude::Handle;
-use glam::{UVec2, Vec2};
-use shiftnanigans::pixel_board::{pixel_board_randomizer::PixelBoardRandomizer, Pixel, PixelBoard};
 
 /// Map randomizer using [Shiftnanigans](https://github.com/AustinHellerRepo/Shiftnanigans).
 pub struct ShiftnanigansMapConstructor {
@@ -25,7 +20,7 @@ impl ShiftnanigansMapConstructor {
     pub fn new(
         map_size: UVec2,
         tile_size: Vec2,
-        tile_layers: &[TileLayer],
+        tile_layers: &[LocatedTileLayer],
         element_layers: &[ElementLayer],
     ) -> ShiftnanigansMapConstructor {
         // . map tiles and elements into pixel types
@@ -250,7 +245,7 @@ impl MapConstructor for ShiftnanigansMapConstructor {
                                     map_manager.set_tile(
                                         tile.layer_index,
                                         position,
-                                        &Some(tile.tilemap_tile_index as usize),
+                                        &Some(tile.tilemap_tile_index),
                                         tile.tile_collision_kind,
                                     );
                                 }
@@ -283,14 +278,14 @@ impl MapConstructor for ShiftnanigansMapConstructor {
 
 /// The tile as it exists in the map
 struct Tile {
-    layer_index: usize,
+    layer_index: u32,
     tilemap_tile_index: u32,
     tile_collision_kind: TileCollisionKind,
 }
 
 /// An element at a location within the map
 struct Element {
-    layer_index: usize,
+    layer_index: u32,
     element_meta_handle: Handle<ElementMeta>,
     position: Vec2,
 }
@@ -308,7 +303,7 @@ struct UngroupedPixel {
 
 impl UngroupedPixel {
     fn from_layers_and_location(
-        tile_layers: &[TileLayer],
+        tile_layers: &[LocatedTileLayer],
         element_layers: &[ElementLayer],
         x: u32,
         y: u32,
@@ -333,7 +328,7 @@ impl UngroupedPixel {
                     // TODO determine which element this is in 'element' for custom spacing requirements
                     entity_types.push(LayerPixelEntityType::Element(Element {
                         layer_index: element_layer.layer_index,
-                        element_meta_handle: element.1.clone(),
+                        element_meta_handle: element.1,
                         position: Vec2::new(element.0.x - x as f32, element.0.y - y as f32),
                     }));
                 }
diff --git a/src/core/metadata.rs b/src/core/metadata.rs
new file mode 100644
index 0000000000..94aa626fb2
--- /dev/null
+++ b/src/core/metadata.rs
@@ -0,0 +1,93 @@
+//! Core game metadata
+
+use serde::Deserializer;
+use std::time::Duration;
+
+use crate::prelude::*;
+
+mod map;
+mod player;
+
+pub use map::*;
+pub use player::*;
+
+/// Extension trait for the bones [`AssetServer`].
+pub trait MatchAssetServerExt {
+    /// Register the default assets from `bones_framework`.
+    fn register_match_assets(self) -> Self;
+}
+impl MatchAssetServerExt for &mut AssetServer {
+    fn register_match_assets(self) -> Self {
+        CoreMeta::schema();
+        PlayerMeta::schema();
+        ElementMeta::schema();
+        BulletMeta::schema();
+        MapMeta::schema();
+        HatMeta::schema();
+
+        self
+    }
+}
+
+#[derive(Clone, Debug, HasSchema, Default)]
+#[repr(C)]
+pub struct CoreMeta {
+    pub camera: CameraMeta,
+    pub physics: PhysicsMeta,
+    pub config: CoreConfigMeta,
+    pub map_tilesets: SVec<Handle<Atlas>>,
+    pub players: SVec<Handle<PlayerMeta>>,
+    pub player_hats: SVec<Handle<HatMeta>>,
+    pub stable_maps: SVec<Handle<MapMeta>>,
+    pub map_elements: SVec<Handle<ElementMeta>>,
+    pub experimental_maps: SVec<Handle<MapMeta>>,
+}
+
+#[derive(HasSchema, Clone, Debug)]
+#[repr(C)]
+pub struct CameraMeta {
+    pub default_height: f32,
+    pub border_top: f32,
+    pub border_bottom: f32,
+    pub border_left: f32,
+    pub border_right: f32,
+    pub move_lerp_factor: f32,
+    pub zoom_in_lerp_factor: f32,
+    pub zoom_out_lerp_factor: f32,
+    pub min_camera_size: Vec2,
+    pub player_camera_box_size: Vec2,
+}
+
+impl Default for CameraMeta {
+    fn default() -> Self {
+        Self {
+            default_height: 400.0,
+            border_top: 0.0,
+            border_bottom: 0.0,
+            border_left: 0.0,
+            border_right: 0.0,
+            move_lerp_factor: 1.0,
+            zoom_in_lerp_factor: 1.0,
+            zoom_out_lerp_factor: 1.0,
+            min_camera_size: Vec2::ZERO,
+            player_camera_box_size: Vec2::ZERO,
+        }
+    }
+}
+
+#[derive(HasSchema, Clone, Debug, Default)]
+#[repr(C)]
+pub struct PhysicsMeta {
+    pub gravity: f32,
+    pub terminal_velocity: f32,
+    pub friction_lerp: f32,
+    pub stop_threshold: f32,
+}
+
+#[derive(HasSchema, Deserialize, Clone, Debug, Default)]
+#[derive_type_data(SchemaDeserialize)]
+pub struct CoreConfigMeta {
+    #[serde(default)]
+    #[serde(with = "humantime_serde")]
+    pub respawn_invincibility_time: Duration,
+}
diff --git a/core/src/metadata/map.rs b/src/core/metadata/map.rs
similarity index 52%
rename from core/src/metadata/map.rs
rename to src/core/metadata/map.rs
index b2825f11d3..4d4ab1814b 100644
--- a/core/src/metadata/map.rs
+++ b/src/core/metadata/map.rs
@@ -1,68 +1,60 @@
 use super::*;
 
-#[derive(BonesBevyAsset, Serialize, Deserialize, Clone, TypeUlid, Debug, Default)]
-#[ulid = "01GP264BT87MAAHMEK52Y5P7BW"]
-#[asset_id = "map"]
-#[serde(deny_unknown_fields)]
+#[derive(Clone, HasSchema, Default, Debug)]
+#[type_data(metadata_asset("map"))]
+#[repr(C)]
 pub struct MapMeta {
-    pub name: String,
+    pub name: Ustr,
     /// The parallax background layers
-    #[serde(default)]
     pub background: BackgroundMeta,
     /// The background color of the map, behind the parallax layers
-    pub background_color: ColorMeta,
+    pub background_color: Color,
     /// Size of the map in tiles
     pub grid_size: UVec2,
     /// The size of the tiles in pixels
     pub tile_size: Vec2,
     /// The layers of the map
-    pub layers: Vec<MapLayerMeta>,
+    pub layers: SVec<MapLayerMeta>,
 }
 
-#[derive(BonesBevyAssetLoad, Serialize, Deserialize, Clone, Debug, Default)]
-#[serde(deny_unknown_fields)]
+#[derive(HasSchema, Clone, Debug, Default)]
+#[repr(C)]
 pub struct BackgroundMeta {
     pub speed: Vec2,
-    pub layers: Vec<ParallaxLayerMeta>,
+    pub layers: SVec<ParallaxLayerMeta>,
 }
 
-#[derive(BonesBevyAssetLoad, Serialize, Deserialize, Clone, Debug, TypeUlid)]
-#[serde(deny_unknown_fields)]
-#[ulid = "01GPP1QJFVQN3HYW4N7ZE3S89Y"]
+#[derive(HasSchema, Clone, Debug, Default)]
+#[repr(C)]
 pub struct ParallaxLayerMeta {
     pub image: Handle<Image>,
     pub size: Vec2,
     pub depth: f32,
     pub scale: f32,
-    #[serde(default)]
     pub offset: Vec2,
 }
 
-#[derive(BonesBevyAssetLoad, Serialize, Deserialize, Clone, Debug)]
-#[serde(deny_unknown_fields)]
+#[derive(HasSchema, Clone, Debug, Default)]
+#[repr(C)]
 pub struct MapLayerMeta {
-    pub id: String,
-    #[serde(default)]
-    pub tilemap: Option<Handle<Atlas>>,
-    #[serde(default)]
-    pub tiles: Vec<MapTileMeta>,
-    #[serde(default)]
-    pub elements: Vec<ElementSpawn>,
+    pub id: Ustr,
+    pub tilemap: Maybe<Handle<Atlas>>,
+    pub tiles: SVec<MapTileMeta>,
+    pub elements: SVec<ElementSpawn>,
 }
 
-#[derive(BonesBevyAssetLoad, Serialize, Deserialize, Clone, Debug, Default)]
-#[serde(deny_unknown_fields)]
+#[derive(HasSchema, Clone, Debug, Default)]
+#[repr(C)]
 pub struct ElementSpawn {
     pub pos: Vec2,
     pub element: Handle<ElementMeta>,
 }
 
-#[derive(BonesBevyAssetLoad, Serialize, Deserialize, Clone, Debug)]
-#[serde(deny_unknown_fields)]
+#[derive(HasSchema, Clone, Debug, Default)]
+#[repr(C)]
 pub struct MapTileMeta {
     pub pos: UVec2,
     pub idx: u32,
-    #[serde(default)]
     pub collision: TileCollisionKind,
 }
 
diff --git a/core/src/metadata/player.rs b/src/core/metadata/player.rs
similarity index 52%
rename from core/src/metadata/player.rs
rename to src/core/metadata/player.rs
index 6b6e55558d..e837feb66f 100644
--- a/core/src/metadata/player.rs
+++ b/src/core/metadata/player.rs
@@ -1,11 +1,10 @@
 use super::*;
 
-#[derive(BonesBevyAsset, Clone, Debug, Default, Deserialize, TypeUlid)]
-#[serde(deny_unknown_fields)]
-#[asset_id = "player"]
-#[ulid = "01GNWTRN89YRFNFTV3KZZ6H8TK"]
+#[derive(HasSchema, Clone, Debug, Default)]
+#[type_data(metadata_asset("player"))]
+#[repr(C)]
 pub struct PlayerMeta {
-    pub name: String,
+    pub name: Ustr,
     pub body_size: Vec2,
     pub slide_body_size: Vec2,
     pub gravity: f32,
@@ -14,47 +13,62 @@ pub struct PlayerMeta {
     pub layers: PlayerLayersMeta,
 }
 
-#[derive(BonesBevyAssetLoad, Deserialize, Clone, Debug, Default)]
-#[serde(deny_unknown_fields)]
+#[derive(HasSchema, Clone, Debug, Default)]
+#[repr(C)]
 pub struct PlayerLayersMeta {
     pub body: PlayerBodyLayerMeta,
     pub fin: PlayerLayerMeta,
     pub face: PlayerLayerMeta,
 }
 
-#[derive(BonesBevyAssetLoad, Deserialize, Clone, Debug, Default)]
-#[serde(deny_unknown_fields)]
+#[derive(HasSchema, Clone, Debug, Default)]
+#[repr(C)]
 pub struct PlayerBodyLayerMeta {
     pub atlas: Handle<Atlas>,
-    #[serde(deserialize_with = "deserialize_body_animations")]
-    #[asset(deserialize_only)]
+    // #[serde(deserialize_with = "deserialize_body_animations")]
+    // #[asset(deserialize_only)]
     pub animations: BodyAnimationsMeta,
 }
 
-#[derive(Clone, Debug, Default)]
+#[derive(HasSchema, Clone, Debug, Default)]
+#[derive_type_data(SchemaDeserialize)]
 pub struct BodyAnimationsMeta {
-    pub offsets: Arc<std::collections::HashMap<Key, Vec<Offsets>>>,
-    pub frames: Arc<std::collections::HashMap<Key, AnimatedSprite>>,
+    // TODO: Put Animation Frames in an `Arc` to Avoid Snapshot Clone Cost.
+    pub offsets: SMap<Ustr, SVec<Offsets>>,
+    pub frames: SMap<Ustr, AnimatedSprite>,
 }
 
-#[derive(Clone, Debug, Default)]
+impl<'de> Deserialize<'de> for BodyAnimationsMeta {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        deserialize_body_animations(deserializer)
+    }
+}
+
+#[derive(Clone, Debug, Default, HasSchema)]
+#[repr(C)]
 pub struct Offsets {
     pub body: Vec2,
     pub head: Vec2,
 }
 
-#[derive(BonesBevyAssetLoad, Deserialize, Clone, Debug, Default)]
-#[serde(deny_unknown_fields)]
+#[derive(HasSchema, Clone, Debug, Default)]
+#[repr(C)]
 pub struct PlayerLayerMeta {
     pub atlas: Handle<Atlas>,
     pub offset: Vec2,
-    #[serde(deserialize_with = "deserialize_arc")]
-    #[asset(deserialize_only)]
-    pub animations: Arc<std::collections::HashMap<Key, AnimatedSprite>>,
+    // TODO: Put Animation Frames in an `Arc` to Avoid Snapshot Clone Cost.
+    // The current blocker to this is `Arc` doesn't implement `HasSchema`, and we have to figure
+    // that out.
+    // TODO: Use more economic key type such as `ustr`
+    // The current blocker is implementing `HasSchema` for `ustr`.
+    pub animations: SMap<Ustr, AnimatedSprite>,
 }
 
-#[derive(BonesBevyAssetLoad, Deserialize, Clone, Debug, Default)]
-#[serde(deny_unknown_fields)]
+#[derive(HasSchema, Deserialize, Clone, Debug, Default)]
+#[repr(C)]
 pub struct PlayerStatsMeta {
     pub jump_speed: f32,
     pub slow_fall_speed: f32,
@@ -65,8 +79,8 @@ pub struct PlayerStatsMeta {
     pub accel_walk_speed: f32,
 }
 
-#[derive(BonesBevyAssetLoad, Deserialize, Clone, Debug, Default)]
-#[serde(deny_unknown_fields)]
+#[derive(HasSchema, Clone, Debug, Default)]
+#[repr(C)]
 pub struct PlayerSoundsMeta {
     pub land_volume: f64,
     pub land: Handle<AudioSource>,
@@ -104,7 +118,7 @@ fn deserialize_body_animations<'de, D: Deserializer<'de>>(
     #[serde(deny_unknown_fields)]
     struct AnimatedBodySprite {
         #[serde(default)]
-        pub index: usize,
+        pub index: u32,
         #[serde(deserialize_with = "deserialize_arc_slice")]
         #[serde(serialize_with = "serialize_arc_slice")]
         pub frames: Arc<[BodyFrame]>,
@@ -121,61 +135,55 @@ fn deserialize_body_animations<'de, D: Deserializer<'de>>(
     #[derive(Clone, Deserialize)]
     #[serde(deny_unknown_fields)]
     struct BodyFrame {
-        pub idx: usize,
+        pub idx: u32,
         #[serde(default)]
         pub offset: Vec2,
         #[serde(default)]
         pub head_offset: Vec2,
     }
 
-    let body_sprite_anmations =
-        <std::collections::HashMap<Key, AnimatedBodySprite>>::deserialize(deserializer)?;
-
-    let offsets = Arc::new(
-        body_sprite_anmations
-            .iter()
-            .map(|(k, v)| {
-                (
-                    *k,
-                    v.frames
-                        .iter()
-                        .map(|x| Offsets {
-                            body: x.offset,
-                            head: x.head_offset,
-                        })
-                        .collect::<Vec<_>>(),
-                )
-            })
-            .collect(),
-    );
-    let frames = Arc::new(
-        body_sprite_anmations
-            .into_iter()
-            .map(|(k, v)| {
-                (
-                    k,
-                    AnimatedSprite {
-                        index: v.index,
-                        frames: v.frames.iter().map(|x| x.idx).collect(),
-                        fps: v.fps,
-                        timer: v.timer,
-                        repeat: v.repeat,
-                    },
-                )
-            })
-            .collect(),
-    );
+    let body_sprite_anmations = <HashMap<String, AnimatedBodySprite>>::deserialize(deserializer)?;
+
+    let offsets = body_sprite_anmations
+        .iter()
+        .map(|(k, v)| {
+            (
+                ustr(k),
+                v.frames
+                    .iter()
+                    .map(|x| Offsets {
+                        body: x.offset,
+                        head: x.head_offset,
+                    })
+                    .collect::<SVec<_>>(),
+            )
+        })
+        .collect();
+    let frames = body_sprite_anmations
+        .into_iter()
+        .map(|(k, v)| {
+            (
+                ustr(&k),
+                AnimatedSprite {
+                    index: v.index,
+                    frames: v.frames.iter().map(|x| x.idx).collect(),
+                    fps: v.fps,
+                    timer: v.timer,
+                    repeat: v.repeat,
+                },
+            )
+        })
+        .collect();
 
     Ok(BodyAnimationsMeta { offsets, frames })
 }
 
 /// Metadata for a player hat.
-#[derive(BonesBevyAsset, Clone, Debug, Default, Deserialize, TypeUlid)]
-#[serde(deny_unknown_fields)]
-#[asset_id = "hat"]
-#[ulid = "01H3D0EKZAV13T8QXW6SY6S1PP"]
+#[derive(HasSchema, Clone, Debug, Default)]
+#[type_data(metadata_asset("hat"))]
+#[repr(C)]
 pub struct HatMeta {
-    pub name: String,
+    pub name: Ustr,
     pub atlas: Handle<Atlas>,
     pub offset: Vec2,
     pub body_size: Vec2,
diff --git a/core/src/physics.rs b/src/core/physics.rs
similarity index 95%
rename from core/src/physics.rs
rename to src/core/physics.rs
index 97929c96ef..bca690e391 100644
--- a/core/src/physics.rs
+++ b/src/core/physics.rs
@@ -7,6 +7,8 @@ pub use collisions::{
     TileCollisionKind,
 };
 
+use super::utils::Rect;
+
 pub mod collisions;
 
 #[derive(Debug, Clone, Copy)]
@@ -26,7 +28,7 @@ impl StageLabel for PhysicsStage {
     }
 }
 
-pub fn install(session: &mut CoreSession) {
+pub fn install(session: &mut Session) {
     session
         .stages
         // TODO: Think again about exactly how to organize the physics sync systems. At the time of
@@ -48,8 +50,7 @@ pub fn install(session: &mut CoreSession) {
 ///
 /// For now, all kinematic bodies have axis-aligned, rectangular colliders. This may or may not
 /// change in the future.
-#[derive(Default, Debug, Clone, Copy, TypeUlid)]
-#[ulid = "01GNF5NRJR7CXZ9NKEBQEGN8R1"]
+#[derive(Default, Debug, Clone, Copy, HasSchema)]
 #[repr(C)]
 pub struct KinematicBody {
     pub velocity: Vec2,
@@ -63,6 +64,7 @@ pub struct KinematicBody {
     ///
     /// This is useful for things like slippery blocks or other things that want to modify a body's
     /// friction while it is on the block.
+    #[schema(opaque)]
     pub frame_friction_override: Option<f32>,
     pub is_on_ground: bool,
     pub was_on_ground: bool,
@@ -136,7 +138,7 @@ fn hydrate_physics_bodies(
 
 /// Update physics for kinematic bodies.
 fn update_kinematic_bodies(
-    game: Res<CoreMetaArc>,
+    meta: Root<GameMeta>,
     entities: Res<Entities>,
     mut bodies: CompMut<KinematicBody>,
     mut collision_world: CollisionWorld,
@@ -305,18 +307,18 @@ fn update_kinematic_bodies(
                 body.velocity.x *= if let Some(friction) = body.frame_friction_override {
                     friction
                 } else {
-                    game.physics.friction_lerp
+                    meta.core.physics.friction_lerp
                 };
                 body.frame_friction_override = None;
 
-                if body.velocity.x.abs() <= game.physics.stop_threshold {
+                if body.velocity.x.abs() <= meta.core.physics.stop_threshold {
                     body.velocity.x = 0.0;
                 }
 
-                body.velocity.y *= game.physics.friction_lerp;
+                body.velocity.y *= meta.core.physics.friction_lerp;
             }
 
-            if body.velocity.y <= game.physics.gravity {
+            if body.velocity.y <= meta.core.physics.gravity {
                 body.velocity.y = 0.0;
             }
         }
@@ -324,8 +326,8 @@ fn update_kinematic_bodies(
         if !body.is_on_ground && body.has_mass {
             body.velocity.y -= body.gravity * time_factor;
 
-            if body.velocity.y < -game.physics.terminal_velocity {
-                body.velocity.y = -game.physics.terminal_velocity;
+            if body.velocity.y < -meta.core.physics.terminal_velocity {
+                body.velocity.y = -meta.core.physics.terminal_velocity;
             }
         }
 
@@ -362,7 +364,7 @@ fn apply_rotation(
             angle += velocity.x.abs() * angular_velocity;
         }
     } else {
-        angle += (angular_velocity * crate::FPS).to_radians();
+        angle += (angular_velocity * FPS).to_radians();
     }
 
     transform.rotation = Quat::from_rotation_z(angle);
diff --git a/core/src/physics/collisions.rs b/src/core/physics/collisions.rs
similarity index 95%
rename from core/src/physics/collisions.rs
rename to src/core/physics/collisions.rs
index 0fbd8c68d8..a9cb5b6b85 100644
--- a/core/src/physics/collisions.rs
+++ b/src/core/physics/collisions.rs
@@ -2,8 +2,6 @@
 
 use std::hash::BuildHasherDefault;
 
-use bytemuck::Zeroable;
-
 use indexmap::IndexMap;
 
 pub use rapier2d::prelude as rapier;
@@ -15,8 +13,7 @@ use crate::impl_system_param;
 use crate::prelude::*;
 
 /// Resource containing the data structures needed for rapier collision detection.
-#[derive(TypeUlid, Default)]
-#[ulid = "01GRYFB82VW5CXGK56KKPAVA5B"]
+#[derive(HasSchema, Default)]
 pub struct RapierContext {
     pub collision_pipeline: rapier::CollisionPipeline,
     pub broad_phase: rapier::BroadPhase,
@@ -47,10 +44,17 @@ impl Clone for RapierContext {
 
 /// A cache containing a map of entities, to the list of entities that each entity is currently
 /// intersecting with.
-#[derive(Default)]
 pub struct CollisionCache {
     /// The collisions in the cache.
-    pub collisions: Arc<AtomicRefCell<IndexMap<Entity, Vec<Entity>, EntityBuildHasher>>>,
+    pub collisions: Arc<AtomicCell<IndexMap<Entity, Vec<Entity>, EntityBuildHasher>>>,
+}
+
+impl Default for CollisionCache {
+    fn default() -> Self {
+        Self {
+            collisions: Arc::new(AtomicCell::new(IndexMap::default())),
+        }
+    }
 }
 
 /// Pass-through hasher for entities to reduce hashing cost when using them as keys in a hash map.
@@ -77,8 +81,8 @@ impl std::hash::Hasher for EntityHasher {
 
 impl CollisionCache {
     /// Get the set of entities that the given `entity` is intersecting.
-    pub fn get(&self, entity: Entity) -> AtomicRefMut<'_, Vec<Entity>> {
-        AtomicRefMut::map(self.collisions.borrow_mut(), |x| {
+    pub fn get(&self, entity: Entity) -> RefMut<'_, Vec<Entity>> {
+        RefMut::map(self.collisions.borrow_mut(), |x| {
             x.entry(entity).or_default()
         })
     }
@@ -87,7 +91,7 @@ impl CollisionCache {
 impl Clone for CollisionCache {
     fn clone(&self) -> Self {
         Self {
-            collisions: Arc::new(AtomicRefCell::new(self.collisions.borrow().clone())),
+            collisions: Arc::new(AtomicCell::new((*self.collisions.borrow()).clone())),
         }
     }
 }
@@ -118,10 +122,16 @@ impl rapier::EventHandler for &mut CollisionCache {
                     .push(a_ent);
             }
             rapier::CollisionEvent::Stopped(a, b, _) => {
-                let Some(a_ent) = colliders.get(a).map(|x| RapierUserData::entity(x.user_data)) else {
+                let Some(a_ent) = colliders
+                    .get(a)
+                    .map(|x| RapierUserData::entity(x.user_data))
+                else {
                     return;
                 };
-                let Some(b_ent) = colliders.get(b).map(|x| RapierUserData::entity(x.user_data)) else {
+                let Some(b_ent) = colliders
+                    .get(b)
+                    .map(|x| RapierUserData::entity(x.user_data))
+                else {
                     return;
                 };
 
@@ -155,7 +165,7 @@ impl_system_param! {
         entities: Res<'a, Entities>,
 
         /// The rapier context.
-        ctx: ResMut<'a, RapierContext>,
+        ctx: ResMutInit<'a, RapierContext>,
 
         /// Actors are things like players that move around and detect collisions, but don't collide
         /// with other actors.
@@ -179,22 +189,19 @@ impl_system_param! {
 }
 
 /// An actor in the physics simulation.
-#[derive(Default, Clone, Copy, Debug, Pod, Zeroable, TypeUlid)]
-#[ulid = "01GNF73PE03HFCE5MP8WC8ZKB6"]
+#[derive(Default, Clone, Copy, Debug, HasSchema)]
 #[repr(C)]
 pub struct Actor;
 
 /// A solid in the physics simulation.
-#[derive(Default, Clone, Copy, Debug, Pod, Zeroable, TypeUlid)]
-#[ulid = "01GNF73B5D1M7JYN0F65HMR2MW"]
+#[derive(Default, Clone, Copy, Debug, HasSchema)]
 #[repr(C)]
 pub struct Solid;
 
 /// A collider body in the physics simulation.
 ///
 /// This is used for actors and solids in the simulation, not for tiles.
-#[derive(Default, Clone, Debug, TypeUlid)]
-#[ulid = "01GNF72YMMDM831S0TGAR2SWZ9"]
+#[derive(Default, Clone, Debug, HasSchema)]
 #[repr(C)]
 pub struct Collider {
     // TODO: We used to have an offset here in the `Collider` struct, but I think maybe that should
@@ -214,12 +221,12 @@ pub struct Collider {
     pub seen_wood: bool,
     /// The handle to the Rapier rigid body associated to this collider, if one has been spawned as
     /// of yet.
+    #[schema(opaque)]
     pub rapier_handle: Option<rapier::RigidBodyHandle>,
 }
 
 /// Component added to tiles that have been given corresponding rapier colliders.
-#[derive(Default, Clone, Debug, TypeUlid, Deref, DerefMut)]
-#[ulid = "01GRYDJ1NVAA07RWSPGRJR6809"]
+#[derive(Default, Clone, Debug, HasSchema, Deref, DerefMut)]
 pub struct TileRapierHandle(pub rapier::RigidBodyHandle);
 
 /// Namespace struct for converting rapier collider user data to/from [`Entity`].
@@ -245,9 +252,9 @@ impl RapierUserData {
 }
 
 /// The kind of collision that a map tile has.
-#[derive(Default, PartialEq, Eq, Clone, Copy, Debug, TypeUlid, Serialize, Deserialize)]
-#[ulid = "01GNF746HB9N9GE9E2KG4X7X4K"]
+#[derive(Default, PartialEq, Eq, Clone, Copy, Debug, HasSchema, Serialize, Deserialize)]
 #[repr(u8)]
+#[derive_type_data(SchemaDeserialize)]
 pub enum TileCollisionKind {
     #[default]
     Empty,
@@ -255,8 +262,6 @@ pub enum TileCollisionKind {
     JumpThrough,
 }
 
-impl BonesBevyAssetLoad for TileCollisionKind {}
-
 impl<'a> CollisionWorld<'a> {
     /// Updates the collision world with the entity's actual transforms.
     ///
@@ -404,7 +409,7 @@ impl<'a> CollisionWorld<'a> {
     }
 
     /// Update the collision for the tile with the given layer index and map grid position.
-    pub fn update_tile(&mut self, layer_idx: usize, pos: UVec2) {
+    pub fn update_tile(&mut self, layer_idx: u32, pos: UVec2) {
         self.update_tiles_with_filter(|idx, p| layer_idx == idx && pos == p);
     }
 
@@ -413,7 +418,7 @@ impl<'a> CollisionWorld<'a> {
     /// The filter is a function that takes the layer index and the tile position as an argument.
     pub fn update_tiles_with_filter<F>(&mut self, mut filter: F)
     where
-        F: FnMut(usize, UVec2) -> bool,
+        F: FnMut(u32, UVec2) -> bool,
     {
         let RapierContext {
             rigid_body_set,
@@ -721,9 +726,9 @@ impl<'a> CollisionWorld<'a> {
                         let ent = RapierUserData::entity(rapier_collider.user_data);
 
                         let Some(tile_kind) = self.tile_collision_kinds.get(ent) else {
-                        // Ignore non-tile collisions
-                        return false;
-                    };
+                            // Ignore non-tile collisions
+                            return false;
+                        };
 
                         // Ignore jump-through tiles if we have already seen wood.
                         !(collider.seen_wood && *tile_kind == TileCollisionKind::JumpThrough)
diff --git a/core/src/physics/collisions/shape.rs b/src/core/physics/collisions/shape.rs
similarity index 94%
rename from core/src/physics/collisions/shape.rs
rename to src/core/physics/collisions/shape.rs
index bd16fc5728..343e45e3e9 100644
--- a/core/src/physics/collisions/shape.rs
+++ b/src/core/physics/collisions/shape.rs
@@ -1,10 +1,7 @@
-use ::bevy::utils::HashMap;
-
 use super::*;
 
 /// Resource that maps [`ColliderShape`]s to a rapier [`SharedShape`][rapier::SharedShape].
-#[derive(Clone, Deref, DerefMut, TypeUlid, Default)]
-#[ulid = "01GRVP9XNY2AA8D9FTSC51HE6E"]
+#[derive(Clone, Deref, DerefMut, HasSchema, Default)]
 pub struct ColliderShapeCache(HashMap<ColliderShape, rapier::SharedShape>);
 
 impl ColliderShapeCache {
@@ -14,7 +11,8 @@ impl ColliderShapeCache {
 }
 
 /// The Jumpy collision shape type.
-#[derive(Clone, Copy, Debug)]
+#[derive(Clone, Copy, Debug, HasSchema)]
+#[schema(opaque)]
 pub enum ColliderShape {
     Circle { diameter: f32 },
     Rectangle { size: Vec2 },
@@ -96,10 +94,15 @@ impl std::hash::Hash for ColliderShape {
 
 impl PartialOrd for ColliderShape {
     fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+        Some(self.cmp(other))
+    }
+}
+impl Ord for ColliderShape {
+    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
         use ordered_float::OrderedFloat as F;
         use std::cmp::Ordering::*;
 
-        Some(match self {
+        match self {
             ColliderShape::Circle { diameter: r1 } => match other {
                 ColliderShape::Circle { diameter: r2 } => F(*r1).cmp(&F(*r2)),
                 ColliderShape::Rectangle { .. } => Less,
@@ -115,11 +118,6 @@ impl PartialOrd for ColliderShape {
                 }
                 ColliderShape::Circle { .. } => Greater,
             },
-        })
-    }
-}
-impl Ord for ColliderShape {
-    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
-        self.partial_cmp(other).unwrap()
+        }
     }
 }
diff --git a/core/src/player.rs b/src/core/player.rs
similarity index 85%
rename from core/src/player.rs
rename to src/core/player.rs
index 72f0f7738e..8ac28e0a17 100644
--- a/core/src/player.rs
+++ b/src/core/player.rs
@@ -2,15 +2,9 @@
 
 use std::collections::VecDeque;
 
-use crate::{
-    item::ItemGrabbed,
-    physics::KinematicBody,
-    prelude::{player_spawner::PlayerSpawner, *},
-    random::GlobalRng,
-};
+use crate::prelude::*;
 
 mod state;
-use bones_lib::animation::AnimationBankSprite;
 pub use state::*;
 use turborand::GenCore;
 
@@ -21,8 +15,8 @@ const PLAYER_COLORS: [Color; 4] = [
     Color::rgb(1.0, 0.0, 1.0),
 ];
 
-pub fn install(session: &mut CoreSession) {
-    state::install(session);
+pub fn plugin(session: &mut Session) {
+    session.install_plugin(state::plugin);
 
     // Add other player systems
     session
@@ -37,19 +31,17 @@ pub fn install(session: &mut CoreSession) {
 }
 
 /// The player index, for example Player 1, Player 2, and so on.
-#[derive(Clone, TypeUlid, Deref, DerefMut)]
-#[ulid = "01GP49B2AMTYB6W8DWKBRF27FT"]
-pub struct PlayerIdx(pub usize);
+#[derive(Clone, HasSchema, Deref, DerefMut, Default)]
+pub struct PlayerIdx(pub u32);
 
 /// Contains the entities of the extra player layers, such as the player face and fin.
-#[derive(Clone, TypeUlid)]
-#[ulid = "01GQQRZ4V5WSRJTA1VTA816Z9T"]
+#[derive(Clone, HasSchema, Default)]
 pub struct PlayerLayers {
-    pub fin_anim: Key,
+    pub fin_anim: Ustr,
     pub fin_ent: Entity,
     pub fin_offset: Vec2,
     pub face_ent: Entity,
-    pub face_anim: Key,
+    pub face_anim: Ustr,
     pub hat_ent: Option<Entity>,
 }
 
@@ -60,8 +52,7 @@ impl PlayerLayers {
 }
 
 /// A component representing the current emote state of a player.
-#[derive(Clone, TypeUlid, Default)]
-#[ulid = "01GR4Q7MJF132EFY1RZZWECJK0"]
+#[derive(Clone, HasSchema, Default)]
 enum EmoteState {
     /// The player is not emoting
     #[default]
@@ -73,8 +64,7 @@ enum EmoteState {
 /// A component representing a region in which a player should emote in some way.
 ///
 /// For example, a lit grenade could have a
-#[derive(Debug, Clone, TypeUlid)]
-#[ulid = "01GR2QVYXRX5V689C4EMBDS3AQ"]
+#[derive(Debug, Clone, HasSchema)]
 pub struct EmoteRegion {
     /// The entity that owns this emote region.
     pub owner: Option<Entity>,
@@ -125,9 +115,9 @@ pub enum Emote {
 }
 
 impl Emote {
-    pub fn animation_key(&self) -> Key {
+    pub fn animation_key(&self) -> &str {
         match self {
-            Emote::Alarm => key!("emote_alarm"),
+            Emote::Alarm => "emote_alarm",
         }
     }
 }
@@ -135,8 +125,7 @@ impl Emote {
 /// Marker component indicating that a player has been killed.
 ///
 /// This usually means their death animation is playing, and they are about to be de-spawned.
-#[derive(Clone, TypeUlid)]
-#[ulid = "01GP49AK25A8S9G2GYNAVE4PTN"]
+#[derive(Clone, HasSchema, Default)]
 pub struct PlayerKilled {
     pub hit_from: Option<Vec2>,
 }
@@ -149,7 +138,7 @@ impl PlayerCommand {
     /// Kill a player.
     ///
     /// > **Note:** This doesn't despawn the player, it just puts the player into it's death animation.
-    pub fn kill(player: Entity, hit_from: Option<Vec2>) -> System {
+    pub fn kill(player: Entity, hit_from: Option<Vec2>) -> StaticSystem<(), ()> {
         (move |entities: Res<Entities>,
                mut players_killed: CompMut<PlayerKilled>,
                mut items_dropped: CompMut<ItemDropped>,
@@ -161,10 +150,10 @@ impl PlayerCommand {
             }
 
             let Some(idx) = player_indexes.get(player) else {
-                    // Not a player, just ignore it.
-                    warn!("Tried to kill non-player entity.");
-                    return;
-                };
+                // Not a player, just ignore it.
+                warn!("Tried to kill non-player entity.");
+                return;
+            };
 
             debug!("Killing player: {}", idx.0);
 
@@ -190,8 +179,8 @@ impl PlayerCommand {
     /// > player to enter the death animation.
     /// >
     /// > [`despawn`][Self::despawn] is usually sent at the end of the player death animation.
-    pub fn despawn(player: Entity) -> System {
-        (move |mut entities: ResMut<Entities>,
+    pub fn despawn(player: Entity) -> StaticSystem<(), ()> {
+        (move |mut entities: ResMutInit<Entities>,
                attachments: Comp<Attachment>,
                player_indexes: Comp<PlayerIdx>,
                player_layers: Comp<PlayerLayers>,
@@ -225,7 +214,7 @@ impl PlayerCommand {
         .system()
     }
     /// Set the player's inventory
-    pub fn set_inventory(player: Entity, item: Option<Entity>) -> System {
+    pub fn set_inventory(player: Entity, item: Option<Entity>) -> StaticSystem<(), ()> {
         (move |mut items_grabbed: CompMut<ItemGrabbed>,
                mut items_dropped: CompMut<ItemDropped>,
                mut inventories: CompMut<Inventory>| {
@@ -247,7 +236,7 @@ impl PlayerCommand {
         .system()
     }
     /// Have the player use the item they are carrying, if any.
-    pub fn use_item(player: Entity) -> System {
+    pub fn use_item(player: Entity) -> StaticSystem<(), ()> {
         (move |mut items_used: CompMut<ItemUsed>, inventories: CompMut<Inventory>| {
             // If the player has an item
             if let Some(item) = inventories.get(player).and_then(|x| x.0) {
@@ -259,8 +248,7 @@ impl PlayerCommand {
     }
 }
 
-#[derive(Clone, Debug, TypeUlid)]
-#[ulid = "01GQWND0P969BCZF5JET9MY944"]
+#[derive(Clone, Debug, HasSchema)]
 pub struct AiPlayer {
     /// Tick timer that is used for AI pausing logic.
     tick: Timer,
@@ -283,34 +271,29 @@ impl Default for AiPlayer {
     }
 }
 
-#[derive(Debug, TypeUlid, Clone)]
-#[ulid = "01GRA68NKYG6X7C5D0WNA5W1VX"]
+#[derive(Debug, HasSchema, Clone)]
+#[schema(no_default)]
 pub struct PathfindingDebugLines {
     pub entities: Vec<Entity>,
 }
 
 impl FromWorld for PathfindingDebugLines {
     fn from_world(world: &mut World) -> Self {
-        let entities = world
-            .run_initialized_system(
-                |mut entities: ResMut<Entities>, mut transforms: CompMut<Transform>| {
-                    let ents = (0..MAX_PLAYERS)
-                        .map(|_| {
-                            let ent = entities.create();
-
-                            transforms.insert(
-                                ent,
-                                Transform::from_translation(Vec3::new(0.0, 0.0, -1.0)),
-                            );
-
-                            ent
-                        })
-                        .collect::<Vec<_>>();
+        let entities = world.run_initialized_system(
+            |mut entities: ResMutInit<Entities>, mut transforms: CompMut<Transform>| {
+                (0..MAX_PLAYERS)
+                    .map(|_| {
+                        let ent = entities.create();
 
-                    Ok(ents)
-                },
-            )
-            .unwrap();
+                        transforms
+                            .insert(ent, Transform::from_translation(Vec3::new(0.0, 0.0, -1.0)));
+
+                        ent
+                    })
+                    .collect::<Vec<_>>()
+            },
+            (),
+        );
 
         Self { entities }
     }
@@ -318,16 +301,16 @@ impl FromWorld for PathfindingDebugLines {
 
 fn player_ai_system(
     entities: Res<Entities>,
-    nav_graph: ResMut<NavGraph>,
-    mut player_inputs: ResMut<PlayerInputs>,
+    nav_graph: ResMutInit<NavGraph>,
+    mut player_inputs: ResMutInit<MatchInputs>,
     mut ai_players: CompMut<AiPlayer>,
     player_indexes: Comp<PlayerIdx>,
     map: Res<LoadedMap>,
     transforms: Comp<Transform>,
-    pathfinding_debug_line: ResMut<PathfindingDebugLines>,
+    pathfinding_debug_line: ResMutInit<PathfindingDebugLines>,
     mut paths: CompMut<Path2d>,
     bodies: Comp<KinematicBody>,
-    debug_settings: Res<DebugSettings>,
+    debug_settings: ResInit<DebugSettings>,
     rng: Res<GlobalRng>,
     time: Res<Time>,
 ) {
@@ -389,7 +372,7 @@ fn player_ai_system(
         // Complete any previous movement instructions if we are in the middle of any
         if let Some(movement_buffer) = &mut ai_player.movement_buffer {
             if let Some(control) = movement_buffer.pop_front() {
-                player_inputs.players[player_idx.0].control = control;
+                player_inputs.players[player_idx.0 as usize].control = control;
                 if movement_buffer.is_empty() {
                     ai_player.movement_buffer = None;
                 }
@@ -408,14 +391,14 @@ fn player_ai_system(
         if let Some((_cost, path)) = path {
             if debug_settings.show_pathfinding_lines {
                 paths.insert(
-                    pathfinding_debug_line.entities[player_idx.0],
+                    pathfinding_debug_line.entities[player_idx.0 as usize],
                     Path2d {
                         points: path
                             .iter()
                             .map(|x| x.0.as_vec2() * map.tile_size + map.tile_size / 2.0)
                             .collect(),
                         thickness: 2.0,
-                        color: PLAYER_COLORS[player_idx.0],
+                        color: PLAYER_COLORS[player_idx.0 as usize],
                         ..default()
                     },
                 );
@@ -442,23 +425,25 @@ fn player_ai_system(
                     first_movement.move_direction.x = sign;
                 }
 
-                player_inputs.players[player_idx.0].control = first_movement;
+                player_inputs.players[player_idx.0 as usize].control = first_movement;
                 if !movement_buffer.is_empty() {
                     ai_player.movement_buffer = Some(movement_buffer)
                 }
             }
 
             if (target_pos - ai_pos).length() < SWORD_SWING_DIST {
-                player_inputs.players[player_idx.0]
+                player_inputs.players[player_idx.0 as usize]
                     .control
                     .shoot_just_pressed = true;
-                player_inputs.players[player_idx.0].control.shoot_pressed = true;
+                player_inputs.players[player_idx.0 as usize]
+                    .control
+                    .shoot_pressed = true;
             }
         } else if debug_settings.show_pathfinding_lines {
             let pos =
                 current_node.0.as_vec2() * map.tile_size + map.tile_size / 2.0 - vec2(0.0, 4.0);
             paths.insert(
-                pathfinding_debug_line.entities[player_idx.0],
+                pathfinding_debug_line.entities[player_idx.0 as usize],
                 Path2d {
                     points: vec![pos, pos + vec2(0.0, 4.0)],
                     thickness: 8.0,
@@ -469,7 +454,7 @@ fn player_ai_system(
         }
 
         if !debug_settings.show_pathfinding_lines {
-            paths.remove(pathfinding_debug_line.entities[player_idx.0]);
+            paths.remove(pathfinding_debug_line.entities[player_idx.0 as usize]);
         }
     }
 }
@@ -480,26 +465,23 @@ fn player_ai_system(
 ///
 /// TODO: This is probably temporary and will be removed when we have the proper tournament flow
 /// down.
-#[derive(Debug, Clone, TypeUlid, Default)]
-#[ulid = "01H3F91HNY3X2QXCGKGZDTXVAM"]
+#[derive(Debug, Clone, HasSchema, Default)]
 struct PlayersHaveSpawned {
     /// For each player, whether they have spawned before.
     pub players: [bool; MAX_PLAYERS],
 }
 
 /// Marker component for a player hat.
-#[derive(Debug, Clone, TypeUlid)]
-#[ulid = "01H3FDDXMSMVV8VMX1HRRFMXH0"]
+#[derive(Debug, Clone, HasSchema, Default)]
 struct Hat(Handle<HatMeta>);
 
 fn hydrate_players(
     mut commands: Commands,
-    mut entities: ResMut<Entities>,
-    game_meta: Res<CoreMetaArc>,
-    player_inputs: Res<PlayerInputs>,
+    mut entities: ResMutInit<Entities>,
+    game_meta: Root<GameMeta>,
+    player_inputs: Res<MatchInputs>,
     player_indexes: Comp<PlayerIdx>,
-    player_assets: BevyAssets<PlayerMeta>,
-    hat_assets: BevyAssets<HatMeta>,
+    assets: Res<AssetServer>,
     mut player_states: CompMut<PlayerState>,
     mut inventories: CompMut<Inventory>,
     mut animation_bank_sprites: CompMut<AnimationBankSprite>,
@@ -512,7 +494,7 @@ fn hydrate_players(
     mut ai_players: CompMut<AiPlayer>,
     mut invincibles: CompMut<Invincibility>,
     mut element_kill_callbacks: CompMut<ElementKillCallback>,
-    mut players_have_spawned: ResMut<PlayersHaveSpawned>,
+    mut players_have_spawned: ResMutInit<PlayersHaveSpawned>,
     mut item_grabs: CompMut<ItemGrab>,
     mut item_throws: CompMut<ItemThrow>,
     mut items: CompMut<Item>,
@@ -533,14 +515,14 @@ fn hydrate_players(
 
     for player_entity in entities.iter_with_bitset(&not_hydrated_bitset) {
         let player_idx = player_indexes.get(player_entity).unwrap();
-        let player_has_spawned = &mut players_have_spawned.players[player_idx.0];
-        let player_handle = &player_inputs.players[player_idx.0].selected_player;
-        let player_hat = &player_inputs.players[player_idx.0].selected_hat;
-        let is_ai = player_inputs.players[player_idx.0].is_ai;
+        let player_has_spawned = &mut players_have_spawned.players[player_idx.0 as usize];
+        let player_handle = player_inputs.players[player_idx.0 as usize].selected_player;
+        let player_hat = &player_inputs.players[player_idx.0 as usize].selected_hat;
+        let is_ai = player_inputs.players[player_idx.0 as usize]
+            .control_source
+            .is_none();
 
-        let Some(meta) = player_assets.get(&player_handle.get_bevy_handle()) else {
-            continue;
-        };
+        let meta = assets.get(player_handle);
 
         let animation_bank_sprite = AnimationBankSprite {
             current: "idle".try_into().unwrap(),
@@ -554,7 +536,7 @@ fn hydrate_players(
         inventories.insert(player_entity, default());
         invincibles.insert(
             player_entity,
-            Invincibility::new(game_meta.config.respawn_invincibility_time),
+            Invincibility::new(game_meta.core.config.respawn_invincibility_time),
         );
         element_kill_callbacks.insert(
             player_entity,
@@ -564,7 +546,7 @@ fn hydrate_players(
         atlas_sprites.insert(
             player_entity,
             AtlasSprite {
-                atlas: meta.layers.body.atlas.clone(),
+                atlas: meta.layers.body.atlas,
                 ..default()
             },
         );
@@ -591,7 +573,7 @@ fn hydrate_players(
         atlas_sprites.insert(
             fin_entity,
             AtlasSprite {
-                atlas: meta.layers.fin.atlas.clone(),
+                atlas: meta.layers.fin.atlas,
                 ..default()
             },
         );
@@ -619,7 +601,7 @@ fn hydrate_players(
         atlas_sprites.insert(
             face_entity,
             AtlasSprite {
-                atlas: meta.layers.face.atlas.clone(),
+                atlas: meta.layers.face.atlas,
                 ..default()
             },
         );
@@ -646,10 +628,10 @@ fn hydrate_players(
         let hat_ent = new_entities.next().unwrap();
         let hat_ent = if !*player_has_spawned {
             if let Some(hat_handle) = player_hat {
-                let hat_meta = hat_assets.get(&hat_handle.get_bevy_handle()).unwrap();
-                let atlas = hat_meta.atlas.clone();
+                let hat_meta = assets.get(*hat_handle);
+                let atlas = hat_meta.atlas;
                 let offset = hat_meta.offset.extend(PlayerLayers::HAT_Z_OFFSET);
-                hats.insert(hat_ent, Hat(hat_handle.clone()));
+                hats.insert(hat_ent, Hat(*hat_handle));
                 transforms.insert(hat_ent, default());
                 atlas_sprites.insert(hat_ent, AtlasSprite { atlas, ..default() });
                 player_body_attachments.insert(
@@ -679,7 +661,7 @@ fn hydrate_players(
                 item_grabs.insert(
                     hat_ent,
                     ItemGrab {
-                        fin_anim: key!("grab_2"),
+                        fin_anim: "grab_2".into(),
                         grab_offset: Vec2::ZERO,
                         sync_animation: false,
                     },
@@ -699,10 +681,10 @@ fn hydrate_players(
         player_layers.insert(
             player_entity,
             PlayerLayers {
-                fin_anim: key!("idle"),
+                fin_anim: "idle".into(),
                 fin_ent: fin_entity,
                 fin_offset: Vec2::ZERO,
-                face_anim: key!("idle"),
+                face_anim: "idle".into(),
                 face_ent: face_entity,
                 hat_ent,
             },
@@ -718,50 +700,46 @@ fn hydrate_players(
             // functionality here, and this is pretty hacky, but the AI as it stands is temporary
             // anyway, so it's fine for now.
             commands.add(
-                move |mut entities: ResMut<Entities>,
+                move |mut entities: ResMutInit<Entities>,
                       mut swords: CompMut<sword::Sword>,
                       mut element_handles: CompMut<ElementHandle>,
-                      element_assets: BevyAssets<ElementMeta>,
+                      assets: Res<AssetServer>,
                       mut hydrated: CompMut<MapElementHydrated>,
                       mut bodies: CompMut<KinematicBody>,
                       mut atlas_sprites: CompMut<AtlasSprite>,
                       mut items: CompMut<Item>,
                       mut transforms: CompMut<Transform>,
-                      game_meta: Res<CoreMetaArc>,
+                      game_meta: Root<GameMeta>,
                       mut attachments: CompMut<PlayerBodyAttachment>,
                       mut inventories: CompMut<Inventory>| {
                     let element_handle = game_meta
+                        .core
                         .map_elements
                         .iter()
                         .find(|handle| {
-                            matches!(
-                                element_assets
-                                    .get(&handle.get_bevy_handle())
-                                    .unwrap()
-                                    .builtin,
-                                BuiltinElementKind::Sword { .. }
-                            )
+                            assets
+                                .get(assets.get(**handle).data)
+                                .try_cast_ref::<SwordMeta>()
+                                .is_ok()
                         })
                         .unwrap();
-                    let element_meta = element_assets
-                        .get(&element_handle.get_bevy_handle())
-                        .unwrap();
-                    if let BuiltinElementKind::Sword {
+                    let element_meta = assets.get(*element_handle);
+                    if let Ok(SwordMeta {
                         atlas,
                         body_size,
                         can_rotate,
                         bounciness,
                         grab_offset,
                         ..
-                    } = &element_meta.builtin
+                    }) = assets.get(element_meta.data).try_cast_ref()
                     {
                         let sword_ent = entities.create();
                         inventories.insert(player_entity, Inventory(Some(sword_ent)));
                         items.insert(sword_ent, Item);
                         swords.insert(sword_ent, sword::Sword::default());
-                        atlas_sprites.insert(sword_ent, AtlasSprite::new(atlas.clone()));
+                        atlas_sprites.insert(sword_ent, AtlasSprite::new(*atlas));
                         transforms.insert(sword_ent, default());
-                        element_handles.insert(sword_ent, ElementHandle(element_handle.clone()));
+                        element_handles.insert(sword_ent, ElementHandle(*element_handle));
                         hydrated.insert(sword_ent, MapElementHydrated);
                         bodies.insert(
                             sword_ent,
@@ -771,7 +749,7 @@ fn hydrate_players(
                                 has_friction: true,
                                 can_rotate: *can_rotate,
                                 bounciness: *bounciness,
-                                gravity: game_meta.physics.gravity,
+                                gravity: game_meta.core.physics.gravity,
                                 ..default()
                             },
                         );
@@ -796,8 +774,8 @@ fn hydrate_players(
     }
 }
 
-fn player_kill_callback(player_entity: Entity) -> System {
-    (move |mut entities: ResMut<Entities>,
+fn player_kill_callback(player_entity: Entity) -> StaticSystem<(), ()> {
+    (move |mut entities: ResMutInit<Entities>,
            attachments: Comp<Attachment>,
            player_layers: Comp<PlayerLayers>| {
         entities
@@ -819,7 +797,7 @@ fn player_kill_callback(player_entity: Entity) -> System {
 
 /// System that makes sure the swords held by AI are despawned when they are killed.
 fn delete_dead_ai_swords(
-    mut entities: ResMut<Entities>,
+    mut entities: ResMutInit<Entities>,
     ai_players: Comp<AiPlayer>,
     items: Comp<Item>,
     dropped: Comp<ItemDropped>,
@@ -846,7 +824,7 @@ fn play_itemless_fin_animations(
     for (_, (player_layers, player_idx, animation_bank)) in
         entities.iter_with((&mut player_layers, &player_indexes, &animation_bank_sprites))
     {
-        let inventory = player_inventories[player_idx.0];
+        let inventory = player_inventories[player_idx.0 as usize];
 
         if inventory.is_none() {
             player_layers.fin_anim = animation_bank.current;
@@ -920,11 +898,11 @@ fn player_facial_animations(
         if let Some(new_emote) = triggered_emote {
             if let EmoteState::Emoting(already_emote) = emote_state {
                 if new_emote != *already_emote {
-                    player_layer.face_anim = new_emote.animation_key();
+                    player_layer.face_anim = new_emote.animation_key().into();
                     *emote_state = EmoteState::Emoting(new_emote);
                 }
             } else {
-                player_layer.face_anim = new_emote.animation_key();
+                player_layer.face_anim = new_emote.animation_key().into();
                 *emote_state = EmoteState::Emoting(new_emote);
             }
         } else {
@@ -938,18 +916,16 @@ fn player_facial_animations(
 /// the animations specified.
 fn update_player_layers(
     entities: Res<Entities>,
-    player_inputs: ResMut<PlayerInputs>,
+    player_inputs: ResMutInit<MatchInputs>,
     mut animation_bank_sprites: CompMut<AnimationBankSprite>,
     mut player_body_attachments: CompMut<PlayerBodyAttachment>,
     player_layers: Comp<PlayerLayers>,
     player_indexes: Comp<PlayerIdx>,
-    player_assets: BevyAssets<PlayerMeta>,
+    assets: Res<AssetServer>,
 ) {
     for (_ent, (layers, player_idx)) in entities.iter_with((&player_layers, &player_indexes)) {
-        let player_handle = &player_inputs.players[player_idx.0].selected_player;
-        let Some(player_meta) = player_assets.get(&player_handle.get_bevy_handle()) else {
-            continue;
-        };
+        let player_handle = player_inputs.players[player_idx.0 as usize].selected_player;
+        let player_meta = assets.get(player_handle);
 
         let face_bank = animation_bank_sprites.get_mut(layers.face_ent).unwrap();
         face_bank.current = layers.face_anim;
@@ -972,7 +948,7 @@ fn equip_hats(
     mut kinematic_bodies: CompMut<KinematicBody>,
     mut player_body_attachments: CompMut<PlayerBodyAttachment>,
     hats: Comp<Hat>,
-    hat_assets: BevyAssets<HatMeta>,
+    assets: Res<AssetServer>,
     player_inventories: PlayerInventories,
     mut player_layers: CompMut<PlayerLayers>,
     mut inventories: CompMut<Inventory>,
@@ -987,7 +963,7 @@ fn equip_hats(
                 items_used.remove(hat_ent).unwrap();
                 inventories.get_mut(inventory.player).unwrap().0 = None;
 
-                let hat_meta = hat_assets.get(&hat.0.get_bevy_handle()).unwrap();
+                let hat_meta = assets.get(hat.0);
                 kinematic_bodies.get_mut(hat_ent).unwrap().is_deactivated = true;
                 player_body_attachments.insert(
                     hat_ent,
diff --git a/core/src/player/state.rs b/src/core/player/state.rs
similarity index 77%
rename from core/src/player/state.rs
rename to src/core/player/state.rs
index 8d8923c9f3..1135266c2f 100644
--- a/core/src/player/state.rs
+++ b/src/core/player/state.rs
@@ -7,29 +7,28 @@ use states::*;
 mod states;
 
 /// The state of the player controller.
-#[derive(Clone, TypeUlid, Default)]
-#[ulid = "01GP4E4BH47RN41QS66QBD679Q"]
+#[derive(Clone, HasSchema, Default)]
 pub struct PlayerState {
     /// The ID for the current state.
-    pub current: Key,
+    pub current: Ustr,
     /// The number of frames that this state has been active.
     pub age: u64,
     /// The ID of the state that the player was in in the last frame.
-    pub last: Key,
+    pub last: Ustr,
 }
 impl PlayerState {
-    /// Adds a system to the appropriate stage in a [`CoreSession`] for a player state transition.
+    /// Adds a system to the appropriate stage in a [`Session`] for a player state transition.
     pub fn add_player_state_transition_system<Args>(
-        session: &mut CoreSession,
-        system: impl IntoSystem<Args, ()>,
+        session: &mut Session,
+        system: impl IntoSystem<Args, (), (), Sys = StaticSystem<(), ()>>,
     ) {
         session.stages.add_system_to_stage(PlayerStateStage, system);
     }
 
-    /// Adds a system to the appropriate stage in a [`CoreSession`] for a player state update.
+    /// Adds a system to the appropriate stage in a [`Session`] for a player state update.
     pub fn add_player_state_update_system<Args>(
-        session: &mut CoreSession,
-        system: impl IntoSystem<Args, ()>,
+        session: &mut Session,
+        system: impl IntoSystem<Args, (), (), Sys = StaticSystem<(), ()>>,
     ) {
         session
             .stages
@@ -37,7 +36,7 @@ impl PlayerState {
     }
 }
 
-pub fn install(session: &mut CoreSession) {
+pub fn plugin(session: &mut Session) {
     // Add the player state stage
     session
         .stages
@@ -62,16 +61,16 @@ fn update_player_state_age(entities: Res<Entities>, mut player_states: CompMut<P
     }
 }
 
-fn use_drop_or_grab_items_system(id: Key) -> System {
+fn use_drop_or_grab_items_system(id: Ustr) -> StaticSystem<(), ()> {
     (move |entities: Res<Entities>,
-           player_inputs: Res<PlayerInputs>,
+           player_inputs: Res<MatchInputs>,
            player_indexes: Comp<PlayerIdx>,
            player_states: Comp<PlayerState>,
-           player_assets: BevyAssets<PlayerMeta>,
+           assets: Res<AssetServer>,
            items: Comp<Item>,
            collision_world: CollisionWorld,
            mut inventories: CompMut<Inventory>,
-           mut audio_events: ResMut<AudioEvents>,
+           mut audio_events: ResMutInit<AudioEvents>,
            mut commands: Commands| {
         // Collect a list of items that are being held by players
         let held_items = entities
@@ -85,12 +84,10 @@ fn use_drop_or_grab_items_system(id: Key) -> System {
             if player_state.current != id {
                 continue;
             }
-            let meta_handle = player_inputs.players[player_idx.0]
-                .selected_player
-                .get_bevy_handle();
-            let Some(meta) = player_assets.get(&meta_handle) else { continue; };
+            let meta_handle = player_inputs.players[player_idx.0 as usize].selected_player;
+            let meta = assets.get(meta_handle);
 
-            let control = &player_inputs.players[player_idx.0].control;
+            let control = &player_inputs.players[player_idx.0 as usize].control;
             // If we are grabbing
             if control.grab_just_pressed {
                 if inventory.is_none() {
@@ -112,7 +109,7 @@ fn use_drop_or_grab_items_system(id: Key) -> System {
                         commands.add(PlayerCommand::set_inventory(player_ent, Some(*item)));
 
                         // Play grab sound
-                        audio_events.play(meta.sounds.grab.clone(), meta.sounds.grab_volume);
+                        audio_events.play(meta.sounds.grab, meta.sounds.grab_volume);
                     }
 
                 // If we are already carrying an item
@@ -121,7 +118,7 @@ fn use_drop_or_grab_items_system(id: Key) -> System {
                     commands.add(PlayerCommand::set_inventory(player_ent, None));
 
                     // Play drop sound
-                    audio_events.play(meta.sounds.drop.clone(), meta.sounds.drop_volume);
+                    audio_events.play(meta.sounds.drop, meta.sounds.drop_volume);
                 }
             }
 
diff --git a/core/src/player/state/stage.rs b/src/core/player/state/stage.rs
similarity index 81%
rename from core/src/player/state/stage.rs
rename to src/core/player/state/stage.rs
index f0b3a1f4ef..e6b0275e29 100644
--- a/core/src/player/state/stage.rs
+++ b/src/core/player/state/stage.rs
@@ -13,9 +13,9 @@ impl StageLabel for PlayerStateStage {
     }
 }
 
-#[derive(Debug, Default)]
+#[derive(Default)]
 pub struct PlayerStateStageImpl {
-    systems: Vec<System>,
+    systems: Vec<StaticSystem<(), ()>>,
 }
 
 impl PlayerStateStageImpl {
@@ -34,7 +34,7 @@ impl SystemStage for PlayerStateStageImpl {
     }
 
     fn name(&self) -> String {
-        format!("{self:?}")
+        "PlayerStateStage".into()
     }
 
     fn initialize(&mut self, world: &mut World) {
@@ -45,7 +45,7 @@ impl SystemStage for PlayerStateStageImpl {
         }
     }
 
-    fn run(&mut self, world: &mut World) -> SystemResult {
+    fn run(&mut self, world: &mut World) {
         trace!("Starting player state transitions");
         loop {
             // Get the current player states
@@ -53,22 +53,23 @@ impl SystemStage for PlayerStateStageImpl {
                 |entities: Res<Entities>,
                  player_indexes: Comp<PlayerIdx>,
                  player_states: Comp<PlayerState>| {
-                    let mut states = [None; MAX_PLAYERS];
+                    let mut states: [Option<Ustr>; MAX_PLAYERS] = std::array::from_fn(|_| None);
                     for (_ent, (idx, state)) in
                         entities.iter_with((&player_indexes, &player_states))
                     {
-                        states[idx.0] = Some(state.current);
+                        states[idx.0 as usize] = Some(state.current);
                     }
 
-                    Ok(states)
+                    states
                 },
-            )?;
+                (),
+            );
             trace!(?last_player_states, "Checcking current states");
 
             trace!("Running state transitions");
             // Run all of the player state systems
             for system in &mut self.systems {
-                system.run(world)?;
+                system.run(world, ());
             }
 
             // Get whether the states have changed
@@ -80,7 +81,7 @@ impl SystemStage for PlayerStateStageImpl {
                     for (_ent, (idx, state)) in
                         entities.iter_with((&player_indexes, &mut player_states))
                     {
-                        let old_state = last_player_states[idx.0].unwrap();
+                        let old_state = last_player_states[idx.0 as usize].unwrap();
 
                         if old_state != state.current {
                             state.last = old_state;
@@ -89,20 +90,21 @@ impl SystemStage for PlayerStateStageImpl {
                         }
                     }
 
-                    Ok(has_changed)
+                    has_changed
                 },
-            )?;
+                (),
+            );
 
             // If the states haven't changed
             if !has_changed {
                 trace!("No state changes, done with state transition loop");
                 // Then we are finished applying player state transitions
-                break Ok(());
+                break;
             }
         }
     }
 
-    fn add_system(&mut self, system: System) {
-        self.systems.push(system)
+    fn add_system(&mut self, system: StaticSystem<(), ()>) {
+        self.systems.push(system.system())
     }
 }
diff --git a/core/src/player/state/states.rs b/src/core/player/state/states.rs
similarity index 100%
rename from core/src/player/state/states.rs
rename to src/core/player/state/states.rs
diff --git a/core/src/player/state/states/crouch.rs b/src/core/player/state/states/crouch.rs
similarity index 70%
rename from core/src/player/state/states/crouch.rs
rename to src/core/player/state/states/crouch.rs
index 830b73c74e..c11ffc737a 100644
--- a/core/src/player/state/states/crouch.rs
+++ b/src/core/player/state/states/crouch.rs
@@ -1,19 +1,19 @@
 use super::*;
 
-pub const ID: Key = key!("core::crouch");
+pub static ID: Lazy<Ustr> = Lazy::new(|| ustr("core::crouch"));
 
-pub fn install(session: &mut CoreSession) {
+pub fn install(session: &mut Session) {
     PlayerState::add_player_state_transition_system(session, player_state_transition);
     PlayerState::add_player_state_update_system(session, handle_player_state);
-    PlayerState::add_player_state_update_system(session, use_drop_or_grab_items_system(ID));
+    PlayerState::add_player_state_update_system(session, use_drop_or_grab_items_system(*ID));
 }
 
 pub fn player_state_transition(
     entities: Res<Entities>,
-    player_inputs: Res<PlayerInputs>,
+    player_inputs: Res<MatchInputs>,
     player_indexes: Comp<PlayerIdx>,
     mut player_states: CompMut<PlayerState>,
-    player_assets: BevyAssets<PlayerMeta>,
+    assets: Res<AssetServer>,
     mut bodies: CompMut<KinematicBody>,
     mut transforms: CompMut<Transform>,
 ) {
@@ -23,15 +23,11 @@ pub fn player_state_transition(
         &mut bodies,
         &mut transforms,
     )) {
-        let meta_handle = player_inputs.players[player_idx.0]
-            .selected_player
-            .get_bevy_handle();
-        let Some(meta) = player_assets.get(&meta_handle) else {
-            continue;
-        };
+        let meta_handle = player_inputs.players[player_idx.0 as usize].selected_player;
+        let meta = assets.get(meta_handle);
 
         // Reset the body size and position if we stop sliding
-        if state.last == ID && state.current != ID {
+        if state.last == *ID && state.current != *ID {
             if let ColliderShape::Rectangle { size } = &body.shape {
                 if *size != meta.body_size {
                     body.shape = ColliderShape::Rectangle {
@@ -42,25 +38,25 @@ pub fn player_state_transition(
             }
         }
 
-        if state.current != ID {
+        if state.current != *ID {
             continue;
         }
-        let control = &player_inputs.players[player_idx.0].control;
+        let control = &player_inputs.players[player_idx.0 as usize].control;
 
         if !body.is_on_ground || control.move_direction.y > -0.5 {
-            state.current = idle::ID;
+            state.current = *idle::ID;
         }
     }
 }
 
 pub fn handle_player_state(
     entities: Res<Entities>,
-    player_inputs: Res<PlayerInputs>,
+    player_inputs: Res<MatchInputs>,
     player_states: Comp<PlayerState>,
     player_indexes: Comp<PlayerIdx>,
     mut animations: CompMut<AnimationBankSprite>,
     mut bodies: CompMut<KinematicBody>,
-    player_assets: BevyAssets<PlayerMeta>,
+    assets: Res<AssetServer>,
     mut transforms: CompMut<Transform>,
 ) {
     for (_player_ent, (state, player_idx, animation, body, transform)) in entities.iter_with((
@@ -70,18 +66,14 @@ pub fn handle_player_state(
         &mut bodies,
         &mut transforms,
     )) {
-        if state.current != ID {
+        if state.current != *ID {
             continue;
         }
-        let meta_handle = player_inputs.players[player_idx.0]
-            .selected_player
-            .get_bevy_handle();
-        let Some(meta) = player_assets.get(&meta_handle) else {
-            continue;
-        };
+        let meta_handle = player_inputs.players[player_idx.0 as usize].selected_player;
+        let meta = assets.get(meta_handle);
 
         if body.velocity.x == 0.0 {
-            animation.current = key!("crouch");
+            animation.current = "crouch".into();
             if let ColliderShape::Rectangle { size } = &body.shape {
                 if *size != meta.body_size {
                     body.shape = ColliderShape::Rectangle {
@@ -91,7 +83,7 @@ pub fn handle_player_state(
                 }
             }
         } else if let ColliderShape::Rectangle { size } = &body.shape {
-            animation.current = key!("slide");
+            animation.current = "slide".into();
 
             if *size != meta.slide_body_size {
                 body.shape = ColliderShape::Rectangle {
@@ -101,7 +93,7 @@ pub fn handle_player_state(
             }
         }
 
-        let control = &player_inputs.players[player_idx.0].control;
+        let control = &player_inputs.players[player_idx.0 as usize].control;
 
         if control.jump_just_pressed {
             body.fall_through = true;
diff --git a/core/src/player/state/states/dead.rs b/src/core/player/state/states/dead.rs
similarity index 89%
rename from core/src/player/state/states/dead.rs
rename to src/core/player/state/states/dead.rs
index ccd8f6eb82..97c7365922 100644
--- a/core/src/player/state/states/dead.rs
+++ b/src/core/player/state/states/dead.rs
@@ -1,8 +1,8 @@
 use super::*;
 
-pub const ID: Key = key!("core::dead");
+pub static ID: Lazy<Ustr> = Lazy::new(|| ustr("core::dead"));
 
-pub fn install(session: &mut CoreSession) {
+pub fn install(session: &mut Session) {
     PlayerState::add_player_state_transition_system(session, player_state_transition);
     PlayerState::add_player_state_update_system(session, handle_player_state);
 }
@@ -13,7 +13,7 @@ pub fn player_state_transition(
     mut player_states: CompMut<PlayerState>,
 ) {
     for (_ent, (state, _killed)) in entities.iter_with((&mut player_states, &killed_players)) {
-        state.current = ID;
+        state.current = *ID;
     }
 }
 
@@ -32,7 +32,7 @@ pub fn handle_player_state(
     for (player_ent, (state, animation, killed_player)) in
         entities.iter_with((&player_states, &mut animations, &killed_players))
     {
-        if state.current != ID {
+        if state.current != *ID {
             continue;
         };
 
@@ -55,9 +55,9 @@ pub fn handle_player_state(
                         (player_on_right && is_hit_right) || (!player_on_right && !is_hit_right)
                     } =>
                 {
-                    key!("death_spine")
+                    "death_spine".into()
                 }
-                _ => key!("death_belly"),
+                _ => "death_belly".into(),
             };
         }
 
diff --git a/core/src/player/state/states/default.rs b/src/core/player/state/states/default.rs
similarity index 74%
rename from core/src/player/state/states/default.rs
rename to src/core/player/state/states/default.rs
index 09f3e1c948..afd14b52f4 100644
--- a/core/src/player/state/states/default.rs
+++ b/src/core/player/state/states/default.rs
@@ -1,14 +1,14 @@
 use super::*;
 
-pub fn install(session: &mut CoreSession) {
+pub fn install(session: &mut Session) {
     PlayerState::add_player_state_transition_system(session, player_state_transition);
 }
 
 pub fn player_state_transition(entities: Res<Entities>, mut player_states: CompMut<PlayerState>) {
     for (_ent, state) in entities.iter_with(&mut player_states) {
         // If the current state is the default, meaningless state
-        if state.current == default() {
-            state.current = idle::ID;
+        if state.current.is_empty() {
+            state.current = *idle::ID;
         }
     }
 }
diff --git a/core/src/player/state/states/idle.rs b/src/core/player/state/states/idle.rs
similarity index 69%
rename from core/src/player/state/states/idle.rs
rename to src/core/player/state/states/idle.rs
index 992e933edd..d2f2713d5a 100644
--- a/core/src/player/state/states/idle.rs
+++ b/src/core/player/state/states/idle.rs
@@ -1,17 +1,16 @@
 use super::*;
-use crate::player::slippery::Slippery;
 
-pub const ID: Key = key!("core::idle");
+pub static ID: Lazy<Ustr> = Lazy::new(|| ustr("core::idle"));
 
-pub fn install(session: &mut CoreSession) {
+pub fn install(session: &mut Session) {
     PlayerState::add_player_state_transition_system(session, player_state_transition);
     PlayerState::add_player_state_update_system(session, handle_player_state);
-    PlayerState::add_player_state_update_system(session, use_drop_or_grab_items_system(ID));
+    PlayerState::add_player_state_update_system(session, use_drop_or_grab_items_system(*ID));
 }
 
 pub fn player_state_transition(
     entities: Res<Entities>,
-    player_inputs: Res<PlayerInputs>,
+    player_inputs: Res<MatchInputs>,
     player_indexes: Comp<PlayerIdx>,
     mut player_states: CompMut<PlayerState>,
     bodies: Comp<KinematicBody>,
@@ -19,58 +18,54 @@ pub fn player_state_transition(
     for (_ent, (player_idx, player_state, body)) in
         entities.iter_with((&player_indexes, &mut player_states, &bodies))
     {
-        if player_state.current != ID {
+        if player_state.current != *ID {
             continue;
         }
 
-        let control = &player_inputs.players[player_idx.0].control;
+        let control = &player_inputs.players[player_idx.0 as usize].control;
 
         if !body.is_on_ground {
-            player_state.current = midair::ID;
+            player_state.current = *midair::ID;
         } else if control.move_direction.y < -0.5 {
-            player_state.current = crouch::ID;
+            player_state.current = *crouch::ID;
         } else if control.move_direction.x != 0.0 {
-            player_state.current = walk::ID;
+            player_state.current = *walk::ID;
         }
     }
 }
 
 pub fn handle_player_state(
     entities: Res<Entities>,
-    player_inputs: Res<PlayerInputs>,
+    player_inputs: Res<MatchInputs>,
     player_indexes: Comp<PlayerIdx>,
     player_states: Comp<PlayerState>,
-    player_assets: BevyAssets<PlayerMeta>,
+    assets: Res<AssetServer>,
     mut sprites: CompMut<AnimationBankSprite>,
     mut bodies: CompMut<KinematicBody>,
-    mut audio_events: ResMut<AudioEvents>,
+    mut audio_events: ResMutInit<AudioEvents>,
     collision_world: CollisionWorld,
     slippery: CompMut<Slippery>,
 ) {
     let players = entities.iter_with((&player_states, &player_indexes, &mut sprites, &mut bodies));
     for (player_ent, (player_state, player_idx, animation, body)) in players {
-        if player_state.current != ID {
+        if player_state.current != *ID {
             continue;
         }
-        let meta_handle = player_inputs.players[player_idx.0]
-            .selected_player
-            .get_bevy_handle();
-        let Some(meta) = player_assets.get(&meta_handle) else {
-            continue;
-        };
+        let meta_handle = player_inputs.players[player_idx.0 as usize].selected_player;
+        let meta = assets.get(meta_handle);
 
         // If this is the first frame of this state
         if player_state.age == 0 {
             // set our animation to idle
-            animation.current = key!("idle");
+            animation.current = "idle".into();
         }
 
-        let control = &player_inputs.players[player_idx.0].control;
+        let control = &player_inputs.players[player_idx.0 as usize].control;
 
         // If we are jumping
         if control.jump_just_pressed {
             // Play jump sound
-            audio_events.play(meta.sounds.jump.clone(), meta.sounds.jump_volume);
+            audio_events.play(meta.sounds.jump, meta.sounds.jump_volume);
 
             // Move up
             body.velocity.y = meta.stats.jump_speed;
diff --git a/core/src/player/state/states/incapacitated.rs b/src/core/player/state/states/incapacitated.rs
similarity index 70%
rename from core/src/player/state/states/incapacitated.rs
rename to src/core/player/state/states/incapacitated.rs
index de0d2166e4..93d709a11f 100644
--- a/core/src/player/state/states/incapacitated.rs
+++ b/src/core/player/state/states/incapacitated.rs
@@ -1,8 +1,8 @@
 use super::*;
 
-pub const ID: Key = key!("core::incapacitated");
+pub static ID: Lazy<Ustr> = Lazy::new(|| ustr("core::incapacitated"));
 
-pub fn install(session: &mut CoreSession) {
+pub fn install(session: &mut Session) {
     PlayerState::add_player_state_update_system(session, handle_player_state);
 }
 
@@ -12,8 +12,8 @@ pub fn handle_player_state(
     entities: Res<Entities>,
     mut player_states: CompMut<PlayerState>,
     player_indexes: Comp<PlayerIdx>,
-    player_assets: BevyAssets<PlayerMeta>,
-    player_inputs: Res<PlayerInputs>,
+    assets: Res<AssetServer>,
+    player_inputs: Res<MatchInputs>,
     atlas_sprites: Comp<AtlasSprite>,
     mut animations: CompMut<AnimationBankSprite>,
     mut bodies: CompMut<KinematicBody>,
@@ -25,21 +25,17 @@ pub fn handle_player_state(
         &player_indexes,
         &atlas_sprites,
     )) {
-        if state.current != ID {
+        if state.current != *ID {
             continue;
         };
 
-        let meta_handle = player_inputs.players[player_idx.0]
-            .selected_player
-            .get_bevy_handle();
-        let Some(meta) = player_assets.get(&meta_handle) else {
-            continue;
-        };
+        let meta_handle = player_inputs.players[player_idx.0 as usize].selected_player;
+        let meta = assets.get(meta_handle);
 
         match state.age {
             0 => {
                 // TODO find right animation
-                animation.current = key!("rise");
+                animation.current = "rise".into();
                 PlayerCommand::set_inventory(player_ent, None);
 
                 if body.velocity.x.abs() < meta.stats.walk_speed {
@@ -54,8 +50,8 @@ pub fn handle_player_state(
                 }
             }
             n if n >= 80 => {
-                state.current = idle::ID;
-                animation.current = key!("idle");
+                state.current = *idle::ID;
+                animation.current = ustr("idle");
             }
             _ => (),
         }
diff --git a/core/src/player/state/states/midair.rs b/src/core/player/state/states/midair.rs
similarity index 68%
rename from core/src/player/state/states/midair.rs
rename to src/core/player/state/states/midair.rs
index d1c529cce9..d7d5e2fde4 100644
--- a/core/src/player/state/states/midair.rs
+++ b/src/core/player/state/states/midair.rs
@@ -1,50 +1,46 @@
 use super::*;
 
-pub const ID: Key = key!("core::midair");
+pub static ID: Lazy<Ustr> = Lazy::new(|| ustr("core::midair"));
 
-pub fn install(session: &mut CoreSession) {
+pub fn install(session: &mut Session) {
     PlayerState::add_player_state_transition_system(session, player_state_transition);
     PlayerState::add_player_state_update_system(session, handle_player_state);
-    PlayerState::add_player_state_update_system(session, use_drop_or_grab_items_system(ID));
+    PlayerState::add_player_state_update_system(session, use_drop_or_grab_items_system(*ID));
 }
 
 pub fn player_state_transition(
     entities: Res<Entities>,
-    player_inputs: Res<PlayerInputs>,
+    player_inputs: Res<MatchInputs>,
     player_indexes: Comp<PlayerIdx>,
-    player_assets: BevyAssets<PlayerMeta>,
+    assets: Res<AssetServer>,
     mut player_states: CompMut<PlayerState>,
     bodies: Comp<KinematicBody>,
-    mut audio_events: ResMut<AudioEvents>,
+    mut audio_events: ResMutInit<AudioEvents>,
 ) {
     for (_ent, (player_idx, player_state, body)) in
         entities.iter_with((&player_indexes, &mut player_states, &bodies))
     {
-        let meta_handle = player_inputs.players[player_idx.0]
-            .selected_player
-            .get_bevy_handle();
-        let Some(meta) = player_assets.get(&meta_handle) else {
-            continue;
-        };
-        if player_state.current != ID {
+        let meta_handle = player_inputs.players[player_idx.0 as usize].selected_player;
+        let meta = assets.get(meta_handle);
+        if player_state.current != *ID {
             continue;
         }
 
         if body.is_on_ground {
             // Play land sound
-            audio_events.play(meta.sounds.land.clone(), meta.sounds.land_volume);
+            audio_events.play(meta.sounds.land, meta.sounds.land_volume);
             // Switch to idle state
-            player_state.current = idle::ID;
+            player_state.current = *idle::ID;
         }
     }
 }
 
 pub fn handle_player_state(
     entities: Res<Entities>,
-    player_inputs: Res<PlayerInputs>,
+    player_inputs: Res<MatchInputs>,
     player_indexes: Comp<PlayerIdx>,
     player_states: Comp<PlayerState>,
-    player_assets: BevyAssets<PlayerMeta>,
+    assets: Res<AssetServer>,
     mut sprites: CompMut<AtlasSprite>,
     mut animations: CompMut<AnimationBankSprite>,
     mut bodies: CompMut<KinematicBody>,
@@ -57,21 +53,17 @@ pub fn handle_player_state(
         &mut bodies,
     ));
     for (_player_ent, (player_state, player_idx, animation, sprite, body)) in players {
-        if player_state.current != ID {
+        if player_state.current != *ID {
             continue;
         }
-        let meta_handle = player_inputs.players[player_idx.0]
-            .selected_player
-            .get_bevy_handle();
-        let Some(meta) = player_assets.get(&meta_handle) else {
-            continue;
-        };
-        let control = &player_inputs.players[player_idx.0].control;
+        let meta_handle = player_inputs.players[player_idx.0 as usize].selected_player;
+        let meta = assets.get(meta_handle);
+        let control = &player_inputs.players[player_idx.0 as usize].control;
 
         if body.velocity.y > 0.0 {
-            animation.current = key!("rise");
+            animation.current = "rise".into();
         } else {
-            animation.current = key!("fall");
+            animation.current = "fall".into();
         }
 
         // Limit fall speed if holding jump button
diff --git a/core/src/player/state/states/walk.rs b/src/core/player/state/states/walk.rs
similarity index 70%
rename from core/src/player/state/states/walk.rs
rename to src/core/player/state/states/walk.rs
index 90bfec0230..3f9be72f94 100644
--- a/core/src/player/state/states/walk.rs
+++ b/src/core/player/state/states/walk.rs
@@ -1,16 +1,16 @@
 use super::*;
 
-pub const ID: Key = key!("core::walk");
+pub static ID: Lazy<Ustr> = Lazy::new(|| ustr("core::walk"));
 
-pub fn install(session: &mut CoreSession) {
+pub fn install(session: &mut Session) {
     PlayerState::add_player_state_transition_system(session, player_state_transition);
     PlayerState::add_player_state_update_system(session, handle_player_state);
-    PlayerState::add_player_state_update_system(session, use_drop_or_grab_items_system(ID));
+    PlayerState::add_player_state_update_system(session, use_drop_or_grab_items_system(*ID));
 }
 
 pub fn player_state_transition(
     entities: Res<Entities>,
-    player_inputs: Res<PlayerInputs>,
+    player_inputs: Res<MatchInputs>,
     player_indexes: Comp<PlayerIdx>,
     mut player_states: CompMut<PlayerState>,
     bodies: Comp<KinematicBody>,
@@ -18,32 +18,32 @@ pub fn player_state_transition(
     for (_ent, (player_idx, player_state, body)) in
         entities.iter_with((&player_indexes, &mut player_states, &bodies))
     {
-        if player_state.current != ID {
+        if player_state.current != *ID {
             continue;
         }
 
-        let control = &player_inputs.players[player_idx.0].control;
+        let control = &player_inputs.players[player_idx.0 as usize].control;
 
         if !body.is_on_ground {
-            player_state.current = midair::ID;
+            player_state.current = *midair::ID;
         } else if control.move_direction.y < -0.5 {
-            player_state.current = crouch::ID;
+            player_state.current = *crouch::ID;
         } else if control.move_direction.x == 0.0 {
-            player_state.current = idle::ID;
+            player_state.current = *idle::ID;
         }
     }
 }
 
 pub fn handle_player_state(
     entities: Res<Entities>,
-    player_inputs: Res<PlayerInputs>,
+    player_inputs: Res<MatchInputs>,
     player_indexes: Comp<PlayerIdx>,
     player_states: Comp<PlayerState>,
-    player_assets: BevyAssets<PlayerMeta>,
+    assets: Res<AssetServer>,
     mut sprites: CompMut<AtlasSprite>,
     mut animations: CompMut<AnimationBankSprite>,
     mut bodies: CompMut<KinematicBody>,
-    mut audio_events: ResMut<AudioEvents>,
+    mut audio_events: ResMutInit<AudioEvents>,
 ) {
     let players = entities.iter_with((
         &player_states,
@@ -53,26 +53,22 @@ pub fn handle_player_state(
         &mut bodies,
     ));
     for (_player_ent, (player_state, player_idx, animation, sprite, body)) in players {
-        if player_state.current != ID {
+        if player_state.current != *ID {
             continue;
         }
-        let meta_handle = player_inputs.players[player_idx.0]
-            .selected_player
-            .get_bevy_handle();
-        let Some(meta) = player_assets.get(&meta_handle) else {
-            continue;
-        };
-        let control = &player_inputs.players[player_idx.0].control;
+        let meta_handle = player_inputs.players[player_idx.0 as usize].selected_player;
+        let meta = assets.get(meta_handle);
+        let control = &player_inputs.players[player_idx.0 as usize].control;
 
         // If this is the first frame of this state
         if player_state.age == 0 {
             // set our animation
-            animation.current = key!("walk");
+            animation.current = "walk".into();
         }
 
         // If we are jumping
         if control.jump_just_pressed {
-            audio_events.play(meta.sounds.jump.clone(), meta.sounds.jump_volume);
+            audio_events.play(meta.sounds.jump, meta.sounds.jump_volume);
 
             // Move up
             body.velocity.y = meta.stats.jump_speed;
diff --git a/core/src/random.rs b/src/core/random.rs
similarity index 76%
rename from core/src/random.rs
rename to src/core/random.rs
index e5c35006ae..dc3dcfa9dc 100644
--- a/core/src/random.rs
+++ b/src/core/random.rs
@@ -1,17 +1,18 @@
 //! Global, deterministic random resource.
 
 use crate::prelude::*;
+
+use bones_framework::prelude::HasSchema;
 pub use turborand::prelude::*;
 
-pub fn install(session: &mut CoreSession) {
+pub fn plugin(session: &mut Session) {
     session.world.init_resource::<GlobalRng>();
 }
 
 /// Resource that can produce deterministic, pseudo-random numbers.
 ///
 /// Access in a system with [`Res<GlobalRng>`].
-#[derive(Clone, TypeUlid, Deref, DerefMut)]
-#[ulid = "01GQ0K6DDA9KKQTM3WDK1R91TE"]
+#[derive(Clone, HasSchema, Deref, DerefMut)]
 pub struct GlobalRng(AtomicRng);
 
 impl Default for GlobalRng {
diff --git a/core/src/utils.rs b/src/core/utils.rs
similarity index 100%
rename from core/src/utils.rs
rename to src/core/utils.rs
diff --git a/core/src/utils/easing.rs b/src/core/utils/easing.rs
similarity index 100%
rename from core/src/utils/easing.rs
rename to src/core/utils/easing.rs
diff --git a/core/src/utils/macros.rs b/src/core/utils/macros.rs
similarity index 90%
rename from core/src/utils/macros.rs
rename to src/core/utils/macros.rs
index c7f7997beb..8373c199bd 100644
--- a/core/src/utils/macros.rs
+++ b/src/core/utils/macros.rs
@@ -41,7 +41,7 @@ macro_rules! impl_system_param {
                 )
             }
 
-            fn borrow(state: &mut Self::State) -> Self::Param<'_> {
+            fn borrow<'s>(world: &'s World, state: &'s mut Self::State) -> Self::Param<'s> {
                 let (
                     $(
                         $f_name
@@ -53,7 +53,7 @@ macro_rules! impl_system_param {
                     ),*
                 ) = (
                     $(
-                        <$f_ty as SystemParam>::borrow($f_name)
+                        <$f_ty as SystemParam>::borrow(world, $f_name)
                     ),*
                 );
 
diff --git a/core/src/utils/math.rs b/src/core/utils/math.rs
similarity index 100%
rename from core/src/utils/math.rs
rename to src/core/utils/math.rs
diff --git a/core/src/utils/rect.rs b/src/core/utils/rect.rs
similarity index 97%
rename from core/src/utils/rect.rs
rename to src/core/utils/rect.rs
index cb1a09a3a4..7f45e36177 100644
--- a/core/src/utils/rect.rs
+++ b/src/core/utils/rect.rs
@@ -1,6 +1,6 @@
 use crate::prelude::*;
 
-#[derive(Debug, Copy, Clone, Pod, Zeroable, Default)]
+#[derive(Debug, Copy, Clone, Default)]
 #[repr(C)]
 pub struct Rect {
     pub min: Vec2,
diff --git a/src/debug.rs b/src/debug.rs
deleted file mode 100644
index d815eebf6c..0000000000
--- a/src/debug.rs
+++ /dev/null
@@ -1,58 +0,0 @@
-//! Debugging tools.
-//!
-//! Sets up the Bevy world inspector, and the puffin profiler.
-//!
-//! More debug related ui code can be found in [`ui::debug_tools`].
-
-use crate::prelude::*;
-use bevy::window::PrimaryWindow;
-use bevy_egui::EguiContext;
-use bevy_inspector_egui::{bevy_inspector, inspector_egui_impls};
-
-/// Debug plugin.
-pub struct JumpyDebugPlugin;
-
-/// Resource that tracks whether or not the world inspector window is visible.
-#[derive(Resource, Deref, DerefMut, Default)]
-pub struct WorldInspectorEnabled(pub bool);
-
-impl Plugin for JumpyDebugPlugin {
-    fn build(&self, app: &mut App) {
-        app.init_resource::<WorldInspectorEnabled>()
-            .add_system(world_inspector)
-            .add_system(
-                (|| {
-                    profiling::mark_new_frame();
-                })
-                .in_base_set(CoreSet::Last),
-            );
-
-        let type_registry = app.world.resource::<bevy::app::AppTypeRegistry>();
-        let mut type_registry = type_registry.write();
-
-        inspector_egui_impls::register_std_impls(&mut type_registry);
-        inspector_egui_impls::register_glam_impls(&mut type_registry);
-        inspector_egui_impls::register_bevy_impls(&mut type_registry);
-    }
-}
-
-/// Renders the world-inspector UI.
-pub fn world_inspector(world: &mut World) {
-    if !**world.resource::<WorldInspectorEnabled>() {
-        return;
-    }
-
-    let mut egui_context = world
-        .query_filtered::<&mut EguiContext, With<PrimaryWindow>>()
-        .single(world)
-        .clone();
-
-    egui::Window::new("World Inspector")
-        .default_size(egui::vec2(400.0, 400.0))
-        .show(egui_context.get_mut(), |ui| {
-            egui::ScrollArea::vertical().show(ui, |ui| {
-                bevy_inspector::ui_for_world(world, ui);
-                ui.allocate_space(ui.available_size());
-            });
-        });
-}
diff --git a/src/input.rs b/src/input.rs
index 660de16258..fd239f82f5 100644
--- a/src/input.rs
+++ b/src/input.rs
@@ -1,32 +1,362 @@
-//! Player input types.
-//!
-//! We use the [`leafwing-input-manager`] plugin for collecting user input in Jumpy. This crate
-//! installs the input manager plugin and registers the [`PlayerAction`] type as the collectible
-//! player input.
-//!
-//! [`leafwing-input-manager`]: https://docs.rs/leafwing-input-manager
-
-use crate::prelude::*;
-
-/// Input plugin.
-pub struct JumpyPlayerInputPlugin;
-
-impl Plugin for JumpyPlayerInputPlugin {
-    fn build(&self, app: &mut App) {
-        app.add_plugin(InputManagerPlugin::<PlayerAction>::default());
+use crate::{
+    prelude::*,
+    settings::{InputKind, PlayerControlMapping, PlayerControlSetting, Settings},
+};
+
+pub fn game_plugin(game: &mut Game) {
+    game.systems.add_startup_system(load_controler_mapping);
+    game.insert_shared_resource(EguiInputHook::new(handle_egui_input));
+    game.init_shared_resource::<GlobalPlayerControls>();
+    game.init_shared_resource::<PlayerInputCollector>();
+}
+
+// Startup system to load game control mapping resource from the storage and insert the player input
+// collector.
+fn load_controler_mapping(game: &mut Game) {
+    let control_mapping = {
+        let storage = game.shared_resource::<Storage>().unwrap();
+        storage.get::<Settings>().unwrap().player_controls.clone()
+    };
+    game.insert_shared_resource(control_mapping);
+}
+
+fn collect_player_controls(game: &mut Game) {
+    let controls = 'controls: {
+        let mut collector = game.shared_resource_mut::<PlayerInputCollector>().unwrap();
+        let Some(mapping) = game.shared_resource::<PlayerControlMapping>() else {
+            break 'controls default();
+        };
+        let keyboard = game.shared_resource::<KeyboardInputs>().unwrap();
+        let gamepad = game.shared_resource::<GamepadInputs>().unwrap();
+        collector.update(&mapping, &keyboard, &gamepad);
+        GlobalPlayerControls(collector.get().clone().into_iter().collect())
+    };
+    game.insert_shared_resource(controls);
+}
+
+/// Settings to configure the [`handle_egui_input`] system
+#[derive(Default, Debug, Clone, Copy)]
+pub struct EguiInputSettings {
+    /// If set to `true`, then all keyboard inputs will be sucked into a black hole so that egui
+    /// doesn't read them.
+    pub disable_keyboard_input: bool,
+    /// If set to `true`, gamepad inputs will not be converted to egui inputs for menu navigation.
+    pub disable_gamepad_input: bool,
+}
+
+/// Game system that takes the raw input events and converts it to player controls based on the
+/// player input map.
+pub fn handle_egui_input(game: &mut Game, egui_input: &mut egui::RawInput) {
+    // We collect the global player controls here in the egui input hoook so that it will be
+    // available immediately to egui, and then available to the rest of the systems that run after.
+    collect_player_controls(game);
+
+    let ctx = game.shared_resource::<EguiCtx>().unwrap();
+    let controls = game.shared_resource::<GlobalPlayerControls>().unwrap();
+
+    let settings = ctx.get_state::<EguiInputSettings>();
+    let events = &mut egui_input.events;
+
+    // Remove keyboard events if disabled.
+    if settings.disable_keyboard_input {
+        events.retain(|x| !matches!(x, egui::Event::Key { .. }));
+    }
+
+    // Forward gamepad events to egui if not disabled.
+    if !settings.disable_gamepad_input {
+        let push_key = |events: &mut Vec<egui::Event>, key| {
+            events.push(egui::Event::Key {
+                key,
+                pressed: true,
+                repeat: false,
+                modifiers: default(),
+            });
+        };
+
+        for player_control in controls.values() {
+            if player_control.just_moved {
+                if player_control.move_direction.y > 0.1 {
+                    push_key(events, egui::Key::ArrowUp);
+                } else if player_control.move_direction.y < -0.1 {
+                    push_key(events, egui::Key::ArrowDown);
+                } else if player_control.move_direction.x < -0.1 {
+                    push_key(events, egui::Key::ArrowLeft);
+                } else if player_control.move_direction.x > 0.1 {
+                    push_key(events, egui::Key::ArrowRight);
+                }
+            }
+            if player_control.menu_confirm_just_pressed {
+                push_key(events, egui::Key::Enter);
+            }
+            if player_control.menu_back_just_pressed {
+                push_key(events, egui::Key::Escape);
+            }
+        }
     }
 }
 
-/// The control inputs that a player may make.
-#[derive(Debug, Copy, Clone, Actionlike, Deserialize, Eq, PartialEq, Hash)]
-pub enum PlayerAction {
-    Move,
-    Jump,
-    Shoot,
-    Grab,
-    Slide,
+/// Resource containing the global player control inputs.
+///
+/// It is important to note that these controls are updated every system frame, and therefore
+/// the `just_pressed` and `just_moved` flags are not accurate in the context of a fixed
+/// update match loop. Matches with fixed updates have their own input resource.
+///
+/// This resource is used throughout the menu where the inputs are collected every frame, not
+/// every fixed update.
+#[derive(HasSchema, Clone, Default, Deref, DerefMut)]
+pub struct GlobalPlayerControls(HashMap<ControlSource, PlayerControl>);
+
+impl GlobalPlayerControls {
+    /// Iterator over inputs that originated from gamepads.
+    pub fn gamepads(&self) -> impl Iterator<Item = &PlayerControl> {
+        self.iter().filter_map(|(source, control)| {
+            matches!(source, ControlSource::Gamepad(_)).then_some(control)
+        })
+    }
 }
 
-/// Bevy resource containing the editor action to perform for this frame.
-#[derive(Resource, Default, Deref, DerefMut)]
-pub struct CurrentEditorInput(Option<jumpy_core::input::EditorInput>);
+/// The source of player control inputs
+#[derive(Debug, Clone, Copy, Default, HasSchema, Hash, Eq, PartialEq)]
+#[repr(C, u8)]
+pub enum ControlSource {
+    #[default]
+    /// The first keyboard controls
+    Keyboard1,
+    /// The second keyboard controls
+    Keyboard2,
+    /// A gamepad control with the given index
+    Gamepad(u32),
+}
+
+/// Player control input state
+#[derive(HasSchema, Default, Clone, Copy, Debug)]
+#[repr(C)]
+pub struct PlayerControl {
+    pub left: f32,
+    pub right: f32,
+    pub up: f32,
+    pub down: f32,
+    pub move_direction: Vec2,
+    pub just_moved: bool,
+    pub moving: bool,
+
+    pub menu_back_pressed: bool,
+    pub menu_back_just_pressed: bool,
+    pub menu_confirm_pressed: bool,
+    pub menu_confirm_just_pressed: bool,
+    pub menu_start_pressed: bool,
+    pub menu_start_just_pressed: bool,
+
+    pub pause_pressed: bool,
+    pub pause_just_pressed: bool,
+
+    pub jump_pressed: bool,
+    pub jump_just_pressed: bool,
+
+    pub shoot_pressed: bool,
+    pub shoot_just_pressed: bool,
+
+    pub grab_pressed: bool,
+    pub grab_just_pressed: bool,
+
+    pub slide_pressed: bool,
+    pub slide_just_pressed: bool,
+}
+
+#[derive(HasSchema, Clone)]
+pub struct PlayerInputCollector {
+    current_controls: HashMap<ControlSource, PlayerControl>,
+    last_controls: HashMap<ControlSource, PlayerControl>,
+}
+
+impl Default for PlayerInputCollector {
+    fn default() -> Self {
+        let def_controls = || {
+            let mut m = HashMap::default();
+            // We always have the keyboard controls "plugged in"
+            m.insert(ControlSource::Keyboard1, default());
+            m.insert(ControlSource::Keyboard2, default());
+            for i in 0..MAX_PLAYERS as u32 {
+                m.insert(ControlSource::Gamepad(i), default());
+            }
+            m
+        };
+        Self {
+            current_controls: def_controls(),
+            last_controls: def_controls(),
+        }
+    }
+}
+
+impl PlayerInputCollector {
+    /// Update the internal state with new inputs. This must be called every render frame with the
+    /// input events.
+    pub fn update(
+        &mut self,
+        mapping: &crate::settings::PlayerControlMapping,
+        keyboard: &KeyboardInputs,
+        gamepad: &GamepadInputs,
+    ) {
+        // Helper to get the value of the given input type for the given player.
+        let get_input_value = |input_map: &InputKind, control_source: &ControlSource| {
+            match (input_map, control_source) {
+                (InputKind::Button(mapped_button), ControlSource::Gamepad(idx)) => {
+                    for input in &gamepad.gamepad_events {
+                        if let GamepadEvent::Button(e) = input {
+                            if &e.button == mapped_button && e.gamepad == *idx {
+                                let value = if e.value < 0.1 { 0.0 } else { e.value };
+                                return Some(value);
+                            }
+                        }
+                    }
+                }
+                (InputKind::AxisPositive(mapped_axis), ControlSource::Gamepad(idx)) => {
+                    for input in &gamepad.gamepad_events {
+                        if let GamepadEvent::Axis(e) = input {
+                            if &e.axis == mapped_axis && e.gamepad == *idx {
+                                let value = if e.value < 0.1 { 0.0 } else { e.value };
+                                return Some(value);
+                            }
+                        }
+                    }
+                }
+                (InputKind::AxisNegative(mapped_axis), ControlSource::Gamepad(idx)) => {
+                    for input in &gamepad.gamepad_events {
+                        if let GamepadEvent::Axis(e) = input {
+                            if &e.axis == mapped_axis && e.gamepad == *idx {
+                                let value = if e.value > -0.1 { 0.0 } else { e.value };
+                                return Some(value);
+                            }
+                        }
+                    }
+                }
+                (
+                    InputKind::Keyboard(mapped_key),
+                    ControlSource::Keyboard1 | ControlSource::Keyboard2,
+                ) => {
+                    for input in &keyboard.key_events {
+                        if input.key_code == Set(*mapped_key) {
+                            return Some(if input.button_state.pressed() {
+                                1.0
+                            } else {
+                                0.0
+                            });
+                        }
+                    }
+                }
+                _ => (),
+            };
+            None
+        };
+
+        let apply_controls = |control: &mut PlayerControl,
+                              source: &ControlSource,
+                              mapping: &PlayerControlSetting| {
+            for (button_pressed, button_map) in [
+                (&mut control.pause_pressed, &mapping.pause),
+                (&mut control.jump_pressed, &mapping.jump),
+                (&mut control.grab_pressed, &mapping.grab),
+                (&mut control.shoot_pressed, &mapping.shoot),
+                (&mut control.slide_pressed, &mapping.slide),
+                (&mut control.menu_back_pressed, &mapping.menu_back),
+                (&mut control.menu_confirm_pressed, &mapping.menu_confirm),
+                (&mut control.menu_start_pressed, &mapping.menu_start),
+            ] {
+                if let Some(value) = get_input_value(button_map, source) {
+                    *button_pressed = value > 0.0;
+                }
+            }
+
+            if let Some(left) = get_input_value(&mapping.movement.left, source) {
+                control.left = left.abs();
+            }
+            if let Some(right) = get_input_value(&mapping.movement.right, source) {
+                control.right = right.abs();
+            }
+            if let Some(up) = get_input_value(&mapping.movement.up, source) {
+                control.up = up.abs();
+            }
+            if let Some(down) = get_input_value(&mapping.movement.down, source) {
+                control.down = down.abs();
+            }
+        };
+
+        for (source, control) in self.current_controls.iter_mut() {
+            apply_controls(
+                control,
+                source,
+                match source {
+                    ControlSource::Keyboard1 => &mapping.keyboard1,
+                    ControlSource::Keyboard2 => &mapping.keyboard2,
+                    ControlSource::Gamepad(_) => &mapping.gamepad,
+                },
+            );
+        }
+    }
+
+    /// Get the player inputs for the next game simulation frame.
+    ///
+    /// This should only be called once per game simulation frame, because calling it will reset
+    /// the `just_pressed` flags.
+    pub fn get(&mut self) -> &HashMap<ControlSource, PlayerControl> {
+        self.current_controls
+            .iter_mut()
+            .for_each(|(source, current)| {
+                let last = self.last_controls.entry(*source).or_default();
+
+                current.move_direction =
+                    vec2(current.right - current.left, current.up - current.down);
+                current.moving = current.move_direction.length_squared() > 0.01;
+
+                for (just_pressed, current_pressed, last_pressed) in [
+                    (
+                        &mut current.pause_just_pressed,
+                        current.pause_pressed,
+                        last.pause_pressed,
+                    ),
+                    (
+                        &mut current.jump_just_pressed,
+                        current.jump_pressed,
+                        last.jump_pressed,
+                    ),
+                    (
+                        &mut current.shoot_just_pressed,
+                        current.shoot_pressed,
+                        last.shoot_pressed,
+                    ),
+                    (
+                        &mut current.grab_just_pressed,
+                        current.grab_pressed,
+                        last.grab_pressed,
+                    ),
+                    (
+                        &mut current.slide_just_pressed,
+                        current.slide_pressed,
+                        last.slide_pressed,
+                    ),
+                    (
+                        &mut current.menu_back_just_pressed,
+                        current.menu_back_pressed,
+                        last.menu_back_pressed,
+                    ),
+                    (
+                        &mut current.menu_confirm_just_pressed,
+                        current.menu_confirm_pressed,
+                        last.menu_confirm_pressed,
+                    ),
+                    (
+                        &mut current.menu_start_just_pressed,
+                        current.menu_start_pressed,
+                        last.menu_start_pressed,
+                    ),
+                    (&mut current.just_moved, current.moving, last.moving),
+                ] {
+                    *just_pressed = current_pressed && !last_pressed;
+                }
+            });
+
+        self.last_controls = self.current_controls.clone();
+
+        &self.current_controls
+    }
+}
diff --git a/src/loading.rs b/src/loading.rs
deleted file mode 100644
index 20b6120039..0000000000
--- a/src/loading.rs
+++ /dev/null
@@ -1,460 +0,0 @@
-//! Initial game loading implementation.
-
-use bevy::ecs::system::SystemParam;
-use bevy_egui::{egui, EguiContexts};
-use bevy_fluent::Locale;
-use leafwing_input_manager::{
-    axislike::{AxisType, SingleAxis},
-    prelude::InputMap,
-    InputManagerBundle,
-};
-
-use crate::{
-    editor::{MapTilesetEguiTextureinfo, MapTilesetEguiTextures},
-    prelude::*,
-};
-
-/// Loading plugin.
-pub struct JumpyLoadingPlugin;
-
-impl Plugin for JumpyLoadingPlugin {
-    fn build(&self, app: &mut App) {
-        app.add_startup_system(setup).add_system(
-            load_game
-                .run_if(in_state(EngineState::LoadingGameData))
-                .run_if(core_assets_loaded),
-        );
-
-        // Configure hot reload
-        if ENGINE_CONFIG.hot_reload {
-            app.add_system(
-                hot_reload_game
-                    .in_base_set(CoreSet::Last)
-                    .run_if(in_state(EngineState::InGame)),
-            );
-        }
-    }
-}
-
-/// Run criteria that waits until the necessary core assets have loaded.
-///
-/// Not all the assets need to be loaded, just the ones we need immediately for the menu load, the
-/// rest will be loading while the menu is running, in the background.
-fn core_assets_loaded(
-    game_handle: Res<GameMetaHandle>,
-    game_assets: Res<Assets<GameMeta>>,
-    core_assets: Res<Assets<CoreMeta>>,
-    player_assets: Res<Assets<PlayerMeta>>,
-    atlas_assets: Res<Assets<TextureAtlas>>,
-    hat_assets: Res<Assets<HatMeta>>,
-) -> bool {
-    // The game asset
-    let Some(game) = game_assets.get(&game_handle) else {
-        return false;
-    };
-    // The core asset
-    let Some(core) = core_assets.get(&game.core.inner) else {
-        return false;
-    };
-
-    // Egui assets
-    //
-    // The assets below must be loaded because they are used during the game load process for
-    // getting egui textures for images that need to be displayed in egui. If we add new egui
-    // textures to the load process we need to make sure they are loaded here.
-
-    // The player assets
-    for player in &core.players {
-        let Some(player) = player_assets.get(&player.get_bevy_handle()) else {
-            return false;
-        };
-
-        // The player atlases ( needed for the player selection screen )
-        if atlas_assets
-            .get(&player.layers.body.atlas.get_bevy_handle_untyped().typed())
-            .is_none()
-        {
-            return false;
-        }
-        if atlas_assets
-            .get(&player.layers.fin.atlas.get_bevy_handle_untyped().typed())
-            .is_none()
-        {
-            return false;
-        }
-        if atlas_assets
-            .get(&player.layers.face.atlas.get_bevy_handle_untyped().typed())
-            .is_none()
-        {
-            return false;
-        }
-    }
-    // The map tilesets
-    for tileset_handle in &core.map_tilesets {
-        if atlas_assets
-            .get(&tileset_handle.get_bevy_handle_untyped().typed())
-            .is_none()
-        {
-            return false;
-        }
-    }
-
-    // Hats
-    for hats_handle in &core.player_hats {
-        if hat_assets
-            .get(&hats_handle.get_bevy_handle_untyped().typed())
-            .is_none()
-        {
-            return false;
-        }
-    }
-
-    true
-}
-
-/// Component added to the entities used to collect player input.
-///
-/// The inner [`usize`] is the player index.
-///
-/// The `leafwing-input-manager` tracks input for specific entities, instead of globally collecting
-/// input. This usually makes things easier, but for our usje-case, we need to be able to collect
-/// user input even for players that haven't, spawned yet.
-///
-/// To facilitate this, for every user we spawn [`jumpy_core::MAX_PLAYERS`] entities with a
-/// [`PlayerInputCollector`] and the `InputManagerBundle` that is needed for
-/// `leafwing-input-manager`.
-#[derive(Component)]
-pub struct PlayerInputCollector(pub usize);
-
-/// Systemrunonce to spawn the menu input collector.
-fn setup(mut commands: Commands) {
-    commands.spawn((
-        Name::new("Menu Input Collector"),
-        InputManagerBundle {
-            input_map: menu_input_map(),
-            ..default()
-        },
-    ));
-}
-
-/// Resource containing mappings of asset paths to their egui textures.
-///
-/// This is populated during the game load.
-#[derive(Resource)]
-pub struct AtlasEguiTextures(pub HashMap<bones::AssetPath, egui::TextureId>);
-
-/// System param used to load and hot reload the game.
-#[derive(SystemParam)]
-pub struct GameLoader<'w, 's> {
-    skip_next_asset_update_event: Local<'s, bool>,
-    commands: Commands<'w, 's>,
-    game_handle: Res<'w, GameMetaHandle>,
-    game_assets: ResMut<'w, Assets<GameMeta>>,
-    core_assets: ResMut<'w, Assets<CoreMeta>>,
-    events: EventReader<'w, 's, AssetEvent<GameMeta>>,
-    // active_scripts: ResMut<'w, ActiveScripts>,
-    storage: ResMut<'w, Storage>,
-    player_assets: ResMut<'w, Assets<PlayerMeta>>,
-    hat_assets: ResMut<'w, Assets<HatMeta>>,
-    texture_atlas_assets: Res<'w, Assets<TextureAtlas>>,
-    egui_ctx: EguiContexts<'w, 's>,
-}
-
-impl<'w, 's> GameLoader<'w, 's> {
-    /// This function is called once when the game starts up and, when hot reload is enabled, on
-    /// update, to check for asset changed events and to update the [`GameMeta`] resource.
-    ///
-    /// The `is_hot_reload` argument is used to indicate whether the function should check for asset
-    /// updates and reload, or whether it should run the one-time initialization of the game.
-    fn load(mut self, is_hot_reload: bool) {
-        // Check to make sure we shouldn't skip this execution
-        // ( i.e. if this is a hot reload run without any changed assets )
-        if self.should_skip_run(is_hot_reload) {
-            return;
-        }
-
-        let Self {
-            mut skip_next_asset_update_event,
-            mut commands,
-            game_handle,
-            mut game_assets,
-            mut core_assets,
-            mut egui_ctx,
-            mut storage,
-            ..
-        } = self;
-
-        let game = game_assets.get_mut(&game_handle).unwrap();
-        let core = core_assets.get_mut(&game.core).unwrap();
-
-        // Hot reload preparation
-        if is_hot_reload {
-            // Since we are modifying the game asset, which will trigger another asset changed
-            // event, we need to skip the next update event.
-            *skip_next_asset_update_event = true;
-
-            // // Clear the active scripts
-            // active_scripts.clear();
-
-            // One-time initialization
-        } else {
-            spawn_menu_camera(&mut commands, core);
-
-            // Initialize empty fonts for all game fonts.
-            //
-            // This makes sure Egui will not panic if we try to use a font that is still loading.
-            let mut egui_fonts = egui::FontDefinitions::default();
-            for font_name in game.ui_theme.font_families.keys() {
-                let font_family = egui::FontFamily::Name(font_name.clone().into());
-                egui_fonts.families.insert(font_family, vec![]);
-            }
-            egui_ctx.ctx_mut().set_fonts(egui_fonts.clone());
-            commands.insert_resource(EguiFontDefinitions(egui_fonts));
-
-            // Spawn player input collectors.
-            let settings = storage.get(Settings::STORAGE_KEY);
-            let settings = settings.as_ref().unwrap_or(&game.default_settings);
-            for player in 0..MAX_PLAYERS {
-                commands.spawn((
-                    Name::new(format!("Player Input Collector {player}")),
-                    PlayerInputCollector(player),
-                    InputManagerBundle {
-                        input_map: settings.player_controls.get_input_map(player),
-                        ..default()
-                    },
-                ));
-            }
-
-            // Transition to the main menu when we are done
-            commands.insert_resource(NextState(Some(EngineState::MainMenu)));
-        }
-
-        // Set the locale resource
-        let translations = &game.translations;
-        commands.insert_resource(
-            Locale::new(translations.detected_locale.clone())
-                .with_default(translations.default_locale.clone()),
-        );
-
-        let mut visuals = egui::Visuals::dark();
-        visuals.widgets = game.ui_theme.widgets.get_egui_widget_style();
-        visuals.window_fill = game.ui_theme.debug_window_fill.into_egui();
-        visuals.panel_fill = visuals.window_fill;
-        let [red, green, blue, alpha] = visuals.window_fill.to_srgba_unmultiplied();
-        let [red, green, blue, alpha] = [
-            red as f32 / 255.0,
-            green as f32 / 255.0,
-            blue as f32 / 255.0,
-            alpha as f32 / 255.0,
-        ];
-        commands.insert_resource(ClearColor(Color::Rgba {
-            red,
-            green,
-            blue,
-            alpha,
-        }));
-        egui_ctx.ctx_mut().set_visuals(visuals);
-
-        // Helper to load border images
-        let mut load_border_image = |border: &mut BorderImageMeta| {
-            border.egui_texture = egui_ctx.add_image(border.image.inner.clone_weak());
-        };
-
-        // Add Border images to egui context
-        load_border_image(&mut game.ui_theme.hud.portrait_frame);
-        load_border_image(&mut game.ui_theme.panel.border);
-        load_border_image(&mut game.ui_theme.hud.lifebar.background_image);
-        load_border_image(&mut game.ui_theme.hud.lifebar.progress_image);
-        for button in game.ui_theme.button_styles.as_list() {
-            load_border_image(&mut button.borders.default);
-            if let Some(border) = &mut button.borders.clicked {
-                load_border_image(border);
-            }
-            if let Some(border) = &mut button.borders.focused {
-                load_border_image(border);
-            }
-        }
-
-        // Add editor icons to egui context
-        for icon in game.ui_theme.editor.icons.as_mut_list() {
-            icon.egui_texture_id = egui_ctx.add_image(icon.image.inner.clone_weak());
-        }
-
-        // Insert the game resource
-        commands.insert_resource(game.clone());
-        commands.insert_resource(CoreMetaArc(Arc::new(core.clone())));
-
-        // Load player atlas egui handles
-        let mut player_atlas_egui_textures = HashMap::default();
-        for player_handle in &core.players {
-            let player_meta = self
-                .player_assets
-                .get(&player_handle.get_bevy_handle())
-                .unwrap();
-
-            for (path, handle) in [
-                (
-                    player_meta.layers.body.atlas.path.clone(),
-                    player_meta.layers.body.atlas.get_bevy_handle_untyped(),
-                ),
-                (
-                    player_meta.layers.fin.atlas.path.clone(),
-                    player_meta.layers.fin.atlas.get_bevy_handle_untyped(),
-                ),
-                (
-                    player_meta.layers.face.atlas.path.clone(),
-                    player_meta.layers.face.atlas.get_bevy_handle_untyped(),
-                ),
-            ] {
-                let texture_atlas = self.texture_atlas_assets.get(&handle.typed()).unwrap();
-
-                let egui_texture = egui_ctx.add_image(texture_atlas.texture.clone_weak());
-                player_atlas_egui_textures.insert(path, egui_texture);
-            }
-        }
-        // Load player hat atlase egui handles
-        for hat_handle in &core.player_hats {
-            let hat_meta = self.hat_assets.get(&hat_handle.get_bevy_handle()).unwrap();
-            let path = hat_meta.atlas.path.clone();
-            let texture_atlas = self
-                .texture_atlas_assets
-                .get(&hat_meta.atlas.get_bevy_handle_untyped().typed())
-                .unwrap();
-            let egui_texture = egui_ctx.add_image(texture_atlas.texture.clone_weak());
-
-            player_atlas_egui_textures.insert(path, egui_texture);
-        }
-        commands.insert_resource(AtlasEguiTextures(player_atlas_egui_textures));
-
-        // load map tileset egui handles
-        let mut map_tileset_egui_textures = HashMap::default();
-        for tileset_handle in &core.map_tilesets {
-            let tileset_meta = self
-                .texture_atlas_assets
-                .get(&tileset_handle.get_bevy_handle_untyped().typed())
-                .unwrap();
-            let size = tileset_meta.size;
-            let tile_size = tileset_meta.textures[0].size(); // All tiles have to be the same size
-            let texture = egui_ctx.add_image(tileset_meta.texture.clone_weak());
-
-            map_tileset_egui_textures.insert(
-                tileset_handle.path.clone(),
-                MapTilesetEguiTextureinfo {
-                    texture,
-                    size,
-                    tile_size,
-                },
-            );
-        }
-        commands.insert_resource(MapTilesetEguiTextures(map_tileset_egui_textures));
-
-        // NOTE: If you add more egui texture loading to this phase you need to make sure they are
-        // loaded in the `core_assets_loaded` function.
-    }
-
-    // Run checks to see if we should skip running the system
-    fn should_skip_run(&mut self, is_hot_reload: bool) -> bool {
-        // If this is a hot reload run, check for modified asset events
-        if is_hot_reload {
-            let mut has_update = false;
-            for (event, event_id) in self.events.iter_with_id() {
-                if let AssetEvent::Modified { .. } = event {
-                    // We may need to skip an asset update event
-                    if *self.skip_next_asset_update_event {
-                        *self.skip_next_asset_update_event = false;
-                    } else {
-                        debug!(%event_id, "Game updated");
-                        has_update = true;
-                    }
-                }
-            }
-
-            // If there was no update, skip execution
-            if !has_update {
-                return true;
-            }
-        }
-
-        false
-    }
-}
-
-/// Get the input map for the menu controls.
-fn menu_input_map() -> InputMap<MenuAction> {
-    InputMap::default()
-        .set_gamepad(Gamepad::new(0))
-        // Up
-        .insert(KeyCode::Up, MenuAction::Up)
-        .insert(GamepadButtonType::DPadUp, MenuAction::Up)
-        .insert(
-            SingleAxis {
-                axis_type: AxisType::Gamepad(GamepadAxisType::LeftStickY),
-                positive_low: 0.5,
-                negative_low: -1.0,
-                value: None,
-            },
-            MenuAction::Up,
-        )
-        // Left
-        .insert(KeyCode::Left, MenuAction::Left)
-        .insert(GamepadButtonType::DPadLeft, MenuAction::Left)
-        .insert(
-            SingleAxis {
-                axis_type: AxisType::Gamepad(GamepadAxisType::LeftStickX),
-                positive_low: 1.0,
-                negative_low: -0.5,
-                value: None,
-            },
-            MenuAction::Left,
-        )
-        // Down
-        .insert(KeyCode::Down, MenuAction::Down)
-        .insert(GamepadButtonType::DPadDown, MenuAction::Down)
-        .insert(
-            SingleAxis {
-                axis_type: AxisType::Gamepad(GamepadAxisType::LeftStickY),
-                positive_low: 1.0,
-                negative_low: -0.5,
-                value: None,
-            },
-            MenuAction::Down,
-        )
-        // Right
-        .insert(KeyCode::Right, MenuAction::Right)
-        .insert(GamepadButtonType::DPadRight, MenuAction::Right)
-        .insert(
-            SingleAxis {
-                axis_type: AxisType::Gamepad(GamepadAxisType::LeftStickX),
-                positive_low: 0.5,
-                negative_low: -1.0,
-                value: None,
-            },
-            MenuAction::Right,
-        )
-        // Start
-        .insert(GamepadButtonType::Start, MenuAction::Start)
-        // Confirm
-        .insert(KeyCode::Return, MenuAction::Confirm)
-        .insert(GamepadButtonType::South, MenuAction::Confirm)
-        .insert(GamepadButtonType::Start, MenuAction::Confirm)
-        // Back
-        .insert(KeyCode::Escape, MenuAction::Back)
-        .insert(GamepadButtonType::East, MenuAction::Back)
-        // Toggle Fullscreen
-        .insert(KeyCode::F11, MenuAction::ToggleFullscreen)
-        .insert(GamepadButtonType::Mode, MenuAction::ToggleFullscreen)
-        // Pause
-        .insert(KeyCode::Escape, MenuAction::Pause)
-        .insert(GamepadButtonType::Start, MenuAction::Pause)
-        .build()
-}
-
-/// System to run the initial game load.
-fn load_game(loader: GameLoader) {
-    loader.load(false);
-}
-
-/// System to check for asset changes and hot reload the game.
-fn hot_reload_game(loader: GameLoader) {
-    loader.load(true);
-}
diff --git a/src/localization.rs b/src/localization.rs
deleted file mode 100644
index 2f396c9b07..0000000000
--- a/src/localization.rs
+++ /dev/null
@@ -1,121 +0,0 @@
-//! Localization utilities & initialization.
-
-use std::borrow::Borrow;
-
-use bevy::{prelude::*, utils::HashMap};
-use bevy_fluent::prelude::*;
-use fluent::FluentArgs;
-use fluent_content::{Content, Request};
-
-/// Plugin for initializing and loading the [`Localization`] resource.
-///
-/// [`Localization`]: https://docs.rs/bevy_fluent/latest/bevy_fluent/struct.Localization.html
-pub struct JumpyLocalizationPlugin;
-
-impl Plugin for JumpyLocalizationPlugin {
-    fn build(&self, app: &mut App) {
-        app.add_plugin(FluentPlugin)
-            .init_resource::<Locale>()
-            .insert_resource(Localization::new());
-
-        app.add_system(load_locales);
-    }
-}
-
-/// Extension trait to reduce boilerplate when getting values from a [`Localization`].
-///
-/// [`Localization`]: https://docs.rs/bevy_fluent/latest/bevy_fluent/struct.Localization.html
-pub trait LocalizationExt<'a, T: Into<Request<'a, U>>, U: Borrow<FluentArgs<'a>>> {
-    /// Request message content and get an empty string if it doesn't exist.
-    fn get(&self, request: T) -> String;
-}
-
-impl<'a, T, U> LocalizationExt<'a, T, U> for Localization
-where
-    T: Copy + Into<Request<'a, U>> + std::fmt::Debug,
-    U: Borrow<FluentArgs<'a>>,
-{
-    /// Request message content and get an empty string if it doesn't exist.
-    fn get(&self, request: T) -> String {
-        let response = self.content(request);
-
-        if response.is_none() {
-            debug!(
-                "Missing response for {request:?}. \
-                ( Could be normal if localization is still loading )"
-            );
-        }
-
-        response.unwrap_or_default()
-    }
-}
-
-/// Watch for locale load events and add any new bundles to the [`Localization`] resource.
-///
-/// [`Localization`]: https://docs.rs/bevy_fluent/latest/bevy_fluent/struct.Localization.html
-fn load_locales(
-    locale: Res<Locale>,
-    mut loading_bundles: Local<Vec<Handle<BundleAsset>>>,
-    mut localization: ResMut<Localization>,
-    mut events: EventReader<AssetEvent<BundleAsset>>,
-    assets: Res<Assets<BundleAsset>>,
-) {
-    // Whether there was an update that means we need to rebuild the localization
-    let mut should_rebuild_localization = false;
-
-    // We need to reload the localization if our Locale changed
-    if locale.is_changed() {
-        should_rebuild_localization = true;
-    }
-
-    // Collect any previously loading locales that we should try to load again
-    let mut try_to_load = loading_bundles.drain(..).collect::<Vec<_>>();
-
-    // Add any updated or created assets to the list of bundles to try to load
-    for event in events.iter() {
-        match event {
-            AssetEvent::Created { handle } | AssetEvent::Modified { handle } => {
-                try_to_load.push(handle.clone_weak());
-            }
-            _ => (),
-        }
-    }
-
-    // Try to load all bundles that need to be loaded
-    for handle in try_to_load {
-        // If the asset is loaded now
-        if assets.get(&handle).is_some() {
-            // We need to rebuild the localization
-            should_rebuild_localization = true;
-
-        // If it isn't loaded yet
-        } else {
-            // Try to load it next frame
-            loading_bundles.push(handle);
-        }
-    }
-
-    // Rebuild localization if anything was updated
-    if should_rebuild_localization {
-        let mut new_localization = Localization::new();
-
-        // Create map containing the bundles and their handles, indexed by their locale
-        let mut bundles = assets
-            .iter()
-            .map(|(handle_id, asset)| (&asset.locales[0], (handle_id, asset)))
-            .collect::<HashMap<_, _>>();
-
-        // Extract sorted list of locales in a fallback chain
-        let locales = locale.fallback_chain(bundles.keys().cloned());
-
-        // Insert bundles into the localization in sorted order
-        for locale in locales {
-            if let Some((handle_id, bundle)) = bundles.remove(locale) {
-                new_localization.insert(&Handle::weak(handle_id), bundle);
-            }
-        }
-
-        // Update the localization resource
-        *localization = new_localization;
-    }
-}
diff --git a/src/logs.rs b/src/logs.rs
deleted file mode 100644
index 6f21a774f3..0000000000
--- a/src/logs.rs
+++ /dev/null
@@ -1,211 +0,0 @@
-//! The logging implementation is duplicated from Bevy - `bevy::LogPlugin` does not support registering
-//! external tracing Layers, this implementation adds an extra layer for sending tracing to the in
-//! game console. If this feature is added in the future, we should switch back to Bevy's LogPlugin.
-
-// #[cfg(target_os = "android")]
-// mod android_tracing;
-
-pub mod prelude {
-    //! The Bevy Log Prelude.
-    #[doc(hidden)]
-    pub use bevy::utils::tracing::{
-        debug, debug_span, error, error_span, info, info_span, trace, trace_span, warn, warn_span,
-    };
-}
-
-#[cfg(target_arch = "wasm32")]
-/// Gets time and formats for use in fmt::Layer on wasm32 target,
-#[derive(Default)]
-pub struct WebFormatTime;
-
-#[cfg(target_arch = "wasm32")]
-impl fmt::time::FormatTime for WebFormatTime {
-    fn format_time(&self, w: &mut fmt::format::Writer<'_>) -> std::fmt::Result {
-        let date = js_sys::Date::new_0();
-        let date_time = chrono::DateTime::<chrono::Utc>::from(date);
-        // Format similarly to tracing_subscriber::SystemTime
-        let date_str = date_time.format("%0Y-%0m-%0dT%0H:%0M:%0S%.3fZ");
-        write!(w, "{date_str}")
-    }
-}
-
-use bevy::prelude::{App, Plugin};
-pub use bevy::utils::tracing::{
-    debug, debug_span, error, error_span, info, info_span, trace, trace_span, warn, warn_span,
-    Level,
-};
-
-use tracing_log::LogTracer;
-// #[cfg(feature = "tracing-chrome")]
-// use tracing_subscriber::fmt::{format::DefaultFields, FormattedFields};
-use tracing_subscriber::{fmt, prelude::*, registry::Registry, EnvFilter};
-
-use crate::prelude::ConsoleLogBufferWriter;
-
-#[cfg(feature = "profiling-full")]
-use crate::{profiling::ProfilingScopeFormatter, puffin_tracing};
-
-/// This is largely duplicate of `bevy::LogPlugin` with minor additions. Some functionality
-/// normally behind bevy_log feature flags is not yet implemented.
-///
-/// This plugin should be loaded as early as possible to ensure console_error_panic_hook
-/// is set before any exceptions are thrown on wasm target.
-///
-/// Enabling [`JumpyLogPlugin`] requires disabling `bevy::LogPlugin`:
-/// ```
-///     App::new()
-///         .add_plugins(DefaultPlugins.build().disable::<LogPlugin>())
-///         .add_plugin(JumpyLogPlugin {
-///             level: Level::DEBUG,
-///             filter: "wgpu=error,bevy_render=info,bevy_ecs=trace".to_string(),
-///         })
-///         .run();
-/// ```
-///
-/// Log level can also be changed using the `RUST_LOG` environment variable.
-/// For example, using `RUST_LOG=wgpu=error,bevy_render=info,bevy_ecs=trace cargo run ..`
-///
-/// It has the same syntax as the field [`JumpyLogPlugin::filter`], see [`EnvFilter`].
-/// If you define the `RUST_LOG` environment variable, the [`JumpyLogPlugin`] settings
-/// will be ignored.
-///
-/// # Panics
-///
-/// This plugin should not be added multiple times in the same process. This plugin
-/// sets up global logging configuration for **all** Apps in a given process, and
-/// rerunning the same initialization multiple times will lead to a panic.
-/// (See example of disabling `bevy::LogPlugin` from defaults in example above)
-pub struct JumpyLogPlugin {
-    /// Filters logs using the [`EnvFilter`] format
-    pub filter: String,
-
-    /// Filters out logs that are "less than" the given level.
-    /// This can be further filtered using the `filter` setting.
-    pub level: Level,
-}
-
-impl Default for JumpyLogPlugin {
-    fn default() -> Self {
-        Self {
-            filter: "wgpu=error".to_string(),
-            level: Level::INFO,
-        }
-    }
-}
-
-impl Plugin for JumpyLogPlugin {
-    #[cfg_attr(not(feature = "tracing-chrome"), allow(unused_variables))]
-    fn build(&self, app: &mut App) {
-        // #[cfg(feature = "trace")]
-        // {
-        //     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 default_filter = { format!("{},{}", self.level, self.filter) };
-        let filter_layer = EnvFilter::try_from_default_env()
-            .or_else(|_| EnvFilter::try_new(&default_filter))
-            .unwrap();
-
-        let subscriber = Registry::default().with(filter_layer);
-
-        // Layer to write logs for access in in-game console
-        let console_layer = fmt::Layer::default()
-            .with_ansi(false) // console does not support this
-            .with_writer(ConsoleLogBufferWriter::default);
-
-        // #[cfg(feature = "trace")]
-        // let subscriber = subscriber.with(tracing_error::ErrorLayer::default());
-
-        #[cfg(all(not(target_arch = "wasm32"), not(target_os = "android")))]
-        {
-            // Support for saving a chrome tracing file
-            // #[cfg(feature = "tracing-chrome")]
-            // let chrome_layer = {
-            //     let mut layer = tracing_chrome::ChromeLayerBuilder::new();
-            //     if let Ok(path) = std::env::var("TRACE_CHROME") {
-            //         layer = layer.file(path);
-            //     }
-            //     let (chrome_layer, guard) = layer
-            //         .name_fn(Box::new(|event_or_span| match event_or_span {
-            //             tracing_chrome::EventOrSpan::Event(event) => event.metadata().name().into(),
-            //             tracing_chrome::EventOrSpan::Span(span) => {
-            //                 if let Some(fields) =
-            //                     span.extensions().get::<FormattedFields<DefaultFields>>()
-            //                 {
-            //                     format!("{}: {}", span.metadata().name(), fields.fields.as_str())
-            //                 } else {
-            //                     span.metadata().name().into()
-            //                 }
-            //             }
-            //         }))
-            //         .build();
-            //     app.world.insert_non_send_resource(guard);
-            //     chrome_layer
-            // };
-
-            let fmt_layer = fmt::Layer::default().with_writer(std::io::stderr);
-
-            #[cfg(feature = "profiling-full")]
-            let (fmt_layer, tracy_layer, puffin_layer) = {
-                // bevy_render::renderer logs a `tracy.frame_mark` event every frame
-                // at Level::INFO. Formatted logs should omit it
-                let fmt_layer =
-                    fmt_layer.with_filter(tracing_subscriber::filter::FilterFn::new(|meta| {
-                        meta.fields().field("tracy.frame_mark").is_none()
-                    }));
-
-                // Capture tracing spans and send to tracy.
-                let tracy_layer = tracing_tracy::TracyLayer::new()
-                    .with_formatter(ProfilingScopeFormatter::default());
-
-                // The puffin layer captures tracing spans and creates puffin scopes
-                let puffin_layer = puffin_tracing::PuffinLayer::new()
-                    .with_formatter(ProfilingScopeFormatter::default());
-                (fmt_layer, tracy_layer, puffin_layer)
-            };
-
-            let subscriber = subscriber.with(fmt_layer).with(console_layer);
-
-            // #[cfg(feature = "tracing-chrome")]
-            // let subscriber = subscriber.with(chrome_layer);
-
-            #[cfg(feature = "profiling-full")]
-            let subscriber = subscriber.with(puffin_layer).with(tracy_layer);
-
-            finished_subscriber = subscriber;
-        }
-
-        #[cfg(target_arch = "wasm32")]
-        {
-            console_error_panic_hook::set_once();
-            finished_subscriber = subscriber
-                .with(tracing_wasm::WASMLayer::new(
-                    tracing_wasm::WASMLayerConfig::default(),
-                ))
-                .with(console_layer.with_timer(WebFormatTime::default()));
-        }
-
-        // #[cfg(target_os = "android")]
-        // {
-        //     finished_subscriber = subscriber.with(android_tracing::AndroidLayer::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) => warn!(
-				"Could not set global logger and tracing subscriber as they are already set. Consider disabling JumpyLogPlugin."
-			),
-			(true, _) => warn!("Could not set global logger as it is already set. Consider disabling JumpyLogPlugin."),
-			(_, true) => warn!("Could not set global tracing subscriber as it is already set. Consider disabling JumpyLogPlugin."),
-			_ => (),
-		}
-    }
-}
diff --git a/src/main.rs b/src/main.rs
index e8e8cba736..9698ee015e 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,35 +1,34 @@
-#![doc = include_str!("./README.md")]
 #![doc(html_logo_url = "https://avatars.githubusercontent.com/u/87333478?s=200&v=4")]
 // This cfg_attr is needed because `rustdoc::all` includes lints not supported on stable
 #![cfg_attr(doc, allow(unknown_lints))]
 #![deny(rustdoc::all)]
-#![allow(rustdoc::private_intra_doc_links)]
-#![allow(clippy::type_complexity)]
-#![allow(clippy::forget_non_drop)]
 #![allow(clippy::too_many_arguments)]
+// TODO: Warn on dead code.
+// This is temporarily disabled while migrating to the new bones.
+#![allow(dead_code)]
+#![allow(ambiguous_glob_reexports)]
+#![doc = include_str!("./README.md")]
 
-/// Sets the global Rust allocator to MiMalloc instead of the system one.
-///
-/// Doesn't do anything on WASM builds. ( We may want an alternative allocator for WASM later. )
-#[cfg(not(target_arch = "wasm32"))]
-#[global_allocator]
-static GLOBAL_ALLOCATOR: mimalloc::MiMalloc = mimalloc::MiMalloc;
+use bones_bevy_renderer::BonesBevyRenderer;
+use bones_framework::prelude::*;
+
+pub mod core;
+pub mod input;
+pub mod sessions;
+pub mod settings;
+pub mod ui;
 
-/// External crate documentation.
-///
-/// This module only exists during docs builds and serves to make it eaiser to link to relevant
-/// documentation in external crates.
-#[cfg(doc)]
-pub mod external {
-    #[doc(inline)]
-    pub use bevy;
-    #[doc(inline)]
-    pub use bevy_egui::egui;
-    #[doc(inline)]
-    pub use bones_matchmaker_proto;
-    #[doc(inline)]
-    pub use ggrs;
+mod prelude {
+    pub use crate::{
+        core::prelude::*, impl_system_param, input::*, sessions::*, settings::*, GameMeta,
+    };
+    pub use bones_framework::prelude::*;
+    pub use once_cell::sync::Lazy;
+    pub use serde::{Deserialize, Serialize};
+    pub use std::{sync::Arc, time::Duration};
+    pub use tracing::{debug, error, info, trace, warn};
 }
+use crate::prelude::*;
 
 // This will cause Bevy to be dynamically linked during development,
 // which can greatly reduce re-compile times in some circumstances.
@@ -38,109 +37,63 @@ pub mod external {
 #[allow(clippy::single_component_path_imports)]
 use bevy_dylib;
 
-pub mod assets;
-pub mod audio;
-pub mod bevy_states;
-pub mod config;
-pub mod console;
-pub mod debug;
-pub mod input;
-pub mod loading;
-pub mod localization;
-pub mod logs;
-pub mod metadata;
-pub mod platform;
-pub mod profiling;
-pub mod puffin_tracing;
-pub mod session;
-pub mod ui;
-pub mod utils;
+#[derive(HasSchema, Clone, Debug, Default)]
+#[type_data(metadata_asset("game"))]
+#[repr(C)]
+pub struct GameMeta {
+    pub core: CoreMeta,
+    pub default_settings: settings::Settings,
+    pub localization: Handle<LocalizationAsset>,
+    pub theme: ui::UiTheme,
+    pub main_menu: ui::main_menu::MainMenuMeta,
+}
 
-pub mod camera;
-#[cfg(not(target_arch = "wasm32"))]
-pub mod networking;
-pub mod prelude;
-use prelude::*;
+fn main() {
+    // Initialize the Bevy task pool manually so that we can use it during startup.
+    bevy_tasks::IoTaskPool::init(bevy_tasks::TaskPool::new);
 
-/// The entrypoint function for the jumpy game.
-///
-/// This function:
-///
-/// - Parses engine config:
-///     - On native: commandline arguments
-///     - On web: query string parameters
-/// - Initializes the Bevy [`App`]
-/// - Initializes settings and resources
-/// - Installs our Bevy plugins
-///     - This includes 3rd party plugins, and our custom bevy plugins
-///     - Nearly all of the game logic resides in these plugins
-/// - Starts the game
-pub fn main() {
-    // Load engine config. This will parse CLI arguments or web query string so we want to do it
-    // before we create the app to make sure everything is in order.
-    let engine_config = Lazy::force(&config::ENGINE_CONFIG);
+    // Register types that we will load from persistent storage.
+    settings::Settings::schema();
 
-    let mut app = App::new();
+    // First create bones game.
+    let mut game = Game::new();
 
-    app
-        // Initialize resources
-        .insert_resource(ClearColor(Color::BLACK))
-        // Set initial game state
-        .add_state::<EngineState>()
-        .add_state::<InGameState>()
-        .add_state::<GameEditorState>()
-        // Install plugins
-        //
-        // Log plugin is added first to ensure console_error_panic_hook is set early on,
-        // otherwise in wasm an exception may occur without being logged to browser console.
-        .add_plugin(JumpyLogPlugin {
-            filter: engine_config.log_level.clone(),
-            ..default()
-        })
-        .add_plugins(
-            DefaultPlugins
-                .set(WindowPlugin {
-                    primary_window: Some(Window {
-                        title: "Fish Folk: Jumpy".to_string(),
-                        fit_canvas_to_parent: true,
-                        ..default()
-                    }),
-                    ..default()
-                })
-                .set(ImagePlugin::default_nearest())
-                .set(bevy::asset::AssetPlugin {
-                    watch_for_changes: engine_config.hot_reload,
-                    asset_folder: engine_config
-                        .asset_dir
-                        .clone()
-                        .unwrap_or_else(|| "assets".into()),
-                })
-                // We are using JumpyLogPlugin, disabled to avoid conflicts in global logging/tracing.
-                .disable::<bevy::log::LogPlugin>(),
-        )
-        .add_plugin(bevy_tweening::TweeningPlugin)
-        .add_plugin(bevy_framepace::FramepacePlugin)
-        .add_plugin(JumpyPlayerInputPlugin)
-        .add_plugin(JumpySessionPlugin)
-        .add_plugin(JumpyUiPlugin)
-        .add_plugin(JumpyAudioPlugin)
-        .add_plugin(JumpyPlatformPlugin)
-        .add_plugin(JumpyLoadingPlugin)
-        .add_plugin(JumpyAssetPlugin)
-        .add_plugin(JumpyLocalizationPlugin)
-        .add_plugin(JumpyDebugPlugin)
-        .add_plugin(JumpyConsolePlugin);
+    // Register our game asset type
+    GameMeta::schema();
 
-    debug!(?engine_config, "Starting game");
+    game
+        // Install game plugins
+        .install_plugin(DefaultGamePlugin)
+        .install_plugin(settings::game_plugin)
+        .install_plugin(input::game_plugin)
+        .install_plugin(core::game_plugin)
+        // We initialize the asset server and register asset types
+        .init_shared_resource::<AssetServer>()
+        .register_default_assets();
 
-    // Get the game handle
-    let asset_server = app.world.get_resource::<AssetServer>().unwrap();
-    let game_asset = &engine_config.game_asset;
-    let game_handle = GameMetaHandle(asset_server.load(game_asset));
+    // Create a new session for the game menu. Each session is it's own bones world with it's own
+    // plugins, systems, and entities.
+    game.sessions.start_menu();
 
-    // Insert game handle resource
-    app.world.insert_resource(game_handle);
+    // Create a new session for the pause menu, which sits in the background by default and only
+    // does anything while the game is running.
+    game.sessions
+        .create(SessionNames::PAUSE_MENU)
+        .install_plugin(ui::pause_menu::session_plugin);
 
-    // Start the game
-    app.run()
+    // Create a bevy renderer for the bones game and run it.
+    BonesBevyRenderer {
+        game,
+        pixel_art: true,
+        game_version: Version::new(
+            env!("CARGO_PKG_VERSION_MAJOR").parse().unwrap(),
+            env!("CARGO_PKG_VERSION_MINOR").parse().unwrap(),
+            env!("CARGO_PKG_VERSION_PATCH").parse().unwrap(),
+        ),
+        app_namespace: ("org".into(), "fishfolk".into(), "jumpy".into()),
+        asset_dir: "assets".into(),
+        packs_dir: "packs".into(),
+    }
+    .app()
+    .run();
 }
diff --git a/src/metadata.rs b/src/metadata.rs
deleted file mode 100644
index b5b9c827b6..0000000000
--- a/src/metadata.rs
+++ /dev/null
@@ -1,77 +0,0 @@
-//! Data structures for things like assets and settings that can be serialized and deserialized.
-
-use crate::prelude::*;
-
-mod localization;
-mod settings;
-mod ui;
-
-pub use localization::*;
-pub use settings::*;
-pub use ui::*;
-
-/// Resource containing the main [`Handle<GameMeta>`].
-#[derive(Resource, Deref, DerefMut, Clone, Debug, Default)]
-pub struct GameMetaHandle(pub Handle<GameMeta>);
-
-#[derive(Resource, BonesBevyAsset, TypeUlid, Deserialize, Clone, Debug)]
-#[asset_id = "game"]
-#[serde(deny_unknown_fields)]
-#[ulid = "01GPEMR6KZ4QZBNN8HBJZEX2JB"]
-pub struct GameMeta {
-    pub core: AssetHandle<CoreMeta>,
-    pub translations: localization::TranslationsMeta,
-    pub ui_theme: ui::UIThemeMeta,
-    pub main_menu: MainMenuMeta,
-    #[asset(deserialize_only)]
-    pub default_settings: settings::Settings,
-    pub music: MusicMeta,
-}
-
-#[derive(BonesBevyAssetLoad, Deserialize, Clone, Debug)]
-#[serde(deny_unknown_fields)]
-pub struct MusicMeta {
-    pub title_screen: AssetHandle<AudioSource>,
-    pub fight: Vec<AssetHandle<AudioSource>>,
-    pub character_screen: AssetHandle<AudioSource>,
-    pub results_screen: AssetHandle<AudioSource>,
-    pub credits: AssetHandle<AudioSource>,
-}
-
-#[derive(BonesBevyAssetLoad, Deserialize, Clone, Debug)]
-#[serde(deny_unknown_fields)]
-pub struct MainMenuMeta {
-    pub title_font: FontMeta,
-    pub subtitle_font: FontMeta,
-    pub background_image: ImageMeta,
-    pub menu_width: f32,
-}
-
-#[derive(BonesBevyAssetLoad, Deserialize, Serialize, Clone, Debug)]
-#[serde(deny_unknown_fields)]
-pub struct ImageMeta {
-    pub image_size: Vec2,
-    pub image: AssetHandle<Image>,
-    /// Egui texture ID may not be valid on all [`ImageMeta`] unless it is added to the egui context
-    /// during game load.
-    #[serde(skip)]
-    #[asset(deserialize_only)]
-    pub egui_texture_id: bevy_egui::egui::TextureId,
-}
-
-/// Helper trait for converting color meta to [`egui::Color32`].
-pub trait ColorMetaExt {
-    fn into_egui(self) -> egui::Color32;
-}
-
-impl ColorMetaExt for ColorMeta {
-    fn into_egui(self) -> egui::Color32 {
-        let [r, g, b, a] = self.0.as_rgba_f32();
-        egui::Color32::from_rgba_premultiplied(
-            (r * 255.0) as u8,
-            (g * 255.0) as u8,
-            (b * 255.0) as u8,
-            (a * 255.0) as u8,
-        )
-    }
-}
diff --git a/src/metadata/localization.rs b/src/metadata/localization.rs
deleted file mode 100644
index 220686ef6e..0000000000
--- a/src/metadata/localization.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-use bevy_fluent::BundleAsset;
-use unic_langid::LanguageIdentifier;
-
-use super::*;
-
-#[derive(BonesBevyAssetLoad, Deserialize, Clone, Debug)]
-#[serde(deny_unknown_fields)]
-pub struct TranslationsMeta {
-    // TODO: Custom implementation of BonesBevyAssetLoad that will detect the system locale with the sys-locale crate.
-    /// The locale setting detected on the user's system
-    #[serde(skip)]
-    #[asset(deserialize_only)]
-    pub detected_locale: LanguageIdentifier,
-    /// The default locale that will be used if a message is not found in the user's selected locale
-    #[asset(deserialize_only)]
-    pub default_locale: LanguageIdentifier,
-    /// The handles to the locale bundle assets
-    pub locales: Vec<AssetHandle<BundleAsset>>,
-}
diff --git a/src/metadata/settings.rs b/src/metadata/settings.rs
deleted file mode 100644
index 7c2808bb85..0000000000
--- a/src/metadata/settings.rs
+++ /dev/null
@@ -1,81 +0,0 @@
-use std::borrow::Cow;
-
-use bevy::prelude::Gamepad;
-use leafwing_input_manager::{axislike::VirtualDPad, prelude::InputMap, user_input::InputKind};
-use serde::{Deserialize, Serialize};
-
-use crate::{input::PlayerAction, platform::Storage};
-
-use super::GameMeta;
-
-/// Global settings, stored and accessed through [`crate::platform::Storage`]
-#[derive(Deserialize, Serialize, Debug, Clone)]
-pub struct Settings {
-    /// The player controller bindings
-    pub player_controls: PlayerControlMethods,
-    /// The address of the matchmaking server to connect to for online games.
-    pub matchmaking_server: String,
-}
-
-impl Settings {
-    /// The key used to store the settings in the [`crate::platform::Storage`] resource.
-    pub const STORAGE_KEY: &'static str = "settings";
-
-    pub fn get_stored_or_default<'w>(
-        game: &'w GameMeta,
-        storage: &'w mut Storage,
-    ) -> Cow<'w, Self> {
-        if let Some(settings) = storage.get::<Self>(Self::STORAGE_KEY) {
-            Cow::Owned(settings)
-        } else {
-            Cow::Borrowed(&game.default_settings)
-        }
-    }
-}
-
-#[derive(Deserialize, Serialize, Clone, Debug)]
-pub struct PlayerControlMethods {
-    /// Controls for game remotes
-    pub gamepad: PlayerControls,
-    /// Controls for keyboard player 1
-    pub keyboard1: PlayerControls,
-    /// Controls for keyboard player 2
-    pub keyboard2: PlayerControls,
-}
-
-impl PlayerControlMethods {
-    /// Get the input map for the given player index
-    pub fn get_input_map(&self, player_idx: usize) -> InputMap<PlayerAction> {
-        let mut input_map = InputMap::default();
-
-        input_map.set_gamepad(Gamepad { id: player_idx });
-
-        let mut add_controls = |ctrls: &PlayerControls| {
-            input_map.insert(ctrls.movement.clone(), PlayerAction::Move);
-            input_map.insert(ctrls.jump, PlayerAction::Jump);
-            input_map.insert(ctrls.grab, PlayerAction::Grab);
-            input_map.insert(ctrls.shoot, PlayerAction::Shoot);
-            input_map.insert(ctrls.slide, PlayerAction::Slide);
-        };
-
-        add_controls(&self.gamepad);
-
-        match player_idx {
-            0 => add_controls(&self.keyboard1),
-            1 => add_controls(&self.keyboard2),
-            _ => (),
-        }
-
-        input_map
-    }
-}
-
-/// Binds inputs to player actions
-#[derive(Deserialize, Serialize, Clone, Debug)]
-pub struct PlayerControls {
-    pub movement: VirtualDPad,
-    pub jump: InputKind,
-    pub grab: InputKind,
-    pub shoot: InputKind,
-    pub slide: InputKind,
-}
diff --git a/src/metadata/ui.rs b/src/metadata/ui.rs
deleted file mode 100644
index 2649879127..0000000000
--- a/src/metadata/ui.rs
+++ /dev/null
@@ -1,262 +0,0 @@
-use std::sync::Arc;
-
-use crate::assets::EguiFont;
-
-use super::*;
-
-#[derive(BonesBevyAssetLoad, Deserialize, Clone, Debug)]
-#[serde(deny_unknown_fields)]
-pub struct UIThemeMeta {
-    pub scale: f32,
-    pub font_families: HashMap<String, AssetHandle<EguiFont>>,
-    pub font_styles: FontStylesMeta,
-    pub button_styles: ButtonStylesMeta,
-    pub hud: HudThemeMeta,
-    pub panel: PanelThemeMeta,
-    pub colors: UiThemeColors,
-    pub widgets: UiThemeWidgets,
-    pub debug_window_fill: ColorMeta,
-    pub editor: UiThemeEditor,
-}
-
-#[derive(BonesBevyAssetLoad, Deserialize, Clone, Debug)]
-#[serde(deny_unknown_fields)]
-pub struct UiThemeEditor {
-    pub icons: UiThemeEditorIcons,
-}
-
-#[derive(BonesBevyAssetLoad, Deserialize, Clone, Debug)]
-#[serde(deny_unknown_fields)]
-pub struct UiThemeEditorIcons {
-    pub elements: ImageMeta,
-    pub tiles: ImageMeta,
-    pub select: ImageMeta,
-    pub collisions: ImageMeta,
-}
-
-impl UiThemeEditorIcons {
-    pub fn as_mut_list(&mut self) -> [&mut ImageMeta; 4] {
-        [
-            &mut self.elements,
-            &mut self.select,
-            &mut self.tiles,
-            &mut self.collisions,
-        ]
-    }
-}
-
-#[derive(BonesBevyAssetLoad, Deserialize, Clone, Debug)]
-#[serde(deny_unknown_fields)]
-pub struct UiThemeColors {
-    pub positive: ColorMeta,
-}
-
-#[derive(BonesBevyAssetLoad, Deserialize, Clone, Debug)]
-#[serde(deny_unknown_fields)]
-pub struct UiThemeWidgets {
-    pub border_radius: f32,
-
-    pub active: WidgetStyle,
-    pub default: WidgetStyle,
-    pub hovered: WidgetStyle,
-    pub noninteractive: WidgetStyle,
-    pub menu: WidgetStyle,
-}
-
-impl UiThemeWidgets {
-    pub fn get_egui_widget_style(&self) -> egui::style::Widgets {
-        egui::style::Widgets {
-            noninteractive: self
-                .noninteractive
-                .get_egui_widget_visuals(self.border_radius),
-            inactive: self.default.get_egui_widget_visuals(self.border_radius),
-            hovered: self.hovered.get_egui_widget_visuals(self.border_radius),
-            active: self.active.get_egui_widget_visuals(self.border_radius),
-            open: self.menu.get_egui_widget_visuals(self.border_radius),
-        }
-    }
-}
-
-#[derive(BonesBevyAssetLoad, Deserialize, Clone, Debug)]
-#[serde(deny_unknown_fields)]
-pub struct WidgetStyle {
-    pub bg_fill: ColorMeta,
-    pub bg_stroke: ColorMeta,
-    pub text: ColorMeta,
-    #[serde(default)]
-    pub expansion: f32,
-}
-
-impl WidgetStyle {
-    pub fn get_egui_widget_visuals(&self, border_radius: f32) -> egui::style::WidgetVisuals {
-        egui::style::WidgetVisuals {
-            expansion: self.expansion,
-            bg_fill: self.bg_fill.into_egui(),
-            weak_bg_fill: self.bg_fill.into_egui(), // TODO: Does this need to be different?
-            bg_stroke: egui::Stroke::new(2.0, self.bg_stroke.into_egui()),
-            fg_stroke: egui::Stroke::new(2.0, self.text.into_egui()),
-            rounding: egui::Rounding::same(border_radius),
-        }
-    }
-}
-
-#[derive(BonesBevyAssetLoad, Deserialize, Clone, Debug)]
-#[serde(deny_unknown_fields)]
-pub struct FontStylesMeta {
-    pub normal: FontMeta,
-    pub heading: FontMeta,
-    pub bigger: FontMeta,
-    pub smaller: FontMeta,
-}
-
-#[derive(BonesBevyAssetLoad, Deserialize, Clone, Debug)]
-#[serde(deny_unknown_fields)]
-pub struct ButtonStylesMeta {
-    pub normal: ButtonThemeMeta,
-    pub small: ButtonThemeMeta,
-}
-
-impl ButtonStylesMeta {
-    pub fn as_list(&mut self) -> [&mut ButtonThemeMeta; 2] {
-        [&mut self.normal, &mut self.small]
-    }
-}
-
-/// This is a helper to reduce clones on font family strings for egui
-#[derive(Deserialize, Clone, Debug)]
-#[serde(from = "String")]
-pub struct FontFamily(Arc<str>);
-
-impl From<String> for FontFamily {
-    fn from(s: String) -> Self {
-        Self(Arc::from(s))
-    }
-}
-
-impl From<FontFamily> for egui::FontFamily {
-    fn from(family: FontFamily) -> Self {
-        Self::Name(family.0)
-    }
-}
-
-#[derive(BonesBevyAssetLoad, Deserialize, Clone, Debug)]
-#[serde(deny_unknown_fields)]
-pub struct FontMeta {
-    #[asset(deserialize_only)]
-    pub family: FontFamily,
-    pub size: f32,
-    #[serde(default)]
-    pub color: ColorMeta,
-}
-
-impl From<FontMeta> for egui::FontSelection {
-    fn from(meta: FontMeta) -> Self {
-        egui::FontSelection::FontId(egui::FontId {
-            size: meta.size,
-            family: meta.family.into(),
-        })
-    }
-}
-
-impl FontMeta {
-    pub fn colored(&self, color: ColorMeta) -> Self {
-        let mut meta = self.clone();
-        meta.color = color;
-        meta
-    }
-
-    pub fn font_id(&self) -> egui::FontId {
-        egui::FontId {
-            size: self.size,
-            family: self.family.clone().into(),
-        }
-    }
-}
-
-#[derive(BonesBevyAssetLoad, Deserialize, Clone, Debug)]
-#[serde(deny_unknown_fields)]
-pub struct HudThemeMeta {
-    pub player_hud_width: f32,
-    pub portrait_frame: BorderImageMeta,
-    pub font: FontMeta,
-    pub lifebar: ProgressBarMeta,
-}
-
-#[derive(BonesBevyAssetLoad, Deserialize, Clone, Debug)]
-#[serde(deny_unknown_fields)]
-pub struct PanelThemeMeta {
-    #[serde(default)]
-    pub font_color: ColorMeta,
-    #[serde(default)]
-    pub padding: MarginMeta,
-    pub border: BorderImageMeta,
-}
-
-#[derive(BonesBevyAssetLoad, Deserialize, Clone, Debug)]
-#[serde(deny_unknown_fields)]
-pub struct ButtonThemeMeta {
-    pub font: FontMeta,
-    #[serde(default)]
-    pub padding: MarginMeta,
-    pub borders: ButtonBordersMeta,
-}
-
-#[derive(BonesBevyAssetLoad, Deserialize, Clone, Debug)]
-#[serde(deny_unknown_fields)]
-pub struct BorderImageMeta {
-    pub image: AssetHandle<Image>,
-    pub image_size: UVec2,
-    #[serde(default)]
-    pub border_size: MarginMeta,
-    #[serde(default = "f32_one")]
-    pub scale: f32,
-    #[serde(skip)]
-    #[asset(deserialize_only)]
-    pub egui_texture: egui::TextureId,
-}
-
-fn f32_one() -> f32 {
-    1.0
-}
-
-#[derive(BonesBevyAssetLoad, Deserialize, Clone, Debug)]
-#[serde(deny_unknown_fields)]
-pub struct ProgressBarMeta {
-    pub height: f32,
-    pub background_image: BorderImageMeta,
-    pub progress_image: BorderImageMeta,
-}
-
-#[derive(BonesBevyAssetLoad, Deserialize, Clone, Debug)]
-#[serde(deny_unknown_fields)]
-pub struct ButtonBordersMeta {
-    pub default: BorderImageMeta,
-    #[serde(default)]
-    pub focused: Option<BorderImageMeta>,
-    #[serde(default)]
-    pub clicked: Option<BorderImageMeta>,
-}
-
-#[derive(BonesBevyAssetLoad, Default, Deserialize, Clone, Copy, Debug)]
-#[serde(deny_unknown_fields, default)]
-pub struct MarginMeta {
-    #[serde(default)]
-    pub top: f32,
-    #[serde(default)]
-    pub bottom: f32,
-    #[serde(default)]
-    pub left: f32,
-    #[serde(default)]
-    pub right: f32,
-}
-
-impl From<MarginMeta> for bevy_egui::egui::style::Margin {
-    fn from(m: MarginMeta) -> Self {
-        Self {
-            left: m.left,
-            right: m.right,
-            top: m.top,
-            bottom: m.bottom,
-        }
-    }
-}
diff --git a/src/networking.md b/src/networking.md
deleted file mode 100644
index 1dfc63217d..0000000000
--- a/src/networking.md
+++ /dev/null
@@ -1,74 +0,0 @@
-Networked multi-player plugin.
-
-Jumpy uses a Peer-to-Peer, rollback networking model built on [GGRS].
-
-Messages are serialized/deserialized to a binary representation using [`serde`] and the [`postcard`]
-crate.
-
-The major facets of our networking are:
-
-- **[Matchmaking](#matchmaking):** How we connect clients to each-other and start an network match.
-- **[Synchronization](#synchronization):** How we synchronize a network game between multiple players.
-
-[ggrs]: https://github.com/gschup/ggrs
-[`serde`]: https://docs.rs/serde
-[`postcard`]: https://docs.rs/postcard
-
-## Matchmaking
-
-There are currently two different matchmaking strategies: [`online`] and [`lan`]. Both of those
-modules contain their own matchmaker with docs on how it works. Eventually we will probably have
-additional matchmakers for Steam and the browser.
-
-Regardless of the matchmaker, the goal is to find a match and establish a connection to the other
-players. Once a match is established, the matchmaker must provide an implementation of
-[`NetworkSocket`] that may be used to send [GGRS], reliable, and unreliable messages.
-
-Each matchmaker is free to implement this socket with whatever networking transport they wish,
-allowing the Steam matchmaker, for example, to use the steam networking library, and the browser
-matchmaker to use `WebTransport` or `WebRTC`.
-
-## Synchronization
-
-Match synchronization, as mentioned above, is accomplished with [GGRS], wich is a re-imagining of
-the [GGPO] network SDK.
-
-The [`NetworkSocket`] trait, which matchmakers are required to implement for their sockets, is
-required to return an implementation of GGRS's [`NonBlockingSocket`] trait, so that it can send it's
-unreliable messages. The exact method for sending these messages depends on the matchmaker.
-
-The key requirement for rollback networking is:
-
-- The synchronized game loop must be **deterministic**.
-- We must have the ability to **snapshot** and **restore** the game state.
-- We must be able to run up to 8 game simulation frames in 16ms ( to achieve a 60 FPS frame rate,
-  even in the case where we have to rollback and re-simulate ).
-
-These requirements are provided for primarily by [`bones_lib`]. The core match logic is implemented
-in [`jumpy_core::session::CoreSession`][::jumpy_core::session::CoreSession], allowing us to advance
-the game, snapshot the game, and restore it.
-
-The integration with GGRS is implemented by the [`GgrsSessionRunner`].
-
-[`NonBlockingSocket`]: https://docs.rs/ggrs/0.9.2/ggrs/trait.NonBlockingSocket.html
-[ggpo]: https://github.com/pond3r/ggpo/tree/master
-[`bones_lib`]: https://fishfolk.github.io/bones/rustdoc/bones_lib/index.html
-
-## Development & Debugging
-
-Here are some tips for debugging networking features while developing.
-
-### Local Sync Test
-
-It can be cumbersome to start a new networked match every time you need to troubleshoot some part of
-the game that may not be rolling back or restoring properly. To help with this, you can run the game
-with the `--sync-test-check-distance 7` to make the game test rolling back and forward 8 times every
-frame as a test when starting a local game.
-
-This allows you to test the rollback without having to connect to a server. If things start popping
-around the map or having other weird behaviors that they don't have without the sync-test mode, then
-you know you have a rollback issue.
-
-> **ℹ️ Note:** Just because you **don't** have an issue in sync test mode, doesn't mean that there
-> is no determinism issues. You still have to test network games with multiple game instances. There
-> are some non-determinism issues that only exhibit themselves when restarting the game.
diff --git a/src/networking.rs b/src/networking.rs
deleted file mode 100644
index 1712bbe839..0000000000
--- a/src/networking.rs
+++ /dev/null
@@ -1,390 +0,0 @@
-#![doc = include_str!("./networking.md")]
-
-use ggrs::{NetworkStats, P2PSession, PlayerHandle};
-use jumpy_core::input::PlayerControl;
-use rand::Rng;
-
-use crate::{
-    networking::debug::{NetworkDebugMessage, NETWORK_DEBUG_CHANNEL},
-    prelude::*,
-};
-
-pub mod certs;
-pub mod debug;
-pub mod lan;
-pub mod online;
-pub mod proto;
-
-/// The muliplier for the [`jumpy_core::FPS`] that will be used when playing an online match.
-///
-/// Lowering the frame rate a little for online matches reduces bandwidth and may help overall
-/// gameplay. This may not be necessary once we improve network performance.
-pub const NETWORK_FRAME_RATE_FACTOR: f32 = 0.9;
-
-/// Number of frames client may predict beyond confirmed frame before freezing and waiting
-/// for inputs from other players.
-pub const NETWORK_MAX_PREDICTION_WINDOW: usize = 10;
-
-/// The [`ggrs::Config`] implementation used by Jumpy.
-#[derive(Debug)]
-pub struct GgrsConfig;
-impl ggrs::Config for GgrsConfig {
-    type Input = proto::DensePlayerControl;
-    type State = bones::World;
-    /// Addresses are the same as the player handle for our custom socket.
-    type Address = usize;
-}
-
-/// The network endpoint used for all QUIC network communications.
-pub static NETWORK_ENDPOINT: Lazy<quinn::Endpoint> = Lazy::new(|| {
-    // Generate certificate
-    let (cert, key) = certs::generate_self_signed_cert().unwrap();
-
-    let mut transport_config = quinn::TransportConfig::default();
-    transport_config.keep_alive_interval(Some(std::time::Duration::from_secs(5)));
-
-    let mut server_config = quinn::ServerConfig::with_single_cert([cert].to_vec(), key).unwrap();
-    server_config.transport = Arc::new(transport_config);
-
-    // Open Socket and create endpoint
-    let port = rand::thread_rng().gen_range(10000..=11000); // Bind a random port
-    info!(port, "Started network endpoint");
-    let socket = std::net::UdpSocket::bind(("0.0.0.0", port)).unwrap();
-
-    let client_config = rustls::ClientConfig::builder()
-        .with_safe_defaults()
-        .with_custom_certificate_verifier(certs::SkipServerVerification::new())
-        .with_no_client_auth();
-    let client_config = quinn::ClientConfig::new(Arc::new(client_config));
-
-    let mut endpoint = quinn::Endpoint::new(
-        quinn::EndpointConfig::default(),
-        Some(server_config),
-        socket,
-        Arc::new(quinn_runtime_bevy::BevyIoTaskPoolExecutor),
-    )
-    .unwrap();
-
-    endpoint.set_default_client_config(client_config);
-
-    endpoint
-});
-
-/// Resource containing the [`NetworkSocket`] implementation while there is a connection to a
-/// network game.
-///
-/// This is inserted into the world after a match has been established by a network matchmaker.
-#[derive(Resource, Deref, DerefMut)]
-pub struct NetworkMatchSocket(pub Box<dyn NetworkSocket>);
-
-/// A type-erased [`ggrs::NonBlockingSocket`][crate::external::ggrs::NonBlockingSocket]
-/// implementation.
-#[derive(Deref, DerefMut)]
-pub struct BoxedNonBlockingSocket(Box<dyn ggrs::NonBlockingSocket<usize> + 'static>);
-
-impl ggrs::NonBlockingSocket<usize> for BoxedNonBlockingSocket {
-    fn send_to(&mut self, msg: &ggrs::Message, addr: &usize) {
-        self.0.send_to(msg, addr)
-    }
-
-    fn receive_all_messages(&mut self) -> Vec<(usize, ggrs::Message)> {
-        self.0.receive_all_messages()
-    }
-}
-
-/// Trait that must be implemented by socket connections establish by matchmakers.
-///
-/// The [`NetworkMatchSocket`] resource will contain an instance of this trait and will be used by
-/// the game to send network messages after a match has been established.
-pub trait NetworkSocket: Sync + Send {
-    /// Get a GGRS socket from this network socket.
-    fn ggrs_socket(&self) -> BoxedNonBlockingSocket;
-    /// Send a reliable message to the given [`SocketTarget`].
-    fn send_reliable(&self, target: SocketTarget, message: &[u8]);
-    /// Receive reliable messages from other players. The `usize` is the index of the player that
-    /// sent the message.
-    fn recv_reliable(&self) -> Vec<(usize, Vec<u8>)>;
-    /// Close the connection.
-    fn close(&self);
-    /// Get the player index of the local player.
-    fn player_idx(&self) -> usize;
-    /// Return, for every player index, whether the player is a local player.
-    fn player_is_local(&self) -> [bool; MAX_PLAYERS];
-    /// Get the player count for this network match.
-    fn player_count(&self) -> usize;
-}
-
-/// The destination for a reliable network message.
-pub enum SocketTarget {
-    /// Send to a specific player.
-    Player(usize),
-    /// Broadcast to all players.
-    All,
-}
-
-/// [`SessionRunner`] implementation that uses [`ggrs`][crate::external::ggrs] for network play.
-///
-/// This is where the whole `ggrs` integration is implemented.
-pub struct GgrsSessionRunner {
-    /// The last player input we detected.
-    pub last_player_input: PlayerControl,
-    /// The core game session.
-    pub core: CoreSession,
-    /// The GGRS peer-to-peer session.
-    pub session: P2PSession<GgrsConfig>,
-    /// Array containing a flag indicating, for each player, whether they are a local player.
-    pub player_is_local: [bool; MAX_PLAYERS],
-    /// The frame time delta.
-    pub delta: f32,
-    /// The frame time accumulator, used to produce a fixed refresh rate.
-    pub accumulator: f32,
-}
-
-/// The info required to create a [`GgrsSessionRunner`].
-pub struct GgrsSessionRunnerInfo {
-    /// The GGRS socket implementation to use.
-    pub socket: BoxedNonBlockingSocket,
-    /// The list of local players.
-    pub player_is_local: [bool; MAX_PLAYERS],
-    /// the player count.
-    pub player_count: usize,
-}
-
-impl GgrsSessionRunner {
-    /// Create a new sessino runner.
-    pub fn new(mut core: CoreSession, info: GgrsSessionRunnerInfo) -> Self
-    where
-        Self: Sized,
-    {
-        core.time_step = 1.0 / (jumpy_core::FPS * NETWORK_FRAME_RATE_FACTOR);
-        let mut builder = ggrs::SessionBuilder::new()
-            .with_num_players(info.player_count)
-            .with_max_prediction_window(NETWORK_MAX_PREDICTION_WINDOW)
-            .with_input_delay(1)
-            .with_fps((jumpy_core::FPS * NETWORK_FRAME_RATE_FACTOR) as usize)
-            .unwrap();
-
-        for i in 0..info.player_count {
-            if info.player_is_local[i] {
-                builder = builder.add_player(ggrs::PlayerType::Local, i).unwrap();
-            } else {
-                builder = builder.add_player(ggrs::PlayerType::Remote(i), i).unwrap();
-            }
-        }
-
-        let session = builder.start_p2p_session(info.socket).unwrap();
-
-        Self {
-            last_player_input: PlayerControl::default(),
-            core,
-            session,
-            player_is_local: info.player_is_local,
-            accumulator: default(),
-            delta: default(),
-        }
-    }
-}
-
-/// Get a [`proto::DensePlayerControl`] from a normal [`PlayerControl`].
-fn get_dense_input(control: &PlayerControl) -> proto::DensePlayerControl {
-    let mut dense_control = proto::DensePlayerControl::default();
-    dense_control.set_jump_pressed(control.jump_just_pressed);
-    dense_control.set_grab_pressed(control.grab_pressed);
-    dense_control.set_slide_pressed(control.slide_pressed);
-    dense_control.set_shoot_pressed(control.shoot_pressed);
-    dense_control.set_move_direction(proto::DenseMoveDirection(control.move_direction));
-    dense_control
-}
-
-impl crate::session::SessionRunner for GgrsSessionRunner {
-    fn core_session(&mut self) -> &mut CoreSession {
-        &mut self.core
-    }
-
-    fn restart(&mut self) {
-        self.core.restart()
-    }
-
-    fn set_player_input(&mut self, player_idx: usize, control: PlayerControl) {
-        if !self.player_is_local[player_idx] {
-            return;
-        }
-        self.last_player_input = control;
-    }
-
-    fn advance(&mut self, bevy_world: &mut World) -> Result<(), SessionError> {
-        const STEP: f32 = 1.0 / (jumpy_core::FPS * NETWORK_FRAME_RATE_FACTOR);
-        let delta = self.delta;
-        let local_player_idx = self.network_player_idx().unwrap();
-
-        self.accumulator += delta;
-
-        let mut skip_frames = 0;
-
-        // Current frame before we start network update loop
-        let current_frame_original = self.session.current_frame();
-        for event in self.session.events() {
-            match event {
-                ggrs::GGRSEvent::Synchronizing { addr, total, count } => {
-                    info!(player=%addr, %total, progress=%count, "Syncing network player");
-                }
-                ggrs::GGRSEvent::Synchronized { addr } => {
-                    info!(player=%addr, "Syncrhonized network client");
-                }
-                ggrs::GGRSEvent::Disconnected { .. } => return Err(SessionError::Disconnected),
-                ggrs::GGRSEvent::NetworkInterrupted { addr, .. } => {
-                    info!(player=%addr, "Network player interrupted");
-                }
-                ggrs::GGRSEvent::NetworkResumed { addr } => {
-                    info!(player=%addr, "Network player re-connected");
-                }
-                ggrs::GGRSEvent::WaitRecommendation {
-                    skip_frames: skip_count,
-                } => {
-                    info!(
-                        "Skipping {skip_count} frames to give network players a chance to catch up"
-                    );
-                    skip_frames = skip_count;
-                    NETWORK_DEBUG_CHANNEL
-                        .sender
-                        .try_send(NetworkDebugMessage::SkipFrame {
-                            frame: current_frame_original,
-                            count: skip_count,
-                        })
-                        .unwrap();
-                }
-                ggrs::GGRSEvent::DesyncDetected {
-                    frame,
-                    local_checksum,
-                    remote_checksum,
-                    addr,
-                } => {
-                    error!(%frame, %local_checksum, %remote_checksum, player=%addr, "Network de-sync detected");
-                }
-            }
-        }
-
-        loop {
-            self.session
-                .add_local_input(local_player_idx, get_dense_input(&self.last_player_input))
-                .unwrap();
-            if self.accumulator >= STEP {
-                self.accumulator -= STEP;
-
-                let current_frame = self.session.current_frame();
-                let confirmed_frame = self.session.confirmed_frame();
-                NETWORK_DEBUG_CHANNEL
-                    .sender
-                    .try_send(NetworkDebugMessage::FrameUpdate {
-                        current: current_frame,
-                        last_confirmed: confirmed_frame,
-                    })
-                    .unwrap();
-
-                if skip_frames > 0 {
-                    skip_frames = skip_frames.saturating_sub(1);
-                    continue;
-                }
-
-                match self.session.advance_frame() {
-                    Ok(requests) => {
-                        for request in requests {
-                            match request {
-                                ggrs::GGRSRequest::SaveGameState { cell, frame } => {
-                                    cell.save(frame, Some(self.core.world.clone()), None)
-                                }
-                                ggrs::GGRSRequest::LoadGameState { cell, .. } => {
-                                    let world = cell.load().unwrap_or_default();
-                                    self.core.world = world;
-                                }
-                                ggrs::GGRSRequest::AdvanceFrame {
-                                    inputs: network_inputs,
-                                } => {
-                                    self.core.update_input(|inputs| {
-                                        for (player_idx, (input, _status)) in
-                                            network_inputs.into_iter().enumerate()
-                                        {
-                                            let control = &mut inputs.players[player_idx].control;
-
-                                            let jump_pressed = input.jump_pressed();
-                                            control.jump_just_pressed =
-                                                jump_pressed && !control.jump_pressed;
-                                            control.jump_pressed = jump_pressed;
-
-                                            let grab_pressed = input.grab_pressed();
-                                            control.grab_just_pressed =
-                                                grab_pressed && !control.grab_pressed;
-                                            control.grab_pressed = grab_pressed;
-
-                                            let shoot_pressed = input.shoot_pressed();
-                                            control.shoot_just_pressed =
-                                                shoot_pressed && !control.shoot_pressed;
-                                            control.shoot_pressed = shoot_pressed;
-
-                                            let was_moving =
-                                                control.move_direction.length_squared()
-                                                    > f32::MIN_POSITIVE;
-                                            control.move_direction = input.move_direction().0;
-                                            let is_moving = control.move_direction.length_squared()
-                                                > f32::MIN_POSITIVE;
-                                            control.just_moved = !was_moving && is_moving;
-                                        }
-                                    });
-                                    self.core.advance(bevy_world);
-                                }
-                            }
-                        }
-                    }
-                    Err(e) => match e {
-                        ggrs::GGRSError::NotSynchronized => {
-                            debug!("Waiting for network clients to sync")
-                        }
-                        ggrs::GGRSError::PredictionThreshold => {
-                            warn!("Freezing game while waiting for network to catch-up.");
-                            NETWORK_DEBUG_CHANNEL
-                                .sender
-                                .try_send(NetworkDebugMessage::FrameFroze {
-                                    frame: self.session.current_frame(),
-                                })
-                                .unwrap();
-                        }
-                        e => error!("Network protocol error: {e}"),
-                    },
-                }
-            } else {
-                break;
-            }
-        }
-
-        // Fetch GGRS network stats of remote players and send to net debug tool
-        let mut network_stats: Vec<(PlayerHandle, NetworkStats)> = vec![];
-        for handle in self.session.remote_player_handles().iter() {
-            if let Ok(stats) = self.session.network_stats(*handle) {
-                network_stats.push((*handle, stats));
-            }
-        }
-        if !network_stats.is_empty() {
-            NETWORK_DEBUG_CHANNEL
-                .sender
-                .try_send(NetworkDebugMessage::NetworkStats { network_stats })
-                .unwrap();
-        }
-
-        Ok(())
-    }
-
-    fn run_criteria(&mut self, time: &Time) -> ShouldRun {
-        self.delta = time.delta_seconds();
-        ShouldRun::Yes
-    }
-
-    fn network_player_idx(&mut self) -> Option<usize> {
-        // We are the first local player
-        for i in 0..MAX_PLAYERS {
-            if self.player_is_local[i] {
-                return Some(i);
-            }
-        }
-        unreachable!();
-    }
-}
diff --git a/src/networking/certs.rs b/src/networking/certs.rs
deleted file mode 100644
index dffc90746f..0000000000
--- a/src/networking/certs.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-//! QUIC certificate utilities.
-//!
-//!
-
-use std::sync::Arc;
-
-/// Implementation of `ServerCertVerifier` that verifies everything as trustworthy.
-///
-/// This allows us to connect to servers without having to worry about domain verification.
-///
-/// TODO: In the future we may want to do domain verification, but allow opting out of it.
-pub struct SkipServerVerification;
-
-impl SkipServerVerification {
-    pub fn new() -> Arc<Self> {
-        Arc::new(Self)
-    }
-}
-
-impl rustls::client::ServerCertVerifier for SkipServerVerification {
-    fn verify_server_cert(
-        &self,
-        _end_entity: &rustls::Certificate,
-        _intermediates: &[rustls::Certificate],
-        _server_name: &rustls::ServerName,
-        _scts: &mut dyn Iterator<Item = &[u8]>,
-        _ocsp_response: &[u8],
-        _now: std::time::SystemTime,
-    ) -> Result<rustls::client::ServerCertVerified, rustls::Error> {
-        Ok(rustls::client::ServerCertVerified::assertion())
-    }
-}
-
-/// Generates a self-signed cert for use in QUIC connections.
-pub fn generate_self_signed_cert() -> anyhow::Result<(rustls::Certificate, rustls::PrivateKey)> {
-    let cert = rcgen::generate_simple_self_signed(vec!["localhost".to_string()])?;
-    let key = rustls::PrivateKey(cert.serialize_private_key_der());
-    Ok((rustls::Certificate(cert.serialize_der()?), key))
-}
diff --git a/src/networking/debug.rs b/src/networking/debug.rs
deleted file mode 100644
index cead91554b..0000000000
--- a/src/networking/debug.rs
+++ /dev/null
@@ -1,285 +0,0 @@
-use async_channel::{Receiver, Sender};
-use bevy::prelude::{Res, ResMut, Resource};
-use bevy_egui::{
-    egui::{
-        self,
-        plot::{Bar, BarChart, GridMark, Plot},
-    },
-    EguiContexts,
-};
-use bevy_fluent::Localization;
-use ggrs::{NetworkStats, PlayerHandle};
-use once_cell::sync::Lazy;
-
-use crate::prelude::{debug_tools::ShowDebugWindows, LocalizationExt};
-
-use super::NETWORK_MAX_PREDICTION_WINDOW;
-
-/// Messages used by network debug channel
-pub enum NetworkDebugMessage {
-    /// Reset network diag on new session.
-    ResetData,
-
-    /// Notifies that frames were skipped, and the frame at start of net
-    /// update loop containing skips.
-    SkipFrame { frame: i32, count: u32 },
-    /// Update with current frame and the last confirmed frame.
-    FrameUpdate { current: i32, last_confirmed: i32 },
-    /// Update that network update loop starting at this frame froze waiting
-    /// for inputs from other clients after reaching max prediction window.
-    FrameFroze { frame: i32 },
-    /// Network stats per remote player
-    NetworkStats {
-        network_stats: Vec<(PlayerHandle, NetworkStats)>,
-    },
-}
-
-/// Sender and receiver for [`NetworkDebugMessage`] for network diagnostics debug tool.
-pub struct NetworkDebugChannel {
-    pub receiver: Receiver<NetworkDebugMessage>,
-    pub sender: Sender<NetworkDebugMessage>,
-}
-
-impl Default for NetworkDebugChannel {
-    fn default() -> Self {
-        let (sender, receiver) = async_channel::unbounded();
-        Self { sender, receiver }
-    }
-}
-
-pub struct NetworkFrameData {
-    /// How many frames we are predicted ahead of last confirmed frame?
-    pub predicted_frames: i32,
-    pub current_frame: i32,
-    /// Did frame freeze waiting for other inputs?
-    pub froze: bool,
-}
-
-impl NetworkFrameData {
-    pub fn new(confirmed: i32, current: i32) -> Self {
-        Self {
-            // confirmed may be -1 on start of match.
-            predicted_frames: current - std::cmp::max(confirmed, 0),
-            current_frame: current,
-            froze: false,
-        }
-    }
-}
-
-/// Data captured from networking for debugging purposes.
-#[derive(Resource)]
-pub struct NetworkDebug {
-    /// Last confirmed frame
-    pub confirmed_frame: i32,
-    pub current_frame: i32,
-
-    /// Amount of frames skipped on last update that had skips.
-    pub last_skipped_frame_count: u32,
-    /// Last frame of net update loop that had skipped frames.
-    pub last_frame_with_skips: i32,
-
-    pub frame_buffer: Vec<NetworkFrameData>,
-
-    /// How many frames to display in bar graph visualizer
-    pub frame_buffer_display_size: usize,
-
-    /// Is network debug tool paused.
-    pub paused: bool,
-
-    /// Network stats per connection to remote player
-    pub network_stats: Vec<(PlayerHandle, NetworkStats)>,
-}
-
-impl Default for NetworkDebug {
-    fn default() -> Self {
-        Self {
-            confirmed_frame: 0,
-            current_frame: 0,
-            last_skipped_frame_count: 0,
-            last_frame_with_skips: -1,
-            frame_buffer: vec![],
-            frame_buffer_display_size: 64,
-            paused: false,
-            network_stats: vec![],
-        }
-    }
-}
-
-impl NetworkDebug {
-    /// Add frame data to [`NetworkDebug`]
-    pub fn add_or_update_frame(&mut self, current: i32, confirmed: i32) {
-        if let Some(last) = self.frame_buffer.last_mut() {
-            if last.current_frame == current {
-                // Frame already buffered.
-                return;
-            }
-        }
-        self.current_frame = current;
-        self.confirmed_frame = confirmed;
-        self.frame_buffer
-            .push(NetworkFrameData::new(confirmed, current));
-    }
-
-    /// Set frame as having frozen
-    pub fn set_frozen(&mut self, frame: i32) {
-        let mut last = self.frame_buffer.last_mut().unwrap();
-        if last.current_frame == frame {
-            last.froze = true;
-        }
-    }
-}
-
-/// Async channel for sending debug messages from networking implementation
-/// to debug tools.
-pub static NETWORK_DEBUG_CHANNEL: Lazy<NetworkDebugChannel> =
-    Lazy::new(NetworkDebugChannel::default);
-
-/// System displaying network debug window
-pub fn network_debug_window(
-    mut show: ResMut<ShowDebugWindows>,
-    localization: Res<Localization>,
-    mut diagnostics: ResMut<NetworkDebug>,
-    mut egui_ctx: EguiContexts,
-) {
-    if show.network_debug {
-        while let Ok(message) = NETWORK_DEBUG_CHANNEL.receiver.try_recv() {
-            if diagnostics.paused {
-                continue;
-            }
-            match message {
-                NetworkDebugMessage::ResetData => *diagnostics = NetworkDebug::default(),
-                NetworkDebugMessage::SkipFrame { frame, count } => {
-                    diagnostics.last_frame_with_skips = frame;
-                    diagnostics.last_skipped_frame_count = count;
-                }
-                NetworkDebugMessage::FrameUpdate {
-                    current,
-                    last_confirmed: confirmed,
-                } => {
-                    diagnostics.add_or_update_frame(current, confirmed);
-                }
-                NetworkDebugMessage::FrameFroze { frame } => {
-                    diagnostics.set_frozen(frame);
-                }
-                NetworkDebugMessage::NetworkStats { network_stats } => {
-                    diagnostics.network_stats = network_stats;
-                }
-            }
-        }
-
-        if show.network_debug {
-            let frame_localized = localization.get("frame");
-            let predicted_localized = localization.get("predicted");
-            egui::Window::new(&localization.get("network-diagnostics"))
-                .id(egui::Id::new("network-diagnostics"))
-                .open(&mut show.network_debug)
-                .show(egui_ctx.ctx_mut(), |ui| {
-                    ui.monospace(&format!(
-                        "{label}: {current_frame}",
-                        label = localization.get("current-frame"),
-                        current_frame = diagnostics.current_frame
-                    ));
-                    ui.monospace(&format!(
-                        "{label}: {confirmed_frame}",
-                        label = localization.get("confirmed-frame"),
-                        confirmed_frame = diagnostics.confirmed_frame
-                    ));
-
-                    if diagnostics.last_frame_with_skips != -1 {
-                        ui.monospace(&format!(
-                            "{label}: {last_skip_frame}",
-                            label = localization.get("last-frame-with-skips"),
-                            last_skip_frame = diagnostics.last_frame_with_skips
-                        ));
-                        ui.monospace(&format!(
-                            "{label}: {skip_count}",
-                            label = localization.get("last-skipped-frame-count"),
-                            skip_count = diagnostics.last_skipped_frame_count
-                        ));
-                    } else {
-                        ui.monospace(localization.get("no-frame-skips-detected"));
-                    }
-
-                    let pause_label = if diagnostics.paused {
-                        localization.get("resume")
-                    } else {
-                        localization.get("pause")
-                    };
-                    if ui.button(pause_label).clicked() {
-                        diagnostics.paused = !diagnostics.paused;
-                    }
-
-                    let max_display_frame;
-                    if let Some(last) = diagnostics.frame_buffer.last() {
-                        max_display_frame = last.current_frame;
-                    } else {
-                        max_display_frame = diagnostics.frame_buffer_display_size as i32;
-                    }
-                    let min_display_frame =
-                        max_display_frame - diagnostics.frame_buffer_display_size as i32;
-                    Plot::new(localization.get("predicted-frames"))
-                        .allow_zoom(false)
-                        .allow_scroll(false)
-                        .allow_boxed_zoom(false)
-                        .include_x(min_display_frame)
-                        .include_x(max_display_frame)
-                        .auto_bounds_y()
-                        .include_y(NETWORK_MAX_PREDICTION_WINDOW as f64)
-                        .show_axes([false, true])
-                        .y_grid_spacer(|_grid_input| {
-                            (0..NETWORK_MAX_PREDICTION_WINDOW + 1)
-                                .into_iter()
-                                .map(|y| GridMark {
-                                    step_size: 1.0,
-                                    value: y as f64,
-                                })
-                                .collect()
-                        })
-                        .label_formatter({
-                            let frame_localized = frame_localized.clone();
-                            move |_name, value| {
-                                let frame_floor = value.x as i32;
-                                format!("{frame_localized}: {frame_floor}")
-                            }
-                        })
-                        .height(128.0)
-                        .show(ui, |plot_ui| {
-                            plot_ui.bar_chart(
-                                BarChart::new(
-                                    diagnostics
-                                        .frame_buffer
-                                        .iter()
-                                        .map(|frame| {
-                                            let color = if frame.froze {
-                                                egui::Color32::YELLOW
-                                            } else {
-                                                egui::Color32::LIGHT_BLUE
-                                            };
-                                            Bar::new(
-                                                frame.current_frame as f64,
-                                                frame.predicted_frames as f64,
-                                            )
-                                            .fill(color)
-                                        })
-                                        .collect(),
-                                )
-                                .width(1.0)
-                                .element_formatter(Box::new(move |bar, _chart| {
-                                    format!(
-                                        "{frame_localized}: {} {predicted_localized}: {}",
-                                        bar.argument as i32, bar.value as i32
-                                    )
-                                })),
-                            );
-                        });
-
-                    for (player_handle, stats) in diagnostics.network_stats.iter() {
-                        let label = format!("{} {}", localization.get("player"), player_handle);
-                        ui.collapsing(label, |ui| {
-                            ui.monospace(&format!("{stats:?}"));
-                        });
-                    }
-                });
-        }
-    }
-}
diff --git a/src/networking/lan.rs b/src/networking/lan.rs
deleted file mode 100644
index 26b57f71c3..0000000000
--- a/src/networking/lan.rs
+++ /dev/null
@@ -1,731 +0,0 @@
-//! LAN matchmaking and socket implementation.
-//!
-//! ## Matchmaking
-//!
-//! The LAN matchmaker works by allowing the player to start a match and wait for people to join it,
-//! or to join player's started match.
-//!
-//! Players hosting matches are found using the MDNS protocol. Currently the MDNS logic resides in
-//! the [`ui::main_menu::network_game`] module, in the menu code. This probably isn't the best place
-//! for it, and it should be moved into here to be a part of the [`lan_matchmaker`] task.
-//!
-//! Communication happens directly between LAN peers over the QUIC protocol.
-
-use std::{
-    net::{IpAddr, Ipv4Addr, SocketAddr, SocketAddrV4},
-    time::Duration,
-};
-
-use bevy::{tasks::IoTaskPool, utils::Instant};
-use bytes::Bytes;
-use futures_lite::{future, FutureExt};
-use mdns_sd::{ServiceDaemon, ServiceEvent, ServiceInfo};
-use smallvec::SmallVec;
-
-use super::*;
-
-pub struct ServerInfo {
-    pub service: ServiceInfo,
-    /// The ping in milliseconds
-    pub ping: Option<u16>,
-}
-
-/// Channel used to do matchmaking over LAN.
-///
-/// Spawns a task to handle the actual matchmaking.
-static LAN_MATCHMAKER: Lazy<LanMatchmaker> = Lazy::new(|| {
-    let (client, server) = bi_channel();
-
-    IoTaskPool::get().spawn(lan_matchmaker(server)).detach();
-
-    LanMatchmaker(client)
-});
-
-static MDNS: Lazy<ServiceDaemon> =
-    Lazy::new(|| ServiceDaemon::new().expect("Couldn't start MDNS service discovery thread."));
-
-const MDNS_SERVICE_TYPE: &str = "_jumpy._udp.local.";
-
-#[derive(DerefMut, Deref)]
-struct Pinger(BiChannelClient<PingerRequest, PingerResponse>);
-
-type PingerRequest = SmallVec<[Ipv4Addr; 10]>;
-type PingerResponse = SmallVec<[(Ipv4Addr, Option<u16>); 10]>;
-
-static PINGER: Lazy<Pinger> = Lazy::new(|| {
-    let (client, server) = bi_channel();
-
-    std::thread::spawn(move || pinger(server));
-
-    Pinger(client)
-});
-
-/// Host a server.
-pub fn start_server(service_info: ServiceInfo, player_count: usize) {
-    MDNS.register(service_info)
-        .expect("Could not register MDNS service.");
-    LAN_MATCHMAKER
-        .try_send(LanMatchmakerRequest::StartServer { player_count })
-        .unwrap();
-}
-
-/// Stop hosting a server.
-pub fn stop_server(service_info: &ServiceInfo) {
-    loop {
-        match MDNS.unregister(service_info.get_fullname()) {
-            Ok(_) => break,
-            Err(mdns_sd::Error::Again) => (),
-            Err(e) => {
-                panic!("Error unregistering MDNS service: {e}")
-            }
-        }
-    }
-}
-
-/// Wait for players to join a hosted server.
-pub fn wait_players(joined_players: &mut usize, service_info: &ServiceInfo) -> Option<LanSocket> {
-    while let Ok(response) = LAN_MATCHMAKER.try_recv() {
-        match response {
-            LanMatchmakerResponse::ServerStarted => {}
-            LanMatchmakerResponse::PlayerCount(count) => {
-                *joined_players = count;
-            }
-            LanMatchmakerResponse::GameStarting {
-                lan_socket,
-                player_idx,
-                player_count: _,
-            } => {
-                info!(?player_idx, "Starting network game");
-                loop {
-                    match MDNS.unregister(service_info.get_fullname()) {
-                        Ok(_) => break,
-                        Err(mdns_sd::Error::Again) => (),
-                        Err(e) => panic!("Error unregistering MDNS service: {e}"),
-                    }
-                }
-                return Some(lan_socket);
-            }
-        }
-    }
-    None
-}
-
-/// Join a server hosted by someone else.
-pub fn join_server(server: &ServerInfo) {
-    LAN_MATCHMAKER
-        .try_send(networking::lan::LanMatchmakerRequest::JoinServer {
-            ip: *server.service.get_addresses().iter().next().unwrap(),
-            port: server.service.get_port(),
-        })
-        .unwrap();
-}
-
-/// Leave a joined server.
-pub fn leave_server() {
-    LAN_MATCHMAKER
-        .try_send(LanMatchmakerRequest::StopJoin)
-        .unwrap();
-}
-
-/// Wait for a joined game to start.
-pub fn wait_game_start() -> Option<LanSocket> {
-    while let Ok(message) = LAN_MATCHMAKER.try_recv() {
-        match message {
-            LanMatchmakerResponse::ServerStarted | LanMatchmakerResponse::PlayerCount(_) => {}
-            LanMatchmakerResponse::GameStarting {
-                lan_socket,
-                player_idx,
-                player_count: _,
-            } => {
-                info!(?player_idx, "Starting network game");
-                return Some(lan_socket);
-            }
-        }
-    }
-    None
-}
-
-/// Update server pings and turn on service discovery.
-pub fn prepare_to_join(
-    servers: &mut Vec<ServerInfo>,
-    service_discovery_recv: &mut Option<mdns_sd::Receiver<ServiceEvent>>,
-    ping_update_timer: &Timer,
-) {
-    // Update server pings
-    if ping_update_timer.finished() {
-        PINGER
-            .try_send(
-                servers
-                    .iter()
-                    .map(|x| *x.service.get_addresses().iter().next().unwrap())
-                    .collect(),
-            )
-            .ok();
-    }
-    if let Ok(pings) = PINGER.try_recv() {
-        for (server, ping) in pings {
-            for info in servers.iter_mut() {
-                if info.service.get_addresses().contains(&server) {
-                    info.ping = ping;
-                }
-            }
-        }
-    }
-
-    let events = service_discovery_recv.get_or_insert_with(|| {
-        MDNS.browse(MDNS_SERVICE_TYPE)
-            .expect("Couldn't start service discovery")
-    });
-
-    while let Ok(event) = events.try_recv() {
-        match event {
-            mdns_sd::ServiceEvent::ServiceResolved(info) => servers.push(lan::ServerInfo {
-                service: info,
-                ping: None,
-            }),
-            mdns_sd::ServiceEvent::ServiceRemoved(_, full_name) => {
-                servers.retain(|server| server.service.get_fullname() != full_name);
-            }
-            _ => (),
-        }
-    }
-}
-
-/// Get the current host info or create a new one. When there's an existing
-/// service but its `service_name` is different, the service is recreated and
-/// only then the returned `bool` is `true`.
-pub fn prepare_to_host<'a>(
-    host_info: &'a mut Option<ServiceInfo>,
-    service_name: &str,
-) -> (bool, &'a mut ServiceInfo) {
-    let create_service_info = || {
-        let port = NETWORK_ENDPOINT.local_addr().unwrap().port();
-        mdns_sd::ServiceInfo::new(
-            MDNS_SERVICE_TYPE,
-            service_name,
-            service_name,
-            "",
-            port,
-            None,
-        )
-        .unwrap()
-        .enable_addr_auto()
-    };
-
-    let service_info = host_info.get_or_insert_with(create_service_info);
-
-    let mut is_recreated = false;
-    if service_info.get_hostname() != service_name {
-        stop_server(service_info);
-        is_recreated = true;
-        *service_info = create_service_info();
-    }
-    (is_recreated, service_info)
-}
-
-/// Implementation of the lan matchmaker task.
-///
-/// This is a long-running tasks that listens for messages sent through the [`LAN_MATCHMAKER`]
-/// channel.
-async fn lan_matchmaker(
-    matchmaker_channel: BiChannelServer<LanMatchmakerRequest, LanMatchmakerResponse>,
-) {
-    #[derive(Serialize, Deserialize)]
-    enum MatchmakerNetMsg {
-        MatchReady {
-            /// The peers they have for the match, with the index in the array being the player index of the peer.
-            peers: [Option<SocketAddrV4>; MAX_PLAYERS],
-            /// The player index of the player getting the message.
-            player_idx: usize,
-            player_count: usize,
-        },
-    }
-
-    while let Ok(request) = matchmaker_channel.recv().await {
-        match request {
-            // Start server
-            LanMatchmakerRequest::StartServer { mut player_count } => {
-                info!("Starting LAN server");
-                matchmaker_channel
-                    .send(LanMatchmakerResponse::ServerStarted)
-                    .await
-                    .unwrap();
-
-                let mut connections = Vec::new();
-
-                loop {
-                    let next_request = async { either::Left(matchmaker_channel.recv().await) };
-                    let next_conn = async { either::Right(NETWORK_ENDPOINT.accept().await) };
-
-                    match next_request.or(next_conn).await {
-                        // Handle more matchmaker requests
-                        either::Either::Left(next_request) => {
-                            let Ok(next_request) = next_request else { break; };
-
-                            match next_request {
-                                LanMatchmakerRequest::StartServer {
-                                    player_count: new_player_count,
-                                } => {
-                                    connections.clear();
-                                    player_count = new_player_count;
-                                }
-                                LanMatchmakerRequest::StopServer => {
-                                    break;
-                                }
-                                LanMatchmakerRequest::StopJoin => {} // Not joining, so don't do anything
-                                LanMatchmakerRequest::JoinServer { .. } => {
-                                    error!("Cannot join server while hosting server");
-                                }
-                            }
-                        }
-
-                        // Handle new connections
-                        either::Either::Right(Some(new_connection)) => {
-                            let Some(conn) = new_connection.await.ok() else { continue };
-                            connections.push(conn);
-                            let current_players = connections.len() + 1;
-                            info!(%current_players, "New player connection");
-                        }
-                        _ => (),
-                    }
-
-                    // Discard closed connections
-                    connections.retain(|conn| {
-                        if conn.close_reason().is_some() {
-                            info!("Player closed connection");
-                            false
-                        } else {
-                            true
-                        }
-                    });
-
-                    let current_players = connections.len();
-                    let target_players = player_count;
-                    info!(%current_players, %target_players);
-
-                    // If we're ready to start a match
-                    if connections.len() == player_count - 1 {
-                        info!("All players joined.");
-
-                        // Tell all clients we're ready
-                        for (i, conn) in connections.iter().enumerate() {
-                            let mut peers = [None; MAX_PLAYERS];
-                            connections
-                                .iter()
-                                .enumerate()
-                                .filter(|x| x.0 != i)
-                                .for_each(|(i, conn)| {
-                                    if let SocketAddr::V4(addr) = conn.remote_address() {
-                                        peers[i + 1] = Some(addr);
-                                    } else {
-                                        unreachable!("IPV6 not supported in LAN matchmaking");
-                                    };
-                                });
-
-                            let mut uni = conn.open_uni().await.unwrap();
-                            uni.write_all(
-                                &postcard::to_vec::<_, 20>(&MatchmakerNetMsg::MatchReady {
-                                    player_idx: i + 1,
-                                    peers,
-                                    player_count,
-                                })
-                                .unwrap(),
-                            )
-                            .await
-                            .unwrap();
-                            uni.finish().await.unwrap();
-                        }
-
-                        // Collect the list of client connections
-                        let connections = std::array::from_fn(|i| {
-                            if i == 0 {
-                                None
-                            } else {
-                                connections.get(i - 1).cloned()
-                            }
-                        });
-
-                        // Send the connections to the game so that it can start the network match.
-                        matchmaker_channel
-                            .try_send(LanMatchmakerResponse::GameStarting {
-                                lan_socket: LanSocket::new(0, connections),
-                                player_idx: 0,
-                                player_count,
-                            })
-                            .ok();
-                        info!(player_idx=0, %player_count, "Matchmaking finished");
-
-                        // Break out of the server loop
-                        break;
-
-                    // If we don't have enough players yet, send the updated player count to the game.
-                    } else if matchmaker_channel
-                        .try_send(LanMatchmakerResponse::PlayerCount(current_players))
-                        .is_err()
-                    {
-                        break;
-                    }
-                }
-
-                // Once we are done with server matchmaking
-            }
-            // Server not running or joining so do nothing
-            LanMatchmakerRequest::StopServer => (),
-            LanMatchmakerRequest::StopJoin => (),
-
-            // Join a hosted match
-            LanMatchmakerRequest::JoinServer { ip, port } => {
-                let conn = NETWORK_ENDPOINT
-                    .connect((ip, port).into(), "jumpy-host")
-                    .unwrap()
-                    .await
-                    .expect("Could not connect to server");
-
-                // Wait for match to start
-                let mut uni = conn.accept_uni().await.unwrap();
-                let bytes = uni.read_to_end(20).await.unwrap();
-                let message: MatchmakerNetMsg = postcard::from_bytes(&bytes).unwrap();
-
-                match message {
-                    MatchmakerNetMsg::MatchReady {
-                        peers: peer_addrs,
-                        player_idx,
-                        player_count,
-                    } => {
-                        info!(%player_count, %player_idx, ?peer_addrs, "Matchmaking finished");
-                        let mut peer_connections = std::array::from_fn(|_| None);
-
-                        // Set the connection to the matchmaker for player 0
-                        peer_connections[0] = Some(conn.clone());
-
-                        // For every peer with a player index that is higher than ours, wait for
-                        // them to connect to us.
-                        let range = (player_idx + 1)..player_count;
-                        info!(players=?range, "Waiting for {} peer connections", range.len());
-                        for _ in range {
-                            // Wait for connection
-                            let conn = NETWORK_ENDPOINT
-                                .accept()
-                                .await
-                                .unwrap()
-                                .await
-                                .expect("Could not accept incomming connection");
-
-                            // Receive the player index
-                            let idx = {
-                                let mut buf = [0; 1];
-                                let mut channel = conn.accept_uni().await.unwrap();
-                                channel.read_exact(&mut buf).await.unwrap();
-
-                                buf[0] as usize
-                            };
-                            assert!(idx < MAX_PLAYERS, "Invalid player index");
-
-                            peer_connections[idx] = Some(conn);
-                        }
-
-                        // For every peer with a player index lower than ours, connect to them.
-                        let range = 1..player_idx;
-                        info!(players=?range, "Connecting to {} peers", range.len());
-                        for i in range {
-                            let addr = peer_addrs[i].unwrap();
-                            let conn = NETWORK_ENDPOINT
-                                .connect(addr.into(), "jumpy-peer")
-                                .unwrap()
-                                .await
-                                .expect("Could not connect to peer");
-
-                            // Send player index
-                            let mut channel = conn.open_uni().await.unwrap();
-                            channel.write(&[player_idx as u8]).await.unwrap();
-                            channel.finish().await.unwrap();
-
-                            peer_connections[i] = Some(conn);
-                        }
-
-                        let lan_socket = LanSocket::new(player_idx, peer_connections);
-                        info!("Connections established.");
-
-                        matchmaker_channel
-                            .try_send(LanMatchmakerResponse::GameStarting {
-                                lan_socket,
-                                player_idx,
-                                player_count,
-                            })
-                            .ok();
-                    }
-                }
-            }
-        }
-    }
-}
-
-/// The type of the [`LAN_MATCHMAKER`] channel.
-#[derive(DerefMut, Deref)]
-pub struct LanMatchmaker(BiChannelClient<LanMatchmakerRequest, LanMatchmakerResponse>);
-
-/// A request that may be sent to the [`LAN_MATCHMAKER`].
-#[derive(Debug)]
-pub enum LanMatchmakerRequest {
-    StartServer { player_count: usize },
-    JoinServer { ip: Ipv4Addr, port: u16 },
-    StopServer,
-    StopJoin,
-}
-
-/// A response that may come from the [`LAN_MATCHMAKER`].
-pub enum LanMatchmakerResponse {
-    ServerStarted,
-    PlayerCount(usize),
-    GameStarting {
-        lan_socket: LanSocket,
-        player_idx: usize,
-        player_count: usize,
-    },
-}
-
-/// The LAN [`NetworkSocket`] implementation.
-#[derive(Debug, Clone)]
-pub struct LanSocket {
-    pub connections: [Option<quinn::Connection>; MAX_PLAYERS],
-    pub ggrs_receiver: async_channel::Receiver<(usize, ggrs::Message)>,
-    pub reliable_receiver: async_channel::Receiver<(usize, Vec<u8>)>,
-    pub player_idx: usize,
-    pub player_count: usize,
-}
-
-impl LanSocket {
-    pub fn new(player_idx: usize, connections: [Option<quinn::Connection>; MAX_PLAYERS]) -> Self {
-        let (ggrs_sender, ggrs_receiver) = async_channel::unbounded();
-        let (reliable_sender, reliable_receiver) = async_channel::unbounded();
-
-        let pool = bevy::tasks::IoTaskPool::get();
-
-        // Spawn tasks to receive network messages from each peer
-        #[allow(clippy::needless_range_loop)]
-        for i in 0..MAX_PLAYERS {
-            if let Some(conn) = connections[i].clone() {
-                let ggrs_sender = ggrs_sender.clone();
-
-                // Unreliable message receiver
-                let conn_ = conn.clone();
-                pool.spawn(async move {
-                    let conn = conn_;
-
-                    #[cfg(feature = "debug-network-slowdown")]
-                    use turborand::prelude::*;
-                    #[cfg(feature = "debug-network-slowdown")]
-                    let rng = AtomicRng::new();
-
-                    loop {
-                        let event =
-                            future::or(async { either::Left(conn.closed().await) }, async {
-                                either::Right(conn.read_datagram().await)
-                            })
-                            .await;
-
-                        match event {
-                            either::Either::Left(closed) => {
-                                warn!("Connection error: {closed}");
-                                break;
-                            }
-                            either::Either::Right(datagram_result) => match datagram_result {
-                                Ok(data) => {
-                                    let message: ggrs::Message = postcard::from_bytes(&data)
-                                        .expect("Could not deserialize net message");
-
-                                    // Debugging code to introduce artificial latency
-                                    #[cfg(feature = "debug-network-slowdown")]
-                                    {
-                                        use async_timer::Oneshot;
-                                        async_timer::oneshot::Timer::new(
-                                            std::time::Duration::from_millis(
-                                                (rng.f32_normalized() * 100.0) as u64 + 1,
-                                            ),
-                                        )
-                                        .await;
-                                    }
-                                    if ggrs_sender.send((i, message)).await.is_err() {
-                                        break;
-                                    }
-                                }
-                                Err(e) => {
-                                    warn!("Connection error: {e}");
-                                }
-                            },
-                        }
-                    }
-                })
-                .detach();
-
-                // Reliable message receiver
-                let reliable_sender = reliable_sender.clone();
-                pool.spawn(async move {
-                    #[cfg(feature = "debug-network-slowdown")]
-                    use turborand::prelude::*;
-                    #[cfg(feature = "debug-network-slowdown")]
-                    let rng = AtomicRng::new();
-
-                    loop {
-                        let event =
-                            future::or(async { either::Left(conn.closed().await) }, async {
-                                either::Right(conn.accept_uni().await)
-                            })
-                            .await;
-
-                        match event {
-                            either::Either::Left(closed) => {
-                                warn!("Connection error: {closed}");
-                                break;
-                            }
-                            either::Either::Right(result) => match result {
-                                Ok(mut stream) => {
-                                    let data =
-                                        stream.read_to_end(4096).await.expect("Network read error");
-
-                                    // Debugging code to introduce artificial latency
-                                    #[cfg(feature = "debug-network-slowdown")]
-                                    {
-                                        use async_timer::Oneshot;
-                                        async_timer::oneshot::Timer::new(
-                                            std::time::Duration::from_millis(
-                                                (rng.f32_normalized() * 100.0) as u64 + 1,
-                                            ),
-                                        )
-                                        .await;
-                                    }
-                                    if reliable_sender.send((i, data)).await.is_err() {
-                                        break;
-                                    }
-                                }
-                                Err(e) => {
-                                    warn!("Connection error: {e}");
-                                }
-                            },
-                        }
-                    }
-                })
-                .detach();
-            }
-        }
-
-        Self {
-            player_idx,
-            player_count: connections.iter().flatten().count() + 1,
-            connections,
-            ggrs_receiver,
-            reliable_receiver,
-        }
-    }
-}
-
-impl ggrs::NonBlockingSocket<usize> for LanSocket {
-    fn send_to(&mut self, msg: &ggrs::Message, addr: &usize) {
-        let conn = self.connections[*addr].as_ref().unwrap();
-
-        // TODO: determine a reasonable size for this buffer.
-        let msg_bytes = postcard::to_allocvec(msg).unwrap();
-        conn.send_datagram(Bytes::copy_from_slice(&msg_bytes[..]))
-            .ok();
-    }
-
-    fn receive_all_messages(&mut self) -> Vec<(usize, ggrs::Message)> {
-        let mut messages = Vec::new();
-        while let Ok(message) = self.ggrs_receiver.try_recv() {
-            messages.push(message);
-        }
-        messages
-    }
-}
-
-impl NetworkSocket for LanSocket {
-    fn send_reliable(&self, target: SocketTarget, message: &[u8]) {
-        let task_pool = IoTaskPool::get();
-        let message = Bytes::copy_from_slice(message);
-
-        match target {
-            SocketTarget::Player(i) => {
-                let conn = self.connections[i].as_ref().unwrap().clone();
-
-                task_pool
-                    .spawn(async move {
-                        let mut stream = conn.open_uni().await.unwrap();
-                        stream.write_chunk(message).await.unwrap();
-                        stream.finish().await.unwrap();
-                    })
-                    .detach();
-            }
-            SocketTarget::All => {
-                for conn in &self.connections {
-                    if let Some(conn) = conn.clone() {
-                        let message = message.clone();
-                        task_pool
-                            .spawn(async move {
-                                let mut stream = conn.open_uni().await.unwrap();
-                                stream.write_chunk(message).await.unwrap();
-                                stream.finish().await.unwrap();
-                            })
-                            .detach();
-                    }
-                }
-            }
-        }
-    }
-
-    fn recv_reliable(&self) -> Vec<(usize, Vec<u8>)> {
-        let mut messages = Vec::new();
-        while let Ok(message) = self.reliable_receiver.try_recv() {
-            messages.push(message);
-        }
-        messages
-    }
-
-    fn ggrs_socket(&self) -> BoxedNonBlockingSocket {
-        BoxedNonBlockingSocket(Box::new(self.clone()))
-    }
-
-    fn close(&self) {
-        for conn in self.connections.iter().flatten() {
-            conn.close(0u8.into(), &[]);
-        }
-    }
-
-    fn player_idx(&self) -> usize {
-        self.player_idx
-    }
-
-    fn player_count(&self) -> usize {
-        self.player_count
-    }
-
-    fn player_is_local(&self) -> [bool; MAX_PLAYERS] {
-        std::array::from_fn(|i| self.connections[i].is_none() && i < self.player_count)
-    }
-}
-
-fn pinger(server: BiChannelServer<PingerRequest, PingerResponse>) {
-    while let Ok(servers) = server.recv_blocking() {
-        let mut pings = SmallVec::new();
-        for server in servers {
-            let start = Instant::now();
-            let ping_result = ping_rs::send_ping(
-                &IpAddr::V4(server),
-                Duration::from_secs(2),
-                &[1, 2, 3, 4],
-                None,
-            );
-
-            let ping = if let Err(e) = ping_result {
-                warn!("Error pinging {server}: {e:?}");
-                None
-            } else {
-                Some((Instant::now() - start).as_millis() as u16)
-            };
-
-            pings.push((server, ping));
-        }
-        if server.send_blocking(pings).is_err() {
-            break;
-        }
-    }
-}
diff --git a/src/networking/online.md b/src/networking/online.md
deleted file mode 100644
index 3c3d94d92c..0000000000
--- a/src/networking/online.md
+++ /dev/null
@@ -1,95 +0,0 @@
-Contains the online matchmaker and the [`NetworkSocket`] implementation.
-
-## Matchmaking
-
-For online matchmaking, we use a centralized matchmaking server to connect peers to each-other and
-to forward the peers' network traffic. All connections utilize UDP and the QUIC protocol.
-
-In order to establish the peer connections we use a matchmaking server implemented in the
-[`bones_matchmaker`] crate. This server binds one UDP port and listens for client connections.
-Because QUIC supports mutliplexing connections, we are able to handle any number of clients on a
-single UDP port.
-
-All client traffic is proxied to other peers through the matchmaking server. In this way it is not
-true peer-to-peer networking, but logically, once the match starts, clients are sending messages to
-each-other, and the server doesn't take part in the match protocol.
-
-Having the matchmaker proxy client messages has the following pros and cons:
-
-**Cons:**
-
-- It uses up more of the matchmaking server's bandwidth
-- It adds an extra network hop between peers, increasing latency.
-
-**Pros:**
-
-- It reduces the number of connections each peer needs to make. Each peer only holds one
-  connection to the matchmaking server and nothing else.
-- It hides the IP addresses of clients from each-other. This is an important privacy feature.
-- It avoids a number of difficulties that you may run into while trying to establish true
-  peer-to-peer connections, and makes it much easier to bypass firewalls, NATs, etc.
-
-This doesn't prevent us from supporting true peer-to-peer connections in the future, though.
-Similarly, another scenario we will support in the future is LAN games that you can join without
-needing a matchmaking server.
-
-[`bones_matchmaker`]: https://github.com/fishfolk/bones/tree/main/crates/bones_matchmaker
-
-### Matchmaking Protocol
-
-> **ℹ️ Note:** This is meant as an overview and is not an exact specification of the matchmaking
-> protocol.
-
-#### Initial Connection
-
-When a client connects to the matchmaking server, the very first thing it will do is send a
-[`RequestMatch`][crate::external::bones_matchmaker_proto::MatchmakerRequest::RequestMatch] message
-to the server over a reliable channel.
-
-This message contains the [`MatchInfo`][crate::external::bones_matchmaker_proto::MatchInfo] that
-tells the server how many players the client wants to connect to for the match, along with an
-arbitrary byte sequence for the `match_data`.
-
-In order for players to end up in the same match as each-other, they must specify the _exact_ same
-`MatchInfo`, including the `match_data`. We use the `match_data` as a way to specify which game mode
-and parameters, etc. that the player wants to connect to, so that all the players that are connected
-to each-other are playing the same mode.
-
-The `match_data` also contains the game name and version. Because the matchmaker does not take part
-in the match protocol itself, just the matchmaking protocol, **this makes the matchmaking server
-game agnostic**. Different games can connect to the same matchmaking server, and they can make sure
-they are only connected to players playing the same game, by specifying a unique `match_data`.
-
-> **Note:** To be clear, the game implementation sets the `match_data` for players. Players are
-> never exposed directly to the concept of the `match_data`.
-
-#### Waiting For Players
-
-After the initial connection and match request, the server will send the client an
-[`Accepted`][crate::external::bones_matchmaker_proto::MatchmakerResponse::Accepted] message.
-
-If the waiting room for that match already has the desired number of players in it, the server will
-then respond immediately with a
-[`Success`][crate::external::bones_matchmaker_proto::MatchmakerResponse::Success] message. This
-message comes with:
-
-- a `random_seed` that can be used by all clients to generate deterministic random numbers, and
-- a `player_idx` that tells the client _which_ player in the match it is. This is used throughout
-    the game to keep track of the players, and is between `0` and `player_count - 1`.
-
-#### In the Match
-
-Immediately after the desired number of clients have joined and the `Success` message has been sent
-to all players, the matchmaker goes into proxy mode for all clients in the match.
-
-Once in proxy mode, the server listens for
-[`SendProxyMessage`][crate::external::bones_matchmaker_proto::SendProxyMessage]s from clients. Each
-message simply specifies a [`TargetClient`][crate::external::bones_matchmaker_proto::TargetClient] (
-either a specific client or all of them ), and a binary message data.
-
-Once it a `SendProxyMessage` it will send it to the target client, which will receive it in the form
-of a [`RecvProxyMessage`][crate::external::bones_matchmaker_proto::RecvProxyMessage], containing the
-message data, and the index of the client that sent the message.
-
-The matchmaking server supports forwarding both reliable and unreliable message in this way,
-allowing the game to chose any kind of protocol it sees fit to synchronize the match data.
diff --git a/src/networking/online.rs b/src/networking/online.rs
deleted file mode 100644
index a3a6a7e36b..0000000000
--- a/src/networking/online.rs
+++ /dev/null
@@ -1,355 +0,0 @@
-#![doc = include_str!("./online.md")]
-
-use std::net::{SocketAddr, ToSocketAddrs};
-
-use bevy::tasks::IoTaskPool;
-use bones_matchmaker_proto::{MatchInfo, MatchmakerRequest, MatchmakerResponse};
-use bytes::Bytes;
-use futures_lite::future;
-use quinn::Connection;
-
-use crate::prelude::*;
-
-use super::{NetworkSocket, NETWORK_ENDPOINT};
-
-pub static ONLINE_MATCHMAKER: Lazy<OnlineMatchmaker> = Lazy::new(|| {
-    let (client, server) = bi_channel();
-
-    IoTaskPool::get().spawn(online_matchmaker(server)).detach();
-
-    OnlineMatchmaker(client)
-});
-
-#[derive(DerefMut, Deref)]
-pub struct OnlineMatchmaker(BiChannelClient<OnlineMatchmakerRequest, OnlineMatchmakerResponse>);
-
-#[derive(Debug)]
-pub enum OnlineMatchmakerRequest {
-    SearchForGame { addr: String, player_count: usize },
-    StopSearch,
-}
-
-#[derive(Debug)]
-pub enum OnlineMatchmakerResponse {
-    Searching,
-    PlayerCount(usize),
-    GameStarting {
-        online_socket: OnlineSocket,
-        player_idx: usize,
-        player_count: usize,
-    },
-}
-
-async fn online_matchmaker(
-    matchmaker_channel: BiChannelServer<OnlineMatchmakerRequest, OnlineMatchmakerResponse>,
-) {
-    while let Ok(message) = matchmaker_channel.recv().await {
-        match message {
-            OnlineMatchmakerRequest::SearchForGame { addr, player_count } => {
-                info!("Connecting to online matchmaker");
-                let addr = resolve_addr_blocking(&addr).unwrap();
-                let conn = NETWORK_ENDPOINT
-                    .connect(addr, "matchmaker")
-                    .unwrap()
-                    .await
-                    .unwrap();
-                info!("Connected to online matchmaker");
-
-                matchmaker_channel
-                    .try_send(OnlineMatchmakerResponse::Searching)
-                    .unwrap();
-
-                // Send a match request to the server
-                let (mut send, mut recv) = conn.open_bi().await.unwrap();
-
-                let message = MatchmakerRequest::RequestMatch(MatchInfo {
-                    client_count: player_count.try_into().unwrap(),
-                    match_data: b"jumpy_default_game".to_vec(),
-                });
-                info!(request=?message, "Sending match request");
-                let message = postcard::to_allocvec(&message).unwrap();
-                send.write_all(&message).await.unwrap();
-                send.finish().await.unwrap();
-
-                let response = recv.read_to_end(256).await.unwrap();
-                let message: MatchmakerResponse = postcard::from_bytes(&response).unwrap();
-
-                if let MatchmakerResponse::Accepted = message {
-                    info!("Waiting for match...");
-                } else {
-                    panic!("Invalid response from matchmaker");
-                }
-
-                loop {
-                    let recv_ui_message = matchmaker_channel.recv();
-                    let recv_online_matchmaker = conn.accept_uni();
-
-                    let next_message = futures_lite::future::or(
-                        async move { either::Left(recv_ui_message.await) },
-                        async move { either::Right(recv_online_matchmaker.await) },
-                    )
-                    .await;
-
-                    match next_message {
-                        // UI message
-                        either::Either::Left(message) => {
-                            let message = message.unwrap();
-
-                            match message {
-                                OnlineMatchmakerRequest::SearchForGame { .. } => {
-                                    panic!("Unexpected message from UI");
-                                }
-                                OnlineMatchmakerRequest::StopSearch => {
-                                    info!("Canceling online search");
-                                    break;
-                                }
-                            }
-                        }
-
-                        // Matchmaker message
-                        either::Either::Right(recv) => {
-                            let mut recv = recv.unwrap();
-                            let message = recv.read_to_end(256).await.unwrap();
-                            let message: MatchmakerResponse =
-                                postcard::from_bytes(&message).unwrap();
-
-                            match message {
-                                MatchmakerResponse::ClientCount(count) => {
-                                    info!("Online match player count: {count}");
-                                    matchmaker_channel
-                                        .try_send(OnlineMatchmakerResponse::PlayerCount(count as _))
-                                        .unwrap();
-                                }
-                                MatchmakerResponse::Success {
-                                    random_seed,
-                                    player_idx,
-                                    client_count,
-                                } => {
-                                    info!(%random_seed, %player_idx, player_count=%client_count, "Online match complete");
-                                    let online_socket = OnlineSocket::new(
-                                        player_idx as usize,
-                                        client_count as usize,
-                                        conn,
-                                    );
-
-                                    matchmaker_channel
-                                        .try_send(OnlineMatchmakerResponse::GameStarting {
-                                            online_socket,
-                                            player_idx: player_idx as _,
-                                            player_count: client_count as _,
-                                        })
-                                        .unwrap();
-                                    break;
-                                }
-                                _ => panic!("Unexpected message from matchmaker"),
-                            }
-                        }
-                    }
-                }
-            }
-            OnlineMatchmakerRequest::StopSearch => (), // Not searching, don't do anything
-        }
-    }
-}
-
-/// Resolve a server address.
-///
-/// Note: This may block the thread
-fn resolve_addr_blocking(addr: &str) -> anyhow::Result<SocketAddr> {
-    let formatting_err =
-        || anyhow::format_err!("Matchmaking server must be in the format `host:port`");
-
-    let mut iter = addr.split(':');
-    let host = iter.next().ok_or_else(formatting_err)?;
-    let port = iter.next().ok_or_else(formatting_err)?;
-    let port: u16 = port.parse().context("Couldn't parse port number")?;
-    if iter.next().is_some() {
-        return Err(formatting_err());
-    }
-
-    let addr = (host, port)
-        .to_socket_addrs()
-        .context("Couldn't resolve matchmaker address")?
-        .find(|x| x.is_ipv4()) // For now, only support IpV4. I don't think IpV6 works right.
-        .ok_or_else(|| anyhow::format_err!("Couldn't resolve matchmaker address"))?;
-
-    Ok(addr)
-}
-
-#[derive(Debug, Clone)]
-pub struct OnlineSocket {
-    pub conn: Connection,
-    pub ggrs_receiver: async_channel::Receiver<(usize, ggrs::Message)>,
-    pub reliable_receiver: async_channel::Receiver<(usize, Vec<u8>)>,
-    pub player_idx: usize,
-    pub player_count: usize,
-}
-
-impl OnlineSocket {
-    pub fn new(player_idx: usize, player_count: usize, conn: Connection) -> Self {
-        let (ggrs_sender, ggrs_receiver) = async_channel::unbounded();
-        let (reliable_sender, reliable_receiver) = async_channel::unbounded();
-
-        let task_pool = IoTaskPool::get();
-
-        let conn_ = conn.clone();
-        task_pool
-            .spawn(async move {
-                let conn = conn_;
-                loop {
-                    let event = future::or(async { either::Left(conn.closed().await) }, async {
-                        either::Right(conn.read_datagram().await)
-                    })
-                    .await;
-
-                    match event {
-                        either::Either::Left(closed) => {
-                            warn!("Connection error: {closed}");
-                            break;
-                        }
-                        either::Either::Right(datagram_result) => match datagram_result {
-                            Ok(data) => {
-                                let message: bones_matchmaker_proto::RecvProxyMessage =
-                                    postcard::from_bytes(&data)
-                                        .expect("Could not deserialize net message");
-                                let player = message.from_client;
-                                let message = postcard::from_bytes(&message.message).unwrap();
-
-                                if ggrs_sender.send((player as _, message)).await.is_err() {
-                                    break;
-                                }
-                            }
-                            Err(e) => {
-                                warn!("Connection error: {e}");
-                            }
-                        },
-                    }
-                }
-            })
-            .detach();
-
-        let conn_ = conn.clone();
-        task_pool
-            .spawn(async move {
-                let conn = conn_;
-                loop {
-                    let event = future::or(async { either::Left(conn.closed().await) }, async {
-                        either::Right(conn.accept_uni().await)
-                    })
-                    .await;
-
-                    match event {
-                        either::Either::Left(closed) => {
-                            warn!("Connection error: {closed}");
-                            break;
-                        }
-                        either::Either::Right(result) => match result {
-                            Ok(mut stream) => {
-                                let data =
-                                    stream.read_to_end(4096).await.expect("Network read error");
-                                let message: bones_matchmaker_proto::RecvProxyMessage =
-                                    postcard::from_bytes(&data).unwrap();
-
-                                if reliable_sender
-                                    .send((message.from_client as usize, message.message))
-                                    .await
-                                    .is_err()
-                                {
-                                    break;
-                                }
-                            }
-                            Err(e) => {
-                                warn!("Connection error: {e}");
-                            }
-                        },
-                    }
-                }
-            })
-            .detach();
-
-        Self {
-            conn,
-            ggrs_receiver,
-            reliable_receiver,
-            player_idx,
-            player_count,
-        }
-    }
-}
-
-impl NetworkSocket for OnlineSocket {
-    fn ggrs_socket(&self) -> networking::BoxedNonBlockingSocket {
-        networking::BoxedNonBlockingSocket(Box::new(self.clone()))
-    }
-
-    fn send_reliable(&self, target: networking::SocketTarget, message: &[u8]) {
-        let task_pool = IoTaskPool::get();
-        let target_client = match target {
-            networking::SocketTarget::Player(player) => {
-                bones_matchmaker_proto::TargetClient::One(player as _)
-            }
-            networking::SocketTarget::All => bones_matchmaker_proto::TargetClient::All,
-        };
-        let message = bones_matchmaker_proto::SendProxyMessage {
-            target_client,
-            message: message.into(),
-        };
-
-        let conn = self.conn.clone();
-        task_pool
-            .spawn(async move {
-                let mut send = conn.open_uni().await.unwrap();
-
-                send.write_all(&postcard::to_allocvec(&message).unwrap())
-                    .await
-                    .unwrap();
-                send.finish().await.unwrap();
-            })
-            .detach();
-    }
-
-    fn recv_reliable(&self) -> Vec<(usize, Vec<u8>)> {
-        let mut messages = Vec::new();
-        while let Ok(message) = self.reliable_receiver.try_recv() {
-            messages.push(message);
-        }
-        messages
-    }
-
-    fn close(&self) {
-        self.conn.close(0u8.into(), &[]);
-    }
-
-    fn player_idx(&self) -> usize {
-        self.player_idx
-    }
-
-    fn player_is_local(&self) -> [bool; MAX_PLAYERS] {
-        std::array::from_fn(|i| i == self.player_idx)
-    }
-
-    fn player_count(&self) -> usize {
-        self.player_count
-    }
-}
-
-impl ggrs::NonBlockingSocket<usize> for OnlineSocket {
-    fn send_to(&mut self, msg: &ggrs::Message, addr: &usize) {
-        let message = bones_matchmaker_proto::SendProxyMessage {
-            target_client: bones_matchmaker_proto::TargetClient::One(*addr as u8),
-            message: postcard::to_allocvec(msg).unwrap(),
-        };
-        let msg_bytes = postcard::to_allocvec(&message).unwrap();
-        self.conn
-            .send_datagram(Bytes::copy_from_slice(&msg_bytes[..]))
-            .ok();
-    }
-
-    fn receive_all_messages(&mut self) -> Vec<(usize, ggrs::Message)> {
-        let mut messages = Vec::new();
-        while let Ok(message) = self.ggrs_receiver.try_recv() {
-            messages.push(message);
-        }
-        messages
-    }
-}
diff --git a/src/networking/proto.rs b/src/networking/proto.rs
deleted file mode 100644
index 8a382a90de..0000000000
--- a/src/networking/proto.rs
+++ /dev/null
@@ -1,69 +0,0 @@
-//! Serializable data types for network messages used by the game.
-
-use numquant::{IntRange, Quantized};
-
-use crate::prelude::*;
-
-bitfield::bitfield! {
-    /// A player's controller inputs densely packed into a single u16.
-    ///
-    /// This is used when sending player inputs across the network.
-    #[derive(bytemuck::Pod, bytemuck::Zeroable, Copy, Clone, PartialEq, Eq, Reflect)]
-    #[repr(transparent)]
-    pub struct DensePlayerControl(u16);
-    impl Debug;
-    pub jump_pressed, set_jump_pressed: 0;
-    pub shoot_pressed, set_shoot_pressed: 1;
-    pub grab_pressed, set_grab_pressed: 2;
-    pub slide_pressed, set_slide_pressed: 3;
-    pub from into DenseMoveDirection, move_direction, set_move_direction: 15, 4;
-}
-
-impl Default for DensePlayerControl {
-    fn default() -> Self {
-        let mut control = Self(0);
-        control.set_move_direction(default());
-        control
-    }
-}
-
-/// A newtype around [`Vec2`] that implements [`From<u16>`] and [`Into<u16>`] as a way to compress
-/// user stick input for use in [`DensePlayerControl`].
-#[derive(Debug, Deref, DerefMut, Default)]
-pub struct DenseMoveDirection(pub Vec2);
-
-/// This is the specific [`Quantized`] type that we use to represent movement directions in
-/// [`DenseMoveDirection`].
-type MoveDirQuant = Quantized<IntRange<u16, 0b111111, -1, 1>>;
-
-impl From<u16> for DenseMoveDirection {
-    fn from(bits: u16) -> Self {
-        // maximum movement value representable, we use 6 bits to represent each movement direction.
-        let max = 0b111111;
-        // The first six bits represent the x movement
-        let x_move_bits = bits & max;
-        // The second six bits represents the y movement
-        let y_move_bits = (bits >> 6) & max;
-
-        // Round near-zero values to zero
-        let mut x = MoveDirQuant::from_raw(x_move_bits).to_f32();
-        if x.abs() < 0.02 {
-            x = 0.0;
-        }
-        let mut y = MoveDirQuant::from_raw(y_move_bits).to_f32();
-        if y.abs() < 0.02 {
-            y = 0.0;
-        }
-
-        DenseMoveDirection(Vec2::new(x, y))
-    }
-}
-
-impl From<DenseMoveDirection> for u16 {
-    fn from(dir: DenseMoveDirection) -> Self {
-        let x_bits = MoveDirQuant::from_f32(dir.x).raw();
-        let y_bits = MoveDirQuant::from_f32(dir.y).raw();
-
-        x_bits | (y_bits << 6)
-    }
-}
diff --git a/src/platform.rs b/src/platform.rs
deleted file mode 100644
index d2f2f4d723..0000000000
--- a/src/platform.rs
+++ /dev/null
@@ -1,436 +0,0 @@
-//! Platform abstractions.
-//!
-//! This module contains abstractions over platform-specific details. Currently this is just the
-//! [`Storage`] abstraction, which allows us to persist key-value data in a way that works on both
-//! native platforms and on web.
-
-use crate::prelude::*;
-
-use async_channel::{Receiver, Sender};
-use bevy::utils::HashMap;
-use serde::{de::DeserializeOwned, Serialize};
-
-#[cfg(not(target_arch = "wasm32"))]
-use native as backend;
-
-#[cfg(target_arch = "wasm32")]
-use wasm as backend;
-
-/// Platform plugin.
-pub struct JumpyPlatformPlugin;
-
-impl Plugin for JumpyPlatformPlugin {
-    fn build(&self, app: &mut App) {
-        app.init_resource::<Storage>()
-            .add_system(load_storage.run_if(in_state(EngineState::LoadingPlatformStorage)));
-    }
-}
-
-/// Bevy system that will load the [`Storage`] and wait for it to finish loading so it can be used
-/// throughout the rest of the game without having to check that storage is loaded.
-///
-/// Will transition to [`EngineState::LoadingGameData`] when finished.
-pub fn load_storage(
-    mut started: Local<bool>,
-    mut commands: Commands,
-    mut storage: ResMut<Storage>,
-) {
-    // If we haven't started loading
-    if !*started {
-        debug!("Start loading platform storage");
-        // Start loading
-        *started = true;
-        storage.load();
-
-    // If storage has finished loading
-    } else if storage.is_loaded() {
-        debug!("Done loading platform storage");
-        // Load game
-        commands.insert_resource(NextState(Some(EngineState::LoadingGameData)));
-    }
-}
-
-/// The type of the inner data in [`Storage`]
-type StorageData = HashMap<String, serde_yaml::Value>;
-
-/// Resource for accessing platform specific persistent storage apis through a simple interface.
-#[derive(Resource)]
-pub struct Storage {
-    /// The in-memory storage data that we operate on when getting and setting values.
-    data: Option<StorageData>,
-    /// A data receiver that gets set when we are awaiting the result of a [`Self::load()`] operation.
-    data_receiver: Option<Receiver<StorageData>>,
-    /// The sender we use to send storage requests to the storage backend
-    backend_sender: Sender<StorageRequest>,
-}
-
-impl FromWorld for Storage {
-    fn from_world(_: &mut World) -> Self {
-        let backend_sender = backend::init_storage();
-
-        Self {
-            data: None,
-            data_receiver: None,
-            backend_sender,
-        }
-    }
-}
-
-/// An error that may occur while accessing [`Storage`].
-#[derive(thiserror::Error, Debug)]
-pub enum StorageError {
-    #[error("Storage has not been loaded yet")]
-    NotLoaded,
-    #[error("Storage backend connection lost")]
-    BackendLost,
-    #[error("Storage key could not be serizlized/deserialized: {0}")]
-    SerializationError(#[from] serde_yaml::Error),
-}
-
-impl Storage {
-    fn check_pending_data_load(&mut self) {
-        // If we are waiting on a data load response
-        if let Some(receiver) = &mut self.data_receiver {
-            // If the data has been loaded
-            if let Ok(data) = receiver.try_recv() {
-                // Set the local data and clear the load receiver
-                self.data = Some(data);
-                self.data_receiver = None;
-            }
-        }
-    }
-
-    /// Get whether or not storage has been loaded.
-    ///
-    /// Before you may get or set values, you must [`load()`][Self::load] the storage.
-    pub fn is_loaded(&mut self) -> bool {
-        self.check_pending_data_load();
-
-        self.data.is_some()
-    }
-
-    /// Load from platform storage into memory.
-    ///
-    /// This process is asynchronous. Loaded data will not be available immediately, and
-    /// [`Self::is_loaded()`] can be used to check whether or not data has been loaded.
-    pub fn try_load(&mut self) -> Result<(), StorageError> {
-        let (result_sender, data_receiver) = async_channel::unbounded();
-
-        self.data_receiver = Some(data_receiver);
-
-        self.backend_sender
-            .try_send(StorageRequest::Load { result_sender })
-            .map_err(|_| StorageError::BackendLost)?;
-
-        Ok(())
-    }
-
-    /// Load from platform storage into memory.
-    ///
-    /// This process is asynchronous. Loaded data will not be available immediately, and
-    /// [`Self::is_loaded()`] can be used to check whether or not data has been loaded.
-    ///
-    /// # Panics
-    ///
-    /// Panics if the storage backend disconnects for some reason.
-    #[track_caller]
-    pub fn load(&mut self) {
-        self.try_load().expect("Storage load")
-    }
-
-    /// Try to get a value from the in-memory storage cache.
-    pub fn try_get<T>(&mut self, key: &str) -> Result<Option<T>, StorageError>
-    where
-        T: Serialize + DeserializeOwned,
-    {
-        self.check_pending_data_load();
-
-        if let Some(data) = &self.data {
-            let value = data.get(key).cloned();
-
-            if let Some(value) = value {
-                let value = serde_yaml::from_value(value)?;
-
-                Ok(Some(value))
-            } else {
-                Ok(None)
-            }
-        } else {
-            Err(StorageError::NotLoaded)
-        }
-    }
-
-    /// Get a value from the in-memory storage cache.
-    ///
-    /// # Panics
-    ///
-    /// This will panic if storage has not been loaded yet or if there is a deserialization error.
-    #[track_caller]
-    pub fn get<T>(&mut self, key: &str) -> Option<T>
-    where
-        T: Serialize + DeserializeOwned,
-    {
-        match self.try_get(key) {
-            Ok(data) => data,
-            Err(e) => {
-                error!(
-                    "Error deserializing storage key, returning empty value: {}",
-                    e
-                );
-                None
-            }
-        }
-    }
-
-    /// Set a value in the in-memory storage cache.
-    ///
-    /// Changes will not be persisted until [`Self::save()`] is called.
-    pub fn try_set<T>(&mut self, key: &str, value: &T) -> Result<(), StorageError>
-    where
-        T: Serialize + DeserializeOwned,
-    {
-        self.check_pending_data_load();
-
-        if let Some(data) = &mut self.data {
-            let value = serde_yaml::to_value(value)?;
-            data.insert(key.into(), value);
-
-            Ok(())
-        } else {
-            Err(StorageError::NotLoaded)
-        }
-    }
-
-    /// Set a value in the in-memory storage cache.
-    ///
-    ///
-    /// Changes will not be persisted until [`Self::save()`] is called.
-    ///
-    /// # Panics
-    ///
-    /// This will panic if storage has not been loaded yet or if there is a serialization error.
-    #[track_caller]
-    pub fn set<T>(&mut self, key: &str, value: &T)
-    where
-        T: Serialize + DeserializeOwned,
-    {
-        self.try_set(key, value).expect("Set value in storage")
-    }
-
-    /// Saves the in-memory storage cache to persistent storage.
-    ///
-    /// This operation is asynchronous and returns a [`SaveTask`] that can be used to check when the
-    /// operation is complete.
-    pub fn try_save(&mut self) -> Result<SaveTask, StorageError> {
-        self.check_pending_data_load();
-
-        if let Some(data) = &self.data {
-            let (result_sender, result_receiver) = async_channel::unbounded();
-
-            self.backend_sender
-                .try_send(StorageRequest::Save {
-                    data: data.clone(),
-                    result_sender,
-                })
-                .map_err(|_| StorageError::BackendLost)?;
-
-            Ok(SaveTask(result_receiver))
-        } else {
-            Err(StorageError::NotLoaded)
-        }
-    }
-
-    /// Saves the in-memory storage cache to persistent storage.
-    ///
-    /// This operation is asynchronous and returns a [`SaveTask`] that can be used to check when the
-    /// operation is complete.
-    ///
-    /// # Panics
-    ///
-    /// This will panic if the storage hasn't been loaded yet or if the storage backend disconnects
-    /// for some reason.
-    #[track_caller]
-    pub fn save(&mut self) -> SaveTask {
-        self.try_save().expect("Save storage")
-    }
-}
-
-/// [`Storage::save()`] task handle that can be used to check whether or not saving has been
-/// completed.
-pub struct SaveTask(Receiver<()>);
-
-impl SaveTask {
-    /// Get whether or not saving has been completed.
-    #[allow(unused)] // TODO: Remove when we use it
-    pub fn is_complete(&mut self) -> bool {
-        !self.0.is_empty()
-    }
-}
-
-/// Message type sent over a channel to the storage task.
-enum StorageRequest {
-    /// Load the storage and send it to the `result_sender`.
-    Load { result_sender: Sender<StorageData> },
-    /// Save the storage and send confirmation to the `result_sender`.
-    Save {
-        data: StorageData,
-        result_sender: Sender<()>,
-    },
-}
-
-/// Native platform support.
-#[cfg(not(target_arch = "wasm32"))]
-mod native {
-    use std::{
-        fs,
-        io::{Read, Write},
-    };
-
-    use async_channel::Sender;
-    use bevy::{
-        prelude::{error, trace},
-        tasks::IoTaskPool,
-        utils::HashMap,
-    };
-
-    use super::StorageRequest;
-
-    /// Initialize storage backend.
-    pub(super) fn init_storage() -> Sender<StorageRequest> {
-        trace!("Initialize platform storage backend");
-        let io_task_pool = IoTaskPool::get();
-
-        // Create channel used for sending and receving storage requests
-        let (sender, receiver) = async_channel::unbounded();
-
-        // Identify project storage file path
-        let project_dirs = directories::ProjectDirs::from("org", "FishFolk", "Jumpy")
-            .expect("Identify system data dir path");
-        let file_path = project_dirs.data_dir().join("storage.yml");
-
-        trace!(?file_path, "Platform storage filepath");
-
-        // Spawn an async task that will read and write to the filesystem
-        io_task_pool
-            .spawn(async move {
-                while let Ok(request) = receiver.recv().await {
-                    match request {
-                        StorageRequest::Load { result_sender } => {
-                            let data = if file_path.exists() {
-                                let mut file = fs::OpenOptions::new()
-                                    .read(true)
-                                    .open(&file_path)
-                                    .expect("Open storage file");
-
-                                let mut contents = Vec::new();
-                                file.read_to_end(&mut contents).expect("Read storage file");
-
-                                match serde_yaml::from_slice(&contents) {
-                                    Ok(data) => data,
-                                    Err(e) => {
-                                        error!(
-                                            "Error deserializing storage file. Ignoring existing \
-                                            data and overwriting on next attempt to save: {}",
-                                            e
-                                        );
-                                        Default::default()
-                                    }
-                                }
-                            } else {
-                                HashMap::new()
-                            };
-
-                            result_sender.try_send(data).ok();
-                        }
-                        StorageRequest::Save {
-                            data,
-                            result_sender,
-                        } => {
-                            let data = serde_yaml::to_string(&data).expect("Serialize data");
-                            if let Some(parent) = file_path.parent() {
-                                std::fs::create_dir_all(parent).expect("Create storage dir");
-                            }
-                            let mut file = fs::OpenOptions::new()
-                                .create(true)
-                                .write(true)
-                                .truncate(true)
-                                .open(&file_path)
-                                .expect("Open storage file");
-
-                            file.write_all(data.as_bytes()).expect("Write storage file");
-
-                            result_sender.try_send(()).ok();
-                        }
-                    }
-                }
-            })
-            .detach();
-
-        sender
-    }
-}
-
-/// WASM platform support
-#[cfg(target_arch = "wasm32")]
-mod wasm {
-    use async_channel::Sender;
-    use bevy::{prelude::*, tasks::IoTaskPool};
-
-    use super::StorageRequest;
-
-    const BROWSER_LOCAL_STORAGE_KEY: &str = "jumpy-platform-storage";
-
-    /// Initialize storage backend
-    pub(super) fn init_storage() -> Sender<StorageRequest> {
-        trace!("Initialize platform storage backend");
-        let io_task_pool = IoTaskPool::get();
-
-        // Create channel used for sending and receving storage requests
-        let (sender, receiver) = async_channel::unbounded();
-
-        // Spawn an async task for interfacing with browser local storage
-        io_task_pool.spawn(async move {
-            let local_storage = web_sys::window().unwrap().local_storage().unwrap().unwrap();
-
-            // Loop as long as there are still storage request senders in scope
-            while let Ok(request) = receiver.recv().await {
-                match request {
-                    StorageRequest::Load { result_sender } => {
-                        let data = local_storage
-                            .get_item(BROWSER_LOCAL_STORAGE_KEY)
-                            .unwrap()
-                            .and_then(|data| match serde_yaml::from_str(&data) {
-                                Ok(data) => data,
-                                Err(e) => {
-                                    error!(
-                                        "Error deserializing storage, ignoring existing data \
-                                        and overwriting on next attempt to set data in storage: {}",
-                                        e
-                                    );
-
-                                    None
-                                }
-                            })
-                            .unwrap_or_default();
-
-                        result_sender.try_send(data).ok();
-                    }
-                    StorageRequest::Save {
-                        data,
-                        result_sender,
-                    } => {
-                        let data = serde_yaml::to_string(&data).expect("Serialize platform data");
-
-                        local_storage
-                            .set_item(BROWSER_LOCAL_STORAGE_KEY, &data)
-                            .unwrap();
-
-                        result_sender.try_send(()).ok();
-                    }
-                }
-            }
-        });
-
-        sender
-    }
-}
diff --git a/src/prelude.rs b/src/prelude.rs
deleted file mode 100644
index 6cef554f6d..0000000000
--- a/src/prelude.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-//! Internal prelude used to easily import common types.
-
-pub use crate::{
-    assets::*, audio::*, bevy_states::*, camera::*, config::*, console::*, debug::*, input::*,
-    loading::*, localization::*, logs::*, metadata::*, platform::*, session::*, ui::*, utils::*, *,
-};
-pub use anyhow::Context;
-pub use jumpy_core::bevy_prelude::*;
-
-pub use {
-    bevy::{
-        ecs::system::SystemParam,
-        prelude::*,
-        render::view::RenderLayers,
-        // time::FixedTimestep,
-        utils::{HashMap, HashSet},
-    },
-    bevy_egui::egui,
-    bevy_kira_audio::prelude::*,
-    bevy_kira_audio::AudioSource,
-    bones_bevy_asset::{BonesBevyAsset, BonesBevyAssetLoad},
-    bones_lib::prelude as bones,
-    leafwing_input_manager::prelude::*,
-    once_cell::sync::Lazy,
-    serde::{Deserialize, Serialize},
-    std::{marker::PhantomData, ops::Deref, sync::Arc},
-    type_ulid::TypeUlid,
-};
diff --git a/src/profiling.rs b/src/profiling.rs
deleted file mode 100644
index f78e5bd1b1..0000000000
--- a/src/profiling.rs
+++ /dev/null
@@ -1,90 +0,0 @@
-use tracing_core::Field;
-use tracing_subscriber::{field::MakeVisitor, fmt::format::Writer};
-
-/// Format scope such that field 'name' is displayed as
-/// its value instead of field debug formatting (like name="{value}")
-#[derive(Default, Debug)]
-pub struct ProfilingScopeFormatter;
-
-/// Visitor implementing formatting for [`ProfilingScopeFormatter`]
-pub struct ProfilingScopeVisitor<'a> {
-    writer: Writer<'a>,
-    is_empty: bool,
-    result: Result<(), std::fmt::Error>,
-}
-
-impl<'a> ProfilingScopeVisitor<'a> {
-    pub fn new(writer: Writer<'a>, is_empty: bool) -> Self {
-        Self {
-            writer,
-            is_empty,
-            result: Ok(()),
-        }
-    }
-
-    fn maybe_pad(&mut self) {
-        if self.is_empty {
-            self.is_empty = false;
-        } else {
-            self.result = write!(self.writer, " ");
-        }
-    }
-}
-
-impl<'a> tracing_subscriber::field::Visit for ProfilingScopeVisitor<'a> {
-    fn record_str(&mut self, field: &Field, value: &str) {
-        if self.result.is_err() {
-            return;
-        }
-
-        if field.name() == "name" {
-            self.record_debug(field, &format_args!("{value}"))
-        } else {
-            // If fields other than 'name' included in span, debug print.
-            self.record_debug(field, &value)
-        }
-    }
-
-    fn record_debug(&mut self, _field: &Field, value: &dyn std::fmt::Debug) {
-        if self.result.is_err() {
-            return;
-        }
-        self.maybe_pad();
-        self.result = write!(self.writer, "{value:?}");
-    }
-}
-
-impl<'a> tracing_subscriber::field::VisitOutput<std::fmt::Result> for ProfilingScopeVisitor<'a> {
-    fn finish(self) -> std::fmt::Result {
-        self.result
-    }
-}
-
-impl<'a> tracing_subscriber::field::VisitFmt for ProfilingScopeVisitor<'a> {
-    fn writer(&mut self) -> &mut dyn std::fmt::Write {
-        &mut self.writer
-    }
-}
-
-impl<'a> MakeVisitor<Writer<'a>> for ProfilingScopeFormatter {
-    type Visitor = ProfilingScopeVisitor<'a>;
-
-    #[inline]
-    fn make_visitor(&self, target: Writer<'a>) -> Self::Visitor {
-        ProfilingScopeVisitor::new(target, true)
-    }
-}
-
-/// Notify profilers we are at frame boundary
-pub fn mark_new_frame() {
-    // Tell puffin we are on new frame
-    puffin::GlobalProfiler::lock().new_frame();
-
-    #[cfg(feature = "profiling-full")]
-    // tell tracy we are on new frame
-    tracing::event!(
-        tracing::Level::INFO,
-        message = "finished frame",
-        tracy.frame_mark = true
-    );
-}
diff --git a/src/puffin_tracing.rs b/src/puffin_tracing.rs
deleted file mode 100644
index cbd17c6679..0000000000
--- a/src/puffin_tracing.rs
+++ /dev/null
@@ -1,124 +0,0 @@
-///! This is based the work done here: https://github.com/bevyengine/bevy/pull/4730
-///! This creates puffin scopes from tracing - integrating bevy's profiling traces with puffin.
-use puffin::ThreadProfiler;
-use std::{cell::RefCell, collections::VecDeque};
-use tracing_core::{
-    span::{Attributes, Id, Record},
-    Subscriber,
-};
-use tracing_subscriber::{
-    fmt::{format::DefaultFields, FormatFields, FormattedFields},
-    layer::Context,
-    registry::LookupSpan,
-    Layer,
-};
-
-thread_local! {
-    static PUFFIN_SPAN_STACK: RefCell<VecDeque<(Id, usize)>> =
-        RefCell::new(VecDeque::with_capacity(16));
-}
-
-/// A tracing layer that collects data for puffin.
-pub struct PuffinLayer<F = DefaultFields> {
-    fmt: F,
-}
-
-impl Default for PuffinLayer<DefaultFields> {
-    fn default() -> Self {
-        Self {
-            fmt: DefaultFields::default(),
-        }
-    }
-}
-
-impl PuffinLayer<DefaultFields> {
-    /// Create a new `PuffinLayer`.
-    pub fn new() -> Self {
-        Self::default()
-    }
-
-    /// Use a custom field formatting implementation.
-    pub fn with_formatter<F>(self, fmt: F) -> PuffinLayer<F> {
-        let _ = self;
-        PuffinLayer { fmt }
-    }
-}
-
-impl<S, F> Layer<S> for PuffinLayer<F>
-where
-    S: Subscriber + for<'a> LookupSpan<'a>,
-    F: for<'writer> FormatFields<'writer> + 'static,
-{
-    fn on_new_span(&self, attrs: &Attributes<'_>, id: &Id, ctx: Context<'_, S>) {
-        if !puffin::are_scopes_on() {
-            return;
-        }
-
-        if let Some(span) = ctx.span(id) {
-            let mut extensions = span.extensions_mut();
-            if extensions.get_mut::<FormattedFields<F>>().is_none() {
-                let mut fields = FormattedFields::<F>::new(String::with_capacity(64));
-                if self.fmt.format_fields(fields.as_writer(), attrs).is_ok() {
-                    extensions.insert(fields);
-                }
-            }
-        }
-    }
-
-    fn on_record(&self, id: &Id, values: &Record<'_>, ctx: Context<'_, S>) {
-        if let Some(span) = ctx.span(id) {
-            let mut extensions = span.extensions_mut();
-            if let Some(fields) = extensions.get_mut::<FormattedFields<F>>() {
-                let _ = self.fmt.add_fields(fields, values);
-            } else {
-                let mut fields = FormattedFields::<F>::new(String::with_capacity(64));
-                if self.fmt.format_fields(fields.as_writer(), values).is_ok() {
-                    extensions.insert(fields);
-                }
-            }
-        }
-    }
-
-    fn on_enter(&self, id: &Id, ctx: Context<'_, S>) {
-        if !puffin::are_scopes_on() {
-            return;
-        }
-
-        if let Some(span_data) = ctx.span(id) {
-            let metadata = span_data.metadata();
-            let name = metadata.name();
-            let target = metadata.target();
-            let extensions = span_data.extensions();
-            let data = extensions
-                .get::<FormattedFields<F>>()
-                .map(|fields| fields.fields.as_str())
-                .unwrap_or_default();
-
-            ThreadProfiler::call(|tp| {
-                let start_stream_offset = tp.begin_scope(name, target, data);
-                PUFFIN_SPAN_STACK.with(|s| {
-                    s.borrow_mut().push_back((id.clone(), start_stream_offset));
-                });
-            });
-        }
-    }
-
-    fn on_exit(&self, id: &Id, _ctx: Context<'_, S>) {
-        PUFFIN_SPAN_STACK.with(|s| {
-            let value = s.borrow_mut().pop_back();
-            if let Some((last_id, start_stream_offset)) = value {
-                if *id == last_id {
-                    ThreadProfiler::call(|tp| tp.end_scope(start_stream_offset));
-                } else {
-                    s.borrow_mut().push_back((last_id, start_stream_offset));
-                }
-            }
-        });
-    }
-
-    fn on_close(&self, id: Id, ctx: Context<'_, S>) {
-        if let Some(span) = ctx.span(&id) {
-            span.extensions_mut().remove::<FormattedFields<F>>();
-        }
-    }
-}
diff --git a/src/session.rs b/src/session.rs
deleted file mode 100644
index ffd0609092..0000000000
--- a/src/session.rs
+++ /dev/null
@@ -1,385 +0,0 @@
-//! Session management for matches.
-//!
-//! The [`SessionManager`] is used to create, stop, snapshot, and restore game matches. A session
-//! refers to an in-progress game match.
-//!
-//! Right now there are two kinds of sessions: local sessions and network sessions. These are
-//! implemented by the [`LocalSessionRunner`] and
-//! [`GgrsSessionRunner`][crate::networking::GgrsSessionRunner] types respectively.
-//!
-//! Both of them implmenent [`SessionRunner`] which is a trait used by the [`SessionManager`] to
-//! advance the game simulation properly.
-
-use bevy::utils::Instant;
-use downcast_rs::{impl_downcast, Downcast};
-use jumpy_core::input::{PlayerControl, PlayerInputs};
-
-use crate::{main_menu::MenuPage, prelude::*};
-
-/// Session plugin.
-pub struct JumpySessionPlugin;
-
-/// Stage label for the game session stages
-#[derive(Debug, Hash, PartialEq, Eq, Clone, SystemSet)]
-#[system_set(base)]
-pub enum SessionStage {
-    /// Update the game session.
-    Update,
-}
-
-impl Plugin for JumpySessionPlugin {
-    fn build(&self, app: &mut App) {
-        let mut session_schedule = Schedule::new();
-        session_schedule.add_systems((
-            ensure_2_players,
-            collect_local_input.pipe(update_game),
-            play_sounds,
-        ));
-
-        app.add_plugin(bones_bevy_renderer::BonesRendererPlugin::<Session>::with_sync_time(false))
-            .add_plugin(jumpy_core::metadata::JumpyCoreAssetsPlugin)
-            .init_resource::<CurrentEditorInput>()
-            .configure_set(
-                SessionStage::Update
-                    .before(CoreSet::Update)
-                    .run_if(in_state(InGameState::Playing))
-                    .run_if(in_state(EngineState::InGame))
-                    .run_if(resource_exists::<Session>()),
-            )
-            .add_system(move |world: &mut World| {
-                let in_correct_state = {
-                    world.resource::<State<EngineState>>().0 == EngineState::InGame
-                        && world.resource::<State<InGameState>>().0 == InGameState::Playing
-                };
-
-                if !in_correct_state || !world.contains_resource::<Session>() {
-                    return;
-                }
-
-                loop {
-                    let should_run =
-                        world.resource_scope(|world: &mut World, mut session: Mut<Session>| {
-                            session.run_criteria(world.resource::<Time>())
-                        });
-
-                    match should_run {
-                        ShouldRun::Yes => {
-                            session_schedule.run(world);
-                            break;
-                        }
-                        ShouldRun::No => break,
-                        ShouldRun::YesAndCheckAgain => {
-                            session_schedule.run(world);
-                        }
-                    }
-                }
-            });
-    }
-}
-
-/// A resource containing the in-progress game session.
-#[derive(Resource, Deref, DerefMut)]
-pub struct Session(pub Box<dyn SessionRunner>);
-
-/// Trait implemented by types that know how to advance the core game simulation.
-///
-/// Things like fixed frame updates are expected to be handled by the session runner.
-///
-/// The [`GgrsSessionRunner`][crate::networking::GgrsSessionRunner] is an example of how a custom
-/// runner can be used for running a network game.
-pub trait SessionRunner: Sync + Send + Downcast {
-    /// Get mutable access to the [`CoreSession`].
-    fn core_session(&mut self) -> &mut CoreSession;
-    /// Get mutable access to the [`bones::World`] from in the [`CoreSession`].
-    fn world(&mut self) -> &mut bones::World {
-        &mut self.core_session().world
-    }
-    /// Restart the session.
-    fn restart(&mut self);
-    /// Get the control input for the player with the given `player_idx`.
-    fn get_player_input(&mut self, player_idx: usize) -> PlayerControl {
-        self.core_session()
-            .update_input(|inputs| inputs.players[player_idx].control.clone())
-    }
-    /// Set the player input for the player with the given `player_idx`.
-    fn set_player_input(&mut self, player_idx: usize, control: PlayerControl);
-    /// Advance the game simmulation.
-    fn advance(&mut self, bevy_world: &mut World) -> Result<(), SessionError>;
-    /// Return whether or not the simulation should run, given the current time.
-    ///
-    /// This is used to created fixed refresh rates.
-    fn run_criteria(&mut self, time: &Time) -> ShouldRun;
-    /// Returns the player index of the player if we are in a network game.
-    ///
-    /// In a network game, we currently only allow for one local player, so this allows the session
-    /// to find out which player we are playing as so it can map the local player 1's input to the
-    /// appropriate network player.
-    fn network_player_idx(&mut self) -> Option<usize>;
-}
-impl_downcast!(SessionRunner);
-
-/// Possible errors returned by [`SessionRunner::advance`].
-pub enum SessionError {
-    /// The session was disconnected.
-    Disconnected,
-}
-
-/// Implementation of [`SessionRunner`] for local games.
-///
-/// This is almost as simple as a [`SessionRunner`] can get: it just advances the game simulation at
-/// the fixed [`jumpy_core::FPS`].
-pub struct LocalSessionRunner {
-    pub core: CoreSession,
-    pub accumulator: f64,
-    pub loop_start: Option<Instant>,
-}
-
-impl LocalSessionRunner {
-    fn new(core: CoreSession) -> Self
-    where
-        Self: Sized,
-    {
-        LocalSessionRunner {
-            core,
-            accumulator: default(),
-            loop_start: default(),
-        }
-    }
-}
-
-/// Indicates whether or not a session advance should be run.
-#[derive(Clone, Copy, Debug, Eq, PartialEq)]
-pub enum ShouldRun {
-    Yes,
-    No,
-    YesAndCheckAgain,
-}
-
-impl SessionRunner for LocalSessionRunner {
-    fn core_session(&mut self) -> &mut CoreSession {
-        &mut self.core
-    }
-
-    fn set_player_input(&mut self, player_idx: usize, control: PlayerControl) {
-        self.core.update_input(|inputs| {
-            inputs.players[player_idx].control = control;
-        });
-    }
-
-    fn restart(&mut self) {
-        self.core.restart();
-    }
-
-    fn advance(&mut self, bevy_world: &mut World) -> Result<(), SessionError> {
-        self.core.advance(bevy_world);
-
-        Ok(())
-    }
-    fn run_criteria(&mut self, time: &Time) -> ShouldRun {
-        const STEP: f64 = 1.0 / jumpy_core::FPS as f64;
-        let delta = time.delta_seconds_f64();
-        if self.loop_start.is_none() {
-            self.accumulator += delta;
-        }
-
-        if self.accumulator >= STEP {
-            let start = self.loop_start.get_or_insert_with(Instant::now);
-
-            let loop_too_long = (Instant::now() - *start).as_secs_f64() > STEP;
-
-            if loop_too_long {
-                warn!("Frame took too long: couldn't keep up with fixed update.");
-                self.accumulator = 0.0;
-                self.loop_start = None;
-                ShouldRun::No
-            } else {
-                self.accumulator -= STEP;
-                ShouldRun::YesAndCheckAgain
-            }
-        } else {
-            self.loop_start = None;
-            ShouldRun::No
-        }
-    }
-    fn network_player_idx(&mut self) -> Option<usize> {
-        None
-    }
-}
-
-// Give bones_bevy_render plugin access to the bones world in our game session.
-impl bones_bevy_renderer::HasBonesWorld for Session {
-    fn world(&mut self) -> &mut bones::World {
-        self.0.world()
-    }
-}
-
-/// Helper for creating and stopping game sessions.
-#[derive(SystemParam)]
-pub struct SessionManager<'w, 's> {
-    pub commands: Commands<'w, 's>,
-    pub menu_camera: Query<'w, 's, &'static mut Camera, With<MenuCamera>>,
-    pub session: Option<ResMut<'w, Session>>,
-    pub core_meta_arc: Res<'w, CoreMetaArc>,
-}
-
-impl<'w, 's> SessionManager<'w, 's> {
-    /// Start a game session
-    pub fn start_local(&mut self, info: CoreSessionInfo) {
-        let session = Session(Box::new(LocalSessionRunner::new(CoreSession::new(info))));
-        self.commands.insert_resource(session);
-        self.menu_camera.for_each_mut(|mut x| x.is_active = false);
-    }
-
-    /// Start a network game session.
-    #[cfg(not(target_arch = "wasm32"))]
-    pub fn start_network(
-        &mut self,
-        core_info: CoreSessionInfo,
-        ggrs_info: crate::networking::GgrsSessionRunnerInfo,
-    ) {
-        let session = Session(Box::new(crate::networking::GgrsSessionRunner::new(
-            CoreSession::new(core_info),
-            ggrs_info,
-        )));
-        self.commands.insert_resource(session);
-        self.menu_camera.for_each_mut(|mut x| x.is_active = false);
-        self.commands
-            .insert_resource(NextState(Some(InGameState::Playing)));
-        self.commands
-            .insert_resource(NextState(Some(EngineState::InGame)));
-    }
-
-    /// Restart a game session without changing the settings
-    pub fn restart(&mut self) {
-        if let Some(session) = self.session.as_mut() {
-            session.restart();
-        }
-    }
-
-    /// Stop a game session
-    pub fn stop(&mut self) {
-        self.commands.remove_resource::<Session>();
-        self.menu_camera.for_each_mut(|mut x| x.is_active = true);
-    }
-}
-
-/// Helper system to make sure there are two players on the board, if ever the game is in the middle
-/// of playing and there are no players on the board.
-///
-/// This is primarily for the editor, which may be started without going through the player
-/// selection screen.
-fn ensure_2_players(mut session: ResMut<Session>, core_meta: Res<CoreMetaArc>) {
-    let player_inputs = session
-        .world()
-        .resource::<jumpy_core::input::PlayerInputs>();
-    let mut player_inputs = player_inputs.borrow_mut();
-
-    if player_inputs.players.iter().all(|x| !x.active) {
-        for i in 0..2 {
-            player_inputs.players[i].active = true;
-            player_inputs.players[i].selected_player = core_meta.players[i].clone();
-        }
-    }
-}
-
-/// Update the input to the game session.
-fn collect_local_input(
-    mut session: ResMut<Session>,
-    player_input_collectors: Query<(&PlayerInputCollector, &ActionState<PlayerAction>)>,
-    mut current_editor_input: ResMut<CurrentEditorInput>,
-) {
-    let network_player_idx = session.network_player_idx();
-
-    if let Some(local_session) = session.downcast_mut::<LocalSessionRunner>() {
-        // TODO: Handle editor input for non-local sessions.
-        let editor_input = current_editor_input.take();
-        local_session.core.update_input(|inputs| {
-            inputs.players[0].editor_input = editor_input;
-        });
-    }
-
-    for (player_idx, action_state) in &player_input_collectors {
-        let is_ai = {
-            let world = &session.core_session().world;
-            let inputs = world.resource::<PlayerInputs>();
-            let inputs = inputs.borrow();
-            inputs.players[player_idx.0].is_ai
-        };
-        if (player_idx.0 != 0 && network_player_idx.is_some()) || is_ai {
-            continue;
-        }
-
-        let mut control = session.0.get_player_input(player_idx.0);
-
-        let jump_pressed = action_state.pressed(PlayerAction::Jump);
-        control.jump_just_pressed = jump_pressed && !control.jump_pressed;
-        control.jump_pressed = jump_pressed;
-
-        let grab_pressed = action_state.pressed(PlayerAction::Grab);
-        control.grab_just_pressed = grab_pressed && !control.grab_pressed;
-        control.grab_pressed = grab_pressed;
-
-        let shoot_pressed = action_state.pressed(PlayerAction::Shoot);
-        control.shoot_just_pressed = shoot_pressed && !control.shoot_pressed;
-        control.shoot_pressed = shoot_pressed;
-
-        let was_moving = control.move_direction.length_squared() > f32::MIN_POSITIVE;
-        control.move_direction = action_state.axis_pair(PlayerAction::Move).unwrap().xy();
-        let is_moving = control.move_direction.length_squared() > f32::MIN_POSITIVE;
-        control.just_moved = !was_moving && is_moving;
-
-        session.set_player_input(network_player_idx.unwrap_or(player_idx.0), control);
-    }
-}
-
-/// Update the game session simulation.
-fn update_game(world: &mut World) {
-    let mut session = world.remove_resource::<Session>().unwrap();
-
-    // Advance the game session
-    if let Err(e) = session.advance(world) {
-        match e {
-            SessionError::Disconnected => {
-                error!("Network session disconnected");
-                // Don't return the session to the world
-
-                // Go back to the menu
-                let mut cameras = world.query_filtered::<&mut Camera, With<MenuCamera>>();
-                cameras.for_each_mut(world, |mut camera| camera.is_active = true);
-                world.insert_resource(MenuPage::Home);
-                world.insert_resource(NextState(Some(EngineState::MainMenu)));
-                world.insert_resource(NextState(Some(InGameState::Playing)));
-            }
-        }
-
-    // If the session is OK
-    } else {
-        // Return the session to the world
-        world.insert_resource(session);
-    }
-}
-
-/// Play sounds from the game session.
-pub fn play_sounds(audio: Res<AudioChannel<EffectsChannel>>, mut session: ResMut<Session>) {
-    // Get the sound queue out of the world
-    let queue = session
-        .world()
-        .run_initialized_system(move |mut audio_events: bones::ResMut<bones::AudioEvents>| {
-            Ok(audio_events.queue.drain(..).collect::<Vec<_>>())
-        })
-        .unwrap();
-
-    // Play all the sounds in the queue
-    for event in queue {
-        match event {
-            bones::AudioEvent::PlaySound {
-                sound_source,
-                volume,
-            } => {
-                audio
-                    .play(sound_source.get_bevy_handle_untyped().typed())
-                    .with_volume(volume);
-            }
-        }
-    }
-}
diff --git a/src/sessions.rs b/src/sessions.rs
new file mode 100644
index 0000000000..9d059a20ab
--- /dev/null
+++ b/src/sessions.rs
@@ -0,0 +1,46 @@
+use crate::prelude::*;
+
+pub struct SessionNames;
+impl SessionNames {
+    pub const GAME: &str = "game";
+    pub const MAIN_MENU: &str = "main_menu";
+    pub const PAUSE_MENU: &str = "pause_menu";
+}
+
+pub trait SessionExt {
+    fn start_menu(&mut self);
+    fn end_game(&mut self);
+    fn restart_game(&mut self);
+    fn start_game(&mut self, match_plugin: crate::core::MatchPlugin);
+}
+
+impl SessionExt for Sessions {
+    fn start_menu(&mut self) {
+        self.create(SessionNames::MAIN_MENU)
+            .install_plugin(crate::ui::main_menu::session_plugin);
+    }
+
+    fn end_game(&mut self) {
+        self.delete(SessionNames::GAME);
+    }
+
+    #[track_caller]
+    fn restart_game(&mut self) {
+        if let Some((map, player_info)) = self.get(SessionNames::GAME).map(|session| {
+            let map = (*session.world.resource::<LoadedMap>().0).clone();
+            let match_inputs = session.world.resource::<MatchInputs>();
+            (map, match_inputs.players.clone())
+        }) {
+            self.end_game();
+            self.create(SessionNames::GAME)
+                .install_plugin(crate::core::MatchPlugin { map, player_info });
+        } else {
+            panic!("Cannot restart game when game is not running");
+        }
+    }
+
+    fn start_game(&mut self, match_plugin: crate::core::MatchPlugin) {
+        let session = self.create(SessionNames::GAME);
+        session.install_plugin(match_plugin);
+    }
+}
diff --git a/src/settings.rs b/src/settings.rs
new file mode 100644
index 0000000000..22f252b89f
--- /dev/null
+++ b/src/settings.rs
@@ -0,0 +1,87 @@
+use crate::prelude::*;
+
+/// Settings plugin
+pub fn game_plugin(game: &mut Game) {
+    game.systems.add_startup_system(load_settings);
+}
+
+/// Startup system to load the game settings or use the default settings specified in the game meta.
+fn load_settings(game: &mut Game) {
+    let default_settings = {
+        let assets = game.shared_resource::<AssetServer>().unwrap();
+        let settings = &assets.root::<GameMeta>().default_settings;
+        settings.clone()
+    };
+    let mut storage = game.shared_resource_mut::<Storage>().unwrap();
+    if storage.get::<Settings>().is_none() {
+        storage.insert(default_settings);
+    }
+}
+
+/// Global settings, stored and accessed through [`Storage`].
+#[derive(HasSchema, Debug, Clone, Default)]
+#[repr(C)]
+pub struct Settings {
+    /// The player controller bindings
+    pub player_controls: PlayerControlMapping,
+    /// The address of the matchmaking server to connect to for online games.
+    pub matchmaking_server: String,
+}
+
+#[derive(HasSchema, Clone, Debug, Default)]
+#[repr(C)]
+pub struct PlayerControlMapping {
+    /// Controls for game remotes
+    pub gamepad: PlayerControlSetting,
+    /// Controls for keyboard player 1
+    pub keyboard1: PlayerControlSetting,
+    /// Controls for keyboard player 2
+    pub keyboard2: PlayerControlSetting,
+}
+
+/// Binds inputs to player actions
+#[derive(HasSchema, Clone, Debug, Default)]
+#[repr(C)]
+pub struct PlayerControlSetting {
+    pub movement: VirtualDPad,
+    pub pause: InputKind,
+    pub jump: InputKind,
+    pub grab: InputKind,
+    pub shoot: InputKind,
+    pub slide: InputKind,
+    pub menu_back: InputKind,
+    pub menu_start: InputKind,
+    pub menu_confirm: InputKind,
+}
+
+#[derive(HasSchema, Clone, Debug, Default)]
+#[repr(C)]
+pub struct VirtualDPad {
+    pub up: InputKind,
+    pub down: InputKind,
+    pub left: InputKind,
+    pub right: InputKind,
+}
+
+#[derive(HasSchema, Clone, Debug, Default)]
+#[repr(C, u8)]
+pub enum InputKind {
+    #[default]
+    None,
+    Button(GamepadButton),
+    AxisPositive(GamepadAxis),
+    AxisNegative(GamepadAxis),
+    Keyboard(KeyCode),
+}
+
+impl std::fmt::Display for InputKind {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            InputKind::None => write!(f, "[None]"),
+            InputKind::Button(btn) => write!(f, "{btn}"),
+            InputKind::AxisPositive(axis) => write!(f, "{axis} +"),
+            InputKind::AxisNegative(axis) => write!(f, "{axis} -"),
+            InputKind::Keyboard(key) => write!(f, "{key:?}"),
+        }
+    }
+}
diff --git a/src/ui.rs b/src/ui.rs
index 6f8b3b6966..654cb6b5e0 100644
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -1,390 +1,106 @@
-//! User interface.
-
-use bevy::{
-    ecs::system::SystemState,
-    window::{PrimaryWindow, WindowMode},
-};
-use bevy_egui::EguiContexts;
-
 use crate::prelude::*;
 
-pub use self::ui_input::MenuAction;
-
-pub mod ui_input;
-pub mod widgets;
-
-pub mod debug_tools;
-pub mod editor;
 pub mod main_menu;
+pub mod map_select;
 pub mod pause_menu;
 
-pub struct JumpyUiPlugin;
-
-impl Plugin for JumpyUiPlugin {
-    fn build(&self, app: &mut App) {
-        app.add_plugin(bevy_egui::EguiPlugin)
-            .add_plugin(ui_input::UiInputPlugin)
-            .add_plugin(main_menu::MainMenuPlugin)
-            .add_plugin(editor::EditorPlugin)
-            .add_plugin(debug_tools::DebugToolsPlugin)
-            .add_plugin(pause_menu::PausePlugin)
-            .init_resource::<WidgetAdjacencies>()
-            .init_resource::<DisableMenuInput>()
-            .add_system(
-                handle_menu_input
-                    .run_if(resource_exists::<GameMeta>())
-                    .in_base_set(CoreSet::PreUpdate)
-                    .before(bevy_egui::EguiSet::BeginFrame)
-                    .after(bevy_egui::EguiSet::ProcessInput)
-                    .after(leafwing_input_manager::plugin::InputManagerSystem::Update),
-            )
-            .add_system(update_egui_fonts)
-            .add_system(update_ui_scale.run_if(resource_exists::<GameMeta>()));
-    }
-}
-
-/// Awesome widget system shared by @aevyrie:
-/// <https://github.com/bevyengine/bevy/discussions/5522>
-pub trait WidgetSystem: SystemParam {
-    type Args;
-    fn system(
-        world: &mut World,
-        state: &mut SystemState<Self>,
-        ui: &mut egui::Ui,
-        id: WidgetId,
-        args: Self::Args,
-    );
+#[derive(HasSchema, Clone, Debug)]
+#[repr(C)]
+pub struct UiTheme {
+    pub scale: f64,
+    pub colors: UiThemeColors,
+    pub widgets: UiThemeWidgets,
+    pub fonts: SVec<Handle<Font>>,
+    pub font_styles: UiThemeFontStyles,
+    pub buttons: UiThemeButtons,
+    pub panel: UiThemePanel,
+    pub editor: UiThemeEditor,
 }
 
-pub fn widget<S: 'static + WidgetSystem>(
-    world: &mut World,
-    ui: &mut egui::Ui,
-    id: WidgetId,
-    args: S::Args,
-) {
-    // We need to cache `SystemState` to allow for a system's locally tracked state
-    if !world.contains_resource::<StateInstances<S>>() {
-        // Note, this message should only appear once! If you see it twice in the logs, the function
-        // may have been called recursively, and will panic.
-        trace!("Init widget system state {}", std::any::type_name::<S>());
-        world.insert_resource(StateInstances::<S> {
-            instances: HashMap::new(),
-        });
-    }
-    world.resource_scope(|world, mut states: Mut<StateInstances<S>>| {
-        if !states.instances.contains_key(&id) {
-            trace!(
-                "Registering widget system state for widget {id:?} of type {}",
-                std::any::type_name::<S>()
-            );
-            states.instances.insert(id, SystemState::new(world));
+impl Default for UiTheme {
+    fn default() -> Self {
+        Self {
+            scale: 1.0,
+            colors: default(),
+            widgets: default(),
+            fonts: default(),
+            buttons: default(),
+            font_styles: default(),
+            panel: default(),
+            editor: default(),
         }
-        let cached_state = states.instances.get_mut(&id).unwrap();
-        S::system(world, cached_state, ui, id, args);
-        cached_state.apply(world);
-    });
-}
-
-/// A UI widget may have multiple instances. We need to ensure the local state of these instances is
-/// not shared. This hashmap allows us to dynamically store instance states.
-#[derive(Resource, Default)]
-struct StateInstances<S: WidgetSystem + 'static> {
-    instances: HashMap<WidgetId, SystemState<S>>,
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct WidgetId(pub u64);
-impl WidgetId {
-    pub fn new(name: &str) -> Self {
-        use std::hash::Hasher;
-        let bytes = name.as_bytes();
-        let mut hasher = bevy::utils::AHasher::default();
-        hasher.write(bytes);
-        WidgetId(hasher.finish())
-    }
-    pub fn with(&self, name: &str) -> WidgetId {
-        Self::new(&format!("{}{name}", self.0))
     }
 }
 
-impl From<&str> for WidgetId {
-    fn from(s: &str) -> Self {
-        Self::new(s)
-    }
+#[derive(HasSchema, Debug, Default, Clone)]
+#[repr(C)]
+pub struct ImageMeta {
+    image: Handle<Image>,
+    image_size: Vec2,
 }
 
-/// Resource that stores which ui widgets are adjacent to which other widgets.
-///
-/// This is used to figure out which widget to focus on next when you press a direction on the
-/// gamepad, for instance.
-#[derive(Resource, Debug, Clone, Default)]
-pub struct WidgetAdjacencies {
-    pub map: HashMap<egui::Id, WidgetAdjacency>,
-    /// These widgets will have the focus change when pressing directional inputs
-    pub text_boxes: HashSet<egui::Id>,
+#[derive(HasSchema, Default, Debug, Clone)]
+#[repr(C)]
+pub struct UiThemeColors {
+    pub positive: Color,
 }
 
-/// The list of widgets in each direction from another widget
-#[derive(Debug, Clone, Default)]
-pub struct WidgetAdjacency {
-    pub up: Option<egui::Id>,
-    pub down: Option<egui::Id>,
-    pub left: Option<egui::Id>,
-    pub right: Option<egui::Id>,
+#[derive(HasSchema, Default, Debug, Clone)]
+#[repr(C)]
+pub struct UiThemeWidgets {
+    pub border_radius: f32,
+    pub default: UiThemeWidgetColors,
+    pub hovered: UiThemeWidgetColors,
+    pub active: UiThemeWidgetColors,
+    pub noninteractive: UiThemeWidgetColors,
+    pub menu: UiThemeWidgetColors,
+    pub window_fill: Color,
+    pub panel: UiThemePanel,
 }
 
-impl WidgetAdjacencies {
-    pub fn widget(&mut self, resp: &egui::Response) -> WidgetAdjacencyEntry {
-        WidgetAdjacencyEntry {
-            id: resp.id,
-            adjacencies: self,
-        }
-    }
+#[derive(HasSchema, Default, Debug, Clone)]
+#[repr(C)]
+pub struct UiThemeWidgetColors {
+    pub bg_fill: Color,
+    pub bg_stroke: Color,
+    pub text: Color,
 }
 
-pub struct WidgetAdjacencyEntry<'a> {
-    id: egui::Id,
-    adjacencies: &'a mut WidgetAdjacencies,
+#[derive(HasSchema, Default, Debug, Clone)]
+#[repr(C)]
+pub struct UiThemeFontStyles {
+    pub heading: FontMeta,
+    pub bigger: FontMeta,
+    pub normal: FontMeta,
+    pub smaller: FontMeta,
 }
 
-#[allow(clippy::wrong_self_convention)]
-impl<'a> WidgetAdjacencyEntry<'a> {
-    pub fn to_left_of(self, resp: &egui::Response) -> Self {
-        let other_id = resp.id;
-        self.adjacencies.map.entry(self.id).or_default().right = Some(other_id);
-        self.adjacencies.map.entry(other_id).or_default().left = Some(self.id);
-        self
-    }
-    pub fn to_right_of(self, resp: &egui::Response) -> Self {
-        let other_id = resp.id;
-        self.adjacencies.map.entry(self.id).or_default().left = Some(other_id);
-        self.adjacencies.map.entry(other_id).or_default().right = Some(self.id);
-        self
-    }
-    pub fn above(self, resp: &egui::Response) -> Self {
-        let other_id = resp.id;
-        self.adjacencies.map.entry(self.id).or_default().down = Some(other_id);
-        self.adjacencies.map.entry(other_id).or_default().up = Some(self.id);
-        self
-    }
-    pub fn below(self, resp: &egui::Response) -> Self {
-        let other_id = resp.id;
-        self.adjacencies.map.entry(self.id).or_default().up = Some(other_id);
-        self.adjacencies.map.entry(other_id).or_default().down = Some(self.id);
-        self
-    }
+#[derive(HasSchema, Default, Debug, Clone)]
+#[repr(C)]
+pub struct UiThemeButtons {
+    pub normal: ButtonThemeMeta,
+    pub small: ButtonThemeMeta,
 }
 
-#[derive(Resource, Default, Deref, DerefMut)]
-pub struct DisableMenuInput(pub bool);
-
-fn handle_menu_input(
-    disable_menu_input: Res<DisableMenuInput>,
-    mut windows: Query<&mut Window, With<PrimaryWindow>>,
-    input: Query<&ActionState<MenuAction>>,
-    keyboard: Res<Input<KeyCode>>,
-    mut egui_inputs: Query<&mut bevy_egui::EguiInput, With<PrimaryWindow>>,
-    adjacencies: Res<WidgetAdjacencies>,
-    editor_state: Res<State<GameEditorState>>,
-    mut egui_ctx: EguiContexts,
-) {
-    let input = input.single();
-
-    // Handle fullscreen toggling
-    if input.just_pressed(MenuAction::ToggleFullscreen) {
-        if let Ok(mut window) = windows.get_single_mut() {
-            window.mode = match window.mode {
-                WindowMode::BorderlessFullscreen => WindowMode::Windowed,
-                _ => WindowMode::BorderlessFullscreen,
-            };
-        }
-    }
-
-    if let Ok(mut inputs) = egui_inputs.get_single_mut() {
-        if **disable_menu_input {
-            inputs.events.retain(|event| match event {
-                egui::Event::Key { key, .. } => key == &egui::Key::Escape,
-                _ => true,
-            });
-            return;
-        }
-
-        // TODO: This might not be the best way to do this, but here we prevent spacebar presses from
-        // comming to Egui while the editor is visible. This is to prevent you pressing spacebar to jump
-        // the player and inadvertently clicking a button and closing the map, losing your work.
-        if editor_state.0 == GameEditorState::Visible {
-            inputs.events.retain(|event| match event {
-                egui::Event::Key { key, .. } => key != &egui::Key::Space,
-                _ => true,
-            });
-        }
-
-        if input.just_pressed(MenuAction::Confirm) {
-            inputs.events.push(egui::Event::Key {
-                key: egui::Key::Enter,
-                pressed: true,
-                repeat: false,
-                modifiers: egui::Modifiers::NONE,
-            });
-        }
-
-        // Helper to fall back on using tab order instead of adjacency map to determine next focused
-        // widget.
-        let mut tab_fallback = || {
-            if input.just_pressed(MenuAction::Up) || input.just_pressed(MenuAction::Left) {
-                inputs.events.push(egui::Event::Key {
-                    key: egui::Key::Tab,
-                    pressed: true,
-                    repeat: false,
-                    modifiers: egui::Modifiers::SHIFT,
-                });
-            } else if input.just_pressed(MenuAction::Down) || input.just_pressed(MenuAction::Right)
-            {
-                inputs.events.push(egui::Event::Key {
-                    key: egui::Key::Tab,
-                    pressed: true,
-                    repeat: false,
-                    modifiers: egui::Modifiers::NONE,
-                });
-            }
-        };
-
-        egui_ctx.ctx_mut().memory_mut(|memory| {
-            let focused = memory.focus();
-            let is_text_box = focused
-                .map(|id| adjacencies.text_boxes.contains(&id))
-                .unwrap_or(false);
-
-            if !(is_text_box
-                && (keyboard.pressed(KeyCode::Up)
-                    || keyboard.pressed(KeyCode::Down)
-                    || keyboard.pressed(KeyCode::Left)
-                    || keyboard.pressed(KeyCode::Right)))
-            {
-                if let Some(adjacency) = memory.focus().and_then(|id| adjacencies.map.get(&id)) {
-                    if input.just_pressed(MenuAction::Up) {
-                        if let Some(adjacent) = adjacency.up {
-                            memory.request_focus(adjacent);
-                        } else {
-                            tab_fallback()
-                        }
-                    } else if input.just_pressed(MenuAction::Down) {
-                        if let Some(adjacent) = adjacency.down {
-                            memory.request_focus(adjacent);
-                        } else {
-                            tab_fallback()
-                        }
-                    } else if input.just_pressed(MenuAction::Left) {
-                        if let Some(adjacent) = adjacency.left {
-                            memory.request_focus(adjacent);
-                        } else {
-                            tab_fallback()
-                        }
-                    } else if input.just_pressed(MenuAction::Right) {
-                        if let Some(adjacent) = adjacency.right {
-                            memory.request_focus(adjacent);
-                        } else {
-                            tab_fallback()
-                        }
-                    }
-                } else {
-                    tab_fallback();
-                }
-            }
-        });
-    }
+#[derive(HasSchema, Default, Debug, Clone)]
+#[repr(C)]
+pub struct UiThemePanel {
+    pub font_color: Color,
+    pub padding: MarginMeta,
+    pub border: BorderImageMeta,
 }
 
-/// Resource containing the font definitions to use for Egui.
-#[derive(Resource, Deref, DerefMut)]
-pub struct EguiFontDefinitions(pub egui::FontDefinitions);
-
-/// Watches for asset events for [`EguiFont`] assets and updates the corresponding fonts from the
-/// [`GameMeta`], inserting the font data into the egui context.
-fn update_egui_fonts(
-    mut font_queue: Local<Vec<Handle<EguiFont>>>,
-    egui_font_definitions: Option<ResMut<EguiFontDefinitions>>,
-    game: Option<Res<GameMeta>>,
-    mut events: EventReader<AssetEvent<EguiFont>>,
-    assets: Res<Assets<EguiFont>>,
-    mut contexts: EguiContexts,
-) {
-    // Add any newly updated/created fonts to the queue
-    for event in events.iter() {
-        if let AssetEvent::Created { handle } | AssetEvent::Modified { handle } = event {
-            font_queue.push(handle.clone_weak());
-        }
-    }
-
-    // Update queued fonts if the game is ready
-    if let Some((game, mut egui_font_definitions)) = game.zip(egui_font_definitions) {
-        for handle in font_queue.drain(..) {
-            // Get the game font name associated to this handle
-            let name = game
-                .ui_theme
-                .font_families
-                .iter()
-                .find_map(|(font_name, font_handle)| {
-                    if font_handle.inner == handle {
-                        Some(font_name.clone())
-                    } else {
-                        None
-                    }
-                });
-
-            // If we were able to find the font handle in our game fonts
-            if let Some(font_name) = name {
-                // Get the font asset
-                if let Some(font) = assets.get(&handle) {
-                    // And insert it into the Egui font definitions
-                    let ctx = contexts.ctx_mut();
-                    egui_font_definitions
-                        .font_data
-                        .insert(font_name.clone(), font.0.clone());
-
-                    egui_font_definitions
-                        .families
-                        .get_mut(&egui::FontFamily::Name(font_name.clone().into()))
-                        .unwrap()
-                        .push(font_name);
-
-                    ctx.set_fonts(egui_font_definitions.clone());
-                }
-            }
-        }
-    }
+#[derive(HasSchema, Default, Debug, Clone)]
+#[repr(C)]
+pub struct UiThemeEditor {
+    pub icons: UiThemeEditorIcons,
 }
 
-fn update_ui_scale(
-    game_meta: Res<GameMeta>,
-    mut egui_settings: ResMut<bevy_egui::EguiSettings>,
-    windows: Query<&Window, With<PrimaryWindow>>,
-    projection: Query<&OrthographicProjection, With<MenuCamera>>,
-) {
-    if let Ok(window) = windows.get_single() {
-        if let Ok(projection) = projection.get_single() {
-            match projection.scaling_mode {
-                bevy::render::camera::ScalingMode::FixedVertical(height) => {
-                    let window_height = window.height();
-                    let scale = window_height / height;
-                    egui_settings.scale_factor = (scale * game_meta.ui_theme.scale) as f64;
-                }
-                bevy::render::camera::ScalingMode::FixedHorizontal(width) => {
-                    let window_width = window.width();
-                    let scale = window_width / width;
-                    egui_settings.scale_factor = (scale * game_meta.ui_theme.scale) as f64;
-                }
-                bevy::render::camera::ScalingMode::Fixed { width, height } => {
-                    let window_width = window.width();
-                    let window_height = window.height();
-                    let scale = window_width / width;
-                    let scale = scale.min(window_height / height);
-                    egui_settings.scale_factor = (scale * game_meta.ui_theme.scale) as f64;
-                }
-                bevy::render::camera::ScalingMode::AutoMin { .. } => (),
-                bevy::render::camera::ScalingMode::AutoMax { .. } => (),
-                bevy::render::camera::ScalingMode::WindowSize(..) => (),
-            }
-        }
-    }
+#[derive(HasSchema, Debug, Default, Clone)]
+#[repr(C)]
+pub struct UiThemeEditorIcons {
+    pub elements: ImageMeta,
+    pub tiles: ImageMeta,
+    pub collisions: ImageMeta,
+    pub select: ImageMeta,
 }
diff --git a/src/ui/debug_tools.rs b/src/ui/debug_tools.rs
deleted file mode 100644
index 95ffd09882..0000000000
--- a/src/ui/debug_tools.rs
+++ /dev/null
@@ -1,282 +0,0 @@
-use bevy::{
-    diagnostic::{Diagnostics, FrameTimeDiagnosticsPlugin},
-    prelude::*,
-};
-use bevy_egui::{egui::Checkbox, *};
-use bevy_fluent::Localization;
-
-use crate::prelude::*;
-
-#[cfg(not(target_arch = "wasm32"))]
-use crate::networking::debug::{network_debug_window, NetworkDebug};
-
-pub struct DebugToolsPlugin;
-
-impl Plugin for DebugToolsPlugin {
-    fn build(&self, app: &mut App) {
-        app.add_plugin(FrameTimeDiagnosticsPlugin)
-            // .init_resource::<ShowNetworkVisualizer>()
-            .init_resource::<BonesSnapshot>()
-            .init_resource::<CoreDebugSettings>()
-            .init_resource::<ShowDebugWindows>()
-            .add_system(sync_core_debug_settings)
-            .add_system(debug_tools_window)
-            .add_system(frame_diagnostic_window)
-            .add_system(profiler_window);
-
-        #[cfg(not(target_arch = "wasm32"))]
-        app.init_resource::<NetworkDebug>().add_system(
-            network_debug_window
-                .in_base_set(CoreSet::Last)
-                .run_if(in_state(EngineState::InGame))
-                .run_if(in_state(InGameState::Playing)),
-        );
-    }
-}
-
-/// Bevy resource containing the core debug settings that will be used for game sessions.
-#[derive(Resource, Default, Deref, DerefMut)]
-pub struct CoreDebugSettings(pub jumpy_core::debug::DebugSettings);
-
-/// System to sync the core debug settings with any active bones sessions.
-fn sync_core_debug_settings(session: Option<ResMut<Session>>, settings: Res<CoreDebugSettings>) {
-    if settings.is_changed() {
-        if let Some(mut session) = session {
-            session.world().insert_resource(settings.0);
-        }
-    }
-}
-
-#[derive(Resource, Default)]
-pub struct ShowDebugWindows {
-    pub frame_time_diagnostics: bool,
-    pub profiler: bool,
-    pub network_debug: bool,
-}
-
-/// Resource containing the bones snapshot.
-#[derive(Default, Resource)]
-struct BonesSnapshot(Option<bones::World>);
-
-/// System that renders the debug tools window which can be toggled by pressing F12
-fn debug_tools_window(
-    mut core_debug_settings: ResMut<CoreDebugSettings>,
-    mut visible: Local<bool>,
-    mut show_debug_windows: ResMut<ShowDebugWindows>,
-    localization: Res<Localization>,
-    input: Res<Input<KeyCode>>,
-    mut show_inspector: ResMut<WorldInspectorEnabled>,
-    mut bones_world_snapshot: ResMut<BonesSnapshot>,
-    mut session: Option<ResMut<Session>>,
-    mut egui_ctxs: EguiContexts,
-) {
-    // Toggle debug window visibility
-    if input.just_pressed(KeyCode::F12) {
-        *visible = !*visible;
-    }
-
-    // Shortcut to toggle collision shapes without having to use the menu
-    if input.just_pressed(KeyCode::F10) {
-        core_debug_settings.show_damage_regions = !core_debug_settings.show_damage_regions;
-        core_debug_settings.show_kinematic_colliders = core_debug_settings.show_damage_regions;
-    }
-
-    // Shortcut to toggle the inspector without having to use the menu
-    if input.just_pressed(KeyCode::F9) {
-        show_inspector.0 = !show_inspector.0;
-    }
-
-    // Shortcut to toggle frame diagnostics
-    if input.just_pressed(KeyCode::F8) {
-        show_debug_windows.frame_time_diagnostics = !show_debug_windows.frame_time_diagnostics;
-    }
-
-    if input.just_pressed(KeyCode::F7) {
-        show_debug_windows.profiler = !show_debug_windows.profiler;
-    }
-
-    if input.just_pressed(KeyCode::F6) {
-        show_debug_windows.network_debug = !show_debug_windows.network_debug;
-    }
-
-    // // Shortcut to toggle network visualizers
-    // if input.just_pressed(KeyCode::F7) {
-    //     **show_network_visualizer = !**show_network_visualizer;
-    // }
-
-    // Display debug tool window
-    egui::Window::new(localization.get("debug-tools"))
-        // ID is needed because title comes from localizaition which can change
-        .id(egui::Id::new("debug_tools"))
-        .open(&mut visible)
-        .show(egui_ctxs.ctx_mut(), |ui| {
-            ui.heading("Render");
-
-            // Show collision shapes
-            ui.checkbox(
-                &mut core_debug_settings.show_kinematic_colliders,
-                format!("{} ( F10 )", localization.get("kinematic-colliders")),
-            );
-            ui.checkbox(
-                &mut core_debug_settings.show_damage_regions,
-                format!("{} ( F10 )", localization.get("damage-regions")),
-            );
-            ui.checkbox(
-                &mut core_debug_settings.show_pathfinding_lines,
-                localization.get("pathfinding-lines"),
-            );
-
-            ui.heading("Windows");
-
-            // Show world inspector
-            ui.checkbox(
-                &mut show_inspector.0,
-                format!("{} ( F9 )", localization.get("world-inspector")),
-            );
-
-            // Show frame time diagnostics
-            ui.checkbox(
-                &mut show_debug_windows.frame_time_diagnostics,
-                format!("{} ( F8 )", localization.get("frame-time-diagnostics")),
-            );
-
-            // Show profiler
-            ui.checkbox(
-                &mut show_debug_windows.profiler,
-                format!("{} ( F7 )", localization.get("profiler")),
-            );
-
-            let networking_enabled = cfg!(not(target_arch = "wasm32"));
-            // Show network diagnostics
-            ui.add_enabled(
-                networking_enabled,
-                Checkbox::new(
-                    &mut show_debug_windows.network_debug,
-                    format!("{} ( F6 )", localization.get("network-diagnostics")),
-                ),
-            )
-            .on_disabled_hover_text(localization.get("networking-disabled-message"));
-
-            // Snapshot/Restore buttons
-            ui.add_space(2.0);
-            ui.heading(localization.get("snapshot"));
-            ui.horizontal(|ui| {
-                ui.scope(|ui| {
-                    ui.set_enabled(session.is_some());
-
-                    if ui.button(localization.get("take-snapshot")).clicked() {
-                        if let Some(session) = &mut session {
-                            bones_world_snapshot.0 = Some(session.core_session().snapshot());
-                        }
-                    }
-
-                    ui.scope(|ui| {
-                        ui.set_enabled(bones_world_snapshot.0.is_some());
-
-                        if ui.button(localization.get("restore-snapshot")).clicked() {
-                            if let Some(mut session) = session {
-                                if let Some(snapshot) = &mut bones_world_snapshot.0 {
-                                    session.core_session().restore(&mut snapshot.clone())
-                                }
-                            }
-                        }
-                    });
-                });
-            });
-        });
-}
-
-struct FrameDiagState {
-    min_fps: f64,
-    max_fps: f64,
-    min_frame_time: f64,
-    max_frame_time: f64,
-}
-
-impl Default for FrameDiagState {
-    fn default() -> Self {
-        Self {
-            min_fps: f64::MAX,
-            max_fps: 0.0,
-            min_frame_time: f64::MAX,
-            max_frame_time: 0.0,
-        }
-    }
-}
-
-fn frame_diagnostic_window(
-    mut state: Local<FrameDiagState>,
-    mut show: ResMut<ShowDebugWindows>,
-    diagnostics: Res<Diagnostics>,
-    localization: Res<Localization>,
-    mut egui_ctx: EguiContexts,
-) {
-    if show.frame_time_diagnostics {
-        egui::Window::new(&localization.get("frame-diagnostics"))
-            .id(egui::Id::new("frame_diagnostics"))
-            .default_width(500.0)
-            .open(&mut show.frame_time_diagnostics)
-            .show(egui_ctx.ctx_mut(), |ui| {
-                if ui.button(&localization.get("reset-min-max")).clicked() {
-                    *state = default();
-                }
-
-                let fps = diagnostics.get(FrameTimeDiagnosticsPlugin::FPS).unwrap();
-                let fps_value = fps.value().unwrap();
-
-                if fps_value < state.min_fps {
-                    state.min_fps = fps_value;
-                }
-                if fps_value > state.max_fps {
-                    state.max_fps = fps_value;
-                }
-
-                let frame_time = diagnostics
-                    .get(FrameTimeDiagnosticsPlugin::FRAME_TIME)
-                    .unwrap();
-                let frame_time_value = frame_time.value().unwrap();
-
-                if frame_time_value < state.min_frame_time {
-                    state.min_frame_time = frame_time_value;
-                }
-                if frame_time_value > state.max_frame_time {
-                    state.max_frame_time = frame_time_value;
-                }
-
-                ui.monospace(&format!(
-                    "{label:20}: {fps:4.0}{suffix:3} ( {min:4.0}{suffix:3}, {avg:4.0}{suffix:3}, {max:4.0}{suffix:3} )",
-                    label = localization.get("frames-per-second"),
-                    fps = fps_value,
-                    suffix = fps.suffix,
-                    min = state.min_fps,
-                    avg = fps.average().unwrap(),
-                    max = state.max_fps,
-                ));
-                ui.monospace(&format!(
-                    "{label:20}: {fps:4.1}{suffix:3} ( {min:4.1}{suffix:3}, {avg:4.0}{suffix:3}, {max:4.1}{suffix:3} )",
-                    label = localization.get("frame-time"),
-                    fps = frame_time_value * 1000.0,
-                    suffix = "ms",
-                    min = state.min_frame_time * 1000.0,
-                    avg = frame_time.average().unwrap() * 1000.0,
-                    max = state.max_frame_time * 1000.0,
-                ));
-            });
-    }
-}
-
-fn profiler_window(
-    mut show: ResMut<ShowDebugWindows>,
-    localization: Res<Localization>,
-    mut egui_ctx: EguiContexts,
-) {
-    puffin::set_scopes_on(true);
-    if show.profiler {
-        egui::Window::new(&localization.get("profiler"))
-            .id(egui::Id::new("profiler"))
-            .open(&mut show.profiler)
-            .show(egui_ctx.ctx_mut(), |ui| {
-                puffin_egui::profiler_ui(ui);
-            });
-    }
-}
diff --git a/src/ui/editor.rs b/src/ui/editor.rs
deleted file mode 100644
index a3a9ef2627..0000000000
--- a/src/ui/editor.rs
+++ /dev/null
@@ -1,1731 +0,0 @@
-use super::{widget, widgets::bordered_button::BorderedButton, WidgetSystem};
-use crate::prelude::*;
-use bevy::{ecs::system::SystemParam, math::Vec3Swizzles, window::PrimaryWindow};
-use bevy_egui::*;
-use bevy_fluent::Localization;
-use bones_bevy_renderer::BevyBonesEntity;
-use jumpy_core::{
-    input::{ElementLayer, TileLayer},
-    physics::TileCollisionKind,
-};
-use std::marker::PhantomData;
-
-pub struct EditorPlugin;
-
-impl Plugin for EditorPlugin {
-    fn build(&self, app: &mut App) {
-        app.init_resource::<EditorState>()
-            .add_system(
-                editor_ui_system
-                    .run_if(in_state(EngineState::InGame))
-                    .run_if(in_state(GameEditorState::Visible)),
-            )
-            .add_system(cleanup_editor.in_schedule(OnExit(GameEditorState::Visible)));
-    }
-}
-
-/// Resource containing the current position of the mouse cursor in the editor.
-#[derive(Default)]
-struct EditorCursor {
-    pub current_pos: Option<Vec2>,
-    pub context_click_pos: Option<Vec2>,
-}
-
-#[derive(Resource)]
-struct EditorState {
-    pub cursor: EditorCursor,
-    pub current_layer_idx: usize,
-    pub current_tilemap_tile: usize,
-    pub current_collision: TileCollisionKind,
-    pub current_tool: EditorTool,
-    pub camera: EditorCameraPos,
-    // pub hidden_layers: HashSet<usize>,
-}
-
-impl Default for EditorState {
-    fn default() -> Self {
-        Self {
-            cursor: Default::default(),
-            current_layer_idx: Default::default(),
-            current_tilemap_tile: Default::default(),
-            current_collision: TileCollisionKind::Solid,
-            current_tool: Default::default(),
-            camera: Default::default(),
-        }
-    }
-}
-
-#[derive(Serialize, Deserialize, Clone, Default, Deref, DerefMut)]
-pub struct UserMapStorage(pub HashMap<String, MapMeta>);
-
-impl UserMapStorage {
-    pub const STORAGE_KEY: &str = "user_maps";
-}
-
-fn tile_collision_color(collision: TileCollisionKind) -> egui::Color32 {
-    match collision {
-        TileCollisionKind::Solid => egui::Color32::LIGHT_GRAY.linear_multiply(0.68),
-        TileCollisionKind::JumpThrough => egui::Color32::GOLD,
-        _ => egui::Color32::BLACK,
-    }
-}
-
-#[derive(Clone, Copy)]
-struct EditorCameraPos {
-    pos: Vec2,
-    height: f32,
-}
-
-impl Default for EditorCameraPos {
-    fn default() -> Self {
-        Self {
-            pos: Vec2::new(500.0, 350.0),
-            height: 800.0,
-        }
-    }
-}
-
-/// The current export of the world's map metadata, if a map is loaded.
-#[derive(Resource, Default, Deref, DerefMut)]
-struct EditorMapExport(Option<MapMeta>);
-
-#[derive(Default, PartialEq, Eq)]
-enum EditorTool {
-    #[default]
-    Element,
-    Tile,
-    Collision,
-}
-
-impl EditorTool {
-    pub fn cursor(&self) -> egui::CursorIcon {
-        match self {
-            EditorTool::Element => egui::CursorIcon::Default,
-            EditorTool::Tile => egui::CursorIcon::Crosshair,
-            EditorTool::Collision => egui::CursorIcon::Default,
-        }
-    }
-}
-
-/// Resource that maps the map tileset paths to their egui textures.
-#[derive(Resource)]
-pub struct MapTilesetEguiTextures(pub HashMap<bones::AssetPath, MapTilesetEguiTextureinfo>);
-
-/// Information about an egui tileset texture. Used in [`MapTilesetEguiTextures`].
-pub struct MapTilesetEguiTextureinfo {
-    pub texture: egui::TextureId,
-    pub size: Vec2,
-    pub tile_size: Vec2,
-}
-
-pub fn cleanup_editor(session: Option<ResMut<Session>>) {
-    // Update camera viewport to fit into central editor area.
-    if let Some(mut session) = session {
-        let cameras = session.world().components.get::<bones::Camera>();
-        let mut cameras = cameras.borrow_mut();
-        let camera = cameras.iter_mut().next().unwrap();
-        camera.viewport = None;
-        camera.height = bones::Camera::default().height;
-
-        // Enable the default camera controller
-        let camera_states = session
-            .world()
-            .components
-            .get::<jumpy_core::camera::CameraState>();
-        let mut camera_states = camera_states.borrow_mut();
-        camera_states.iter_mut().next().unwrap().disable_controller = false;
-    }
-}
-
-pub fn editor_ui_system(world: &mut World) {
-    // Force set the camera position
-    {
-        world.resource_scope(|world, editor_state: Mut<EditorState>| {
-            let session = world.get_resource_mut::<Session>();
-            let camera_info = editor_state.camera;
-            if let Some(mut session) = session {
-                session
-                    .world()
-                    .run_initialized_system(
-                        move |mut cameras: bones::CompMut<bones::Camera>,
-                              mut camera_shakes: bones::CompMut<bones::CameraShake>,
-                              mut camera_states: bones::CompMut<
-                            jumpy_core::camera::CameraState,
-                        >| {
-                            let Some(camera) = cameras.iter_mut().next() else { return };
-                            let camera_shake = camera_shakes.iter_mut().next().unwrap();
-                            let camera_state = camera_states.iter_mut().next().unwrap();
-                            camera.height = camera_info.height;
-                            camera_shake.center = camera_info.pos.extend(0.0);
-                            camera_state.disable_controller = true;
-                        },
-                    )
-                    .ok();
-            }
-        });
-    }
-
-    // Get the world cursor position
-    let cursor_pos = {
-        let mut camera_query =
-            world.query_filtered::<(&Camera, &Transform), With<BevyBonesEntity>>();
-        let mut windows = world.query_filtered::<&Window, With<PrimaryWindow>>();
-        let Ok(window) = windows.get_single(world) else { return };
-        camera_query
-            .get_single(world)
-            .ok()
-            .and_then(|(camera, transform)| {
-                window
-                    .cursor_position()
-                    .and_then(|pos| {
-                        camera.viewport_to_world(&GlobalTransform::from(*transform), pos)
-                    })
-                    .map(|x| x.origin.truncate())
-            })
-    };
-
-    // Get the up-to-date map meta export from the world
-    let map_meta = {
-        world
-            .get_resource_mut::<Session>()
-            .map(|mut sess| sess.core_session().export_map())
-    };
-    world.insert_resource(EditorMapExport(map_meta));
-
-    let mut state = world.resource_mut::<EditorState>();
-    state.cursor.current_pos = cursor_pos;
-
-    let mut egui_context = world
-        .query_filtered::<&mut EguiContext, With<PrimaryWindow>>()
-        .single(world)
-        .clone();
-
-    let egui_ctx = egui_context.get_mut();
-
-    egui::TopBottomPanel::top("top-bar").show(egui_ctx, |ui| {
-        widget::<EditorTopBar>(world, ui, "editor-top-bar".into(), ());
-    });
-
-    egui::SidePanel::left("left-toolbar")
-        .width_range(40.0..=40.0)
-        .resizable(false)
-        .show(egui_ctx, |ui| {
-            widget::<EditorLeftToolbar>(world, ui, "editor-left-toolbar".into(), ());
-        });
-
-    egui::SidePanel::right("right-toolbar")
-        .min_width(125.0)
-        .show(egui_ctx, |ui| {
-            widget::<EditorRightToolbar>(world, ui, "editor-right-toolbar".into(), ());
-        });
-
-    egui::CentralPanel::default()
-        .frame(egui::Frame::none())
-        .show(egui_ctx, |ui| {
-            widget::<EditorCentralPanel>(world, ui, "editor-central-panel".into(), ());
-        });
-}
-
-type CameraQuery<'w, 's> = Query<
-    'w,
-    's,
-    (
-        &'static Camera,
-        &'static mut Transform,
-        &'static mut OrthographicProjection,
-    ),
-    (With<BevyBonesEntity>, Without<MenuCamera>),
->;
-
-#[derive(SystemParam)]
-struct EditorTopBar<'w, 's> {
-    commands: Commands<'w, 's>,
-    game: Res<'w, GameMeta>,
-    core_meta: Res<'w, CoreMetaArc>,
-    show_map_export_window: Local<'s, bool>,
-    state: Res<'w, EditorState>,
-    localization: Res<'w, Localization>,
-    session_manager: SessionManager<'w, 's>,
-    camera: CameraQuery<'w, 's>,
-    #[cfg(not(target_arch = "wasm32"))]
-    clipboard: ResMut<'w, bevy_egui::EguiClipboard>,
-    map_export: Res<'w, EditorMapExport>,
-    storage: ResMut<'w, Storage>,
-}
-
-impl<'w, 's> WidgetSystem for EditorTopBar<'w, 's> {
-    type Args = ();
-
-    fn system(
-        world: &mut World,
-        state: &mut bevy::ecs::system::SystemState<Self>,
-        ui: &mut egui::Ui,
-        _id: super::WidgetId,
-        _args: Self::Args,
-    ) {
-        let mut params: EditorTopBar = state.get_mut(world);
-
-        map_export_window(ui, &mut params);
-
-        ui.horizontal_centered(|ui| {
-            ui.label(&params.localization.get("map-editor"));
-            ui.separator();
-
-            if let Ok((_camera, transform, projection)) = params.camera.get_single() {
-                let height = match projection.scaling_mode {
-                    bevy::render::camera::ScalingMode::FixedVertical(height) => height,
-                    _ => 1.0, // This shouldn't happen for now
-                };
-                let zoom = params.core_meta.camera.default_height / height * 100.0;
-                let [view_x, view_y]: [f32; 2] = transform.translation.xy().into();
-
-                ui.label(
-                    egui::RichText::new(
-                        params
-                            .localization
-                            .get(&format!("view-offset?x={view_x:.0}&y={view_y:.0}")),
-                    )
-                    .small(),
-                );
-                ui.label(
-                    egui::RichText::new(
-                        params
-                            .localization
-                            .get(&format!("view-zoom?percent={zoom:.0}")),
-                    )
-                    .small(),
-                );
-                if let Some(cursor_pos) = params.state.cursor.current_pos.as_ref() {
-                    let (cursor_x, cursor_y) = (cursor_pos.x, cursor_pos.y);
-                    ui.label(
-                        egui::RichText::new(
-                            params
-                                .localization
-                                .get(&format!("cursor-position?x={cursor_x:.0}&y={cursor_y:.0}")),
-                        )
-                        .small(),
-                    );
-                }
-            }
-
-            ui.add_space(ui.spacing().icon_spacing);
-
-            ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
-                if ui.button(&params.localization.get("main-menu")).clicked() {
-                    params
-                        .commands
-                        .insert_resource(NextState(Some(EngineState::MainMenu)));
-                }
-
-                ui.scope(|ui| {
-                    ui.set_enabled(params.session_manager.session.is_some());
-                    if ui.button(&params.localization.get("play")).clicked() {
-                        params
-                            .commands
-                            .insert_resource(NextState(Some(GameEditorState::Hidden)));
-                    }
-                    if ui.button(&params.localization.get("export")).clicked() {
-                        *params.show_map_export_window = true;
-                    }
-
-                    if ui.button(&params.localization.get("close")).clicked() {
-                        params.session_manager.stop();
-                    }
-
-                    if ui.button(&params.localization.get("reload")).clicked() {
-                        params.session_manager.stop();
-                        params.session_manager.start_local(CoreSessionInfo {
-                            meta: params.core_meta.0.clone(),
-                            map_meta: params.map_export.0.as_ref().unwrap().clone(),
-                            player_info: default(),
-                        });
-                        params
-                            .commands
-                            .insert_resource(NextState(Some(InGameState::Playing)));
-                    }
-                    if ui.button(&params.localization.get("save")).clicked()
-                        || (ui.input(|i| i.key_down(egui::Key::S))
-                            && ui.input(|i| i.modifiers.command))
-                    {
-                        if let Some(map) = params.map_export.0.as_ref() {
-                            let mut user_maps: UserMapStorage = params
-                                .storage
-                                .get(UserMapStorage::STORAGE_KEY)
-                                .unwrap_or_default();
-                            user_maps.insert(map.name.clone(), map.clone());
-                            params.storage.set(UserMapStorage::STORAGE_KEY, &user_maps);
-                            params.storage.save();
-                        }
-                    }
-                });
-            });
-        });
-    }
-}
-
-fn map_export_window(ui: &mut egui::Ui, params: &mut EditorTopBar) {
-    if !*params.show_map_export_window {
-        return;
-    }
-    // let map = params.map_meta.single();
-    overlay_window(
-        ui,
-        "export-map-window",
-        &params.localization.get("map-export"),
-        params.game.main_menu.menu_width,
-        |ui| {
-            let Some(map_meta) = params.map_export.0.as_ref() else { return };
-            let mut export = serde_yaml::to_string(map_meta).unwrap();
-
-            ui.vertical(|ui| {
-                ui.set_height(
-                    params.core_meta.camera.default_height * 0.6 * params.game.ui_theme.scale,
-                );
-                egui::ScrollArea::vertical().show(ui, |ui| {
-                    ui.add(
-                        egui::TextEdit::multiline(&mut export)
-                            .font(egui::TextStyle::Monospace) // for cursor height
-                            .code_editor()
-                            .desired_width(ui.available_width())
-                            .lock_focus(true),
-                    );
-                });
-
-                ui.add_space(ui.spacing().icon_width);
-
-                ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
-                    if BorderedButton::themed(
-                        &params.game.ui_theme.button_styles.small,
-                        &params.localization.get("close"),
-                    )
-                    .focus_on_hover(false)
-                    .show(ui)
-                    .clicked()
-                    {
-                        *params.show_map_export_window = false;
-                    }
-
-                    if BorderedButton::themed(
-                        &params.game.ui_theme.button_styles.small,
-                        &params.localization.get("copy-to-clipboard"),
-                    )
-                    .focus_on_hover(false)
-                    .show(ui)
-                    .clicked()
-                    {
-                        #[cfg(not(target_arch = "wasm32"))]
-                        params.clipboard.set_contents(&export);
-                        #[cfg(target_arch = "wasm32")]
-                        {
-                            use wasm_bindgen::prelude::*;
-                            #[wasm_bindgen]
-                            extern "C" {
-                                type Clipboard;
-
-                                #[wasm_bindgen(js_namespace = ["navigator", "clipboard"], js_name = writeText)]
-                                fn write_clipboard(s: &str);
-                            }
-
-                            write_clipboard(&export);
-                        }
-                    }
-                });
-            });
-        },
-    );
-}
-
-#[derive(SystemParam)]
-struct EditorLeftToolbar<'w, 's> {
-    game: Res<'w, GameMeta>,
-    state: ResMut<'w, EditorState>,
-    localization: Res<'w, Localization>,
-    #[system_param(ignore)]
-    _phantom: PhantomData<(&'w (), &'s ())>,
-}
-
-impl<'w, 's> WidgetSystem for EditorLeftToolbar<'w, 's> {
-    type Args = ();
-
-    fn system(
-        world: &mut World,
-        state: &mut bevy::ecs::system::SystemState<Self>,
-        ui: &mut egui::Ui,
-        _id: super::WidgetId,
-        _args: Self::Args,
-    ) {
-        let mut params: EditorLeftToolbar = state.get_mut(world);
-        let icons = &params.game.ui_theme.editor.icons;
-        let width = ui.available_width();
-        for tool in [EditorTool::Element, EditorTool::Tile, EditorTool::Collision] {
-            let (image, hover_text) = match tool {
-                EditorTool::Element => (&icons.elements, params.localization.get("elements")),
-                EditorTool::Tile => (&icons.tiles, params.localization.get("tiles")),
-                EditorTool::Collision => (&icons.collisions, params.localization.get("collisions")),
-            };
-            ui.add_space(ui.spacing().window_margin.top);
-
-            let image_aspect = image.image_size.y / image.image_size.x;
-            let height = width * image_aspect;
-            let button = ui
-                .add(
-                    egui::ImageButton::new(image.egui_texture_id, egui::vec2(width, height))
-                        .selected(params.state.current_tool == tool),
-                )
-                .on_hover_text_at_pointer(&hover_text);
-
-            if button.clicked() {
-                params.state.current_tool = tool;
-            }
-        }
-    }
-}
-
-#[derive(Default)]
-struct LayerCreateInfo {
-    name: String,
-}
-
-#[derive(SystemParam)]
-struct EditorRightToolbar<'w, 's> {
-    show_layer_create: Local<'s, bool>,
-    layer_create_info: Local<'s, LayerCreateInfo>,
-    game: Res<'w, GameMeta>,
-    localization: Res<'w, Localization>,
-    state: ResMut<'w, EditorState>,
-    editor_input: ResMut<'w, CurrentEditorInput>,
-    map_export: Res<'w, EditorMapExport>,
-    tilesets: Res<'w, MapTilesetEguiTextures>,
-}
-
-impl<'w, 's> WidgetSystem for EditorRightToolbar<'w, 's> {
-    type Args = ();
-
-    fn system(
-        world: &mut World,
-        state: &mut bevy::ecs::system::SystemState<Self>,
-        ui: &mut egui::Ui,
-        _id: super::WidgetId,
-        _args: Self::Args,
-    ) {
-        let mut params: EditorRightToolbar = state.get_mut(world);
-        layer_create_dialog(ui, &mut params);
-
-        let map_meta = params.map_export.0.as_ref();
-
-        ui.add_space(ui.spacing().window_margin.top);
-
-        ui.horizontal(|ui| {
-            ui.label(&params.localization.get("map-info"));
-        });
-        ui.separator();
-
-        let row_height = ui.spacing().interact_size.y;
-        ui.push_id("info", |ui| {
-            ui.set_enabled(map_meta.is_some());
-            let table = egui_extras::TableBuilder::new(ui)
-                .cell_layout(egui::Layout::left_to_right(egui::Align::Center))
-                .column(egui_extras::Column::auto())
-                .column(egui_extras::Column::remainder())
-                .resizable(false);
-
-            table.body(|mut body| {
-                if let Some(map) = params.map_export.0.as_ref() {
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.label(&params.localization.get("name"));
-                        });
-                        row.col(|ui| {
-                            let mut name = map.name.clone();
-                            egui::TextEdit::singleline(&mut name)
-                                .desired_width(ui.available_width() * 0.9)
-                                .show(ui);
-
-                            if name != map.name {
-                                **params.editor_input = Some(EditorInput::RenameMap { name });
-                            }
-                        });
-                    });
-                }
-
-                body.row(row_height, |mut row| {
-                    row.col(|ui| {
-                        ui.label(&params.localization.get("grid-size"));
-                    });
-                    if let Some(map) = map_meta {
-                        let x = map.grid_size.x;
-                        let y = map.grid_size.y;
-                        row.col(|ui| {
-                            ui.label(format!("{x} x {y}"));
-                        });
-                    }
-                });
-
-                body.row(row_height, |mut row| {
-                    row.col(|ui| {
-                        if ui.button(&params.localization.get("randomize")).clicked() {
-                            if let Some(map) = map_meta {
-                                let mut tile_layers: Vec<TileLayer> = vec![];
-                                let mut element_layers: Vec<ElementLayer> = vec![];
-
-                                map.layers
-                                    .iter()
-                                    .enumerate()
-                                    .for_each(|(layer_index, layer)| {
-                                        let located_tiles: Vec<(UVec2, u32, TileCollisionKind)> =
-                                            layer
-                                                .tiles
-                                                .iter()
-                                                .map(|tile| (tile.pos, tile.idx, tile.collision))
-                                                .collect();
-                                        if !located_tiles.is_empty() {
-                                            let tile_layer = TileLayer {
-                                                layer_index,
-                                                located_tiles,
-                                            };
-                                            tile_layers.push(tile_layer);
-                                        }
-                                        let located_elements: Vec<(
-                                            Vec2,
-                                            bones_lib::prelude::Handle<ElementMeta>,
-                                        )> = layer
-                                            .elements
-                                            .iter()
-                                            .map(|element| {
-                                                (
-                                                    Vec2::new(
-                                                        element.pos.x / map.tile_size.x,
-                                                        element.pos.y / map.tile_size.y,
-                                                    ),
-                                                    element.element.clone(),
-                                                )
-                                            })
-                                            .collect();
-                                        if !located_elements.is_empty() {
-                                            let element_layer = ElementLayer {
-                                                layer_index,
-                                                located_elements,
-                                            };
-                                            element_layers.push(element_layer);
-                                        }
-                                    });
-
-                                **params.editor_input = Some(EditorInput::RandomizeTiles {
-                                    tile_layers,
-                                    element_layers,
-                                    tile_size: map.tile_size,
-                                });
-                            }
-                        }
-                    });
-                });
-            });
-        });
-
-        ui.add_space(ui.spacing().icon_width);
-
-        ui.separator();
-        ui.horizontal(|ui| {
-            ui.set_enabled(map_meta.is_some());
-            ui.label(&params.localization.get("layers"));
-
-            ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
-                if ui
-                    .button("➕")
-                    .on_hover_text(params.localization.get("create-layer"))
-                    .clicked()
-                {
-                    *params.show_layer_create = true;
-                }
-            });
-        });
-        ui.separator();
-
-        if let Some(map) = map_meta {
-            let row_height = ui.spacing().interact_size.y * 1.4;
-            ui.push_id("layers", |ui| {
-                let width = ui.available_width() - ui.spacing().item_spacing.x * 4.0;
-                for (i, layer) in map.layers.iter().enumerate() {
-                    let layer: &MapLayerMeta = layer;
-
-                    ui.horizontal(|ui| {
-                        ui.set_width(ui.available_width());
-                        ui.set_height(row_height);
-                        ui.add_space(ui.spacing().item_spacing.x);
-
-                        let row_rect = ui.max_rect();
-                        let mut response = ui.allocate_rect(row_rect, egui::Sense::click());
-
-                        response = response.context_menu(|ui| {
-                            params.state.current_layer_idx = i;
-                            if ui
-                                .button(&format!("🗑 {}", params.localization.get("delete-layer")))
-                                .clicked()
-                            {
-                                **params.editor_input =
-                                    Some(EditorInput::DeleteLayer { layer: i as u8 });
-                                ui.close_menu();
-                            }
-                        });
-
-                        let hovered = response.hovered();
-                        let active = hovered && response.is_pointer_button_down_on();
-                        let highlighted = hovered || params.state.current_layer_idx == i;
-                        let clicked = response.clicked();
-
-                        if highlighted {
-                            ui.painter().rect_filled(
-                                row_rect,
-                                2.0,
-                                if active {
-                                    ui.visuals().widgets.active.bg_stroke.color
-                                } else {
-                                    ui.visuals().widgets.hovered.bg_fill
-                                },
-                            );
-                        }
-
-                        if clicked {
-                            params.state.current_layer_idx = i;
-                        }
-
-                        ui.allocate_ui_at_rect(row_rect.expand2(egui::vec2(-4.0, 0.0)), |ui| {
-                            ui.vertical(|ui| {
-                                ui.set_width(width * 0.8);
-                                ui.add_space(ui.spacing().interact_size.y * 0.2);
-
-                                #[derive(Clone)]
-                                struct EditingLayerName {
-                                    name: String,
-                                }
-                                let edit_data =
-                                    ui.data_mut(|d| d.get_temp::<EditingLayerName>(response.id));
-
-                                if let Some(mut data) = edit_data {
-                                    let output =
-                                        egui::TextEdit::singleline(&mut data.name).show(ui);
-                                    output.response.request_focus();
-                                    if output.cursor_range.is_none() {
-                                        use egui::text::{CCursor, CCursorRange};
-                                        let mut new_state = output.state;
-                                        new_state.set_ccursor_range(Some(CCursorRange::two(
-                                            CCursor::new(0),
-                                            CCursor::new(data.name.len()),
-                                        )));
-                                        egui::TextEdit::store_state(
-                                            ui.ctx(),
-                                            output.response.id,
-                                            new_state,
-                                        );
-                                    }
-                                    if ui.input(|i| i.key_pressed(egui::Key::Enter)) {
-                                        ui.data_mut(|d| d.remove::<EditingLayerName>(response.id));
-                                        **params.editor_input = Some(EditorInput::RenameLayer {
-                                            layer: i as u8,
-                                            name: data.name,
-                                        });
-                                    } else if ui.input(|i| i.key_pressed(egui::Key::Escape))
-                                        || output.response.clicked_elsewhere()
-                                    {
-                                        ui.data_mut(|d| d.remove::<EditingLayerName>(response.id));
-                                    } else {
-                                        ui.data_mut(|d| d.insert_temp(response.id, data));
-                                    }
-                                } else {
-                                    ui.label(&layer.id);
-                                    if response.double_clicked() {
-                                        ui.data_mut(|d| {
-                                            d.insert_temp(
-                                                response.id,
-                                                EditingLayerName {
-                                                    name: layer.id.clone(),
-                                                },
-                                            )
-                                        });
-                                    }
-                                }
-                            });
-
-                            ui.scope(|ui| {
-                                ui.set_enabled(i > 0);
-                                // Up button
-                                if ui
-                                    .button("⏶")
-                                    .on_hover_text(params.localization.get("move-up"))
-                                    .clicked()
-                                {
-                                    if params.state.current_layer_idx == i {
-                                        params.state.current_layer_idx = i - 1;
-                                    } else if params.state.current_layer_idx == i - 1 {
-                                        params.state.current_layer_idx = i;
-                                    }
-                                    **params.editor_input = Some(EditorInput::MoveLayer {
-                                        layer: i as u8,
-                                        down: false,
-                                    });
-                                }
-                            });
-
-                            // Down button
-                            ui.scope(|ui| {
-                                ui.set_enabled(i < map.layers.len() - 1);
-                                if ui
-                                    .button("⏷")
-                                    .on_hover_text(params.localization.get("move-down"))
-                                    .clicked()
-                                {
-                                    if params.state.current_layer_idx == i {
-                                        params.state.current_layer_idx = i + 1;
-                                    } else if params.state.current_layer_idx == i + 1 {
-                                        params.state.current_layer_idx = i;
-                                    }
-                                    **params.editor_input = Some(EditorInput::MoveLayer {
-                                        layer: i as u8,
-                                        down: true,
-                                    });
-                                }
-                            });
-                        });
-
-                        // ui.vertical_centered(|ui| {
-                        //     ui.set_width(width * 0.1);
-                        //     ui.add_space(ui.spacing().interact_size.y * 0.2);
-                        //     let is_visible = !params.state.hidden_layers.contains(&i);
-                        //     if ui
-                        //         .selectable_label(is_visible, "👁")
-                        //         .on_hover_text(params.localization.get("toggle-visibility"))
-                        //         .clicked()
-                        //     {
-                        //         if is_visible {
-                        //             params.state.hidden_layers.insert(i);
-                        //         } else {
-                        //             params.state.hidden_layers.remove(&i);
-                        //         }
-                        //     };
-                        // });
-                    });
-                }
-            });
-        }
-
-        // Collision section
-        if params.state.current_tool == EditorTool::Collision
-            || params.state.current_tool == EditorTool::Tile
-        {
-            ui.separator();
-            ui.horizontal(|ui| {
-                ui.label(&params.localization.get("collision"));
-            });
-            ui.separator();
-
-            for (collision, label) in [
-                (TileCollisionKind::Solid, params.localization.get("solid")),
-                (
-                    TileCollisionKind::JumpThrough,
-                    params.localization.get("jump-through"),
-                ),
-                (TileCollisionKind::Empty, params.localization.get("empty")),
-            ] {
-                let color = tile_collision_color(collision);
-                let icon_width = ui.spacing().icon_width;
-                let icon_height = icon_width;
-                let icon_size = egui::vec2(icon_width, icon_height);
-                ui.horizontal(|ui| {
-                    let (rect, _response) = ui.allocate_exact_size(icon_size, egui::Sense::hover());
-                    let painter = ui.painter_at(rect);
-                    painter.circle_filled(rect.center(), icon_size.x / 3.5, color);
-                    ui.selectable_value(&mut params.state.current_collision, collision, label);
-                });
-            }
-        }
-
-        // Tilemap section
-        if params.state.current_tool == EditorTool::Tile {
-            if let Some(map_meta) = map_meta {
-                if map_meta.layers.is_empty() {
-                    return;
-                }
-
-                ui.separator();
-                ui.horizontal(|ui| {
-                    ui.label(&params.localization.get("tilemap"));
-                });
-                ui.separator();
-
-                let tilemap = &map_meta.layers[params.state.current_layer_idx].tilemap;
-                ui.horizontal(|ui| {
-                    let none_string = params.localization.get("none");
-                    let tilemap_name = move |tilemap: Option<&bones::AssetPath>| {
-                        tilemap
-                            .as_ref()
-                            .map(|handle| {
-                                handle
-                                    .path
-                                    .file_name()
-                                    .unwrap()
-                                    .to_str()
-                                    .unwrap()
-                                    .strip_suffix(".atlas.yaml")
-                                    .unwrap()
-                                    .to_owned()
-                            })
-                            .unwrap_or_else(|| none_string.clone())
-                    };
-                    let name = tilemap_name(tilemap.as_ref().map(|x| &x.path));
-                    let mut selected_tilemap = tilemap.as_ref().map(|x| x.path.clone());
-                    egui::ComboBox::new("tilemap-select", "")
-                        .selected_text(name)
-                        .width(ui.available_width() - ui.spacing().item_spacing.x)
-                        .show_ui(ui, |ui| {
-                            for tilemap_path in std::iter::once(None)
-                                .chain(params.tilesets.0.keys().cloned().map(Some))
-                            {
-                                let name = tilemap_name(tilemap_path.as_ref());
-                                ui.selectable_value(&mut selected_tilemap, tilemap_path, name);
-                            }
-                        });
-
-                    // If a new tilemap was selected
-                    if selected_tilemap.as_ref() != tilemap.as_ref().map(|x| &x.path) {
-                        // Update the tilemap
-                        params.state.current_tilemap_tile = 0;
-                        **params.editor_input = Some(EditorInput::SetTilemap {
-                            layer: params.state.current_layer_idx as u8,
-                            handle: selected_tilemap
-                                .map(|path| bones::UntypedHandle { path }.typed()),
-                        });
-                    }
-                });
-
-                // Render the tilemap
-                if let Some(tilemap) = tilemap {
-                    ui.add_space(ui.spacing().item_spacing.y);
-                    let info = params.tilesets.0.get(&tilemap.path).unwrap();
-
-                    let aspect = info.size.y / info.size.x;
-                    let width = ui.available_width();
-                    let height = width * aspect;
-                    let size = egui::vec2(width, height);
-
-                    let grid_size = egui::Vec2::from((info.size / info.tile_size).to_array());
-                    let rendered_tile_size = size / grid_size;
-
-                    let (rect, response) = ui.allocate_exact_size(size, egui::Sense::click());
-                    let mut painter = ui.painter_at(rect);
-                    painter.set_clip_rect(rect.expand(2.0));
-                    painter.image(
-                        info.texture,
-                        rect,
-                        egui::Rect::from_min_max(egui::pos2(0.0, 0.0), egui::pos2(1.0, 1.0)),
-                        egui::Color32::WHITE,
-                    );
-
-                    // Render hover tile
-                    if let Some(hover_pos) = response.hover_pos() {
-                        let relative_pos = hover_pos - rect.min;
-                        let tile_pos = (relative_pos / rendered_tile_size)
-                            .floor()
-                            .max(egui::vec2(0.0, 0.0))
-                            .min(egui::vec2(grid_size.x - 1.0, grid_size.y - 1.0));
-
-                        let min = rect.min + tile_pos * rendered_tile_size;
-                        let max = min + rendered_tile_size;
-                        let tile_rect = egui::Rect { min, max };
-                        painter.rect_stroke(
-                            tile_rect,
-                            1.0,
-                            (1.0, ui.visuals().widgets.inactive.fg_stroke.color),
-                        );
-
-                        if response.clicked() {
-                            let (x, y) = (tile_pos.x as usize, tile_pos.y as usize);
-                            let i = y * grid_size.x as usize + x;
-                            params.state.current_tilemap_tile = i;
-                        }
-                    }
-
-                    // Render selected tile
-                    let y = params.state.current_tilemap_tile / grid_size.x as usize;
-                    let x = params.state.current_tilemap_tile - (y * grid_size.x as usize);
-                    let pos = egui::vec2(
-                        x as f32 * rendered_tile_size.x,
-                        y as f32 * rendered_tile_size.y,
-                    );
-                    let min = rect.min + pos;
-                    let max = min + rendered_tile_size;
-                    let tile_rect = egui::Rect { min, max };
-                    painter.rect_stroke(tile_rect, 1.0, (1.5, egui::Color32::GREEN));
-                }
-            }
-        }
-    }
-}
-
-fn layer_create_dialog(ui: &mut egui::Ui, params: &mut EditorRightToolbar) {
-    let space = ui.spacing().icon_width;
-
-    if !*params.show_layer_create {
-        return;
-    }
-
-    let is_valid = !params.layer_create_info.name.is_empty();
-    overlay_window(
-        ui,
-        "create-layer-window",
-        &params.localization.get("create-layer"),
-        params.game.main_menu.menu_width,
-        |ui| {
-            ui.vertical(|ui| {
-                ui.horizontal(|ui| {
-                    ui.label(&params.localization.get("name"));
-                    ui.text_edit_singleline(&mut params.layer_create_info.name);
-                });
-
-                ui.add_space(space / 2.0);
-
-                ui.add_space(space);
-
-                ui.with_layout(egui::Layout::right_to_left(egui::Align::TOP), |ui| {
-                    ui.scope(|ui| {
-                        ui.set_enabled(is_valid);
-
-                        if BorderedButton::themed(
-                            &params.game.ui_theme.button_styles.small,
-                            &params.localization.get("create"),
-                        )
-                        .focus_on_hover(false)
-                        .show(ui)
-                        .clicked()
-                        {
-                            *params.show_layer_create = false;
-                            **params.editor_input = Some(EditorInput::CreateLayer {
-                                id: params.layer_create_info.name.clone(),
-                            });
-                        }
-                    });
-
-                    ui.add_space(space);
-
-                    if BorderedButton::themed(
-                        &params.game.ui_theme.button_styles.small,
-                        &params.localization.get("cancel"),
-                    )
-                    .focus_on_hover(false)
-                    .show(ui)
-                    .clicked()
-                    {
-                        *params.layer_create_info = default();
-                        *params.show_layer_create = false;
-                    }
-                });
-            });
-        },
-    );
-}
-
-#[derive(SystemParam)]
-struct EditorCentralPanel<'w, 's> {
-    show_map_create: Local<'s, bool>,
-    show_map_open: Local<'s, bool>,
-    map_create_info: Local<'s, MapCreateInfo>,
-    game: Res<'w, GameMeta>,
-    core_meta: Res<'w, CoreMetaArc>,
-    state: ResMut<'w, EditorState>,
-    map_assets: Res<'w, Assets<MapMeta>>,
-    element_assets: Res<'w, Assets<ElementMeta>>,
-    localization: Res<'w, Localization>,
-    session_manager: SessionManager<'w, 's>,
-    editor_input: ResMut<'w, CurrentEditorInput>,
-    camera: CameraQuery<'w, 's>,
-    map: Res<'w, EditorMapExport>,
-    storage: ResMut<'w, Storage>,
-}
-
-struct MapCreateInfo {
-    name: String,
-    map_width: u32,
-    map_height: u32,
-}
-
-impl Default for MapCreateInfo {
-    fn default() -> Self {
-        Self {
-            name: default(),
-            map_width: 27,
-            map_height: 21,
-        }
-    }
-}
-
-impl MapCreateInfo {
-    fn is_valid(&self) -> bool {
-        !self.name.is_empty() && self.map_width > 10 && self.map_height > 10
-    }
-}
-
-impl<'w, 's> WidgetSystem for EditorCentralPanel<'w, 's> {
-    type Args = ();
-
-    fn system(
-        world: &mut World,
-        state: &mut bevy::ecs::system::SystemState<Self>,
-        ui: &mut egui::Ui,
-        _id: super::WidgetId,
-        _args: Self::Args,
-    ) {
-        let mut params: EditorCentralPanel = state.get_mut(world);
-
-        map_open_dialog(ui, &mut params);
-        map_create_dialog(ui, &mut params);
-        if *params.show_map_create || *params.show_map_open {
-            ui.set_enabled(false);
-        }
-
-        if let Some(mut session) = params.session_manager.session {
-            let Ok((camera, camera_transform, _)) = params.camera.get_single() else { return };
-            let Some(map) = params.map.0.as_ref() else { return; };
-
-            let core_meta = session.world().resource::<CoreMetaArc>();
-            let core_meta = core_meta.borrow();
-
-            let mut map_response =
-                ui.allocate_response(ui.available_size(), egui::Sense::click_and_drag());
-            let map_response_rect = map_response.rect;
-
-            // Move camera
-            let camera_zoom = {
-                let cursor_icon = ui.output(|o| o.cursor_icon);
-                let (zoom, panning, ctrl_modifier) = ui.input_mut(|input| {
-                    let ctrl_modifier = input.modifiers.command;
-                    let pointer = &input.pointer;
-                    let editor_camera_pos = &mut params.state.camera;
-                    // Handle camera zoom
-                    let hovered = pointer
-                        .hover_pos()
-                        .map(|pos| map_response_rect.contains(pos))
-                        .unwrap_or_default();
-                    if hovered {
-                        editor_camera_pos.height -= input.scroll_delta.y;
-                        editor_camera_pos.height = editor_camera_pos.height.max(10.0);
-                    }
-                    let zoom = editor_camera_pos.height / core_meta.camera.default_height;
-
-                    // Handle camera pan
-                    let panning = pointer.is_moving()
-                        && (pointer.middle_down() || (ctrl_modifier && pointer.primary_down()));
-                    if panning {
-                        let drag_delta = pointer.delta() * params.game.ui_theme.scale * zoom;
-                        editor_camera_pos.pos.x -= drag_delta.x;
-                        editor_camera_pos.pos.y += drag_delta.y;
-                    }
-
-                    (zoom, panning, ctrl_modifier)
-                });
-
-                // Handle cursor
-                //
-                // We only change the cursor if it's not been changed by another widget, for instance, for the
-                // resize handle of the right sidebar.
-                if cursor_icon == default() {
-                    if panning {
-                        map_response = map_response.on_hover_cursor(egui::CursorIcon::Grabbing);
-                    } else if ctrl_modifier {
-                        map_response = map_response.on_hover_cursor(egui::CursorIcon::Grab);
-                    } else {
-                        map_response =
-                            map_response.on_hover_cursor(params.state.current_tool.cursor());
-                    }
-                }
-
-                zoom
-            };
-            let ppp = params.game.ui_theme.scale * camera_zoom;
-
-            let elements =
-                session
-                    .world()
-                    .run_initialized_system(
-                        |entities: bones::Res<bones::Entities>,
-                         transforms: bones::Comp<bones::Transform>,
-                         element_handles: bones::Comp<jumpy_core::elements::ElementHandle>,
-                         spawned_map_layer_metas: bones::Comp<
-                            jumpy_core::map::SpawnedMapLayerMeta,
-                        >| {
-                            Ok(entities
-                                .iter_with((
-                                    &element_handles,
-                                    &transforms,
-                                    &spawned_map_layer_metas,
-                                ))
-                                .map(|(ent, (handle, transform, layer))| {
-                                    (
-                                        ent,
-                                        handle.get_bevy_handle(),
-                                        transform.translation,
-                                        layer.layer_idx,
-                                    )
-                                })
-                                .collect::<Vec<_>>())
-                        },
-                    )
-                    .unwrap();
-
-            let screen_rect = ui.input(|i| i.screen_rect);
-            let window_size = screen_rect.size();
-
-            // Map element tool
-            if params.state.current_tool == EditorTool::Element {
-                // Collect map element list
-                let element_handles: &Vec<bones::Handle<ElementMeta>> =
-                    &params.core_meta.map_elements;
-                let mut element_categories =
-                    HashMap::<String, Vec<(bones::Handle<ElementMeta>, &ElementMeta)>>::new();
-                element_handles
-                    .iter()
-                    .map(|handle| (handle.clone(), handle.get_bevy_handle()))
-                    .map(|(handle, bevy_handle)| {
-                        (handle, params.element_assets.get(&bevy_handle).unwrap())
-                    })
-                    .for_each(|(handle, element)| {
-                        element_categories
-                            .entry(element.category.clone())
-                            .or_default()
-                            .push((handle, element));
-                    });
-                let mut element_categories = element_categories
-                    .into_iter()
-                    .map(|(k, mut v)| {
-                        v.sort_by_key(|x| &x.1.name);
-                        (k, v)
-                    })
-                    .collect::<Vec<_>>();
-                element_categories.sort_by(|a, b| a.0.cmp(&b.0));
-
-                // Element context menu
-                map_response.context_menu(|ui| {
-                    if ui.input(|i| i.pointer.secondary_clicked()) {
-                        params.state.cursor.context_click_pos = params.state.cursor.current_pos;
-                    }
-                    ui.menu_button(
-                        &format!("➕ {}", params.localization.get("add-element")),
-                        |ui| {
-                            for (category, elements) in element_categories {
-                                ui.menu_button(&category, |ui| {
-                                    for (handle, element) in elements {
-                                        if ui.button(&element.name).clicked() {
-                                            **params.editor_input =
-                                                Some(EditorInput::SpawnElement {
-                                                    handle,
-                                                    translation: params
-                                                        .state
-                                                        .cursor
-                                                        .context_click_pos
-                                                        .unwrap(),
-                                                    layer: params
-                                                        .state
-                                                        .current_layer_idx
-                                                        .try_into()
-                                                        .unwrap(),
-                                                });
-                                            ui.close_menu();
-                                            params.state.cursor.context_click_pos = None;
-                                        }
-                                    }
-                                });
-                            }
-                        },
-                    );
-                });
-
-                // Selectable element rendering and handling
-                for (entity, handle, translation, layer_idx) in elements {
-                    if layer_idx != params.state.current_layer_idx {
-                        continue;
-                    }
-
-                    let element_meta = params.element_assets.get(&handle).unwrap();
-                    let grab_size = element_meta.editor.grab_size;
-                    let grab_offset = element_meta.editor.grab_offset;
-
-                    let Some(ndc) = camera
-                        .world_to_ndc(
-                            &(*camera_transform).into(),
-                            translation
-                        ) else { continue };
-                    let ndc = (ndc + 1.0) / 2.0;
-                    let pos =
-                        egui::pos2(window_size.x * ndc.x, window_size.y - window_size.y * ndc.y);
-
-                    let rect = egui::Rect::from_center_size(
-                        pos + egui::vec2(grab_offset.x, -grab_offset.y) / ppp,
-                        egui::vec2(grab_size.x, grab_size.y) / ppp,
-                    );
-                    let mut color_override = None;
-                    let response = ui
-                        .allocate_rect(rect, egui::Sense::click_and_drag())
-                        .context_menu(|ui| {
-                            color_override = Some(egui::Color32::RED);
-                            if ui
-                                .button(&format!("🗑 {}", params.localization.get("delete-element")))
-                                .clicked()
-                            {
-                                ui.close_menu();
-                                **params.editor_input = Some(EditorInput::DeleteEntity { entity });
-                            }
-                        });
-
-                    #[derive(Clone)]
-                    struct ElementDrag {
-                        offset: Vec2,
-                    }
-                    let drag_id = egui::Id::from("element_drag");
-                    if response.drag_started() {
-                        ui.data_mut(|d| {
-                            d.insert_temp(
-                                drag_id,
-                                ElementDrag {
-                                    offset: params.state.cursor.current_pos.unwrap()
-                                        - translation.truncate(),
-                                },
-                            )
-                        });
-                    } else if response.drag_released() {
-                        ui.data_mut(|d| d.remove::<ElementDrag>(drag_id));
-                    }
-
-                    let half_pixel_offset = Vec2::new(
-                        if grab_size.x % 2.0 != 0.0 { 0.5 } else { 0.0 },
-                        if grab_size.y % 2.0 != 0.0 { 0.5 } else { 0.0 },
-                    );
-                    let snap_to_grid = ui.input(|i| i.modifiers.shift_only());
-                    let ctrl_modifier = ui.input(|i| i.modifiers.command);
-
-                    let default_color = if response.dragged_by(egui::PointerButton::Primary)
-                        && map_response_rect.contains(ui.input(|i| i.pointer.hover_pos().unwrap()))
-                        && !ctrl_modifier
-                    {
-                        let element_drag: ElementDrag =
-                            ui.data_mut(|d| d.get_temp(drag_id).unwrap());
-
-                        let new_pos =
-                            params.state.cursor.current_pos.unwrap() - element_drag.offset;
-
-                        let new_pos = if snap_to_grid {
-                            let bottom_center_offset =
-                                -grab_offset + Vec2::new(0.0, grab_size.y / 2.0);
-                            let bottom_center = new_pos - bottom_center_offset;
-
-                            let increment = params.map.0.as_ref().unwrap().tile_size / 4.0;
-                            let snapped_bottom_center =
-                                (bottom_center / increment).floor() * increment;
-                            snapped_bottom_center + bottom_center_offset
-                        } else {
-                            new_pos.floor() + half_pixel_offset
-                        };
-
-                        **params.editor_input = Some(EditorInput::MoveEntity {
-                            entity,
-                            pos: new_pos,
-                        });
-                        response.on_hover_cursor(egui::CursorIcon::Grabbing);
-                        egui::Color32::GREEN
-                    } else {
-                        response.on_hover_cursor(egui::CursorIcon::PointingHand);
-                        egui::Color32::LIGHT_GRAY
-                    };
-                    let mut painter = ui.painter_at(screen_rect);
-                    let color = color_override.unwrap_or(default_color);
-                    painter.set_clip_rect(map_response_rect);
-                    if element_meta.editor.show_name {
-                        painter.text(
-                            rect.center_top(),
-                            egui::Align2::CENTER_BOTTOM,
-                            &element_meta.name,
-                            egui::FontId::new(15.0, egui::FontFamily::Proportional),
-                            color,
-                        );
-                    }
-                    painter.rect_stroke(rect, 2.0, (1.0, color));
-                }
-
-            // Tile tool
-            } else if params.state.current_tool == EditorTool::Tile {
-                #[allow(clippy::unnecessary_operation)] // false alarm
-                'tile_tool: {
-                    if let Some(cursor_pos) = params.state.cursor.current_pos {
-                        if cursor_pos.x < 0.0
-                            || cursor_pos.y < 0.0
-                            || cursor_pos.y > map.grid_size.y as f32 * map.tile_size.y
-                            || cursor_pos.x > map.grid_size.x as f32 * map.tile_size.x
-                        {
-                            break 'tile_tool;
-                        }
-
-                        let tile_pos = (cursor_pos / map.tile_size).floor() * map.tile_size;
-                        let Some(ndc) = camera
-                        .world_to_ndc(
-                            &(*camera_transform).into(),
-                            tile_pos.extend(0.0)
-                        ) else { break 'tile_tool };
-
-                        let ndc = (ndc + 1.0) / 2.0;
-                        let bottom_left = egui::pos2(
-                            window_size.x * ndc.x,
-                            window_size.y - window_size.y * ndc.y,
-                        );
-                        let size = egui::vec2(map.tile_size.x, map.tile_size.y) / ppp;
-                        let top_right = egui::pos2(bottom_left.x + size.x, bottom_left.y - size.y);
-                        let rect = egui::Rect::from_two_pos(bottom_left, top_right);
-
-                        if !map_response_rect.contains_rect(rect) {
-                            break 'tile_tool;
-                        }
-
-                        let response = ui.allocate_rect(rect, egui::Sense::click_and_drag());
-
-                        let mut painter = ui.painter_at(map_response_rect);
-                        painter.set_clip_rect(map_response_rect);
-                        painter.rect_stroke(rect, 1.0, ui.visuals().widgets.active.fg_stroke);
-
-                        let tile_xy = (cursor_pos / map.tile_size).floor().as_uvec2();
-                        if response.dragged_by(egui::PointerButton::Primary)
-                            && !ui.input(|i| i.modifiers.command)
-                        {
-                            **params.editor_input = Some(EditorInput::SetTile {
-                                layer: params.state.current_layer_idx as u8,
-                                pos: tile_xy,
-                                tilemap_tile_idx: Some(params.state.current_tilemap_tile),
-                                collision: params.state.current_collision,
-                            });
-                        } else if response.dragged_by(egui::PointerButton::Secondary) {
-                            **params.editor_input = Some(EditorInput::SetTile {
-                                layer: params.state.current_layer_idx as u8,
-                                pos: tile_xy,
-                                tilemap_tile_idx: None,
-                                collision: params.state.current_collision,
-                            });
-                        }
-                    }
-                };
-
-            // Collision tool
-            } else if params.state.current_tool == EditorTool::Collision {
-                #[allow(clippy::unnecessary_operation)] // false alarm
-                for tile in &map.layers[params.state.current_layer_idx].tiles {
-                    let tile_xy = tile.pos;
-                    let tile_pos = tile_xy.as_vec2() * map.tile_size;
-                    let Some(ndc) = camera
-                            .world_to_ndc(
-                                &(*camera_transform).into(),
-                                tile_pos.extend(0.0)
-                            ) else { continue; };
-
-                    let ndc = (ndc + 1.0) / 2.0;
-                    let bottom_left =
-                        egui::pos2(window_size.x * ndc.x, window_size.y - window_size.y * ndc.y);
-                    let size = egui::vec2(map.tile_size.x, map.tile_size.y) / ppp;
-                    let top_right = egui::pos2(bottom_left.x + size.x, bottom_left.y - size.y);
-                    let rect = egui::Rect::from_two_pos(bottom_left, top_right);
-
-                    if !map_response_rect.intersects(rect) {
-                        continue;
-                    }
-
-                    if tile.collision != TileCollisionKind::Empty {
-                        let mut painter = ui.painter_at(map_response_rect);
-                        painter.set_clip_rect(map_response_rect);
-                        painter.rect_stroke(
-                            rect.expand(-1.0 / ppp),
-                            0.0,
-                            (2.0 / ppp, tile_collision_color(tile.collision)),
-                        );
-                    }
-
-                    if ui.input(|i| {
-                        i.pointer
-                            .hover_pos()
-                            .map(|pos| rect.contains(pos))
-                            .unwrap_or(false)
-                    }) && !ui.input(|i| i.modifiers.command)
-                    {
-                        if ui.input(|i| i.pointer.primary_down()) {
-                            **params.editor_input = Some(EditorInput::SetTile {
-                                layer: params.state.current_layer_idx as u8,
-                                pos: tile_xy,
-                                tilemap_tile_idx: Some(tile.idx as usize),
-                                collision: params.state.current_collision,
-                            });
-                        } else if ui.input(|i| i.pointer.secondary_down()) {
-                            **params.editor_input = Some(EditorInput::SetTile {
-                                layer: params.state.current_layer_idx as u8,
-                                pos: tile_xy,
-                                tilemap_tile_idx: Some(tile.idx as usize),
-                                collision: TileCollisionKind::Empty,
-                            });
-                        }
-                    }
-                }
-            };
-
-        // If there is no current map
-        } else {
-            ui.add_space(ui.available_height() / 2.0);
-            ui.vertical_centered(|ui| {
-                if BorderedButton::themed(
-                    &params.game.ui_theme.button_styles.normal,
-                    &params.localization.get("open-map"),
-                )
-                .show(ui)
-                .clicked()
-                {
-                    *params.show_map_open = true;
-                }
-
-                ui.add_space(ui.spacing().item_spacing.y);
-
-                ui.scope(|ui| {
-                    ui.set_enabled(false);
-                    if BorderedButton::themed(
-                        &params.game.ui_theme.button_styles.normal,
-                        &params.localization.get("create-map"),
-                    )
-                    .show(ui)
-                    .clicked()
-                    {
-                        *params.show_map_create = true;
-                        *params.map_create_info = default();
-                    }
-                });
-            });
-        }
-    }
-}
-
-fn map_open_dialog(ui: &mut egui::Ui, params: &mut EditorCentralPanel) {
-    let space = ui.spacing().icon_width;
-
-    if !*params.show_map_open {
-        return;
-    }
-
-    overlay_window(
-        ui,
-        "open-map-window",
-        &params.localization.get("open-map"),
-        params.game.main_menu.menu_width,
-        |ui| {
-            // ui.set_height(params.game.camera_height as f32 * 0.6);
-            ui.vertical_centered_justified(|ui| {
-                egui::ScrollArea::vertical().show(ui, |ui| {
-                    ui.heading(params.localization.get("builtin-maps"));
-
-                    #[allow(clippy::unnecessary_to_owned)] // False alarm
-                    for map_handle in params
-                        .core_meta
-                        .stable_maps
-                        .to_vec()
-                        .into_iter()
-                        .chain(params.core_meta.experimental_maps.to_vec().into_iter())
-                    {
-                        let map_meta = &params
-                            .map_assets
-                            .get(&map_handle.get_bevy_handle())
-                            .unwrap();
-                        if ui.button(&map_meta.name).clicked() {
-                            params.session_manager.start_local(CoreSessionInfo {
-                                meta: params.core_meta.0.clone(),
-                                map_meta: (*map_meta).clone(),
-                                player_info: default(),
-                            });
-                            *params.show_map_open = false;
-                        }
-                    }
-
-                    let user_maps: Option<UserMapStorage> =
-                        params.storage.get(UserMapStorage::STORAGE_KEY);
-                    ui.heading(params.localization.get("user-maps"));
-                    if let Some(mut user_maps) = user_maps {
-                        let mut maps = user_maps.0.clone().into_iter().collect::<Vec<_>>();
-                        maps.sort_by(|a, b| a.0.cmp(&b.0));
-
-                        if maps.is_empty() {
-                            ui.label(params.localization.get("none"));
-                        }
-
-                        for (name, map_meta) in maps {
-                            ui.with_layout(egui::Layout::right_to_left(egui::Align::Min), |ui| {
-                                if ui
-                                    .button("🗑")
-                                    .on_hover_text(params.localization.get("delete"))
-                                    .clicked()
-                                {
-                                    user_maps.remove(&name);
-                                    params.storage.set(UserMapStorage::STORAGE_KEY, &user_maps);
-                                    params.storage.save();
-                                }
-                                if ui
-                                    .add(
-                                        egui::Button::new(&name)
-                                            .min_size(egui::vec2(ui.available_width(), 0.0)),
-                                    )
-                                    .clicked()
-                                {
-                                    params.session_manager.start_local(CoreSessionInfo {
-                                        meta: params.core_meta.0.clone(),
-                                        map_meta: map_meta.clone(),
-                                        player_info: default(),
-                                    });
-                                    *params.show_map_open = false;
-                                };
-                            });
-                        }
-                    } else {
-                        ui.label(params.localization.get("none"));
-                    }
-                });
-            });
-
-            ui.add_space(space);
-
-            ui.with_layout(egui::Layout::right_to_left(egui::Align::Min), |ui| {
-                if BorderedButton::themed(
-                    &params.game.ui_theme.button_styles.small,
-                    &params.localization.get("cancel"),
-                )
-                .focus_on_hover(false)
-                .show(ui)
-                .clicked()
-                {
-                    *params.show_map_open = false;
-                }
-            });
-        },
-    );
-}
-
-fn map_create_dialog(ui: &mut egui::Ui, params: &mut EditorCentralPanel) {
-    let space = ui.spacing().icon_width;
-
-    if !*params.show_map_create {
-        return;
-    }
-
-    let is_valid = params.map_create_info.is_valid();
-    overlay_window(
-        ui,
-        "create-map-window",
-        &params.localization.get("create-map"),
-        params.game.main_menu.menu_width,
-        |ui| {
-            ui.horizontal(|ui| {
-                ui.label(&params.localization.get("name"));
-                ui.text_edit_singleline(&mut params.map_create_info.name);
-            });
-
-            ui.add_space(space / 2.0);
-
-            ui.horizontal(|ui| {
-                ui.label(&params.localization.get("grid-size"));
-                ui.add(egui::DragValue::new(&mut params.map_create_info.map_width));
-                ui.label("X");
-                ui.add(egui::DragValue::new(&mut params.map_create_info.map_height));
-            });
-
-            ui.add_space(space);
-
-            ui.with_layout(egui::Layout::right_to_left(egui::Align::TOP), |ui| {
-                ui.scope(|ui| {
-                    ui.set_enabled(is_valid);
-
-                    if BorderedButton::themed(
-                        &params.game.ui_theme.button_styles.small,
-                        &params.localization.get("create"),
-                    )
-                    .focus_on_hover(false)
-                    .show(ui)
-                    .clicked()
-                    {
-                        *params.show_map_create = false;
-                        create_map(params);
-                    }
-                });
-
-                ui.add_space(space);
-
-                if BorderedButton::themed(
-                    &params.game.ui_theme.button_styles.small,
-                    &params.localization.get("cancel"),
-                )
-                .focus_on_hover(false)
-                .show(ui)
-                .clicked()
-                {
-                    *params.show_map_create = false;
-                }
-            });
-        },
-    );
-}
-
-fn create_map(params: &mut EditorCentralPanel) {
-    // let info = &params.map_create_info;
-    // let grid_size = UVec2::new(info.map_width, info.map_height);
-    // let tile_size = UVec2::new(10, 10);
-    // let meta = MapMeta {
-    //     background_color: params.game.clear_color,
-    //     name: info.name.clone(),
-    //     grid_size,
-    //     tile_size,
-    //     layers: default(),
-    //     background_layers: default(),
-    // };
-
-    // params.commands.spawn().insert(meta);
-    *params.show_map_open = false;
-    *params.show_map_create = false;
-
-    unimplemented!();
-}
-
-/// Helper to render an egui frame in the center of the screen as an overlay
-fn overlay_window<R, F: FnOnce(&mut egui::Ui) -> R>(
-    ui: &mut egui::Ui,
-    id: &str,
-    title: &str,
-    width: f32,
-    f: F,
-) -> egui::InnerResponse<R> {
-    let space = ui.spacing().icon_width;
-    let i = egui::Window::new(title)
-        .auto_sized()
-        .id(egui::Id::new(id))
-        .frame(
-            egui::Frame::window(ui.style()).inner_margin(egui::style::Margin::symmetric(
-                space,
-                ui.spacing().window_margin.top,
-            )),
-        )
-        .default_width(width)
-        .collapsible(false)
-        .title_bar(false)
-        .anchor(egui::Align2::CENTER_CENTER, egui::Vec2::ZERO)
-        .show(ui.ctx(), |ui| {
-            ui.vertical(|ui| {
-                ui.vertical_centered(|ui| {
-                    ui.heading(title);
-                });
-                ui.separator();
-                ui.add_space(space);
-                let r = f(ui);
-                ui.add_space(space / 2.0);
-                r
-            })
-            .inner
-        })
-        .unwrap();
-
-    egui::InnerResponse {
-        inner: i.inner.unwrap(),
-        response: i.response,
-    }
-}
diff --git a/src/ui/main_menu.rs b/src/ui/main_menu.rs
index d80068dea1..bd12919230 100644
--- a/src/ui/main_menu.rs
+++ b/src/ui/main_menu.rs
@@ -1,137 +1,70 @@
-use std::marker::PhantomData;
-
-use bevy::{
-    app::AppExit,
-    ecs::system::{SystemParam, SystemState},
-    window::PrimaryWindow,
-};
-use bevy_egui::*;
-use bevy_fluent::Localization;
-
-use crate::{
-    localization::LocalizationExt,
-    metadata::{GameMeta, Settings},
-    platform::Storage,
-    prelude::*,
-    ui::ui_input::MenuAction,
-};
-
-use self::settings::ModifiedSettings;
-
-use super::{
-    widget,
-    widgets::{
-        bordered_button::BorderedButton, bordered_frame::BorderedFrame, EguiContextExt,
-        EguiResponseExt, EguiUiExt,
-    },
-    DisableMenuInput, WidgetAdjacencies, WidgetId, WidgetSystem,
-};
-
-pub mod credits;
-pub mod map_select;
-#[cfg(not(target_arch = "wasm32"))]
-pub mod network_game;
-pub mod player_select;
-pub mod settings;
-
-pub struct MainMenuPlugin;
-
-impl Plugin for MainMenuPlugin {
-    fn build(&self, app: &mut App) {
-        app.register_type::<MainMenuBackground>()
-            .init_resource::<MenuPage>()
-            .init_resource::<settings::SettingsTab>()
-            .init_resource::<settings::ModifiedSettings>()
-            .init_resource::<player_select::PlayerSelectState>()
-            .add_systems((
-                main_menu_system.run_if(in_state(EngineState::MainMenu)),
-                setup_main_menu.in_schedule(OnEnter(EngineState::MainMenu)),
-                clean_up_main_menu.in_schedule(OnExit(EngineState::MainMenu)),
-            ));
-    }
+use crate::prelude::*;
+
+use super::ImageMeta;
+
+mod credits;
+mod map_select;
+mod player_select;
+mod settings;
+
+#[derive(HasSchema, Debug, Default, Clone)]
+#[repr(C)]
+pub struct MainMenuMeta {
+    pub title_font: FontMeta,
+    pub subtitle_font: FontMeta,
+    pub background_image: ImageMeta,
+    pub menu_width: f32,
 }
 
-#[derive(Component, Reflect)]
-pub struct MainMenuBackground;
-
-/// Spawns the background image for the main menu
-#[allow(unreachable_code)]
-pub fn setup_main_menu(
-    mut commands: Commands,
-    game: Res<GameMeta>,
-    core: Res<CoreMetaArc>,
-    mut session_manager: SessionManager,
-) {
-    session_manager.stop();
-
-    // Make sure the game editor is hidden
-    commands.insert_resource(NextState(Some(GameEditorState::Hidden)));
+pub fn session_plugin(session: &mut Session) {
+    session
+        // Install the default bones_framework plugin for this session
+        .install_plugin(DefaultSessionPlugin)
+        .add_startup_system(setup_menu)
+        // Add our menu system to the update stage
+        .add_system_to_stage(Update, main_menu_system);
 
-    // Spawn menu background
-    let bg_handle = game.main_menu.background_image.image.inner.clone_weak();
-    let img_size = game.main_menu.background_image.image_size;
-    let ratio = img_size.x / img_size.y;
-    let height = core.camera.default_height;
-    let width = height * ratio;
-    commands
-        .spawn((
-            Name::new("Menu Background Parent"),
-            VisibilityBundle::default(),
-            TransformBundle::default(),
-            MainMenuBackground,
-        ))
-        .with_children(|parent| {
-            parent.spawn((
-                SpriteBundle {
-                    texture: bg_handle.clone_weak(),
-                    sprite: Sprite {
-                        custom_size: Some(Vec2::new(width, height)),
-                        ..default()
-                    },
-                    transform: Transform::from_translation(Vec3::new(-width, 0.0, 0.0)),
-                    ..default()
-                },
-                Name::new("Main Menu Background Left"),
-            ));
-            parent.spawn((
-                SpriteBundle {
-                    texture: bg_handle.clone_weak(),
-                    sprite: Sprite {
-                        custom_size: Some(Vec2::new(width, height)),
-                        ..default()
-                    },
-                    ..default()
-                },
-                Name::new("Main Menu Background Middle"),
-            ));
-            parent.spawn((
-                SpriteBundle {
-                    texture: bg_handle,
-                    sprite: Sprite {
-                        custom_size: Some(Vec2::new(width, height)),
-                        ..default()
-                    },
-                    transform: Transform::from_translation(Vec3::new(width, 0.0, 0.0)),
-                    ..default()
-                },
-                Name::new("Main Menu Background Right"),
-            ));
-        });
+    session.world.init_param::<Localization<GameMeta>>();
 }
 
-/// Despawns the background image for the main menu
-pub fn clean_up_main_menu(
-    mut commands: Commands,
-    backgrounds: Query<Entity, With<MainMenuBackground>>,
+fn setup_menu(
+    meta: Root<GameMeta>,
+    mut egui_settings: ResMutInit<EguiSettings>,
+    mut entities: ResMut<Entities>,
+    mut sprites: CompMut<Sprite>,
+    mut transforms: CompMut<Transform>,
+    mut cameras: CompMut<Camera>,
+    mut clear_color: ResMutInit<ClearColor>,
 ) {
-    for bg in &backgrounds {
-        commands.entity(bg).despawn_recursive();
+    egui_settings.scale = meta.theme.scale;
+    **clear_color = Color::BLACK;
+    spawn_default_camera(&mut entities, &mut transforms, &mut cameras);
+
+    for i in -1..=1 {
+        let ent = entities.create();
+        transforms.insert(
+            ent,
+            Transform::from_translation(vec3(
+                meta.main_menu.background_image.image_size.x * i as f32,
+                0.,
+                0.,
+            )),
+        );
+        sprites.insert(
+            ent,
+            Sprite {
+                image: meta.main_menu.background_image.image,
+                ..default()
+            },
+        );
     }
 }
 
 /// Which page of the menu we are on
-#[derive(Resource, Clone, Copy)]
+#[derive(HasSchema, Clone, Copy, Default)]
+#[repr(C, u8)]
 pub enum MenuPage {
+    #[default]
     Home,
     Settings,
     PlayerSelect,
@@ -144,230 +77,98 @@ pub enum MenuPage {
     NetworkGame,
 }
 
-impl Default for MenuPage {
-    fn default() -> Self {
-        Self::Home
-    }
-}
-
-/// Render the main menu UI
-pub fn main_menu_system(world: &mut World) {
-    let mut egui_context = world
-        .query_filtered::<&mut EguiContext, With<PrimaryWindow>>()
-        .single(world)
-        .clone();
+fn main_menu_system(world: &World) {
+    let ctx = (*world.resource::<EguiCtx>()).clone();
 
     egui::CentralPanel::default()
         .frame(egui::Frame::none())
-        .show(egui_context.get_mut(), |ui| {
-            widget::<MainMenu>(world, ui, WidgetId::new("main-menu"), ());
+        .show(&ctx, |ui| match ctx.get_state::<MenuPage>() {
+            MenuPage::Home => world.run_initialized_system(home_menu, ui),
+            MenuPage::Settings => world.run_initialized_system(settings::widget, ui),
+            MenuPage::PlayerSelect => world.run_initialized_system(player_select::widget, ui),
+            MenuPage::MapSelect { .. } => world.run_initialized_system(map_select::widget, ui),
+            MenuPage::Credits => world.run_initialized_system(credits::widget, ui),
+            MenuPage::NetworkGame => todo!(),
         });
 }
 
-#[derive(SystemParam)]
-struct MainMenu<'w, 's> {
-    menu_page: ResMut<'w, MenuPage>,
-    disable_menu_input: ResMut<'w, DisableMenuInput>,
-    #[system_param(ignore)]
-    _phantom: PhantomData<&'s ()>,
-}
-
-impl<'w, 's> WidgetSystem for MainMenu<'w, 's> {
-    type Args = ();
-    fn system(
-        world: &mut World,
-        state: &mut SystemState<Self>,
-        ui: &mut egui::Ui,
-        id: WidgetId,
-        _args: (),
-    ) {
-        let mut params: MainMenu = state.get_mut(world);
-
-        // Disable menu input handling on player select page, so each player can control their own
-        // player selection independently.
-        let is_player_select = matches!(*params.menu_page, MenuPage::PlayerSelect);
-        **params.disable_menu_input = is_player_select;
-
-        // Render the menu based on the current menu selection
-        match *params.menu_page {
-            MenuPage::Home => widget::<HomeMenu>(world, ui, id.with("home"), ()),
-            MenuPage::NetworkGame =>
-            {
-                #[cfg(not(target_arch = "wasm32"))]
-                widget::<network_game::MatchmakingMenu>(world, ui, id.with("network-game"), ())
-            }
-            MenuPage::PlayerSelect => {
-                widget::<player_select::PlayerSelectMenu>(world, ui, id.with("player-select"), ())
-            }
-            MenuPage::MapSelect { is_waiting } => {
-                widget::<map_select::MapSelectMenu>(world, ui, id.with("map-select"), is_waiting)
-            }
-            MenuPage::Settings => {
-                widget::<settings::SettingsMenu>(world, ui, id.with("settings"), ())
-            }
-            MenuPage::Credits => widget::<credits::CreditsMenu>(world, ui, id.with("credits"), ()),
-        }
-    }
-}
-
-#[derive(SystemParam)]
-struct HomeMenu<'w, 's> {
-    commands: Commands<'w, 's>,
-    menu_page: ResMut<'w, MenuPage>,
-    player_select_state: ResMut<'w, player_select::PlayerSelectState>,
-    modified_settings: ResMut<'w, ModifiedSettings>,
-    game: Res<'w, GameMeta>,
-    localization: Res<'w, Localization>,
-    app_exit: EventWriter<'w, AppExit>,
-    storage: ResMut<'w, Storage>,
-}
-
-impl<'w, 's> WidgetSystem for HomeMenu<'w, 's> {
-    type Args = ();
-    fn system(
-        world: &mut World,
-        state: &mut SystemState<Self>,
-        ui: &mut egui::Ui,
-        _: WidgetId,
-        _: (),
-    ) {
-        let mut params: HomeMenu = state.get_mut(world);
-
-        // Reset player selection when comming to the home menu
-        if params.player_select_state.is_changed() {
-            *params.player_select_state = default();
-        }
-
-        let ui_theme = &params.game.ui_theme;
-
-        ui.vertical_centered(|ui| {
-            ui.add_space(&params.game.main_menu.title_font.size / 4.0);
-            ui.themed_label(
-                &params.game.main_menu.title_font,
-                &params.localization.get("title"),
-            );
-            ui.themed_label(
-                &params.game.main_menu.subtitle_font,
-                &params.localization.get("subtitle"),
-            );
-        });
-
-        ui.add_space(params.game.main_menu.subtitle_font.size / 2.0);
-
-        // Create a vertical list of items, centered horizontally
-        ui.vertical_centered(|ui| {
-            let available_size = ui.available_size();
-
-            let menu_width = params.game.main_menu.menu_width;
-            let x_margin = (available_size.x - menu_width) / 2.0;
-            let outer_margin = egui::style::Margin::symmetric(x_margin, 0.0);
-
-            BorderedFrame::new(&params.game.ui_theme.panel.border)
-                .margin(outer_margin)
-                .padding(params.game.ui_theme.panel.padding.into())
-                .show(ui, |ui| {
-                    let min_button_size = egui::vec2(ui.available_width(), 0.0);
-
-                    // Local Game
-                    let local_game_button = BorderedButton::themed(
-                        &ui_theme.button_styles.normal,
-                        &params.localization.get("local-game"),
-                    )
-                    .min_size(min_button_size)
-                    .show(ui)
-                    .focus_by_default(ui);
-
-                    if local_game_button.clicked() {
-                        *params.menu_page = MenuPage::PlayerSelect;
-                    }
-
-                    // Network Game
-                    #[cfg(not(target_arch = "wasm32"))]
-                    {
-                        ui.scope(|ui| {
-                            let online_game_button = BorderedButton::themed(
-                                &ui_theme.button_styles.normal,
-                                &params.localization.get("network-game"),
-                            )
-                            .min_size(min_button_size)
-                            .show(ui);
-
-                            if online_game_button.clicked() {
-                                *params.menu_page = MenuPage::NetworkGame;
-                            }
-                        });
-                    }
-
-                    // Map editor
-                    ui.scope(|ui| {
-                        if BorderedButton::themed(
-                            &ui_theme.button_styles.normal,
-                            &params.localization.get("map-editor"),
-                        )
-                        .min_size(min_button_size)
-                        .show(ui)
-                        .clicked()
-                        {
-                            params
-                                .commands
-                                .insert_resource(NextState(Some(GameEditorState::Visible)));
-                            params
-                                .commands
-                                .insert_resource(NextState(Some(EngineState::InGame)));
-                            params
-                                .commands
-                                .insert_resource(NextState(Some(InGameState::Playing)));
-                        }
-                    });
-
-                    // Settings button
-                    if BorderedButton::themed(
-                        &ui_theme.button_styles.normal,
-                        &params.localization.get("settings"),
-                    )
-                    .min_size(min_button_size)
+/// System to render the home menu.
+fn home_menu(
+    mut ui: In<&mut egui::Ui>,
+    meta: Root<GameMeta>,
+    localization: Localization<GameMeta>,
+) {
+    let ui = &mut *ui;
+    ui.vertical_centered(|ui| {
+        ui.add_space(meta.main_menu.title_font.size / 2.0);
+        ui.label(meta.main_menu.title_font.rich(localization.get("title")));
+        ui.label(
+            meta.main_menu
+                .subtitle_font
+                .rich(localization.get("subtitle")),
+        );
+
+        ui.add_space(meta.main_menu.subtitle_font.size / 2.0);
+
+        BorderedFrame::new(&meta.theme.panel.border)
+            .padding(meta.theme.panel.padding)
+            .show(ui, |ui| {
+                ui.set_width(meta.main_menu.menu_width);
+
+                // Local game
+                if BorderedButton::themed(
+                    &meta.theme.buttons.normal,
+                    localization.get("local-game"),
+                )
+                .min_size(vec2(ui.available_width(), 0.0))
+                .show(ui)
+                .focus_by_default(ui)
+                .clicked()
+                {
+                    ui.ctx().set_state(MenuPage::PlayerSelect);
+                }
+
+                // // Online game
+                // #[cfg(not(target_arch = "wasm32"))]
+                // if BorderedButton::themed(
+                //     &meta.theme.buttons.normal,
+                //     localization.get("online-game"),
+                // )
+                // .min_size(vec2(ui.available_width(), 0.0))
+                // .show(ui)
+                // .clicked()
+                // {}
+
+                // Settings
+                if BorderedButton::themed(&meta.theme.buttons.normal, localization.get("settings"))
+                    .min_size(vec2(ui.available_width(), 0.0))
                     .show(ui)
                     .clicked()
-                    {
-                        *params.menu_page = MenuPage::Settings;
-                        **params.modified_settings = Some(
-                            params
-                                .storage
-                                .get(Settings::STORAGE_KEY)
-                                .unwrap_or_else(|| params.game.default_settings.clone()),
-                        );
-                    }
+                {
+                    ui.ctx().set_state(MenuPage::Settings);
+                }
 
-                    // Credits button
-                    if BorderedButton::themed(
-                        &ui_theme.button_styles.normal,
-                        &params.localization.get("credits"),
-                    )
-                    .min_size(min_button_size)
+                // Credits
+                if BorderedButton::themed(&meta.theme.buttons.normal, localization.get("credits"))
+                    .min_size(vec2(ui.available_width(), 0.0))
                     .show(ui)
                     .clicked()
-                    {
-                        *params.menu_page = MenuPage::Credits;
-                    }
+                {
+                    ui.ctx().set_state(MenuPage::Credits);
+                }
 
-                    // Quit button
-                    #[cfg(not(target_arch = "wasm32"))]
-                    // Quitting doesn't make sense in a web context
-                    if BorderedButton::themed(
-                        &ui_theme.button_styles.normal,
-                        &params.localization.get("quit"),
-                    )
-                    .min_size(min_button_size)
+                #[cfg(not(target_arch = "wasm32"))]
+                if BorderedButton::themed(&meta.theme.buttons.normal, localization.get("quit"))
+                    .min_size(vec2(ui.available_width(), 0.0))
                     .show(ui)
                     .clicked()
-                    {
-                        params.app_exit.send(AppExit);
-                    }
-
-                    // use the app exit variable on WASM to avoid warnings
-                    #[cfg(target_arch = "wasm32")]
-                    let _ = params.app_exit;
-                });
-        });
-    }
+                {
+                    // TODO: Gracefully exit game on quit.
+                    // Right now we don't have a way for bones to trigger a Bevy graceful shutdown.
+                    // We need to have a way for bones games to communicate that they want to exit,
+                    // and then the Bones Bevy Renderer can gracefully shutdown.
+                    std::process::exit(0);
+                }
+            });
+    });
 }
diff --git a/src/ui/main_menu/credits.rs b/src/ui/main_menu/credits.rs
index 15309c6adf..74e702be5c 100644
--- a/src/ui/main_menu/credits.rs
+++ b/src/ui/main_menu/credits.rs
@@ -63,121 +63,97 @@ peg::parser! {
     }
 }
 
-#[derive(SystemParam)]
-pub struct CreditsMenu<'w, 's> {
-    game: Res<'w, GameMeta>,
-    menu_page: ResMut<'w, MenuPage>,
-    localization: Res<'w, Localization>,
-    keyboard_input: Res<'w, Input<KeyCode>>,
-    menu_input: Query<'w, 's, &'static mut ActionState<MenuAction>>,
-}
+pub fn widget(
+    mut ui: In<&mut egui::Ui>,
+    meta: Root<GameMeta>,
+    localization: Localization<GameMeta>,
+    input: Res<GlobalPlayerControls>,
+) {
+    let outer_margin = egui::style::Margin::symmetric(
+        ui.available_width() * 0.1,
+        meta.theme.font_styles.bigger.size,
+    );
+
+    BorderedFrame::new(&meta.theme.panel.border)
+        .margin(outer_margin)
+        .padding(meta.theme.panel.padding)
+        .show(*ui, |ui| {
+            let font_color = meta.theme.panel.font_color;
+            let heading_font = meta.theme.font_styles.heading.with_color(font_color);
+            let heading_size = heading_font.size;
+            let normal_size = meta.theme.font_styles.normal.size;
+            let bigger_font = meta.theme.font_styles.bigger.with_color(font_color);
+            let bigger_size = bigger_font.size;
+
+            ui.vertical_centered(|ui| {
+                ui.label(
+                    meta.theme
+                        .font_styles
+                        .heading
+                        .rich(localization.get("credits")),
+                );
+            });
+            ui.set_min_width(ui.available_width());
 
-impl<'w, 's> WidgetSystem for CreditsMenu<'w, 's> {
-    type Args = ();
-
-    fn system(
-        world: &mut World,
-        state: &mut SystemState<Self>,
-        ui: &mut egui::Ui,
-        _id: WidgetId,
-        _args: Self::Args,
-    ) {
-        let mut params: CreditsMenu = state.get_mut(world);
-
-        let ui_theme = &params.game.ui_theme;
-        let heading_font = ui_theme
-            .font_styles
-            .heading
-            .colored(ui_theme.panel.font_color);
-        let bigger_font = ui_theme
-            .font_styles
-            .bigger
-            .colored(ui_theme.panel.font_color);
-        let normal_font = ui_theme
-            .font_styles
-            .normal
-            .colored(ui_theme.panel.font_color);
-
-        let outer_margin =
-            egui::style::Margin::symmetric(ui.available_width() * 0.1, bigger_font.size);
-
-        BorderedFrame::new(&ui_theme.panel.border)
-            .margin(outer_margin)
-            .padding(ui_theme.panel.padding.into())
-            .show(ui, |ui| {
-                ui.vertical_centered(|ui| {
-                    ui.themed_label(&heading_font, &params.localization.get("credits"));
-                });
-                ui.set_min_width(ui.available_width());
-
-                ui.with_layout(egui::Layout::bottom_up(egui::Align::Min), |ui| {
-                    // Back button
-                    let back_button = BorderedButton::themed(
-                        &params.game.ui_theme.button_styles.normal,
-                        &params.localization.get("back"),
-                    )
+            ui.with_layout(egui::Layout::bottom_up(egui::Align::Min), |ui| {
+                ui.add_space(normal_size / 2.0);
+
+                // Back button
+                if BorderedButton::themed(&meta.theme.buttons.normal, localization.get("back"))
                     .show(ui)
-                    .focus_by_default(ui);
-
-                    ui.add_space(normal_font.size / 2.0);
-
-                    if back_button.clicked()
-                        || params.menu_input.single().just_pressed(MenuAction::Back)
-                        || params.keyboard_input.just_pressed(KeyCode::Escape)
-                    {
-                        *params.menu_page = MenuPage::Home;
-                    }
-
-                    ui.with_layout(default(), |ui| {
-                        egui::ScrollArea::vertical().show(ui, |ui| {
-                            ui.set_width(ui.available_width());
-                            for section in &CREDITS.sections {
-                                ui.add_space(heading_font.size / 2.0);
-                                ui.themed_label(&heading_font, &section.title);
-                                ui.add_space(heading_font.size / 2.0);
-
-                                for entry in &section.entries {
-                                    ui.add(egui::Separator::default().spacing(normal_font.size));
-                                    ui.horizontal(|ui| {
-                                        ui.add_space(bigger_font.size);
-
-                                        if let Some(name) = &entry.name {
-                                            ui.themed_label(&bigger_font, name);
-                                        }
-
-                                        if let Some(handle) = &entry.handle {
-                                            ui.themed_label(&bigger_font, &handle.name);
-                                        }
-                                    });
-                                    ui.horizontal(|ui| {
-                                        if let Some(contribution) = &entry.contribution {
-                                            ui.with_layout(
-                                                egui::Layout::right_to_left(egui::Align::Center),
-                                                |ui| {
-                                                    ui.add_space(bigger_font.size);
-                                                    ui.themed_label(
-                                                        &bigger_font,
-                                                        &format!(
-                                                            "{} {contribution}",
-                                                            if entry.name.is_some()
-                                                                || entry.handle.is_some()
-                                                            {
-                                                                "-"
-                                                            } else {
-                                                                ""
-                                                            }
-                                                        ),
-                                                    );
-                                                },
-                                            );
-                                        }
-                                    });
-                                }
-                                ui.add(egui::Separator::default().spacing(normal_font.size));
+                    .focus_by_default(ui)
+                    .clicked()
+                    || input.values().any(|x| x.menu_back_just_pressed)
+                {
+                    ui.ctx().set_state(MenuPage::Home);
+                }
+
+                ui.with_layout(default(), |ui| {
+                    egui::ScrollArea::vertical().show(ui, |ui| {
+                        ui.set_width(ui.available_width());
+                        for section in &CREDITS.sections {
+                            ui.add_space(heading_size / 2.0);
+                            ui.label(heading_font.rich(&section.title));
+                            ui.add_space(heading_size / 2.0);
+
+                            for entry in &section.entries {
+                                ui.add(egui::Separator::default().spacing(normal_size));
+                                ui.horizontal(|ui| {
+                                    ui.add_space(bigger_size);
+
+                                    if let Some(name) = &entry.name {
+                                        ui.label(bigger_font.rich(name));
+                                    }
+
+                                    if let Some(handle) = &entry.handle {
+                                        ui.label(bigger_font.rich(&handle.name));
+                                    }
+                                });
+                                ui.horizontal(|ui| {
+                                    if let Some(contribution) = &entry.contribution {
+                                        ui.with_layout(
+                                            egui::Layout::right_to_left(egui::Align::Center),
+                                            |ui| {
+                                                ui.add_space(bigger_size);
+                                                ui.label(bigger_font.rich(format!(
+                                                    "{} {contribution}",
+                                                    if entry.name.is_some()
+                                                        || entry.handle.is_some()
+                                                    {
+                                                        "-"
+                                                    } else {
+                                                        ""
+                                                    }
+                                                )));
+                                            },
+                                        );
+                                    }
+                                });
                             }
-                        });
+                            ui.add(egui::Separator::default().spacing(normal_size));
+                        }
                     });
                 });
             });
-    }
+        });
 }
diff --git a/src/ui/main_menu/map_select.rs b/src/ui/main_menu/map_select.rs
index 673bc44524..97a339b9b6 100644
--- a/src/ui/main_menu/map_select.rs
+++ b/src/ui/main_menu/map_select.rs
@@ -1,320 +1,43 @@
-use crate::{editor::UserMapStorage, ui::pause_menu::PauseMenuPage};
-
-#[cfg(not(target_arch = "wasm32"))]
-use crate::networking::{GgrsSessionRunnerInfo, NetworkMatchSocket, SocketTarget};
-
-use super::*;
-
-/// Network message that may be sent when selecting a map.
-#[derive(Serialize, Deserialize)]
-pub enum MapSelectMessage {
-    SelectMap(bones::Handle<MapMeta>),
-}
-
-#[derive(SystemParam)]
-pub struct MapSelectMenu<'w, 's> {
-    menu_input: Query<'w, 's, &'static mut ActionState<MenuAction>>,
-    menu_page: ResMut<'w, MenuPage>,
-    session_manager: SessionManager<'w, 's>,
-    game: Res<'w, GameMeta>,
-    core: Res<'w, CoreMetaArc>,
-    player_select_state: Res<'w, super::player_select::PlayerSelectState>,
-    game_state: Res<'w, State<EngineState>>,
-    pause_page: ResMut<'w, PauseMenuPage>,
-    commands: Commands<'w, 's>,
-    localization: Res<'w, Localization>,
-    map_assets: Res<'w, Assets<MapMeta>>,
-    storage: ResMut<'w, Storage>,
-    #[cfg(not(target_arch = "wasm32"))]
-    network_socket: Option<Res<'w, NetworkMatchSocket>>,
-}
-
-impl<'w, 's> WidgetSystem for MapSelectMenu<'w, 's> {
-    type Args = bool;
-
-    fn system(
-        world: &mut World,
-        state: &mut SystemState<Self>,
-        ui: &mut egui::Ui,
-        _id: WidgetId,
-        is_waiting: Self::Args,
-    ) {
-        let mut params: MapSelectMenu = state.get_mut(world);
-
-        #[cfg(not(target_arch = "wasm32"))]
-        handle_match_setup_messages(&mut params);
-
-        let in_game = params.game_state.0 == EngineState::InGame;
-
-        if params.menu_input.single().just_pressed(MenuAction::Back) {
-            // If we are on the main menu
-            if params.game_state.0 == EngineState::MainMenu {
-                *params.menu_page = MenuPage::PlayerSelect;
-
-            // If we're on a map selection in game, we must be in the pause menu
-            } else if in_game {
-                *params.pause_page = PauseMenuPage::Default;
-            }
-        }
-
-        ui.vertical_centered_justified(|ui| {
-            let bigger_text_style = &params.game.ui_theme.font_styles.bigger;
-            let heading_text_style = &params.game.ui_theme.font_styles.heading;
-            let small_button_style = &params.game.ui_theme.button_styles.small;
-
-            if !in_game {
-                ui.add_space(heading_text_style.size / 4.0);
-                ui.themed_label(heading_text_style, &params.localization.get("local-game"));
-                ui.themed_label(
-                    bigger_text_style,
-                    &params.localization.get("map-select-title"),
-                );
-                ui.add_space(small_button_style.font.size);
-            }
-
-            let available_size = ui.available_size();
-            let menu_width = params.game.main_menu.menu_width;
-            let x_margin = (available_size.x - menu_width) / 2.0;
-            let outer_margin = egui::style::Margin::symmetric(x_margin, heading_text_style.size);
-
-            if is_waiting {
-                ui.themed_label(
-                    bigger_text_style,
-                    &params.localization.get("waiting-for-map"),
-                );
-            } else {
-                BorderedFrame::new(&params.game.ui_theme.panel.border)
-                    .margin(outer_margin)
-                    .padding(params.game.ui_theme.panel.padding.into())
-                    .show(ui, |ui| {
-                        ui.set_width(ui.available_width());
-
-                        let mut first_button = true;
-
-                        egui::ScrollArea::vertical().show(ui, |ui| {
-                            for (section_title, map_handles) in [
-                                (
-                                    &params.localization.get("default-maps"),
-                                    &params.core.stable_maps,
-                                ),
-                                (
-                                    &params.localization.get("experimental-maps"),
-                                    &params.core.experimental_maps,
-                                ),
-                            ] {
-                                if map_handles.is_empty() {
-                                    continue;
-                                }
-                                ui.add_space(bigger_text_style.size / 2.0);
-                                ui.themed_label(bigger_text_style, section_title);
-
-                                // Clippy lint is a false alarm, necessary to avoid borrowing params
-                                #[allow(clippy::unnecessary_to_owned)]
-                                for map_handle in map_handles.to_vec().into_iter() {
-                                    let map_meta = params
-                                        .map_assets
-                                        .get(&map_handle.get_bevy_handle())
-                                        .expect("Error loading map");
-                                    ui.add_space(ui.spacing().item_spacing.y);
-
-                                    let mut button =
-                                        BorderedButton::themed(small_button_style, &map_meta.name)
-                                            .show(ui);
-
-                                    if first_button {
-                                        first_button = false;
-                                        button = button.focus_by_default(ui);
-                                    }
-
-                                    if button.clicked() {
-                                        *params.pause_page = PauseMenuPage::Default;
-                                        *params.menu_page = MenuPage::Home;
-
-                                        // TODO: This code to start a game is duplicated 3 or 4
-                                        // times throughout this file, which isn't good. We should
-                                        // try to abstract it into a function or something.
-                                        let mut player_info = <[Option<GameSessionPlayerInfo>;
-                                            MAX_PLAYERS]>::default(
-                                        );
-                                        (0..MAX_PLAYERS).for_each(|i| {
-                                            let slot = &params.player_select_state.slots[i];
-                                            if slot.active {
-                                                player_info[i] = Some(GameSessionPlayerInfo {
-                                                    player: slot.selected_player.clone(),
-                                                    hat: slot.selected_hat.clone(),
-                                                    is_ai: slot.is_ai,
-                                                });
-                                            }
-                                        });
-                                        let core_info = CoreSessionInfo {
-                                            meta: params.core.0.clone(),
-                                            map_meta: map_meta.clone(),
-                                            player_info,
-                                        };
-                                        #[cfg(not(target_arch = "wasm32"))]
-                                        if let Some(socket) = &params.network_socket {
-                                            info!("Selected map, starting network game");
-                                            params.session_manager.start_network(
-                                                core_info,
-                                                GgrsSessionRunnerInfo {
-                                                    socket: socket.ggrs_socket(),
-                                                    player_is_local: socket.player_is_local(),
-                                                    player_count: socket.player_count(),
-                                                },
-                                            );
-                                        } else {
-                                            info!("Selected map, starting game");
-                                            params.session_manager.start_local(core_info);
-                                        }
-                                        #[cfg(target_arch = "wasm32")]
-                                        {
-                                            info!("Selected map, starting game");
-                                            params.session_manager.start_local(core_info);
-                                        }
-
-                                        params
-                                            .commands
-                                            .insert_resource(NextState(Some(EngineState::InGame)));
-                                        params
-                                            .commands
-                                            .insert_resource(NextState(Some(InGameState::Playing)));
-
-                                        #[cfg(not(target_arch = "wasm32"))]
-                                        if let Some(socket) = &params.network_socket {
-                                            socket.send_reliable(
-                                                SocketTarget::All,
-                                                &postcard::to_allocvec(
-                                                    &MapSelectMessage::SelectMap(map_handle),
-                                                )
-                                                .unwrap(),
-                                            );
-                                        }
-                                    }
-                                }
-
-                                let user_maps: Option<UserMapStorage> =
-                                    params.storage.get(UserMapStorage::STORAGE_KEY);
-                                if let Some(user_maps) = user_maps {
-                                    #[cfg(not(target_arch = "wasm32"))]
-                                    let is_network = params.network_socket.is_some();
-                                    #[cfg(target_arch = "wasm32")]
-                                    let is_network = false;
-
-                                    // For now, network games can only play core maps.
-                                    ui.set_enabled(!is_network);
-                                    ui.add_space(bigger_text_style.size / 2.0);
-                                    ui.themed_label(
-                                        bigger_text_style,
-                                        &params.localization.get("user-maps"),
-                                    );
-
-                                    let mut maps =
-                                        user_maps.0.clone().into_iter().collect::<Vec<_>>();
-                                    maps.sort_by(|a, b| a.0.cmp(&b.0));
-
-                                    for (name, map_meta) in maps {
-                                        ui.add_space(ui.spacing().item_spacing.y);
-                                        let button =
-                                            BorderedButton::themed(small_button_style, &name)
-                                                .show(ui);
-                                        if button.clicked() {
-                                            *params.pause_page = PauseMenuPage::Default;
-                                            *params.menu_page = MenuPage::Home;
-
-                                            let mut player_info = <[Option<GameSessionPlayerInfo>;
-                                                MAX_PLAYERS]>::default(
-                                            );
-                                            (0..MAX_PLAYERS).for_each(|i| {
-                                                let slot = &params.player_select_state.slots[i];
-                                                if slot.active {
-                                                    player_info[i] = Some(GameSessionPlayerInfo {
-                                                        player: slot.selected_player.clone(),
-                                                        hat: slot.selected_hat.clone(),
-                                                        is_ai: slot.is_ai,
-                                                    });
-                                                }
-                                            });
-                                            params.session_manager.start_local(CoreSessionInfo {
-                                                meta: params.core.0.clone(),
-                                                map_meta,
-                                                player_info,
-                                            });
-                                            params.commands.insert_resource(NextState(Some(
-                                                EngineState::InGame,
-                                            )));
-                                            params.commands.insert_resource(NextState(Some(
-                                                InGameState::Playing,
-                                            )));
-                                        };
-                                    }
-                                }
-                            }
-                        });
-                    });
-            }
-        });
-    }
-}
-
-#[cfg(not(target_arch = "wasm32"))]
-fn handle_match_setup_messages(params: &mut MapSelectMenu) {
-    if let Some(socket) = &params.network_socket {
-        let datas: Vec<(usize, Vec<u8>)> = socket.recv_reliable();
-
-        for (player, data) in datas {
-            match postcard::from_bytes::<MapSelectMessage>(&data) {
-                Ok(message) => match message {
-                    MapSelectMessage::SelectMap(map_handle) => {
-                        assert_eq!(player, 0, "Only player 0 may select the map.");
-                        info!("Other player selected map, starting game");
-                        *params.pause_page = PauseMenuPage::Default;
-                        *params.menu_page = MenuPage::Home;
-
-                        let map_meta = params
-                            .map_assets
-                            .get(&map_handle.get_bevy_handle())
-                            .unwrap()
-                            .clone();
-
-                        let mut player_info =
-                            <[Option<GameSessionPlayerInfo>; MAX_PLAYERS]>::default();
-                        (0..MAX_PLAYERS).for_each(|i| {
-                            let slot = &params.player_select_state.slots[i];
-                            if slot.active {
-                                player_info[i] = Some(GameSessionPlayerInfo {
-                                    player: slot.selected_player.clone(),
-                                    hat: slot.selected_hat.clone(),
-                                    is_ai: slot.is_ai,
-                                });
-                            }
-                        });
-                        params.session_manager.start_network(
-                            CoreSessionInfo {
-                                meta: params.core.0.clone(),
-                                map_meta,
-                                player_info,
-                            },
-                            GgrsSessionRunnerInfo {
-                                socket: socket.ggrs_socket(),
-                                player_is_local: socket.player_is_local(),
-                                player_count: socket.player_count(),
-                            },
-                        );
-                        params
-                            .commands
-                            .insert_resource(NextState(Some(EngineState::InGame)));
-                        params
-                            .commands
-                            .insert_resource(NextState(Some(InGameState::Playing)));
+use crate::core::MatchPlugin;
+use crate::prelude::*;
+
+use crate::ui::map_select::{map_select_menu, MapSelectAction};
+
+use super::player_select::PlayerSelectState;
+use super::MenuPage;
+
+pub fn widget(
+    ui: In<&mut egui::Ui>,
+    world: &World,
+    mut sessions: ResMut<Sessions>,
+    mut session_options: ResMut<SessionOptions>,
+) {
+    let select_action = world.run_initialized_system(map_select_menu, ());
+
+    match select_action {
+        MapSelectAction::None => (),
+        MapSelectAction::SelectMap(map_meta) => {
+            session_options.delete = true;
+            ui.ctx().set_state(MenuPage::Home);
+
+            let player_select_state = ui.ctx().get_state::<PlayerSelectState>();
+            sessions.start_game(MatchPlugin {
+                map: map_meta,
+                player_info: std::array::from_fn(|i| {
+                    let slot = player_select_state.slots[i];
+
+                    PlayerInput {
+                        active: slot.active,
+                        selected_player: slot.selected_player,
+                        selected_hat: slot.selected_hat,
+                        control_source: slot.control_source,
+                        editor_input: default(),
+                        control: default(),
                     }
-                },
-                Err(e) => {
-                    // TODO: The second player in an online match is having this triggered by
-                    // picking up a `ConfirmSelection` message, that might have been sent to
-                    // _itself_.
-                    warn!("Ignoring network message that was not understood: {e}");
-                }
-            }
+                }),
+            });
+            ui.ctx().set_state(PlayerSelectState::default());
         }
+        MapSelectAction::GoBack => ui.ctx().set_state(MenuPage::PlayerSelect),
     }
 }
diff --git a/src/ui/main_menu/network_game.rs b/src/ui/main_menu/network_game.rs
deleted file mode 100644
index 19311800d5..0000000000
--- a/src/ui/main_menu/network_game.rs
+++ /dev/null
@@ -1,579 +0,0 @@
-use std::time::Duration;
-
-use crate::networking::{
-    lan,
-    online::{OnlineMatchmakerRequest, OnlineMatchmakerResponse, ONLINE_MATCHMAKER},
-    NetworkMatchSocket,
-};
-
-use super::*;
-
-#[derive(SystemParam)]
-pub struct MatchmakingMenu<'w, 's> {
-    time: Res<'w, Time>,
-    menu_page: ResMut<'w, MenuPage>,
-    game: Res<'w, GameMeta>,
-    localization: Res<'w, Localization>,
-    state: Local<'s, State>,
-    menu_input: Query<'w, 's, &'static mut ActionState<MenuAction>>,
-    commands: Commands<'w, 's>,
-    storage: ResMut<'w, Storage>,
-}
-
-pub struct State {
-    match_kind: MatchKind,
-    lan_service_discovery_recv: Option<mdns_sd::Receiver<mdns_sd::ServiceEvent>>,
-    service_info: Option<mdns_sd::ServiceInfo>,
-    status: Status,
-    joined_players: usize,
-    lan_servers: Vec<lan::ServerInfo>,
-    ping_update_timer: Timer,
-}
-
-#[derive(Default, PartialEq, Eq)]
-pub enum Status {
-    #[default]
-    Idle,
-    Joining,
-    Hosting,
-    Searching,
-}
-
-impl Default for State {
-    fn default() -> Self {
-        Self {
-            match_kind: default(),
-            lan_service_discovery_recv: default(),
-            service_info: default(),
-            status: default(),
-            lan_servers: default(),
-            joined_players: default(),
-            ping_update_timer: Timer::new(Duration::from_secs(1), TimerMode::Repeating),
-        }
-    }
-}
-
-#[derive(Clone)]
-pub enum MatchKind {
-    Lan(LanMode),
-    Online(OnlineState),
-}
-
-impl Default for MatchKind {
-    fn default() -> Self {
-        MatchKind::Lan(LanMode::Join)
-    }
-}
-
-#[derive(Default, Clone)]
-pub enum LanMode {
-    #[default]
-    Join,
-    Host {
-        service_name: String,
-        player_count: usize,
-    },
-}
-
-#[derive(Eq, PartialEq, Clone)]
-pub struct OnlineState {
-    player_count: usize,
-    matchmaking_server: String,
-    search_state: SearchState,
-}
-
-impl Default for OnlineState {
-    fn default() -> Self {
-        Self {
-            player_count: 2,
-            matchmaking_server: String::new(),
-            search_state: default(),
-        }
-    }
-}
-
-#[derive(Default, PartialEq, Eq, Clone, Copy)]
-pub enum SearchState {
-    #[default]
-    Connecting,
-    Searching,
-    WaitingForPlayers(usize),
-}
-
-impl<'w, 's> WidgetSystem for MatchmakingMenu<'w, 's> {
-    type Args = ();
-    fn system(
-        world: &mut World,
-        state: &mut SystemState<Self>,
-        ui: &mut egui::Ui,
-        _: WidgetId,
-        _: (),
-    ) {
-        let mut params: MatchmakingMenu = state.get_mut(world);
-        let menu_input = params.menu_input.single();
-        params.state.ping_update_timer.tick(params.time.delta());
-
-        let bigger_text_style = &params.game.ui_theme.font_styles.bigger;
-        let normal_text_style = &params.game.ui_theme.font_styles.normal;
-        let smaller_text_style = &params.game.ui_theme.font_styles.smaller;
-        let heading_text_style = &params.game.ui_theme.font_styles.heading;
-        let normal_button_style = &params.game.ui_theme.button_styles.normal;
-        let small_button_style = &params.game.ui_theme.button_styles.small;
-
-        ui.vertical_centered(|ui| {
-            ui.add_space(heading_text_style.size / 4.0);
-            ui.themed_label(heading_text_style, &params.localization.get("network-game"));
-            ui.themed_label(
-                bigger_text_style,
-                &params.localization.get("configure-match"),
-            );
-            ui.add_space(heading_text_style.size * 4.0);
-        });
-
-        let available_size = ui.available_size();
-        let x_margin = available_size.x / 4.0;
-        let outer_margin = egui::style::Margin::symmetric(x_margin, 0.0);
-
-        BorderedFrame::new(&params.game.ui_theme.panel.border)
-            .margin(outer_margin)
-            .padding(params.game.ui_theme.panel.padding.into())
-            .show(ui, |ui| {
-                ui.set_width(ui.available_width());
-
-                ui.horizontal(|ui| {
-                    // Lan tab
-                    let mut lan = egui::RichText::new(params.localization.get("lan"));
-                    if matches!(params.state.match_kind, MatchKind::Lan(..)) {
-                        lan = lan.underline();
-                    }
-                    if BorderedButton::themed(normal_button_style, lan)
-                        .show(ui)
-                        .clicked()
-                    {
-                        params.state.match_kind = MatchKind::Lan(default());
-                    }
-
-                    // Online tab
-                    let mut online = egui::RichText::new(params.localization.get("online"));
-                    if matches!(params.state.match_kind, MatchKind::Online(..)) {
-                        online = online.underline();
-                    }
-                    if BorderedButton::themed(normal_button_style, online)
-                        .show(ui)
-                        .clicked()
-                    {
-                        params.state.match_kind = MatchKind::Online(default());
-                    }
-
-                    match &mut params.state.match_kind {
-                        MatchKind::Lan(mode) => {
-                            ui.with_layout(
-                                egui::Layout::right_to_left(egui::Align::Center),
-                                |ui| {
-                                    ui.horizontal(|ui| {
-                                        // Host tab
-                                        let mut host =
-                                            egui::RichText::new(params.localization.get("host"));
-                                        if matches!(mode, LanMode::Host { .. }) {
-                                            host = host.underline();
-                                        }
-                                        if BorderedButton::themed(
-                                            &params.game.ui_theme.button_styles.small,
-                                            host,
-                                        )
-                                        .show(ui)
-                                        .clicked()
-                                        {
-                                            *mode = LanMode::Host {
-                                                service_name: params.localization.get("fish-fight"),
-                                                player_count: 2,
-                                            };
-                                        }
-
-                                        // Join tab
-                                        let mut join =
-                                            egui::RichText::new(params.localization.get("join"));
-                                        if matches!(mode, LanMode::Join) {
-                                            join = join.underline();
-                                        }
-                                        if BorderedButton::themed(
-                                            &params.game.ui_theme.button_styles.small,
-                                            join,
-                                        )
-                                        .show(ui)
-                                        .clicked()
-                                        {
-                                            *mode = LanMode::Join
-                                        }
-                                    });
-                                },
-                            );
-                        }
-                        MatchKind::Online(_online_state) => {
-                            ui.with_layout(
-                                egui::Layout::right_to_left(egui::Align::Center),
-                                |ui| {
-                                    ui.themed_label(
-                                        normal_text_style,
-                                        &params.localization.get("search-for-match"),
-                                    );
-                                },
-                            );
-                        }
-                    }
-                });
-
-                let State {
-                    match_kind,
-                    lan_service_discovery_recv,
-                    lan_servers,
-                    service_info: host_info,
-                    status,
-                    ping_update_timer,
-                    joined_players,
-                } = &mut *params.state;
-
-                ui.separator();
-                ui.add_space(normal_text_style.size);
-
-                match match_kind {
-                    // LAN game
-                    MatchKind::Lan(mode) => match mode {
-                        LanMode::Join => {
-                            // Stop any running server
-                            if let Some(service_info) = host_info.take() {
-                                lan::stop_server(&service_info);
-                                *status = Status::Idle;
-                            }
-                            lan::prepare_to_join(lan_servers, lan_service_discovery_recv, ping_update_timer);
-
-                            if *status != Status::Joining {
-                                ui.themed_label(
-                                    normal_text_style,
-                                    &params.localization.get("servers"),
-                                );
-                                ui.add_space(normal_text_style.size / 2.0);
-
-                                ui.indent("servers", |ui| {
-                                    for server in lan_servers.iter() {
-                                        ui.horizontal(|ui| {
-                                            if BorderedButton::themed(
-                                                &params.game.ui_theme.button_styles.normal,
-                                                server.service.get_hostname().trim_end_matches('.'),
-                                            )
-                                            .min_size(egui::vec2(ui.available_width() * 0.8, 0.0))
-                                            .show(ui)
-                                            .clicked()
-                                            {
-                                                lan::join_server(server);
-                                                *status = Status::Joining;
-                                            }
-
-                                            let label_text = egui::RichText::new(format!(
-                                                "🖧 {}ms",
-                                                server
-                                                    .ping
-                                                    .map(|x| x.to_string())
-                                                    .unwrap_or("?".into())
-                                            ))
-                                            .size(normal_text_style.size);
-                                            ui.label(label_text)
-                                        });
-                                    }
-
-                                    if lan_servers.is_empty() {
-                                        ui.themed_label(
-                                            normal_text_style,
-                                            &params.localization.get("no-servers"),
-                                        );
-                                    }
-                                });
-
-                            // If we are trying to join a match.
-                            } else {
-                                ui.themed_label(
-                                    normal_text_style,
-                                    &params.localization.get("joining"),
-                                );
-
-                                if let Some(lan_socket) = lan::wait_game_start() {
-                                    params.commands.insert_resource(NetworkMatchSocket(
-                                        Box::new(lan_socket),
-                                    ));
-
-                                    *status = default();
-                                    *params.menu_page = MenuPage::PlayerSelect;
-                                }
-                            }
-
-                            ui.add_space(normal_text_style.size / 2.0);
-                        }
-                        LanMode::Host {
-                            service_name,
-                            player_count,
-                        } => {
-                            ui.scope(|ui| {
-                                ui.set_enabled(*status != Status::Hosting);
-                                ui.horizontal(|ui| {
-                                    ui.themed_label(
-                                        normal_text_style,
-                                        &params.localization.get("server-name"),
-                                    );
-                                    ui.add(
-                                        egui::TextEdit::singleline(service_name)
-                                            .font(normal_text_style.font_id()),
-                                    );
-                                    *service_name = service_name.replace(' ', "-");
-                                });
-                                ui.add_space(normal_text_style.size / 2.0);
-                                ui.horizontal(|ui| {
-                                    ui.themed_label(
-                                        normal_text_style,
-                                        &params.localization.get("player-count"),
-                                    );
-                                    ui.add_space(normal_text_style.size);
-                                    ui.scope(|ui| {
-                                        ui.set_enabled(*player_count > 2);
-                                        if BorderedButton::themed(small_button_style, "-")
-                                            .min_size(egui::vec2(normal_text_style.size * 2.0, 0.0))
-                                            .show(ui)
-                                            .clicked()
-                                        {
-                                            *player_count = player_count
-                                                .saturating_sub(1)
-                                                .clamp(2, MAX_PLAYERS);
-                                        }
-                                    });
-                                    ui.themed_label(normal_text_style, &player_count.to_string());
-                                    ui.scope(|ui| {
-                                        ui.set_enabled(*player_count < MAX_PLAYERS);
-                                        if BorderedButton::themed(small_button_style, "+")
-                                            .min_size(egui::vec2(normal_text_style.size * 2.0, 0.0))
-                                            .show(ui)
-                                            .clicked()
-                                        {
-                                            *player_count = player_count
-                                                .saturating_add(1)
-                                                .clamp(2, MAX_PLAYERS);
-                                        }
-                                    });
-
-                                    *service_name = service_name.replace(' ', "-");
-                                });
-                            });
-
-                            let (is_recreated, service_info) = lan::prepare_to_host(host_info, service_name);
-                            if is_recreated {
-                                *status = Status::Idle;
-                            }
-
-                            ui.add_space(params.game.ui_theme.font_styles.normal.size);
-
-                            if *status == Status::Idle {
-                                if BorderedButton::themed(
-                                    small_button_style,
-                                    &params.localization.get("start-server"),
-                                )
-                                .show(ui)
-                                .clicked()
-                                {
-                                    *status = Status::Hosting;
-                                    lan::start_server(service_info.clone(), *player_count);
-                                }
-
-                            // If we are hosting a match currently
-                            } else if *status == Status::Hosting {
-                                if let Some(lan_socket) = lan::wait_players(joined_players, service_info) {
-                                    params.commands.insert_resource(NetworkMatchSocket(
-                                        Box::new(lan_socket),
-                                    ));
-
-                                    *status = default();
-                                    *params.menu_page = MenuPage::PlayerSelect;
-                                }
-
-                                ui.horizontal(|ui| {
-                                    if BorderedButton::themed(
-                                        small_button_style,
-                                        &params.localization.get("stop-server"),
-                                    )
-                                    .show(ui)
-                                    .clicked()
-                                    {
-                                        lan::stop_server(service_info);
-                                        *status = Status::Idle;
-                                    }
-
-                                    ui.themed_label(
-                                        normal_text_style,
-                                        &format!(
-                                            "{} {} / {}",
-                                            &params.localization.get("players"),
-                                            *joined_players + 1, // Add one to count the host.
-                                            player_count
-                                        ),
-                                    );
-                                });
-                            }
-                        }
-                    },
-
-                    // Online game
-                    MatchKind::Online(OnlineState {
-                        player_count,
-                        matchmaking_server,
-                        mut search_state,
-                    }) => {
-                        // Get the matchmaking server from the settings.
-                        if matchmaking_server.is_empty() {
-                            *matchmaking_server = params
-                                .storage
-                                .get::<Settings>(Settings::STORAGE_KEY)
-                                .unwrap_or_else(|| params.game.default_settings.clone())
-                                .matchmaking_server;
-                        }
-
-                        ui.horizontal(|ui| {
-                            ui.set_enabled(*status == Status::Idle);
-                            ui.themed_label(
-                                normal_text_style,
-                                &params.localization.get("player-count"),
-                            );
-
-                            ui.scope(|ui| {
-                                ui.set_enabled(*player_count > 2);
-                                if BorderedButton::themed(small_button_style, "-")
-                                    .min_size(egui::vec2(normal_text_style.size * 2.0, 0.0))
-                                    .show(ui)
-                                    .clicked()
-                                {
-                                    *player_count =
-                                        player_count.saturating_sub(1).clamp(2, MAX_PLAYERS);
-                                }
-                            });
-                            ui.themed_label(normal_text_style, &player_count.to_string());
-                            ui.scope(|ui| {
-                                ui.set_enabled(*player_count < MAX_PLAYERS);
-                                if BorderedButton::themed(small_button_style, "+")
-                                    .min_size(egui::vec2(normal_text_style.size * 2.0, 0.0))
-                                    .show(ui)
-                                    .clicked()
-                                {
-                                    *player_count =
-                                        player_count.saturating_add(1).clamp(2, MAX_PLAYERS);
-                                }
-                            });
-                        });
-
-                        ui.add_space(normal_text_style.size);
-
-                        if *status == Status::Idle {
-                            if BorderedButton::themed(
-                                small_button_style,
-                                &params.localization.get("search"),
-                            )
-                            .show(ui)
-                            .clicked()
-                            {
-                                *status = Status::Searching;
-                                ONLINE_MATCHMAKER
-                                    .try_send(OnlineMatchmakerRequest::SearchForGame {
-                                        addr: matchmaking_server.clone(),
-                                        player_count: *player_count,
-                                    })
-                                    .unwrap();
-                            }
-                        } else if *status == Status::Searching {
-                            while let Ok(message) = ONLINE_MATCHMAKER.try_recv() {
-                                match message {
-                                    OnlineMatchmakerResponse::Searching => {
-                                        search_state = SearchState::Searching
-                                    }
-                                    OnlineMatchmakerResponse::PlayerCount(count) => {
-                                        search_state = SearchState::WaitingForPlayers(count)
-                                    }
-                                    OnlineMatchmakerResponse::GameStarting {
-                                        online_socket,
-                                        player_idx,
-                                        player_count: _,
-                                    } => {
-                                        info!(?player_idx, "Starting network game");
-                                        params.commands.insert_resource(NetworkMatchSocket(
-                                            Box::new(online_socket),
-                                        ));
-
-                                        *status = default();
-                                        search_state = default();
-                                        *params.menu_page = MenuPage::PlayerSelect;
-                                    }
-                                }
-                            }
-
-                            ui.horizontal(|ui| {
-                                if BorderedButton::themed(
-                                    small_button_style,
-                                    &params.localization.get("cancel"),
-                                )
-                                .show(ui)
-                                .clicked()
-                                {
-                                    ONLINE_MATCHMAKER
-                                        .try_send(OnlineMatchmakerRequest::StopSearch)
-                                        .unwrap();
-                                    search_state = default();
-                                    *status = Status::Idle;
-                                }
-
-                                ui.themed_label(
-                                    smaller_text_style,
-                                    &match search_state {
-                                        SearchState::Connecting => {
-                                            params.localization.get("connecting")
-                                        }
-                                        SearchState::Searching => {
-                                            params.localization.get("searching")
-                                        }
-                                        SearchState::WaitingForPlayers(current) => {
-                                            params.localization.get(&format!(
-                                                "waiting-for-players?current={current}&total={player_count}",
-                                            ))
-                                        }
-                                    },
-                                );
-                            });
-                        }
-                    }
-                }
-
-                ui.with_layout(egui::Layout::right_to_left(egui::Align::Min), |ui| {
-                    if BorderedButton::themed(normal_button_style, &params.localization.get("back"))
-                        .show(ui)
-                        .clicked()
-                        || menu_input.pressed(MenuAction::Back)
-                    {
-                        match status {
-                            Status::Idle => (),
-                            Status::Searching => {
-                                if let Err(err) = ONLINE_MATCHMAKER.try_send(OnlineMatchmakerRequest::StopSearch){
-                                    error!("Error stopping search: {:?}", err);
-                                }
-
-                                *status = Status::Idle;
-                            }
-                            Status::Joining => {
-                                lan::leave_server();
-                                *status = Status::Idle;
-                            }
-                            Status::Hosting => {
-                                if let Some(service_info) = host_info.take() {
-                                    lan::stop_server(&service_info);
-                                }
-                                *status = Status::Idle;
-                            }
-                        }
-                        *params.menu_page = MenuPage::Home;
-                    }
-                });
-            });
-    }
-}
diff --git a/src/ui/main_menu/player_select.rs b/src/ui/main_menu/player_select.rs
index b9988cf08c..a48bc57436 100644
--- a/src/ui/main_menu/player_select.rs
+++ b/src/ui/main_menu/player_select.rs
@@ -1,681 +1,626 @@
-use crate::loading::PlayerInputCollector;
-#[cfg(not(target_arch = "wasm32"))]
-use crate::networking::{NetworkMatchSocket, SocketTarget};
-
-use bones_lib::prelude::{key, Key, KeyError};
-use rand::Rng;
+// #[cfg(not(target_arch = "wasm32"))]
+// use crate::networking::{NetworkMatchSocket, SocketTarget};
 
 use super::*;
 
-const GAMEPAD_ACTION_IDX: usize = 0;
-const KEYPAD_ACTION_IDX: usize = 1;
+// const GAMEPAD_ACTION_IDX: usize = 0;
+// const KEYPAD_ACTION_IDX: usize = 1;
 
-#[derive(Resource, Default)]
+#[derive(Default, Clone, Debug)]
 pub struct PlayerSelectState {
     pub slots: [PlayerSlot; MAX_PLAYERS],
 }
 
-#[derive(Default)]
+#[derive(Default, Clone, Copy, Debug)]
 pub struct PlayerSlot {
     pub active: bool,
     pub confirmed: bool,
-    pub selected_player: bones::Handle<PlayerMeta>,
-    pub selected_hat: Option<bones::Handle<HatMeta>>,
-    pub is_ai: bool,
-}
-
-/// Network message that may be sent during player selection.
-#[derive(Serialize, Deserialize)]
-pub enum PlayerSelectMessage {
-    SelectPlayer(bones::Handle<PlayerMeta>),
-    SelectHat(Option<bones::Handle<HatMeta>>),
-    ConfirmSelection(bool),
+    pub selected_player: Handle<PlayerMeta>,
+    pub selected_hat: Option<Handle<HatMeta>>,
+    pub control_source: Option<ControlSource>,
 }
 
-#[derive(SystemParam)]
-pub struct PlayerSelectMenu<'w, 's> {
-    game: Res<'w, GameMeta>,
-    menu_page: ResMut<'w, MenuPage>,
-    localization: Res<'w, Localization>,
-    keyboard_input: Res<'w, Input<KeyCode>>,
-    player_select_state: ResMut<'w, PlayerSelectState>,
-    menu_input: Query<'w, 's, &'static mut ActionState<MenuAction>>,
-    #[cfg(not(target_arch = "wasm32"))]
-    network_socket: Option<Res<'w, NetworkMatchSocket>>,
+impl PlayerSlot {
+    pub fn is_ai(&self) -> bool {
+        self.control_source.is_none()
+    }
 }
 
-impl<'w, 's> WidgetSystem for PlayerSelectMenu<'w, 's> {
-    type Args = ();
-    fn system(
-        world: &mut World,
-        state: &mut SystemState<Self>,
-        ui: &mut egui::Ui,
-        id: WidgetId,
-        _: (),
-    ) {
-        #[cfg_attr(target_arch = "wasm32", allow(unused_mut))]
-        let mut params: PlayerSelectMenu = state.get_mut(world);
-        let is_online = false;
-
-        #[cfg(not(target_arch = "wasm32"))]
-        handle_match_setup_messages(&mut params);
-
-        // Whether or not the continue button should be enabled
-        let mut ready_players = 0;
-        let mut unconfirmed_players = 0;
-
-        for slot in &params.player_select_state.slots {
-            if slot.confirmed {
-                ready_players += 1;
-            } else if slot.active {
-                unconfirmed_players += 1;
-            }
+// /// Network message that may be sent during player selection.
+// #[derive(Serialize, Deserialize)]
+// pub enum PlayerSelectMessage {
+//     SelectPlayer(Handle<PlayerMeta>),
+//     SelectHat(Option<Handle<HatMeta>>),
+//     ConfirmSelection(bool),
+// }
+
+pub fn widget(
+    mut ui: In<&mut egui::Ui>,
+    meta: Root<GameMeta>,
+    localization: Localization<GameMeta>,
+    controls: Res<GlobalPlayerControls>,
+    world: &World,
+) {
+    let is_online = false;
+    let mut state = ui.ctx().get_state::<PlayerSelectState>();
+    ui.ctx().set_state(EguiInputSettings {
+        disable_keyboard_input: true,
+        disable_gamepad_input: true,
+    });
+
+    // #[cfg(not(target_arch = "wasm32"))]
+    // handle_match_setup_messages(&mut params);
+
+    // Whether or not the continue button should be enabled
+    let mut ready_players = 0;
+    let mut unconfirmed_players = 0;
+
+    for slot in &state.slots {
+        if slot.confirmed {
+            ready_players += 1;
+        } else if slot.active {
+            unconfirmed_players += 1;
         }
-        let may_continue = ready_players >= 1 && unconfirmed_players == 0;
-
-        #[cfg(not(target_arch = "wasm32"))]
-        if let Some(socket) = &params.network_socket {
-            if may_continue {
-                // The first player picks the map
-                let is_waiting = socket.player_idx() != 0;
-
-                *params.menu_page = MenuPage::MapSelect { is_waiting };
-            }
+    }
+    let may_continue = ready_players >= 1 && unconfirmed_players == 0;
+
+    // #[cfg(not(target_arch = "wasm32"))]
+    // if let Some(socket) = &params.network_socket {
+    //     if may_continue {
+    //         // The first player picks the map
+    //         let is_waiting = socket.player_idx() != 0;
+
+    //         *params.menu_page = MenuPage::MapSelect { is_waiting };
+    //     }
+    // }
+
+    let bigger_text_style = &meta
+        .theme
+        .font_styles
+        .bigger
+        .with_color(meta.theme.panel.font_color);
+    let heading_text_style = &meta
+        .theme
+        .font_styles
+        .heading
+        .with_color(meta.theme.panel.font_color);
+    let normal_button_style = &meta.theme.buttons.normal;
+
+    ui.vertical_centered(|ui| {
+        ui.add_space(heading_text_style.size / 4.0);
+
+        // Title
+        if is_online {
+            ui.label(heading_text_style.rich(localization.get("online-game")));
+        } else {
+            ui.label(heading_text_style.rich(localization.get("local-game")));
         }
 
-        ui.vertical_centered(|ui| {
-            let params: PlayerSelectMenu = state.get_mut(world);
+        ui.label(bigger_text_style.rich(localization.get("player-select-title")));
+        ui.add_space(normal_button_style.font.size);
+
+        ui.with_layout(egui::Layout::bottom_up(egui::Align::Center), |ui| {
+            ui.add_space(normal_button_style.font.size * 2.0);
+            ui.horizontal(|ui| {
+                // Calculate button size and spacing
+                let width = ui.available_width();
+                let button_width = width / 3.0;
+                let button_min_size = vec2(button_width, 0.0);
+                let button_spacing = (width - 2.0 * button_width) / 3.0;
+
+                ui.add_space(button_spacing);
+
+                // Back button
+                let back_button =
+                    BorderedButton::themed(normal_button_style, localization.get("back"))
+                        .min_size(button_min_size)
+                        .show(ui)
+                        .focus_by_default(ui);
+
+                if back_button.clicked()
+                    || (ready_players == 0
+                        && unconfirmed_players == 0
+                        && controls.values().any(|x| x.menu_back_just_pressed))
+                {
+                    ui.ctx().set_state(MenuPage::Home);
+                    ui.ctx().set_state(EguiInputSettings::default());
+                    ui.ctx().set_state(PlayerSelectState::default());
+
+                    // #[cfg(not(target_arch = "wasm32"))]
+                    // if let Some(socket) = params.network_socket {
+                    //     socket.close();
+                    // }
+                }
 
-            let bigger_text_style = &params.game.ui_theme.font_styles.bigger;
-            let heading_text_style = &params.game.ui_theme.font_styles.heading;
-            let normal_button_style = &params.game.ui_theme.button_styles.normal;
+                ui.add_space(button_spacing);
 
-            ui.add_space(heading_text_style.size / 4.0);
+                // Continue button
+                let continue_button = ui
+                    .scope(|ui| {
+                        ui.set_enabled(may_continue);
 
-            // Title
-            if is_online {
-                ui.themed_label(heading_text_style, &params.localization.get("online-game"));
-            } else {
-                ui.themed_label(heading_text_style, &params.localization.get("local-game"));
-            }
+                        BorderedButton::themed(normal_button_style, localization.get("continue"))
+                            .min_size(button_min_size)
+                            .show(ui)
+                    })
+                    .inner;
+
+                if !controls.values().any(|x| x.menu_back_just_pressed)
+                    && (continue_button.clicked()
+                        || (controls.values().any(|x| x.menu_start_just_pressed) && may_continue))
+                {
+                    ui.ctx()
+                        .set_state(MenuPage::MapSelect { is_waiting: false });
+                    ui.ctx().set_state(EguiInputSettings::default());
+                    ui.ctx().set_state(PlayerSelectState::default());
+                }
+            });
 
-            ui.themed_label(
-                bigger_text_style,
-                &params.localization.get("player-select-title"),
-            );
             ui.add_space(normal_button_style.font.size);
 
-            ui.with_layout(egui::Layout::bottom_up(egui::Align::Center), |ui| {
-                let mut params: PlayerSelectMenu = state.get_mut(world);
-
-                let normal_button_style = &params.game.ui_theme.button_styles.normal;
-                let is_active = params.player_select_state.slots[0].active;
-                let is_confirmed = params.player_select_state.slots[0].confirmed;
-
-                ui.add_space(normal_button_style.font.size * 2.0);
-                ui.horizontal(|ui| {
-                    // Calculate button size and spacing
-                    let width = ui.available_width();
-                    let button_width = width / 3.0;
-                    let button_min_size = egui::vec2(button_width, 0.0);
-                    let button_spacing = (width - 2.0 * button_width) / 3.0;
-
-                    ui.add_space(button_spacing);
-
-                    // Back button
-                    let back_button = BorderedButton::themed(
-                        &params.game.ui_theme.button_styles.normal,
-                        &params.localization.get("back"),
-                    )
-                    .min_size(button_min_size)
-                    .show(ui)
-                    .focus_by_default(ui);
-
-                    if back_button.clicked()
-                        || params.menu_input.single().just_pressed(MenuAction::Back)
-                    {
-                        if is_confirmed {
-                            params.player_select_state.slots[0].confirmed = false;
-                        } else if is_active {
-                            params.player_select_state.slots[0].active = false;
-                        } else {
-                            *params.menu_page = MenuPage::Home;
+            ui.vertical_centered(|ui| {
+                ui.set_width(ui.available_width() - normal_button_style.font.size * 2.0);
 
-                            #[cfg(not(target_arch = "wasm32"))]
-                            if let Some(socket) = params.network_socket {
-                                socket.close();
-                            }
-
-                            ui.ctx().clear_focus();
-                        }
-                    }
-
-                    ui.add_space(button_spacing);
-
-                    // Continue button
-                    let continue_button = ui
-                        .scope(|ui| {
-                            ui.set_enabled(may_continue);
-
-                            BorderedButton::themed(
-                                &params.game.ui_theme.button_styles.normal,
-                                &params.localization.get("continue"),
-                            )
-                            .min_size(button_min_size)
-                            .show(ui)
-                        })
-                        .inner;
-
-                    if continue_button.clicked()
-                        || ((params.menu_input.single().just_pressed(MenuAction::Start)
-                            || params.keyboard_input.just_pressed(KeyCode::Return))
-                            && may_continue)
-                    {
-                        *params.menu_page = MenuPage::MapSelect { is_waiting: false };
+                ui.columns(MAX_PLAYERS, |columns| {
+                    for (i, ui) in columns.iter_mut().enumerate() {
+                        world.run_initialized_system(player_select_panel, (ui, i, &mut state))
                     }
                 });
-
-                ui.add_space(normal_button_style.font.size);
-
-                ui.vertical_centered(|ui| {
-                    let params: PlayerSelectMenu = state.get_mut(world);
-
-                    let normal_button_style = &params.game.ui_theme.button_styles.normal;
-                    ui.set_width(ui.available_width() - normal_button_style.font.size * 2.0);
-
-                    ui.columns(MAX_PLAYERS, |columns| {
-                        for (i, ui) in columns.iter_mut().enumerate() {
-                            widget::<PlayerSelectPanel>(
-                                world,
-                                ui,
-                                id.with(&format!("player_panel{i}")),
-                                i,
-                            );
-                        }
-                    });
-                });
             });
         });
-    }
-}
-
-#[cfg(not(target_arch = "wasm32"))]
-fn handle_match_setup_messages(params: &mut PlayerSelectMenu) {
-    if let Some(socket) = &params.network_socket {
-        let datas: Vec<(usize, Vec<u8>)> = socket.recv_reliable();
+    });
 
-        for (player, data) in datas {
-            match postcard::from_bytes::<PlayerSelectMessage>(&data) {
-                Ok(message) => match message {
-                    PlayerSelectMessage::SelectPlayer(player_handle) => {
-                        params.player_select_state.slots[player].selected_player = player_handle;
-                    }
-                    PlayerSelectMessage::ConfirmSelection(confirmed) => {
-                        params.player_select_state.slots[player].confirmed = confirmed;
-                    }
-                    PlayerSelectMessage::SelectHat(hat) => {
-                        params.player_select_state.slots[player].selected_hat = hat;
-                    }
-                },
-                Err(e) => warn!("Ignoring network message that was not understood: {e}"),
-            }
-        }
-    }
+    ui.ctx().set_state(state);
 }
 
-#[derive(Debug)]
-struct PlayerActionMap<'a>(HashMap<PlayerAction, Vec<Option<&'a UserInput>>>);
-
-impl PlayerActionMap<'_> {
-    fn get_text(&self, action: PlayerAction) -> String {
-        self.0
-            .get(&action)
-            .unwrap_or(&vec![])
+// #[cfg(not(target_arch = "wasm32"))]
+// fn handle_match_setup_messages(params: &mut PlayerSelectMenu) {
+//     if let Some(socket) = &params.network_socket {
+//         let datas: Vec<(usize, Vec<u8>)> = socket.recv_reliable();
+
+//         for (player, data) in datas {
+//             match postcard::from_bytes::<PlayerSelectMessage>(&data) {
+//                 Ok(message) => match message {
+//                     PlayerSelectMessage::SelectPlayer(player_handle) => {
+//                         params.player_select_state.slots[player].selected_player = player_handle;
+//                     }
+//                     PlayerSelectMessage::ConfirmSelection(confirmed) => {
+//                         params.player_select_state.slots[player].confirmed = confirmed;
+//                     }
+//                     PlayerSelectMessage::SelectHat(hat) => {
+//                         params.player_select_state.slots[player].selected_hat = hat;
+//                     }
+//                 },
+//                 Err(e) => warn!("Ignoring network message that was not understood: {e}"),
+//             }
+//         }
+//     }
+// }
+
+fn player_select_panel(
+    mut params: In<(&mut egui::Ui, usize, &mut PlayerSelectState)>,
+    meta: Root<GameMeta>,
+    controls: Res<GlobalPlayerControls>,
+    asset_server: Res<AssetServer>,
+    localization: Localization<GameMeta>,
+    mapping: Res<PlayerControlMapping>,
+    world: &World,
+) {
+    let (ui, slot_id, state) = &mut *params;
+
+    let is_network = false;
+    // #[cfg(target_arch = "wasm32")]
+    // let is_network = false;
+    // #[cfg(not(target_arch = "wasm32"))]
+    // let is_network = params.network_socket.is_some();
+
+    // let player_map = params
+    //     .players
+    //     .iter()
+    //     .find(|(player_idx, _, _)| player_idx.0 == player_id)
+    //     .unwrap()
+    //     .2;
+
+    // #[cfg(not(target_arch = "wasm32"))]
+    // let dummy_actions = default();
+    // let (player_actions, player_action_map) = if is_network {
+    //     // #[cfg(not(target_arch = "wasm32"))]
+    //     // if let Some(socket) = &params.network_socket {
+    //     //     let actions = if player_id == socket.player_idx() {
+    //     //         params
+    //     //             .players
+    //     //             .iter()
+    //     //             .find(|(player_idx, _, _)| player_idx.0 == 0)
+    //     //             .unwrap()
+    //     //             .1
+    //     //     } else {
+    //     //         &dummy_actions
+    //     //     };
+    //     //     let map = None;
+    //     //     (actions, map)
+    //     // } else {
+    //     //     unreachable!();
+    //     // }
+
+    //     // #[cfg(target_arch = "wasm32")]
+    //     // unreachable!()
+    // } else {
+    //     let actions = players
+    //         .iter()
+    //         .find(|(player_idx, _, _)| player_idx.0 == player_id)
+    //         .unwrap()
+    //         .1;
+    //     let map = Some(get_player_actions(player_id, player_map));
+    //     (actions, map)
+    // };
+
+    // #[cfg(not(target_arch = "wasm32"))]
+    // if let Some(socket) = &params.network_socket {
+    //     // Don't show panels for non-connected players.
+    //     if player_id + 1 > socket.player_count() {
+    //         return;
+    //     } else {
+    //         slot.active = true;
+    //     }
+    // }
+
+    // Get the ID of the first un-occupied slot
+    let next_open_slot = state
+        .slots
+        .iter()
+        .enumerate()
+        .find_map(|(i, slot)| (!slot.active).then_some(i));
+
+    // Check if a new player is trying to join
+    let new_player_join = controls.iter().find_map(|(source, control)| {
+        (
+            // If this control input is pressing the join button
+            control.menu_confirm_just_pressed &&
+            // And this is the next open slot
+            next_open_slot == Some(*slot_id) &&
+            // And this control source is not bound to a player slot already
+            !state
+            .slots
             .iter()
-            .filter_map(|action| *action)
-            .map(|action| action.to_string())
-            .fold("".to_string(), |acc, curr| {
-                if acc.is_empty() {
-                    curr
-                } else {
-                    format!("{acc} / {curr}")
-                }
-            })
-    }
-}
-
-fn get_player_actions(idx: usize, map: &InputMap<PlayerAction>) -> PlayerActionMap {
-    let map_idx = if idx > 1 {
-        GAMEPAD_ACTION_IDX
-    } else {
-        KEYPAD_ACTION_IDX
+            .any(|s| s.control_source == Some(*source))
+        )
+        // Return this source
+        .then_some(*source)
+    });
+
+    // Input sources that may be used to join a new player
+    let available_input_sources = {
+        let mut sources = SmallVec::<[_; 3]>::from_slice(&[
+            ControlSource::Keyboard1,
+            ControlSource::Keyboard2,
+            ControlSource::Gamepad(0),
+        ]);
+
+        for slot in &state.slots {
+            if matches!(
+                slot.control_source,
+                Some(ControlSource::Keyboard1 | ControlSource::Keyboard2)
+            ) {
+                sources.retain(|&mut x| x != slot.control_source.unwrap());
+            }
+        }
+        sources
     };
 
-    let mut jump_actions = vec![get_user_action(map_idx, PlayerAction::Jump, map)];
-    let mut grab_actions = vec![get_user_action(map_idx, PlayerAction::Grab, map)];
+    let slot = &mut state.slots[*slot_id];
+    let player_handle = &mut slot.selected_player;
 
-    if idx <= 1 {
-        jump_actions.push(get_user_action(GAMEPAD_ACTION_IDX, PlayerAction::Jump, map));
-        grab_actions.push(get_user_action(GAMEPAD_ACTION_IDX, PlayerAction::Grab, map));
+    // If the handle is empty
+    if *player_handle == default() {
+        // Select the first player
+        *player_handle = meta.core.players[0];
     }
 
-    PlayerActionMap(HashMap::from_iter(vec![
-        (PlayerAction::Jump, jump_actions),
-        (PlayerAction::Grab, grab_actions),
-    ]))
-}
-
-fn get_user_action(
-    idx: usize,
-    action: PlayerAction,
-    map: &InputMap<PlayerAction>,
-) -> Option<&'_ UserInput> {
-    let action = map.get(action).get_at(idx);
-    if let Some(action) = action {
-        Some(action)
-    } else {
-        None
+    // Handle player joining
+    if let Some(control_source) = new_player_join {
+        slot.active = true;
+        slot.confirmed = false;
+        slot.control_source = Some(control_source);
     }
-}
-
-#[derive(SystemParam)]
-struct PlayerSelectPanel<'w, 's> {
-    game: Res<'w, GameMeta>,
-    core: Res<'w, CoreMetaArc>,
-    localization: Res<'w, Localization>,
-    player_meta_assets: Res<'w, Assets<PlayerMeta>>,
-    hat_assets: Res<'w, Assets<HatMeta>>,
-    player_select_state: ResMut<'w, PlayerSelectState>,
-    atlas_meta_assets: Res<'w, Assets<TextureAtlas>>,
-    player_atlas_egui_textures: Res<'w, AtlasEguiTextures>,
-    players: Query<
-        'w,
-        's,
-        (
-            &'static PlayerInputCollector,
-            &'static ActionState<PlayerAction>,
-            &'static InputMap<PlayerAction>,
-        ),
-    >,
-    #[cfg(not(target_arch = "wasm32"))]
-    network_socket: Option<Res<'w, NetworkMatchSocket>>,
-}
 
-impl<'w, 's> WidgetSystem for PlayerSelectPanel<'w, 's> {
-    type Args = usize; // Player Idx
-    fn system(
-        world: &mut World,
-        state: &mut SystemState<Self>,
-        ui: &mut egui::Ui,
-        _id: WidgetId,
-        args: usize,
-    ) {
-        let mut params: PlayerSelectPanel = state.get_mut(world);
-
-        #[cfg(target_arch = "wasm32")]
-        let is_network = false;
-        #[cfg(not(target_arch = "wasm32"))]
-        let is_network = params.network_socket.is_some();
-
-        let player_id = args;
-
-        let player_map = params
-            .players
-            .iter()
-            .find(|(player_idx, _, _)| player_idx.0 == player_id)
-            .unwrap()
-            .2;
-
-        #[cfg(not(target_arch = "wasm32"))]
-        let dummy_actions = default();
-        let (player_actions, player_action_map) = if is_network {
-            #[cfg(not(target_arch = "wasm32"))]
-            if let Some(socket) = &params.network_socket {
-                let actions = if player_id == socket.player_idx() {
-                    params
-                        .players
-                        .iter()
-                        .find(|(player_idx, _, _)| player_idx.0 == 0)
-                        .unwrap()
-                        .1
-                } else {
-                    &dummy_actions
-                };
-                let map = None;
-                (actions, map)
-            } else {
-                unreachable!();
+    let player_control = slot
+        .control_source
+        .as_ref()
+        .map(|s| *controls.get(s).unwrap())
+        .unwrap_or_default();
+
+    if player_control.menu_confirm_just_pressed && new_player_join.is_none() {
+        slot.confirmed = true;
+
+        // #[cfg(not(target_arch = "wasm32"))]
+        // if let Some(socket) = &params.network_socket {
+        //     socket.send_reliable(
+        //         SocketTarget::All,
+        //         &postcard::to_allocvec(&PlayerSelectMessage::ConfirmSelection(slot.confirmed))
+        //             .unwrap(),
+        //     );
+        // }
+    } else if player_control.menu_back_just_pressed {
+        if !is_network {
+            if slot.confirmed {
+                slot.confirmed = false;
+            } else if slot.active {
+                slot.active = false;
+                slot.control_source = None;
             }
-
-            #[cfg(target_arch = "wasm32")]
-            unreachable!()
         } else {
-            let actions = params
-                .players
-                .iter()
-                .find(|(player_idx, _, _)| player_idx.0 == player_id)
-                .unwrap()
-                .1;
-            let map = Some(get_player_actions(player_id, player_map));
-            (actions, map)
-        };
-
-        let slot = &mut params.player_select_state.slots[player_id];
-        #[cfg(not(target_arch = "wasm32"))]
-        if let Some(socket) = &params.network_socket {
-            // Don't show panels for non-connected players.
-            if player_id + 1 > socket.player_count() {
-                return;
-            } else {
-                slot.active = true;
-            }
+            slot.confirmed = false;
         }
 
-        let player_handle = &mut slot.selected_player;
-        let player_hat = &mut slot.selected_hat;
-
-        // If the handle is empty
-        if player_handle.path == default() {
-            // Select the first player
-            *player_handle = params.core.players[0].clone();
-        }
-
-        if player_actions.just_pressed(PlayerAction::Jump) {
-            if !is_network {
-                if slot.active {
-                    slot.confirmed = true;
-                } else {
-                    slot.active = true;
-                }
-            } else {
-                slot.confirmed = true;
-            }
+        // #[cfg(not(target_arch = "wasm32"))]
+        // if let Some(socket) = &params.network_socket {
+        //     socket.send_reliable(
+        //         SocketTarget::All,
+        //         &postcard::to_allocvec(&PlayerSelectMessage::ConfirmSelection(slot.confirmed))
+        //             .unwrap(),
+        //     );
+        // }
+    } else if player_control.just_moved {
+        let direction = player_control.move_direction;
+
+        // Select a hat if the player has been confirmed
+        if slot.confirmed {
+            let current_hat_handle_idx = slot.selected_hat.as_ref().map(|player_hat| {
+                meta.core
+                    .player_hats
+                    .iter()
+                    .enumerate()
+                    .find(|(_, handle)| *handle == player_hat)
+                    .map(|(i, _)| i)
+                    .unwrap_or(0)
+            });
 
-            #[cfg(not(target_arch = "wasm32"))]
-            if let Some(socket) = &params.network_socket {
-                socket.send_reliable(
-                    SocketTarget::All,
-                    &postcard::to_allocvec(&PlayerSelectMessage::ConfirmSelection(slot.confirmed))
-                        .unwrap(),
-                );
-            }
-        } else if player_actions.just_pressed(PlayerAction::Grab) {
-            if !is_network {
-                if slot.confirmed {
-                    slot.confirmed = false;
-                } else {
-                    slot.active = false;
-                }
+            let next_idx = if direction.x > 0.0 {
+                current_hat_handle_idx
+                    .map(|x| {
+                        if x < meta.core.player_hats.len() - 1 {
+                            Some(x + 1)
+                        } else {
+                            None
+                        }
+                    })
+                    .unwrap_or(Some(0))
             } else {
-                slot.confirmed = false;
-            }
-
-            #[cfg(not(target_arch = "wasm32"))]
-            if let Some(socket) = &params.network_socket {
-                socket.send_reliable(
-                    SocketTarget::All,
-                    &postcard::to_allocvec(&PlayerSelectMessage::ConfirmSelection(slot.confirmed))
-                        .unwrap(),
-                );
-            }
-        } else if player_actions.just_pressed(PlayerAction::Move) {
-            let direction = player_actions
-                .clamped_axis_pair(PlayerAction::Move)
-                .unwrap();
-
-            // Select a hat if the player has been confirmed
-            if slot.confirmed {
-                let current_hat_handle_idx = player_hat.as_ref().map(|player_hat| {
-                    params
-                        .core
-                        .player_hats
-                        .iter()
-                        .enumerate()
-                        .find(|(_, handle)| handle.path == player_hat.path)
-                        .map(|(i, _)| i)
-                        .unwrap_or(0)
-                });
-
-                let next_idx = if direction.x() > 0.0 {
-                    current_hat_handle_idx
-                        .map(|x| {
-                            if x < params.core.player_hats.len() - 1 {
-                                Some(x + 1)
-                            } else {
-                                None
-                            }
-                        })
-                        .unwrap_or(Some(0))
-                } else {
-                    current_hat_handle_idx
-                        .map(|x| if x == 0 { None } else { Some(x - 1) })
-                        .unwrap_or(Some(params.core.player_hats.len() - 1))
-                };
-                *player_hat = next_idx.map(|idx| params.core.player_hats.get(idx).unwrap().clone());
-
-                #[cfg(not(target_arch = "wasm32"))]
-                if let Some(socket) = &params.network_socket {
-                    socket.send_reliable(
-                        SocketTarget::All,
-                        &postcard::to_allocvec(&PlayerSelectMessage::SelectHat(player_hat.clone()))
-                            .unwrap(),
-                    );
-                }
+                current_hat_handle_idx
+                    .map(|x| if x == 0 { None } else { Some(x - 1) })
+                    .unwrap_or(Some(meta.core.player_hats.len() - 1))
+            };
+            slot.selected_hat = next_idx.map(|idx| *meta.core.player_hats.get(idx).unwrap());
+
+            // #[cfg(not(target_arch = "wasm32"))]
+            // if let Some(socket) = &params.network_socket {
+            //     socket.send_reliable(
+            //         SocketTarget::All,
+            //         &postcard::to_allocvec(&PlayerSelectMessage::SelectHat(player_hat.clone()))
+            //             .unwrap(),
+            //     );
+            // }
+
+            // Select player skin if the player has not be confirmed
+        } else {
+            let current_player_handle_idx = meta
+                .core
+                .players
+                .iter()
+                .enumerate()
+                .find(|(_, handle)| *handle == player_handle)
+                .map(|(i, _)| i)
+                .unwrap_or(0);
 
-            // Adjust the player if the player has not be confirmed
-            } else {
-                let current_player_handle_idx = params
+            if direction.x > 0.0 {
+                *player_handle = meta
                     .core
                     .players
-                    .iter()
-                    .enumerate()
-                    .find(|(_, handle)| handle.path == player_handle.path)
-                    .map(|(i, _)| i)
-                    .unwrap_or(0);
-
-                if direction.x() > 0.0 {
-                    *player_handle = params
+                    .get(current_player_handle_idx + 1)
+                    .cloned()
+                    .unwrap_or_else(|| meta.core.players[0]);
+            } else if direction.x <= 0.0 {
+                if current_player_handle_idx > 0 {
+                    *player_handle = meta
                         .core
                         .players
-                        .get(current_player_handle_idx + 1)
+                        .get(current_player_handle_idx - 1)
                         .cloned()
-                        .unwrap_or_else(|| params.core.players[0].clone());
-                } else if direction.x() <= 0.0 {
-                    if current_player_handle_idx > 0 {
-                        *player_handle = params
-                            .core
-                            .players
-                            .get(current_player_handle_idx - 1)
-                            .cloned()
-                            .unwrap();
-                    } else {
-                        *player_handle = params.core.players.iter().last().unwrap().clone();
-                    }
-                }
-
-                #[cfg(not(target_arch = "wasm32"))]
-                if let Some(socket) = &params.network_socket {
-                    socket.send_reliable(
-                        SocketTarget::All,
-                        &postcard::to_allocvec(&PlayerSelectMessage::SelectPlayer(
-                            player_handle.clone(),
-                        ))
-                        .unwrap(),
-                    );
+                        .unwrap();
+                } else {
+                    *player_handle = *meta.core.players.iter().last().unwrap();
                 }
             }
+
+            // #[cfg(not(target_arch = "wasm32"))]
+            // if let Some(socket) = &params.network_socket {
+            //     socket.send_reliable(
+            //         SocketTarget::All,
+            //         &postcard::to_allocvec(&PlayerSelectMessage::SelectPlayer(
+            //             player_handle.clone(),
+            //         ))
+            //         .unwrap(),
+            //     );
+            // }
         }
+    }
 
-        BorderedFrame::new(&params.game.ui_theme.panel.border)
-            .padding(params.game.ui_theme.panel.padding.into())
-            .show(ui, |ui| {
-                ui.set_width(ui.available_width());
-                ui.set_height(ui.available_height());
-
-                let normal_font = &params.game.ui_theme.font_styles.normal;
-                let smaller_font = &params.game.ui_theme.font_styles.smaller;
-                let heading_font = &params.game.ui_theme.font_styles.heading;
-
-                // Marker for current player in online matches
-                #[cfg(not(target_arch = "wasm32"))]
-                if let Some(socket) = &params.network_socket {
-                    if socket.player_idx() == player_id {
-                        ui.vertical_centered(|ui| {
-                            ui.themed_label(normal_font, &params.localization.get("you-marker"));
-                        });
+    let panel = &meta.theme.panel;
+    BorderedFrame::new(&panel.border)
+        .padding(panel.padding)
+        .show(ui, |ui| {
+            ui.set_width(ui.available_width());
+            ui.set_height(ui.available_height());
+
+            let normal_font = &meta.theme.font_styles.normal.with_color(panel.font_color);
+            let smaller_font = &meta.theme.font_styles.smaller.with_color(panel.font_color);
+            let heading_font = &meta.theme.font_styles.heading.with_color(panel.font_color);
+
+            // Marker for current player in online matches
+            // #[cfg(not(target_arch = "wasm32"))]
+            // if let Some(socket) = &params.network_socket {
+            //     if socket.player_idx() == player_id {
+            //         ui.vertical_centered(|ui| {
+            //             ui.themed_label(normal_font, &params.localization.get("you-marker"));
+            //         });
+            //     } else {
+            //         ui.add_space(normal_font.size);
+            //     }
+            // } else {
+            //     ui.add_space(normal_font.size);
+            // }
+
+            ui.add_space(normal_font.size);
+
+            if slot.active {
+                let confirm_binding = slot.control_source.map(|s| {
+                    match s {
+                        ControlSource::Keyboard1 => &mapping.keyboard1.menu_confirm,
+                        ControlSource::Keyboard2 => &mapping.keyboard2.menu_confirm,
+                        ControlSource::Gamepad(_) => &mapping.gamepad.menu_confirm,
+                    }
+                    .to_string()
+                });
+                let back_binding = slot.control_source.map(|s| {
+                    match s {
+                        ControlSource::Keyboard1 => &mapping.keyboard1.menu_back,
+                        ControlSource::Keyboard2 => &mapping.keyboard2.menu_back,
+                        ControlSource::Gamepad(_) => &mapping.gamepad.menu_back,
+                    }
+                    .to_string()
+                });
+                ui.vertical_centered(|ui| {
+                    let player_meta = asset_server.get(slot.selected_player);
+                    let hat_meta = slot
+                        .selected_hat
+                        .as_ref()
+                        .map(|handle| asset_server.get(*handle));
+
+                    ui.label(normal_font.rich(localization.get("pick-a-fish")));
+
+                    if !slot.confirmed {
+                        ui.label(normal_font.rich(localization.get_with(
+                            "press-button-to-lock-in",
+                            &fluent_args! {
+                                "button" => confirm_binding.as_ref().unwrap().as_str()
+                            },
+                        )));
+
+                        ui.label(normal_font.rich(localization.get_with(
+                            "press-button-to-remove",
+                            &fluent_args! {
+                                "button" => back_binding.as_ref().unwrap().as_str()
+                            },
+                        )));
                     } else {
-                        ui.add_space(normal_font.size);
+                        ui.label(normal_font.rich(localization.get("waiting")));
                     }
-                } else {
-                    ui.add_space(normal_font.size);
-                }
-                #[cfg(target_arch = "wasm32")]
-                ui.add_space(normal_font.size);
 
-                if slot.active {
                     ui.vertical_centered(|ui| {
-                        let player_meta = params
-                            .player_meta_assets
-                            .get(&player_handle.get_bevy_handle())
-                            .unwrap();
-                        let hat_meta = player_hat.as_ref().map(|handle| {
-                            params.hat_assets.get(&handle.get_bevy_handle()).unwrap()
-                        });
-
-                        ui.themed_label(normal_font, &params.localization.get("pick-a-fish"));
-
-                        if !slot.confirmed {
-                            if let Some(player_action_map) = &player_action_map {
-                                ui.themed_label(
-                                    normal_font,
-                                    &params.localization.get(&format!(
-                                        "press-button-to-lock-in?button={}",
-                                        player_action_map.get_text(PlayerAction::Jump)
-                                    )),
-                                );
-
-                                ui.themed_label(
-                                    normal_font,
-                                    &params.localization.get(&format!(
-                                        "press-button-to-remove?button={}",
-                                        player_action_map.get_text(PlayerAction::Grab)
-                                    )),
-                                );
-                            } else {
-                                ui.themed_label(normal_font, &params.localization.get("waiting"));
-                            }
-                        }
-
-                        ui.vertical_centered(|ui| {
-                            ui.set_height(heading_font.size * 1.5);
-
-                            if slot.confirmed && !slot.is_ai {
-                                ui.themed_label(
-                                    &heading_font.colored(params.game.ui_theme.colors.positive),
-                                    &params.localization.get("player-select-ready"),
-                                );
-
-                                if let Some(player_action_map) = &player_action_map {
-                                    ui.themed_label(
-                                        normal_font,
-                                        &params.localization.get(&format!(
-                                            "player-select-unready?button={}",
-                                            player_action_map.get_text(PlayerAction::Grab)
-                                        )),
-                                    );
-                                }
-                            }
-                            if slot.is_ai {
-                                ui.themed_label(
-                                    &heading_font.colored(params.game.ui_theme.colors.positive),
-                                    &params.localization.get("ai-player"),
-                                );
-                                if BorderedButton::themed(
-                                    &params.game.ui_theme.button_styles.normal,
-                                    &params.localization.get("remove-ai-player"),
-                                )
-                                .show(ui)
-                                .clicked()
-                                {
-                                    slot.confirmed = false;
-                                    slot.active = false;
-                                    slot.is_ai = false;
-                                }
-                            }
-                        });
-
-                        ui.with_layout(egui::Layout::bottom_up(egui::Align::Center), |ui| {
-                            let name_with_arrows = format!("<  {}  >", player_meta.name);
-                            ui.themed_label(
-                                normal_font,
-                                if slot.confirmed {
-                                    &player_meta.name
-                                } else {
-                                    &name_with_arrows
-                                },
-                            );
-                            let hat_label = if let Some(hat_meta) = hat_meta {
-                                format!("< {} >", hat_meta.name)
-                            } else {
-                                format!("< {} >", params.localization.get("no-hat"))
-                            };
-                            ui.themed_label(
-                                smaller_font,
-                                if slot.confirmed { &hat_label } else { "" },
-                            );
+                        ui.set_height(heading_font.size * 1.5);
 
-                            player_image(
-                                ui,
-                                player_meta,
-                                hat_meta,
-                                &params.atlas_meta_assets,
-                                &params.player_atlas_egui_textures,
-                            );
-                        });
-                    });
-                } else {
-                    ui.vertical_centered(|ui| {
-                        if let Some(player_action_map) = &player_action_map {
-                            ui.themed_label(
-                                normal_font,
-                                &params.localization.get(&format!(
-                                    "press-button-to-join?button={}",
-                                    player_action_map.get_text(PlayerAction::Jump)
-                                )),
+                        if slot.confirmed && !slot.is_ai() {
+                            ui.label(
+                                heading_font
+                                    .with_color(meta.theme.colors.positive)
+                                    .rich(localization.get("player-select-ready")),
                             );
+                            ui.add_space(normal_font.size / 2.0);
+                            ui.label(normal_font.rich(localization.get_with(
+                                "player-select-unready",
+                                &fluent_args! {
+                                    "button" => back_binding.as_ref().unwrap().as_str()
+                                },
+                            )));
                         }
-
-                        if player_id != 0 && !is_network {
-                            ui.add_space(params.game.ui_theme.font_styles.bigger.size);
+                        if slot.is_ai() {
+                            ui.label(
+                                heading_font
+                                    .with_color(meta.theme.colors.positive)
+                                    .rich(localization.get("ai-player")),
+                            );
+                            ui.add_space(normal_font.size / 2.0);
                             if BorderedButton::themed(
-                                &params.game.ui_theme.button_styles.normal,
-                                &params.localization.get("add-ai-player"),
+                                &meta.theme.buttons.normal,
+                                localization.get("remove-ai-player"),
                             )
                             .show(ui)
                             .clicked()
                             {
-                                slot.is_ai = true;
-                                slot.confirmed = true;
-                                slot.active = true;
-                                let mut rng = rand::thread_rng();
-                                *player_handle = params.core.players
-                                    [rng.gen_range(0..params.core.players.len())]
-                                .clone();
+                                slot.confirmed = false;
+                                slot.active = false;
+                                slot.control_source = None;
                             }
                         }
                     });
-                }
-            });
-    }
+
+                    ui.with_layout(egui::Layout::bottom_up(egui::Align::Center), |ui| {
+                        let name_with_arrows = format!("<  {}  >", player_meta.name);
+                        ui.label(normal_font.rich(if slot.confirmed {
+                            player_meta.name.to_string()
+                        } else {
+                            name_with_arrows
+                        }));
+                        let hat_label = if let Some(hat_meta) = &hat_meta {
+                            format!("< {} >", hat_meta.name)
+                        } else {
+                            format!("< {} >", localization.get("no-hat"))
+                        };
+                        ui.label(smaller_font.rich(if slot.confirmed { &hat_label } else { "" }));
+
+                        world.run_initialized_system(
+                            player_image,
+                            (ui, &player_meta, hat_meta.as_deref()),
+                        );
+                    });
+                });
+
+            // If this slot is empty
+            } else {
+                let bindings = available_input_sources
+                    .into_iter()
+                    .map(|x| match x {
+                        ControlSource::Keyboard1 => mapping.keyboard1.menu_confirm.to_string(),
+                        ControlSource::Keyboard2 => mapping.keyboard2.menu_confirm.to_string(),
+                        ControlSource::Gamepad(_) => mapping.gamepad.menu_confirm.to_string(),
+                    })
+                    .collect::<SmallVec<[_; 3]>>();
+
+                ui.vertical_centered(|ui| {
+                    ui.label(normal_font.rich(localization.get_with(
+                        "press-button-to-join",
+                        &fluent_args! {
+                            "button" => bindings.join(" / ")
+                        },
+                    )));
+
+                    if !is_network {
+                        ui.add_space(meta.theme.font_styles.bigger.size);
+                        if BorderedButton::themed(
+                            &meta.theme.buttons.normal,
+                            localization.get("add-ai-player"),
+                        )
+                        .show(ui)
+                        .clicked()
+                        {
+                            slot.confirmed = true;
+                            slot.active = true;
+                            let rand_idx =
+                                THREAD_RNG.with(|rng| rng.usize(0..meta.core.players.len()));
+                            slot.selected_player = meta.core.players[rand_idx];
+                        }
+                    }
+                });
+            }
+        });
 }
 
 fn player_image(
-    ui: &mut egui::Ui,
-    player_meta: &PlayerMeta,
-    hat_meta: Option<&HatMeta>,
-    atlas_assets: &Assets<TextureAtlas>,
-    egui_textures: &AtlasEguiTextures,
+    mut params: In<(&mut egui::Ui, &PlayerMeta, Option<&HatMeta>)>,
+    egui_textures: Res<EguiTextures>,
+    asset_server: Res<AssetServer>,
 ) {
+    let (ui, player_meta, hat_meta) = &mut *params;
     let time = ui.ctx().input(|i| i.time as f32);
     let width = ui.available_width();
     let available_height = ui.available_width();
@@ -687,39 +632,36 @@ fn player_image(
     // Render the body sprite
     {
         let atlas_handle = &player_meta.layers.body.atlas;
-        let atlas = atlas_assets
-            .get(&atlas_handle.get_bevy_handle_untyped().typed())
-            .unwrap();
-        let atlas_path = &atlas_handle.path;
+        let atlas = asset_server.get(*atlas_handle);
         let anim_clip = player_meta
             .layers
             .body
             .animations
             .frames
-            .get(&key!("idle"))
+            .get(&ustr("idle"))
             .unwrap();
         let fps = anim_clip.fps;
         let frame_in_time_idx = (time * fps).round() as usize;
         let frame_in_clip_idx = frame_in_time_idx % anim_clip.frames.len();
         let frame_in_sheet_idx = anim_clip.frames[frame_in_clip_idx];
-        let sprite_rect = &atlas.textures[frame_in_sheet_idx];
+        let sprite_pos = atlas.tile_pos(frame_in_sheet_idx);
         body_offset =
-            player_meta.layers.body.animations.offsets[&key!("idle")][frame_in_clip_idx].body;
+            player_meta.layers.body.animations.offsets[&ustr("idle")][frame_in_clip_idx].body;
 
-        let sprite_aspect = sprite_rect.height() / sprite_rect.width();
+        let sprite_aspect = atlas.tile_size.y / atlas.tile_size.x;
         let height = sprite_aspect * width;
         y_offset = -(available_height - height) / 2.0;
         let (rect, _) = ui.allocate_exact_size(egui::vec2(width, height), egui::Sense::hover());
 
-        let uv_min = sprite_rect.min / atlas.size;
-        let uv_max = sprite_rect.max / atlas.size;
+        let uv_min = sprite_pos / atlas.size();
+        let uv_max = (sprite_pos + atlas.tile_size) / atlas.size();
         let uv = egui::Rect {
             min: egui::pos2(uv_min.x, uv_min.y),
             max: egui::pos2(uv_max.x, uv_max.y),
         };
 
         let mut mesh = egui::Mesh {
-            texture_id: *egui_textures.0.get(atlas_path).unwrap(),
+            texture_id: *egui_textures.0.get(&atlas.image).unwrap(),
             ..default()
         };
 
@@ -728,36 +670,33 @@ fn player_image(
         ui.painter().add(mesh);
 
         body_rect = rect;
-        body_scale = width / sprite_rect.size().x;
+        body_scale = width / atlas.tile_size.x;
     }
 
     // Render the fin & face animation
     for layer in [&player_meta.layers.fin, &player_meta.layers.face] {
         let atlas_handle = &layer.atlas;
-        let atlas = atlas_assets
-            .get(&atlas_handle.get_bevy_handle_untyped().typed())
-            .unwrap();
-        let atlas_path = &atlas_handle.path;
-        let anim_clip = layer.animations.get(&key!("idle")).unwrap();
+        let atlas = asset_server.get(*atlas_handle);
+        let anim_clip = layer.animations.get(&ustr("idle")).unwrap();
         let fps = anim_clip.fps;
         let frame_in_time_idx = (time * fps).round() as usize;
         let frame_in_clip_idx = frame_in_time_idx % anim_clip.frames.len();
         let frame_in_sheet_idx = anim_clip.frames[frame_in_clip_idx];
-        let sprite_rect = &atlas.textures[frame_in_sheet_idx];
+        let sprite_pos = atlas.tile_pos(frame_in_sheet_idx);
 
-        let uv_min = sprite_rect.min / atlas.size;
-        let uv_max = sprite_rect.max / atlas.size;
+        let uv_min = sprite_pos / atlas.size();
+        let uv_max = (sprite_pos + atlas.tile_size) / atlas.size();
         let uv = egui::Rect {
             min: egui::pos2(uv_min.x, uv_min.y),
             max: egui::pos2(uv_max.x, uv_max.y),
         };
 
         let mut mesh = egui::Mesh {
-            texture_id: *egui_textures.0.get(atlas_path).unwrap(),
+            texture_id: *egui_textures.0.get(&atlas.image).unwrap(),
             ..default()
         };
 
-        let sprite_size = sprite_rect.size() * body_scale;
+        let sprite_size = atlas.tile_size * body_scale;
         let offset = (layer.offset + body_offset) * body_scale;
         let rect = egui::Rect::from_center_size(
             body_rect.center() + egui::vec2(offset.x, -offset.y + y_offset),
@@ -771,25 +710,22 @@ fn player_image(
     // Render the player hat
     if let Some(hat_meta) = hat_meta {
         let atlas_handle = &hat_meta.atlas;
-        let atlas = atlas_assets
-            .get(&atlas_handle.get_bevy_handle_untyped().typed())
-            .unwrap();
-        let atlas_path = &atlas_handle.path;
-        let sprite_rect = &atlas.textures[0];
+        let atlas = asset_server.get(*atlas_handle);
+        let sprite_pos = Vec2::ZERO;
 
-        let uv_min = sprite_rect.min / atlas.size;
-        let uv_max = sprite_rect.max / atlas.size;
+        let uv_min = sprite_pos / atlas.size();
+        let uv_max = (sprite_pos + atlas.tile_size) / atlas.size();
         let uv = egui::Rect {
             min: egui::pos2(uv_min.x, uv_min.y),
             max: egui::pos2(uv_max.x, uv_max.y),
         };
 
         let mut mesh = egui::Mesh {
-            texture_id: *egui_textures.0.get(atlas_path).unwrap(),
+            texture_id: *egui_textures.0.get(&atlas.image).unwrap(),
             ..default()
         };
 
-        let sprite_size = sprite_rect.size() * body_scale;
+        let sprite_size = atlas.tile_size * body_scale;
         let offset = (hat_meta.offset + body_offset) * body_scale;
         let rect = egui::Rect::from_center_size(
             body_rect.center() + egui::vec2(offset.x, -offset.y + y_offset),
diff --git a/src/ui/main_menu/settings.rs b/src/ui/main_menu/settings.rs
index a527113aae..a186ec0544 100644
--- a/src/ui/main_menu/settings.rs
+++ b/src/ui/main_menu/settings.rs
@@ -1,224 +1,183 @@
-use bevy_inspector_egui::egui::style::Margin;
-use leafwing_input_manager::{axislike::SingleAxis, user_input::InputKind, Actionlike};
+use crate::{
+    prelude::*,
+    settings::{PlayerControlMapping, Settings},
+};
 
-use super::*;
+use super::MenuPage;
 
 mod controls;
 mod networking;
-mod sound;
+
+#[derive(Clone, Default)]
+struct SettingsState {
+    tab: SettingsTab,
+    modified_settings: Settings,
+    settings_loaded: bool,
+    currently_binding_input_idx: Option<usize>,
+}
 
 /// Which settings tab we are on
-#[derive(Resource, Clone, Copy, PartialEq, Eq)]
-pub enum SettingsTab {
+#[derive(Clone, Copy, PartialEq, Eq, Default)]
+enum SettingsTab {
+    #[default]
     Controls,
-    #[allow(unused)] // TODO: Just for now until we get sound settings setup
-    Sound,
     Networking,
 }
 
 impl SettingsTab {
     const TABS: &'static [(Self, &'static str)] = &[
         (Self::Controls, "controls"),
-        (Self::Networking, "networking"), // For now, hide the sound tab because we don't have it working yet.
-                                          // (Self::Sound, "sound")
+        (Self::Networking, "networking"),
     ];
 }
 
-impl Default for SettingsTab {
-    fn default() -> Self {
-        Self::Controls
+pub fn widget(
+    mut ui: In<&mut egui::Ui>,
+    meta: Root<GameMeta>,
+    localization: Localization<GameMeta>,
+    input: Res<GlobalPlayerControls>,
+    mut mapping: ResMut<PlayerControlMapping>,
+    mut storage: ResMut<Storage>,
+    world: &World,
+) {
+    let ui = &mut *ui;
+    let mut state = ui.ctx().get_state::<SettingsState>();
+    let screen_rect = ui.max_rect();
+
+    if !state.settings_loaded {
+        state.modified_settings = storage.get::<Settings>().unwrap().clone();
+        state.settings_loaded = true;
     }
-}
 
-#[derive(Resource, Default, Deref, DerefMut)]
-pub struct ModifiedSettings(pub Option<Settings>);
-
-#[derive(SystemParam)]
-pub struct SettingsMenu<'w, 's> {
-    game: Res<'w, GameMeta>,
-    current_tab: ResMut<'w, SettingsTab>,
-    menu_page: ResMut<'w, MenuPage>,
-    modified_settings: ResMut<'w, ModifiedSettings>,
-    currently_binding_input_idx: Local<'s, Option<usize>>,
-    localization: Res<'w, Localization>,
-    adjacencies: ResMut<'w, WidgetAdjacencies>,
-    storage: ResMut<'w, Storage>,
-    control_inputs: controls::ControlInputBindingEvents<'w, 's>,
-    menu_input: Query<'w, 's, &'static mut ActionState<MenuAction>>,
-    #[system_param(ignore)]
-    _phantom: PhantomData<(&'w (), &'s ())>,
-}
+    let mut should_reset = false;
+
+    // Calculate a margin
+    let outer_margin = screen_rect.size() * 0.10;
+    let outer_margin = egui::Margin {
+        left: outer_margin.x,
+        right: outer_margin.x,
+        // Make top and bottom margins smaller
+        top: outer_margin.y / 1.5,
+        bottom: outer_margin.y / 1.5,
+    };
+
+    let heading_font = meta
+        .theme
+        .font_styles
+        .heading
+        .with_color(meta.theme.panel.font_color);
+
+    BorderedFrame::new(&meta.theme.panel.border)
+        .margin(outer_margin)
+        .padding(meta.theme.panel.padding)
+        .show(ui, |ui| {
+            // Disable all the buttons if we are currently binding an input
+            ui.set_enabled(state.currently_binding_input_idx.is_none());
+
+            ui.vertical_centered(|ui| {
+                // Settings Heading
+                ui.label(heading_font.rich(localization.get("settings")));
+
+                // Add tab list at the top of the panel
+                ui.horizontal(|ui| {
+                    for (i, (tab, name)) in SettingsTab::TABS.iter().enumerate() {
+                        let name = localization.get(name);
+                        let mut name = egui::RichText::new(name);
+
+                        // Underline the current tab
+                        if *tab == state.tab {
+                            name = name.underline();
+                        }
 
-impl<'w, 's> WidgetSystem for SettingsMenu<'w, 's> {
-    type Args = ();
-
-    fn system(
-        world: &mut World,
-        state: &mut SystemState<Self>,
-        ui: &mut egui::Ui,
-        _id: WidgetId,
-        _args: Self::Args,
-    ) {
-        let mut params: SettingsMenu = state.get_mut(world);
-
-        let screen_rect = ui.max_rect();
-
-        // Calculate a margin
-        let outer_margin = screen_rect.size() * 0.10;
-        let outer_margin = Margin {
-            left: outer_margin.x,
-            right: outer_margin.x,
-            // Make top and bottom margins smaller
-            top: outer_margin.y / 1.5,
-            bottom: outer_margin.y / 1.5,
-        };
-
-        BorderedFrame::new(&params.game.ui_theme.panel.border)
-            .margin(outer_margin)
-            .padding(params.game.ui_theme.panel.padding.into())
-            .show(ui, |ui| {
-                // Disable all the buttons if we are currently binding an input
-                ui.set_enabled(params.currently_binding_input_idx.is_none());
-
-                ui.vertical_centered(|ui| {
-                    // Settings Heading
-                    ui.themed_label(
-                        &params.game.ui_theme.font_styles.heading,
-                        &params.localization.get("settings"),
-                    );
-
-                    // Add tab list at the top of the panel
-                    let mut tabs = Vec::new();
+                        let mut button =
+                            BorderedButton::themed(&meta.theme.buttons.normal, name).show(ui);
+
+                        // Focus the first tab by default
+                        if i == 0 {
+                            button = button.focus_by_default(ui);
+                        }
+
+                        // Change tab when clicked
+                        if button.clicked() {
+                            state.tab = *tab;
+                        }
+                    }
+                });
+
+                // Add buttons to the bottom
+                ui.with_layout(egui::Layout::bottom_up(egui::Align::Center), |ui| {
                     ui.horizontal(|ui| {
-                        for (i, (tab, name)) in SettingsTab::TABS.iter().enumerate() {
-                            let name = &params.localization.get(*name);
-                            let mut name = egui::RichText::new(name);
-
-                            // Underline the current tab
-                            if tab == &*params.current_tab {
-                                name = name.underline();
-                            }
-
-                            let mut button = BorderedButton::themed(
-                                &params.game.ui_theme.button_styles.normal,
-                                name,
-                            )
-                            .show(ui);
-
-                            // Focus the first tab by default
-                            if i == 0 {
-                                button = button.focus_by_default(ui);
-                            }
-
-                            // Change tab when clicked
-                            if button.clicked() {
-                                *params.current_tab = *tab;
-                            }
-
-                            tabs.push(button);
+                        // Calculate button size and spacing
+                        let width = ui.available_width();
+                        let button_width = width / 4.0;
+                        let button_min_size = vec2(button_width, 0.0);
+                        let button_spacing = (width - 3.0 * button_width) / 4.0;
+
+                        ui.add_space(button_spacing);
+
+                        // Cancel button
+                        if (BorderedButton::themed(
+                            &meta.theme.buttons.normal,
+                            localization.get("cancel"),
+                        )
+                        .min_size(button_min_size)
+                        .show(ui)
+                        .clicked()
+                            || input.values().any(|x| x.menu_back_just_pressed))
+                            && state.currently_binding_input_idx.is_none()
+                        {
+                            ui.ctx().set_state(MenuPage::Home);
+                            // Reset the modified settings to their stored settings.
+                            state.modified_settings = storage.get::<Settings>().unwrap().clone();
+                        }
+
+                        ui.add_space(button_spacing);
+
+                        // Reset button
+                        if BorderedButton::themed(
+                            &meta.theme.buttons.normal,
+                            localization.get("reset"),
+                        )
+                        .min_size(button_min_size)
+                        .show(ui)
+                        .clicked()
+                        {
+                            should_reset = true;
+                        }
+
+                        ui.add_space(button_spacing);
+
+                        // Save button
+                        if BorderedButton::themed(
+                            &meta.theme.buttons.normal,
+                            localization.get("save"),
+                        )
+                        .min_size(button_min_size)
+                        .show(ui)
+                        .clicked()
+                        {
+                            // Save the settings to disk.
+                            *mapping = state.modified_settings.player_controls.clone();
+                            storage.insert(state.modified_settings.clone());
+                            storage.save();
+                            ui.ctx().set_state(MenuPage::Home);
                         }
                     });
 
-                    // Add buttons to the bottom
-                    ui.with_layout(egui::Layout::bottom_up(egui::Align::Center), |ui| {
-                        // Collect button responses so we can add them to adjacency map later
-                        let bottom_buttons = ui
-                            .horizontal(|ui| {
-                                // Calculate button size and spacing
-                                let width = ui.available_width();
-                                let button_width = width / 4.0;
-                                let button_min_size = egui::vec2(button_width, 0.0);
-                                let button_spacing = (width - 3.0 * button_width) / 4.0;
-
-                                ui.add_space(button_spacing);
-
-                                // Cancel button
-                                let cancel_button = BorderedButton::themed(
-                                    &params.game.ui_theme.button_styles.normal,
-                                    &params.localization.get("cancel"),
-                                )
-                                .min_size(button_min_size)
-                                .show(ui);
-
-                                // Go to menu when cancel is clicked
-                                if cancel_button.clicked()
-                                    || params.menu_input.single().just_pressed(MenuAction::Back)
-                                {
-                                    *params.menu_page = MenuPage::Home;
-                                    ui.ctx().clear_focus();
-                                }
-
-                                ui.add_space(button_spacing);
-
-                                // Reset button
-                                let reset_button = BorderedButton::themed(
-                                    &params.game.ui_theme.button_styles.normal,
-                                    &params.localization.get("reset"),
-                                )
-                                .min_size(button_min_size)
-                                .show(ui);
-
-                                ui.add_space(button_spacing);
-
-                                // Save button
-                                let save_button = BorderedButton::themed(
-                                    &params.game.ui_theme.button_styles.normal,
-                                    &params.localization.get("save"),
-                                )
-                                .min_size(button_min_size)
-                                .show(ui);
-
-                                // Save new settings if settings button clicked
-                                if save_button.clicked() {
-                                    // Update in-memory settings
-                                    params.storage.set(
-                                        Settings::STORAGE_KEY,
-                                        params.modified_settings.0.as_ref().unwrap(),
-                                    );
-                                    // Persist to storage
-                                    params.storage.save();
-
-                                    // Go to main menu
-                                    *params.menu_page = MenuPage::Home;
-                                    ui.ctx().clear_focus();
-                                }
-
-                                [cancel_button, reset_button, save_button]
-                            })
-                            .inner;
-
-                        // Set the last bottom button's adjacency to be to the "left" of the first tab. This way
-                        // you can wrap around from the bottom right button to the top left.
-                        params
-                            .adjacencies
-                            .widget(&bottom_buttons[bottom_buttons.len() - 1])
-                            .to_left_of(&tabs[0]);
-
-                        ui.vertical(|ui| {
-                            // Render selected tab
-                            match *params.current_tab {
-                                SettingsTab::Controls => {
-                                    controls::controls_settings_ui(
-                                        &mut params,
-                                        ui,
-                                        // Reset button clicked
-                                        bottom_buttons[1].clicked(),
-                                        &tabs,
-                                        &bottom_buttons,
-                                    )
-                                }
-                                SettingsTab::Networking => networking::networking_settings_ui(
-                                    &mut params,
-                                    ui,
-                                    bottom_buttons[1].clicked(),
-                                    &tabs,
-                                    &bottom_buttons,
-                                ),
-                                SettingsTab::Sound => sound::sound_settings_ui(ui, &params.game),
-                            }
-                        });
+                    ui.vertical(|ui| match state.tab {
+                        SettingsTab::Controls => world.run_initialized_system(
+                            controls::widget,
+                            (ui, &mut state, should_reset),
+                        ),
+                        SettingsTab::Networking => world.run_initialized_system(
+                            networking::widget,
+                            (ui, &mut state, should_reset),
+                        ),
                     });
                 });
             });
-    }
+        });
+
+    // Update the state with our modified one
+    ui.ctx().set_state(state);
 }
diff --git a/src/ui/main_menu/settings/controls.rs b/src/ui/main_menu/settings/controls.rs
index 365baccf66..9ea6cb3c97 100644
--- a/src/ui/main_menu/settings/controls.rs
+++ b/src/ui/main_menu/settings/controls.rs
@@ -1,122 +1,148 @@
-use bevy::input::gamepad::{GamepadAxisChangedEvent, GamepadEvent};
-use egui_extras::Column;
+use egui_extras::{Column, TableBuilder};
+
+use crate::settings::InputKind;
 
 use super::*;
 
-// Render the control input grid
-pub fn controls_settings_ui(
-    params: &mut SettingsMenu,
-    ui: &mut egui::Ui,
-    should_reset: bool,
-    settings_tabs: &[egui::Response],
-    bottom_buttons: &[egui::Response],
+pub(super) fn widget(
+    mut args: In<(&mut egui::Ui, &mut SettingsState, bool)>,
+    meta: Root<GameMeta>,
+    localization: Localization<GameMeta>,
+    keyboard: Res<KeyboardInputs>,
+    gamepad: Res<GamepadInputs>,
 ) {
-    let ui_theme = &params.game.ui_theme;
+    let (ui, state, should_reset) = &mut *args;
 
-    // Reset the settings when reset button is clicked
-    if should_reset {
-        params.modified_settings.0.as_mut().unwrap().player_controls =
-            params.game.default_settings.player_controls.clone();
+    if *should_reset {
+        state.modified_settings.player_controls = meta.default_settings.player_controls.clone();
     }
 
-    // Get the font meta for the table headings and labels
-    let bigger_font = &ui_theme
+    let bigger_font = meta
+        .theme
         .font_styles
         .bigger
-        .colored(ui_theme.panel.font_color);
-    let label_font = &ui_theme
+        .with_color(meta.theme.panel.font_color);
+    let normal_font = meta
+        .theme
         .font_styles
         .normal
-        .colored(ui_theme.panel.font_color);
+        .with_color(meta.theme.panel.font_color);
 
     ui.add_space(bigger_font.size * 0.1);
 
     // Calculate the row height so that it can fit the input buttons
-    let small_button_style = &ui_theme.button_styles.small;
+    let small_button_style = &meta.theme.buttons.small;
     let row_height = small_button_style.font.size
         + small_button_style.padding.top
         + small_button_style.padding.bottom;
 
-    // Mutably borrow the player controlls settings
-    let controls = &mut params.modified_settings.0.as_mut().unwrap().player_controls;
+    let mapping = &mut state.modified_settings.player_controls;
 
-    // Build the table rows of control bindings as an array of mutable InputKind's
     let mut input_rows = [
         (
-            &params.localization.get("move-up"),
+            localization.get("move-up"),
+            [
+                &mut mapping.keyboard1.movement.up,
+                &mut mapping.keyboard2.movement.up,
+                &mut mapping.gamepad.movement.up,
+            ],
+        ),
+        (
+            localization.get("move-down"),
             [
-                &mut controls.keyboard1.movement.up,
-                &mut controls.keyboard2.movement.up,
-                &mut controls.gamepad.movement.up,
+                &mut mapping.keyboard1.movement.down,
+                &mut mapping.keyboard2.movement.down,
+                &mut mapping.gamepad.movement.down,
             ],
         ),
         (
-            &params.localization.get("move-down"),
+            localization.get("move-left"),
             [
-                &mut controls.keyboard1.movement.down,
-                &mut controls.keyboard2.movement.down,
-                &mut controls.gamepad.movement.down,
+                &mut mapping.keyboard1.movement.left,
+                &mut mapping.keyboard2.movement.left,
+                &mut mapping.gamepad.movement.left,
             ],
         ),
         (
-            &params.localization.get("move-left"),
+            localization.get("move-right"),
             [
-                &mut controls.keyboard1.movement.left,
-                &mut controls.keyboard2.movement.left,
-                &mut controls.gamepad.movement.left,
+                &mut mapping.keyboard1.movement.right,
+                &mut mapping.keyboard2.movement.right,
+                &mut mapping.gamepad.movement.right,
             ],
         ),
         (
-            &params.localization.get("move-right"),
+            localization.get("jump"),
             [
-                &mut controls.keyboard1.movement.right,
-                &mut controls.keyboard2.movement.right,
-                &mut controls.gamepad.movement.right,
+                &mut mapping.keyboard1.jump,
+                &mut mapping.keyboard2.jump,
+                &mut mapping.gamepad.jump,
             ],
         ),
         (
-            &params.localization.get("jump"),
+            localization.get("grab-drop"),
             [
-                &mut controls.keyboard1.jump,
-                &mut controls.keyboard2.jump,
-                &mut controls.gamepad.jump,
+                &mut mapping.keyboard1.grab,
+                &mut mapping.keyboard2.grab,
+                &mut mapping.gamepad.grab,
             ],
         ),
         (
-            &params.localization.get("grab-drop"),
+            localization.get("shoot"),
             [
-                &mut controls.keyboard1.grab,
-                &mut controls.keyboard2.grab,
-                &mut controls.gamepad.grab,
+                &mut mapping.keyboard1.shoot,
+                &mut mapping.keyboard2.shoot,
+                &mut mapping.gamepad.shoot,
             ],
         ),
         (
-            &params.localization.get("shoot"),
+            localization.get("slide"),
             [
-                &mut controls.keyboard1.shoot,
-                &mut controls.keyboard2.shoot,
-                &mut controls.gamepad.shoot,
+                &mut mapping.keyboard1.slide,
+                &mut mapping.keyboard2.slide,
+                &mut mapping.gamepad.slide,
             ],
         ),
         (
-            &params.localization.get("slide"),
+            localization.get("pause"),
             [
-                &mut controls.keyboard1.slide,
-                &mut controls.keyboard2.slide,
-                &mut controls.gamepad.slide,
+                &mut mapping.keyboard1.pause,
+                &mut mapping.keyboard2.pause,
+                &mut mapping.gamepad.pause,
+            ],
+        ),
+        (
+            localization.get("menu-confirm"),
+            [
+                &mut mapping.keyboard1.menu_confirm,
+                &mut mapping.keyboard2.menu_confirm,
+                &mut mapping.gamepad.menu_confirm,
+            ],
+        ),
+        (
+            localization.get("menu-back"),
+            [
+                &mut mapping.keyboard1.menu_back,
+                &mut mapping.keyboard2.menu_back,
+                &mut mapping.gamepad.menu_back,
+            ],
+        ),
+        (
+            localization.get("menu-start"),
+            [
+                &mut mapping.keyboard1.menu_start,
+                &mut mapping.keyboard2.menu_start,
+                &mut mapping.gamepad.menu_start,
             ],
         ),
     ];
 
-    // Collect input button responses for building adjacency graph
-    let mut input_buttons = Vec::new();
-
     // Create input table
     let width = ui.available_width();
-    let label_size = label_font.size * 7.0;
+    let label_size = normal_font.size * 7.0;
     let remaining_width = width - label_size;
-    let cell_width = remaining_width / 3.0;
-    egui_extras::TableBuilder::new(ui)
+    let cell_width = remaining_width / 3.1;
+    TableBuilder::new(ui)
         .cell_layout(egui::Layout::centered_and_justified(
             egui::Direction::LeftToRight,
         ))
@@ -126,16 +152,16 @@ pub fn controls_settings_ui(
         .column(Column::exact(cell_width))
         .header(bigger_font.size * 1.5, |mut row| {
             row.col(|ui| {
-                ui.themed_label(bigger_font, &params.localization.get("action"));
+                ui.label(bigger_font.rich(localization.get("action")));
             });
             row.col(|ui| {
-                ui.themed_label(bigger_font, &params.localization.get("keyboard-1"));
+                ui.label(bigger_font.rich(localization.get("keyboard-1")));
             });
             row.col(|ui| {
-                ui.themed_label(bigger_font, &params.localization.get("keyboard-2"));
+                ui.label(bigger_font.rich(localization.get("keyboard-2")));
             });
             row.col(|ui| {
-                ui.themed_label(bigger_font, &params.localization.get("gamepad"));
+                ui.label(bigger_font.rich(localization.get("gamepad")));
             });
         })
         .body(|mut body| {
@@ -147,7 +173,7 @@ pub fn controls_settings_ui(
                 body.row(row_height, |mut row| {
                     // Add row label
                     row.col(|ui| {
-                        ui.themed_label(label_font, title);
+                        ui.label(normal_font.rich(title.to_string()));
                     });
 
                     // Add buttons for each kind of input
@@ -156,24 +182,23 @@ pub fn controls_settings_ui(
                         let binding_kind = if button_idx == 2 {
                             BindingKind::Gamepad
                         } else {
-                            BindingKind::KeyboardMouse
+                            BindingKind::Keyboard
                         };
 
                         // Render the button
                         row.col(|ui| {
                             let button = BorderedButton::themed(
-                                &ui_theme.button_styles.small,
-                                format_input(input),
+                                &meta.theme.buttons.small,
+                                input.to_string(),
                             )
                             .show(ui);
 
                             // Start an input binding if the button is clicked
                             if button.clicked() {
-                                *params.currently_binding_input_idx = Some(input_idx);
+                                state.currently_binding_input_idx = Some(input_idx);
                             }
-
                             // If we are binding an input for this button
-                            if *params.currently_binding_input_idx == Some(input_idx) {
+                            else if state.currently_binding_input_idx == Some(input_idx) {
                                 // Render the binding window
                                 egui::Window::new("input_binding_overlay")
                                     .auto_sized()
@@ -182,39 +207,66 @@ pub fn controls_settings_ui(
                                     .frame(egui::Frame::none())
                                     .title_bar(false)
                                     .show(ui.ctx(), |ui| {
-                                        let font = params
-                                            .game
-                                            .ui_theme
-                                            .font_styles
-                                            .normal
-                                            .colored(params.game.ui_theme.panel.font_color);
-
-                                        let border = &params.game.ui_theme.panel.border;
-                                        let m = &border.border_size;
-                                        let s = border.scale;
-                                        BorderedFrame::new(border)
+                                        let m = meta.theme.panel.border.border_size;
+                                        let s = meta.theme.panel.border.scale;
+                                        BorderedFrame::new(&meta.theme.panel.border)
                                             // Just enough padding to fit the frame's border image
-                                            .padding(Margin {
+                                            .padding(egui::Margin {
                                                 left: m.left * s,
                                                 right: m.right * s,
                                                 top: m.top * s,
                                                 bottom: m.bottom * s,
                                             })
                                             .show(ui, |ui| {
-                                                ui.themed_label(
-                                                    &font,
-                                                    &params.localization.get("bind-input"),
-                                                );
+                                                ui.label(normal_font.rich(localization.get_with(
+                                                    "bind-input",
+                                                    &fluent_args! {
+                                                        "binding" => title.as_ref(),
+                                                        "binding_kind" => match binding_kind {
+                                                            BindingKind::Keyboard => "keyboard",
+                                                            BindingKind::Gamepad => "gamepad",
+                                                        }
+                                                    },
+                                                )));
+
+                                                ui.add_space(normal_font.size / 2.0);
+
+                                                ui.horizontal(|ui| {
+                                                    // Cancel button
+                                                    if BorderedButton::themed(
+                                                        &meta.theme.buttons.small,
+                                                        localization.get("cancel"),
+                                                    )
+                                                    .show(ui)
+                                                    .clicked()
+                                                    {
+                                                        button.request_focus();
+                                                        state.currently_binding_input_idx = None;
+                                                    }
+
+                                                    // Clear button
+                                                    if BorderedButton::themed(
+                                                        &meta.theme.buttons.small,
+                                                        localization.get("clear-binding"),
+                                                    )
+                                                    .show(ui)
+                                                    .clicked()
+                                                    {
+                                                        **input = InputKind::None;
+                                                        button.request_focus();
+                                                        state.currently_binding_input_idx = None;
+                                                    }
+                                                });
 
                                                 // See if there has been any inputs of the kind we
                                                 // are binding.
-                                                let get_input =
-                                                    params.control_inputs.get_event(binding_kind);
+                                                let bound_input =
+                                                    get_input(binding_kind, &keyboard, &gamepad);
 
                                                 // If there has been an input
-                                                if let Ok(Some(input_kind)) = get_input {
+                                                if let Some(input_kind) = bound_input {
                                                     // Stop listening for inputs
-                                                    *params.currently_binding_input_idx = None;
+                                                    state.currently_binding_input_idx = None;
 
                                                     // Reset the focus on the input button
                                                     button.request_focus();
@@ -222,28 +274,10 @@ pub fn controls_settings_ui(
                                                     // Set the input for this button to the pressed
                                                     // input
                                                     **input = input_kind;
-
-                                                // If the user cancelled the input binding
-                                                } else if get_input.is_err() {
-                                                    // Set the focus back on the button
-                                                    button.request_focus();
-                                                    // And stop listening for inputs
-                                                    *params.currently_binding_input_idx = None;
-                                                }
-
-                                                // Make sure we don't double-trigger any menu
-                                                // actions while on this menu by consuming all menu
-                                                // actions.
-                                                let mut menu_input = params.menu_input.single_mut();
-                                                for action in MenuAction::variants() {
-                                                    menu_input.consume(action);
                                                 }
                                             });
                                     });
                             }
-
-                            // Add input button to the list
-                            input_buttons.push(button);
                         });
 
                         // Increment the input button index
@@ -252,170 +286,47 @@ pub fn controls_settings_ui(
                 });
             }
         });
-
-    // Set adjacency for all of the gamepad input buttons
-    for row_idx in 0..input_rows.len() {
-        if row_idx == 0 {
-            // Reverse button order here so that the first input button gets priority when
-            // navigating down from the tabs.
-            for i in (0..3).rev() {
-                let button = &input_buttons[row_idx * 3 + i];
-
-                // The top row of buttons is below the settings tabs
-                for tab in settings_tabs {
-                    params.adjacencies.widget(tab).above(button);
-                }
-
-                // The last tab is considered to the left of the first button
-                if i == 0 {
-                    params
-                        .adjacencies
-                        .widget(button)
-                        .to_right_of(&settings_tabs[settings_tabs.len() - 1]);
-                }
-            }
-
-        // If this is the last row, the input buttons are above the bottom buttons
-        } else if row_idx == input_rows.len() - 1 {
-            for i in 0..3 {
-                let button_above = &input_buttons[(row_idx - 1) * 3 + i];
-                let button = &input_buttons[row_idx * 3 + i];
-
-                params
-                    .adjacencies
-                    .widget(button)
-                    .above(&bottom_buttons[i])
-                    .below(button_above);
-
-                // The first bottom button is to the right of the last input button
-                if i == 2 {
-                    params
-                        .adjacencies
-                        .widget(button)
-                        .to_left_of(&bottom_buttons[0]);
-                }
-            }
-
-        // If this is a middle row, set the input buttons to be below the ones in the row above
-        } else {
-            for i in 0..3 {
-                let button_above = &input_buttons[(row_idx - 1) * 3 + i];
-                let button = &input_buttons[row_idx * 3 + i];
-
-                params.adjacencies.widget(button).below(button_above);
-            }
-        }
-    }
-}
-
-/// Format an InputKind as a user-facing string
-fn format_input(input: &InputKind) -> String {
-    match input {
-        InputKind::SingleAxis(axis) => {
-            // If we set the positive low to 1.0, then that means we don't trigger on positive
-            // movement, and it must be a negative movement binding.
-            let direction = if axis.positive_low == 1.0 { "-" } else { "+" };
-
-            let stick = match axis.axis_type {
-                leafwing_input_manager::axislike::AxisType::Gamepad(axis) => {
-                    format!("{axis:?}")
-                }
-                other => format!("{other:?}"),
-            };
-
-            format!("{stick} {direction}")
-        }
-        other => other.to_string(),
-    }
-}
-
-/// Helper system param to get input events that we are interested in for input binding.
-#[derive(SystemParam)]
-pub struct ControlInputBindingEvents<'w, 's> {
-    keys: Res<'w, Input<KeyCode>>,
-    gamepad_buttons: Res<'w, Input<GamepadButton>>,
-    gamepad_events: EventReader<'w, 's, bevy::input::gamepad::GamepadEvent>,
-    mouse: Res<'w, Input<MouseButton>>,
 }
 
 /// The kind of input binding to listen for.
 enum BindingKind {
-    KeyboardMouse,
+    Keyboard,
     Gamepad,
 }
 
-impl<'w, 's> ControlInputBindingEvents<'w, 's> {
-    // Get the next event, if any
-    fn get_event(&mut self, binding_kind: BindingKind) -> Result<Option<InputKind>, ()> {
-        if self.keys.just_pressed(KeyCode::Escape) {
-            return Err(());
-        }
-
-        Ok(match binding_kind {
-            // If we are looking for keyboard or mouse inputs
-            BindingKind::KeyboardMouse => {
-                // Check for mouse input first
-                if let Some(&mouse_button) = self.mouse.get_just_pressed().next() {
-                    return Ok(Some(mouse_button.into()));
-                }
-                // Just return the first pressed button we find
-                if let Some(&key_code) = self.keys.get_just_pressed().next() {
-                    Some(key_code.into())
-                } else {
-                    None
-                }
-            }
-            // If we are looking for gamepad events
-            BindingKind::Gamepad => {
-                // Return the first pressed button we find, if any
-                if let Some(&button) = self.gamepad_buttons.get_just_pressed().next() {
-                    Some(button.button_type.into())
-
-                // If we can't find a button pressed
-                } else {
-                    // Look for axes tilted more than 0.5 in either direction.
-                    for gamepad_event in self.gamepad_events.iter() {
-                        if let GamepadEvent::Axis(GamepadAxisChangedEvent {
-                            axis_type,
-                            value,
-                            ..
-                        }) = gamepad_event
-                        {
-                            // Create an axis positive movement binding
-                            if value > &0.5 {
-                                return Ok(Some(
-                                    SingleAxis {
-                                        axis_type:
-                                            leafwing_input_manager::axislike::AxisType::Gamepad(
-                                                *axis_type,
-                                            ),
-                                        positive_low: 0.1,
-                                        negative_low: -1.0,
-                                        value: None,
-                                    }
-                                    .into(),
-                                ));
-                            // Create an axis negative movement binding
-                            } else if value < &-0.5 {
-                                return Ok(Some(
-                                    SingleAxis {
-                                        axis_type:
-                                            leafwing_input_manager::axislike::AxisType::Gamepad(
-                                                *axis_type,
-                                            ),
-                                        positive_low: 1.0,
-                                        negative_low: -0.1,
-                                        value: None,
-                                    }
-                                    .into(),
-                                ));
-                            }
+fn get_input(
+    kind: BindingKind,
+    keyboard: &KeyboardInputs,
+    gamepad: &GamepadInputs,
+) -> Option<InputKind> {
+    match kind {
+        BindingKind::Keyboard => keyboard.key_events.iter().next().and_then(|event| {
+            event
+                .button_state
+                .pressed()
+                .then(|| event.key_code.option().map(InputKind::Keyboard))
+                .flatten()
+        }),
+        BindingKind::Gamepad => {
+            gamepad
+                .gamepad_events
+                .iter()
+                .next()
+                .and_then(|event| match event {
+                    GamepadEvent::Button(e) => {
+                        (e.value.abs() > 0.1).then(|| InputKind::Button(e.button.clone()))
+                    }
+                    GamepadEvent::Axis(e) => {
+                        if e.value > 0.1 {
+                            Some(InputKind::AxisPositive(e.axis.clone()))
+                        } else if e.value < -0.1 {
+                            Some(InputKind::AxisNegative(e.axis.clone()))
+                        } else {
+                            None
                         }
                     }
-
-                    None
-                }
-            }
-        })
+                    _ => None,
+                })
+        }
     }
 }
diff --git a/src/ui/main_menu/settings/networking.rs b/src/ui/main_menu/settings/networking.rs
index 3bdac70ba9..bd2d560eaa 100644
--- a/src/ui/main_menu/settings/networking.rs
+++ b/src/ui/main_menu/settings/networking.rs
@@ -1,59 +1,37 @@
 use super::*;
 
-pub fn networking_settings_ui(
-    params: &mut SettingsMenu,
-    ui: &mut egui::Ui,
-    should_reset: bool,
-    settings_tabs: &[egui::Response],
-    bottom_buttons: &[egui::Response],
+pub(super) fn widget(
+    mut args: In<(&mut egui::Ui, &mut SettingsState, bool)>,
+    meta: Root<GameMeta>,
+    localization: Localization<GameMeta>,
 ) {
-    let settings = params.modified_settings.0.as_mut().unwrap();
+    let (ui, state, should_reset) = &mut *args;
 
-    let bigger_font = &params.game.ui_theme.font_styles.bigger;
-    let normal_font = &params.game.ui_theme.font_styles.normal;
+    let bigger_font = meta
+        .theme
+        .font_styles
+        .bigger
+        .with_color(meta.theme.panel.font_color);
+    let normal_font = meta
+        .theme
+        .font_styles
+        .normal
+        .with_color(meta.theme.panel.font_color);
 
-    ui.add_space(bigger_font.size);
+    if *should_reset {
+        state.modified_settings.matchmaking_server =
+            meta.default_settings.matchmaking_server.clone();
+    }
 
-    ui.horizontal(|ui| {
-        ui.add_space(bigger_font.size * 2.0);
-        ui.themed_label(
-            bigger_font,
-            &format!("{}:", params.localization.get("matchmaking-server")),
-        );
+    ui.add_space(bigger_font.size / 2.0);
 
-        if should_reset {
-            settings.matchmaking_server = params.game.default_settings.matchmaking_server.clone();
-        }
+    ui.horizontal(|ui| {
+        ui.label(bigger_font.rich(localization.get("matchmaking-server")));
 
-        let text_box = &ui.add(
-            egui::TextEdit::singleline(&mut settings.matchmaking_server)
-                .font(normal_font.clone())
+        ui.add(
+            egui::TextEdit::singleline(&mut state.modified_settings.matchmaking_server)
+                .font(normal_font)
                 .desired_width(ui.available_width() - bigger_font.size * 2.0),
         );
-        let first_bottom_button = bottom_buttons.iter().next().unwrap();
-        let last_bottom_button = bottom_buttons.iter().last().unwrap();
-        let first_top_tab = settings_tabs.iter().next().unwrap();
-        let last_top_tab = settings_tabs.iter().last().unwrap();
-        params.adjacencies.text_boxes.insert(text_box.id);
-
-        params
-            .adjacencies
-            .widget(text_box)
-            .to_right_of(last_top_tab);
-        for tab in settings_tabs {
-            params.adjacencies.widget(text_box).below(tab);
-            params.adjacencies.widget(tab).below(first_bottom_button);
-        }
-        for button in bottom_buttons {
-            params.adjacencies.widget(button).below(text_box);
-        }
-        params
-            .adjacencies
-            .widget(text_box)
-            .above(first_bottom_button);
-        params
-            .adjacencies
-            .widget(last_bottom_button)
-            .to_left_of(first_top_tab);
     });
 }
diff --git a/src/ui/main_menu/settings/sound.rs b/src/ui/main_menu/settings/sound.rs
deleted file mode 100644
index 2c2ca66c2c..0000000000
--- a/src/ui/main_menu/settings/sound.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-use super::*;
-
-/// Render the sound settings UI
-pub fn sound_settings_ui(_ui: &mut egui::Ui, _game: &GameMeta) {
-    // This is un-reachable right now
-    todo!("Implement sound settings UI");
-}
diff --git a/src/ui/map_select.rs b/src/ui/map_select.rs
new file mode 100644
index 0000000000..ad477b7d4c
--- /dev/null
+++ b/src/ui/map_select.rs
@@ -0,0 +1,78 @@
+use crate::prelude::*;
+
+#[derive(Clone, Debug, Default)]
+pub enum MapSelectAction {
+    #[default]
+    None,
+    SelectMap(MapMeta),
+    GoBack,
+}
+
+pub fn map_select_menu(
+    asset_server: Res<AssetServer>,
+    meta: Root<GameMeta>,
+    ctx: Res<EguiCtx>,
+    localization: Localization<GameMeta>,
+    player_controls: Res<GlobalPlayerControls>,
+) -> MapSelectAction {
+    if player_controls.values().any(|x| x.menu_back_just_pressed) {
+        return MapSelectAction::GoBack;
+    }
+
+    egui::CentralPanel::default()
+        .frame(egui::Frame::none())
+        .show(&ctx, |ui| {
+            let screen_rect = ui.max_rect();
+
+            let pause_menu_width = meta.main_menu.menu_width;
+            let x_margin = (screen_rect.width() - pause_menu_width) / 2.0;
+            let outer_margin = egui::style::Margin::symmetric(x_margin, screen_rect.height() * 0.1);
+
+            BorderedFrame::new(&meta.theme.panel.border)
+                .margin(outer_margin)
+                .padding(meta.theme.panel.padding)
+                .show(ui, |ui| {
+                    ui.set_min_width(ui.available_width());
+
+                    ui.vertical_centered(|ui| {
+                        ui.label(
+                            meta.theme
+                                .font_styles
+                                .bigger
+                                .rich(localization.get("map-select-title")),
+                        );
+                    });
+
+                    ui.add_space(meta.theme.font_styles.normal.size);
+
+                    egui::ScrollArea::vertical()
+                        .show(ui, |ui| {
+                            ui.vertical_centered_justified(|ui| {
+                                for (i, handle) in meta.core.stable_maps.iter().enumerate() {
+                                    let map_meta = asset_server.get(*handle);
+
+                                    let mut button = BorderedButton::themed(
+                                        &meta.theme.buttons.small,
+                                        map_meta.name.to_string(),
+                                    )
+                                    .show(ui);
+
+                                    if i == 0 {
+                                        button = button.focus_by_default(ui);
+                                    }
+
+                                    if button.clicked() {
+                                        return MapSelectAction::SelectMap(map_meta.clone());
+                                    }
+                                }
+
+                                MapSelectAction::None
+                            })
+                            .inner
+                        })
+                        .inner
+                })
+                .inner
+        })
+        .inner
+}
diff --git a/src/ui/pause_menu.rs b/src/ui/pause_menu.rs
index 7ee2d6b8b5..545825715c 100644
--- a/src/ui/pause_menu.rs
+++ b/src/ui/pause_menu.rs
@@ -1,210 +1,201 @@
-use bevy::window::PrimaryWindow;
-use bevy_egui::*;
-use bevy_fluent::Localization;
-
-use crate::{prelude::*, widgets::EguiResponseExt};
-
-use super::{
-    main_menu::map_select::MapSelectMenu,
-    widget,
-    widgets::{
-        bordered_button::BorderedButton, bordered_frame::BorderedFrame, EguiContextExt, EguiUiExt,
-    },
-    WidgetId,
-};
-
-pub struct PausePlugin;
-
-impl Plugin for PausePlugin {
-    fn build(&self, app: &mut App) {
-        app.init_resource::<PauseMenuPage>()
-            .add_systems(
-                (
-                    unpause_system
-                        .run_if(in_state(EngineState::InGame))
-                        .run_if(in_state(InGameState::Paused)),
-                    pause_system
-                        .run_if(in_state(EngineState::InGame))
-                        .run_if(in_state(GameEditorState::Hidden))
-                        .run_if(in_state(InGameState::Playing)),
-                )
-                    .in_base_set(CoreSet::PostUpdate),
-            )
-            .add_systems(
-                (
-                    pause_menu_default
-                        .run_if(in_state(EngineState::InGame))
-                        .run_if(in_state(InGameState::Paused))
-                        .run_if(resource_equals(PauseMenuPage::Default)),
-                    pause_menu_map_select
-                        .run_if(in_state(EngineState::InGame))
-                        .run_if(in_state(InGameState::Paused))
-                        .run_if(resource_equals(PauseMenuPage::MapSelect)),
-                )
-                    .in_base_set(CoreSet::Update),
-            );
-    }
-}
+use std::ops::Deref;
 
-/// Transition game to pause state
-fn pause_system(mut commands: Commands, input: Query<&ActionState<MenuAction>>) {
-    let input = input.single();
-    if input.just_pressed(MenuAction::Pause) {
-        commands.insert_resource(NextState(Some(InGameState::Paused)));
-    }
-}
-
-// Transition game out of paused state
-fn unpause_system(
-    mut commands: Commands,
-    input: Query<&ActionState<MenuAction>>,
-    mut pause_page: ResMut<PauseMenuPage>,
-) {
-    let input = input.single();
-    if input.just_pressed(MenuAction::Pause) {
-        *pause_page = default();
-        commands.insert_resource(NextState(Some(InGameState::Playing)));
-    }
-}
+use crate::prelude::*;
 
-#[derive(Resource, Default, Eq, PartialEq, Copy, Clone)]
-pub enum PauseMenuPage {
+#[derive(Clone, Debug, Copy, Default)]
+enum PauseMenuPage {
     #[default]
-    Default,
+    Pause,
     MapSelect,
 }
 
-pub fn pause_menu_default(
-    mut commands: Commands,
-    game: Res<GameMeta>,
-    localization: Res<Localization>,
-    map_handle: Query<&AssetHandle<MapMeta>>,
-    map_assets: Res<Assets<MapMeta>>,
-    mut pause_page: ResMut<PauseMenuPage>,
-    mut session_manager: SessionManager,
-    mut contexts: EguiContexts,
+pub fn session_plugin(session: &mut Session) {
+    session.world.init_param::<Localization<GameMeta>>();
+    session.add_system_to_stage(Update, pause_menu_system);
+}
+
+fn pause_menu_system(
+    meta: Root<GameMeta>,
+    mut sessions: ResMut<Sessions>,
+    ctx: Res<EguiCtx>,
+    controls: Res<GlobalPlayerControls>,
+    world: &World,
 ) {
-    let is_online = false;
-    let ui_theme = &game.ui_theme;
-
-    egui::CentralPanel::default()
-        .frame(egui::Frame::none())
-        .show(contexts.ctx_mut(), |ui| {
-            let screen_rect = ui.max_rect();
-
-            let pause_menu_width = game.main_menu.menu_width;
-            let x_margin = (screen_rect.width() - pause_menu_width) / 2.0;
-            let outer_margin = egui::style::Margin::symmetric(x_margin, screen_rect.height() * 0.2);
-
-            BorderedFrame::new(&ui_theme.panel.border)
-                .margin(outer_margin)
-                .padding(ui_theme.panel.padding.into())
-                .show(ui, |ui| {
-                    ui.set_min_width(ui.available_width());
-
-                    let heading_font = ui_theme
-                        .font_styles
-                        .heading
-                        .colored(ui_theme.panel.font_color);
-                    let bigger_font = ui_theme
-                        .font_styles
-                        .bigger
-                        .colored(ui_theme.panel.font_color);
-
-                    ui.vertical_centered(|ui| {
-                        if let Some(map_meta) = map_handle
-                            .get_single()
-                            .ok()
-                            .and_then(|handle| map_assets.get(handle))
-                        {
-                            ui.themed_label(&bigger_font, &map_meta.name);
+    let mut back_to_menu = false;
+    let mut restart_game = false;
+    let mut select_map = None;
+    if let Some(session) = sessions.get_mut(SessionNames::GAME) {
+        let pause_pressed = controls.values().any(|x| x.pause_just_pressed);
+
+        if !session.active {
+            let page = ctx.get_state::<PauseMenuPage>();
+
+            match page {
+                PauseMenuPage::Pause => {
+                    egui::CentralPanel::default()
+                        .frame(egui::Frame::none())
+                        .show(&ctx, |ui| {
+                            let screen_rect = ui.max_rect();
+
+                            let pause_menu_width = meta.main_menu.menu_width;
+                            let x_margin = (screen_rect.width() - pause_menu_width) / 2.0;
+                            let outer_margin = egui::style::Margin::symmetric(
+                                x_margin,
+                                screen_rect.height() * 0.2,
+                            );
+
+                            BorderedFrame::new(&meta.theme.panel.border)
+                                .margin(outer_margin)
+                                .padding(meta.theme.panel.padding)
+                                .show(ui, |ui| {
+                                    ui.set_min_width(ui.available_width());
+
+                                    world.run_initialized_system(
+                                        main_pause_menu,
+                                        (ui, session, &mut restart_game, &mut back_to_menu),
+                                    );
+                                });
+                        });
+                }
+                PauseMenuPage::MapSelect => {
+                    let action =
+                        world.run_initialized_system(crate::ui::map_select::map_select_menu, ());
+
+                    match action {
+                        super::map_select::MapSelectAction::None => (),
+                        super::map_select::MapSelectAction::SelectMap(map) => {
+                            select_map = Some(map);
+                            ctx.set_state(PauseMenuPage::Pause);
                         }
-                        ui.themed_label(&heading_font, &localization.get("paused"));
-
-                        ui.add_space(10.0);
-
-                        let width = ui.available_width();
-
-                        let mut continue_button = BorderedButton::themed(
-                            &ui_theme.button_styles.normal,
-                            &localization.get("continue"),
-                        )
-                        .min_size(egui::vec2(width, 0.0))
-                        .show(ui);
-
-                        continue_button = continue_button.focus_by_default(ui);
-
-                        if continue_button.clicked() {
-                            commands.insert_resource(NextState(Some(InGameState::Playing)));
+                        super::map_select::MapSelectAction::GoBack => {
+                            ctx.set_state(PauseMenuPage::Pause);
                         }
+                    }
+                }
+            }
+        } else if pause_pressed {
+            session.active = false;
+        }
+    }
 
-                        ui.scope(|ui| {
-                            ui.set_enabled(!is_online);
-
-                            if BorderedButton::themed(
-                                &ui_theme.button_styles.normal,
-                                &localization.get("map-select-title"),
-                            )
-                            .min_size(egui::vec2(width, 0.0))
-                            .show(ui)
-                            .clicked()
-                            {
-                                *pause_page = PauseMenuPage::MapSelect;
-                            }
-
-                            if BorderedButton::themed(
-                                &ui_theme.button_styles.normal,
-                                &localization.get("restart"),
-                            )
-                            .min_size(egui::vec2(width, 0.0))
-                            .show(ui)
-                            .clicked()
-                            {
-                                session_manager.restart();
-                                commands.insert_resource(NextState(Some(InGameState::Playing)));
-                            }
-                        });
+    if back_to_menu {
+        sessions.end_game();
+        sessions.start_menu();
+    } else if restart_game {
+        sessions.restart_game();
+    } else if let Some(map) = select_map {
+        let match_info = sessions
+            .get(SessionNames::GAME)
+            .unwrap()
+            .world
+            .resource::<MatchInputs>()
+            .deref()
+            .clone();
+        sessions.end_game();
+        sessions.start_game(crate::core::MatchPlugin {
+            map,
+            player_info: std::array::from_fn(|i| PlayerInput {
+                control: default(),
+                editor_input: default(),
+                ..match_info.players[i]
+            }),
+        })
+    }
+}
 
-                        ui.scope(|ui| {
-                            if BorderedButton::themed(
-                                &ui_theme.button_styles.normal,
-                                &localization.get("edit"),
-                            )
-                            .min_size(egui::vec2(width, 0.0))
-                            .show(ui)
-                            .clicked()
-                            {
-                                commands.insert_resource(NextState(Some(GameEditorState::Visible)));
-                                commands.insert_resource(NextState(Some(InGameState::Playing)));
-                            }
-                        });
+fn main_pause_menu(
+    mut param: In<(&mut egui::Ui, &mut Session, &mut bool, &mut bool)>,
+    meta: Root<GameMeta>,
+    localization: Localization<GameMeta>,
+    controls: Res<GlobalPlayerControls>,
+) {
+    let (ui, session, restart_game, back_to_menu) = &mut *param;
 
-                        if BorderedButton::themed(
-                            &ui_theme.button_styles.normal,
-                            &localization.get("main-menu"),
-                        )
-                        .min_size(egui::vec2(width, 0.0))
-                        .show(ui)
-                        .clicked()
-                        {
-                            // Show the main menu
-                            commands.insert_resource(NextState(Some(EngineState::MainMenu)));
-                            ui.ctx().clear_focus();
-                        }
-                    });
-                });
-        });
-}
+    // Unpause the game
+    if controls.values().any(|x| x.pause_just_pressed) {
+        session.active = true;
+    }
 
-fn pause_menu_map_select(world: &mut World) {
-    let mut egui_context = world
-        .query_filtered::<&mut EguiContext, With<PrimaryWindow>>()
-        .single(world)
-        .clone();
+    ui.vertical_centered(|ui| {
+        let width = ui.available_width();
+
+        // Heading
+        ui.label(
+            meta.theme
+                .font_styles
+                .heading
+                .rich(localization.get("paused"))
+                .color(meta.theme.panel.font_color),
+        );
+
+        // Map title
+        if let Some(map_meta) = session.world.get_resource::<SpawnedMapMeta>() {
+            ui.label(
+                meta.theme
+                    .font_styles
+                    .bigger
+                    .rich(map_meta.name.to_string()),
+            );
+        }
+
+        ui.add_space(10.0);
+
+        // Continue button
+        if BorderedButton::themed(&meta.theme.buttons.normal, localization.get("continue"))
+            .min_size(vec2(width, 0.0))
+            .show(ui)
+            .focus_by_default(ui)
+            .clicked()
+        {
+            session.active = true;
+        }
+
+        // Local game buttons
+        ui.scope(|ui| {
+            let is_online = false;
+            ui.set_enabled(!is_online);
+
+            // Map select button
+            if BorderedButton::themed(
+                &meta.theme.buttons.normal,
+                localization.get("map-select-title"),
+            )
+            .min_size(vec2(width, 0.0))
+            .show(ui)
+            .clicked()
+            {
+                ui.ctx().set_state(PauseMenuPage::MapSelect);
+            }
+
+            // Restart button
+            if BorderedButton::themed(&meta.theme.buttons.normal, localization.get("restart"))
+                .min_size(vec2(width, 0.0))
+                .show(ui)
+                .clicked()
+            {
+                **restart_game = true;
+            }
+        });
 
-    egui::CentralPanel::default()
-        .frame(egui::Frame::none())
-        .show(egui_context.get_mut(), |ui| {
-            widget::<MapSelectMenu>(world, ui, WidgetId::new("map-select"), false);
+        // Edit button
+        ui.scope(|ui| {
+            if BorderedButton::themed(&meta.theme.buttons.normal, localization.get("edit"))
+                .min_size(vec2(width, 0.0))
+                .show(ui)
+                .clicked()
+            {
+                // TODO: show editor.
+                session.active = true;
+            }
         });
+
+        // Main menu button
+        if BorderedButton::themed(&meta.theme.buttons.normal, localization.get("main-menu"))
+            .min_size(vec2(width, 0.0))
+            .show(ui)
+            .clicked()
+        {
+            **back_to_menu = true;
+        }
+    });
 }
diff --git a/src/ui/ui_input.rs b/src/ui/ui_input.rs
deleted file mode 100644
index 95c5567e81..0000000000
--- a/src/ui/ui_input.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-use crate::prelude::*;
-
-pub struct UiInputPlugin;
-
-impl Plugin for UiInputPlugin {
-    fn build(&self, app: &mut App) {
-        app.add_plugin(InputManagerPlugin::<MenuAction>::default());
-    }
-}
-
-#[derive(Debug, Copy, Clone, Actionlike, Deserialize, Eq, PartialEq, Hash)]
-pub enum MenuAction {
-    Up,
-    Down,
-    Left,
-    Right,
-    Confirm,
-    Start,
-    Back,
-    Pause,
-    ToggleFullscreen,
-}
diff --git a/src/ui/widgets.rs b/src/ui/widgets.rs
deleted file mode 100644
index 50f5dc3b4a..0000000000
--- a/src/ui/widgets.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-use bevy_egui::egui;
-
-use crate::prelude::*;
-
-pub mod bordered_button;
-pub mod bordered_frame;
-
-/// Extensions on [`egui::Ui`] for custom widgets
-pub trait EguiUiExt {
-    fn themed_label(self, font_meta: &FontMeta, label: &str) -> egui::Response;
-}
-
-impl EguiUiExt for &mut egui::Ui {
-    fn themed_label(self, font_meta: &FontMeta, label: &str) -> egui::Response {
-        self.add(egui::Label::new(
-            egui::RichText::new(label)
-                .color(font_meta.color.into_egui())
-                .font(font_meta.font_id()),
-        ))
-    }
-}
-
-/// Extension trait with helpers for the egui context
-pub trait EguiContextExt {
-    /// Clear the UI focus
-    fn clear_focus(self);
-}
-
-impl EguiContextExt for &egui::Context {
-    fn clear_focus(self) {
-        self.memory_mut(|r| r.request_focus(egui::Id::null()));
-    }
-}
-
-/// Extension trait with helpers for egui responses
-pub trait EguiResponseExt {
-    /// Set this response to focused if nothing else is focused
-    fn focus_by_default(self, ui: &mut egui::Ui) -> egui::Response;
-}
-
-impl EguiResponseExt for egui::Response {
-    fn focus_by_default(self, ui: &mut egui::Ui) -> egui::Response {
-        if ui.ctx().memory(|r| r.focus().is_none()) {
-            ui.ctx().memory_mut(|r| r.request_focus(self.id));
-
-            self
-        } else {
-            self
-        }
-    }
-}
diff --git a/src/ui/widgets/bordered_button.rs b/src/ui/widgets/bordered_button.rs
deleted file mode 100644
index 497f8d9b4f..0000000000
--- a/src/ui/widgets/bordered_button.rs
+++ /dev/null
@@ -1,215 +0,0 @@
-#![allow(dead_code)] // We haven't used all of these methods yet but we still want them there
-
-/// Bordered button rendering
-///
-/// Adapted from <https://docs.rs/egui/0.18.1/src/egui/widgets/button.rs.html>
-use bevy_egui::egui::{self, *};
-
-use crate::{
-    metadata::{BorderImageMeta, ButtonThemeMeta},
-    ColorMetaExt,
-};
-
-use super::bordered_frame::BorderedFrame;
-
-/// A button rendered with a [`BorderImageMeta`]
-pub struct BorderedButton<'a> {
-    text: WidgetText,
-    wrap: Option<bool>,
-    sense: Sense,
-    min_size: Vec2,
-    focus_on_hover: bool,
-    default_border: Option<&'a BorderImageMeta>,
-    on_focus_border: Option<&'a BorderImageMeta>,
-    on_click_border: Option<&'a BorderImageMeta>,
-    margin: egui::style::Margin,
-    padding: egui::style::Margin,
-}
-
-impl<'a> BorderedButton<'a> {
-    // Create a new button
-    #[must_use = "You must call .show() to render the button"]
-    pub fn new(text: impl Into<WidgetText>) -> Self {
-        Self {
-            text: text.into(),
-            sense: Sense::click(),
-            min_size: Vec2::ZERO,
-            focus_on_hover: true,
-            wrap: None,
-            default_border: None,
-            on_focus_border: None,
-            on_click_border: None,
-            margin: Default::default(),
-            padding: Default::default(),
-        }
-    }
-
-    #[must_use = "You must call .show() to render the button"]
-    pub fn themed(
-        button_theme: &'a ButtonThemeMeta,
-        label: impl Into<RichText>,
-    ) -> BorderedButton<'a> {
-        BorderedButton::new(
-            label
-                .into()
-                .font(button_theme.font.font_id())
-                .color(button_theme.font.color.into_egui()),
-        )
-        .border(&button_theme.borders.default)
-        .on_click_border(button_theme.borders.clicked.as_ref())
-        .on_focus_border(button_theme.borders.focused.as_ref())
-        .padding(button_theme.padding.into())
-    }
-
-    /// Set whether or not the button focuses itself automatically when it is hovered over.
-    pub fn focus_on_hover(mut self, focus_on_hover: bool) -> Self {
-        self.focus_on_hover = focus_on_hover;
-        self
-    }
-
-    /// If `true`, the text will wrap to stay within the max width of the [`Ui`].
-    ///
-    /// By default [`Self::wrap`] will be true in vertical layouts
-    /// and horizontal layouts with wrapping,
-    /// and false on non-wrapping horizontal layouts.
-    ///
-    /// Note that any `\n` in the text will always produce a new line.
-    #[inline]
-    #[must_use = "You must call .show() to render the button"]
-    pub fn wrap(mut self, wrap: bool) -> Self {
-        self.wrap = Some(wrap);
-        self
-    }
-
-    /// Set the margin. This will be applied on the outside of the border.
-    #[must_use = "You must call .show() to render the button"]
-    pub fn margin(mut self, margin: egui::style::Margin) -> Self {
-        self.margin = margin;
-
-        self
-    }
-
-    /// Set the padding. This will be applied on the inside of the border.
-    #[must_use = "You must call .show() to render the button"]
-    pub fn padding(mut self, padding: egui::style::Margin) -> Self {
-        self.padding = padding;
-
-        self
-    }
-
-    /// Set the button border image
-    #[must_use = "You must call .show() to render the button"]
-    pub fn border(mut self, border: &'a BorderImageMeta) -> Self {
-        self.default_border = Some(border);
-        self
-    }
-
-    /// Set a different border to use when focusing / hovering over the button
-    #[must_use = "You must call .show() to render the button"]
-    pub fn on_focus_border(mut self, border: Option<&'a BorderImageMeta>) -> Self {
-        self.on_focus_border = border;
-        self
-    }
-
-    /// Set a different border to use when the mouse is clicking on the button
-    #[must_use = "You must call .show() to render the button"]
-    pub fn on_click_border(mut self, border: Option<&'a BorderImageMeta>) -> Self {
-        self.on_click_border = border;
-        self
-    }
-
-    /// By default, buttons senses clicks.
-    /// Change this to a drag-button with `Sense::drag()`.
-    #[must_use = "You must call .show() to render the button"]
-    pub fn sense(mut self, sense: Sense) -> Self {
-        self.sense = sense;
-        self
-    }
-
-    /// Set the minimum size for the button
-    #[must_use = "You must call .show() to render the button"]
-    pub fn min_size(mut self, min_size: Vec2) -> Self {
-        self.min_size = min_size;
-        self
-    }
-
-    /// Render the button
-    #[must_use = "You must call .show() to render the button"]
-    pub fn show(self, ui: &mut Ui) -> egui::Response {
-        self.ui(ui)
-    }
-}
-
-impl<'a> Widget for BorderedButton<'a> {
-    fn ui(self, ui: &mut Ui) -> Response {
-        let BorderedButton {
-            text,
-            sense,
-            min_size,
-            focus_on_hover,
-            wrap,
-            default_border,
-            on_focus_border,
-            on_click_border,
-            margin,
-            padding,
-        }: BorderedButton = self;
-
-        let total_extra = padding.sum() + margin.sum();
-
-        let wrap_width = ui.available_width() - total_extra.x;
-        let text = text.into_galley(ui, wrap, wrap_width, TextStyle::Button);
-
-        let mut desired_size = text.size() + total_extra;
-        desired_size = desired_size.at_least(min_size);
-
-        let (rect, response) = ui.allocate_at_least(desired_size, sense);
-        response.widget_info(|| WidgetInfo::labeled(WidgetType::Button, text.text()));
-
-        // Focus the button automatically when it is hovered and the mouse is moving
-        if response.hovered()
-            && ui.ctx().input(|i| i.pointer.velocity().length_sq() > 0.0)
-            && focus_on_hover
-        {
-            response.request_focus();
-        }
-
-        if ui.is_rect_visible(rect) {
-            let visuals = ui.style().interact(&response);
-
-            let mut text_rect = rect;
-            text_rect.min += padding.left_top() + margin.left_top();
-            text_rect.max -= padding.right_bottom() + margin.right_bottom();
-            text_rect.max.x = text_rect.max.x.max(text_rect.min.x);
-            text_rect.max.y = text_rect.max.y.max(text_rect.min.y);
-
-            let label_pos = ui
-                .layout()
-                .align_size_within_rect(text.size(), text_rect)
-                .min;
-
-            let border = if response.is_pointer_button_down_on() {
-                on_click_border.or(default_border)
-            } else if response.has_focus() || response.hovered() {
-                on_focus_border.or(default_border)
-            } else {
-                default_border
-            };
-
-            let mut border_rect = rect;
-            border_rect.min += margin.left_top();
-            border_rect.max -= margin.right_bottom();
-            border_rect.max.x = border_rect.max.x.max(border_rect.min.x);
-            border_rect.max.y = border_rect.max.y.max(border_rect.min.y);
-
-            if let Some(border) = border {
-                ui.painter()
-                    .add(BorderedFrame::new(border).paint(border_rect));
-            }
-
-            text.paint_with_visuals(ui.painter(), label_pos, visuals);
-        }
-
-        response
-    }
-}
diff --git a/src/ui/widgets/bordered_frame.rs b/src/ui/widgets/bordered_frame.rs
deleted file mode 100644
index 523a9eed55..0000000000
--- a/src/ui/widgets/bordered_frame.rs
+++ /dev/null
@@ -1,274 +0,0 @@
-use bevy_egui::egui;
-
-use crate::metadata::BorderImageMeta;
-
-/// A 9-patch style bordered frame.
-pub struct BorderedFrame {
-    bg_texture: egui::TextureId,
-    border_scale: f32,
-    texture_size: egui::Vec2,
-    texture_border_size: egui::style::Margin,
-    padding: egui::style::Margin,
-    margin: egui::style::Margin,
-    border_only: bool,
-}
-
-impl BorderedFrame {
-    /// Create a new frame with the given [`BorderImageMeta`]
-    #[must_use = "You must call .show() to render the frame"]
-    pub fn new(border_image: &BorderImageMeta) -> Self {
-        let s = border_image.image_size;
-        Self {
-            bg_texture: border_image.egui_texture,
-            border_scale: border_image.scale,
-            texture_size: egui::Vec2::new(s.x as f32, s.y as f32),
-            texture_border_size: border_image.border_size.into(),
-            padding: Default::default(),
-            margin: Default::default(),
-            border_only: false,
-        }
-    }
-
-    /// Set the padding. This will be applied on the inside of the border.
-    #[must_use = "You must call .show() to render the frame"]
-    pub fn padding(mut self, margin: egui::style::Margin) -> Self {
-        self.padding = margin;
-
-        self
-    }
-
-    /// Set the margin. This will be applied on the outside of the border.
-    #[must_use = "You must call .show() to render the frame"]
-    pub fn margin(mut self, margin: egui::style::Margin) -> Self {
-        self.margin = margin;
-
-        self
-    }
-
-    #[allow(unused)] // We just haven't needed this method yet
-    #[must_use = "You must call .show() to render the frame"]
-    pub fn border_scale(mut self, scale: f32) -> Self {
-        self.border_scale = scale;
-
-        self
-    }
-
-    #[allow(unused)] // We just haven't needed this method yet
-    /// If border_only is set to `true`, then the middle section of the frame will be transparent,
-    /// only the border will be rendered.
-    #[must_use = "You must call .show() to render the frame"]
-    pub fn border_only(mut self, border_only: bool) -> Self {
-        self.border_only = border_only;
-
-        self
-    }
-
-    /// Render the frame
-    pub fn show<R>(
-        self,
-        ui: &mut egui::Ui,
-        add_contents: impl FnOnce(&mut egui::Ui) -> R,
-    ) -> egui::InnerResponse<R> {
-        self.show_dyn(ui, Box::new(add_contents))
-    }
-
-    fn show_dyn<'c, R>(
-        self,
-        ui: &mut egui::Ui,
-        add_contents: Box<dyn FnOnce(&mut egui::Ui) -> R + 'c>,
-    ) -> egui::InnerResponse<R> {
-        let mut prepared = self.begin(ui);
-        let ret = add_contents(&mut prepared.content_ui);
-        let response = prepared.end(ui);
-
-        egui::InnerResponse {
-            inner: ret,
-            response,
-        }
-    }
-
-    fn begin(self, ui: &mut egui::Ui) -> BorderedFramePrepared {
-        let background_shape_idx = ui.painter().add(egui::Shape::Noop);
-
-        let mut content_rect = ui.available_rect_before_wrap();
-        content_rect.min += self.padding.left_top() + self.margin.left_top();
-        content_rect.max -= self.padding.right_bottom() + self.margin.right_bottom();
-
-        // Avoid negative size
-        content_rect.max.x = content_rect.max.x.max(content_rect.min.x);
-        content_rect.max.y = content_rect.max.y.max(content_rect.min.y);
-
-        let content_ui = ui.child_ui(content_rect, *ui.layout());
-
-        BorderedFramePrepared {
-            frame: self,
-            background_shape_idx,
-            content_ui,
-        }
-    }
-
-    pub fn paint(&self, paint_rect: egui::Rect) -> egui::Shape {
-        use egui::{Pos2, Rect, Vec2};
-        let white = egui::Color32::WHITE;
-
-        let mut mesh = egui::Mesh {
-            texture_id: self.bg_texture,
-            ..Default::default()
-        };
-
-        let s = self.texture_size;
-        let b = self.texture_border_size;
-        let pr = paint_rect;
-        // UV border
-        let buv = egui::style::Margin {
-            left: b.left / s.x,
-            right: b.right / s.x,
-            top: b.top / s.y,
-            bottom: b.bottom / s.y,
-        };
-        let b = egui::style::Margin {
-            left: b.left * self.border_scale,
-            right: b.right * self.border_scale,
-            top: b.top * self.border_scale,
-            bottom: b.bottom * self.border_scale,
-        };
-
-        // Build the 9-patches
-
-        // Top left
-        mesh.add_rect_with_uv(
-            Rect::from_min_size(pr.min, Vec2::new(b.left, b.top)),
-            egui::Rect::from_min_size(Pos2::ZERO, Vec2::new(buv.left, buv.top)),
-            white,
-        );
-        // Top center
-        mesh.add_rect_with_uv(
-            Rect::from_min_size(
-                pr.min + Vec2::new(b.left, 0.0),
-                Vec2::new(pr.width() - b.left - b.right, b.top),
-            ),
-            egui::Rect::from_min_size(
-                Pos2::new(buv.left, 0.0),
-                Vec2::new(1.0 - buv.left - buv.right, buv.top),
-            ),
-            white,
-        );
-        // Top right
-        mesh.add_rect_with_uv(
-            Rect::from_min_size(
-                pr.right_top() - Vec2::new(b.right, 0.0),
-                Vec2::new(b.right, b.top),
-            ),
-            egui::Rect::from_min_size(
-                Pos2::new(1.0 - buv.right, 0.0),
-                Vec2::new(buv.right, buv.top),
-            ),
-            white,
-        );
-        // Middle left
-        mesh.add_rect_with_uv(
-            Rect::from_min_size(
-                pr.min + Vec2::new(0.0, b.top),
-                Vec2::new(b.left, pr.height() - b.top - b.bottom),
-            ),
-            egui::Rect::from_min_size(
-                Pos2::new(0.0, buv.top),
-                Vec2::new(buv.left, 1.0 - buv.top - buv.bottom),
-            ),
-            white,
-        );
-        // Middle center
-        if !self.border_only {
-            mesh.add_rect_with_uv(
-                Rect::from_min_size(
-                    pr.min + Vec2::new(b.left, b.top),
-                    Vec2::new(
-                        pr.width() - b.left - b.right,
-                        pr.height() - b.top - b.bottom,
-                    ),
-                ),
-                egui::Rect::from_min_size(
-                    Pos2::new(buv.left, buv.top),
-                    Vec2::new(1.0 - buv.left - buv.top, 1.0 - buv.top - buv.bottom),
-                ),
-                white,
-            );
-        }
-        // Middle right
-        mesh.add_rect_with_uv(
-            Rect::from_min_size(
-                pr.min + Vec2::new(pr.width() - b.right, b.top),
-                Vec2::new(b.right, pr.height() - b.top - b.bottom),
-            ),
-            egui::Rect::from_min_size(
-                Pos2::new(1.0 - buv.right, buv.top),
-                Vec2::new(buv.right, 1.0 - buv.top - buv.bottom),
-            ),
-            white,
-        );
-        // Bottom left
-        mesh.add_rect_with_uv(
-            Rect::from_min_size(
-                pr.min + Vec2::new(0.0, pr.height() - b.bottom),
-                Vec2::new(b.left, b.bottom),
-            ),
-            egui::Rect::from_min_size(
-                Pos2::new(0.0, 1.0 - buv.bottom),
-                Vec2::new(buv.left, buv.bottom),
-            ),
-            white,
-        );
-        // Bottom center
-        mesh.add_rect_with_uv(
-            Rect::from_min_size(
-                pr.min + Vec2::new(b.left, pr.height() - b.bottom),
-                Vec2::new(pr.width() - b.left - b.right, b.bottom),
-            ),
-            egui::Rect::from_min_size(
-                Pos2::new(buv.left, 1.0 - buv.bottom),
-                Vec2::new(1.0 - buv.left - buv.right, buv.bottom),
-            ),
-            white,
-        );
-        // Bottom right
-        mesh.add_rect_with_uv(
-            Rect::from_min_size(
-                pr.min + Vec2::new(pr.width() - b.right, pr.height() - b.bottom),
-                Vec2::new(b.right, b.bottom),
-            ),
-            egui::Rect::from_min_size(
-                Pos2::new(1.0 - buv.right, 1.0 - buv.bottom),
-                Vec2::new(buv.right, buv.bottom),
-            ),
-            white,
-        );
-
-        egui::Shape::Mesh(mesh)
-    }
-}
-
-/// Internal helper struct for rendering the [`BorderedFrame`]
-struct BorderedFramePrepared {
-    frame: BorderedFrame,
-    background_shape_idx: egui::layers::ShapeIdx,
-    content_ui: egui::Ui,
-}
-
-impl BorderedFramePrepared {
-    fn end(self, ui: &mut egui::Ui) -> egui::Response {
-        use egui::Vec2;
-
-        let min_rect = self.content_ui.min_rect();
-        let m = self.frame.padding;
-        let paint_rect = egui::Rect {
-            min: min_rect.min - Vec2::new(m.left, m.top),
-            max: min_rect.max + Vec2::new(m.right, m.bottom),
-        };
-        if ui.is_rect_visible(paint_rect) {
-            let shape = self.frame.paint(paint_rect);
-            ui.painter().set(self.background_shape_idx, shape);
-        }
-
-        ui.allocate_rect(paint_rect, egui::Sense::hover())
-    }
-}
diff --git a/src/utils.rs b/src/utils.rs
deleted file mode 100644
index 305b710d2e..0000000000
--- a/src/utils.rs
+++ /dev/null
@@ -1,82 +0,0 @@
-//! Miscellaneous utilities.
-
-use async_channel::*;
-
-/// Create a bi-directional channel with a given request and response type.
-///
-/// This reduces the boilerplate required to implement patterns where you need to send data across a
-/// channel, but in both directions.
-pub fn bi_channel<Request, Response>() -> (
-    BiChannelClient<Request, Response>,
-    BiChannelServer<Request, Response>,
-) {
-    let (request_sender, request_receiver) = async_channel::unbounded();
-    let (response_sender, response_receiver) = async_channel::unbounded();
-
-    (
-        BiChannelClient {
-            request_sender,
-            response_receiver,
-        },
-        BiChannelServer {
-            request_receiver,
-            response_sender,
-        },
-    )
-}
-
-/// A [`bi_channel`] client.
-///
-/// See [`bi_channel`].
-pub struct BiChannelClient<Request, Response> {
-    pub request_sender: Sender<Request>,
-    pub response_receiver: Receiver<Response>,
-}
-impl<Req, Res> BiChannelClient<Req, Res> {
-    pub fn recv_blocking(&self) -> Result<Res, RecvError> {
-        self.response_receiver.recv_blocking()
-    }
-    pub fn send_blocking(&self, req: Req) -> Result<(), SendError<Req>> {
-        self.request_sender.send_blocking(req)
-    }
-    pub async fn send(&self, req: Req) -> Result<(), SendError<Req>> {
-        self.request_sender.send(req).await
-    }
-    pub async fn recv(&self) -> Result<Res, RecvError> {
-        self.response_receiver.recv().await
-    }
-    pub fn try_send(&self, req: Req) -> Result<(), TrySendError<Req>> {
-        self.request_sender.try_send(req)
-    }
-    pub fn try_recv(&self) -> Result<Res, TryRecvError> {
-        self.response_receiver.try_recv()
-    }
-}
-
-/// A [`bi_channel`] server.
-///
-/// See [`bi_channel`].
-pub struct BiChannelServer<Request, Response> {
-    pub request_receiver: Receiver<Request>,
-    pub response_sender: Sender<Response>,
-}
-impl<Req, Res> BiChannelServer<Req, Res> {
-    pub fn recv_blocking(&self) -> Result<Req, RecvError> {
-        self.request_receiver.recv_blocking()
-    }
-    pub fn send_blocking(&self, res: Res) -> Result<(), SendError<Res>> {
-        self.response_sender.send_blocking(res)
-    }
-    pub async fn send(&self, res: Res) -> Result<(), SendError<Res>> {
-        self.response_sender.send(res).await
-    }
-    pub async fn recv(&self) -> Result<Req, RecvError> {
-        self.request_receiver.recv().await
-    }
-    pub fn try_send(&self, res: Res) -> Result<(), TrySendError<Res>> {
-        self.response_sender.try_send(res)
-    }
-    pub fn try_recv(&self) -> Result<Req, TryRecvError> {
-        self.request_receiver.try_recv()
-    }
-}
diff --git a/taplo.toml b/taplo.toml
new file mode 100644
index 0000000000..df1b55010a
--- /dev/null
+++ b/taplo.toml
@@ -0,0 +1,3 @@
+[formatting]
+align_entries = true
+column_width  = 120