diff --git a/Cargo.lock b/Cargo.lock
index 728ad6f..7c5502b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -422,22 +422,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd64580f4496ed987c6231c6a7d833068914331a9084bf5a3dd9dcbc66fd8a73"
 dependencies = [
  "bevy-inspector-egui-derive",
- "bevy_app 0.15.0",
+ "bevy_app",
  "bevy_asset",
  "bevy_color",
- "bevy_core 0.15.0",
+ "bevy_core",
  "bevy_core_pipeline",
- "bevy_ecs 0.15.0",
+ "bevy_ecs",
  "bevy_egui",
  "bevy_hierarchy",
  "bevy_image",
  "bevy_log",
  "bevy_math",
- "bevy_reflect 0.15.0",
+ "bevy_reflect",
  "bevy_render",
  "bevy_state",
  "bevy_time",
- "bevy_utils 0.15.0",
+ "bevy_utils",
  "bevy_window",
  "bytemuck",
  "disqualified",
@@ -459,29 +459,6 @@ dependencies = [
  "syn 2.0.90",
 ]
 
-[[package]]
-name = "bevy-trait-query"
-version = "0.6.0"
-source = "git+https://github.com/JoJoJet/bevy-trait-query.git#45df913ab7ece46f03da4473ff54330d978b9db8"
-dependencies = [
- "bevy-trait-query-impl",
- "bevy_app 0.14.2",
- "bevy_core 0.14.2",
- "bevy_ecs 0.14.2",
- "tracing",
-]
-
-[[package]]
-name = "bevy-trait-query-impl"
-version = "0.6.0"
-source = "git+https://github.com/JoJoJet/bevy-trait-query.git#45df913ab7ece46f03da4473ff54330d978b9db8"
-dependencies = [
- "proc-macro-crate 1.3.1",
- "proc-macro2",
- "quote",
- "syn 2.0.90",
-]
-
 [[package]]
 name = "bevy_a11y"
 version = "0.15.0"
@@ -489,10 +466,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "82c66b5bc82a2660a5663d85b3354ddb72c8ab2c443989333cbea146f39a4e9a"
 dependencies = [
  "accesskit",
- "bevy_app 0.15.0",
- "bevy_derive 0.15.0",
- "bevy_ecs 0.15.0",
- "bevy_reflect 0.15.0",
+ "bevy_app",
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_reflect",
 ]
 
 [[package]]
@@ -501,20 +478,20 @@ version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ee48f3fc65f583e5e320e38874053e20e7a71205a62aaace5d607446781bd742"
 dependencies = [
- "bevy_app 0.15.0",
+ "bevy_app",
  "bevy_asset",
  "bevy_color",
- "bevy_core 0.15.0",
- "bevy_derive 0.15.0",
- "bevy_ecs 0.15.0",
+ "bevy_core",
+ "bevy_derive",
+ "bevy_ecs",
  "bevy_hierarchy",
  "bevy_log",
  "bevy_math",
- "bevy_reflect 0.15.0",
+ "bevy_reflect",
  "bevy_render",
  "bevy_time",
  "bevy_transform",
- "bevy_utils 0.15.0",
+ "bevy_utils",
  "blake3",
  "derive_more",
  "downcast-rs",
@@ -527,35 +504,17 @@ dependencies = [
  "uuid",
 ]
 
-[[package]]
-name = "bevy_app"
-version = "0.14.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5361d0f8a8677a5d0102cfe7321a7ecd2a8b9a4f887ce0dde1059311cf9cd42"
-dependencies = [
- "bevy_derive 0.14.2",
- "bevy_ecs 0.14.2",
- "bevy_reflect 0.14.2",
- "bevy_tasks 0.14.2",
- "bevy_utils 0.14.2",
- "console_error_panic_hook",
- "downcast-rs",
- "thiserror 1.0.69",
- "wasm-bindgen",
- "web-sys",
-]
-
 [[package]]
 name = "bevy_app"
 version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "652574e4c10efcfa70f98036709dd5b67e5cb8d46c58087ef48c2ac6b62df9da"
 dependencies = [
- "bevy_derive 0.15.0",
- "bevy_ecs 0.15.0",
- "bevy_reflect 0.15.0",
- "bevy_tasks 0.15.0",
- "bevy_utils 0.15.0",
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_reflect",
+ "bevy_tasks",
+ "bevy_utils",
  "console_error_panic_hook",
  "ctrlc",
  "derive_more",
@@ -574,12 +533,12 @@ dependencies = [
  "async-fs",
  "async-lock",
  "atomicow",
- "bevy_app 0.15.0",
+ "bevy_app",
  "bevy_asset_macros",
- "bevy_ecs 0.15.0",
- "bevy_reflect 0.15.0",
- "bevy_tasks 0.15.0",
- "bevy_utils 0.15.0",
+ "bevy_ecs",
+ "bevy_reflect",
+ "bevy_tasks",
+ "bevy_utils",
  "bevy_window",
  "bitflags 2.6.0",
  "blake3",
@@ -607,7 +566,7 @@ version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7474b77fc27db11ec03d49ca04f1a7471f369dc373fd5e091a12ad7ab533d8c8"
 dependencies = [
- "bevy_macro_utils 0.15.0",
+ "bevy_macro_utils",
  "proc-macro2",
  "quote",
  "syn 2.0.90",
@@ -620,7 +579,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "87bccacba27db37375eb97ffc86e91a7d95db3f5faa6a834fa7306db02cde327"
 dependencies = [
  "bevy_math",
- "bevy_reflect 0.15.0",
+ "bevy_reflect",
  "bytemuck",
  "derive_more",
  "encase",
@@ -628,31 +587,17 @@ dependencies = [
  "wgpu-types",
 ]
 
-[[package]]
-name = "bevy_core"
-version = "0.14.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de706862871a1fe99ea619bff2f99d73e43ad82f19ef866a9e19a14c957c8537"
-dependencies = [
- "bevy_app 0.14.2",
- "bevy_ecs 0.14.2",
- "bevy_reflect 0.14.2",
- "bevy_tasks 0.14.2",
- "bevy_utils 0.14.2",
- "uuid",
-]
-
 [[package]]
 name = "bevy_core"
 version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ecccf7be33330f58d4c7033b212a25c414d388e3a8d55b61331346da5dbabf22"
 dependencies = [
- "bevy_app 0.15.0",
- "bevy_ecs 0.15.0",
- "bevy_reflect 0.15.0",
- "bevy_tasks 0.15.0",
- "bevy_utils 0.15.0",
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_reflect",
+ "bevy_tasks",
+ "bevy_utils",
  "serde",
  "uuid",
 ]
@@ -663,18 +608,18 @@ version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a3fb9f84fa60c2006d4a15e039c3d08d4d10599441b9175907341a77a69d627"
 dependencies = [
- "bevy_app 0.15.0",
+ "bevy_app",
  "bevy_asset",
  "bevy_color",
- "bevy_core 0.15.0",
- "bevy_derive 0.15.0",
- "bevy_ecs 0.15.0",
+ "bevy_core",
+ "bevy_derive",
+ "bevy_ecs",
  "bevy_image",
  "bevy_math",
- "bevy_reflect 0.15.0",
+ "bevy_reflect",
  "bevy_render",
  "bevy_transform",
- "bevy_utils 0.15.0",
+ "bevy_utils",
  "bevy_window",
  "bitflags 2.6.0",
  "derive_more",
@@ -684,24 +629,13 @@ dependencies = [
  "smallvec",
 ]
 
-[[package]]
-name = "bevy_derive"
-version = "0.14.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fbfc33a4c6b80760bb8bf850a2cc65a1e031da62fd3ca8b552189104dc98514"
-dependencies = [
- "bevy_macro_utils 0.14.2",
- "quote",
- "syn 2.0.90",
-]
-
 [[package]]
 name = "bevy_derive"
 version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e141b7eda52a23bb88740b37a291e26394524cb9ee3b034c7014669671fc2bb5"
 dependencies = [
- "bevy_macro_utils 0.15.0",
+ "bevy_macro_utils",
  "quote",
  "syn 2.0.90",
 ]
@@ -712,34 +646,15 @@ version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fa97748337405089edfb2857f7608f21bcc648a7ad272c9209808aad252ed542"
 dependencies = [
- "bevy_app 0.15.0",
- "bevy_core 0.15.0",
- "bevy_ecs 0.15.0",
- "bevy_tasks 0.15.0",
+ "bevy_app",
+ "bevy_core",
+ "bevy_ecs",
+ "bevy_tasks",
  "bevy_time",
- "bevy_utils 0.15.0",
+ "bevy_utils",
  "const-fnv1a-hash",
 ]
 
-[[package]]
-name = "bevy_ecs"
-version = "0.14.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ee4222406637f3c8e3991a99788cfcde76097bf997c311f1b6297364057483f"
-dependencies = [
- "bevy_ecs_macros 0.14.2",
- "bevy_ptr 0.14.2",
- "bevy_reflect 0.14.2",
- "bevy_tasks 0.14.2",
- "bevy_utils 0.14.2",
- "bitflags 2.6.0",
- "concurrent-queue",
- "fixedbitset 0.5.7",
- "nonmax",
- "petgraph",
- "thiserror 1.0.69",
-]
-
 [[package]]
 name = "bevy_ecs"
 version = "0.15.0"
@@ -747,11 +662,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb4c4b60d2a712c6d5cbe610bac7ecf0838fc56a095fd5b15f30230873e84f15"
 dependencies = [
  "arrayvec",
- "bevy_ecs_macros 0.15.0",
- "bevy_ptr 0.15.0",
- "bevy_reflect 0.15.0",
- "bevy_tasks 0.15.0",
- "bevy_utils 0.15.0",
+ "bevy_ecs_macros",
+ "bevy_ptr",
+ "bevy_reflect",
+ "bevy_tasks",
+ "bevy_utils",
  "bitflags 2.6.0",
  "concurrent-queue",
  "derive_more",
@@ -763,25 +678,13 @@ dependencies = [
  "smallvec",
 ]
 
-[[package]]
-name = "bevy_ecs_macros"
-version = "0.14.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36b573430b67aff7bde8292257494f39343401379bfbda64035ba4918bba7b20"
-dependencies = [
- "bevy_macro_utils 0.14.2",
- "proc-macro2",
- "quote",
- "syn 2.0.90",
-]
-
 [[package]]
 name = "bevy_ecs_macros"
 version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb4296b3254b8bd29769f6a4512731b2e6c4b163343ca18b72316927315b6096"
 dependencies = [
- "bevy_macro_utils 0.15.0",
+ "bevy_macro_utils",
  "proc-macro2",
  "quote",
  "syn 2.0.90",
@@ -794,18 +697,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "954fbe8551af4b40767ea9390ec7d32fe1070a6ab55d524cf0868c17f8469a55"
 dependencies = [
  "arboard",
- "bevy_app 0.15.0",
+ "bevy_app",
  "bevy_asset",
- "bevy_derive 0.15.0",
- "bevy_ecs 0.15.0",
+ "bevy_derive",
+ "bevy_ecs",
  "bevy_image",
  "bevy_input",
  "bevy_log",
  "bevy_math",
- "bevy_reflect 0.15.0",
+ "bevy_reflect",
  "bevy_render",
  "bevy_time",
- "bevy_utils 0.15.0",
+ "bevy_utils",
  "bevy_window",
  "bevy_winit",
  "bytemuck",
@@ -829,7 +732,7 @@ version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bfe562b883fb652acde84cb6bb01cbc9f23c377e411f1484467ecfdd3a3d234e"
 dependencies = [
- "bevy_macro_utils 0.15.0",
+ "bevy_macro_utils",
  "encase_derive_impl",
 ]
 
@@ -839,21 +742,21 @@ version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1c82341f6a3517efeeeef2fe68135ac3a91b11b6e369fc1a07f6e9a4b462b57"
 dependencies = [
- "bevy_app 0.15.0",
+ "bevy_app",
  "bevy_asset",
  "bevy_color",
  "bevy_core_pipeline",
- "bevy_ecs 0.15.0",
+ "bevy_ecs",
  "bevy_gizmos_macros",
  "bevy_image",
  "bevy_math",
  "bevy_pbr",
- "bevy_reflect 0.15.0",
+ "bevy_reflect",
  "bevy_render",
  "bevy_sprite",
  "bevy_time",
  "bevy_transform",
- "bevy_utils 0.15.0",
+ "bevy_utils",
  "bytemuck",
 ]
 
@@ -863,7 +766,7 @@ version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9454ac9f0a2141900ef9f3482af9333e490d5546bbea3cab63a777447d35beed"
 dependencies = [
- "bevy_macro_utils 0.15.0",
+ "bevy_macro_utils",
  "proc-macro2",
  "quote",
  "syn 2.0.90",
@@ -877,22 +780,22 @@ checksum = "b21ed694796a001a5cf63de9ddc62fc017302b0e2998a361ef1126880ec93555"
 dependencies = [
  "base64 0.22.1",
  "bevy_animation",
- "bevy_app 0.15.0",
+ "bevy_app",
  "bevy_asset",
  "bevy_color",
- "bevy_core 0.15.0",
+ "bevy_core",
  "bevy_core_pipeline",
- "bevy_ecs 0.15.0",
+ "bevy_ecs",
  "bevy_hierarchy",
  "bevy_image",
  "bevy_math",
  "bevy_pbr",
- "bevy_reflect 0.15.0",
+ "bevy_reflect",
  "bevy_render",
  "bevy_scene",
- "bevy_tasks 0.15.0",
+ "bevy_tasks",
  "bevy_transform",
- "bevy_utils 0.15.0",
+ "bevy_utils",
  "derive_more",
  "gltf",
  "percent-encoding",
@@ -907,11 +810,11 @@ version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe0b538beea7edbf30a6062242b99e67ff3bfa716566aacf91d5b5e027f02a2"
 dependencies = [
- "bevy_app 0.15.0",
- "bevy_core 0.15.0",
- "bevy_ecs 0.15.0",
- "bevy_reflect 0.15.0",
- "bevy_utils 0.15.0",
+ "bevy_app",
+ "bevy_core",
+ "bevy_ecs",
+ "bevy_reflect",
+ "bevy_utils",
  "disqualified",
  "smallvec",
 ]
@@ -925,8 +828,8 @@ dependencies = [
  "bevy_asset",
  "bevy_color",
  "bevy_math",
- "bevy_reflect 0.15.0",
- "bevy_utils 0.15.0",
+ "bevy_reflect",
+ "bevy_utils",
  "bitflags 2.6.0",
  "bytemuck",
  "derive_more",
@@ -944,12 +847,12 @@ version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "46b4ea60095d1a1851e40cb12481ad3d5d234e14376d6b73142a85586c266b74"
 dependencies = [
- "bevy_app 0.15.0",
- "bevy_core 0.15.0",
- "bevy_ecs 0.15.0",
+ "bevy_app",
+ "bevy_core",
+ "bevy_ecs",
  "bevy_math",
- "bevy_reflect 0.15.0",
- "bevy_utils 0.15.0",
+ "bevy_reflect",
+ "bevy_utils",
  "derive_more",
  "serde",
  "smol_str",
@@ -963,14 +866,14 @@ checksum = "d4237e6e9b03902321032f00f931f18a4a211093bd9a7cf81276a0228a2a4417"
 dependencies = [
  "bevy_a11y",
  "bevy_animation",
- "bevy_app 0.15.0",
+ "bevy_app",
  "bevy_asset",
  "bevy_color",
- "bevy_core 0.15.0",
+ "bevy_core",
  "bevy_core_pipeline",
- "bevy_derive 0.15.0",
+ "bevy_derive",
  "bevy_diagnostic",
- "bevy_ecs 0.15.0",
+ "bevy_ecs",
  "bevy_gizmos",
  "bevy_gltf",
  "bevy_hierarchy",
@@ -980,17 +883,17 @@ dependencies = [
  "bevy_math",
  "bevy_pbr",
  "bevy_picking",
- "bevy_ptr 0.15.0",
- "bevy_reflect 0.15.0",
+ "bevy_ptr",
+ "bevy_reflect",
  "bevy_render",
  "bevy_scene",
  "bevy_sprite",
- "bevy_tasks 0.15.0",
+ "bevy_tasks",
  "bevy_text",
  "bevy_time",
  "bevy_transform",
  "bevy_ui",
- "bevy_utils 0.15.0",
+ "bevy_utils",
  "bevy_window",
  "bevy_winit",
 ]
@@ -1002,9 +905,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1a0bdb42b00ac3752f0d6f531fbda8abf313603157a7b3163da8529412119a0a"
 dependencies = [
  "android_log-sys",
- "bevy_app 0.15.0",
- "bevy_ecs 0.15.0",
- "bevy_utils 0.15.0",
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_utils",
  "tracing-error",
  "tracing-log",
  "tracing-oslog",
@@ -1012,18 +915,6 @@ dependencies = [
  "tracing-wasm",
 ]
 
-[[package]]
-name = "bevy_macro_utils"
-version = "0.14.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfc65e570012e64a21f3546df68591aaede8349e6174fb500071677f54f06630"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.90",
- "toml_edit 0.22.22",
-]
-
 [[package]]
 name = "bevy_macro_utils"
 version = "0.15.0"
@@ -1033,7 +924,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "syn 2.0.90",
- "toml_edit 0.22.22",
+ "toml_edit",
 ]
 
 [[package]]
@@ -1042,7 +933,7 @@ version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ae26f952598e293acac783d947b21af1809673cbeba25d76b969a56f287160b"
 dependencies = [
- "bevy_reflect 0.15.0",
+ "bevy_reflect",
  "derive_more",
  "glam",
  "itertools",
@@ -1059,14 +950,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c324d45ca0043a4696d7324b569de65be17066ed3a97dd42205bc28693d20b5"
 dependencies = [
  "bevy_asset",
- "bevy_derive 0.15.0",
- "bevy_ecs 0.15.0",
+ "bevy_derive",
+ "bevy_ecs",
  "bevy_image",
  "bevy_math",
  "bevy_mikktspace",
- "bevy_reflect 0.15.0",
+ "bevy_reflect",
  "bevy_transform",
- "bevy_utils 0.15.0",
+ "bevy_utils",
  "bitflags 2.6.0",
  "bytemuck",
  "derive_more",
@@ -1090,18 +981,18 @@ version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "01b3bd8e646ddd3f27743b712957d2990d7361eb21044accc47c4f66711bf2cb"
 dependencies = [
- "bevy_app 0.15.0",
+ "bevy_app",
  "bevy_asset",
  "bevy_color",
  "bevy_core_pipeline",
- "bevy_derive 0.15.0",
- "bevy_ecs 0.15.0",
+ "bevy_derive",
+ "bevy_ecs",
  "bevy_image",
  "bevy_math",
- "bevy_reflect 0.15.0",
+ "bevy_reflect",
  "bevy_render",
  "bevy_transform",
- "bevy_utils 0.15.0",
+ "bevy_utils",
  "bevy_window",
  "bitflags 2.6.0",
  "bytemuck",
@@ -1119,51 +1010,28 @@ version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97a137ed706574dc4a01cac527eb2c44a0b0e477d5bce3afc892a9ee95ee0078"
 dependencies = [
- "bevy_app 0.15.0",
+ "bevy_app",
  "bevy_asset",
- "bevy_derive 0.15.0",
- "bevy_ecs 0.15.0",
+ "bevy_derive",
+ "bevy_ecs",
  "bevy_hierarchy",
  "bevy_input",
  "bevy_math",
- "bevy_reflect 0.15.0",
+ "bevy_reflect",
  "bevy_render",
  "bevy_time",
  "bevy_transform",
- "bevy_utils 0.15.0",
+ "bevy_utils",
  "bevy_window",
  "uuid",
 ]
 
-[[package]]
-name = "bevy_ptr"
-version = "0.14.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61baa1bdc1f4a7ac2c18217570a7cc04e1cd54d38456e91782f0371c79afe0a8"
-
 [[package]]
 name = "bevy_ptr"
 version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2af9e30b40fb3f0a80a658419f670f2de1e743efcaca1952c43cdcc923287944"
 
-[[package]]
-name = "bevy_reflect"
-version = "0.14.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2508785a4a5809f25a237eec4fee2c91a4dbcf81324b2bbc2d6c52629e603781"
-dependencies = [
- "bevy_ptr 0.14.2",
- "bevy_reflect_derive 0.14.2",
- "bevy_utils 0.14.2",
- "downcast-rs",
- "erased-serde",
- "serde",
- "smallvec",
- "smol_str",
- "thiserror 1.0.69",
-]
-
 [[package]]
 name = "bevy_reflect"
 version = "0.15.0"
@@ -1171,9 +1039,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "52a37e2ae5ed62df4a0e3f958076effe280b39bc81fe878587350897a89332a2"
 dependencies = [
  "assert_type_match",
- "bevy_ptr 0.15.0",
- "bevy_reflect_derive 0.15.0",
- "bevy_utils 0.15.0",
+ "bevy_ptr",
+ "bevy_reflect_derive",
+ "bevy_utils",
  "derive_more",
  "disqualified",
  "downcast-rs",
@@ -1186,26 +1054,13 @@ dependencies = [
  "uuid",
 ]
 
-[[package]]
-name = "bevy_reflect_derive"
-version = "0.14.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "967d5da1882ec3bb3675353915d3da909cafac033cbf31e58727824a1ad2a288"
-dependencies = [
- "bevy_macro_utils 0.14.2",
- "proc-macro2",
- "quote",
- "syn 2.0.90",
- "uuid",
-]
-
 [[package]]
 name = "bevy_reflect_derive"
 version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94c683fc68c75fc26f90bb1e529590095380d7cec66f6610dbe6b93d9fd26f94"
 dependencies = [
- "bevy_macro_utils 0.15.0",
+ "bevy_macro_utils",
  "proc-macro2",
  "quote",
  "syn 2.0.90",
@@ -1219,24 +1074,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d188f392edf4edcae53dfda07f3ec618a7a704183ec3f2e8504657a9fb940c8a"
 dependencies = [
  "async-channel",
- "bevy_app 0.15.0",
+ "bevy_app",
  "bevy_asset",
  "bevy_color",
- "bevy_core 0.15.0",
- "bevy_derive 0.15.0",
+ "bevy_core",
+ "bevy_derive",
  "bevy_diagnostic",
- "bevy_ecs 0.15.0",
+ "bevy_ecs",
  "bevy_encase_derive",
  "bevy_hierarchy",
  "bevy_image",
  "bevy_math",
  "bevy_mesh",
- "bevy_reflect 0.15.0",
+ "bevy_reflect",
  "bevy_render_macros",
- "bevy_tasks 0.15.0",
+ "bevy_tasks",
  "bevy_time",
  "bevy_transform",
- "bevy_utils 0.15.0",
+ "bevy_utils",
  "bevy_window",
  "bytemuck",
  "codespan-reporting",
@@ -1266,7 +1121,7 @@ version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ab37ee2945f93e9ba8daf91cd968b4cba9c677ac51d349dd8512a107a9a5d92"
 dependencies = [
- "bevy_macro_utils 0.15.0",
+ "bevy_macro_utils",
  "proc-macro2",
  "quote",
  "syn 2.0.90",
@@ -1278,15 +1133,15 @@ version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0e883fd3c6d6e7761f1fe662e79bc7bdc7e917e73e7bfc434b1d16d2a5852119"
 dependencies = [
- "bevy_app 0.15.0",
+ "bevy_app",
  "bevy_asset",
- "bevy_derive 0.15.0",
- "bevy_ecs 0.15.0",
+ "bevy_derive",
+ "bevy_ecs",
  "bevy_hierarchy",
- "bevy_reflect 0.15.0",
+ "bevy_reflect",
  "bevy_render",
  "bevy_transform",
- "bevy_utils 0.15.0",
+ "bevy_utils",
  "derive_more",
  "serde",
  "uuid",
@@ -1298,19 +1153,19 @@ version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e975abc3f3f3432d6ad86ae32de804e96d7faf59d27f32b065b5ddc1e73ed7e1"
 dependencies = [
- "bevy_app 0.15.0",
+ "bevy_app",
  "bevy_asset",
  "bevy_color",
  "bevy_core_pipeline",
- "bevy_derive 0.15.0",
- "bevy_ecs 0.15.0",
+ "bevy_derive",
+ "bevy_ecs",
  "bevy_image",
  "bevy_math",
  "bevy_picking",
- "bevy_reflect 0.15.0",
+ "bevy_reflect",
  "bevy_render",
  "bevy_transform",
- "bevy_utils 0.15.0",
+ "bevy_utils",
  "bevy_window",
  "bitflags 2.6.0",
  "bytemuck",
@@ -1329,12 +1184,12 @@ version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "036ec832197eae51b8a842220d2df03591dff75b4566dcf0f81153bbcb2b593b"
 dependencies = [
- "bevy_app 0.15.0",
- "bevy_ecs 0.15.0",
+ "bevy_app",
+ "bevy_ecs",
  "bevy_hierarchy",
- "bevy_reflect 0.15.0",
+ "bevy_reflect",
  "bevy_state_macros",
- "bevy_utils 0.15.0",
+ "bevy_utils",
 ]
 
 [[package]]
@@ -1343,23 +1198,12 @@ version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2828eb6762af9eccfebb5e4a0e56dbc4bd07bf3192083fa3e8525cfdb3e95add"
 dependencies = [
- "bevy_macro_utils 0.15.0",
+ "bevy_macro_utils",
  "proc-macro2",
  "quote",
  "syn 2.0.90",
 ]
 
-[[package]]
-name = "bevy_tasks"
-version = "0.14.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77865f310b1fc48fb05b7c4adbe76607ec01d0c14f8ab4caba4d714c86439946"
-dependencies = [
- "async-executor",
- "futures-lite",
- "wasm-bindgen-futures",
-]
-
 [[package]]
 name = "bevy_tasks"
 version = "0.15.0"
@@ -1381,19 +1225,19 @@ version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fb000b2abad9f82f7a137fac7e0e3d2c6488cbf8dd9ddbb68f9a6b7e7af8d84"
 dependencies = [
- "bevy_app 0.15.0",
+ "bevy_app",
  "bevy_asset",
  "bevy_color",
- "bevy_derive 0.15.0",
- "bevy_ecs 0.15.0",
+ "bevy_derive",
+ "bevy_ecs",
  "bevy_hierarchy",
  "bevy_image",
  "bevy_math",
- "bevy_reflect 0.15.0",
+ "bevy_reflect",
  "bevy_render",
  "bevy_sprite",
  "bevy_transform",
- "bevy_utils 0.15.0",
+ "bevy_utils",
  "bevy_window",
  "cosmic-text",
  "derive_more",
@@ -1409,10 +1253,10 @@ version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "291b6993b899c04554fc034ebb9e0d7fde9cb9b2fb58dcd912bfa6247abdedbb"
 dependencies = [
- "bevy_app 0.15.0",
- "bevy_ecs 0.15.0",
- "bevy_reflect 0.15.0",
- "bevy_utils 0.15.0",
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_reflect",
+ "bevy_utils",
  "crossbeam-channel",
  "serde",
 ]
@@ -1423,11 +1267,11 @@ version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc35665624d0c728107ab0920d5ad2d352362b906a8c376eaf375ec9c751faf4"
 dependencies = [
- "bevy_app 0.15.0",
- "bevy_ecs 0.15.0",
+ "bevy_app",
+ "bevy_ecs",
  "bevy_hierarchy",
  "bevy_math",
- "bevy_reflect 0.15.0",
+ "bevy_reflect",
  "derive_more",
  "serde",
 ]
@@ -1440,22 +1284,22 @@ checksum = "43da3326aa592d6f6326e31893901bf17cd6957ded4e0ea02bc54652e5624b7f"
 dependencies = [
  "accesskit",
  "bevy_a11y",
- "bevy_app 0.15.0",
+ "bevy_app",
  "bevy_asset",
  "bevy_color",
  "bevy_core_pipeline",
- "bevy_derive 0.15.0",
- "bevy_ecs 0.15.0",
+ "bevy_derive",
+ "bevy_ecs",
  "bevy_hierarchy",
  "bevy_image",
  "bevy_input",
  "bevy_math",
- "bevy_reflect 0.15.0",
+ "bevy_reflect",
  "bevy_render",
  "bevy_sprite",
  "bevy_text",
  "bevy_transform",
- "bevy_utils 0.15.0",
+ "bevy_utils",
  "bevy_window",
  "bytemuck",
  "derive_more",
@@ -1465,21 +1309,6 @@ dependencies = [
  "taffy",
 ]
 
-[[package]]
-name = "bevy_utils"
-version = "0.14.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffb0ec333b5965771153bd746f92ffd8aeeb9d008a8620ffd9ed474859381a5e"
-dependencies = [
- "ahash",
- "bevy_utils_proc_macros 0.14.2",
- "getrandom",
- "hashbrown 0.14.5",
- "thread_local",
- "tracing",
- "web-time",
-]
-
 [[package]]
 name = "bevy_utils"
 version = "0.15.0"
@@ -1487,7 +1316,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a0a48bad33c385a7818b7683a16c8b5c6930eded05cd3f176264fc1f5acea473"
 dependencies = [
  "ahash",
- "bevy_utils_proc_macros 0.15.0",
+ "bevy_utils_proc_macros",
  "getrandom",
  "hashbrown 0.14.5",
  "thread_local",
@@ -1495,17 +1324,6 @@ dependencies = [
  "web-time",
 ]
 
-[[package]]
-name = "bevy_utils_proc_macros"
-version = "0.14.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38f1ab8f2f6f58439d260081d89a42b02690e5fdd64f814edc9417d33fcf2857"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.90",
-]
-
 [[package]]
 name = "bevy_utils_proc_macros"
 version = "0.15.0"
@@ -1540,12 +1358,12 @@ checksum = "05f3520279aae65935d6a84443202c154ead3abebf8dae906d095665162de358"
 dependencies = [
  "android-activity",
  "bevy_a11y",
- "bevy_app 0.15.0",
- "bevy_ecs 0.15.0",
+ "bevy_app",
+ "bevy_ecs",
  "bevy_input",
  "bevy_math",
- "bevy_reflect 0.15.0",
- "bevy_utils 0.15.0",
+ "bevy_reflect",
+ "bevy_utils",
  "raw-window-handle",
  "serde",
  "smol_str",
@@ -1561,18 +1379,18 @@ dependencies = [
  "accesskit_winit",
  "approx",
  "bevy_a11y",
- "bevy_app 0.15.0",
+ "bevy_app",
  "bevy_asset",
- "bevy_derive 0.15.0",
- "bevy_ecs 0.15.0",
+ "bevy_derive",
+ "bevy_ecs",
  "bevy_hierarchy",
  "bevy_image",
  "bevy_input",
  "bevy_log",
  "bevy_math",
- "bevy_reflect 0.15.0",
- "bevy_tasks 0.15.0",
- "bevy_utils 0.15.0",
+ "bevy_reflect",
+ "bevy_tasks",
+ "bevy_utils",
  "bevy_window",
  "bytemuck",
  "cfg-if",
@@ -3503,7 +3321,7 @@ version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56"
 dependencies = [
- "proc-macro-crate 3.2.0",
+ "proc-macro-crate",
  "proc-macro2",
  "quote",
  "syn 2.0.90",
@@ -3982,23 +3800,13 @@ dependencies = [
  "syn 2.0.90",
 ]
 
-[[package]]
-name = "proc-macro-crate"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
-dependencies = [
- "once_cell",
- "toml_edit 0.19.15",
-]
-
 [[package]]
 name = "proc-macro-crate"
 version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
 dependencies = [
- "toml_edit 0.22.22",
+ "toml_edit",
 ]
 
 [[package]]
@@ -4584,7 +4392,6 @@ dependencies = [
  "avian2d",
  "bevy",
  "bevy-inspector-egui",
- "bevy-trait-query",
  "bevy_egui",
  "bevy_vector_shapes",
  "chrono",
@@ -4822,17 +4629,6 @@ version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
 
-[[package]]
-name = "toml_edit"
-version = "0.19.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
-dependencies = [
- "indexmap",
- "toml_datetime",
- "winnow 0.5.40",
-]
-
 [[package]]
 name = "toml_edit"
 version = "0.22.22"
@@ -4841,7 +4637,7 @@ checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
 dependencies = [
  "indexmap",
  "toml_datetime",
- "winnow 0.6.20",
+ "winnow",
 ]
 
 [[package]]
@@ -5815,15 +5611,6 @@ dependencies = [
  "xkbcommon-dl",
 ]
 
-[[package]]
-name = "winnow"
-version = "0.5.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "winnow"
 version = "0.6.20"
diff --git a/Cargo.toml b/Cargo.toml
index 1d522bd..a8c9a6c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -32,7 +32,6 @@ bevy-inspector-egui = { version = "0.28.0", default-features = false, features=[
     "egui_clipboard",
     "egui_open_url",
 ] }
-bevy-trait-query = "0.6.0"
 bevy_egui = "0.31.1"
 bevy_vector_shapes = "0.9.2"
 avian2d = { version = "0.1.2", features = ["serialize", "debug-plugin"] }
@@ -69,5 +68,4 @@ opt-level = 3
 
 [patch.crates-io]
 # These crates haven't yet released with 0.15 support.
-avian2d = { git = "https://github.com/Jondolf/avian.git" }
-bevy-trait-query = { git = "https://github.com/JoJoJet/bevy-trait-query.git" }
+avian2d = { git = "https://github.com/Jondolf/avian.git" }
\ No newline at end of file
diff --git a/serve/.nojekyll b/serve/.nojekyll
new file mode 100644
index 0000000..e69de29