From 7a1acb3f0a7f88e21de363f7968a40e0fd4e5cd2 Mon Sep 17 00:00:00 2001
From: Joshua Maleszewski <20520890+Threadzless@users.noreply.github.com>
Date: Sat, 20 Apr 2024 03:45:07 -0400
Subject: [PATCH] Now compatible with bevy 0.13 (#82)

---
 Cargo.lock                                    | 1058 ++++++++---------
 Cargo.toml                                    |   26 +-
 crates/belly_cli/Cargo.toml                   |    4 +-
 crates/belly_cli/src/main.rs                  |    2 +-
 crates/belly_core/Cargo.toml                  |   12 +-
 crates/belly_core/src/element.rs              |    6 +-
 crates/belly_core/src/eml/asset.rs            |    6 +-
 crates/belly_core/src/eml/build.rs            |    9 +-
 crates/belly_core/src/eml/content.rs          |    4 +-
 crates/belly_core/src/eml/parse.rs            |    1 -
 crates/belly_core/src/eml/variant/impls.rs    |    2 +-
 crates/belly_core/src/ess/mod.rs              |   13 +-
 crates/belly_core/src/ess/parser.rs           |    2 +-
 .../src/ess/property/impls/stylebox.rs        |   44 +-
 crates/belly_core/src/ess/property/mod.rs     |    7 +-
 crates/belly_core/src/ess/selector.rs         |   10 -
 crates/belly_core/src/input.rs                |   18 +-
 crates/belly_core/src/relations/connect.rs    |   14 +-
 crates/belly_core/src/relations/mod.rs        |    6 +-
 crates/belly_macro/Cargo.toml                 |    6 +-
 crates/belly_macro/src/widgets.rs             |   20 +-
 crates/belly_widgets/Cargo.toml               |   14 +-
 crates/belly_widgets/src/img.rs               |   13 +-
 crates/belly_widgets/src/input/button.rs      |    3 -
 crates/belly_widgets/src/input/text.rs        |   21 +-
 crates/bevy_stylebox/Cargo.toml               |    2 +-
 crates/bevy_stylebox/src/lib.rs               |    2 +-
 crates/tagstr/Cargo.toml                      |    4 +-
 examples/connections.rs                       |    6 +-
 examples/follow.rs                            |    2 +-
 examples/image-render-to-texture.rs           |   26 +-
 examples/image.rs                             |    1 +
 examples/ui_scale.rs                          |    2 +-
 src/lib.rs                                    |    3 +-
 34 files changed, 672 insertions(+), 697 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6cb6aec..0165b0a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -47,7 +47,7 @@ checksum = "cd3b6ae1eabbfbced10e840fd3fce8a93ae84f174b3e4ba892ab7bcb42e477a7"
 dependencies = [
  "accesskit",
  "accesskit_consumer",
- "objc2",
+ "objc2 0.3.0-beta.3.patch-leaks.3",
  "once_cell",
 ]
 
@@ -67,25 +67,17 @@ dependencies = [
 
 [[package]]
 name = "accesskit_winit"
-version = "0.15.0"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88e39fcec2e10971e188730b7a76bab60647dacc973d4591855ebebcadfaa738"
+checksum = "45f8f7c9f66d454d5fd8e344c8c8c7324b57194e1041b955519fc58a01e77a25"
 dependencies = [
  "accesskit",
  "accesskit_macos",
  "accesskit_windows",
+ "raw-window-handle",
  "winit",
 ]
 
-[[package]]
-name = "addr2line"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
-dependencies = [
- "gimli",
-]
-
 [[package]]
 name = "adler"
 version = "1.0.2"
@@ -143,20 +135,23 @@ dependencies = [
 
 [[package]]
 name = "android-activity"
-version = "0.4.3"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64529721f27c2314ced0890ce45e469574a73e5e6fdd6e9da1860eb29285f5e0"
+checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289"
 dependencies = [
  "android-properties",
- "bitflags 1.3.2",
+ "bitflags 2.4.2",
  "cc",
+ "cesu8",
+ "jni",
  "jni-sys",
  "libc",
  "log",
- "ndk 0.7.0",
+ "ndk",
  "ndk-context",
- "ndk-sys 0.4.1+23.1.7779620",
- "num_enum 0.6.1",
+ "ndk-sys",
+ "num_enum",
+ "thiserror",
 ]
 
 [[package]]
@@ -261,6 +256,12 @@ version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
+[[package]]
+name = "as-raw-xcb-connection"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b"
+
 [[package]]
 name = "ash"
 version = "0.37.3+1.3.251"
@@ -280,17 +281,6 @@ dependencies = [
  "futures-core",
 ]
 
-[[package]]
-name = "async-channel"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
-dependencies = [
- "concurrent-queue",
- "event-listener 2.5.3",
- "futures-core",
-]
-
 [[package]]
 name = "async-channel"
 version = "2.2.0"
@@ -310,33 +300,23 @@ version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c"
 dependencies = [
- "async-lock 3.3.0",
+ "async-lock",
  "async-task",
  "concurrent-queue",
- "fastrand 2.0.1",
- "futures-lite 2.2.0",
+ "fastrand",
+ "futures-lite",
  "slab",
 ]
 
 [[package]]
 name = "async-fs"
-version = "1.6.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06"
+checksum = "bc19683171f287921f2405677dd2ed2549c3b3bda697a563ebc3a121ace2aba1"
 dependencies = [
- "async-lock 2.8.0",
- "autocfg",
+ "async-lock",
  "blocking",
- "futures-lite 1.13.0",
-]
-
-[[package]]
-name = "async-lock"
-version = "2.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b"
-dependencies = [
- "event-listener 2.5.3",
+ "futures-lite",
 ]
 
 [[package]]
@@ -368,21 +348,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
-[[package]]
-name = "backtrace"
-version = "0.3.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
-dependencies = [
- "addr2line",
- "cc",
- "cfg-if",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
-]
-
 [[package]]
 name = "base64"
 version = "0.13.1"
@@ -429,7 +394,7 @@ dependencies = [
 
 [[package]]
 name = "belly_cli"
-version = "0.1.0"
+version = "0.4.0"
 dependencies = [
  "clap",
  "rustdoc-json",
@@ -480,18 +445,18 @@ dependencies = [
 
 [[package]]
 name = "bevy"
-version = "0.12.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4bc7e09282a82a48d70ade0c4c1154b0fd7882a735a39c66766a5d0f4718ea9"
+checksum = "65b9eadaacf8fe971331bc3f250f35c18bc9dace3f96b483062f38ac07e3a1b4"
 dependencies = [
  "bevy_internal",
 ]
 
 [[package]]
 name = "bevy_a11y"
-version = "0.12.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68080288c932634f6563d3a8299efe0ddc9ea6787539c4c771ba250d089a94f0"
+checksum = "cd8ef2795f7f5c816a4eda04834083eb5a92e8fef603bc21d2091c6e3b63621a"
 dependencies = [
  "accesskit",
  "bevy_app",
@@ -501,9 +466,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_animation"
-version = "0.12.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7aa37683b1281e1ba8cf285644e6e3f0704f14b3901c5ee282067ff7ff6f4a56"
+checksum = "e553d68bc937586010ed2194ac66b751bc6238cf622b3ed5a86f4e1581e94509"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -520,9 +485,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_app"
-version = "0.12.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d41731817993f92e4363dd3335558e779e290bc71eefc0b5547052b85810907e"
+checksum = "ab348a32e46d21c5d61794294a92d415a770d26c7ba8951830b127b40b53ccc4"
 dependencies = [
  "bevy_derive",
  "bevy_ecs",
@@ -536,13 +501,13 @@ dependencies = [
 
 [[package]]
 name = "bevy_asset"
-version = "0.12.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "935984568f75867dd7357133b06f4b1502cd2be55e4642d483ce597e46e63bff"
+checksum = "50028e0d4f28a9f6aab48f61b688ba2793141188f88cdc9aa6c2bca2cc02ad35"
 dependencies = [
  "async-broadcast",
  "async-fs",
- "async-lock 2.8.0",
+ "async-lock",
  "bevy_app",
  "bevy_asset_macros",
  "bevy_ecs",
@@ -555,7 +520,7 @@ dependencies = [
  "crossbeam-channel",
  "downcast-rs",
  "futures-io",
- "futures-lite 1.13.0",
+ "futures-lite",
  "js-sys",
  "parking_lot",
  "ron",
@@ -568,9 +533,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_asset_macros"
-version = "0.12.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f48b9bbe4ec605e4910b5cd1e1a0acbfbe0b80af5f3bcc4489a9fdd1e80058c"
+checksum = "6617475908368418d815360148fdbb82f879dc255a70d2d7baa3766f0cd4bfd7"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
@@ -580,9 +545,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_audio"
-version = "0.12.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18a69889e1bfa4dbac4e641536b94f91c441da55796ad9832e77836b8264688b"
+checksum = "b0f12495e230cd5cf59c6051cdd820c97d7fe4f0597d4d9c3240c62e9c65b485"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -592,15 +557,15 @@ dependencies = [
  "bevy_reflect",
  "bevy_transform",
  "bevy_utils",
- "oboe 0.5.0",
+ "cpal",
  "rodio",
 ]
 
 [[package]]
 name = "bevy_core"
-version = "0.12.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3daa24502a14839509f02407bc7e48299fe84d260877de23b60662de0f4f4b6c"
+checksum = "12b0042f241ba7cd61487aadd8addfb56f7eeb662d713ac1577026704508fc6c"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -613,9 +578,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_core_pipeline"
-version = "0.12.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4b77c4fca6e90edbe2e72da7bc9aa7aed7dfdfded0920ae0a0c845f5e11084a"
+checksum = "48b7a471cb8ba665f12f7a167faa5566c11386f5bfc77d2e10bfde22b179f7b3"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -635,9 +600,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_derive"
-version = "0.12.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f484318350462c58ba3942a45a656c1fd6b6e484a6b6b7abc3a787ad1a51e500"
+checksum = "f0e01f8343f391e2d6a63b368b82fb5b252ed43c8713fc87f9a8f2d59407dd00"
 dependencies = [
  "bevy_macro_utils",
  "quote",
@@ -646,9 +611,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_diagnostic"
-version = "0.12.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa38ca5967d335cc1006a0e0f1a86c350e2f15fd1878449f61d04cd57a7c4060"
+checksum = "e1401cdccec7e49378d013dfb0ff62c251f85b3be19dcdf04cfd827f793d1ee9"
 dependencies = [
  "bevy_app",
  "bevy_core",
@@ -656,23 +621,23 @@ dependencies = [
  "bevy_log",
  "bevy_time",
  "bevy_utils",
+ "const-fnv1a-hash",
  "sysinfo",
 ]
 
 [[package]]
 name = "bevy_ecs"
-version = "0.12.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7709fbd22f81fb681534cd913c41e1cd18b17143368743281195d7f024b61aea"
+checksum = "98e612a8e7962ead849e370f3a7e972b88df879ced05cd9dad6a0286d14650cf"
 dependencies = [
- "async-channel 1.9.0",
+ "async-channel",
  "bevy_ecs_macros",
  "bevy_ptr",
  "bevy_reflect",
  "bevy_tasks",
  "bevy_utils",
  "downcast-rs",
- "event-listener 2.5.3",
  "fixedbitset",
  "rustc-hash",
  "serde",
@@ -682,9 +647,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_ecs_macros"
-version = "0.12.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8843aa489f159f25cdcd9fee75cd7d221a7098a71eaa72cb2d6b40ac4e3f1ba"
+checksum = "807b5106c3410e58f4f523b55ea3c071e2a09e31e9510f3c22021c6a04732b5b"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
@@ -694,9 +659,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_encase_derive"
-version = "0.12.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5328a3715e933ebbff07d0e99528dc423c4f7a53590ed1ac19a120348b028990"
+checksum = "887087a5e522d9f20733a84dd7e6e9ca04cd8fdfac659220ed87d675eebc83a7"
 dependencies = [
  "bevy_macro_utils",
  "encase_derive_impl",
@@ -704,9 +669,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_gilrs"
-version = "0.12.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b81ca2ebf66cbc7f998f1f142b15038ffe3c4ae1d51f70adda26dcf51b0c4ca"
+checksum = "7d133c65ab756f130c65cf00f37dc293fb9a9336c891802baf006c63e300d0e2"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -720,15 +685,17 @@ dependencies = [
 
 [[package]]
 name = "bevy_gizmos"
-version = "0.12.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db232274ddca2ae452eb2731b98267b795d133ddd14013121bc7daddde1c7491"
+checksum = "054df3550a9d423a961de65b459946ff23304f97f25af8a62c23f4259db8506d"
 dependencies = [
  "bevy_app",
  "bevy_asset",
  "bevy_core",
  "bevy_core_pipeline",
  "bevy_ecs",
+ "bevy_gizmos_macros",
+ "bevy_log",
  "bevy_math",
  "bevy_pbr",
  "bevy_reflect",
@@ -738,13 +705,25 @@ dependencies = [
  "bevy_utils",
 ]
 
+[[package]]
+name = "bevy_gizmos_macros"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abdcaf74d8cd34aa5c3293527e7a012826840886ad3496c1b963ed8b66b1619f"
+dependencies = [
+ "bevy_macro_utils",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.52",
+]
+
 [[package]]
 name = "bevy_gltf"
-version = "0.12.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85adc6b1fc86687bf67149e0bafaa4d6da432232fa956472d1b37f19121d3ace"
+checksum = "21ecf404295055deb7fe037495891bc135ca10d46bc5b6c55f9ab7b7ebc61d31"
 dependencies = [
- "base64 0.13.1",
+ "base64 0.21.7",
  "bevy_animation",
  "bevy_app",
  "bevy_asset",
@@ -770,9 +749,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_hierarchy"
-version = "0.12.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06bd477152ce2ae1430f5e0a4f19216e5785c22fee1ab23788b5982dc59d1a55"
+checksum = "bbb3dfad24866a6713dafa3065a91c5cf5e355f6e1b191c25d704ae54185246c"
 dependencies = [
  "bevy_app",
  "bevy_core",
@@ -780,28 +759,28 @@ dependencies = [
  "bevy_log",
  "bevy_reflect",
  "bevy_utils",
- "smallvec",
 ]
 
 [[package]]
 name = "bevy_input"
-version = "0.12.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cab9a599189b2a694c182d60cd52219dd9364f9892ff542d87799b8e45d9e6dc"
+checksum = "47f2b2b3df168c6ef661d25e09abf5bd4fecaacd400f27e5db650df1c3fa3a3b"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
  "bevy_math",
  "bevy_reflect",
  "bevy_utils",
+ "smol_str",
  "thiserror",
 ]
 
 [[package]]
 name = "bevy_internal"
-version = "0.12.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f124bece9831afd80897815231072d51bfe3ac58c6bb58eca8880963b6d0487c"
+checksum = "f58ec0ce77603df9474cde61f429126bfe06eb79094440e9141afb4217751c79"
 dependencies = [
  "bevy_a11y",
  "bevy_animation",
@@ -838,9 +817,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_log"
-version = "0.12.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dc10ba1d225a8477b9e80a1bf797d8a8b8274e83c9b24fb4d9351aec9229755"
+checksum = "a5eea6c527fd828b7fef8d0f518167f27f405b904a16f227b644687d3f46a809"
 dependencies = [
  "android_log-sys",
  "bevy_app",
@@ -854,22 +833,22 @@ dependencies = [
 
 [[package]]
 name = "bevy_macro_utils"
-version = "0.12.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e566640c6b6dced73d2006c764c2cffebe1a82be4809486c4a5d7b4b50efed4d"
+checksum = "eb270c98a96243b29465139ed10bda2f675d00a11904f6588a5f7fc4774119c7"
 dependencies = [
  "proc-macro2",
  "quote",
  "rustc-hash",
  "syn 2.0.52",
- "toml_edit 0.20.7",
+ "toml_edit 0.21.1",
 ]
 
 [[package]]
 name = "bevy_math"
-version = "0.12.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58ddc2b76783939c530178f88e5711a1b01044d7b02db4033e2eb8b43b6cf4ec"
+checksum = "f06daa26ffb82d90ba772256c0ba286f6c305c392f6976c9822717974805837c"
 dependencies = [
  "glam",
  "serde",
@@ -877,18 +856,18 @@ dependencies = [
 
 [[package]]
 name = "bevy_mikktspace"
-version = "0.12.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ec4962977a746d870170532fc92759e04d3dbcae8b7b82e7ca3bb83b1d75277"
+checksum = "a0d7ef7f2a826d0b19f059035831ce00a5e930435cc53c61e045773d0483f67a"
 dependencies = [
  "glam",
 ]
 
 [[package]]
 name = "bevy_pbr"
-version = "0.12.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "520bfd2a898c74f84ea52cfb8eb061f37373ad15e623489d5f75d27ebd6138fe"
+checksum = "75b29c80269fa6db55c9e33701edd3ecb73d8866ca8cb814d49a9d3fb72531b6"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -904,7 +883,6 @@ dependencies = [
  "bitflags 2.4.2",
  "bytemuck",
  "fixedbitset",
- "naga_oil",
  "radsort",
  "smallvec",
  "thread_local",
@@ -912,15 +890,15 @@ dependencies = [
 
 [[package]]
 name = "bevy_ptr"
-version = "0.12.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c77ec20c8fafcdc196508ef5ccb4f0400a8d193cb61f7b14a36ed9a25ad423cf"
+checksum = "8050e2869fe341db6874203b5a01ff12673807a2c7c80cb829f6c7bea6997268"
 
 [[package]]
 name = "bevy_reflect"
-version = "0.12.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7921f15fc944c9c8ad01d7dbcea6505b8909c6655cd9382bab1407181556038"
+checksum = "ccbd7de21d586457a340a0962ad0747dc5098ff925eb6b27a918c4bdd8252f7b"
 dependencies = [
  "bevy_math",
  "bevy_ptr",
@@ -930,16 +908,15 @@ dependencies = [
  "erased-serde",
  "glam",
  "serde",
- "smallvec",
  "smol_str",
  "thiserror",
 ]
 
 [[package]]
 name = "bevy_reflect_derive"
-version = "0.12.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4a8c5475f216e751ef4452a1306b00711f33d2d04d9f149e4c845dfeb6753a0"
+checksum = "3ce33051bd49036d4a5a62aa3f2068672ec55f3ebe92aa0d003a341f15cc37ac"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
@@ -950,11 +927,11 @@ dependencies = [
 
 [[package]]
 name = "bevy_render"
-version = "0.12.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdefdd3737125b0d94a6ff20bb70fa8cfe9d7d5dcd72ba4dfe6c5f1d30d9f6e4"
+checksum = "88b2c4b644c739c0b474b6f8f7b0bc68ac13d83b59688781e9a7753c52780177"
 dependencies = [
- "async-channel 1.9.0",
+ "async-channel",
  "basis-universal",
  "bevy_app",
  "bevy_asset",
@@ -978,7 +955,7 @@ dependencies = [
  "codespan-reporting",
  "downcast-rs",
  "encase",
- "futures-lite 1.13.0",
+ "futures-lite",
  "hexasphere",
  "image",
  "js-sys",
@@ -987,7 +964,6 @@ dependencies = [
  "naga_oil",
  "ruzstd",
  "serde",
- "smallvec",
  "thiserror",
  "thread_local",
  "wasm-bindgen",
@@ -997,9 +973,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_render_macros"
-version = "0.12.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64d86bfc5a1e7fbeeaec0c4ceab18155530f5506624670965db3415f75826bea"
+checksum = "720b88406e786e378829b7d43c1ffb5300186912b99904d0d4d8ec6698a4f210"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
@@ -1009,9 +985,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_scene"
-version = "0.12.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7df078b5e406e37c8a1c6ba0d652bf105fde713ce3c3efda7263fe27467eee5"
+checksum = "1f3d2caa1bfe7542dbe2c62e1bcc10791ba181fb744d2fe6711d1d373354da7c"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -1022,7 +998,6 @@ dependencies = [
  "bevy_render",
  "bevy_transform",
  "bevy_utils",
- "ron",
  "serde",
  "thiserror",
  "uuid",
@@ -1030,9 +1005,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_sprite"
-version = "0.12.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7cc0c9d946e17e3e0aaa202f182837bc796c4f862b2e5a805134f873f21cf7f"
+checksum = "8cad1b555161f50e5d62b7fdf7ebeef1b24338aae7a88e51985da9553cd60ddf"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -1063,23 +1038,23 @@ dependencies = [
 
 [[package]]
 name = "bevy_tasks"
-version = "0.12.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4fefa7fe0da8923525f7500e274f1bd60dbd79918a25cf7d0dfa0a6ba15c1cf"
+checksum = "f07fcc4969b357de143509925b39c9a2c56eaa8750828d97f319ca9ed41897cb"
 dependencies = [
- "async-channel 1.9.0",
+ "async-channel",
  "async-executor",
  "async-task",
  "concurrent-queue",
- "futures-lite 1.13.0",
+ "futures-lite",
  "wasm-bindgen-futures",
 ]
 
 [[package]]
 name = "bevy_text"
-version = "0.12.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a9a79d49ca06170d69149949b134c14e8b99ace1444c1ca2cd4743b19d5b055"
+checksum = "c4e8456ae0bea7d6b7621e42c1c12bf66c0891381e62c948ab23920673ce611c"
 dependencies = [
  "ab_glyph",
  "bevy_app",
@@ -1099,9 +1074,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_time"
-version = "0.12.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6250d76eed3077128b6a3d004f9f198b01107800b9824051e32bb658054e837"
+checksum = "38ea5ae9fe7f56f555dbb05a88d34931907873e3f0c7dc426591839eef72fe3e"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -1113,9 +1088,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_transform"
-version = "0.12.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d541e0c292edbd96afae816ee680e02247422423ccd5dc635c1e211a20ed64be"
+checksum = "a0d51a1f332cc00939d2f19ed6b909e5ed7037e39c7e25cc86930d79d432163e"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -1127,9 +1102,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_ui"
-version = "0.12.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d785e3b75dabcb2a8ad0d50933f8f3446d59e512cabc2d2a145e28c2bb8792ba"
+checksum = "b6bbc30be39cfbfa3a073b541d22aea43ab14452dea12d7411ce201df17ff7b1"
 dependencies = [
  "bevy_a11y",
  "bevy_app",
@@ -1149,35 +1124,34 @@ dependencies = [
  "bevy_utils",
  "bevy_window",
  "bytemuck",
- "serde",
- "smallvec",
  "taffy",
  "thiserror",
 ]
 
 [[package]]
 name = "bevy_utils"
-version = "0.12.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7915222f4a08ccc782e08d10b751b42e5f9d786e697d0cb3fd09333cb7e8b6ea"
+checksum = "5a9f845a985c00e0ee8dc2d8af3f417be925fb52aad4bda5b96e2e58a2b4d2eb"
 dependencies = [
  "ahash",
  "bevy_utils_proc_macros",
  "getrandom",
  "hashbrown 0.14.3",
- "instant",
  "nonmax",
  "petgraph",
+ "smallvec",
  "thiserror",
  "tracing",
  "uuid",
+ "web-time",
 ]
 
 [[package]]
 name = "bevy_utils_proc_macros"
-version = "0.12.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7aafecc952b6b8eb1a93c12590bd867d25df2f4ae1033a01dfdfc3c35ebccfff"
+checksum = "bef158627f30503d5c18c20c60b444829f698d343516eeaf6eeee078c9a45163"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1186,9 +1160,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_window"
-version = "0.12.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41ee72bf7f974000e9b31bb971a89387f1432ba9413f35c4fef59fef49767260"
+checksum = "976202d2ed838176595b550ac654b15ae236e0178a6f19a94ca6d58f2a96ca60"
 dependencies = [
  "bevy_a11y",
  "bevy_app",
@@ -1198,13 +1172,14 @@ dependencies = [
  "bevy_reflect",
  "bevy_utils",
  "raw-window-handle",
+ "smol_str",
 ]
 
 [[package]]
 name = "bevy_winit"
-version = "0.12.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1eb71f287eca9006dda998784c7b931e400ae2cc4c505da315882a8b082f21ad"
+checksum = "aa66539aa93d8522b146bf82de429714ea6370a6061fc1f1ff7bcacd4e64c6c4"
 dependencies = [
  "accesskit_winit",
  "approx",
@@ -1300,7 +1275,16 @@ version = "0.1.0-beta.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fa55741ee90902547802152aaf3f8e5248aab7e21468089560d4c8840561146"
 dependencies = [
- "objc-sys",
+ "objc-sys 0.2.0-beta.2",
+]
+
+[[package]]
+name = "block-sys"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7"
+dependencies = [
+ "objc-sys 0.3.2",
 ]
 
 [[package]]
@@ -1309,8 +1293,18 @@ version = "0.2.0-alpha.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42"
 dependencies = [
- "block-sys",
- "objc2-encode",
+ "block-sys 0.1.0-beta.1",
+ "objc2-encode 2.0.0-pre.2",
+]
+
+[[package]]
+name = "block2"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68"
+dependencies = [
+ "block-sys 0.2.1",
+ "objc2 0.4.1",
 ]
 
 [[package]]
@@ -1319,12 +1313,12 @@ version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118"
 dependencies = [
- "async-channel 2.2.0",
- "async-lock 3.3.0",
+ "async-channel",
+ "async-lock",
  "async-task",
- "fastrand 2.0.1",
+ "fastrand",
  "futures-io",
- "futures-lite 2.2.0",
+ "futures-lite",
  "piper",
  "tracing",
 ]
@@ -1367,6 +1361,20 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
 
+[[package]]
+name = "calloop"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298"
+dependencies = [
+ "bitflags 2.4.2",
+ "log",
+ "polling",
+ "rustix",
+ "slab",
+ "thiserror",
+]
+
 [[package]]
 name = "camino"
 version = "1.1.6"
@@ -1535,10 +1543,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
 
 [[package]]
-name = "com-rs"
-version = "0.2.1"
+name = "com"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642"
+checksum = "7e17887fd17353b65b1b2ef1c526c83e26cd72e74f598a8dc1bee13a48f3d9f6"
+dependencies = [
+ "com_macros",
+]
+
+[[package]]
+name = "com_macros"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d375883580a668c7481ea6631fc1a8863e33cc335bf56bfad8d7e6d4b04b13a5"
+dependencies = [
+ "com_macros_support",
+ "proc-macro2",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "com_macros_support"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad899a1087a9296d5644792d7cb72b8e34c1bec8e7d4fbc002230169a6e8710c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
 
 [[package]]
 name = "combine"
@@ -1569,6 +1602,12 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "const-fnv1a-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32b13ea120a812beba79e34316b3942a857c86ec1593cb34f27bb28272ce2cca"
+
 [[package]]
 name = "const_panic"
 version = "0.2.8"
@@ -1614,14 +1653,14 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
 
 [[package]]
 name = "core-graphics"
-version = "0.22.3"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb"
+checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081"
 dependencies = [
  "bitflags 1.3.2",
  "core-foundation",
  "core-graphics-types",
- "foreign-types 0.3.2",
+ "foreign-types",
  "libc",
 ]
 
@@ -1670,9 +1709,9 @@ dependencies = [
  "js-sys",
  "libc",
  "mach2",
- "ndk 0.8.0",
+ "ndk",
  "ndk-context",
- "oboe 0.6.1",
+ "oboe",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
@@ -1730,11 +1769,17 @@ dependencies = [
  "syn 2.0.52",
 ]
 
+[[package]]
+name = "cursor-icon"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991"
+
 [[package]]
 name = "d3d12"
-version = "0.7.0"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20"
+checksum = "3e3d747f100290a1ca24b752186f61f6637e1deffe3bf6320de6fcb29510a307"
 dependencies = [
  "bitflags 2.4.2",
  "libloading 0.8.3",
@@ -1753,12 +1798,32 @@ version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
 
+[[package]]
+name = "derive_more"
+version = "0.99.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "dispatch"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
 
+[[package]]
+name = "dlib"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
+dependencies = [
+ "libloading 0.8.3",
+]
+
 [[package]]
 name = "downcast-rs"
 version = "1.2.0"
@@ -1800,9 +1865,9 @@ dependencies = [
 
 [[package]]
 name = "encase"
-version = "0.6.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fce2eeef77fd4a293a54b62aa00ac9daebfbcda4bf8998c5a815635b004aa1c"
+checksum = "95ed933078d2e659745df651f4c180511cd582e5b9414ff896e7d50d207e3103"
 dependencies = [
  "const_panic",
  "encase_derive",
@@ -1812,18 +1877,18 @@ dependencies = [
 
 [[package]]
 name = "encase_derive"
-version = "0.6.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e520cde08cbf4f7cc097f61573ec06ce467019803de8ae82fb2823fa1554a0e"
+checksum = "f4ce1449c7d19eba6cc0abd231150ad81620a8dce29601d7f8d236e5d431d72a"
 dependencies = [
  "encase_derive_impl",
 ]
 
 [[package]]
 name = "encase_derive_impl"
-version = "0.6.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fe2568f851fd6144a45fa91cfed8fe5ca8fc0b56ba6797bfc1ed2771b90e37c"
+checksum = "92959a9e8d13eaa13b8ae8c7b583c3bf1669ca7a8e7708a088d12587ba86effc"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1838,13 +1903,23 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "erased-serde"
-version = "0.3.31"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c"
+checksum = "2b73807008a3c7f171cc40312f37d95ef0396e048b5848d775f54b1a4dd4a0d3"
 dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "errno"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "euclid"
 version = "0.22.9"
@@ -1902,15 +1977,6 @@ dependencies = [
  "pin-project-lite",
 ]
 
-[[package]]
-name = "fastrand"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
-dependencies = [
- "instant",
-]
-
 [[package]]
 name = "fastrand"
 version = "2.0.1"
@@ -1948,15 +2014,6 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared 0.1.1",
-]
-
 [[package]]
 name = "foreign-types"
 version = "0.5.0"
@@ -1964,7 +2021,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
 dependencies = [
  "foreign-types-macros",
- "foreign-types-shared 0.3.1",
+ "foreign-types-shared",
 ]
 
 [[package]]
@@ -1978,12 +2035,6 @@ dependencies = [
  "syn 2.0.52",
 ]
 
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
 [[package]]
 name = "foreign-types-shared"
 version = "0.3.1"
@@ -2004,30 +2055,25 @@ checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
 
 [[package]]
 name = "futures-lite"
-version = "1.13.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
+checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba"
 dependencies = [
- "fastrand 1.9.0",
+ "fastrand",
  "futures-core",
  "futures-io",
- "memchr",
  "parking",
  "pin-project-lite",
- "waker-fn",
 ]
 
 [[package]]
-name = "futures-lite"
-version = "2.2.0"
+name = "gethostname"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba"
+checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818"
 dependencies = [
- "fastrand 2.0.1",
- "futures-core",
- "futures-io",
- "parking",
- "pin-project-lite",
+ "libc",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -2078,16 +2124,21 @@ dependencies = [
 ]
 
 [[package]]
-name = "gimli"
-version = "0.28.1"
+name = "gl_generator"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d"
+dependencies = [
+ "khronos_api",
+ "log",
+ "xml-rs",
+]
 
 [[package]]
 name = "glam"
-version = "0.24.2"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945"
+checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3"
 dependencies = [
  "bytemuck",
  "serde",
@@ -2101,9 +2152,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
 [[package]]
 name = "glow"
-version = "0.12.3"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca0fe580e4b60a8ab24a868bc08e2f03cbcb20d3d676601fa909386713333728"
+checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1"
 dependencies = [
  "js-sys",
  "slotmap",
@@ -2147,6 +2198,15 @@ dependencies = [
  "serde_json",
 ]
 
+[[package]]
+name = "glutin_wgl_sys"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead"
+dependencies = [
+ "gl_generator",
+]
+
 [[package]]
 name = "glyph_brush_layout"
 version = "0.2.3"
@@ -2179,15 +2239,15 @@ dependencies = [
 
 [[package]]
 name = "gpu-allocator"
-version = "0.22.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce95f9e2e11c2c6fadfce42b5af60005db06576f231f5c92550fdded43c423e8"
+checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884"
 dependencies = [
- "backtrace",
  "log",
+ "presser",
  "thiserror",
  "winapi",
- "windows 0.44.0",
+ "windows 0.52.0",
 ]
 
 [[package]]
@@ -2226,12 +2286,6 @@ dependencies = [
  "svg_fmt",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
 [[package]]
 name = "hashbrown"
 version = "0.13.2"
@@ -2254,14 +2308,14 @@ dependencies = [
 
 [[package]]
 name = "hassle-rs"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0"
+checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890"
 dependencies = [
- "bitflags 1.3.2",
- "com-rs",
+ "bitflags 2.4.2",
+ "com",
  "libc",
- "libloading 0.7.4",
+ "libloading 0.8.3",
  "thiserror",
  "widestring",
  "winapi",
@@ -2273,11 +2327,17 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
+[[package]]
+name = "hermit-abi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+
 [[package]]
 name = "hexasphere"
-version = "9.1.0"
+version = "10.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cb3df16a7bcb1b5bc092abd55e14f77ca70aea14445026e264586fc62889a10"
+checksum = "f33ddb7f7143d9e703c072e88b98cd8b9719f174137a671429351bd2ee43c02a"
 dependencies = [
  "constgebra",
  "glam",
@@ -2312,6 +2372,17 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "icrate"
+version = "0.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319"
+dependencies = [
+ "block2 0.3.0",
+ "dispatch",
+ "objc2 0.4.1",
+]
+
 [[package]]
 name = "image"
 version = "0.24.9"
@@ -2325,16 +2396,6 @@ dependencies = [
  "png",
 ]
 
-[[package]]
-name = "indexmap"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
-dependencies = [
- "autocfg",
- "hashbrown 0.12.3",
-]
-
 [[package]]
 name = "indexmap"
 version = "2.2.5"
@@ -2371,18 +2432,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "instant"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
-dependencies = [
- "cfg-if",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
 [[package]]
 name = "io-kit-sys"
 version = "0.4.1"
@@ -2459,15 +2508,21 @@ dependencies = [
 
 [[package]]
 name = "khronos-egl"
-version = "4.1.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3"
+checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76"
 dependencies = [
  "libc",
- "libloading 0.7.4",
+ "libloading 0.8.3",
  "pkg-config",
 ]
 
+[[package]]
+name = "khronos_api"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
+
 [[package]]
 name = "ktx2"
 version = "0.3.0"
@@ -2547,6 +2602,12 @@ dependencies = [
  "pkg-config",
 ]
 
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
+
 [[package]]
 name = "lock_api"
 version = "0.4.11"
@@ -2604,14 +2665,14 @@ checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
 
 [[package]]
 name = "metal"
-version = "0.26.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "623b5e6cefd76e58f774bd3cc0c6f5c7615c58c03a97815245a25c3c9bdee318"
+checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25"
 dependencies = [
  "bitflags 2.4.2",
  "block",
  "core-graphics-types",
- "foreign-types 0.5.0",
+ "foreign-types",
  "log",
  "objc",
  "paste",
@@ -2633,29 +2694,17 @@ dependencies = [
  "simd-adler32",
 ]
 
-[[package]]
-name = "mio"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
-dependencies = [
- "libc",
- "log",
- "wasi",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "naga"
-version = "0.13.0"
+version = "0.19.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1ceaaa4eedaece7e4ec08c55c640ba03dbb73fb812a6570a59bcf1930d0f70e"
+checksum = "50e3524642f53d9af419ab5e8dd29d3ba155708267667c2f3f06c88c9e130843"
 dependencies = [
  "bit-set",
  "bitflags 2.4.2",
  "codespan-reporting",
  "hexf-parse",
- "indexmap 1.9.3",
+ "indexmap",
  "log",
  "num-traits",
  "pp-rs",
@@ -2668,38 +2717,24 @@ dependencies = [
 
 [[package]]
 name = "naga_oil"
-version = "0.10.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ac54c77b3529887f9668d3dd81e955e58f252b31a333f836e3548c06460b958"
+checksum = "c0ea62ae0f2787456afca7209ca180522b41f00cbe159ee369eba1e07d365cd1"
 dependencies = [
  "bit-set",
  "codespan-reporting",
  "data-encoding",
- "indexmap 1.9.3",
+ "indexmap",
  "naga",
  "once_cell",
  "regex",
- "regex-syntax 0.7.5",
+ "regex-syntax 0.8.2",
  "rustc-hash",
  "thiserror",
  "tracing",
  "unicode-ident",
 ]
 
-[[package]]
-name = "ndk"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0"
-dependencies = [
- "bitflags 1.3.2",
- "jni-sys",
- "ndk-sys 0.4.1+23.1.7779620",
- "num_enum 0.5.11",
- "raw-window-handle",
- "thiserror",
-]
-
 [[package]]
 name = "ndk"
 version = "0.8.0"
@@ -2709,8 +2744,9 @@ dependencies = [
  "bitflags 2.4.2",
  "jni-sys",
  "log",
- "ndk-sys 0.5.0+25.2.9519653",
- "num_enum 0.7.2",
+ "ndk-sys",
+ "num_enum",
+ "raw-window-handle",
  "thiserror",
 ]
 
@@ -2720,15 +2756,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
 
-[[package]]
-name = "ndk-sys"
-version = "0.4.1+23.1.7779620"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3"
-dependencies = [
- "jni-sys",
-]
-
 [[package]]
 name = "ndk-sys"
 version = "0.5.0+25.2.9519653"
@@ -2785,17 +2812,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "num-derive"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "num-derive"
 version = "0.4.2"
@@ -2816,55 +2832,13 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "num_enum"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
-dependencies = [
- "num_enum_derive 0.5.11",
-]
-
-[[package]]
-name = "num_enum"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1"
-dependencies = [
- "num_enum_derive 0.6.1",
-]
-
 [[package]]
 name = "num_enum"
 version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845"
 dependencies = [
- "num_enum_derive 0.7.2",
-]
-
-[[package]]
-name = "num_enum_derive"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
-dependencies = [
- "proc-macro-crate 1.3.1",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "num_enum_derive"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6"
-dependencies = [
- "proc-macro-crate 1.3.1",
- "proc-macro2",
- "quote",
- "syn 2.0.52",
+ "num_enum_derive",
 ]
 
 [[package]]
@@ -2873,7 +2847,7 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b"
 dependencies = [
- "proc-macro-crate 3.1.0",
+ "proc-macro-crate",
  "proc-macro2",
  "quote",
  "syn 2.0.52",
@@ -2895,53 +2869,55 @@ version = "0.2.0-beta.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7"
 
+[[package]]
+name = "objc-sys"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7c71324e4180d0899963fc83d9d241ac39e699609fc1025a850aadac8257459"
+
 [[package]]
 name = "objc2"
 version = "0.3.0-beta.3.patch-leaks.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7e01640f9f2cb1220bbe80325e179e532cb3379ebcd1bf2279d703c19fe3a468"
 dependencies = [
- "block2",
- "objc-sys",
- "objc2-encode",
+ "block2 0.2.0-alpha.6",
+ "objc-sys 0.2.0-beta.2",
+ "objc2-encode 2.0.0-pre.2",
 ]
 
 [[package]]
-name = "objc2-encode"
-version = "2.0.0-pre.2"
+name = "objc2"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512"
+checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d"
 dependencies = [
- "objc-sys",
+ "objc-sys 0.3.2",
+ "objc2-encode 3.0.0",
 ]
 
 [[package]]
-name = "objc_exception"
-version = "0.1.2"
+name = "objc2-encode"
+version = "2.0.0-pre.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4"
+checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512"
 dependencies = [
- "cc",
+ "objc-sys 0.2.0-beta.2",
 ]
 
 [[package]]
-name = "object"
-version = "0.32.2"
+name = "objc2-encode"
+version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
-dependencies = [
- "memchr",
-]
+checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666"
 
 [[package]]
-name = "oboe"
-version = "0.5.0"
+name = "objc_exception"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8868cc237ee02e2d9618539a23a8d228b9bb3fc2e7a5b11eed3831de77c395d0"
+checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4"
 dependencies = [
- "num-derive 0.3.3",
- "num-traits",
- "oboe-sys 0.5.0",
+ "cc",
 ]
 
 [[package]]
@@ -2951,20 +2927,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7954d36bcb6c14c5e0de867fb"
 dependencies = [
  "jni",
- "ndk 0.8.0",
+ "ndk",
  "ndk-context",
- "num-derive 0.4.2",
+ "num-derive",
  "num-traits",
- "oboe-sys 0.6.1",
-]
-
-[[package]]
-name = "oboe-sys"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f44155e7fb718d3cfddcf70690b2b51ac4412f347cd9e4fbe511abe9cd7b5f2"
-dependencies = [
- "cc",
+ "oboe-sys",
 ]
 
 [[package]]
@@ -3063,7 +3030,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
 dependencies = [
  "fixedbitset",
- "indexmap 2.2.5",
+ "indexmap",
 ]
 
 [[package]]
@@ -3123,7 +3090,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4"
 dependencies = [
  "atomic-waker",
- "fastrand 2.0.1",
+ "fastrand",
  "futures-io",
 ]
 
@@ -3146,6 +3113,21 @@ dependencies = [
  "miniz_oxide",
 ]
 
+[[package]]
+name = "polling"
+version = "3.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6"
+dependencies = [
+ "cfg-if",
+ "concurrent-queue",
+ "hermit-abi",
+ "pin-project-lite",
+ "rustix",
+ "tracing",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "pp-rs"
 version = "0.2.1"
@@ -3162,14 +3144,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
 [[package]]
-name = "proc-macro-crate"
-version = "1.3.1"
+name = "presser"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
-dependencies = [
- "once_cell",
- "toml_edit 0.19.15",
-]
+checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa"
 
 [[package]]
 name = "proc-macro-crate"
@@ -3267,9 +3245,9 @@ checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab"
 
 [[package]]
 name = "raw-window-handle"
-version = "0.5.2"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9"
+checksum = "42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544"
 
 [[package]]
 name = "rectangle-pack"
@@ -3333,12 +3311,6 @@ version = "0.6.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
-[[package]]
-name = "regex-syntax"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
-
 [[package]]
 name = "regex-syntax"
 version = "0.8.2"
@@ -3382,12 +3354,6 @@ dependencies = [
  "xmlparser",
 ]
 
-[[package]]
-name = "rustc-demangle"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
-
 [[package]]
 name = "rustc-hash"
 version = "1.1.0"
@@ -3416,14 +3382,27 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "rustix"
+version = "0.38.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89"
+dependencies = [
+ "bitflags 2.4.2",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "ruzstd"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3ffab8f9715a0d455df4bbb9d21e91135aab3cd3ca187af0cd0c3c3f868fdc"
+checksum = "58c4eb8a81997cf040a091d1f7e1938aeab6749d3a0dfa73af43cdc32393483d"
 dependencies = [
  "byteorder",
- "thiserror-core",
+ "derive_more",
  "twox-hash",
 ]
 
@@ -3562,12 +3541,11 @@ dependencies = [
 
 [[package]]
 name = "spirv"
-version = "0.2.0+1.5.4"
+version = "0.3.0+sdk-1.3.268.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830"
+checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844"
 dependencies = [
- "bitflags 1.3.2",
- "num-traits",
+ "bitflags 2.4.2",
 ]
 
 [[package]]
@@ -3623,16 +3601,16 @@ dependencies = [
 
 [[package]]
 name = "sysinfo"
-version = "0.29.11"
+version = "0.30.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666"
+checksum = "26d7c217777061d5a2d652aea771fb9ba98b6dade657204b08c4b9604d11555b"
 dependencies = [
  "cfg-if",
  "core-foundation-sys",
  "libc",
  "ntapi",
  "once_cell",
- "winapi",
+ "windows 0.52.0",
 ]
 
 [[package]]
@@ -3649,7 +3627,7 @@ dependencies = [
 
 [[package]]
 name = "tagstr"
-version = "0.1.0"
+version = "0.4.0"
 dependencies = [
  "hashbrown 0.13.2",
  "lazy_static",
@@ -3673,26 +3651,6 @@ dependencies = [
  "thiserror-impl",
 ]
 
-[[package]]
-name = "thiserror-core"
-version = "1.0.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c001ee18b7e5e3f62cbf58c7fe220119e68d902bb7443179c0c8aef30090e999"
-dependencies = [
- "thiserror-core-impl",
-]
-
-[[package]]
-name = "thiserror-core-impl"
-version = "1.0.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4c60d69f36615a077cc7663b9cb8e42275722d23e58a7fa3d2c7f2915d09d04"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.52",
-]
-
 [[package]]
 name = "thiserror-impl"
 version = "1.0.58"
@@ -3744,7 +3702,7 @@ version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af06656561d28735e9c1cd63dfd57132c8155426aa6af24f36a00a351f88c48e"
 dependencies = [
- "indexmap 2.2.5",
+ "indexmap",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -3760,35 +3718,13 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "toml_edit"
-version = "0.19.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
-dependencies = [
- "indexmap 2.2.5",
- "toml_datetime",
- "winnow 0.5.40",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.20.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81"
-dependencies = [
- "indexmap 2.2.5",
- "toml_datetime",
- "winnow 0.5.40",
-]
-
 [[package]]
 name = "toml_edit"
 version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
 dependencies = [
- "indexmap 2.2.5",
+ "indexmap",
  "toml_datetime",
  "winnow 0.5.40",
 ]
@@ -3799,7 +3735,7 @@ version = "0.22.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "18769cd1cec395d70860ceb4d932812a0b4d06b1a4bb336745a4d21b9496e992"
 dependencies = [
- "indexmap 2.2.5",
+ "indexmap",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -3911,6 +3847,12 @@ version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
+[[package]]
+name = "unicode-segmentation"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+
 [[package]]
 name = "unicode-width"
 version = "0.1.11"
@@ -3957,12 +3899,6 @@ version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
-[[package]]
-name = "waker-fn"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690"
-
 [[package]]
 name = "walkdir"
 version = "2.5.0"
@@ -4046,21 +3982,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 
 [[package]]
-name = "wayland-scanner"
-version = "0.29.5"
+name = "web-sys"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53"
+checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
 dependencies = [
- "proc-macro2",
- "quote",
- "xml-rs",
+ "js-sys",
+ "wasm-bindgen",
 ]
 
 [[package]]
-name = "web-sys"
-version = "0.3.69"
+name = "web-time"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
+checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -4068,12 +4003,13 @@ dependencies = [
 
 [[package]]
 name = "wgpu"
-version = "0.17.2"
+version = "0.19.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "752e44d3998ef35f71830dd1ad3da513e628e2e4d4aedb0ab580f850827a0b41"
+checksum = "a4b1213b52478a7631d6e387543ed8f642bc02c578ef4e3b49aca2a29a7df0cb"
 dependencies = [
  "arrayvec",
  "cfg-if",
+ "cfg_aliases",
  "js-sys",
  "log",
  "naga",
@@ -4092,16 +4028,19 @@ dependencies = [
 
 [[package]]
 name = "wgpu-core"
-version = "0.17.1"
+version = "0.19.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f8a44dd301a30ceeed3c27d8c0090433d3da04d7b2a4042738095a424d12ae7"
+checksum = "f9f6b033c2f00ae0bc8ea872c5989777c60bc241aac4e58b24774faa8b391f78"
 dependencies = [
  "arrayvec",
  "bit-vec",
  "bitflags 2.4.2",
+ "cfg_aliases",
  "codespan-reporting",
+ "indexmap",
  "log",
  "naga",
+ "once_cell",
  "parking_lot",
  "profiling",
  "raw-window-handle",
@@ -4115,9 +4054,9 @@ dependencies = [
 
 [[package]]
 name = "wgpu-hal"
-version = "0.17.2"
+version = "0.19.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a80bf0e3c77399bb52850cb0830af9bad073d5cfcb9dd8253bef8125c42db17"
+checksum = "49f972c280505ab52ffe17e94a7413d9d54b58af0114ab226b9fc4999a47082e"
 dependencies = [
  "android_system_properties",
  "arrayvec",
@@ -4125,9 +4064,11 @@ dependencies = [
  "bit-set",
  "bitflags 2.4.2",
  "block",
+ "cfg_aliases",
  "core-graphics-types",
  "d3d12",
  "glow",
+ "glutin_wgl_sys",
  "gpu-alloc",
  "gpu-allocator",
  "gpu-descriptor",
@@ -4139,7 +4080,9 @@ dependencies = [
  "log",
  "metal",
  "naga",
+ "ndk-sys",
  "objc",
+ "once_cell",
  "parking_lot",
  "profiling",
  "range-alloc",
@@ -4156,9 +4099,9 @@ dependencies = [
 
 [[package]]
 name = "wgpu-types"
-version = "0.17.0"
+version = "0.19.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee64d7398d0c2f9ca48922c902ef69c42d000c759f3db41e355f4a570b052b67"
+checksum = "b671ff9fb03f78b46ff176494ee1ebe7d603393f42664be55b64dc8d53969805"
 dependencies = [
  "bitflags 2.4.2",
  "js-sys",
@@ -4204,22 +4147,23 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windows"
-version = "0.44.0"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b"
+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
 dependencies = [
- "windows-targets 0.42.2",
+ "windows-implement",
+ "windows-interface",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
 name = "windows"
-version = "0.48.0"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
 dependencies = [
- "windows-implement",
- "windows-interface",
- "windows-targets 0.48.5",
+ "windows-core 0.52.0",
+ "windows-targets 0.52.4",
 ]
 
 [[package]]
@@ -4482,32 +4426,42 @@ checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
 
 [[package]]
 name = "winit"
-version = "0.28.7"
+version = "0.29.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9596d90b45384f5281384ab204224876e8e8bf7d58366d9b795ad99aa9894b94"
+checksum = "0d59ad965a635657faf09c8f062badd885748428933dad8e8bdd64064d92e5ca"
 dependencies = [
  "android-activity",
- "bitflags 1.3.2",
+ "atomic-waker",
+ "bitflags 2.4.2",
+ "bytemuck",
+ "calloop",
  "cfg_aliases",
  "core-foundation",
  "core-graphics",
- "dispatch",
- "instant",
+ "cursor-icon",
+ "icrate",
+ "js-sys",
  "libc",
  "log",
- "mio",
- "ndk 0.7.0",
- "objc2",
+ "ndk",
+ "ndk-sys",
+ "objc2 0.4.1",
  "once_cell",
  "orbclient",
  "percent-encoding",
  "raw-window-handle",
  "redox_syscall 0.3.5",
+ "rustix",
+ "smol_str",
+ "unicode-segmentation",
  "wasm-bindgen",
- "wayland-scanner",
+ "wasm-bindgen-futures",
  "web-sys",
- "windows-sys 0.45.0",
+ "web-time",
+ "windows-sys 0.48.0",
  "x11-dl",
+ "x11rb",
+ "xkbcommon-dl",
 ]
 
 [[package]]
@@ -4539,12 +4493,52 @@ dependencies = [
  "pkg-config",
 ]
 
+[[package]]
+name = "x11rb"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a"
+dependencies = [
+ "as-raw-xcb-connection",
+ "gethostname",
+ "libc",
+ "libloading 0.8.3",
+ "once_cell",
+ "rustix",
+ "x11rb-protocol",
+]
+
+[[package]]
+name = "x11rb-protocol"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34"
+
 [[package]]
 name = "xi-unicode"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a"
 
+[[package]]
+name = "xkbcommon-dl"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5"
+dependencies = [
+ "bitflags 2.4.2",
+ "dlib",
+ "log",
+ "once_cell",
+ "xkeysym",
+]
+
+[[package]]
+name = "xkeysym"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621"
+
 [[package]]
 name = "xml-rs"
 version = "0.8.19"
diff --git a/Cargo.toml b/Cargo.toml
index 80bee38..325dfe0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "belly"
-version = "0.4.0"
-edition = "2021"
+version = { workspace = true }
+edition = { workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -15,13 +15,29 @@ members = [
     "crates/tagstr",
 ]
 
-[dependencies]
-bevy = "0.12"
-embed-doc-image = "0.1"
+[workspace.package]
+edition = "2021"
+version = "0.4.0"
+
+
+[workspace.dependencies]
+bevy = { version = "0.13" }
+itertools = { version = "0.10.5" }
+
 tagstr = { path = "crates/tagstr" }
 belly_macro = { path = "crates/belly_macro" }
 belly_core = { path = "crates/belly_core" }
 belly_widgets = { path = "crates/belly_widgets" }
+bevy_stylebox = { path = "crates/bevy_stylebox" }
+
+
+[dependencies]
+bevy = { workspace = true }
+embed-doc-image = "0.1"
+tagstr = { workspace = true }
+belly_macro = { workspace = true }
+belly_core = { workspace = true }
+belly_widgets = { workspace = true }
 
 [[example]]
 name = "text_input"
diff --git a/crates/belly_cli/Cargo.toml b/crates/belly_cli/Cargo.toml
index 1b3a4d4..f2fbef7 100644
--- a/crates/belly_cli/Cargo.toml
+++ b/crates/belly_cli/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "belly_cli"
-version = "0.1.0"
-edition = "2021"
+version = { workspace = true }
+edition = { workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/crates/belly_cli/src/main.rs b/crates/belly_cli/src/main.rs
index 49b16a1..ca61c91 100644
--- a/crates/belly_cli/src/main.rs
+++ b/crates/belly_cli/src/main.rs
@@ -3,7 +3,7 @@
 use std::{collections::HashMap, fs::File, io::BufReader};
 
 use clap::{Parser, Subcommand};
-use rustdoc_json;
+
 use rustdoc_types::{Crate, Id, Item, ItemEnum, ItemKind, Module, Type};
 use serde_json::from_reader;
 
diff --git a/crates/belly_core/Cargo.toml b/crates/belly_core/Cargo.toml
index 4e6ce0b..90996e0 100644
--- a/crates/belly_core/Cargo.toml
+++ b/crates/belly_core/Cargo.toml
@@ -1,18 +1,18 @@
 [package]
 name = "belly_core"
-version = "0.4.0"
-edition = "2021"
+version = { workspace = true }
+edition = { workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 anyhow = "1.0"
-bevy = "0.12"
-bevy_stylebox = { path = "../bevy_stylebox" }
+bevy = { workspace = true }
+bevy_stylebox = { workspace = true }
 cssparser = "0.29.6"
-itertools = "0.10.5"
+itertools = { workspace = true }
 lazy_static = "1.4.0"
 roxmltree = "0.16.0"
 smallvec = "1.10.0"
 thiserror = "1.0.50"
-tagstr = { path = "../tagstr" }
+tagstr = { workspace = true }
diff --git a/crates/belly_core/src/element.rs b/crates/belly_core/src/element.rs
index eba7039..7c867df 100644
--- a/crates/belly_core/src/element.rs
+++ b/crates/belly_core/src/element.rs
@@ -1,5 +1,5 @@
 use bevy::ecs::component::Tick;
-use bevy::ecs::query::WorldQuery;
+use bevy::ecs::query::QueryData;
 use bevy::ecs::system::{Command, CommandQueue, SystemMeta, SystemParam};
 use bevy::ecs::world::unsafe_world_cell::UnsafeWorldCell;
 use bevy::ui::UiSystem;
@@ -133,7 +133,7 @@ impl Element {
 #[derive(Resource, Deref, DerefMut, Default)]
 pub struct ElementIdIndex(HashMap<Tag, Entity>);
 
-#[derive(WorldQuery)]
+#[derive(QueryData)]
 pub struct ElementsQuery {
     pub entity: Entity,
     element: &'static Element,
@@ -153,7 +153,7 @@ impl Deref for ElementsQueryItem<'_> {
     }
 }
 
-#[derive(WorldQuery)]
+#[derive(QueryData)]
 pub struct ChildrenQuery {
     children: &'static Children,
 }
diff --git a/crates/belly_core/src/eml/asset.rs b/crates/belly_core/src/eml/asset.rs
index 67b8b43..c2c069a 100644
--- a/crates/belly_core/src/eml/asset.rs
+++ b/crates/belly_core/src/eml/asset.rs
@@ -6,7 +6,7 @@ use bevy::asset::io::Reader;
 use bevy::asset::AsyncReadExt;
 use bevy::reflect::TypePath;
 use bevy::utils::BoxedFuture;
-use bevy::{asset::AssetLoader, prelude::*, reflect::TypeUuid, utils::HashMap};
+use bevy::{asset::AssetLoader, prelude::*, utils::HashMap};
 use std::sync::Arc;
 use tagstr::*;
 use thiserror::Error;
@@ -44,8 +44,8 @@ impl EmlScene {
     }
 }
 
-#[derive(TypeUuid, Clone, TypePath, Asset)]
-#[uuid = "f8d22a65-d671-4fa6-ae8f-0dccdb387ddd"]
+#[derive(Clone, TypePath, Asset)]
+// #[uuid = "f8d22a65-d671-4fa6-ae8f-0dccdb387ddd"]
 pub struct EmlAsset {
     root: Arc<EmlNode>,
 }
diff --git a/crates/belly_core/src/eml/build.rs b/crates/belly_core/src/eml/build.rs
index 371693b..7896ab9 100644
--- a/crates/belly_core/src/eml/build.rs
+++ b/crates/belly_core/src/eml/build.rs
@@ -6,7 +6,6 @@ use crate::{
     tags,
 };
 use bevy::{
-    asset::Asset,
     ecs::system::{Command, CommandQueue, EntityCommands},
     prelude::*,
     ui::FocusPolicy,
@@ -102,9 +101,10 @@ pub struct WidgetContext<'w, 's> {
 }
 
 impl<'w, 's> WidgetContext<'w, 's> {
-    pub fn this<'a>(&'a mut self) -> EntityCommands<'w, 's, 'a> {
+    pub fn this<'a>(&'a mut self) -> EntityCommands<'a> {
         self.commands.entity(self.data.entity)
     }
+
     pub fn load<T: Asset>(&self, path: String) -> Handle<T> {
         self.asset_server.load(path)
     }
@@ -125,7 +125,8 @@ impl<'w, 's> WidgetContext<'w, 's> {
         self.commands.add(command)
     }
 
-    pub fn insert<'a>(&'a mut self, bundle: impl Bundle) -> EntityCommands<'w, 's, 'a> {
+    pub fn insert<'a>(&'a mut self, bundle: impl Bundle) -> EntityCommands<'a> 
+    {
         let mut commands = self.commands.entity(self.data.entity);
         commands.insert(bundle);
         commands
@@ -520,7 +521,7 @@ fn emit_ready_signal(
     mut writer: EventWriter<ReadyEvent>,
 ) {
     for req in requests.read().unique() {
-        writer.send(ReadyEvent(req.0))
+        writer.send(ReadyEvent(req.0));
     }
 }
 
diff --git a/crates/belly_core/src/eml/content.rs b/crates/belly_core/src/eml/content.rs
index eb1dc82..bc38af6 100644
--- a/crates/belly_core/src/eml/content.rs
+++ b/crates/belly_core/src/eml/content.rs
@@ -8,7 +8,7 @@ use crate::{
     to,
 };
 use bevy::{
-    ecs::query::{QueryItem, WorldQuery},
+    ecs::query::{QueryItem, QueryData},
     prelude::*,
 };
 use std::any::TypeId;
@@ -18,7 +18,7 @@ pub trait IntoContent: Sized {
 }
 
 pub trait UpdateContent: Sized {
-    type Query: WorldQuery;
+    type Query: QueryData;
     fn update_content(item: QueryItem<Self::Query>, value: &Self);
 }
 
diff --git a/crates/belly_core/src/eml/parse.rs b/crates/belly_core/src/eml/parse.rs
index e2ddb6a..b2d4d38 100644
--- a/crates/belly_core/src/eml/parse.rs
+++ b/crates/belly_core/src/eml/parse.rs
@@ -1,7 +1,6 @@
 use super::asset::{EmlElement, EmlLoader, EmlNode};
 use super::Variant;
 use crate::{ess::StyleProperty, ElementsError};
-use roxmltree;
 use std::fmt::Display;
 use tagstr::{AsTag, Tag};
 
diff --git a/crates/belly_core/src/eml/variant/impls.rs b/crates/belly_core/src/eml/variant/impls.rs
index e34bbd3..f0d35f3 100644
--- a/crates/belly_core/src/eml/variant/impls.rs
+++ b/crates/belly_core/src/eml/variant/impls.rs
@@ -5,7 +5,7 @@ use crate::{
     ess::{ColorFromHexExtension, StyleProperty, StylePropertyMethods},
     ElementsError,
 };
-use bevy::{asset::Asset, prelude::*};
+use bevy::prelude::*;
 
 use super::{ApplyCommands, Variant};
 
diff --git a/crates/belly_core/src/ess/mod.rs b/crates/belly_core/src/ess/mod.rs
index d0b0462..78f73c1 100644
--- a/crates/belly_core/src/ess/mod.rs
+++ b/crates/belly_core/src/ess/mod.rs
@@ -10,7 +10,7 @@ use bevy::{
     asset::{io::Reader, AssetLoader, AsyncReadExt},
     ecs::system::Command,
     prelude::*,
-    reflect::{TypePath, TypeUuid},
+    reflect::TypePath,
     utils::{hashbrown::hash_map::Keys, BoxedFuture, HashMap},
 };
 pub use property::*;
@@ -98,8 +98,8 @@ impl AssetLoader for EssLoader {
     }
 }
 
-#[derive(Default, TypeUuid, TypePath, Asset)]
-#[uuid = "93767098-caca-4f2b-b1d3-cdc91919be75"]
+#[derive(Default, TypePath, Asset)]
+// #[uuid = "93767098-caca-4f2b-b1d3-cdc91919be75"]
 pub struct StyleSheet {
     weight: usize,
     rules: Vec<StyleRule>,
@@ -200,8 +200,8 @@ impl StyleSheet {
             default: true,
         }
     }
-    pub fn add_rule(&mut self, mut rule: StyleRule) {
-        rule.selector.index = SelectorIndex::new(self.rules.len());
+    pub fn add_rule(&mut self, rule: StyleRule) {
+        // rule.selector.index = SelectorIndex::new(self.rules.len());
         self.rules.push(rule);
     }
 
@@ -286,7 +286,8 @@ fn process_styles_system(
                         }
                     }
                 }
-            }
+            },
+            _ => { info!("Unused") }
         }
     }
     if styles_changed {
diff --git a/crates/belly_core/src/ess/parser.rs b/crates/belly_core/src/ess/parser.rs
index 5c1ac26..8ed5e88 100644
--- a/crates/belly_core/src/ess/parser.rs
+++ b/crates/belly_core/src/ess/parser.rs
@@ -312,7 +312,7 @@ pub fn parse_style_property_value<T: AsRef<str>>(value: T) -> Result<StyleProper
 mod tests {
     use std::str::FromStr;
 
-    use crate::ess::{ExtractProperty, PropertyValue, StylePropertyToken, TransformProperty};
+    use crate::ess::{ExtractProperty, PropertyValue, TransformProperty};
 
     use super::*;
     use bevy::utils::HashMap;
diff --git a/crates/belly_core/src/ess/property/impls/stylebox.rs b/crates/belly_core/src/ess/property/impls/stylebox.rs
index 6582fbf..08b2428 100644
--- a/crates/belly_core/src/ess/property/impls/stylebox.rs
+++ b/crates/belly_core/src/ess/property/impls/stylebox.rs
@@ -12,28 +12,28 @@ use bevy_stylebox::*;
 use tagstr::tag;
 
 compound_style_property! {
-    #[doc = " Specify how to fill the element with region of image sliced by 9 parts."]
-    #[doc = " The `stylebox` property is shorthand property for:"]
-    #[doc = " - `stylebox-source` specifies the source of the image"]
-    #[doc = " - `stylebox-slice` specifies how to slice the image"]
-    #[doc = " - `stylebox-region` specifies the region of the image"]
-    #[doc = " - `stylebox-width` specifies how to resize edges"]
-    #[doc = " - `stylebox-modulate` specifies what color the image should be multiplied by"]
-    #[doc = " "]
-    #[doc = " The format of property is:"]
-    #[doc = " ```css"]
-    #[doc = " source, slice, width, region, modulate"]
-    #[doc = " ```"]
-    #[doc = " Every tail element is optional (you can omit `modulate` for example. If you do,"]
-    #[doc = " you can ompit `region` then. And so on.)"]
-    #[doc = " "]
-    #[doc = " Example:"]
-    #[doc = " ```css"]
-    #[doc = "   stylebox: \"background.png\", 16px 12px, 100%, 0px, blue"]
-    #[doc = "   stylebox: \"background.png\", 5px 20%"]
-    #[doc = " ```"]
-    #[doc = " <!-- @property-type=source, slice, region, width, modulate -->"]
-    #[doc = " <!-- @property-category=Stylebox -->"]
+    /// Specify how to fill the element with region of image sliced by 9 parts.
+    /// The `stylebox` property is shorthand property for:
+    /// - `stylebox-source` specifies the source of the image
+    /// - `stylebox-slice` specifies how to slice the image
+    /// - `stylebox-region` specifies the region of the image
+    /// - `stylebox-width` specifies how to resize edges
+    /// - `stylebox-modulate` specifies what color the image should be multiplied by
+    /// 
+    /// The format of property is:
+    /// ```css
+    /// source, slice, width, region, modulate
+    /// ```
+    /// Every tail element is optional (you can omit `modulate` for example. If you do,
+    /// you can ompit `region` then. And so on.)
+    /// 
+    /// Example:
+    /// ```css
+    ///   stylebox: "background.png", 16px 12px, 100%, 0px, blue
+    ///   stylebox: "background.png", 5px 20%
+    /// ```
+    /// <!-- @property-type=source, slice, region, width, modulate -->
+    /// <!-- @property-category=Stylebox -->
     StyleboxProperty("stylebox", value) {
         let props = match value {
             Variant::String(unparsed) => StyleProperty::try_from(unparsed)?,
diff --git a/crates/belly_core/src/ess/property/mod.rs b/crates/belly_core/src/ess/property/mod.rs
index e92b5f1..c456dc4 100644
--- a/crates/belly_core/src/ess/property/mod.rs
+++ b/crates/belly_core/src/ess/property/mod.rs
@@ -19,9 +19,10 @@ use crate::{
     ess::{ElementsBranch, StyleSheet, Styles},
     ElementsError,
 };
+use bevy::ecs::query::{QueryData, QueryFilter};
 use bevy::ui::UiSystem;
 use bevy::{
-    ecs::query::{QueryItem, ReadOnlyWorldQuery, WorldQuery},
+    ecs::query::QueryItem,
     prelude::*,
     utils::HashMap,
 };
@@ -199,9 +200,9 @@ pub trait Property: Default + Sized + Send + Sync + 'static {
     /// The item value type to be applied by property.
     type Item: Default + Any + Send + Sync;
     /// Which components should be queried when applying the modification. Check [`WorldQuery`] for more.
-    type Components: WorldQuery;
+    type Components: QueryData;
     /// Filters conditions to be applied when querying entities by this property. Check [`WorldQuery`] for more.
-    type Filters: ReadOnlyWorldQuery;
+    type Filters: QueryFilter;
     /// Associate [`PropertyParser`] with [`Property`]
     type Parser: PropertyParser<Self::Item>;
 
diff --git a/crates/belly_core/src/ess/selector.rs b/crates/belly_core/src/ess/selector.rs
index 1ab617f..fd09034 100644
--- a/crates/belly_core/src/ess/selector.rs
+++ b/crates/belly_core/src/ess/selector.rs
@@ -34,15 +34,6 @@ impl Neg for SelectorWeight {
     }
 }
 
-#[derive(Default, Debug)]
-pub struct SelectorIndex(usize);
-
-impl SelectorIndex {
-    pub fn new(value: usize) -> SelectorIndex {
-        SelectorIndex(value)
-    }
-}
-
 #[derive(Debug)]
 pub enum SelectorElement {
     AnyChild,
@@ -244,7 +235,6 @@ impl<'a> SelectorEntry<'a> {
 
 #[derive(Default, Debug)]
 pub struct Selector {
-    pub index: SelectorIndex,
     pub weight: SelectorWeight,
     pub elements: SelectorElements,
 }
diff --git a/crates/belly_core/src/input.rs b/crates/belly_core/src/input.rs
index 0c6c83e..396366b 100644
--- a/crates/belly_core/src/input.rs
+++ b/crates/belly_core/src/input.rs
@@ -1,6 +1,6 @@
 use crate::{element::Element, element::Elements, tags};
 use bevy::{
-    ecs::query::WorldQuery,
+    ecs::query::QueryData,
     prelude::*,
     render::camera::RenderTarget,
     ui::{FocusPolicy, UiStack},
@@ -169,8 +169,8 @@ pub struct State {
 }
 
 /// Main query for [`ui_focus_system`]
-#[derive(WorldQuery)]
-#[world_query(mutable)]
+#[derive(QueryData)]
+#[query_data(mutable)]
 pub struct NodeQuery {
     entity: Entity,
     node: &'static Node,
@@ -185,10 +185,10 @@ pub struct NodeQuery {
 // it emit PointerEvent with associated entities and data.
 pub fn pointer_input_system(
     mut state: Local<State>,
-    camera: Query<(&Camera, Option<&UiCameraConfig>)>,
+    camera: Query<(&Camera, Option<&Visibility>)>,
     primary_window: Query<&Window, With<PrimaryWindow>>,
     windows: Query<&Window, Without<PrimaryWindow>>,
-    mouse_button_input: Res<Input<MouseButton>>,
+    mouse_button_input: Res<ButtonInput<MouseButton>>,
     touches_input: Res<Touches>,
     ui_stack: Res<UiStack>,
     time: Res<Time>,
@@ -201,7 +201,7 @@ pub fn pointer_input_system(
         mouse_button_input.just_pressed(MouseButton::Left) || touches_input.any_just_pressed();
 
     let is_ui_disabled =
-        |camera_ui| matches!(camera_ui, Some(&UiCameraConfig { show_ui: false, .. }));
+        |camera_ui| matches!(camera_ui, Some(&Visibility::Visible));
 
     let cursor_position = camera
         .iter()
@@ -413,8 +413,8 @@ pub fn pointer_input_system(
     }
 }
 
-#[derive(Component)]
-pub struct Focus(bool);
+// #[derive(Component)]
+// pub struct Focus(bool);
 
 #[derive(Resource, Default)]
 pub struct Focused(Option<Entity>);
@@ -532,7 +532,7 @@ pub fn active_system(
 }
 
 pub fn tab_focus_system(
-    keyboard: Res<Input<KeyCode>>,
+    keyboard: Res<ButtonInput<KeyCode>>,
     elements: Query<(Entity, &Element), With<Interaction>>,
     mut requests: EventWriter<RequestFocus>,
 ) {
diff --git a/crates/belly_core/src/relations/connect.rs b/crates/belly_core/src/relations/connect.rs
index 2fe1ffb..234a8a2 100644
--- a/crates/belly_core/src/relations/connect.rs
+++ b/crates/belly_core/src/relations/connect.rs
@@ -1,9 +1,7 @@
 use crate::{element::Elements, relations::RelationsSystems};
 use bevy::{
-    asset::Asset,
     ecs::{
-        event::Event,
-        query::{QueryItem, WorldQuery},
+        query::{QueryData, QueryItem, WorldQuery},
         system::{Command, EntityCommands},
     },
     prelude::*,
@@ -140,7 +138,7 @@ impl<'a, 'w, 's, E: Event> EventContext<'a, 'w, 's, E> {
     pub fn event(&self) -> &'a E {
         self.source_event
     }
-    pub fn entity<'x>(&'x mut self, entity: Entity) -> EntityCommands<'w, 's, 'x> {
+    pub fn entity<'x>(&'x mut self, entity: Entity) -> EntityCommands<'x> {
         self.elements.commands.entity(entity)
     }
     pub fn load<T: Asset>(&self, path: String) -> Handle<T> {
@@ -211,7 +209,7 @@ pub struct Connection<Q: WorldQuery, E: Event> {
     pub(crate) filter: EventFilter<E>,
 }
 
-impl<Q: 'static + WorldQuery, E: Event> Connection<Q, E> {
+impl<Q: 'static + QueryData, E: Event> Connection<Q, E> {
     // pub fn handles(&self, event: &E) -> bool {
     //     (self.filter)(event)
     // }
@@ -230,7 +228,7 @@ impl<Q: 'static + WorldQuery, E: Event> Connection<Q, E> {
     }
 }
 
-impl<Q: 'static + WorldQuery, E: Event> Command for Connection<Q, E> {
+impl<Q: 'static + QueryData, E: Event> Command for Connection<Q, E> {
     fn apply(self, world: &mut World) {
         self.write(world);
     }
@@ -469,7 +467,7 @@ impl<'w, 's, 'a, E: Event> ConnectCommands<'w, 's, 'a, WorldEvent<E>> {
         })
     }
     pub fn to_handler<
-        Q: 'static + WorldQuery,
+        Q: 'static + QueryData,
         F: 'static + Fn(&mut EventContext<E>, &mut QueryItem<Q>),
     >(
         self,
@@ -509,7 +507,7 @@ impl<'w, 's, 'a, E: Event> ConnectCommands<'w, 's, 'a, (Entity, EventFilter<E>)>
     }
 
     pub fn handle<
-        Q: 'static + WorldQuery,
+        Q: 'static + QueryData,
         F: 'static + Fn(&mut EventContext<E>, &mut QueryItem<Q>),
     >(
         self,
diff --git a/crates/belly_core/src/relations/mod.rs b/crates/belly_core/src/relations/mod.rs
index 115ef98..5c1e26c 100644
--- a/crates/belly_core/src/relations/mod.rs
+++ b/crates/belly_core/src/relations/mod.rs
@@ -8,7 +8,7 @@ use crate::{element::Elements, eml::ReadySystemSet, input::InputSystemsSet};
 use self::bind::{BindableSource, BindableTarget, ChangesState};
 pub use self::connect::{Connections, EventContext, Handler};
 use bevy::{
-    ecs::{entity::Entities, event::Event, query::WorldQuery},
+    ecs::{entity::Entities, query::{QueryData, WorldQuery}},
     log::Level,
     prelude::*,
     utils::{tracing::span, HashSet},
@@ -48,7 +48,7 @@ pub fn process_relations_system_b(world: &mut World) {
     relations.run(world);
 }
 
-pub fn process_signals_system<P: 'static + WorldQuery, E: Event>(
+pub fn process_signals_system<P: 'static + QueryData, E: Event>(
     asset_server: Res<AssetServer>,
     connections: Res<Connections<P, E>>,
     time: Res<Time>,
@@ -105,7 +105,7 @@ pub struct BindingSystemsInternal {
 }
 
 impl BindingSystemsInternal {
-    pub fn add_signals_processor<P: 'static + WorldQuery, E: Event>(&self) {
+    pub fn add_signals_processor<P: 'static + QueryData, E: Event>(&self) {
         let entry = (TypeId::of::<P>(), TypeId::of::<E>());
         if self.processors.read().unwrap().contains(&entry) {
             return;
diff --git a/crates/belly_macro/Cargo.toml b/crates/belly_macro/Cargo.toml
index 200f1c4..74af7d7 100644
--- a/crates/belly_macro/Cargo.toml
+++ b/crates/belly_macro/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "belly_macro"
-version = "0.4.0"
-edition = "2021"
+version = { workspace = true }
+edition = { workspace = true }
 
 [lib]
 proc-macro = true
@@ -9,7 +9,7 @@ proc-macro = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bevy = "0.12"
+bevy = { workspace = true }
 quote = "1.0.21"
 syn-rsx = { git = "https://github.com/stoically/syn-rsx.git" }
 # syn-rsx = { git = "https://github.com/jkb0o/syn-rsx.git", branch = "add_syn_printing_feature" }
diff --git a/crates/belly_macro/src/widgets.rs b/crates/belly_macro/src/widgets.rs
index c6a5f79..19f4ca8 100644
--- a/crates/belly_macro/src/widgets.rs
+++ b/crates/belly_macro/src/widgets.rs
@@ -2,7 +2,7 @@ use super::context::Context;
 use super::ess::StyleSheet;
 use super::ext::*;
 use bevy::utils::HashMap;
-use proc_macro2::{Span, TokenStream, TokenTree};
+use proc_macro2::{TokenStream, TokenTree};
 use quote::*;
 use syn::spanned::Spanned;
 
@@ -356,24 +356,6 @@ impl DefaultStyles {
     }
 }
 
-pub trait SpanPos {
-    fn pos(&self) -> usize;
-}
-
-impl SpanPos for Span {
-    fn pos(&self) -> usize {
-        format!("{self:?}")
-            .split("(")
-            .nth(1)
-            .expect("[span] start not splited by (")
-            .split("..")
-            .next()
-            .expect("[span] start not splited by ..")
-            .parse()
-            .unwrap()
-    }
-}
-
 struct WidgetAttributes<'a> {
     ctx: &'a Context,
     name: String,
diff --git a/crates/belly_widgets/Cargo.toml b/crates/belly_widgets/Cargo.toml
index 6213c24..792ec78 100644
--- a/crates/belly_widgets/Cargo.toml
+++ b/crates/belly_widgets/Cargo.toml
@@ -1,14 +1,14 @@
 [package]
 name = "belly_widgets"
-version = "0.4.0"
-edition = "2021"
+version = { workspace = true }
+edition = { workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bevy = "0.12"
-belly_core = { path = "../belly_core" }
-belly_macro = { path = "../belly_macro" }
-tagstr = { path = "../tagstr" }
-itertools = "0.10.5"
+bevy = { workspace = true }
+belly_core = { workspace = true }
+belly_macro = { workspace = true }
+tagstr = { workspace = true }
+itertools = { workspace = true }
 ab_glyph = "0.2.18"
diff --git a/crates/belly_widgets/src/img.rs b/crates/belly_widgets/src/img.rs
index af96e5a..27c9fca 100644
--- a/crates/belly_widgets/src/img.rs
+++ b/crates/belly_widgets/src/img.rs
@@ -1,11 +1,7 @@
-use belly_core::{build::*, relations::connect::EventSource};
+use belly_core::build::*;
 use belly_macro::*;
 
-use bevy::{
-    asset::Asset,
-    prelude::*,
-    // utils::{HashMap, HashSet},
-};
+use bevy::prelude::*;
 use std::collections::{HashMap, HashSet};
 use std::str::FromStr;
 
@@ -297,7 +293,7 @@ fn update_img_size(
                         element.size = Vec2::ZERO;
                     }
                 }
-            }
+            },
             AssetEvent::Added { id }
             | AssetEvent::Modified { id }
             | AssetEvent::LoadedWithDependencies { id } => {
@@ -318,7 +314,8 @@ fn update_img_size(
                         }
                     }
                 }
-            }
+            },
+            AssetEvent::Unused { id: _ } => { },
         }
     }
 }
diff --git a/crates/belly_widgets/src/input/button.rs b/crates/belly_widgets/src/input/button.rs
index ec7be65..a6a261c 100644
--- a/crates/belly_widgets/src/input/button.rs
+++ b/crates/belly_widgets/src/input/button.rs
@@ -2,7 +2,6 @@ use crate::common::prelude::*;
 use crate::tags;
 use belly_core::build::*;
 use belly_core::input;
-use belly_core::relations::connect::EventSource;
 use belly_macro::*;
 
 use bevy::{
@@ -332,8 +331,6 @@ impl TryFrom<&str> for BtnModeGroup {
     }
 }
 
-#[derive(PartialEq, Clone, Debug)]
-struct FloatSequence(Vec<f32>);
 
 #[derive(PartialEq, Clone, Debug, Deref)]
 /// <!-- @type-alias=$repeat -->
diff --git a/crates/belly_widgets/src/input/text.rs b/crates/belly_widgets/src/input/text.rs
index 9cab04d..3c79999 100644
--- a/crates/belly_widgets/src/input/text.rs
+++ b/crates/belly_widgets/src/input/text.rs
@@ -211,7 +211,7 @@ fn get_char_advance(ch: char, font: &Font, font_size: f32) -> f32 {
 fn process_keyboard_input(
     changed_elements: Query<(), Changed<Element>>,
     mut keyboard_input: EventReader<KeyboardInput>,
-    keyboard: Res<Input<KeyCode>>,
+    keyboard: Res<ButtonInput<KeyCode>>,
     fonts: Res<Assets<Font>>,
     nodes: Query<&Node>,
     mut characters: EventReader<ReceivedCharacter>,
@@ -248,9 +248,9 @@ fn process_keyboard_input(
         if !ch.state.is_pressed() {
             continue;
         }
-        let Some(code) = ch.key_code else { continue };
-        match code {
-            KeyCode::Left if !cmd => {
+
+        match ch.key_code {
+            KeyCode::ArrowLeft if !cmd => {
                 if !shift {
                     selected.stop();
                 }
@@ -262,7 +262,7 @@ fn process_keyboard_input(
                     }
                 }
             }
-            KeyCode::Right if !cmd => {
+            KeyCode::ArrowRight if !cmd => {
                 if !shift {
                     selected.stop();
                 }
@@ -275,7 +275,7 @@ fn process_keyboard_input(
                 }
             }
 
-            KeyCode::Up | KeyCode::Home | KeyCode::Left => {
+            KeyCode::ArrowUp | KeyCode::Home | KeyCode::ArrowLeft => {
                 if !shift {
                     selected.stop();
                 }
@@ -286,7 +286,7 @@ fn process_keyboard_input(
                     selected.extend(index);
                 }
             }
-            KeyCode::Down | KeyCode::End | KeyCode::Right => {
+            KeyCode::ArrowDown | KeyCode::End | KeyCode::ArrowRight => {
                 if !shift {
                     selected.stop();
                 }
@@ -297,7 +297,7 @@ fn process_keyboard_input(
                     selected.extend(index);
                 }
             }
-            KeyCode::Back => {
+            KeyCode::Backspace => {
                 if !selected.is_empty() {
                     chars.drain(selected.range());
                     index = selected.min;
@@ -327,7 +327,8 @@ fn process_keyboard_input(
     }
     for ch in characters
         .read()
-        .map(|c| c.char)
+        .map(|c| c.char.chars())
+        .flatten()
         .filter(|c| !c.is_control())
     {
         if !selected.is_empty() {
@@ -450,7 +451,7 @@ fn process_mouse(
     texts: Query<&Text>,
     styles: Query<(&Style, &GlobalTransform, &Node)>,
     fonts: Res<Assets<Font>>,
-    keyboard: Res<Input<KeyCode>>,
+    keyboard: Res<ButtonInput<KeyCode>>,
 ) {
     for evt in events
         .read()
diff --git a/crates/bevy_stylebox/Cargo.toml b/crates/bevy_stylebox/Cargo.toml
index 94018e2..1eeec50 100644
--- a/crates/bevy_stylebox/Cargo.toml
+++ b/crates/bevy_stylebox/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bevy = "0.12"
+bevy = { workspace = true }
 
 [features]
 basis-universal = ["bevy/basis-universal"]
diff --git a/crates/bevy_stylebox/src/lib.rs b/crates/bevy_stylebox/src/lib.rs
index a7427c6..a96b5a8 100644
--- a/crates/bevy_stylebox/src/lib.rs
+++ b/crates/bevy_stylebox/src/lib.rs
@@ -4,7 +4,6 @@
 /// generates more vertices in the rendering system. Only `stretch` mode is
 /// supported for now for drawing edges, `repeat` & `round` coming soon.
 use bevy::{
-    math::Rect,
     prelude::*,
     render::{Extract, RenderApp},
     ui::{ExtractedUiNode, ExtractedUiNodes, FocusPolicy, RenderUiSystem, UiStack},
@@ -448,6 +447,7 @@ pub fn extract_stylebox(
                     stack_index: stack_index as u32,
                     flip_x: false,
                     flip_y: false,
+                    camera_entity: Entity::PLACEHOLDER
                 },
             );
 
diff --git a/crates/tagstr/Cargo.toml b/crates/tagstr/Cargo.toml
index 39fc7cc..f4b96b3 100644
--- a/crates/tagstr/Cargo.toml
+++ b/crates/tagstr/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "tagstr"
-version = "0.1.0"
-edition = "2021"
+version = { workspace = true }
+edition = { workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/examples/connections.rs b/examples/connections.rs
index e990dc5..5b061b3 100644
--- a/examples/connections.rs
+++ b/examples/connections.rs
@@ -35,7 +35,7 @@ enum ButtonEvent {
 // It is possible to connect to this events with
 // commands.connect().event(space_key_released)
 fn space_key_released(event: &KeyboardInput) -> bool {
-    if event.key_code == Some(KeyCode::Space) {
+    if event.key_code == KeyCode::Space {
         match event.state {
             bevy::input::ButtonState::Released => true,
             _ => false,
@@ -127,8 +127,8 @@ fn emit_button_events(
 ) {
     for (entity, interaction) in interactions.iter() {
         match interaction {
-            Interaction::Pressed => events.send(ButtonEvent::Press(entity)),
-            Interaction::Hovered => events.send(ButtonEvent::Hover(entity)),
+            Interaction::Pressed => { events.send(ButtonEvent::Press(entity)); },
+            Interaction::Hovered => { events.send(ButtonEvent::Hover(entity)); },
             _ => {}
         }
     }
diff --git a/examples/follow.rs b/examples/follow.rs
index ce4fb9e..baed5b1 100644
--- a/examples/follow.rs
+++ b/examples/follow.rs
@@ -24,7 +24,7 @@ fn setup(mut commands: Commands) {
 }
 
 fn spawn_sprites(
-    keys: Res<Input<KeyCode>>,
+    keys: Res<ButtonInput<KeyCode>>,
     mut elements: Elements,
     mut commands: Commands,
     assets: Res<AssetServer>,
diff --git a/examples/image-render-to-texture.rs b/examples/image-render-to-texture.rs
index 0d28102..e3b4e1e 100644
--- a/examples/image-render-to-texture.rs
+++ b/examples/image-render-to-texture.rs
@@ -7,15 +7,12 @@
 use belly::prelude::*;
 use bevy::prelude::*;
 
-use bevy::{
-    core_pipeline::clear_color::ClearColorConfig,
-    render::{
-        camera::RenderTarget,
-        render_resource::{
-            Extent3d, TextureDescriptor, TextureDimension, TextureFormat, TextureUsages,
-        },
-        view::RenderLayers,
+use bevy::render::{
+    camera::RenderTarget,
+    render_resource::{
+        Extent3d, TextureDescriptor, TextureDimension, TextureFormat, TextureUsages,
     },
+    view::RenderLayers,
 };
 
 fn main() {
@@ -83,8 +80,8 @@ fn setup_viewport(
 
     let image_handle = images.add(image);
     viewport.image_handle = Some(image_handle.clone());
-
-    let cube_handle = meshes.add(Mesh::from(shape::Cube { size: 4.0 }));
+    
+    let cube_handle = meshes.add(Mesh::from(Cuboid::new(4.0, 4.0, 4.0)));
     let cube_material_handle = materials.add(StandardMaterial {
         base_color: Color::rgb(0.8, 0.7, 0.6),
         reflectance: 0.02,
@@ -114,12 +111,10 @@ fn setup_viewport(
         ..default()
     });
 
+    commands.insert_resource(ClearColor(Color::WHITE));
     commands
         .spawn(Camera3dBundle {
-            camera_3d: Camera3d {
-                clear_color: ClearColorConfig::Custom(Color::WHITE),
-                ..default()
-            },
+            camera_3d: Camera3d::default(),
             camera: Camera {
                 // render before the "main pass" camera
                 order: -1,
@@ -131,7 +126,8 @@ fn setup_viewport(
             ..default()
         })
         .insert(viewport_pass_layer)
-        .insert(UiCameraConfig { show_ui: false });
+        // .insert(UiCameraConfig { show_ui: false })
+        ;
 }
 
 fn setup_ui(mut commands: Commands, asset_server: Res<AssetServer>, viewport: ResMut<Viewport>) {
diff --git a/examples/image.rs b/examples/image.rs
index 146d29d..7ca0695 100644
--- a/examples/image.rs
+++ b/examples/image.rs
@@ -42,6 +42,7 @@ fn setup(mut commands: Commands) {
         }
         buttongroup button {
             flex-grow: 1.0;
+            color: black;
         }
         .red .range-low {
             background-color: #F54C36;
diff --git a/examples/ui_scale.rs b/examples/ui_scale.rs
index c39b7e4..69daf96 100644
--- a/examples/ui_scale.rs
+++ b/examples/ui_scale.rs
@@ -60,5 +60,5 @@ pub fn scale(
 
     let scale_h = ww / 1024.0;
     let scale_w = wh / 768.0;
-    ui_scale.0 = scale_h.min(scale_w) as f64;
+    ui_scale.0 = scale_h.min(scale_w) as f32;
 }
diff --git a/src/lib.rs b/src/lib.rs
index a976a74..9c3a645 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -106,7 +106,8 @@ pub mod prelude {
     pub struct BellyPlugin;
     impl Plugin for BellyPlugin {
         fn build(&self, app: &mut App) {
-            app.add_plugins((ElementsCorePlugin, WidgetsPlugin));
+            app.add_plugins(ElementsCorePlugin);
+            app.add_plugins(WidgetsPlugin);
         }
     }
 }