diff --git a/Cargo.lock b/Cargo.lock
index d41172f..813de19 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -18,6 +18,68 @@ version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046"
 
+[[package]]
+name = "accesskit"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "704d532b1cd3d912bb37499c55a81ac748cc1afa737eedd100ba441acdd47d38"
+
+[[package]]
+name = "accesskit_consumer"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48ba8b23cfca3944012ee2e5c71c02077a400e034c720eed6bd927cb6b4d1fd9"
+dependencies = [
+ "accesskit",
+]
+
+[[package]]
+name = "accesskit_macos"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58d062544d6cc36f4213323b7cb3a0d74ddff4b0d2311ab5e7596f4278bb2cc9"
+dependencies = [
+ "accesskit",
+ "accesskit_consumer",
+ "objc2",
+ "once_cell",
+]
+
+[[package]]
+name = "accesskit_windows"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aaf5b3c3828397ee832ba4a72fb1a4ace10f781e31885f774cbd531014059115"
+dependencies = [
+ "accesskit",
+ "accesskit_consumer",
+ "arrayvec",
+ "once_cell",
+ "paste",
+ "windows",
+]
+
+[[package]]
+name = "accesskit_winit"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbcb615217efc79c4bed3094c4ca76c4bc554751d1da16f3ed4ba0459b1e8f31"
+dependencies = [
+ "accesskit",
+ "accesskit_macos",
+ "accesskit_windows",
+ "winit",
+]
+
+[[package]]
+name = "addr2line"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97"
+dependencies = [
+ "gimli",
+]
+
 [[package]]
 name = "adler"
 version = "1.0.2"
@@ -57,23 +119,35 @@ dependencies = [
 ]
 
 [[package]]
-name = "android_log-sys"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85965b6739a430150bdd138e2374a98af0c3ee0d030b3bb7fc3bddff58d0102e"
-
-[[package]]
-name = "android_logger"
-version = "0.11.3"
+name = "android-activity"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8619b80c242aa7bd638b5c7ddd952addeecb71f69c75e33f1d47b2804f8f883a"
+checksum = "7c77a0045eda8b888c76ea473c2b0515ba6f471d318f8927c5c72240937035a6"
 dependencies = [
- "android_log-sys",
- "env_logger",
+ "android-properties",
+ "bitflags",
+ "cc",
+ "jni-sys",
+ "libc",
  "log",
- "once_cell",
+ "ndk",
+ "ndk-context",
+ "ndk-sys",
+ "num_enum",
 ]
 
+[[package]]
+name = "android-properties"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04"
+
+[[package]]
+name = "android_log-sys"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85965b6739a430150bdd138e2374a98af0c3ee0d030b3bb7fc3bddff58d0102e"
+
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@@ -85,9 +159,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800"
+checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4"
 
 [[package]]
 name = "approx"
@@ -118,15 +192,9 @@ dependencies = [
 
 [[package]]
 name = "arrayref"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
-
-[[package]]
-name = "arrayvec"
-version = "0.5.2"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
+checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
 
 [[package]]
 name = "arrayvec"
@@ -149,20 +217,20 @@ version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833"
 dependencies = [
- "concurrent-queue 2.1.0",
+ "concurrent-queue",
  "event-listener",
  "futures-core",
 ]
 
 [[package]]
 name = "async-executor"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b"
+checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb"
 dependencies = [
  "async-lock",
  "async-task",
- "concurrent-queue 2.1.0",
+ "concurrent-queue",
  "fastrand",
  "futures-lite",
  "slab",
@@ -170,19 +238,18 @@ dependencies = [
 
 [[package]]
 name = "async-lock"
-version = "2.6.0"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8101efe8695a6c17e02911402145357e718ac92d3ff88ae8419e84b1707b685"
+checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7"
 dependencies = [
  "event-listener",
- "futures-lite",
 ]
 
 [[package]]
 name = "async-task"
-version = "4.3.0"
+version = "4.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524"
+checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae"
 
 [[package]]
 name = "atomic_refcell"
@@ -196,20 +263,47 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
+[[package]]
+name = "backtrace"
+version = "0.3.67"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide 0.6.2",
+ "object",
+ "rustc-demangle",
+]
+
 [[package]]
 name = "bevy"
-version = "0.9.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dae99b246505811f5bc19d2de1e406ec5d2816b421d58fa223779eb576f472c9"
+checksum = "b93f906133305915d63f04108e6873c1b93a6605fe374b8f3391f6bda093e396"
 dependencies = [
  "bevy_internal",
 ]
 
+[[package]]
+name = "bevy_a11y"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "037c4063f7dac1a5d596eb47f40782a04ca5838dc4274dbbadc90eb81efe5169"
+dependencies = [
+ "accesskit",
+ "bevy_app",
+ "bevy_derive",
+ "bevy_ecs",
+]
+
 [[package]]
 name = "bevy_app"
-version = "0.9.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "536e4d0018347478545ed8b6cb6e57b9279ee984868e81b7c0e78e0fb3222e42"
+checksum = "01db46963eb9486f7884121527ec69751d0e448f9e1d5329e80ea3424118a31a"
 dependencies = [
  "bevy_derive",
  "bevy_ecs",
@@ -222,9 +316,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_asset"
-version = "0.9.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db1bb550168304df69c867c09125e1aae7ff51cf21575396e1598bf293442c4"
+checksum = "98609b4b0694a23bde0628aed626644967991f167aad9db2afb68dacb0017540"
 dependencies = [
  "anyhow",
  "bevy_app",
@@ -234,11 +328,11 @@ dependencies = [
  "bevy_reflect",
  "bevy_tasks",
  "bevy_utils",
+ "bevy_winit",
  "crossbeam-channel",
  "downcast-rs",
  "fastrand",
  "js-sys",
- "ndk-glue",
  "parking_lot",
  "serde",
  "thiserror",
@@ -249,9 +343,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_core"
-version = "0.9.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96299aceb3c8362cb4aa39ff81c7ef758a5f4e768d16b5046a91628eff114ac0"
+checksum = "0ee53d7b4691b57207d72e996992c995a53f3e8d21ca7151ca3956d9ce7d232e"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -264,9 +358,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_core_pipeline"
-version = "0.9.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc128a9860aadf16fb343ae427f2768986fd91dce64d945455acda9759c48014"
+checksum = "093ae5ced77251602ad6e43521e2acc1a5570bf85b80f232f1a7fdd43b50f8d8"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -284,20 +378,20 @@ dependencies = [
 
 [[package]]
 name = "bevy_derive"
-version = "0.9.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7baf73c58d41c353c6fd08e6764a2e7420c9f19e8227b391c50981db6d0282a6"
+checksum = "dff0add5ab4a6b2b7e86e18f9043bb48b6386faa3b56abaa0ed97a3d669a1992"
 dependencies = [
  "bevy_macro_utils",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "bevy_diagnostic"
-version = "0.9.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63bf96ec7980fa25b77ff6c72dfafada477936c0dab76c1edf6c028c0e5fe0e4"
+checksum = "64c778422643b0adee9e82abbd07e1e906eb9947c274a9b18e0f7fbf137d4c34"
 dependencies = [
  "bevy_app",
  "bevy_core",
@@ -305,13 +399,14 @@ dependencies = [
  "bevy_log",
  "bevy_time",
  "bevy_utils",
+ "sysinfo",
 ]
 
 [[package]]
 name = "bevy_ecs"
-version = "0.9.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4c071d7c6bc9801253485e05d0c257284150de755391902746837ba21c0cf74"
+checksum = "bed2f74687ccf13046c0f8e3b00dc61d7e656877b4a1380cf04635bb74d8e586"
 dependencies = [
  "async-channel",
  "bevy_ecs_macros",
@@ -322,28 +417,28 @@ dependencies = [
  "downcast-rs",
  "event-listener",
  "fixedbitset",
- "fxhash",
+ "rustc-hash",
  "serde",
  "thread_local",
 ]
 
 [[package]]
 name = "bevy_ecs_macros"
-version = "0.9.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c15bd45438eeb681ad74f2d205bb07a5699f98f9524462a30ec764afab2742ce"
+checksum = "a97fd126a0db7b30fb1833614b3a657b44ac88485741c33b2780e25de0f96d78"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "bevy_encase_derive"
-version = "0.9.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "962b6bb0d30e92ec2e6c29837acce9e55b920733a634e7c3c5fd5a514bea7a24"
+checksum = "c086ebdc1f5522787d63772943277cc74a279445fb65db4d58c2c5330654648e"
 dependencies = [
  "bevy_macro_utils",
  "encase_derive_impl",
@@ -351,9 +446,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_hierarchy"
-version = "0.9.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8dd6d50c48c6e1bcb5e08a768b765323292bb3bf3a439b992754c57ffb85b23a"
+checksum = "9d04099865a13d1fd8bf3c044a80148cb3d23bfe8c3d5f082dda2ce091d85532"
 dependencies = [
  "bevy_app",
  "bevy_core",
@@ -366,9 +461,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_input"
-version = "0.9.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3378b5171284f4c4c0e8307081718a9fe458f846444616bd82d69110dcabca51"
+checksum = "a15d40aa636bb656967ac16ca36066ab7a7bb9179e1b0390c5705e54208e8fd7"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -380,10 +475,11 @@ dependencies = [
 
 [[package]]
 name = "bevy_internal"
-version = "0.9.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c46014b7e885b1311de06b6039e448454a4db55b8d35464798ba88faa186e11"
+checksum = "862b11931c5874cb00778ffb715fc526ee49e52a493d3bcf50e8010f301858b3"
 dependencies = [
+ "bevy_a11y",
  "bevy_app",
  "bevy_core",
  "bevy_core_pipeline",
@@ -403,14 +499,13 @@ dependencies = [
  "bevy_transform",
  "bevy_utils",
  "bevy_window",
- "ndk-glue",
 ]
 
 [[package]]
 name = "bevy_log"
-version = "0.9.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c480bac54cf4ae76edc3ae9ae3fa7c5e1b385e7f2111ef5ec3fd00cf3a7998b"
+checksum = "25980c90ceaad34d09a53291e72ca56fcc754a974cd4654fffcf5b68b283b7a7"
 dependencies = [
  "android_log-sys",
  "bevy_app",
@@ -424,20 +519,20 @@ dependencies = [
 
 [[package]]
 name = "bevy_macro_utils"
-version = "0.9.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "022bb69196deeea691b6997414af85bbd7f2b34a8914c4aa7a7ff4dfa44f7677"
+checksum = "5b2fee53b2497cdc3bffff2ddf52afa751242424a5fd0d51d227d4dab081d0d9"
 dependencies = [
  "quote",
- "syn",
- "toml",
+ "syn 1.0.109",
+ "toml_edit",
 ]
 
 [[package]]
 name = "bevy_math"
-version = "0.9.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d434c77ab766c806ed9062ef8a7285b3b02b47df51f188d4496199c3ac062eaf"
+checksum = "da6a1109d06fe947990db032e719e162414cf9bf7a478dcc52742f1c7136c42a"
 dependencies = [
  "glam",
  "serde",
@@ -445,18 +540,18 @@ dependencies = [
 
 [[package]]
 name = "bevy_mikktspace"
-version = "0.9.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbfb5908d33fd613069be516180b8f138aaaf6e41c36b1fd98c6c29c00c24a13"
+checksum = "39106bc2ee21fce9496d2e15e0ba7925dff63e3eae10f7c1fc0094b56ad9f2bb"
 dependencies = [
  "glam",
 ]
 
 [[package]]
 name = "bevy_pbr"
-version = "0.9.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "310b1f260a475d81445623e138e1b7245759a42310bc1f84b550a3f4ff8763bf"
+checksum = "4f507cef55812aa70c2ec2b30fb996eb285fa7497d974cf03f76ec49c77fbe27"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -476,15 +571,15 @@ dependencies = [
 
 [[package]]
 name = "bevy_ptr"
-version = "0.9.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ec44f7655039546bc5d34d98de877083473f3e9b2b81d560c528d6d74d3eff4"
+checksum = "0c4b88451d4c5a353bff67dbaa937b6886efd26ae114769c17f2b35099c7a4de"
 
 [[package]]
 name = "bevy_reflect"
-version = "0.9.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6deae303a7f69dc243b2fa35b5e193cc920229f448942080c8eb2dbd9de6d37a"
+checksum = "9fc3979471890e336f3ba87961ef3ecd45c331cf2cb2f582c885e541af228b48"
 dependencies = [
  "bevy_math",
  "bevy_ptr",
@@ -502,25 +597,26 @@ dependencies = [
 
 [[package]]
 name = "bevy_reflect_derive"
-version = "0.9.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2bf4cb9cd5acb4193f890f36cb63679f1502e2de025e66a63b194b8b133d018"
+checksum = "2bc7ea7c9bc2c531eb29ba5619976613d6680453ff5dd4a7fcd08848e8bec5ad"
 dependencies = [
  "bevy_macro_utils",
  "bit-set",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
  "uuid",
 ]
 
 [[package]]
 name = "bevy_render"
-version = "0.9.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e3282a8f8779d2aced93207fbed73f740937c6c2bd27bd84f0799b081c7fca5"
+checksum = "ee1e126226f0a4d439bf82fe07c1104f894a6a365888e3eba7356f9647e77a83"
 dependencies = [
  "anyhow",
+ "async-channel",
  "bevy_app",
  "bevy_asset",
  "bevy_core",
@@ -533,6 +629,7 @@ dependencies = [
  "bevy_mikktspace",
  "bevy_reflect",
  "bevy_render_macros",
+ "bevy_tasks",
  "bevy_time",
  "bevy_transform",
  "bevy_utils",
@@ -542,7 +639,6 @@ dependencies = [
  "downcast-rs",
  "encase",
  "futures-lite",
- "hex",
  "hexasphere",
  "image",
  "naga",
@@ -554,30 +650,31 @@ dependencies = [
  "thiserror",
  "thread_local",
  "wgpu",
+ "wgpu-hal",
 ]
 
 [[package]]
 name = "bevy_render_macros"
-version = "0.9.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7acae697776ac05bea523e1725cf2660c91c53abe72c66782ea1e1b9eedb572"
+checksum = "652f8c4d9577c6e6a8b3dfd8a4ce331e8b6ecdbb99636a4b2701dec50104d6bc"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "bevy_tasks"
-version = "0.9.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "680b16b53df9c9f24681dd95f4d772d83760bd19adf8bca00f358a3aad997853"
+checksum = "3de86364316e151aeb0897eaaa917c3ad5ee5ef1471a939023cf7f2d5ab76955"
 dependencies = [
  "async-channel",
  "async-executor",
  "async-task",
- "concurrent-queue 1.2.4",
+ "concurrent-queue",
  "futures-lite",
  "once_cell",
  "wasm-bindgen-futures",
@@ -585,22 +682,23 @@ dependencies = [
 
 [[package]]
 name = "bevy_time"
-version = "0.9.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a5c38a6d3ea929c7f81e6adf5a6c62cf7e8c40f5106c2174d6057e9d8ea624d"
+checksum = "d3edbd605df1bced312eb9888d6be3d5a5fcac3d4140038bbe3233d218399eef"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
  "bevy_reflect",
  "bevy_utils",
  "crossbeam-channel",
+ "thiserror",
 ]
 
 [[package]]
 name = "bevy_transform"
-version = "0.9.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba13c57a040b89767191a6f6d720a635b7792793628bfa41a9e38b7026484aec"
+checksum = "24383dfb97d8a14b17721ecfdf58556eff5ea9a4b2a3d91accf2b472783880b0"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -611,30 +709,43 @@ dependencies = [
 
 [[package]]
 name = "bevy_utils"
-version = "0.9.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16750aae52cd35bd7b60eb61cee883420b250e11b4a290b8d44b2b2941795739"
+checksum = "0a88ebbca55d360d72e9fe78df0d22e25cd419933c9559e79dae2757f7c4d066"
 dependencies = [
  "ahash 0.7.6",
+ "bevy_utils_proc_macros",
  "getrandom",
  "hashbrown",
  "instant",
+ "petgraph",
+ "thiserror",
  "tracing",
  "uuid",
 ]
 
+[[package]]
+name = "bevy_utils_proc_macros"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "630b92e32fa5cd7917c7d4fdbf63a90af958b01e096239f71bc4f8f3cf40c0d2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "bevy_vulkano"
-version = "0.10.0"
+version = "0.11.0"
 dependencies = [
  "anyhow",
  "approx",
  "bevy",
- "bytemuck",
  "egui_winit_vulkano",
  "image",
  "rand",
- "raw-window-handle 0.5.0",
+ "raw-window-handle",
  "vulkano",
  "vulkano-shaders",
  "vulkano-util",
@@ -643,9 +754,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_window"
-version = "0.9.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a44d3f3bd54a2261f4f57f614bf7bccc8d2832761493c0cd7dab81d98cc151e"
+checksum = "ad31234754268fbe12050290b0496e2296252a16995a38f94bfb9680a4f09fda"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -653,7 +764,32 @@ dependencies = [
  "bevy_math",
  "bevy_reflect",
  "bevy_utils",
- "raw-window-handle 0.5.0",
+ "raw-window-handle",
+]
+
+[[package]]
+name = "bevy_winit"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf17bd6330f7e633b7c56754c776511a8f52cde4bf54c0278f34d7527548f253"
+dependencies = [
+ "accesskit_winit",
+ "approx",
+ "bevy_a11y",
+ "bevy_app",
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_hierarchy",
+ "bevy_input",
+ "bevy_math",
+ "bevy_utils",
+ "bevy_window",
+ "crossbeam-channel",
+ "once_cell",
+ "raw-window-handle",
+ "wasm-bindgen",
+ "web-sys",
+ "winit",
 ]
 
 [[package]]
@@ -673,9 +809,9 @@ checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
 
 [[package]]
 name = "bit_field"
-version = "0.10.1"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcb6dd1c2376d2e096796e234a70e17e94cc2d5d54ff8ce42b28cef1d0d359a4"
+checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61"
 
 [[package]]
 name = "bitflags"
@@ -689,6 +825,25 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
 
+[[package]]
+name = "block-sys"
+version = "0.1.0-beta.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fa55741ee90902547802152aaf3f8e5248aab7e21468089560d4c8840561146"
+dependencies = [
+ "objc-sys",
+]
+
+[[package]]
+name = "block2"
+version = "0.2.0-alpha.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42"
+dependencies = [
+ "block-sys",
+ "objc2-encode",
+]
+
 [[package]]
 name = "bumpalo"
 version = "3.12.0"
@@ -697,22 +852,22 @@ checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
 
 [[package]]
 name = "bytemuck"
-version = "1.13.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c041d3eab048880cb0b86b256447da3f18859a163c3b8d8893f4e6368abe6393"
+checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea"
 dependencies = [
  "bytemuck_derive",
 ]
 
 [[package]]
 name = "bytemuck_derive"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aca418a974d83d40a0c1f0c5cba6ff4bc28d8df099109ca459a2118d40b6322"
+checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.14",
 ]
 
 [[package]]
@@ -727,12 +882,6 @@ version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
 
-[[package]]
-name = "cache-padded"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c"
-
 [[package]]
 name = "calloop"
 version = "0.10.5"
@@ -751,6 +900,9 @@ name = "cc"
 version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+dependencies = [
+ "jobserver",
+]
 
 [[package]]
 name = "cesu8"
@@ -783,44 +935,13 @@ dependencies = [
 
 [[package]]
 name = "cmake"
-version = "0.1.49"
+version = "0.1.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db34956e100b30725f2eb215f90d4871051239535632f84fea3bc92722c66b7c"
+checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130"
 dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "cocoa"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a"
-dependencies = [
- "bitflags",
- "block",
- "cocoa-foundation",
- "core-foundation",
- "core-graphics",
- "foreign-types 0.3.2",
- "libc",
- "objc",
-]
-
-[[package]]
-name = "cocoa-foundation"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318"
-dependencies = [
- "bitflags",
- "block",
- "core-foundation",
- "core-graphics-types",
- "foreign-types 0.3.2",
- "libc",
- "objc",
-]
-
 [[package]]
 name = "codespan-reporting"
 version = "0.11.1"
@@ -837,6 +958,12 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
+[[package]]
+name = "com-rs"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642"
+
 [[package]]
 name = "combine"
 version = "4.6.6"
@@ -849,18 +976,9 @@ dependencies = [
 
 [[package]]
 name = "concurrent-queue"
-version = "1.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c"
-dependencies = [
- "cache-padded",
-]
-
-[[package]]
-name = "concurrent-queue"
-version = "2.1.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e"
+checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c"
 dependencies = [
  "crossbeam-utils",
 ]
@@ -893,9 +1011,9 @@ dependencies = [
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
+checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
 
 [[package]]
 name = "core-graphics"
@@ -906,7 +1024,7 @@ dependencies = [
  "bitflags",
  "core-foundation",
  "core-graphics-types",
- "foreign-types 0.3.2",
+ "foreign-types",
  "libc",
 ]
 
@@ -918,19 +1036,7 @@ checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b"
 dependencies = [
  "bitflags",
  "core-foundation",
- "foreign-types 0.3.2",
- "libc",
-]
-
-[[package]]
-name = "core-text"
-version = "19.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99d74ada66e07c1cefa18f8abfba765b486f250de2e4a999e5727fc0dd4b4a25"
-dependencies = [
- "core-foundation",
- "core-graphics",
- "foreign-types 0.3.2",
+ "foreign-types",
  "libc",
 ]
 
@@ -945,9 +1051,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.6"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521"
+checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
 dependencies = [
  "cfg-if",
  "crossbeam-utils",
@@ -955,9 +1061,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc"
+checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
 dependencies = [
  "cfg-if",
  "crossbeam-epoch",
@@ -966,14 +1072,14 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.13"
+version = "0.9.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a"
+checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695"
 dependencies = [
  "autocfg",
  "cfg-if",
  "crossbeam-utils",
- "memoffset 0.7.1",
+ "memoffset 0.8.0",
  "scopeguard",
 ]
 
@@ -989,94 +1095,30 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.14"
+version = "0.8.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f"
+checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b"
 dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "crossfont"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21fd3add36ea31aba1520aa5288714dd63be506106753226d0eb387a93bc9c45"
-dependencies = [
- "cocoa",
- "core-foundation",
- "core-foundation-sys",
- "core-graphics",
- "core-text",
- "dwrote",
- "foreign-types 0.5.0",
- "freetype-rs",
- "libc",
- "log",
- "objc",
- "once_cell",
- "pkg-config",
- "servo-fontconfig",
- "winapi",
-]
-
 [[package]]
 name = "crunchy"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
 
-[[package]]
-name = "cty"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35"
-
 [[package]]
 name = "d3d12"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "827914e1f53b1e0e025ecd3d967a7836b7bcb54520f90e21ef8df7b4d88a2759"
+checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da"
 dependencies = [
  "bitflags",
  "libloading",
  "winapi",
 ]
 
-[[package]]
-name = "darling"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c"
-dependencies = [
- "darling_core",
- "darling_macro",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim",
- "syn",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
-dependencies = [
- "darling_core",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "dirs"
 version = "4.0.0"
@@ -1118,31 +1160,17 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
 
-[[package]]
-name = "dwrote"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "439a1c2ba5611ad3ed731280541d36d2e9c4ac5e7fb818a27b604bdc5a6aa65b"
-dependencies = [
- "lazy_static",
- "libc",
- "serde",
- "serde_derive",
- "winapi",
- "wio",
-]
-
 [[package]]
 name = "ecolor"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b601108bca3af7650440ace4ca55b2daf52c36f2635be3587d77b16efd8d0691"
+checksum = "1f99fe3cac305af9d6d92971af60d0f7ea4d783201ef1673571567b6699964d9"
 
 [[package]]
 name = "egui"
-version = "0.20.1"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65a5e883a316e53866977450eecfbcac9c48109c2ab3394af29feb83fcde4ea9"
+checksum = "6412a21e0bde7c0918f7fb44bbbb86b5e1f88e63c026a4e747cc7af02f76dfbe"
 dependencies = [
  "ahash 0.8.3",
  "epaint",
@@ -1152,10 +1180,11 @@ dependencies = [
 
 [[package]]
 name = "egui-winit"
-version = "0.20.1"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5696bdbe60898b81157f07ae34fe02dbfd522174bd6e620942c269cd7307901f"
+checksum = "ab43597ba41f0ce39a364ad83185594578bfd8b3409b99dbcbb01df23afc3dbb"
 dependencies = [
+ "android-activity",
  "arboard",
  "egui",
  "instant",
@@ -1167,12 +1196,11 @@ dependencies = [
 
 [[package]]
 name = "egui_winit_vulkano"
-version = "0.23.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a7369f24a9c1983de4ff7d4e50b5593eaa314913062696ef4ae2695428cb701"
+checksum = "203c1ad521328c178e24d16f5b26ca151a5b1669adafa2c6aa9eb3f904cdfd52"
 dependencies = [
  "ahash 0.8.3",
- "bytemuck",
  "egui",
  "egui-winit",
  "image",
@@ -1189,15 +1217,15 @@ checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
 
 [[package]]
 name = "emath"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5277249c8c3430e7127e4f2c40a77485e7baf11ae132ce9b3253a8ed710df0a0"
+checksum = "b8ecd80612937e0267909d5351770fe150004e24dab93954f69ca62eecd3f77e"
 
 [[package]]
 name = "encase"
-version = "0.4.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48ec50086547d597b5c871a78399ec04a14828a6a5c445a61ed4687c540edec6"
+checksum = "e6591f13a63571c4821802eb5b10fd1155b1290bce87086440003841c8c3909b"
 dependencies = [
  "const_panic",
  "encase_derive",
@@ -1207,39 +1235,29 @@ dependencies = [
 
 [[package]]
 name = "encase_derive"
-version = "0.4.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dda93e9714c7683c474f49a461a2ae329471d2bda43c4302d41c6d8339579e92"
+checksum = "4f1da6deed1f8b6f5909616ffa695f63a5de54d6a0f084fa715c70c8ed3abac9"
 dependencies = [
  "encase_derive_impl",
 ]
 
 [[package]]
 name = "encase_derive_impl"
-version = "0.4.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec27b639e942eb0297513b81cc6d87c50f6c77dc8c37af00a39ed5db3b9657ee"
+checksum = "ae489d58959f3c4cdd1250866a05acfb341469affe4fced71aff3ba228be1693"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
-dependencies = [
- "log",
- "regex",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "epaint"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de14b65fe5e423e0058f77a8beb2c863b056d0566d6c4ce0d097aa5814cb705a"
+checksum = "12e78b5c58a1f7f621f9d546add2adce20636422c9b251e29f749e8a2f713c95"
 dependencies = [
  "ab_glyph",
  "ahash 0.8.3",
@@ -1252,9 +1270,9 @@ dependencies = [
 
 [[package]]
 name = "erased-serde"
-version = "0.3.24"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4ca605381c017ec7a5fef5e548f1cfaa419ed0f6df6367339300db74c92aa7d"
+checksum = "4f2b0c2380453a92ea8b6c8e5f64ecaafccddde8ceab55ff7a8ac1029f894569"
 dependencies = [
  "serde",
 ]
@@ -1275,41 +1293,40 @@ version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
-[[package]]
-name = "expat-sys"
-version = "2.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "658f19728920138342f68408b7cf7644d90d4784353d8ebc32e7e8663dbe45fa"
-dependencies = [
- "cmake",
- "pkg-config",
-]
-
 [[package]]
 name = "exr"
-version = "1.5.3"
+version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8af5ef47e2ed89d23d0ecbc1b681b30390069de70260937877514377fc24feb"
+checksum = "bdd2162b720141a91a054640662d3edce3d50a944a50ffca5313cd951abb35b4"
 dependencies = [
  "bit_field",
  "flume",
  "half",
  "lebe",
- "miniz_oxide",
+ "miniz_oxide 0.6.2",
+ "rayon-core",
  "smallvec",
- "threadpool",
  "zune-inflate",
 ]
 
 [[package]]
 name = "fastrand"
-version = "1.8.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499"
+checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
 dependencies = [
  "instant",
 ]
 
+[[package]]
+name = "fdeflate"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10"
+dependencies = [
+ "simd-adler32",
+]
+
 [[package]]
 name = "fixedbitset"
 version = "0.4.2"
@@ -1323,7 +1340,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
 dependencies = [
  "crc32fast",
- "miniz_oxide",
+ "miniz_oxide 0.6.2",
 ]
 
 [[package]]
@@ -1339,40 +1356,13 @@ dependencies = [
  "spin",
 ]
 
-[[package]]
-name = "fnv"
-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"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
-dependencies = [
- "foreign-types-macros",
- "foreign-types-shared 0.3.1",
-]
-
-[[package]]
-name = "foreign-types-macros"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8469d0d40519bc608ec6863f1cc88f3f1deee15913f2f3b3e573d81ed38cccc"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+ "foreign-types-shared",
 ]
 
 [[package]]
@@ -1381,12 +1371,6 @@ 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"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
-
 [[package]]
 name = "form_urlencoded"
 version = "1.1.0"
@@ -1396,45 +1380,23 @@ dependencies = [
  "percent-encoding",
 ]
 
-[[package]]
-name = "freetype-rs"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74eadec9d0a5c28c54bb9882e54787275152a4e36ce206b45d7451384e5bf5fb"
-dependencies = [
- "bitflags",
- "freetype-sys",
- "libc",
-]
-
-[[package]]
-name = "freetype-sys"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a37d4011c0cc628dfa766fcc195454f4b068d7afdc2adfd28861191d866e731a"
-dependencies = [
- "cmake",
- "libc",
- "pkg-config",
-]
-
 [[package]]
 name = "futures-core"
-version = "0.3.26"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608"
+checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
 
 [[package]]
 name = "futures-io"
-version = "0.3.26"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531"
+checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
 
 [[package]]
 name = "futures-lite"
-version = "1.12.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48"
+checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
 dependencies = [
  "fastrand",
  "futures-core",
@@ -1447,9 +1409,9 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.26"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364"
+checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
 
 [[package]]
 name = "fxhash"
@@ -1472,9 +1434,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.8"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
+checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -1485,19 +1447,25 @@ dependencies = [
 
 [[package]]
 name = "gif"
-version = "0.11.4"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3edd93c6756b4dfaf2709eafcc345ba2636565295c198a9cfbf75fa5e3e00b06"
+checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045"
 dependencies = [
  "color_quant",
  "weezl",
 ]
 
+[[package]]
+name = "gimli"
+version = "0.27.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4"
+
 [[package]]
 name = "glam"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12f597d56c1bd55a811a1be189459e8fad2bbc272616375602443bdfb37fa774"
+checksum = "8e4afd9ad95555081e109fe1d21f2a30c691b5f0919c67dfa690a2e1eb6bd51c"
 dependencies = [
  "bytemuck",
  "serde",
@@ -1505,9 +1473,9 @@ dependencies = [
 
 [[package]]
 name = "glow"
-version = "0.11.2"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8bd5877156a19b8ac83a29b2306fe20537429d318f3ff0a1a2119f8d9c61919"
+checksum = "4e007a07a24de5ecae94160f141029e9a347282cfe25d1d58d85d845cf3130f1"
 dependencies = [
  "js-sys",
  "slotmap",
@@ -1534,6 +1502,19 @@ dependencies = [
  "bitflags",
 ]
 
+[[package]]
+name = "gpu-allocator"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce95f9e2e11c2c6fadfce42b5af60005db06576f231f5c92550fdded43c423e8"
+dependencies = [
+ "backtrace",
+ "log",
+ "thiserror",
+ "winapi",
+ "windows",
+]
+
 [[package]]
 name = "gpu-descriptor"
 version = "0.2.3"
@@ -1560,6 +1541,7 @@ version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0"
 dependencies = [
+ "bytemuck",
  "crunchy",
 ]
 
@@ -1573,6 +1555,21 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "hassle-rs"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90601c6189668c7345fc53842cb3f3a3d872203d523be1b3cb44a36a3e62fb85"
+dependencies = [
+ "bitflags",
+ "com-rs",
+ "libc",
+ "libloading",
+ "thiserror",
+ "widestring",
+ "winapi",
+]
+
 [[package]]
 name = "heck"
 version = "0.4.1"
@@ -1584,21 +1581,15 @@ name = "hermit-abi"
 version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "hex"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+dependencies = [
+ "libc",
+]
 
 [[package]]
 name = "hexasphere"
-version = "8.0.0"
+version = "8.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "619ce654558681d7d0a7809e1b20249c7032ff13ee6baa7bb7ff64f7f28a906a"
+checksum = "bd41d443f978bfa380a6dad58b62a08c43bcb960631f13e9d015b911eaf73588"
 dependencies = [
  "glam",
  "once_cell",
@@ -1610,12 +1601,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
 
-[[package]]
-name = "ident_case"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
-
 [[package]]
 name = "idna"
 version = "0.3.0"
@@ -1628,9 +1613,9 @@ dependencies = [
 
 [[package]]
 name = "image"
-version = "0.24.5"
+version = "0.24.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69b7ea949b537b0fd0af141fff8c77690f2ce96f4f41f042ccb6c69c6c965945"
+checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a"
 dependencies = [
  "bytemuck",
  "byteorder",
@@ -1641,15 +1626,15 @@ dependencies = [
  "num-rational",
  "num-traits",
  "png",
- "scoped_threadpool",
+ "qoi",
  "tiff",
 ]
 
 [[package]]
 name = "indexmap"
-version = "1.9.2"
+version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
 dependencies = [
  "autocfg",
  "hashbrown",
@@ -1669,22 +1654,24 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.5"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
+checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
 
 [[package]]
 name = "jni"
-version = "0.20.0"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c"
+checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97"
 dependencies = [
  "cesu8",
+ "cfg-if",
  "combine",
  "jni-sys",
  "log",
  "thiserror",
  "walkdir",
+ "windows-sys",
 ]
 
 [[package]]
@@ -1693,6 +1680,15 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
 
+[[package]]
+name = "jobserver"
+version = "0.1.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "jpeg-decoder"
 version = "0.3.0"
@@ -1736,9 +1732,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
 
 [[package]]
 name = "libc"
-version = "0.2.139"
+version = "0.2.141"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
+checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5"
 
 [[package]]
 name = "libloading"
@@ -1795,9 +1791,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
 
 [[package]]
 name = "memmap2"
-version = "0.5.8"
+version = "0.5.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b182332558b18d807c4ce1ca8ca983b34c3ee32765e47b3f0f69b90355cc1dc"
+checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327"
 dependencies = [
  "libc",
 ]
@@ -1813,9 +1809,9 @@ dependencies = [
 
 [[package]]
 name = "memoffset"
-version = "0.7.1"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
+checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1"
 dependencies = [
  "autocfg",
 ]
@@ -1829,7 +1825,7 @@ dependencies = [
  "bitflags",
  "block",
  "core-graphics-types",
- "foreign-types 0.3.2",
+ "foreign-types",
  "log",
  "objc",
 ]
@@ -1849,23 +1845,33 @@ dependencies = [
  "adler",
 ]
 
+[[package]]
+name = "miniz_oxide"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+dependencies = [
+ "adler",
+ "simd-adler32",
+]
+
 [[package]]
 name = "mio"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de"
+checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9"
 dependencies = [
  "libc",
  "log",
  "wasi",
- "windows-sys 0.42.0",
+ "windows-sys",
 ]
 
 [[package]]
 name = "naga"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "262d2840e72dbe250e8cf2f522d080988dfca624c4112c096238a4845f591707"
+checksum = "5eafe22a23b797c9bc227c6c896419b26b5bb88fa903417a3adaed08778850d5"
 dependencies = [
  "bit-set",
  "bitflags",
@@ -1902,7 +1908,7 @@ dependencies = [
  "jni-sys",
  "ndk-sys",
  "num_enum",
- "raw-window-handle 0.5.0",
+ "raw-window-handle",
  "thiserror",
 ]
 
@@ -1912,36 +1918,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
 
-[[package]]
-name = "ndk-glue"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0434fabdd2c15e0aab768ca31d5b7b333717f03cf02037d5a0a3ff3c278ed67f"
-dependencies = [
- "android_logger",
- "libc",
- "log",
- "ndk",
- "ndk-context",
- "ndk-macro",
- "ndk-sys",
- "once_cell",
- "parking_lot",
-]
-
-[[package]]
-name = "ndk-macro"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c"
-dependencies = [
- "darling",
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "ndk-sys"
 version = "0.4.1+23.1.7779620"
@@ -1993,12 +1969,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "nom8"
-version = "0.2.0"
+name = "ntapi"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8"
+checksum = "bc51db7b362b205941f71232e56c625156eb9a929f8cf74a428fd5bc094a4afc"
 dependencies = [
- "memchr",
+ "winapi",
 ]
 
 [[package]]
@@ -2053,23 +2029,23 @@ dependencies = [
 
 [[package]]
 name = "num_enum"
-version = "0.5.9"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d829733185c1ca374f17e52b762f24f535ec625d2cc1f070e34c8a9068f341b"
+checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
 dependencies = [
  "num_enum_derive",
 ]
 
 [[package]]
 name = "num_enum_derive"
-version = "0.5.9"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2be1598bf1c313dcdd12092e3f1920f463462525a21b7b4e11b4168353d0123e"
+checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -2093,6 +2069,32 @@ dependencies = [
  "objc_id",
 ]
 
+[[package]]
+name = "objc-sys"
+version = "0.2.0-beta.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7"
+
+[[package]]
+name = "objc2"
+version = "0.3.0-beta.3.patch-leaks.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e01640f9f2cb1220bbe80325e179e532cb3379ebcd1bf2279d703c19fe3a468"
+dependencies = [
+ "block2",
+ "objc-sys",
+ "objc2-encode",
+]
+
+[[package]]
+name = "objc2-encode"
+version = "2.0.0-pre.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512"
+dependencies = [
+ "objc-sys",
+]
+
 [[package]]
 name = "objc_exception"
 version = "0.1.2"
@@ -2111,11 +2113,32 @@ dependencies = [
  "objc",
 ]
 
+[[package]]
+name = "object"
+version = "0.30.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "once_cell"
-version = "1.17.0"
+version = "1.17.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
+
+[[package]]
+name = "orbclient"
+version = "0.3.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
+checksum = "0e9829e16c5e112e94efb5e2ad1fe17f8c1c99bb0fcdc8c65c44e935d904767d"
+dependencies = [
+ "cfg-if",
+ "redox_syscall 0.2.16",
+ "wasm-bindgen",
+ "web-sys",
+]
 
 [[package]]
 name = "overload"
@@ -2134,9 +2157,9 @@ dependencies = [
 
 [[package]]
 name = "parking"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72"
+checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e"
 
 [[package]]
 name = "parking_lot"
@@ -2156,11 +2179,17 @@ checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall",
+ "redox_syscall 0.2.16",
  "smallvec",
- "windows-sys 0.45.0",
+ "windows-sys",
 ]
 
+[[package]]
+name = "paste"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79"
+
 [[package]]
 name = "percent-encoding"
 version = "2.2.0"
@@ -2194,7 +2223,7 @@ checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -2211,14 +2240,15 @@ checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
 
 [[package]]
 name = "png"
-version = "0.17.7"
+version = "0.17.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638"
+checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa"
 dependencies = [
  "bitflags",
  "crc32fast",
+ "fdeflate",
  "flate2",
- "miniz_oxide",
+ "miniz_oxide 0.7.1",
 ]
 
 [[package]]
@@ -2238,9 +2268,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
 [[package]]
 name = "proc-macro-crate"
-version = "1.3.0"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66618389e4ec1c7afe67d51a9bf34ff9236480f8d51e7489b7d5ab0303c13f34"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
 dependencies = [
  "once_cell",
  "toml_edit",
@@ -2248,9 +2278,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.51"
+version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6"
+checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
 dependencies = [
  "unicode-ident",
 ]
@@ -2261,11 +2291,20 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74605f360ce573babfe43964cbe520294dcb081afbf8c108fc6e23036b4da2df"
 
+[[package]]
+name = "qoi"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001"
+dependencies = [
+ "bytemuck",
+]
+
 [[package]]
 name = "quote"
-version = "1.0.23"
+version = "1.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
+checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
 dependencies = [
  "proc-macro2",
 ]
@@ -2314,27 +2353,15 @@ checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab"
 
 [[package]]
 name = "raw-window-handle"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41"
-dependencies = [
- "cty",
-]
-
-[[package]]
-name = "raw-window-handle"
-version = "0.5.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed7e3d950b66e19e0c372f3fa3fbbcf85b1746b571f74e0c2af6042a5c93420a"
-dependencies = [
- "cty",
-]
+checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9"
 
 [[package]]
 name = "rayon"
-version = "1.6.1"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7"
+checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
 dependencies = [
  "either",
  "rayon-core",
@@ -2342,9 +2369,9 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.10.2"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "356a0625f1954f730c0201cdab48611198dc6ce21f4acff55089b5a78e6e835b"
+checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
 dependencies = [
  "crossbeam-channel",
  "crossbeam-deque",
@@ -2361,6 +2388,15 @@ dependencies = [
  "bitflags",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+dependencies = [
+ "bitflags",
+]
+
 [[package]]
 name = "redox_users"
 version = "0.4.3"
@@ -2368,15 +2404,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
 dependencies = [
  "getrandom",
- "redox_syscall",
+ "redox_syscall 0.2.16",
  "thiserror",
 ]
 
 [[package]]
 name = "regex"
-version = "1.7.1"
+version = "1.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
+checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2394,9 +2430,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.28"
+version = "0.6.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "renderdoc-sys"
@@ -2413,6 +2449,12 @@ dependencies = [
  "xmlparser",
 ]
 
+[[package]]
+name = "rustc-demangle"
+version = "0.1.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4a36c42d1873f9a77c53bde094f9664d9891bc604a45b4798fd2c389ed12e5b"
+
 [[package]]
 name = "rustc-hash"
 version = "1.1.0"
@@ -2421,18 +2463,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
 name = "ryu"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
-
-[[package]]
-name = "safe_arch"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1ff3d6d9696af502cc3110dacce942840fb06ff4514cad92236ecc455f2ce05"
-dependencies = [
- "bytemuck",
-]
+checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
 
 [[package]]
 name = "same-file"
@@ -2449,12 +2482,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
 
-[[package]]
-name = "scoped_threadpool"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8"
-
 [[package]]
 name = "scopeguard"
 version = "1.1.0"
@@ -2463,68 +2490,48 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
 [[package]]
 name = "sctk-adwaita"
-version = "0.4.3"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61270629cc6b4d77ec1907db1033d5c2e1a404c412743621981a871dc9c12339"
+checksum = "cda4e97be1fd174ccc2aae81c8b694e803fa99b34e8fd0f057a9d70698e3ed09"
 dependencies = [
- "crossfont",
+ "ab_glyph",
  "log",
+ "memmap2",
  "smithay-client-toolkit",
  "tiny-skia",
 ]
 
 [[package]]
 name = "serde"
-version = "1.0.152"
+version = "1.0.160"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
+checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.152"
+version = "1.0.160"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
+checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.14",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.93"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76"
+checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744"
 dependencies = [
  "itoa",
  "ryu",
  "serde",
 ]
 
-[[package]]
-name = "servo-fontconfig"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7e3e22fe5fd73d04ebf0daa049d3efe3eae55369ce38ab16d07ddd9ac5c217c"
-dependencies = [
- "libc",
- "servo-fontconfig-sys",
-]
-
-[[package]]
-name = "servo-fontconfig-sys"
-version = "5.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e36b879db9892dfa40f95da1c38a835d41634b825fbd8c4c418093d53c24b388"
-dependencies = [
- "expat-sys",
- "freetype-sys",
- "pkg-config",
-]
-
 [[package]]
 name = "shaderc"
 version = "0.8.2"
@@ -2557,15 +2564,15 @@ dependencies = [
 
 [[package]]
 name = "simd-adler32"
-version = "0.3.4"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14a5df39617d7c8558154693a1bb8157a4aab8179209540cc0b10e5dc24e0b18"
+checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f"
 
 [[package]]
 name = "slab"
-version = "0.4.7"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
+checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
 dependencies = [
  "autocfg",
 ]
@@ -2619,9 +2626,9 @@ dependencies = [
 
 [[package]]
 name = "spin"
-version = "0.9.5"
+version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dccf47db1b41fa1573ed27ccf5e08e3ca771cb994f776668c5ebda893b248fc"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
 dependencies = [
  "lock_api",
 ]
@@ -2649,22 +2656,47 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0"
 
 [[package]]
-name = "strsim"
-version = "0.10.0"
+name = "strict-num"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9df65f20698aeed245efdde3628a6b559ea1239bbb871af1b6e3b58c413b2bd1"
+
+[[package]]
+name = "syn"
+version = "1.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
 
 [[package]]
 name = "syn"
-version = "1.0.107"
+version = "2.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
+checksum = "fcf316d5356ed6847742d036f8a39c3b8435cac10bd528a4bd461928a6ab34d5"
 dependencies = [
  "proc-macro2",
  "quote",
  "unicode-ident",
 ]
 
+[[package]]
+name = "sysinfo"
+version = "0.28.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4c2f3ca6693feb29a89724516f016488e9aafc7f37264f898593ee4b942f31b"
+dependencies = [
+ "cfg-if",
+ "core-foundation-sys",
+ "libc",
+ "ntapi",
+ "once_cell",
+ "winapi",
+]
+
 [[package]]
 name = "termcolor"
 version = "1.2.0"
@@ -2676,43 +2708,34 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.38"
+version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
+checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.38"
+version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
+checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.14",
 ]
 
 [[package]]
 name = "thread_local"
-version = "1.1.6"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50f297120ff9d4efe680df143d5631bba9c75fa371992b7fcb33eb3453cb0a07"
+checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
 dependencies = [
  "cfg-if",
  "once_cell",
 ]
 
-[[package]]
-name = "threadpool"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa"
-dependencies = [
- "num_cpus",
-]
-
 [[package]]
 name = "tiff"
 version = "0.8.1"
@@ -2726,27 +2749,27 @@ dependencies = [
 
 [[package]]
 name = "tiny-skia"
-version = "0.7.0"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "642680569bb895b16e4b9d181c60be1ed136fa0c9c7f11d004daf053ba89bf82"
+checksum = "bfef3412c6975196fdfac41ef232f910be2bb37b9dd3313a49a1a6bc815a5bdb"
 dependencies = [
  "arrayref",
- "arrayvec 0.5.2",
+ "arrayvec",
  "bytemuck",
  "cfg-if",
  "png",
- "safe_arch",
  "tiny-skia-path",
 ]
 
 [[package]]
 name = "tiny-skia-path"
-version = "0.7.0"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c114d32f0c2ee43d585367cb013dfaba967ab9f62b90d9af0d696e955e70fa6c"
+checksum = "a4b5edac058fc98f51c935daea4d805b695b38e2f151241cad125ade2a2ac20d"
 dependencies = [
  "arrayref",
  "bytemuck",
+ "strict-num",
 ]
 
 [[package]]
@@ -2764,30 +2787,21 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
-[[package]]
-name = "toml"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "toml_datetime"
-version = "0.5.1"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5"
+checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
 
 [[package]]
 name = "toml_edit"
-version = "0.18.1"
+version = "0.19.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56c59d8dd7d0dcbc6428bf7aa2f0e823e26e43b3c9aca15bbc9475d23e5fa12b"
+checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13"
 dependencies = [
  "indexmap",
- "nom8",
  "toml_datetime",
+ "winnow",
 ]
 
 [[package]]
@@ -2810,7 +2824,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -2871,15 +2885,15 @@ checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633"
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.10"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58"
+checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.6"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
+checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
 
 [[package]]
 name = "unicode-normalization"
@@ -2915,9 +2929,9 @@ dependencies = [
 
 [[package]]
 name = "uuid"
-version = "1.3.0"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79"
+checksum = "5b55a3fef2a1e3b3a00ce878640918820d3c51081576ac657d23af9fc7928fdb"
 dependencies = [
  "getrandom",
  "serde",
@@ -2952,9 +2966,9 @@ dependencies = [
 
 [[package]]
 name = "vulkano"
-version = "0.32.3"
+version = "0.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f80b11c6c46ecb2c42155c8bcbc3ff04b783185181d4bbe19d9635a711ec747f"
+checksum = "1e1f15eeb9d93a05eb3c237332a10806eac1eb82444e54485bfcc1859c483c23"
 dependencies = [
  "ahash 0.8.3",
  "ash",
@@ -2964,9 +2978,9 @@ dependencies = [
  "half",
  "heck",
  "indexmap",
- "lazy_static",
  "libloading",
  "objc",
+ "once_cell",
  "parking_lot",
  "proc-macro2",
  "quote",
@@ -2976,28 +2990,41 @@ dependencies = [
  "smallvec",
  "thread_local",
  "vk-parse",
+ "vulkano-macros",
+]
+
+[[package]]
+name = "vulkano-macros"
+version = "0.33.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "895b8a2cac1e7650d2d0552f2392da0970a358515ac11a34adaf19bfdc771b98"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "vulkano-shaders"
-version = "0.32.0"
+version = "0.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96bbe0784b21e32661fde8a883bb3f659a473693c9f23bab12c26d7884c15ed0"
+checksum = "5f8cf18e9becbc6d39f1c39e26bcf69546c93989553eb5748cd734a8a697a6e5"
 dependencies = [
  "ahash 0.8.3",
  "heck",
  "proc-macro2",
  "quote",
  "shaderc",
- "syn",
+ "syn 1.0.109",
  "vulkano",
 ]
 
 [[package]]
 name = "vulkano-util"
-version = "0.32.0"
+version = "0.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df7d34bf37d622aa10d63a05396d91566d8298ca04ebc632f536946659a62f58"
+checksum = "a71b6df05a391161c1baec645a918437c2949d3494bf74c8358fde291d37f5f4"
 dependencies = [
  "ahash 0.8.3",
  "vulkano",
@@ -3007,13 +3034,13 @@ dependencies = [
 
 [[package]]
 name = "vulkano-win"
-version = "0.32.0"
+version = "0.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac1056e3238fe9025628b3de0f401d8c60b7a6dc89e059534568f55fef4e29f7"
+checksum = "666c77efe5ea82837781961a6bcd957ee2e926777e8de0005f580335d6eaefe7"
 dependencies = [
  "core-graphics-types",
  "objc",
- "raw-window-handle 0.5.0",
+ "raw-window-handle",
  "vulkano",
  "winit",
 ]
@@ -3026,12 +3053,11 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
 
 [[package]]
 name = "walkdir"
-version = "2.3.2"
+version = "2.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
+checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
 dependencies = [
  "same-file",
- "winapi",
  "winapi-util",
 ]
 
@@ -3062,7 +3088,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
  "wasm-bindgen-shared",
 ]
 
@@ -3096,7 +3122,7 @@ checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -3192,9 +3218,9 @@ dependencies = [
 
 [[package]]
 name = "webbrowser"
-version = "0.8.7"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97d1fa1e5c829b2bf9eb1e28fb950248b797cd6a04866fbdfa8bc31e5eef4c78"
+checksum = "579cc485bd5ce5bfa0d738e4921dd0b956eca9800be1fd2e5257ebe95bc4617e"
 dependencies = [
  "core-foundation",
  "dirs",
@@ -3202,7 +3228,7 @@ dependencies = [
  "log",
  "ndk-context",
  "objc",
- "raw-window-handle 0.5.0",
+ "raw-window-handle",
  "url",
  "web-sys",
 ]
@@ -3215,16 +3241,18 @@ checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb"
 
 [[package]]
 name = "wgpu"
-version = "0.14.2"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81f643110d228fd62a60c5ed2ab56c4d5b3704520bd50561174ec4ec74932937"
+checksum = "d745a1b6d91d85c33defbb29f0eee0450e1d2614d987e14bf6baf26009d132d7"
 dependencies = [
- "arrayvec 0.7.2",
+ "arrayvec",
+ "cfg-if",
  "js-sys",
  "log",
  "naga",
  "parking_lot",
- "raw-window-handle 0.5.0",
+ "profiling",
+ "raw-window-handle",
  "smallvec",
  "static_assertions",
  "wasm-bindgen",
@@ -3237,21 +3265,20 @@ dependencies = [
 
 [[package]]
 name = "wgpu-core"
-version = "0.14.2"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6000d1284ef8eec6076fd5544a73125fd7eb9b635f18dceeb829d826f41724ca"
+checksum = "7131408d940e335792645a98f03639573b0480e9e2e7cddbbab74f7c6d9f3fff"
 dependencies = [
- "arrayvec 0.7.2",
+ "arrayvec",
  "bit-vec",
  "bitflags",
- "cfg_aliases",
  "codespan-reporting",
  "fxhash",
  "log",
  "naga",
  "parking_lot",
  "profiling",
- "raw-window-handle 0.5.0",
+ "raw-window-handle",
  "smallvec",
  "thiserror",
  "web-sys",
@@ -3261,25 +3288,28 @@ dependencies = [
 
 [[package]]
 name = "wgpu-hal"
-version = "0.14.1"
+version = "0.15.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cc320a61acb26be4f549c9b1b53405c10a223fbfea363ec39474c32c348d12f"
+checksum = "bdcf61a283adc744bb5453dd88ea91f3f86d5ca6b027661c6c73c7734ae0288b"
 dependencies = [
  "android_system_properties",
- "arrayvec 0.7.2",
+ "arrayvec",
  "ash",
  "bit-set",
  "bitflags",
  "block",
  "core-graphics-types",
  "d3d12",
- "foreign-types 0.3.2",
+ "foreign-types",
  "fxhash",
  "glow",
  "gpu-alloc",
+ "gpu-allocator",
  "gpu-descriptor",
+ "hassle-rs",
  "js-sys",
  "khronos-egl",
+ "libc",
  "libloading",
  "log",
  "metal",
@@ -3288,7 +3318,7 @@ dependencies = [
  "parking_lot",
  "profiling",
  "range-alloc",
- "raw-window-handle 0.5.0",
+ "raw-window-handle",
  "renderdoc-sys",
  "smallvec",
  "thiserror",
@@ -3300,13 +3330,21 @@ dependencies = [
 
 [[package]]
 name = "wgpu-types"
-version = "0.14.1"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb6b28ef22cac17b9109b25b3bf8c9a103eeb293d7c5f78653979b09140375f6"
+checksum = "32444e121b0bd00cb02c0de32fde457a9491bd44e03e7a5db6df9b1da2f6f110"
 dependencies = [
  "bitflags",
+ "js-sys",
+ "web-sys",
 ]
 
+[[package]]
+name = "widestring"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983"
+
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -3348,31 +3386,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
-name = "windows-sys"
-version = "0.36.1"
+name = "windows"
+version = "0.44.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
+checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b"
 dependencies = [
- "windows_aarch64_msvc 0.36.1",
- "windows_i686_gnu 0.36.1",
- "windows_i686_msvc 0.36.1",
- "windows_x86_64_gnu 0.36.1",
- "windows_x86_64_msvc 0.36.1",
+ "windows-implement",
+ "windows-interface",
+ "windows-targets",
 ]
 
 [[package]]
-name = "windows-sys"
-version = "0.42.0"
+name = "windows-implement"
+version = "0.44.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
+checksum = "6ce87ca8e3417b02dc2a8a22769306658670ec92d78f1bd420d6310a67c245c6"
 dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc 0.42.1",
- "windows_i686_gnu 0.42.1",
- "windows_i686_msvc 0.42.1",
- "windows_x86_64_gnu 0.42.1",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc 0.42.1",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.44.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "853f69a591ecd4f810d29f17e902d40e349fb05b0b11fff63b08b826bfe39c7f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -3386,99 +3429,70 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.42.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7"
+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
 dependencies = [
  "windows_aarch64_gnullvm",
- "windows_aarch64_msvc 0.42.1",
- "windows_i686_gnu 0.42.1",
- "windows_i686_msvc 0.42.1",
- "windows_x86_64_gnu 0.42.1",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
  "windows_x86_64_gnullvm",
- "windows_x86_64_msvc 0.42.1",
+ "windows_x86_64_msvc",
 ]
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.36.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.36.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.36.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
+checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.36.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.42.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.36.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.42.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
 
 [[package]]
 name = "winit"
-version = "0.27.5"
+version = "0.28.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb796d6fbd86b2fd896c9471e6f04d39d750076ebe5680a3958f00f5ab97657c"
+checksum = "4f504e8c117b9015f618774f8d58cd4781f5a479bc41079c064f974cbb253874"
 dependencies = [
+ "android-activity",
  "bitflags",
- "cocoa",
+ "cfg_aliases",
  "core-foundation",
  "core-graphics",
  "dispatch",
@@ -3487,30 +3501,31 @@ dependencies = [
  "log",
  "mio",
  "ndk",
- "ndk-glue",
- "objc",
+ "objc2",
  "once_cell",
- "parking_lot",
+ "orbclient",
  "percent-encoding",
- "raw-window-handle 0.4.3",
- "raw-window-handle 0.5.0",
+ "raw-window-handle",
+ "redox_syscall 0.3.5",
  "sctk-adwaita",
  "smithay-client-toolkit",
  "wasm-bindgen",
  "wayland-client",
+ "wayland-commons",
  "wayland-protocols",
+ "wayland-scanner",
  "web-sys",
- "windows-sys 0.36.1",
+ "windows-sys",
  "x11-dl",
 ]
 
 [[package]]
-name = "wio"
-version = "0.2.2"
+name = "winnow"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5"
+checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28"
 dependencies = [
- "winapi",
+ "memchr",
 ]
 
 [[package]]
@@ -3569,9 +3584,9 @@ checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd"
 
 [[package]]
 name = "zune-inflate"
-version = "0.2.42"
+version = "0.2.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c473377c11c4a3ac6a2758f944cd336678e9c977aa0abf54f6450cf77e902d6d"
+checksum = "440a08fd59c6442e4b846ea9b10386c38307eae728b216e1ab2c305d1c9daaf8"
 dependencies = [
  "simd-adler32",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index fd5a141..5b51fd4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,40 +1,64 @@
 [package]
-name = "bevy_vulkano"
-version = "0.11.0"
-edition = "2021"
 authors = ["Okko Hakola <okkohakola@gmail.com>"]
+categories = ["gui", "game-development"]
 description = "Vulkano Backend for Bevy"
+edition = "2021"
 homepage = "https://github.com/hakolao/bevy_vulkano"
+keywords = ["gui", "imgui", "vulkano", "gamedev", "bevy"]
 license = "Apache-2.0"
+name = "bevy_vulkano"
 readme = "README.md"
 repository = "https://github.com/hakolao/bevy_vulkano"
-categories = ["gui", "game-development"]
-keywords = ["gui", "imgui", "vulkano", "gamedev", "bevy"]
+version = "0.11.0"
 
 [features]
 default = []
-example_has_gui = ["gui", "links", "clipboard"]
+gui = ["egui_winit_vulkano"]
 links = ["gui", "egui_winit_vulkano/links"]
 clipboard = ["gui", "egui_winit_vulkano/clipboard"]
-gui = ["egui_winit_vulkano"]
 
 [dependencies]
-vulkano = "0.32"
-vulkano-util = "0.32"
-vulkano-shaders = "0.32"
-egui_winit_vulkano = { version = "0.23.0", optional = true, default_features = false, features = [] }
-winit = "0.27"
-image = "0.24.5"
 approx = "0.5.1"
+egui_winit_vulkano = { version = "0.24.0", optional = true, default_features = false, features = [] }
+image = "0.24.5"
 raw-window-handle = "0.5"
+vulkano = "0.33"
+vulkano-shaders = "0.33"
+vulkano-util = "0.33"
+winit = "0.28"
 
 [dependencies.bevy]
-version = "0.9.1"
 default-features = false
 features = []
+version = "0.10"
 
 [dev-dependencies]
 anyhow = "1.0.66"
 rand = "0.8.5"
-bytemuck = "1.12.3"
 
+[[example]]
+name = "game_of_life"
+path = "examples/game_of_life/main.rs"
+required-features = []
+
+[package.metadata.example.game_of_life]
+name = "Game of life"
+description = "Example running a more comples vulkano pipeline with compute shaders"
+
+[[example]]
+name = "multi_window_gui"
+path = "examples/multi_window_gui/main.rs"
+required-features = ["gui", "links", "clipboard"]
+
+[package.metadata.example.multi_window_gui]
+name = "Multi Window Gui"
+description = "Example running multiple windows with egui gui"
+
+[[example]]
+name = "windowless_compute"
+path = "examples/windowless_compute/main.rs"
+required-features = []
+
+[package.metadata.example.windowless_compute]
+name = "Windowless compute shader"
+description = "Example running a windowless vulkano compute shader"
\ No newline at end of file
diff --git a/README.md b/README.md
index 9efee69..7d96bcf 100644
--- a/README.md
+++ b/README.md
@@ -18,80 +18,13 @@ However, you'll need to do everything in between yourself. A good way to get sta
 
 This should be especially useful for learning graphics pipelines from scratch using Vulkano.
 
-1. Add `VulkanoWinitPlugin`. It also adds `WindowPlugin` and anything that's needed.
+1. Add `VulkanoWinitPlugin`. (Don't forget to add `WindowPlugin`, and some basic bevy plugins). Don't add default plugins.
 2. Then create your own rendering systems using vulkano's pipelines (See example.). You'll need to know how to use [Vulkano](https://github.com/vulkano-rs/vulkano).
 3. If you want to use [egui](https://github.com/emilk/egui) library with this, add `egui` and `bevy_vulkano` with feature `gui`.
 
 ## Usage
 
-```rust
-fn main() {
-    App::new()
-        // Vulkano configs (Modify this if you want to add features to vulkano (vulkan backend).
-        // You can also disable primary window opening here
-        .insert_non_send_resource(VulkanoWinitConfig::default())
-        .add_plugin(bevy::input::InputPlugin::default())
-        // Window settings for primary window (if you want no window, modify config above)
-        .add_plugin(VulkanoWinitPlugin {
-            window_descriptor: WindowDescriptor {
-                width: 1920.0,
-                height: 1080.0,
-                title: "Bevy Vulkano".to_string(),
-                present_mode: bevy::window::PresentMode::Immediate,
-                resizable: true,
-                mode: WindowMode::Windowed,
-                ..WindowDescriptor::default()
-            }
-        })
-        .run();
-}
-```
-
-### Creating a pipeline
-
-```rust
-/// Creates a render pipeline. Add this system with app.add_startup_system(create_pipelines).
-fn create_pipelines_system(mut commands: Commands, vulkano_windows: NonSend<VulkanoWindows>) {
-    let primary_window = vulkano_windows.get_primary_window_renderer().unwrap();
-    // Create your render pass & pipelines (MyRenderPass could contain your pipelines, e.g. draw_circle)
-    let my_pipeline = YourPipeline::new(
-        primary_window.graphics_queue(),
-        primary_window.swapchain_format(),
-    );
-    // Insert as a resource
-    commands.insert_resource(my_pipeline);
-}
-```
-
-### Rendering system
-
-```rust
-
-/// This system should be added either at `CoreStage::PostUpdate` or `CoreStage::Last`. You could also create your own
-/// render stage and place it after `CoreStage::Update`.
-fn my_pipeline_render_system(
-    mut vulkano_windows: NonSendMut<VulkanoWindows>,
-    mut pipeline: ResMut<YourPipeline>,
-) {
-    let primary_window = vulkano_windows.get_primary_window_renderer_mut().unwrap();
-    // Start frame
-    let before = match primary_window.acquire() {
-        Err(e) => {
-            bevy::log::error!("Failed to start frame: {}", e);
-            return;
-        }
-        Ok(f) => f,
-    };
-
-    // Access the swapchain image directly
-    let final_image = primary_window.swapchain_image_view();
-    // Draw your pipeline
-    let after_your_pipeline = pipeline.draw(final_image);
-    
-    // Finish Frame by passing your last future. Wait on the future if needed.
-    primary_window.present(after_your_pipeline, true);
-}
-```
+See examples.
 
 ## Dependencies
 
@@ -99,16 +32,11 @@ This library re-exports `egui_winit_vulkano`.
 
 ## Examples:
 ```bash
-cargo run --example multi_window_gui --features example_has_gui
+cargo run --example multi_window_gui
 cargo run --example windowless_compute
 cargo run --example game_of_life
 ```
 
-### Disclaimer
-While you can use `bevy_vulkano` with bevy `0.9`,
-the windowing features are not quite up to date with latest `bevy_window`.
-Feel free to make contributions if some feature is missing.
-
 ### Contributing
 
 Feel free to open a PR to improve or fix anything that you see would be useful.
\ No newline at end of file
diff --git a/examples/game_of_life/game_of_life.rs b/examples/game_of_life/game_of_life.rs
index 0524e53..4ba32ef 100644
--- a/examples/game_of_life/game_of_life.rs
+++ b/examples/game_of_life/game_of_life.rs
@@ -12,7 +12,7 @@ use std::sync::Arc;
 use bevy::{math::IVec2, prelude::Resource};
 use rand::Rng;
 use vulkano::{
-    buffer::{BufferUsage, CpuAccessibleBuffer},
+    buffer::{Buffer, BufferCreateInfo, BufferUsage, Subbuffer},
     command_buffer::{
         allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage,
         PrimaryAutoCommandBuffer,
@@ -23,7 +23,7 @@ use vulkano::{
     device::{DeviceOwned, Queue},
     format::Format,
     image::{ImageAccess, ImageUsage, StorageImage},
-    memory::allocator::StandardMemoryAllocator,
+    memory::allocator::{AllocationCreateInfo, MemoryUsage, StandardMemoryAllocator},
     pipeline::{ComputePipeline, Pipeline, PipelineBindPoint},
     sync::GpuFuture,
 };
@@ -40,22 +40,22 @@ pub struct GameOfLifeComputePipeline {
     command_buffer_allocator: StandardCommandBufferAllocator,
     descriptor_set_allocator: StandardDescriptorSetAllocator,
     compute_life_pipeline: Arc<ComputePipeline>,
-    life_in: Arc<CpuAccessibleBuffer<[u32]>>,
-    life_out: Arc<CpuAccessibleBuffer<[u32]>>,
+    life_in: Subbuffer<[u32]>,
+    life_out: Subbuffer<[u32]>,
     image: DeviceImageView,
 }
 
-fn rand_grid(
-    allocator: &Arc<StandardMemoryAllocator>,
-    size: [u32; 2],
-) -> Arc<CpuAccessibleBuffer<[u32]>> {
-    CpuAccessibleBuffer::from_iter(
+fn rand_grid(allocator: &Arc<StandardMemoryAllocator>, size: [u32; 2]) -> Subbuffer<[u32]> {
+    Buffer::from_iter(
         allocator,
-        BufferUsage {
-            storage_buffer: true,
-            ..BufferUsage::empty()
+        BufferCreateInfo {
+            usage: BufferUsage::STORAGE_BUFFER,
+            ..Default::default()
+        },
+        AllocationCreateInfo {
+            usage: MemoryUsage::Upload,
+            ..Default::default()
         },
-        false,
         (0..(size[0] * size[1]))
             .map(|_| rand::thread_rng().gen_range(0u32..=1))
             .collect::<Vec<u32>>(),
@@ -89,12 +89,7 @@ impl GameOfLifeComputePipeline {
             compute_queue.clone(),
             size,
             Format::R8G8B8A8_UNORM,
-            ImageUsage {
-                sampled: true,
-                storage: true,
-                transfer_dst: true,
-                ..ImageUsage::empty()
-            },
+            ImageUsage::SAMPLED | ImageUsage::STORAGE | ImageUsage::TRANSFER_DST,
         )
         .unwrap();
         GameOfLifeComputePipeline {
@@ -182,7 +177,7 @@ impl GameOfLifeComputePipeline {
             ])
             .unwrap();
 
-        let push_constants = compute_life_cs::ty::PushConstants {
+        let push_constants = compute_life_cs::PushConstants {
             life_color,
             dead_color,
             step,
@@ -273,10 +268,5 @@ void main() {
         compute_color();
     }
 }",
-        types_meta: {
-            use bytemuck::{Pod, Zeroable};
-
-            #[derive(Clone, Copy, Zeroable, Pod)]
-        },
     }
 }
diff --git a/examples/game_of_life/main.rs b/examples/game_of_life/main.rs
index c8c6040..9419e95 100644
--- a/examples/game_of_life/main.rs
+++ b/examples/game_of_life/main.rs
@@ -4,15 +4,15 @@ mod game_of_life;
 mod pixels_draw_pipeline;
 mod place_over_frame;
 
+use std::time::Duration;
+
 use bevy::{
-    app::PluginGroupBuilder,
+    app::{CoreSet::PostUpdate, PluginGroupBuilder},
     prelude::*,
-    time::FixedTimestep,
-    window::{close_on_esc, WindowId, WindowMode},
-};
-use bevy_vulkano::{
-    BevyVulkanoContext, BevyVulkanoWindows, VulkanoWinitConfig, VulkanoWinitPlugin,
+    time::common_conditions::on_timer,
+    window::{close_on_esc, WindowMode},
 };
+use bevy_vulkano::{BevyVulkanoContext, BevyVulkanoWindows, VulkanoWinitPlugin};
 use vulkano::image::ImageAccess;
 
 use crate::{game_of_life::GameOfLifeComputePipeline, place_over_frame::RenderPassPlaceOverFrame};
@@ -23,71 +23,72 @@ impl PluginGroup for PluginBundle {
     fn build(self) -> PluginGroupBuilder {
         PluginGroupBuilder::start::<PluginBundle>()
             // Minimum plugins for the demo
-            // Core needed for fixed time steps
-            .add(bevy::core::CorePlugin::default())
-            .add(bevy::input::InputPlugin)
-            .add(bevy::time::TimePlugin)
-            // Don't add default bevy plugins or WinitPlugin. This owns "core loop" (runner).
+            .add(bevy::log::LogPlugin::default())
+            .add(bevy::core::TaskPoolPlugin::default())
+            .add(bevy::core::TypeRegistrationPlugin::default())
+            .add(bevy::core::FrameCountPlugin::default())
+            .add(bevy::time::TimePlugin::default())
+            .add(bevy::diagnostic::DiagnosticsPlugin::default())
+            .add(bevy::input::InputPlugin::default())
+            .add(bevy::window::WindowPlugin::default())
+            // Don't add WinitPlugin. This owns "core loop" (runner).
             // Bevy winit and render should be excluded
-            .add(VulkanoWinitPlugin::default())
+            .add(VulkanoWinitPlugin)
     }
 }
 
 fn main() {
     App::new()
-        .insert_non_send_resource(VulkanoWinitConfig::default())
-        .add_plugins(PluginBundle.set(VulkanoWinitPlugin {
-            window_descriptor: WindowDescriptor {
-                width: 1024.0,
-                height: 1024.0,
+        .add_plugins(PluginBundle.set(WindowPlugin {
+            primary_window: Some(Window {
+                resolution: (1024.0, 1024.0).into(),
                 title: "Bevy Vulkano Game Of Life".to_string(),
                 present_mode: bevy::window::PresentMode::Immediate,
                 resizable: true,
                 mode: WindowMode::Windowed,
-                position: WindowPosition::Centered,
-                ..WindowDescriptor::default()
-            },
+                ..default()
+            }),
+            ..default()
         }))
         .add_startup_system(create_pipelines)
         .add_system(close_on_esc)
         .add_system(draw_life_system)
         .add_system(update_window_title_system)
-        .add_system_set_to_stage(
-            // Note that this is `PostUpdate` to ensure we render only after update
-            CoreStage::PostUpdate,
-            SystemSet::new()
-                .with_run_criteria(FixedTimestep::steps_per_second(60.0))
-                .with_system(game_of_life_pipeline_system),
+        .add_system(
+            game_of_life_pipeline_system
+                .in_base_set(PostUpdate)
+                .run_if(on_timer(Duration::from_secs_f32(1.0 / 60.0))),
         )
         .run();
 }
 
-fn update_window_title_system(vulkano_windows: NonSend<BevyVulkanoWindows>, time: ResMut<Time>) {
-    let primary = vulkano_windows
-        .get_winit_window(WindowId::primary())
-        .unwrap();
-    let fps = 1.0 / time.delta_seconds();
-    primary.set_title(&format!("Bevy Vulkano Game Of Life {fps:.2}"));
+fn update_window_title_system(mut windows: Query<&mut Window>, time: ResMut<Time>) {
+    for mut window in windows.iter_mut() {
+        let fps = 1.0 / time.delta_seconds();
+        window.title = format!("Bevy Vulkano Game Of Life {fps:.2}");
+    }
 }
 
 /// Creates our simulation pipeline & render pipeline
 fn create_pipelines(
     mut commands: Commands,
-    context: NonSend<BevyVulkanoContext>,
+    window_query: Query<Entity, With<Window>>,
+    context: Res<BevyVulkanoContext>,
     windows: NonSend<BevyVulkanoWindows>,
 ) {
-    let primary_window = windows.get_primary_window_renderer().unwrap();
+    let window_entity = window_query.single();
+    let primary_window = windows.get_vulkano_window(window_entity).unwrap();
     // Create compute pipeline to simulate game of life
     let game_of_life_pipeline = GameOfLifeComputePipeline::new(
         context.context.memory_allocator(),
-        primary_window.graphics_queue(),
+        primary_window.renderer.graphics_queue(),
         [512, 512],
     );
     // Create our render pass
     let place_over_frame = RenderPassPlaceOverFrame::new(
         context.context.memory_allocator().clone(),
-        primary_window.graphics_queue(),
-        primary_window.swapchain_format(),
+        primary_window.renderer.graphics_queue(),
+        primary_window.renderer.swapchain_format(),
     );
     // Insert resources
     commands.insert_resource(game_of_life_pipeline);
@@ -97,11 +98,11 @@ fn create_pipelines(
 /// Draw life at mouse position on the game of life canvas
 fn draw_life_system(
     mut game_of_life: ResMut<GameOfLifeComputePipeline>,
-    windows: ResMut<Windows>,
+    window: Query<&Window>,
     mouse_input: Res<Input<MouseButton>>,
 ) {
     if mouse_input.pressed(MouseButton::Left) {
-        let primary = windows.get_primary().unwrap();
+        let primary = window.get_single().unwrap();
         if let Some(pos) = primary.cursor_position() {
             let width = primary.width();
             let height = primary.height();
@@ -116,7 +117,7 @@ fn draw_life_system(
                 .width_height();
             let draw_pos = IVec2::new(
                 (image_size[0] as f32 * normalized.x) as i32,
-                (image_size[1] as f32 * normalized.y) as i32,
+                (image_size[1] as f32 - image_size[1] as f32 * normalized.y) as i32,
             );
             game_of_life.draw_life(draw_pos);
         }
@@ -126,14 +127,18 @@ fn draw_life_system(
 /// All render occurs here in one system. If you want to split systems to separate, use
 /// `PipelineSyncData` to update futures. You could have `pre_render_system` and `post_render_system` to start and finish frames
 fn game_of_life_pipeline_system(
+    window_query: Query<Entity, With<Window>>,
     mut vulkano_windows: NonSendMut<BevyVulkanoWindows>,
     mut game_of_life: ResMut<GameOfLifeComputePipeline>,
     mut place_over_frame: ResMut<RenderPassPlaceOverFrame>,
 ) {
-    let primary_window = vulkano_windows.get_primary_window_renderer_mut().unwrap();
+    let window_entity = window_query.single();
+    let primary_window = vulkano_windows
+        .get_vulkano_window_mut(window_entity)
+        .unwrap();
 
     // Start frame
-    let before = match primary_window.acquire() {
+    let before = match primary_window.renderer.acquire() {
         Err(e) => {
             bevy::log::error!("Failed to start frame: {}", e);
             return;
@@ -143,9 +148,9 @@ fn game_of_life_pipeline_system(
 
     let after_compute = game_of_life.compute(before, [1.0, 0.0, 0.0, 1.0], [0.0; 4]);
     let color_image = game_of_life.color_image();
-    let final_image = primary_window.swapchain_image_view();
+    let final_image = primary_window.renderer.swapchain_image_view();
     let after_render = place_over_frame.render(after_compute, color_image, final_image);
 
     // Finish Frame
-    primary_window.present(after_render, true);
+    primary_window.renderer.present(after_render, true);
 }
diff --git a/examples/game_of_life/pixels_draw_pipeline.rs b/examples/game_of_life/pixels_draw_pipeline.rs
index 6f9bfd4..72bfbab 100644
--- a/examples/game_of_life/pixels_draw_pipeline.rs
+++ b/examples/game_of_life/pixels_draw_pipeline.rs
@@ -9,9 +9,8 @@
 
 use std::sync::Arc;
 
-use bytemuck::{Pod, Zeroable};
 use vulkano::{
-    buffer::{BufferUsage, CpuAccessibleBuffer, TypedBufferAccess},
+    buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage, Subbuffer},
     command_buffer::{
         allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder,
         CommandBufferInheritanceInfo, CommandBufferUsage, SecondaryAutoCommandBuffer,
@@ -21,11 +20,11 @@ use vulkano::{
     },
     device::{DeviceOwned, Queue},
     image::ImageViewAbstract,
-    memory::allocator::StandardMemoryAllocator,
+    memory::allocator::{AllocationCreateInfo, MemoryUsage, StandardMemoryAllocator},
     pipeline::{
         graphics::{
             input_assembly::InputAssemblyState,
-            vertex_input::BuffersDefinition,
+            vertex_input::Vertex,
             viewport::{Viewport, ViewportState},
         },
         GraphicsPipeline, Pipeline, PipelineBindPoint,
@@ -36,29 +35,30 @@ use vulkano::{
 
 /// Vertex for textured quads
 #[repr(C)]
-#[derive(Default, Debug, Copy, Clone, Zeroable, Pod)]
-pub struct TexturedVertex {
+#[derive(BufferContents, Vertex)]
+pub struct PosVertex {
+    #[format(R32G32_SFLOAT)]
     pub position: [f32; 2],
+    #[format(R32G32_SFLOAT)]
     pub tex_coords: [f32; 2],
 }
-vulkano::impl_vertex!(TexturedVertex, position, tex_coords);
 
-pub fn textured_quad(width: f32, height: f32) -> (Vec<TexturedVertex>, Vec<u32>) {
+pub fn pos_quad(width: f32, height: f32) -> (Vec<PosVertex>, Vec<u32>) {
     (
         vec![
-            TexturedVertex {
+            PosVertex {
                 position: [-(width / 2.0), -(height / 2.0)],
                 tex_coords: [0.0, 1.0],
             },
-            TexturedVertex {
+            PosVertex {
                 position: [-(width / 2.0), height / 2.0],
                 tex_coords: [0.0, 0.0],
             },
-            TexturedVertex {
+            PosVertex {
                 position: [width / 2.0, height / 2.0],
                 tex_coords: [1.0, 0.0],
             },
-            TexturedVertex {
+            PosVertex {
                 position: [width / 2.0, -(height / 2.0)],
                 tex_coords: [1.0, 1.0],
             },
@@ -74,8 +74,8 @@ pub struct PixelsDrawPipeline {
     descriptor_set_allocator: StandardDescriptorSetAllocator,
     pipeline: Arc<GraphicsPipeline>,
     subpass: Subpass,
-    vertices: Arc<CpuAccessibleBuffer<[TexturedVertex]>>,
-    indices: Arc<CpuAccessibleBuffer<[u32]>>,
+    vertices: Subbuffer<[PosVertex]>,
+    indices: Subbuffer<[u32]>,
 }
 
 impl PixelsDrawPipeline {
@@ -84,24 +84,31 @@ impl PixelsDrawPipeline {
         gfx_queue: Arc<Queue>,
         subpass: Subpass,
     ) -> PixelsDrawPipeline {
-        let (vertices, indices) = textured_quad(2.0, 2.0);
-        let vertex_buffer = CpuAccessibleBuffer::<[TexturedVertex]>::from_iter(
+        let (vertices, indices) = pos_quad(2.0, 2.0);
+        let vertex_buffer = Buffer::from_iter(
             &allocator,
-            BufferUsage {
-                vertex_buffer: true,
-                ..BufferUsage::empty()
+            BufferCreateInfo {
+                usage: BufferUsage::VERTEX_BUFFER,
+                ..Default::default()
+            },
+            AllocationCreateInfo {
+                usage: MemoryUsage::Upload,
+                ..Default::default()
             },
-            false,
             vertices.into_iter(),
         )
         .unwrap();
-        let index_buffer = CpuAccessibleBuffer::<[u32]>::from_iter(
+
+        let index_buffer = Buffer::from_iter(
             &allocator,
-            BufferUsage {
-                index_buffer: true,
-                ..BufferUsage::empty()
+            BufferCreateInfo {
+                usage: BufferUsage::INDEX_BUFFER,
+                ..Default::default()
+            },
+            AllocationCreateInfo {
+                usage: MemoryUsage::Upload,
+                ..Default::default()
             },
-            false,
             indices.into_iter(),
         )
         .unwrap();
@@ -110,7 +117,7 @@ impl PixelsDrawPipeline {
             let vs = vs::load(gfx_queue.device().clone()).expect("failed to create shader module");
             let fs = fs::load(gfx_queue.device().clone()).expect("failed to create shader module");
             GraphicsPipeline::start()
-                .vertex_input_state(BuffersDefinition::new().vertex::<TexturedVertex>())
+                .vertex_input_state(PosVertex::per_vertex())
                 .vertex_shader(vs.entry_point("main").unwrap(), ())
                 .input_assembly_state(InputAssemblyState::new())
                 .fragment_shader(fs.entry_point("main").unwrap(), ())
diff --git a/examples/multi_window_gui/main.rs b/examples/multi_window_gui/main.rs
index eda2c93..9543646 100644
--- a/examples/multi_window_gui/main.rs
+++ b/examples/multi_window_gui/main.rs
@@ -1,165 +1,92 @@
-#[cfg(feature = "example_has_gui")]
-use bevy::window::close_on_esc;
-#[cfg(feature = "example_has_gui")]
 use bevy::{
     app::PluginGroupBuilder,
     prelude::*,
-    window::{CreateWindow, WindowId, WindowMode},
+    window::{close_on_esc, PrimaryWindow, WindowMode},
+};
+use bevy_vulkano::{
+    egui_winit_vulkano::egui, BevyVulkanoSettings, BevyVulkanoWindows, VulkanoWinitPlugin,
 };
-#[cfg(feature = "example_has_gui")]
-use bevy_vulkano::egui_winit_vulkano::egui;
-#[cfg(feature = "example_has_gui")]
-use bevy_vulkano::{BevyVulkanoWindows, VulkanoWinitConfig, VulkanoWinitPlugin};
 
-#[cfg(feature = "example_has_gui")]
 pub struct PluginBundle;
 
-#[cfg(feature = "example_has_gui")]
 impl PluginGroup for PluginBundle {
     fn build(self) -> PluginGroupBuilder {
         PluginGroupBuilder::start::<PluginBundle>()
-            // Minimum plugins for the demo
             .add(bevy::input::InputPlugin)
-            // Don't add default bevy plugins or WinitPlugin. This owns "core loop" (runner).
-            // Bevy winit and render should be excluded
+            .add(bevy::window::WindowPlugin::default())
             .add(VulkanoWinitPlugin::default())
     }
 }
 
-#[cfg(not(feature = "example_has_gui"))]
-fn main() {
-    println!("Multi window Gui example needs to be run with --features example_has_gui")
-}
-
 /*
 * This example adds windows when clicking space button. Windows can be closed as well
  */
 
-#[cfg(feature = "example_has_gui")]
 fn main() {
     App::new()
-        .insert_non_send_resource(VulkanoWinitConfig {
+        .insert_non_send_resource(BevyVulkanoSettings {
             // Since we're only drawing gui, let's clear each frame
             is_gui_overlay: true,
-            ..VulkanoWinitConfig::default()
+            ..BevyVulkanoSettings::default()
         })
-        .add_plugins(PluginBundle.set(VulkanoWinitPlugin {
-            window_descriptor: WindowDescriptor {
-                width: 1920.0,
-                height: 1080.0,
+        .add_plugins(PluginBundle.set(WindowPlugin {
+            primary_window: Some(Window {
+                resolution: (1920.0, 1080.0).into(),
                 title: "Bevy Vulkano Primary Window".to_string(),
                 present_mode: bevy::window::PresentMode::Fifo,
                 resizable: true,
                 mode: WindowMode::Windowed,
-                ..WindowDescriptor::default()
-            },
+                ..default()
+            }),
+            ..default()
         }))
         .add_system(close_on_esc)
-        .add_startup_system(create_new_window_system)
-        .add_system(create_new_window_on_space_system)
-        .add_system_set_to_stage(
-            // Add render system after PostUpdate
-            CoreStage::PostUpdate,
-            SystemSet::new()
-                .with_system(main_render_system_primary_window)
-                .with_system(main_render_system_secondary_window),
-        )
+        .add_system(create_new_window_system)
+        .add_system(main_render_system_primary_window.in_base_set(CoreSet::PostUpdate))
         .run();
 }
 
-#[cfg(feature = "example_has_gui")]
-fn create_new_window_system(mut create_window_events: EventWriter<CreateWindow>) {
-    let window_id = WindowId::new();
-    create_window_events.send(CreateWindow {
-        id: window_id,
-        descriptor: WindowDescriptor {
-            width: 512.,
-            height: 512.,
+fn create_new_window_system(mut commands: Commands, keys: Res<Input<KeyCode>>) {
+    if keys.just_released(KeyCode::Space) {
+        commands.spawn(Window {
+            resolution: (512.0, 512.0).into(),
             present_mode: bevy::window::PresentMode::Fifo,
             title: "Secondary window".to_string(),
-            ..Default::default()
-        },
-    });
-}
-
-/// Adds new window when space is pressed
-#[cfg(feature = "example_has_gui")]
-fn create_new_window_on_space_system(
-    keys: Res<Input<KeyCode>>,
-    mut create_window_events: EventWriter<CreateWindow>,
-) {
-    if keys.just_pressed(KeyCode::Space) {
-        let window_id = WindowId::new();
-        create_window_events.send(CreateWindow {
-            id: window_id,
-            descriptor: WindowDescriptor {
-                width: 512.,
-                height: 512.,
-                present_mode: bevy::window::PresentMode::Fifo,
-                title: "Secondary window".to_string(),
-                ..Default::default()
-            },
+            ..default()
         });
     }
 }
 
-#[cfg(feature = "example_has_gui")]
-pub fn main_render_system_primary_window(mut vulkano_windows: NonSendMut<BevyVulkanoWindows>) {
-    let (window_renderer, gui) = vulkano_windows.get_primary_window_renderer_mut().unwrap();
-    // Start Frame
-    let before = match window_renderer.acquire() {
-        Err(e) => {
-            bevy::log::error!("Failed to start frame: {}", e);
-            return;
-        }
-        Ok(f) => f,
-    };
-    // Egui calls
-    let ctx = gui.context();
-    egui::Area::new("Primary Window Gui")
-        .fixed_pos(egui::pos2(10.0, 10.0))
-        .show(&ctx, |ui| {
-            ui.label("Primary Window");
-        });
-    let final_image = window_renderer.swapchain_image_view();
-    // Render egui
-    let after = gui.draw_on_image(before, final_image);
-    // Finish frame
-    window_renderer.present(after, true);
-}
-
-#[cfg(feature = "example_has_gui")]
-pub fn main_render_system_secondary_window(mut vulkano_windows: NonSendMut<BevyVulkanoWindows>) {
-    let primary_window_id = vulkano_windows.get_primary_winit_window().unwrap().id();
-    for (window_id, (window_renderer, gui)) in vulkano_windows.iter_mut() {
-        // Skip primary window
-        if *window_id == primary_window_id {
-            continue;
+pub fn main_render_system_primary_window(
+    window_query: Query<(Entity, Option<&PrimaryWindow>), With<Window>>,
+    mut vulkano_windows: NonSendMut<BevyVulkanoWindows>,
+) {
+    for (window, maybe_primary) in window_query.iter() {
+        if let Some(vulkano_window) = vulkano_windows.get_vulkano_window_mut(window) {
+            // Start Frame
+            let before = match vulkano_window.renderer.acquire() {
+                Err(e) => {
+                    bevy::log::error!("Failed to start frame: {}", e);
+                    return;
+                }
+                Ok(f) => f,
+            };
+            // Egui calls
+            let ctx = vulkano_window.gui.context();
+            egui::Area::new("Window Gui")
+                .fixed_pos(egui::pos2(10.0, 10.0))
+                .show(&ctx, |ui| {
+                    if maybe_primary.is_some() {
+                        ui.label("Primary Window");
+                    } else {
+                        ui.label("Secondary Window");
+                    }
+                });
+            let final_image = vulkano_window.renderer.swapchain_image_view();
+            // Render egui
+            let after = vulkano_window.gui.draw_on_image(before, final_image);
+            // Finish frame
+            vulkano_window.renderer.present(after, true);
         }
-        // Render on secondary window
-        // Start Frame
-        let before = match window_renderer.acquire() {
-            Err(e) => {
-                bevy::log::error!("Failed to start frame: {}", e);
-                return;
-            }
-            Ok(f) => f,
-        };
-
-        // Egui calls
-        let ctx = gui.context();
-        egui::Area::new("Secondary Window Gui")
-            .fixed_pos(egui::pos2(10.0, 10.0))
-            .show(&ctx, |ui| {
-                ui.label(format!("Secondary Window id {:?}", window_id));
-                ui.button("Hello")
-                    .clicked()
-                    .then(|| println!("Clicked me!"));
-            });
-        // Render egui
-        let final_image = window_renderer.swapchain_image_view();
-        let after = gui.draw_on_image(before, final_image);
-        // Finish frame
-        window_renderer.present(after, false);
     }
 }
diff --git a/examples/windowless_compute/main.rs b/examples/windowless_compute/main.rs
index b2e0555..3a9cbbb 100644
--- a/examples/windowless_compute/main.rs
+++ b/examples/windowless_compute/main.rs
@@ -1,13 +1,14 @@
 use bevy::{app::AppExit, prelude::*};
-use bevy_vulkano::{BevyVulkanoContext, VulkanoWinitConfig, VulkanoWinitPlugin};
+use bevy_vulkano::{BevyVulkanoContext, VulkanoWinitPlugin};
 use vulkano::{
-    buffer::{BufferUsage, CpuAccessibleBuffer},
+    buffer::{Buffer, BufferCreateInfo, BufferUsage},
     command_buffer::{
         allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage,
     },
     descriptor_set::{
         allocator::StandardDescriptorSetAllocator, PersistentDescriptorSet, WriteDescriptorSet,
     },
+    memory::allocator::{AllocationCreateInfo, MemoryUsage},
     pipeline::{ComputePipeline, Pipeline, PipelineBindPoint},
     sync,
     sync::GpuFuture,
@@ -17,8 +18,8 @@ use vulkano::{
 
 fn main() {
     App::new()
-        .insert_non_send_resource(VulkanoWinitConfig {
-            add_primary_window: false,
+        .add_plugin(WindowPlugin {
+            primary_window: None,
             ..default()
         })
         .add_plugin(VulkanoWinitPlugin::default())
@@ -62,20 +63,21 @@ fn run_compute_shader_once_then_exit(
         )
         .unwrap()
     };
+
     // Create buffer
-    let data_buffer = {
-        let data_iter = (0..65536u32).collect::<Vec<u32>>();
-        CpuAccessibleBuffer::from_iter(
-            context.context.memory_allocator(),
-            BufferUsage {
-                storage_buffer: true,
-                ..BufferUsage::empty()
-            },
-            false,
-            data_iter,
-        )
-        .unwrap()
-    };
+    let data_buffer = Buffer::from_iter(
+        context.context.memory_allocator(),
+        BufferCreateInfo {
+            usage: BufferUsage::STORAGE_BUFFER,
+            ..Default::default()
+        },
+        AllocationCreateInfo {
+            usage: MemoryUsage::Upload,
+            ..Default::default()
+        },
+        (0..65536u32).collect::<Vec<u32>>(),
+    )
+    .unwrap();
 
     let command_buffer_allocator =
         StandardCommandBufferAllocator::new(context.context.device().clone(), Default::default());
diff --git a/run_all_examples.sh b/run_all_examples.sh
index 9760997..0db278c 100755
--- a/run_all_examples.sh
+++ b/run_all_examples.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-cargo run --example multi_window_gui --features example_has_gui
 cargo run --example multi_window_gui
 cargo run --example windowless_compute
 cargo run --example game_of_life
\ No newline at end of file
diff --git a/src/config.rs b/src/config.rs
new file mode 100644
index 0000000..fbd6c6a
--- /dev/null
+++ b/src/config.rs
@@ -0,0 +1,138 @@
+use std::{
+    fmt::{Debug, Formatter},
+    time::Duration,
+};
+
+use vulkano_util::context::VulkanoConfig;
+
+/// A resource for configuring usage winit and Vulkano
+pub struct BevyVulkanoSettings {
+    /// Configures `winit` to return control to the caller after exiting the
+    /// event loop, enabling [`App::run()`](bevy_app::App::run()) to return.
+    ///
+    /// By default, [`return_from_run`](Self::return_from_run) is `false` and *Bevy*
+    /// will use `winit`'s
+    /// [`EventLoop::run()`](https://docs.rs/winit/latest/winit/event_loop/struct.EventLoop.html#method.run)
+    /// to initiate the event loop.
+    /// [`EventLoop::run()`](https://docs.rs/winit/latest/winit/event_loop/struct.EventLoop.html#method.run)
+    /// will never return but will terminate the process after the event loop exits.
+    ///
+    /// Setting [`return_from_run`](Self::return_from_run) to `true` will cause *Bevy*
+    /// to use `winit`'s
+    /// [`EventLoopExtRunReturn::run_return()`](https://docs.rs/winit/latest/winit/platform/run_return/trait.EventLoopExtRunReturn.html#tymethod.run_return)
+    /// instead which is strongly discouraged by the `winit` authors.
+    ///
+    /// # Supported platforms
+    ///
+    /// This feature is only available on the following desktop `target_os` configurations:
+    /// `windows`, `macos`, `linux`, `dragonfly`, `freebsd`, `netbsd`, and `openbsd`.
+    ///
+    /// Setting [`return_from_run`](Self::return_from_run) to `true` on
+    /// unsupported platforms will cause [`App::run()`](bevy_app::App::run()) to panic!
+    pub return_from_run: bool,
+    /// Configures how the winit event loop updates while the window is focused.
+    pub focused_mode: UpdateMode,
+    /// Configures how the winit event loop updates while the window is *not* focused.
+    pub unfocused_mode: UpdateMode,
+    /// Configuration of vulkano (device etc.)
+    pub vulkano_config: VulkanoConfig,
+    /// Whether the image gets cleared each frame by gui integration. This is only relevant if
+    /// `gui` feature is set.
+    /// Default is true, thus you need to clear the image you intend to draw gui on
+    #[cfg(feature = "gui")]
+    pub is_gui_overlay: bool,
+}
+
+impl BevyVulkanoSettings {
+    /// Configure winit with common settings for a game.
+    pub fn game() -> Self {
+        BevyVulkanoSettings::default()
+    }
+
+    /// Configure winit with common settings for a desktop application.
+    pub fn desktop_app() -> Self {
+        BevyVulkanoSettings {
+            focused_mode: UpdateMode::Reactive {
+                max_wait: Duration::from_secs(5),
+            },
+            unfocused_mode: UpdateMode::ReactiveLowPower {
+                max_wait: Duration::from_secs(60),
+            },
+            ..Default::default()
+        }
+    }
+
+    /// Gets the configured `UpdateMode` depending on whether the window is focused or not
+    pub fn update_mode(&self, focused: bool) -> &UpdateMode {
+        match focused {
+            true => &self.focused_mode,
+            false => &self.unfocused_mode,
+        }
+    }
+}
+
+impl Default for BevyVulkanoSettings {
+    fn default() -> Self {
+        BevyVulkanoSettings {
+            return_from_run: false,
+            focused_mode: UpdateMode::Continuous,
+            unfocused_mode: UpdateMode::Continuous,
+            vulkano_config: Default::default(),
+            #[cfg(feature = "gui")]
+            is_gui_overlay: false,
+        }
+    }
+}
+
+impl Debug for BevyVulkanoSettings {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("BevyVulkanoSettings")
+            .field("return_from_run", &self.return_from_run)
+            .field("focused_mode", &self.focused_mode)
+            .field("unfocused_mode", &self.unfocused_mode)
+            .finish()
+    }
+}
+
+/// Configure how the winit event loop should update.
+#[derive(Debug)]
+pub enum UpdateMode {
+    /// The event loop will update continuously, running as fast as possible.
+    Continuous,
+    /// The event loop will only update if there is a winit event, a redraw is requested, or the
+    /// maximum wait time has elapsed.
+    ///
+    /// ## Note
+    ///
+    /// Once the app has executed all bevy systems and reaches the end of the event loop, there is
+    /// no way to force the app to wake and update again, unless a `winit` event (such as user
+    /// input, or the window being resized) is received or the time limit is reached.
+    Reactive {
+        /// The maximum time to wait before the event loop runs again.
+        ///
+        /// Note that Bevy will wait indefinitely if the duration is too high (such as [`Duration::MAX`]).
+        max_wait: Duration,
+    },
+    /// The event loop will only update if there is a winit event from direct interaction with the
+    /// window (e.g. mouseover), a redraw is requested, or the maximum wait time has elapsed.
+    ///
+    /// ## Note
+    ///
+    /// Once the app has executed all bevy systems and reaches the end of the event loop, there is
+    /// no way to force the app to wake and update again, unless a `winit` event (such as user
+    /// input, or the window being resized) is received or the time limit is reached.
+    ///
+    /// ## Differences from [`UpdateMode::Reactive`]
+    ///
+    /// Unlike [`UpdateMode::Reactive`], this mode will ignore winit events that aren't directly
+    /// caused by interaction with the window. For example, you might want to use this mode when the
+    /// window is not focused, to only re-draw your bevy app when the cursor is over the window, but
+    /// not when the mouse moves somewhere else on the screen. This helps to significantly reduce
+    /// power consumption by only updated the app when absolutely necessary.
+    ReactiveLowPower {
+        /// The maximum time to wait before the event loop runs again.
+        ///
+        /// Note that Bevy will wait indefinitely if the duration is too high (such as [`Duration::MAX`]).
+        max_wait: Duration,
+    },
+}
diff --git a/src/converters.rs b/src/converters.rs
index ccbfeb8..d1580e2 100644
--- a/src/converters.rs
+++ b/src/converters.rs
@@ -1,3 +1,4 @@
+// Same as in `bevy_winit`
 use bevy::{
     input::{
         keyboard::{KeyCode, KeyboardInput},
@@ -6,7 +7,7 @@ use bevy::{
         ButtonState,
     },
     math::Vec2,
-    window::CursorIcon,
+    window::{CursorIcon, WindowLevel},
 };
 
 pub fn convert_keyboard_input(keyboard_input: &winit::event::KeyboardInput) -> KeyboardInput {
@@ -35,7 +36,7 @@ pub fn convert_mouse_button(mouse_button: winit::event::MouseButton) -> MouseBut
 
 pub fn convert_touch_input(
     touch_input: winit::event::Touch,
-    location: winit::dpi::LogicalPosition<f32>,
+    location: winit::dpi::LogicalPosition<f64>,
 ) -> TouchInput {
     TouchInput {
         phase: match touch_input.phase {
@@ -44,7 +45,7 @@ pub fn convert_touch_input(
             winit::event::TouchPhase::Ended => TouchPhase::Ended,
             winit::event::TouchPhase::Cancelled => TouchPhase::Cancelled,
         },
-        position: Vec2::new(location.x, location.y),
+        position: Vec2::new(location.x as f32, location.y as f32),
         force: touch_input.force.map(|f| match f {
             winit::event::Force::Calibrated {
                 force,
@@ -268,3 +269,11 @@ pub fn convert_cursor_icon(cursor_icon: CursorIcon) -> winit::window::CursorIcon
         CursorIcon::RowResize => winit::window::CursorIcon::RowResize,
     }
 }
+
+pub fn convert_window_level(window_level: WindowLevel) -> winit::window::WindowLevel {
+    match window_level {
+        WindowLevel::AlwaysOnBottom => winit::window::WindowLevel::AlwaysOnBottom,
+        WindowLevel::Normal => winit::window::WindowLevel::Normal,
+        WindowLevel::AlwaysOnTop => winit::window::WindowLevel::AlwaysOnTop,
+    }
+}
diff --git a/src/lib.rs b/src/lib.rs
index 12f156a..a328997 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -7,17 +7,17 @@
     clippy::match_like_matches_macro
 )]
 
-/*
-Pretty much the same as bevy_winit, but organized to use vulkano renderer backend.
-This allows you to create your own pipelines for rendering.
- */
+mod config;
 mod converters;
-mod pipeline_sync_data;
+mod system;
 mod vulkano_windows;
 
 use bevy::{
-    app::{App, AppExit, CoreStage, Plugin},
-    ecs::event::{Events, ManualEventReader},
+    app::{App, AppExit, CoreSet::Last, Plugin},
+    ecs::{
+        event::{Events, ManualEventReader},
+        system::{SystemParam, SystemState},
+    },
     input::{
         keyboard::KeyboardInput,
         mouse::{MouseButtonInput, MouseMotion, MouseScrollUnit, MouseWheel},
@@ -25,60 +25,18 @@ use bevy::{
     },
     math::{ivec2, DVec2, Vec2},
     prelude::*,
+    utils::Instant,
     window::{
-        CreateWindow, CursorEntered, CursorLeft, CursorMoved, FileDragAndDrop, ModifiesWindows,
-        ReceivedCharacter, WindowBackendScaleFactorChanged, WindowCloseRequested, WindowClosed,
-        WindowCreated, WindowFocused, WindowId, WindowMoved, WindowResized,
-        WindowScaleFactorChanged, Windows,
+        exit_on_all_closed, CursorEntered, CursorLeft, CursorMoved, FileDragAndDrop,
+        ReceivedCharacter, RequestRedraw, WindowBackendScaleFactorChanged, WindowCloseRequested,
+        WindowCreated, WindowFocused, WindowMoved, WindowResized, WindowScaleFactorChanged,
     },
 };
+pub use config::*;
 #[cfg(feature = "gui")]
 pub use egui_winit_vulkano;
-pub use pipeline_sync_data::*;
 use vulkano_util::context::{VulkanoConfig, VulkanoContext};
 pub use vulkano_windows::*;
-use winit::{
-    dpi::{LogicalSize, PhysicalPosition},
-    event::{self, DeviceEvent, Event, WindowEvent},
-    event_loop::{ControlFlow, EventLoop, EventLoopWindowTarget},
-    window::CursorGrabMode,
-};
-
-/// Vulkano & winit related configurations
-pub struct VulkanoWinitConfig {
-    /// Configures the winit library to return control to the main thread after
-    /// the [run](bevy_app::App::run) loop is exited. Winit strongly recommends
-    /// avoiding this when possible. Before using this please read and understand
-    /// the [caveats](winit::platform::run_return::EventLoopExtRunReturn::run_return)
-    /// in the winit documentation.
-    ///
-    /// This feature is only available on desktop `target_os` configurations.
-    /// Namely `windows`, `macos`, `linux`, `dragonfly`, `freebsd`, `netbsd`, and
-    /// `openbsd`. If set to true on an unsupported platform
-    /// [run](bevy_app::App::run) will panic.
-    pub return_from_run: bool,
-    /// Vulkano backend related configs
-    pub vulkano_config: VulkanoConfig,
-    /// Whether the image gets cleared each frame by gui integration. This is only relevant if
-    /// `gui` feature is set.
-    /// Default is true, thus you need to clear the image you intend to draw gui on
-    #[cfg(feature = "gui")]
-    pub is_gui_overlay: bool,
-    /// Control whether you want to run the app with or without a window
-    pub add_primary_window: bool,
-}
-
-impl Default for VulkanoWinitConfig {
-    fn default() -> Self {
-        VulkanoWinitConfig {
-            return_from_run: false,
-            vulkano_config: VulkanoConfig::default(),
-            #[cfg(feature = "gui")]
-            is_gui_overlay: true,
-            add_primary_window: true,
-        }
-    }
-}
 
 /// Wrapper around [`VulkanoContext`] to allow using them as resources
 #[derive(Resource)]
@@ -86,351 +44,126 @@ pub struct BevyVulkanoContext {
     pub context: VulkanoContext,
 }
 
-/// Plugin that allows replacing Bevy's render backend with Vulkano. See examples for usage.
+#[cfg(target_os = "android")]
+pub use winit::platform::android::activity::AndroidApp;
+use winit::{
+    event::{self, DeviceEvent, Event, StartCause, WindowEvent},
+    event_loop::{ControlFlow, EventLoop, EventLoopBuilder, EventLoopWindowTarget},
+};
+
+use crate::system::{changed_window, create_window, despawn_window, CachedWindow};
+
+#[cfg(target_os = "android")]
+pub static ANDROID_APP: once_cell::sync::OnceCell<AndroidApp> = once_cell::sync::OnceCell::new();
+
+/// A [`Plugin`] that utilizes [`winit`] for window creation and event loop management.
+/// In addition, windows include custom render functionality with Vulkano.
+/// This is intended to replace `bevy_winit`.
 #[derive(Default)]
-pub struct VulkanoWinitPlugin {
-    pub window_descriptor: WindowDescriptor,
-}
+pub struct VulkanoWinitPlugin;
 
 impl Plugin for VulkanoWinitPlugin {
     fn build(&self, app: &mut App) {
-        // Create event loop, window and renderer (tied together...)
-        let event_loop = EventLoop::new();
+        let mut event_loop_builder = EventLoopBuilder::<()>::with_user_event();
+
+        #[cfg(target_os = "android")]
+        {
+            use winit::platform::android::EventLoopBuilderExtAndroid;
+            event_loop_builder.with_android_app(
+                ANDROID_APP
+                    .get()
+                    .expect("Bevy must be setup with the #[bevy_main] macro on Android")
+                    .clone(),
+            );
+        }
+
+        let event_loop = event_loop_builder.build();
+        app.insert_non_send_resource(event_loop);
 
         // Retrieve config, or use default.
         let config = if app
             .world
-            .get_non_send_resource::<VulkanoWinitConfig>()
+            .get_non_send_resource::<BevyVulkanoSettings>()
             .is_none()
         {
-            VulkanoWinitConfig::default()
+            BevyVulkanoSettings::default()
         } else {
             app.world
-                .remove_non_send_resource::<VulkanoWinitConfig>()
+                .remove_non_send_resource::<BevyVulkanoSettings>()
                 .unwrap()
         };
 
-        // Create vulkano context using the vulkano config from config
-        let VulkanoWinitConfig {
+        // Create vulkano context using the vulkano config from settings
+        let BevyVulkanoSettings {
             vulkano_config, ..
         } = config;
-        let vulkano_context = VulkanoContext::new(vulkano_config);
-        // Place config back as resource. Vulkano config will be useless at this point.
-        let new_config = VulkanoWinitConfig {
+        let vulkano_context = BevyVulkanoContext {
+            context: VulkanoContext::new(vulkano_config),
+        };
+        // Place config back as resource..
+        let new_config = BevyVulkanoSettings {
             vulkano_config: VulkanoConfig::default(),
             ..config
         };
-        app.insert_non_send_resource(new_config);
-
-        let window_plugin = bevy::window::WindowPlugin {
-            // This lib controls exiting all on close. (true)
-            exit_on_all_closed: false,
-            add_primary_window: config.add_primary_window,
-            window: self.window_descriptor.clone(),
-            ..default()
-        };
-
-        // Insert window plugin, vulkano context, windows resource & pipeline data
-        app.add_plugin(window_plugin)
-            .init_non_send_resource::<BevyVulkanoWindows>()
-            .init_resource::<PipelineSyncData>()
-            .insert_resource(BevyVulkanoContext {
-                context: vulkano_context,
-            });
-
-        // Create initial window
-        handle_initial_window_events(&mut app.world, &event_loop);
 
-        app.insert_non_send_resource(event_loop)
+        app.init_non_send_resource::<BevyVulkanoWindows>()
+            .insert_resource(vulkano_context)
+            .insert_non_send_resource(new_config)
             .set_runner(winit_runner)
-            .add_system_to_stage(CoreStage::PreUpdate, update_on_resize_system)
-            .add_system_to_stage(CoreStage::PreUpdate, exit_on_window_close_system)
-            .add_system_to_stage(CoreStage::PostUpdate, change_window.label(ModifiesWindows));
-        // Add gui begin frame system
+            // exit_on_all_closed only uses the query to determine if the query is empty,
+            // and so doesn't care about ordering relative to changed_window
+            .add_systems((
+                changed_window
+                    .ambiguous_with(exit_on_all_closed)
+                    .in_base_set(Last),
+                // Update the state of the window before attempting to despawn to ensure consistent event ordering
+                despawn_window.after(changed_window).in_base_set(Last),
+            ));
+
         #[cfg(feature = "gui")]
         {
-            app.add_system_to_stage(CoreStage::PreUpdate, begin_egui_frame_system);
+            app.add_system(begin_egui_frame_system.in_base_set(bevy::prelude::CoreSet::PreUpdate));
         }
-    }
-}
 
-fn update_on_resize_system(
-    mut pipeline_data: ResMut<PipelineSyncData>,
-    mut windows: NonSendMut<BevyVulkanoWindows>,
-    mut window_resized_events: EventReader<WindowResized>,
-    mut window_created_events: EventReader<WindowCreated>,
-) {
-    let mut changed_window_ids = Vec::new();
-    for event in window_resized_events.iter().rev() {
-        if changed_window_ids.contains(&event.id) {
-            continue;
-        }
-        changed_window_ids.push(event.id);
-    }
-    for event in window_created_events.iter().rev() {
-        if changed_window_ids.contains(&event.id) {
-            continue;
-        }
-        changed_window_ids.push(event.id);
-    }
-    for id in changed_window_ids {
-        #[cfg(not(feature = "gui"))]
-        if let Some(window_renderer) = windows.get_window_renderer_mut(id) {
-            // Swap chain will be resized at the beginning of next frame. But user should update pipeline frame data
-            window_renderer.resize();
-            // Insert or update pipeline frame data
-            pipeline_data.add(SyncData {
-                window_id: id,
-                before: None,
-                after: None,
-            });
-        }
-        #[cfg(feature = "gui")]
-        if let Some((window_renderer, _)) = windows.get_window_renderer_mut(id) {
-            // Swap chain will be resized at the beginning of next frame. But user should update pipeline frame data
-            window_renderer.resize();
-            // Insert or update pipeline frame data
-            pipeline_data.add(SyncData {
-                window_id: id,
-                before: None,
-                after: None,
-            });
+        let mut create_window_system_state: SystemState<(
+            Commands,
+            NonSendMut<EventLoop<()>>,
+            Query<(Entity, &mut Window)>,
+            EventWriter<WindowCreated>,
+            NonSendMut<BevyVulkanoWindows>,
+            Res<BevyVulkanoContext>,
+            NonSend<BevyVulkanoSettings>,
+        )> = SystemState::from_world(&mut app.world);
+
+        // And for ios and macos, we should not create window early, all ui related code should be executed inside
+        // UIApplicationMain/NSApplicationMain.
+        #[cfg(not(any(target_os = "android", target_os = "ios", target_os = "macos")))]
+        {
+            let (
+                commands,
+                event_loop,
+                mut new_windows,
+                event_writer,
+                vulkano_windows,
+                context,
+                settings,
+            ) = create_window_system_state.get_mut(&mut app.world);
+
+            // Here we need to create a winit-window and give it a WindowHandle which the renderer can use.
+            // It needs to be spawned before the start of the startup schedule, so we cannot use a regular system.
+            // Instead we need to create the window and spawn it using direct world access
+            create_window(
+                commands,
+                &event_loop,
+                new_windows.iter_mut(),
+                event_writer,
+                vulkano_windows,
+                context,
+                settings,
+            );
         }
-    }
-}
-
-fn change_window(world: &mut World) {
-    let world = world.cell();
-    let mut vulkano_winit_windows = world
-        .get_non_send_resource_mut::<BevyVulkanoWindows>()
-        .unwrap();
-    let mut pipeline_sync_data = world
-        .get_non_send_resource_mut::<PipelineSyncData>()
-        .unwrap();
-    let mut windows = world.get_resource_mut::<Windows>().unwrap();
-    let mut removed_windows = vec![];
-
-    for bevy_window in windows.iter_mut() {
-        let id = bevy_window.id();
-        for command in bevy_window.drain_commands() {
-            match command {
-                bevy::window::WindowCommand::SetWindowMode {
-                    mode,
-                    resolution,
-                } => {
-                    let window = vulkano_winit_windows.get_winit_window(id).unwrap();
-                    match mode {
-                        bevy::window::WindowMode::BorderlessFullscreen => {
-                            window.set_fullscreen(Some(winit::window::Fullscreen::Borderless(None)))
-                        }
-                        bevy::window::WindowMode::Fullscreen => {
-                            window.set_fullscreen(Some(winit::window::Fullscreen::Exclusive(
-                                get_best_videomode(&window.current_monitor().unwrap()),
-                            )))
-                        }
-                        bevy::window::WindowMode::SizedFullscreen => window.set_fullscreen(Some(
-                            winit::window::Fullscreen::Exclusive(get_fitting_videomode(
-                                &window.current_monitor().unwrap(),
-                                resolution.x,
-                                resolution.y,
-                            )),
-                        )),
-                        bevy::window::WindowMode::Windowed => window.set_fullscreen(None),
-                    }
-                }
-                bevy::window::WindowCommand::SetTitle {
-                    title,
-                } => {
-                    let window = vulkano_winit_windows.get_winit_window(id).unwrap();
-                    window.set_title(&title);
-                }
-                bevy::window::WindowCommand::SetScaleFactor {
-                    scale_factor,
-                } => {
-                    let mut window_dpi_changed_events = world
-                        .get_resource_mut::<Events<WindowScaleFactorChanged>>()
-                        .unwrap();
-                    window_dpi_changed_events.send(WindowScaleFactorChanged {
-                        id,
-                        scale_factor,
-                    });
-                }
-                bevy::window::WindowCommand::SetResolution {
-                    logical_resolution,
-                    scale_factor,
-                } => {
-                    let window = vulkano_winit_windows.get_winit_window(id).unwrap();
-                    window.set_inner_size(
-                        winit::dpi::LogicalSize::new(logical_resolution.x, logical_resolution.y)
-                            .to_physical::<f64>(scale_factor),
-                    );
-                }
-                bevy::window::WindowCommand::SetPresentMode {
-                    present_mode,
-                } => {
-                    let present_mode = match present_mode {
-                        bevy::window::PresentMode::AutoVsync => {
-                            vulkano::swapchain::PresentMode::FifoRelaxed
-                        }
-                        bevy::window::PresentMode::AutoNoVsync => {
-                            vulkano::swapchain::PresentMode::Immediate
-                        }
-                        bevy::window::PresentMode::Fifo => vulkano::swapchain::PresentMode::Fifo,
-                        bevy::window::PresentMode::Immediate => {
-                            vulkano::swapchain::PresentMode::Immediate
-                        }
-                        bevy::window::PresentMode::Mailbox => {
-                            vulkano::swapchain::PresentMode::Mailbox
-                        }
-                    };
-                    let wr = {
-                        #[cfg(not(feature = "gui"))]
-                        let wr = vulkano_winit_windows.get_window_renderer_mut(id).unwrap();
-                        #[cfg(feature = "gui")]
-                        let (wr, _) = vulkano_winit_windows.get_window_renderer_mut(id).unwrap();
-                        wr
-                    };
-                    wr.set_present_mode(present_mode);
-                }
-                bevy::window::WindowCommand::SetResizable {
-                    resizable,
-                } => {
-                    let window = vulkano_winit_windows.get_winit_window(id).unwrap();
-                    window.set_resizable(resizable);
-                }
-                bevy::window::WindowCommand::SetDecorations {
-                    decorations,
-                } => {
-                    let window = vulkano_winit_windows.get_winit_window(id).unwrap();
-                    window.set_decorations(decorations);
-                }
-                bevy::window::WindowCommand::SetCursorIcon {
-                    icon,
-                } => {
-                    let window = vulkano_winit_windows.get_winit_window(id).unwrap();
-                    window.set_cursor_icon(converters::convert_cursor_icon(icon));
-                }
-                bevy::window::WindowCommand::SetCursorGrabMode {
-                    grab_mode,
-                } => {
-                    let window = vulkano_winit_windows.get_winit_window(id).unwrap();
-                    window
-                        .set_cursor_grab(match grab_mode {
-                            bevy::window::CursorGrabMode::Confined => CursorGrabMode::Confined,
-                            bevy::window::CursorGrabMode::Locked => CursorGrabMode::Locked,
-                            bevy::window::CursorGrabMode::None => CursorGrabMode::None,
-                        })
-                        .unwrap_or_else(|e| error!("Unable to un/grab cursor: {}", e));
-                }
-                bevy::window::WindowCommand::SetCursorVisibility {
-                    visible,
-                } => {
-                    let window = vulkano_winit_windows.get_winit_window(id).unwrap();
-                    window.set_cursor_visible(visible);
-                }
-                bevy::window::WindowCommand::SetCursorPosition {
-                    position,
-                } => {
-                    let window = vulkano_winit_windows.get_winit_window(id).unwrap();
-                    let inner_size = window.inner_size().to_logical::<f32>(window.scale_factor());
-                    window
-                        .set_cursor_position(winit::dpi::LogicalPosition::new(
-                            position.x,
-                            inner_size.height - position.y,
-                        ))
-                        .unwrap_or_else(|e| error!("Unable to set cursor position: {}", e));
-                }
-                bevy::window::WindowCommand::SetMaximized {
-                    maximized,
-                } => {
-                    let window = vulkano_winit_windows.get_winit_window(id).unwrap();
-                    window.set_maximized(maximized)
-                }
-                bevy::window::WindowCommand::SetMinimized {
-                    minimized,
-                } => {
-                    let window = vulkano_winit_windows.get_winit_window(id).unwrap();
-                    window.set_minimized(minimized)
-                }
-                bevy::window::WindowCommand::SetPosition {
-                    monitor_selection: _,
-                    position,
-                } => {
-                    let window = vulkano_winit_windows.get_winit_window(id).unwrap();
-                    window.set_outer_position(PhysicalPosition {
-                        x: position[0],
-                        y: position[1],
-                    });
-                }
-                bevy::window::WindowCommand::Center(monitor_selection) => {
-                    let window = vulkano_winit_windows.get_winit_window(id).unwrap();
-
-                    let maybe_monitor = match monitor_selection {
-                        bevy::window::MonitorSelection::Current => window.current_monitor(),
-                        bevy::window::MonitorSelection::Primary => window.primary_monitor(),
-                        bevy::window::MonitorSelection::Index(n) => {
-                            window.available_monitors().nth(n)
-                        }
-                    };
 
-                    if let Some(monitor) = maybe_monitor {
-                        let screen_size = monitor.size();
-
-                        let window_size = window.outer_size();
-
-                        window.set_outer_position(PhysicalPosition {
-                            x: screen_size.width.saturating_sub(window_size.width) as f64 / 2.
-                                + monitor.position().x as f64,
-                            y: screen_size.height.saturating_sub(window_size.height) as f64 / 2.
-                                + monitor.position().y as f64,
-                        });
-                    } else {
-                        warn!("Couldn't get monitor selected with: {monitor_selection:?}");
-                    }
-                }
-                bevy::window::WindowCommand::SetResizeConstraints {
-                    resize_constraints,
-                } => {
-                    let window = vulkano_winit_windows.get_winit_window(id).unwrap();
-                    let constraints = resize_constraints.check_constraints();
-                    let min_inner_size = LogicalSize {
-                        width: constraints.min_width,
-                        height: constraints.min_height,
-                    };
-                    let max_inner_size = LogicalSize {
-                        width: constraints.max_width,
-                        height: constraints.max_height,
-                    };
-
-                    window.set_min_inner_size(Some(min_inner_size));
-                    if constraints.max_width.is_finite() && constraints.max_height.is_finite() {
-                        window.set_max_inner_size(Some(max_inner_size));
-                    }
-                }
-                bevy::window::WindowCommand::Close => {
-                    // Since we have borrowed `windows` to iterate through them, we can't remove the window from it.
-                    // Add the removal requests to a queue to solve this
-                    removed_windows.push(id);
-                    // No need to run any further commands - this drops the rest of the commands, although the `bevy_window::Window` will be dropped later anyway
-                    break;
-                }
-            }
-        }
-    }
-    if !removed_windows.is_empty() {
-        let mut app_exit_events = world.resource_mut::<Events<AppExit>>();
-        let mut window_close_events = world.resource_mut::<Events<WindowClosed>>();
-        for id in removed_windows {
-            let (app_close, window_close) =
-                close_window(id, &mut vulkano_winit_windows, &mut pipeline_sync_data);
-            if app_close {
-                app_exit_events.send(AppExit);
-            } else if window_close {
-                window_close_events.send(WindowClosed {
-                    id,
-                })
-            }
-        }
+        create_window_system_state.apply(&mut app.world);
     }
 }
 
@@ -450,12 +183,12 @@ where
     target_os = "netbsd",
     target_os = "openbsd"
 ))]
-fn run_return<F>(event_loop: &mut EventLoop<()>, event_handler: F) -> i32
+fn run_return<F>(event_loop: &mut EventLoop<()>, event_handler: F)
 where
     F: FnMut(Event<'_, ()>, &EventLoopWindowTarget<()>, &mut ControlFlow),
 {
     use winit::platform::run_return::EventLoopExtRunReturn;
-    event_loop.run_return(event_handler)
+    event_loop.run_return(event_handler);
 }
 
 #[cfg(not(any(
@@ -474,518 +207,534 @@ where
     panic!("Run return is not supported on this platform!")
 }
 
-pub fn winit_runner(app: App) {
-    winit_runner_with(app);
+#[derive(SystemParam)]
+struct WindowEvents<'w> {
+    window_resized: EventWriter<'w, WindowResized>,
+    window_close_requested: EventWriter<'w, WindowCloseRequested>,
+    window_scale_factor_changed: EventWriter<'w, WindowScaleFactorChanged>,
+    window_backend_scale_factor_changed: EventWriter<'w, WindowBackendScaleFactorChanged>,
+    window_focused: EventWriter<'w, WindowFocused>,
+    window_moved: EventWriter<'w, WindowMoved>,
 }
 
-pub fn winit_runner_with(mut app: App) {
+#[derive(SystemParam)]
+struct InputEvents<'w> {
+    keyboard_input: EventWriter<'w, KeyboardInput>,
+    character_input: EventWriter<'w, ReceivedCharacter>,
+    mouse_button_input: EventWriter<'w, MouseButtonInput>,
+    mouse_wheel_input: EventWriter<'w, MouseWheel>,
+    touch_input: EventWriter<'w, TouchInput>,
+    ime_input: EventWriter<'w, Ime>,
+}
+
+#[derive(SystemParam)]
+struct CursorEvents<'w> {
+    cursor_moved: EventWriter<'w, CursorMoved>,
+    cursor_entered: EventWriter<'w, CursorEntered>,
+    cursor_left: EventWriter<'w, CursorLeft>,
+}
+
+/// Stores state that must persist between frames.
+struct WinitPersistentState {
+    /// Tracks whether or not the application is active or suspended.
+    active: bool,
+    /// Tracks whether or not an event has occurred this frame that would trigger an update in low
+    /// power mode. Should be reset at the end of every frame.
+    low_power_event: bool,
+    /// Tracks whether the event loop was started this frame because of a redraw request.
+    redraw_request_sent: bool,
+    /// Tracks if the event loop was started this frame because of a `WaitUntil` timeout.
+    timeout_reached: bool,
+    last_update: Instant,
+}
+
+impl Default for WinitPersistentState {
+    fn default() -> Self {
+        Self {
+            active: false,
+            low_power_event: false,
+            redraw_request_sent: false,
+            timeout_reached: false,
+            last_update: Instant::now(),
+        }
+    }
+}
+
+pub fn winit_runner(mut app: App) {
     let mut event_loop = app
         .world
         .remove_non_send_resource::<EventLoop<()>>()
         .unwrap();
-    let mut create_window_event_reader = ManualEventReader::<CreateWindow>::default();
+
     let mut app_exit_event_reader = ManualEventReader::<AppExit>::default();
+    let mut redraw_event_reader = ManualEventReader::<RequestRedraw>::default();
+    let mut winit_state = WinitPersistentState::default();
     app.world
         .insert_non_send_resource(event_loop.create_proxy());
 
+    let return_from_run = app
+        .world
+        .non_send_resource::<BevyVulkanoSettings>()
+        .return_from_run;
+
     trace!("Entering winit event loop");
 
-    let should_return_from_run = app
-        .world
-        .get_non_send_resource::<VulkanoWinitConfig>()
-        .map_or(false, |config| config.return_from_run);
+    let mut focused_window_state: SystemState<(NonSend<BevyVulkanoSettings>, Query<&Window>)> =
+        SystemState::from_world(&mut app.world);
 
-    let mut active = true;
+    let mut create_window_system_state: SystemState<(
+        Commands,
+        Query<(Entity, &mut Window), Added<Window>>,
+        EventWriter<WindowCreated>,
+        NonSendMut<BevyVulkanoWindows>,
+        Res<BevyVulkanoContext>,
+        NonSend<BevyVulkanoSettings>,
+    )> = SystemState::from_world(&mut app.world);
 
     let event_handler = move |event: Event<()>,
                               event_loop: &EventLoopWindowTarget<()>,
                               control_flow: &mut ControlFlow| {
-        *control_flow = ControlFlow::Poll;
-
-        if let Some(app_exit_events) = app.world.get_resource_mut::<Events<AppExit>>() {
-            if app_exit_event_reader
-                .iter(&app_exit_events)
-                .next_back()
-                .is_some()
-            {
+        #[cfg(feature = "trace")]
+        let _span = bevy_utils::tracing::info_span!("winit event_handler").entered();
+
+        if let Some(app_exit_events) = app.world.get_resource::<Events<AppExit>>() {
+            if app_exit_event_reader.iter(app_exit_events).last().is_some() {
                 *control_flow = ControlFlow::Exit;
+                return;
             }
         }
 
-        #[cfg(feature = "gui")]
-        let mut skip_window_event = false;
-        #[cfg(not(feature = "gui"))]
-        let skip_window_event = false;
-        // Update gui with winit event
-        #[cfg(feature = "gui")]
-        {
-            match &event {
-                event::Event::WindowEvent {
-                    event: window_event,
-                    window_id: winit_window_id,
-                    ..
-                } => {
-                    let world = app.world.cell();
-                    let mut vulkano_winit_windows = world
-                        .get_non_send_resource_mut::<BevyVulkanoWindows>()
-                        .unwrap();
-                    let window_id = if let Some(window_id) =
-                        vulkano_winit_windows.get_window_id(*winit_window_id)
-                    {
-                        window_id
-                    } else {
-                        return;
-                    };
-                    if let Some((_, gui)) = vulkano_winit_windows.get_window_renderer_mut(window_id)
-                    {
-                        // Update egui with the window event. If false, we should skip the event in bevy
-                        skip_window_event = gui.update(window_event);
+        match event {
+            event::Event::NewEvents(start) => {
+                let (config, window_focused_query) = focused_window_state.get(&app.world);
+
+                let app_focused = window_focused_query.iter().any(|window| window.focused);
+
+                // Check if either the `WaitUntil` timeout was triggered by winit, or that same
+                // amount of time has elapsed since the last app update. This manual check is needed
+                // because we don't know if the criteria for an app update were met until the end of
+                // the frame.
+                let auto_timeout_reached = matches!(start, StartCause::ResumeTimeReached { .. });
+                let now = Instant::now();
+                let manual_timeout_reached = match config.update_mode(app_focused) {
+                    UpdateMode::Continuous => false,
+                    UpdateMode::Reactive {
+                        max_wait,
                     }
-                }
-                _ => (),
+                    | UpdateMode::ReactiveLowPower {
+                        max_wait,
+                    } => now.duration_since(winit_state.last_update) >= *max_wait,
+                };
+                // The low_power_event state and timeout must be reset at the start of every frame.
+                winit_state.low_power_event = false;
+                winit_state.timeout_reached = auto_timeout_reached || manual_timeout_reached;
             }
-        }
-
-        // Handle touch separately here, and in case of gui, we don't want to skip the touch event
-        match &event {
+            #[allow(unused_mut)]
             event::Event::WindowEvent {
                 event,
                 window_id: winit_window_id,
                 ..
             } => {
-                let world = app.world.cell();
-                let vulkano_winit_windows =
-                    world.get_non_send_resource::<BevyVulkanoWindows>().unwrap();
-                let mut windows = world.get_resource_mut::<Windows>().unwrap();
-                let window_id = if let Some(window_id) =
-                    vulkano_winit_windows.get_window_id(*winit_window_id)
-                {
-                    window_id
-                } else {
-                    warn!(
-                        "Skipped event for unknown winit Window Id {:?}",
-                        winit_window_id
-                    );
-                    return;
-                };
-                let window = if let Some(window) = windows.get_mut(window_id) {
-                    window
-                } else {
-                    warn!("Skipped event for unknown Window Id {:?}", winit_window_id);
-                    return;
-                };
-                match event {
-                    WindowEvent::Touch(touch) => {
-                        let mut touch_input_events =
-                            world.get_resource_mut::<Events<TouchInput>>().unwrap();
-
-                        let mut location = touch.location.to_logical(window.scale_factor());
-
-                        // On a mobile window, the start is from the top while on PC/Linux/OSX from
-                        // bottom
-                        if cfg!(target_os = "android") || cfg!(target_os = "ios") {
-                            let window_height = windows.get_primary().unwrap().height();
-                            location.y = window_height - location.y;
-                        }
-                        let mut touch = converters::convert_touch_input(*touch, location);
-
-                        // We want to cancel any event when skip_window_event is true
-                        if cfg!(feature = "gui") && skip_window_event {
-                            touch.phase = bevy::input::touch::TouchPhase::Cancelled;
-                            touch_input_events.send(touch);
-                        } else {
-                            touch_input_events.send(touch);
-                        }
-                    }
-                    _ => (),
-                }
-            }
-            _ => (),
-        };
-
-        if !skip_window_event {
-            // Main events...
-            match event {
-                event::Event::WindowEvent {
-                    event,
-                    window_id: winit_window_id,
-                    ..
-                } => {
-                    let world = app.world.cell();
-                    let vulkano_winit_windows =
-                        world.get_non_send_resource::<BevyVulkanoWindows>().unwrap();
-                    let mut windows = world.get_resource_mut::<Windows>().unwrap();
-                    let window_id = if let Some(window_id) =
-                        vulkano_winit_windows.get_window_id(winit_window_id)
-                    {
-                        window_id
+                // Fetch and prepare details from the world
+                let mut system_state: SystemState<(
+                    NonSendMut<BevyVulkanoWindows>,
+                    Query<(&mut Window, &mut CachedWindow)>,
+                    WindowEvents,
+                    InputEvents,
+                    CursorEvents,
+                    EventWriter<FileDragAndDrop>,
+                )> = SystemState::new(&mut app.world);
+                let (
+                    mut vulkano_windows,
+                    mut window_query,
+                    mut window_events,
+                    mut input_events,
+                    mut cursor_events,
+                    mut file_drag_and_drop_events,
+                ) = system_state.get_mut(&mut app.world);
+
+                // Entity of this window
+                let window_entity =
+                    if let Some(entity) = vulkano_windows.get_window_entity(winit_window_id) {
+                        entity
                     } else {
                         warn!(
-                            "Skipped event for unknown winit Window Id {:?}",
-                            winit_window_id
+                            "Skipped event {:?} for unknown winit Window Id {:?}",
+                            event, winit_window_id
                         );
                         return;
                     };
 
-                    let window = if let Some(window) = windows.get_mut(window_id) {
-                        window
+                let (mut window, mut cache) =
+                    if let Ok((window, info)) = window_query.get_mut(window_entity) {
+                        (window, info)
                     } else {
-                        warn!("Skipped event for unknown Window Id {:?}", winit_window_id);
+                        warn!(
+                            "Window {:?} is missing `Window` component, skipping event {:?}",
+                            window_entity, event
+                        );
                         return;
                     };
 
-                    match event {
-                        WindowEvent::Resized(size) => {
-                            window.update_actual_size_from_backend(size.width, size.height);
-                            let mut resize_events =
-                                world.get_resource_mut::<Events<WindowResized>>().unwrap();
-                            resize_events.send(WindowResized {
-                                id: window_id,
-                                width: window.width(),
-                                height: window.height(),
-                            });
-                        }
-                        WindowEvent::CloseRequested => {
-                            let mut window_close_requested_events = world
-                                .get_resource_mut::<Events<WindowCloseRequested>>()
-                                .unwrap();
-                            window_close_requested_events.send(WindowCloseRequested {
-                                id: window_id,
-                            });
-                        }
-                        WindowEvent::KeyboardInput {
-                            ref input, ..
-                        } => {
-                            let mut keyboard_input_events =
-                                world.get_resource_mut::<Events<KeyboardInput>>().unwrap();
-                            keyboard_input_events.send(converters::convert_keyboard_input(input));
-                        }
-                        WindowEvent::CursorMoved {
-                            position, ..
-                        } => {
-                            let mut cursor_moved_events =
-                                world.get_resource_mut::<Events<CursorMoved>>().unwrap();
-                            let winit_window =
-                                vulkano_winit_windows.get_winit_window(window_id).unwrap();
-                            let inner_size = winit_window.inner_size();
-
-                            // move origin to bottom left
-                            let y_position = inner_size.height as f64 - position.y;
-
-                            let physical_position = DVec2::new(position.x, y_position);
-                            window.update_cursor_physical_position_from_backend(Some(
-                                physical_position,
-                            ));
-
-                            cursor_moved_events.send(CursorMoved {
-                                id: window_id,
-                                position: (physical_position / window.scale_factor()).as_vec2(),
-                            });
+                // Skip event if egui wants it
+                #[cfg(feature = "gui")]
+                {
+                    if let Some(vulkano_window) =
+                        vulkano_windows.get_vulkano_window_mut(window_entity)
+                    {
+                        // Update egui with the window event. If false, we should skip the event in bevy
+                        if vulkano_window.gui.update(&event) {
+                            return;
                         }
-                        WindowEvent::CursorEntered {
-                            ..
-                        } => {
-                            let mut cursor_entered_events =
-                                world.get_resource_mut::<Events<CursorEntered>>().unwrap();
-                            cursor_entered_events.send(CursorEntered {
-                                id: window_id,
+                    }
+                }
+
+                winit_state.low_power_event = true;
+
+                match event {
+                    WindowEvent::Resized(size) => {
+                        window
+                            .resolution
+                            .set_physical_resolution(size.width, size.height);
+
+                        window_events.window_resized.send(WindowResized {
+                            window: window_entity,
+                            width: window.width(),
+                            height: window.height(),
+                        });
+                    }
+                    WindowEvent::CloseRequested => {
+                        window_events
+                            .window_close_requested
+                            .send(WindowCloseRequested {
+                                window: window_entity,
                             });
-                        }
-                        WindowEvent::CursorLeft {
-                            ..
-                        } => {
-                            let mut cursor_left_events =
-                                world.get_resource_mut::<Events<CursorLeft>>().unwrap();
-                            window.update_cursor_physical_position_from_backend(None);
-                            cursor_left_events.send(CursorLeft {
-                                id: window_id,
+                    }
+                    WindowEvent::KeyboardInput {
+                        ref input, ..
+                    } => {
+                        input_events
+                            .keyboard_input
+                            .send(converters::convert_keyboard_input(input));
+                    }
+                    WindowEvent::CursorMoved {
+                        position, ..
+                    } => {
+                        let physical_position = DVec2::new(position.x, position.y);
+
+                        window.set_physical_cursor_position(Some(physical_position));
+
+                        cursor_events.cursor_moved.send(CursorMoved {
+                            window: window_entity,
+                            position: (physical_position / window.resolution.scale_factor())
+                                .as_vec2(),
+                        });
+                    }
+                    WindowEvent::CursorEntered {
+                        ..
+                    } => {
+                        cursor_events.cursor_entered.send(CursorEntered {
+                            window: window_entity,
+                        });
+                    }
+                    WindowEvent::CursorLeft {
+                        ..
+                    } => {
+                        window.set_physical_cursor_position(None);
+
+                        cursor_events.cursor_left.send(CursorLeft {
+                            window: window_entity,
+                        });
+                    }
+                    WindowEvent::MouseInput {
+                        state,
+                        button,
+                        ..
+                    } => {
+                        input_events.mouse_button_input.send(MouseButtonInput {
+                            button: converters::convert_mouse_button(button),
+                            state: converters::convert_element_state(state),
+                        });
+                    }
+                    WindowEvent::MouseWheel {
+                        delta, ..
+                    } => match delta {
+                        event::MouseScrollDelta::LineDelta(x, y) => {
+                            input_events.mouse_wheel_input.send(MouseWheel {
+                                unit: MouseScrollUnit::Line,
+                                x,
+                                y,
                             });
                         }
-                        WindowEvent::MouseInput {
-                            state,
-                            button,
-                            ..
-                        } => {
-                            let mut mouse_button_input_events = world
-                                .get_resource_mut::<Events<MouseButtonInput>>()
-                                .unwrap();
-                            mouse_button_input_events.send(MouseButtonInput {
-                                button: converters::convert_mouse_button(button),
-                                state: converters::convert_element_state(state),
+                        event::MouseScrollDelta::PixelDelta(p) => {
+                            input_events.mouse_wheel_input.send(MouseWheel {
+                                unit: MouseScrollUnit::Pixel,
+                                x: p.x as f32,
+                                y: p.y as f32,
                             });
                         }
-                        WindowEvent::MouseWheel {
-                            delta, ..
-                        } => match delta {
-                            event::MouseScrollDelta::LineDelta(x, y) => {
-                                let mut mouse_wheel_input_events =
-                                    world.get_resource_mut::<Events<MouseWheel>>().unwrap();
-                                mouse_wheel_input_events.send(MouseWheel {
-                                    unit: MouseScrollUnit::Line,
-                                    x,
-                                    y,
-                                });
-                            }
-                            event::MouseScrollDelta::PixelDelta(p) => {
-                                let mut mouse_wheel_input_events =
-                                    world.get_resource_mut::<Events<MouseWheel>>().unwrap();
-                                mouse_wheel_input_events.send(MouseWheel {
-                                    unit: MouseScrollUnit::Pixel,
-                                    x: p.x as f32,
-                                    y: p.y as f32,
-                                });
-                            }
-                        },
-                        WindowEvent::ReceivedCharacter(c) => {
-                            let mut char_input_events = world
-                                .get_resource_mut::<Events<ReceivedCharacter>>()
-                                .unwrap();
-
-                            char_input_events.send(ReceivedCharacter {
-                                id: window_id,
-                                char: c,
-                            })
-                        }
-                        WindowEvent::ScaleFactorChanged {
-                            scale_factor,
-                            new_inner_size,
-                        } => {
-                            let mut backend_scale_factor_change_events = world
-                                .get_resource_mut::<Events<WindowBackendScaleFactorChanged>>()
-                                .unwrap();
-                            backend_scale_factor_change_events.send(
-                                WindowBackendScaleFactorChanged {
-                                    id: window_id,
+                    },
+                    WindowEvent::Touch(touch) => {
+                        let location = touch.location.to_logical(window.resolution.scale_factor());
+
+                        // Event
+                        input_events
+                            .touch_input
+                            .send(converters::convert_touch_input(touch, location));
+                    }
+                    WindowEvent::ReceivedCharacter(c) => {
+                        input_events.character_input.send(ReceivedCharacter {
+                            window: window_entity,
+                            char: c,
+                        });
+                    }
+                    WindowEvent::ScaleFactorChanged {
+                        scale_factor,
+                        new_inner_size,
+                    } => {
+                        window_events.window_backend_scale_factor_changed.send(
+                            WindowBackendScaleFactorChanged {
+                                window: window_entity,
+                                scale_factor,
+                            },
+                        );
+
+                        let prior_factor = window.resolution.scale_factor();
+                        window.resolution.set_scale_factor(scale_factor);
+                        let new_factor = window.resolution.scale_factor();
+
+                        if let Some(forced_factor) = window.resolution.scale_factor_override() {
+                            // If there is a scale factor override, then force that to be used
+                            // Otherwise, use the OS suggested size
+                            // We have already told the OS about our resize constraints, so
+                            // the new_inner_size should take those into account
+                            *new_inner_size =
+                                winit::dpi::LogicalSize::new(window.width(), window.height())
+                                    .to_physical::<u32>(forced_factor);
+                            // TODO: Should this not trigger a WindowsScaleFactorChanged?
+                        } else if approx::relative_ne!(new_factor, prior_factor) {
+                            // Trigger a change event if they are approximately different
+                            window_events.window_scale_factor_changed.send(
+                                WindowScaleFactorChanged {
+                                    window: window_entity,
                                     scale_factor,
                                 },
                             );
-                            let prior_factor = window.scale_factor();
-                            window.update_scale_factor_from_backend(scale_factor);
-                            let new_factor = window.scale_factor();
-                            if let Some(forced_factor) = window.scale_factor_override() {
-                                // If there is a scale factor override, then force that to be used
-                                // Otherwise, use the OS suggested size
-                                // We have already told the OS about our resize constraints, so
-                                // the new_inner_size should take those into account
-                                *new_inner_size = winit::dpi::LogicalSize::new(
-                                    window.requested_width(),
-                                    window.requested_height(),
-                                )
-                                .to_physical::<u32>(forced_factor);
-                            } else if approx::relative_ne!(new_factor, prior_factor) {
-                                let mut scale_factor_change_events = world
-                                    .get_resource_mut::<Events<WindowScaleFactorChanged>>()
-                                    .unwrap();
-
-                                scale_factor_change_events.send(WindowScaleFactorChanged {
-                                    id: window_id,
-                                    scale_factor,
-                                });
-                            }
-
-                            let new_logical_width = new_inner_size.width as f64 / new_factor;
-                            let new_logical_height = new_inner_size.height as f64 / new_factor;
-                            if approx::relative_ne!(window.width() as f64, new_logical_width)
-                                || approx::relative_ne!(window.height() as f64, new_logical_height)
-                            {
-                                let mut resize_events =
-                                    world.get_resource_mut::<Events<WindowResized>>().unwrap();
-                                resize_events.send(WindowResized {
-                                    id: window_id,
-                                    width: new_logical_width as f32,
-                                    height: new_logical_height as f32,
-                                });
-                            }
-                            window.update_actual_size_from_backend(
-                                new_inner_size.width,
-                                new_inner_size.height,
-                            );
                         }
-                        WindowEvent::Focused(focused) => {
-                            window.update_focused_status_from_backend(focused);
-                            let mut focused_events =
-                                world.get_resource_mut::<Events<WindowFocused>>().unwrap();
-                            focused_events.send(WindowFocused {
-                                id: window_id,
-                                focused,
-                            });
-                        }
-                        WindowEvent::DroppedFile(path_buf) => {
-                            let mut events =
-                                world.get_resource_mut::<Events<FileDragAndDrop>>().unwrap();
-                            events.send(FileDragAndDrop::DroppedFile {
-                                id: window_id,
-                                path_buf,
-                            });
-                        }
-                        WindowEvent::HoveredFile(path_buf) => {
-                            let mut events =
-                                world.get_resource_mut::<Events<FileDragAndDrop>>().unwrap();
-                            events.send(FileDragAndDrop::HoveredFile {
-                                id: window_id,
-                                path_buf,
-                            });
-                        }
-                        WindowEvent::HoveredFileCancelled => {
-                            let mut events =
-                                world.get_resource_mut::<Events<FileDragAndDrop>>().unwrap();
-                            events.send(FileDragAndDrop::HoveredFileCancelled {
-                                id: window_id,
+
+                        let new_logical_width = (new_inner_size.width as f64 / new_factor) as f32;
+                        let new_logical_height = (new_inner_size.height as f64 / new_factor) as f32;
+                        if approx::relative_ne!(window.width(), new_logical_width)
+                            || approx::relative_ne!(window.height(), new_logical_height)
+                        {
+                            window_events.window_resized.send(WindowResized {
+                                window: window_entity,
+                                width: new_logical_width,
+                                height: new_logical_height,
                             });
                         }
-                        WindowEvent::Moved(position) => {
-                            let position = ivec2(position.x, position.y);
-                            window.update_actual_position_from_backend(position);
-                            let mut events =
-                                world.get_resource_mut::<Events<WindowMoved>>().unwrap();
-                            events.send(WindowMoved {
-                                id: window_id,
-                                position,
+                        window
+                            .resolution
+                            .set_physical_resolution(new_inner_size.width, new_inner_size.height);
+                    }
+                    WindowEvent::Focused(focused) => {
+                        // Component
+                        window.focused = focused;
+
+                        window_events.window_focused.send(WindowFocused {
+                            window: window_entity,
+                            focused,
+                        });
+                    }
+                    WindowEvent::DroppedFile(path_buf) => {
+                        file_drag_and_drop_events.send(FileDragAndDrop::DroppedFile {
+                            window: window_entity,
+                            path_buf,
+                        });
+                    }
+                    WindowEvent::HoveredFile(path_buf) => {
+                        file_drag_and_drop_events.send(FileDragAndDrop::HoveredFile {
+                            window: window_entity,
+                            path_buf,
+                        });
+                    }
+                    WindowEvent::HoveredFileCancelled => {
+                        file_drag_and_drop_events.send(FileDragAndDrop::HoveredFileCancelled {
+                            window: window_entity,
+                        });
+                    }
+                    WindowEvent::Moved(position) => {
+                        let position = ivec2(position.x, position.y);
+
+                        window.position.set(position);
+
+                        window_events.window_moved.send(WindowMoved {
+                            entity: window_entity,
+                            position,
+                        });
+                    }
+                    WindowEvent::Ime(event) => match event {
+                        event::Ime::Preedit(value, cursor) => {
+                            input_events.ime_input.send(Ime::Preedit {
+                                window: window_entity,
+                                value,
+                                cursor,
                             });
                         }
-                        _ => {}
-                    }
+                        event::Ime::Commit(value) => input_events.ime_input.send(Ime::Commit {
+                            window: window_entity,
+                            value,
+                        }),
+                        event::Ime::Enabled => input_events.ime_input.send(Ime::Enabled {
+                            window: window_entity,
+                        }),
+                        event::Ime::Disabled => input_events.ime_input.send(Ime::Disabled {
+                            window: window_entity,
+                        }),
+                    },
+                    _ => {}
                 }
-                event::Event::DeviceEvent {
-                    event:
-                        DeviceEvent::MouseMotion {
-                            delta,
-                        },
-                    ..
-                } => {
-                    let mut mouse_motion_events =
-                        app.world.get_resource_mut::<Events<MouseMotion>>().unwrap();
-                    mouse_motion_events.send(MouseMotion {
-                        delta: Vec2::new(delta.0 as f32, delta.1 as f32),
-                    });
-                }
-                event::Event::Suspended => {
-                    active = false;
+
+                if window.is_changed() {
+                    cache.window = window.clone();
                 }
-                event::Event::Resumed => {
-                    active = true;
+            }
+            event::Event::DeviceEvent {
+                event:
+                    DeviceEvent::MouseMotion {
+                        delta: (x, y),
+                    },
+                ..
+            } => {
+                let mut system_state: SystemState<EventWriter<MouseMotion>> =
+                    SystemState::new(&mut app.world);
+                let mut mouse_motion = system_state.get_mut(&mut app.world);
+
+                mouse_motion.send(MouseMotion {
+                    delta: Vec2::new(x as f32, y as f32),
+                });
+            }
+            event::Event::Suspended => {
+                winit_state.active = false;
+                #[cfg(target_os = "android")]
+                {
+                    // Bevy doesn't support suspend/resume so we just exit
+                    // and Android will restart the application on resume
+                    // TODO: Save save some state and load on resume
+                    *control_flow = ControlFlow::Exit;
                 }
-                event::Event::MainEventsCleared => {
-                    handle_create_window_events(
-                        &mut app.world,
-                        event_loop,
-                        &mut create_window_event_reader,
-                    );
-                    if active {
-                        app.update();
+            }
+            event::Event::Resumed => {
+                winit_state.active = true;
+            }
+            event::Event::MainEventsCleared => {
+                let (winit_config, window_focused_query) = focused_window_state.get(&app.world);
+
+                let update = if winit_state.active {
+                    // True if _any_ windows are currently being focused
+                    let app_focused = window_focused_query.iter().any(|window| window.focused);
+                    match winit_config.update_mode(app_focused) {
+                        UpdateMode::Continuous
+                        | UpdateMode::Reactive {
+                            ..
+                        } => true,
+                        UpdateMode::ReactiveLowPower {
+                            ..
+                        } => {
+                            winit_state.low_power_event
+                                || winit_state.redraw_request_sent
+                                || winit_state.timeout_reached
+                        }
                     }
+                } else {
+                    false
+                };
+
+                if update {
+                    winit_state.last_update = Instant::now();
+                    app.update();
                 }
-                _ => (),
             }
-        }
-    };
-    if should_return_from_run {
-        let _exit_code = run_return(&mut event_loop, event_handler);
-    } else {
-        run(event_loop, event_handler);
-    }
-}
+            Event::RedrawEventsCleared => {
+                {
+                    // Fetch from world
+                    let (winit_config, window_focused_query) = focused_window_state.get(&app.world);
+
+                    // True if _any_ windows are currently being focused
+                    let app_focused = window_focused_query.iter().any(|window| window.focused);
+
+                    let now = Instant::now();
+                    use UpdateMode::*;
+                    *control_flow = match winit_config.update_mode(app_focused) {
+                        Continuous => ControlFlow::Poll,
+                        Reactive {
+                            max_wait,
+                        }
+                        | ReactiveLowPower {
+                            max_wait,
+                        } => {
+                            if let Some(instant) = now.checked_add(*max_wait) {
+                                ControlFlow::WaitUntil(instant)
+                            } else {
+                                ControlFlow::Wait
+                            }
+                        }
+                    };
+                }
 
-fn handle_create_window_events(
-    world: &mut World,
-    event_loop: &EventLoopWindowTarget<()>,
-    create_window_event_reader: &mut ManualEventReader<CreateWindow>,
-) {
-    let world = world.cell();
-    let vulkano_config = world.get_non_send_resource::<VulkanoWinitConfig>().unwrap();
-    let vulkano_context = world.get_resource::<BevyVulkanoContext>().unwrap();
-    let mut vulkano_winit_windows = world
-        .get_non_send_resource_mut::<BevyVulkanoWindows>()
-        .unwrap();
-    let mut windows = world.get_resource_mut::<Windows>().unwrap();
-    let create_window_events = world.get_resource::<Events<CreateWindow>>().unwrap();
-    let mut window_created_events = world.get_resource_mut::<Events<WindowCreated>>().unwrap();
-    for create_window_event in create_window_event_reader.iter(&create_window_events) {
-        let window = vulkano_winit_windows.create_window(
-            event_loop,
-            create_window_event.id,
-            &create_window_event.descriptor,
-            &vulkano_context.context,
-            &vulkano_config,
-        );
-        windows.add(window);
-        window_created_events.send(WindowCreated {
-            id: create_window_event.id,
-        });
-    }
-}
+                // This block needs to run after `app.update()` in `MainEventsCleared`. Otherwise,
+                // we won't be able to see redraw requests until the next event, defeating the
+                // purpose of a redraw request!
+                let mut redraw = false;
+                if let Some(app_redraw_events) = app.world.get_resource::<Events<RequestRedraw>>() {
+                    if redraw_event_reader.iter(app_redraw_events).last().is_some() {
+                        *control_flow = ControlFlow::Poll;
+                        redraw = true;
+                    }
+                }
 
-fn handle_initial_window_events(world: &mut World, event_loop: &EventLoop<()>) {
-    let world = world.cell();
-    let vulkano_config = world.get_non_send_resource::<VulkanoWinitConfig>().unwrap();
-    let vulkano_context = world.get_resource::<BevyVulkanoContext>().unwrap();
-    let mut vulkano_winit_windows = world
-        .get_non_send_resource_mut::<BevyVulkanoWindows>()
-        .unwrap();
-    let mut windows = world.get_resource_mut::<Windows>().unwrap();
-    let mut create_window_events = world.get_resource_mut::<Events<CreateWindow>>().unwrap();
-    let mut window_created_events = world.get_resource_mut::<Events<WindowCreated>>().unwrap();
-    for create_window_event in create_window_events.drain() {
-        let window = vulkano_winit_windows.create_window(
-            event_loop,
-            create_window_event.id,
-            &create_window_event.descriptor,
-            &vulkano_context.context,
-            &vulkano_config,
-        );
-        windows.add(window);
-        window_created_events.send(WindowCreated {
-            id: create_window_event.id,
-        });
-    }
-}
+                winit_state.redraw_request_sent = redraw;
+            }
 
-pub fn exit_on_window_close_system(
-    mut app_exit_events: EventWriter<AppExit>,
-    mut window_close_events: EventWriter<WindowClosed>,
-    mut window_close_requested_events: EventReader<WindowCloseRequested>,
-    mut windows: NonSendMut<BevyVulkanoWindows>,
-    mut pipeline_data: ResMut<PipelineSyncData>,
-) {
-    for event in window_close_requested_events.iter() {
-        let (app_close, window_close) = close_window(event.id, &mut windows, &mut pipeline_data);
-        if app_close {
-            app_exit_events.send(AppExit);
-        } else if window_close {
-            window_close_events.send(WindowClosed {
-                id: event.id,
-            })
+            _ => (),
         }
-    }
-}
 
-fn close_window(
-    window_id: bevy::window::WindowId,
-    windows: &mut BevyVulkanoWindows,
-    pipeline_data: &mut PipelineSyncData,
-    // App close?, Window was closed?
-) -> (bool, bool) {
-    // Close app on primary window exit
-    if window_id == WindowId::primary() {
-        (true, false)
-    }
-    // But don't close app on secondary window exit. Instead cleanup...
-    else {
-        pipeline_data.remove(window_id);
-        let winit_id = if let Some(winit_window) = windows.get_winit_window(window_id) {
-            winit_window.id()
-        } else {
-            // Window already closed
-            return (false, false);
-        };
-        windows.windows.remove(&winit_id);
-        (false, true)
+        if winit_state.active {
+            let (
+                commands,
+                mut new_windows,
+                created_window_writer,
+                vulkano_windows,
+                context,
+                settings,
+            ) = create_window_system_state.get_mut(&mut app.world);
+
+            // Responsible for creating new windows
+            create_window(
+                commands,
+                event_loop,
+                new_windows.iter_mut(),
+                created_window_writer,
+                vulkano_windows,
+                context,
+                settings,
+            );
+
+            create_window_system_state.apply(&mut app.world);
+        }
+    };
+
+    // If true, returns control from Winit back to the main Bevy loop
+    if return_from_run {
+        run_return(&mut event_loop, event_handler);
+    } else {
+        run(event_loop, event_handler);
     }
 }
 
 #[cfg(feature = "gui")]
 pub fn begin_egui_frame_system(mut vulkano_windows: NonSendMut<BevyVulkanoWindows>) {
-    for (_, (_, g)) in vulkano_windows.windows.iter_mut() {
-        g.begin_frame();
+    for (_, w) in vulkano_windows.windows.iter_mut() {
+        w.gui.begin_frame();
     }
 }
diff --git a/src/pipeline_sync_data.rs b/src/pipeline_sync_data.rs
deleted file mode 100644
index 0e4303f..0000000
--- a/src/pipeline_sync_data.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-#[allow(unused)]
-use bevy::{ecs::system::Resource, utils::HashMap, window::WindowId};
-use vulkano::sync::GpuFuture;
-
-/// Contains gpu future data per window to be used in Vulkano pipeline synchronization
-#[derive(Default, Resource)]
-pub struct PipelineSyncData {
-    pub data_per_window: HashMap<WindowId, SyncData>,
-}
-
-impl PipelineSyncData {
-    pub fn add(&mut self, data: SyncData) {
-        self.data_per_window.insert(data.window_id, data);
-    }
-
-    pub fn remove(&mut self, id: WindowId) {
-        self.data_per_window.remove(&id);
-    }
-
-    pub fn get(&self, id: WindowId) -> Option<&SyncData> {
-        self.data_per_window.get(&id)
-    }
-
-    pub fn get_mut(&mut self, id: WindowId) -> Option<&mut SyncData> {
-        self.data_per_window.get_mut(&id)
-    }
-
-    pub fn get_primary(&self) -> Option<&SyncData> {
-        self.get(WindowId::primary())
-    }
-
-    pub fn get_primary_mut(&mut self) -> Option<&mut SyncData> {
-        self.get_mut(WindowId::primary())
-    }
-
-    pub fn iter(&self) -> impl Iterator<Item = &SyncData> {
-        self.data_per_window.values()
-    }
-
-    pub fn iter_mut(&mut self) -> impl Iterator<Item = &mut SyncData> {
-        self.data_per_window.values_mut()
-    }
-}
-
-/// Wrapper for useful data for rendering during pipeline
-pub struct SyncData {
-    pub window_id: WindowId,
-    pub before: Option<Box<dyn GpuFuture>>,
-    pub after: Option<Box<dyn GpuFuture>>,
-}
-
-unsafe impl Send for SyncData {}
-unsafe impl Sync for SyncData {}
diff --git a/src/system.rs b/src/system.rs
new file mode 100644
index 0000000..79a5d6a
--- /dev/null
+++ b/src/system.rs
@@ -0,0 +1,285 @@
+// Same as in `bevy_winit`, but modified to allow inserting vulkano renderer that holds the window
+use bevy::{
+    log::{error, info, warn},
+    prelude::{
+        Changed, Commands, Component, Entity, EventWriter, Mut, NonSend, NonSendMut, Query,
+        RemovedComponents, Res, Resource, Window,
+    },
+    utils::HashMap,
+    window::{RawHandleWrapper, WindowClosed, WindowCreated},
+};
+use raw_window_handle::{HasRawDisplayHandle, HasRawWindowHandle};
+use winit::{
+    dpi::{LogicalPosition, LogicalSize, PhysicalPosition, PhysicalSize},
+    event_loop::EventLoopWindowTarget,
+};
+
+use crate::{
+    config::BevyVulkanoSettings, converters, converters::convert_window_level, get_best_videomode,
+    get_fitting_videomode, vulkano_windows::attempt_grab, BevyVulkanoContext, BevyVulkanoWindows,
+};
+
+/// System responsible for creating new windows whenever a `Window` component is added
+/// to an entity. In addition, A vulkano renderer for each window get created.
+///
+/// This will default any necessary components if they are not already added.
+#[allow(clippy::too_many_arguments)]
+pub(crate) fn create_window<'a>(
+    mut commands: Commands,
+    event_loop: &EventLoopWindowTarget<()>,
+    created_windows: impl Iterator<Item = (Entity, Mut<'a, Window>)>,
+    mut event_writer: EventWriter<WindowCreated>,
+    mut vulkano_windows: NonSendMut<BevyVulkanoWindows>,
+    context: Res<BevyVulkanoContext>,
+    settings: NonSend<BevyVulkanoSettings>,
+) {
+    for (entity, mut window) in created_windows {
+        if vulkano_windows.get_vulkano_window(entity).is_some() {
+            continue;
+        }
+
+        info!(
+            "Creating new window {:?} ({:?})",
+            window.title.as_str(),
+            entity
+        );
+
+        let vulkano_window =
+            vulkano_windows.create_window(event_loop, entity, &window, &context.context, &settings);
+        window
+            .resolution
+            .set_scale_factor(vulkano_window.window().scale_factor());
+        commands
+            .entity(entity)
+            .insert(RawHandleWrapper {
+                window_handle: vulkano_window.window().raw_window_handle(),
+                display_handle: vulkano_window.window().raw_display_handle(),
+            })
+            .insert(CachedWindow {
+                window: window.clone(),
+            });
+
+        event_writer.send(WindowCreated {
+            window: entity,
+        });
+    }
+}
+
+/// Cache for closing windows so we can get better debug information.
+#[derive(Debug, Clone, Resource)]
+pub struct WindowTitleCache(HashMap<Entity, String>);
+
+pub(crate) fn despawn_window(
+    mut closed: RemovedComponents<Window>,
+    window_entities: Query<&Window>,
+    mut close_events: EventWriter<WindowClosed>,
+    mut vulkano_windows: NonSendMut<BevyVulkanoWindows>,
+) {
+    for window in closed.iter() {
+        info!("Closing window {:?}", window);
+        // Guard to verify that the window is in fact actually gone,
+        // rather than having the component added and removed in the same frame.
+        if !window_entities.contains(window) {
+            vulkano_windows.remove_window(window);
+            close_events.send(WindowClosed {
+                window,
+            });
+        }
+    }
+}
+
+/// The cached state of the window so we can check which properties were changed from within the app.
+#[derive(Debug, Clone, Component)]
+pub struct CachedWindow {
+    pub window: Window,
+}
+
+// Detect changes to the window and update the winit window accordingly.
+//
+// Notes:
+// - [`Window::present_mode`] and [`Window::composite_alpha_mode`] updating should be handled in the bevy render crate.
+// - [`Window::transparent`] currently cannot be updated after startup for winit.
+// - [`Window::canvas`] currently cannot be updated after startup, not entirely sure if it would work well with the
+//   event channel stuff.
+pub(crate) fn changed_window(
+    mut changed_windows: Query<(Entity, &mut Window, &mut CachedWindow), Changed<Window>>,
+    vulkano_windows: NonSendMut<BevyVulkanoWindows>,
+) {
+    for (entity, mut window, mut cache) in &mut changed_windows {
+        if let Some(vulkano_window) = vulkano_windows.get_vulkano_window(entity) {
+            if window.title != cache.window.title {
+                vulkano_window.window().set_title(window.title.as_str());
+            }
+
+            if window.mode != cache.window.mode {
+                let new_mode = match window.mode {
+                    bevy::window::WindowMode::BorderlessFullscreen => {
+                        Some(winit::window::Fullscreen::Borderless(None))
+                    }
+                    bevy::window::WindowMode::Fullscreen => {
+                        Some(winit::window::Fullscreen::Exclusive(get_best_videomode(
+                            &vulkano_window.window().current_monitor().unwrap(),
+                        )))
+                    }
+                    bevy::window::WindowMode::SizedFullscreen => {
+                        Some(winit::window::Fullscreen::Exclusive(get_fitting_videomode(
+                            &vulkano_window.window().current_monitor().unwrap(),
+                            window.width() as u32,
+                            window.height() as u32,
+                        )))
+                    }
+                    bevy::window::WindowMode::Windowed => None,
+                };
+
+                if vulkano_window.window().fullscreen() != new_mode {
+                    vulkano_window.window().set_fullscreen(new_mode);
+                }
+            }
+            if window.resolution != cache.window.resolution {
+                let physical_size = PhysicalSize::new(
+                    window.resolution.physical_width(),
+                    window.resolution.physical_height(),
+                );
+                vulkano_window.window().set_inner_size(physical_size);
+            }
+
+            if window.physical_cursor_position() != cache.window.physical_cursor_position() {
+                if let Some(physical_position) = window.physical_cursor_position() {
+                    let inner_size = vulkano_window.window().inner_size();
+
+                    let position = PhysicalPosition::new(
+                        physical_position.x,
+                        // Flip the coordinate space back to winit's context.
+                        inner_size.height as f32 - physical_position.y,
+                    );
+
+                    if let Err(err) = vulkano_window.window().set_cursor_position(position) {
+                        error!("could not set cursor position: {:?}", err);
+                    }
+                }
+            }
+
+            if window.cursor.icon != cache.window.cursor.icon {
+                vulkano_window
+                    .window()
+                    .set_cursor_icon(converters::convert_cursor_icon(window.cursor.icon));
+            }
+
+            if window.cursor.grab_mode != cache.window.cursor.grab_mode {
+                attempt_grab(vulkano_window.window(), window.cursor.grab_mode);
+            }
+
+            if window.cursor.visible != cache.window.cursor.visible {
+                vulkano_window
+                    .window()
+                    .set_cursor_visible(window.cursor.visible);
+            }
+
+            if window.cursor.hit_test != cache.window.cursor.hit_test {
+                if let Err(err) = vulkano_window
+                    .window()
+                    .set_cursor_hittest(window.cursor.hit_test)
+                {
+                    window.cursor.hit_test = cache.window.cursor.hit_test;
+                    warn!(
+                        "Could not set cursor hit test for window {:?}: {:?}",
+                        window.title, err
+                    );
+                }
+            }
+
+            if window.decorations != cache.window.decorations
+                && window.decorations != vulkano_window.window().is_decorated()
+            {
+                vulkano_window.window().set_decorations(window.decorations);
+            }
+
+            if window.resizable != cache.window.resizable
+                && window.resizable != vulkano_window.window().is_resizable()
+            {
+                vulkano_window.window().set_resizable(window.resizable);
+            }
+
+            if window.resize_constraints != cache.window.resize_constraints {
+                let constraints = window.resize_constraints.check_constraints();
+                let min_inner_size = LogicalSize {
+                    width: constraints.min_width,
+                    height: constraints.min_height,
+                };
+                let max_inner_size = LogicalSize {
+                    width: constraints.max_width,
+                    height: constraints.max_height,
+                };
+
+                vulkano_window
+                    .window()
+                    .set_min_inner_size(Some(min_inner_size));
+                if constraints.max_width.is_finite() && constraints.max_height.is_finite() {
+                    vulkano_window
+                        .window()
+                        .set_max_inner_size(Some(max_inner_size));
+                }
+            }
+
+            if window.position != cache.window.position {
+                if let Some(position) = crate::winit_window_position(
+                    &window.position,
+                    &window.resolution,
+                    vulkano_window.window().available_monitors(),
+                    vulkano_window.window().primary_monitor(),
+                    vulkano_window.window().current_monitor(),
+                ) {
+                    let should_set = match vulkano_window.window().outer_position() {
+                        Ok(current_position) => current_position != position,
+                        _ => true,
+                    };
+
+                    if should_set {
+                        vulkano_window.window().set_outer_position(position);
+                    }
+                }
+            }
+
+            if let Some(maximized) = window.internal.take_maximize_request() {
+                vulkano_window.window().set_maximized(maximized);
+            }
+
+            if let Some(minimized) = window.internal.take_minimize_request() {
+                vulkano_window.window().set_minimized(minimized);
+            }
+
+            if window.focused != cache.window.focused && window.focused {
+                vulkano_window.window().focus_window();
+            }
+
+            if window.window_level != cache.window.window_level {
+                vulkano_window
+                    .window()
+                    .set_window_level(convert_window_level(window.window_level));
+            }
+
+            // Currently unsupported changes
+            if window.transparent != cache.window.transparent {
+                window.transparent = cache.window.transparent;
+                warn!(
+                    "Winit does not currently support updating transparency after window creation."
+                );
+            }
+
+            if window.ime_enabled != cache.window.ime_enabled {
+                vulkano_window.window().set_ime_allowed(window.ime_enabled);
+            }
+
+            if window.ime_position != cache.window.ime_position {
+                vulkano_window
+                    .window()
+                    .set_ime_position(LogicalPosition::new(
+                        window.ime_position.x,
+                        window.ime_position.y,
+                    ));
+            }
+
+            cache.window = window.clone();
+        }
+    }
+}
diff --git a/src/vulkano_windows.rs b/src/vulkano_windows.rs
index 81abd52..e7ffe9e 100644
--- a/src/vulkano_windows.rs
+++ b/src/vulkano_windows.rs
@@ -1,19 +1,15 @@
+// Mostly same as in `bevy_winit`, but modified to hold `VulkanoWindow` instead of just winit Window
+
 #![allow(clippy::field_reassign_with_default)]
 
 use bevy::{
-    math::IVec2,
-    utils::{
-        hashbrown::hash_map::{Iter, IterMut},
-        HashMap,
-    },
-    window::{
-        MonitorSelection, PresentMode, RawHandleWrapper, Window, WindowDescriptor, WindowId,
-        WindowMode,
-    },
+    log::warn,
+    prelude::Entity,
+    utils::HashMap,
+    window::{PresentMode, Window, WindowMode, WindowPosition, WindowResolution},
 };
 #[cfg(feature = "gui")]
 use egui_winit_vulkano::{Gui, GuiConfig};
-use raw_window_handle::{HasRawDisplayHandle, HasRawWindowHandle};
 use vulkano_util::{
     context::VulkanoContext,
     renderer::VulkanoWindowRenderer,
@@ -23,81 +19,49 @@ use vulkano_util::{
     },
 };
 use winit::{
-    dpi::{LogicalPosition, LogicalSize, PhysicalPosition},
-    window::CursorGrabMode,
+    dpi::{LogicalSize, PhysicalPosition},
+    monitor::MonitorHandle,
 };
 
-use crate::VulkanoWinitConfig;
+use crate::{config::BevyVulkanoSettings, converters::convert_window_level};
 
-fn window_descriptor_to_vulkano_window_descriptor(
-    wd: &WindowDescriptor,
-    position: Option<[f32; 2]>,
-) -> VulkanoWindowDescriptor {
-    let mut window_descriptor = VulkanoWindowDescriptor::default();
-    window_descriptor.width = wd.width;
-    window_descriptor.height = wd.height;
-    window_descriptor.position = position;
-    window_descriptor.resize_constraints = VulkanoWindowResizeConstraints {
-        min_width: wd.resize_constraints.min_width,
-        min_height: wd.resize_constraints.min_height,
-        max_width: wd.resize_constraints.max_width,
-        max_height: wd.resize_constraints.max_height,
-    };
-    window_descriptor.scale_factor_override = wd.scale_factor_override;
-    window_descriptor.title = wd.title.clone();
-    window_descriptor.present_mode = match wd.present_mode {
-        PresentMode::Fifo => vulkano::swapchain::PresentMode::Fifo,
-        PresentMode::Immediate => vulkano::swapchain::PresentMode::Immediate,
-        PresentMode::Mailbox => vulkano::swapchain::PresentMode::Mailbox,
-        PresentMode::AutoNoVsync => vulkano::swapchain::PresentMode::Immediate,
-        PresentMode::AutoVsync => vulkano::swapchain::PresentMode::FifoRelaxed,
-    };
-    window_descriptor.resizable = wd.resizable;
-    window_descriptor.decorations = wd.decorations;
-    window_descriptor.cursor_visible = wd.cursor_visible;
-    window_descriptor.cursor_locked = match wd.cursor_grab_mode {
-        bevy::window::CursorGrabMode::Locked => true,
-        _ => false,
-    };
-    window_descriptor.mode = match wd.mode {
-        WindowMode::Windowed => vulkano_util::window::WindowMode::Windowed,
-        WindowMode::Fullscreen => vulkano_util::window::WindowMode::Fullscreen,
-        WindowMode::BorderlessFullscreen => vulkano_util::window::WindowMode::BorderlessFullscreen,
-        WindowMode::SizedFullscreen => vulkano_util::window::WindowMode::SizedFullscreen,
-    };
-    window_descriptor.transparent = wd.transparent;
-    window_descriptor
+pub struct VulkanoWindow {
+    pub renderer: VulkanoWindowRenderer,
+    #[cfg(feature = "gui")]
+    pub gui: Gui,
+}
+
+impl VulkanoWindow {
+    pub fn window(&self) -> &winit::window::Window {
+        self.renderer.window()
+    }
 }
 
 #[derive(Default)]
 pub struct BevyVulkanoWindows {
-    #[cfg(not(feature = "gui"))]
-    pub(crate) windows: HashMap<winit::window::WindowId, VulkanoWindowRenderer>,
-    #[cfg(feature = "gui")]
-    pub(crate) windows: HashMap<winit::window::WindowId, (VulkanoWindowRenderer, Gui)>,
-    pub(crate) window_id_to_winit: HashMap<WindowId, winit::window::WindowId>,
-    pub(crate) winit_to_window_id: HashMap<winit::window::WindowId, WindowId>,
+    pub(crate) windows: HashMap<winit::window::WindowId, VulkanoWindow>,
+    /// Maps entities to `winit` window identifiers.
+    pub(crate) entity_to_winit: HashMap<Entity, winit::window::WindowId>,
+    /// Maps `winit` window identifiers to entities.
+    pub(crate) winit_to_entity: HashMap<winit::window::WindowId, Entity>,
+    // Some winit functions, such as `set_window_icon` can only be used from the main thread. If
+    // they are used in another thread, the app will hang. This marker ensures `WinitWindows` is
+    // only ever accessed with bevy's non-send functions and in NonSend systems.
+    _not_send_sync: core::marker::PhantomData<*const ()>,
 }
 
 impl BevyVulkanoWindows {
     pub fn create_window(
         &mut self,
         event_loop: &winit::event_loop::EventLoopWindowTarget<()>,
-        window_id: WindowId,
-        window_descriptor: &WindowDescriptor,
+        entity: Entity,
+        window: &Window,
         vulkano_context: &VulkanoContext,
-        _config: &VulkanoWinitConfig,
-    ) -> Window {
-        #[cfg(target_os = "windows")]
-        let mut winit_window_builder = {
-            use winit::platform::windows::WindowBuilderExtWindows;
-            winit::window::WindowBuilder::new().with_drag_and_drop(true)
-        };
-
-        #[cfg(not(target_os = "windows"))]
+        _settings: &BevyVulkanoSettings,
+    ) -> &VulkanoWindow {
         let mut winit_window_builder = winit::window::WindowBuilder::new();
 
-        winit_window_builder = match window_descriptor.mode {
+        winit_window_builder = match window.mode {
             WindowMode::BorderlessFullscreen => winit_window_builder.with_fullscreen(Some(
                 winit::window::Fullscreen::Borderless(event_loop.primary_monitor()),
             )),
@@ -109,78 +73,37 @@ impl BevyVulkanoWindows {
             WindowMode::SizedFullscreen => winit_window_builder.with_fullscreen(Some(
                 winit::window::Fullscreen::Exclusive(get_fitting_videomode(
                     &event_loop.primary_monitor().unwrap(),
-                    window_descriptor.width as u32,
-                    window_descriptor.height as u32,
+                    window.width() as u32,
+                    window.height() as u32,
                 )),
             )),
-            _ => {
-                let WindowDescriptor {
-                    width,
-                    height,
-                    position,
-                    scale_factor_override,
-                    monitor: monitor_selection,
-                    ..
-                } = window_descriptor;
-
-                 match position {
-                    bevy::window::WindowPosition::Automatic => { /* Window manager will handle position */ }
-                     bevy::window::WindowPosition::Centered  => {
-                         let maybe_monitor = match monitor_selection {
-                             MonitorSelection::Current => None,
-                             MonitorSelection::Primary => event_loop.primary_monitor(),
-                             MonitorSelection::Index(i) => event_loop.available_monitors().nth(*i)};
-                        if let Some(monitor) = maybe_monitor {
-                            let screen_size = monitor.size();
-
-                            let scale_factor = scale_factor_override.unwrap_or(1.0);
-
-                            // Logical to physical window size
-                            let (width, height): (u32, u32) = LogicalSize::new(*width, *height)
-                                .to_physical::<u32>(scale_factor)
-                                .into();
-
-                            let position = PhysicalPosition {
-                                x: screen_size.width.saturating_sub(width) as f64 / 2.
-                                    + monitor.position().x as f64,
-                                y: screen_size.height.saturating_sub(height) as f64 / 2.
-                                    + monitor.position().y as f64,
-                            };
-
-                            winit_window_builder = winit_window_builder.with_position(position);
-                        } else {
-                            bevy::log::warn!("Couldn't get monitor selected with: {monitor_selection:?}");
-                        }
-                    }
-                     bevy::window::WindowPosition::At(position) => {
-                        if let Some(sf) = scale_factor_override {
-                            winit_window_builder = winit_window_builder.with_position(
-                                LogicalPosition::new(position[0] as f64, position[1] as f64)
-                                    .to_physical::<f64>(*sf),
-                            );
-                        } else {
-                            winit_window_builder = winit_window_builder.with_position(
-                                LogicalPosition::new(position[0] as f64, position[1] as f64),
-                            );
-                        }
-                    }
+            WindowMode::Windowed => {
+                if let Some(position) = winit_window_position(
+                    &window.position,
+                    &window.resolution,
+                    event_loop.available_monitors(),
+                    event_loop.primary_monitor(),
+                    None,
+                ) {
+                    winit_window_builder = winit_window_builder.with_position(position);
                 }
 
-                if let Some(sf) = scale_factor_override {
-                    winit_window_builder.with_inner_size(
-                        winit::dpi::LogicalSize::new(*width, *height).to_physical::<f64>(*sf),
-                    )
+                let logical_size = LogicalSize::new(window.width(), window.height());
+                if let Some(sf) = window.resolution.scale_factor_override() {
+                    winit_window_builder.with_inner_size(logical_size.to_physical::<f64>(sf))
                 } else {
-                    winit_window_builder
-                        .with_inner_size(winit::dpi::LogicalSize::new(*width, *height))
+                    winit_window_builder.with_inner_size(logical_size)
                 }
             }
-            .with_resizable(window_descriptor.resizable)
-            .with_decorations(window_descriptor.decorations)
-            .with_transparent(window_descriptor.transparent),
         };
 
-        let constraints = window_descriptor.resize_constraints.check_constraints();
+        winit_window_builder = winit_window_builder
+            .with_window_level(convert_window_level(window.window_level))
+            .with_resizable(window.resizable)
+            .with_decorations(window.decorations)
+            .with_transparent(window.transparent);
+
+        let constraints = window.resize_constraints.check_constraints();
         let min_inner_size = LogicalSize {
             width: constraints.min_width,
             height: constraints.min_height,
@@ -199,177 +122,113 @@ impl BevyVulkanoWindows {
                 winit_window_builder.with_min_inner_size(min_inner_size)
             };
 
-        #[allow(unused_mut)]
-        let mut winit_window_builder = winit_window_builder.with_title(&window_descriptor.title);
+        let winit_window = winit_window_builder
+            .with_title(window.title.as_str())
+            .build(event_loop)
+            .unwrap();
 
-        let winit_window = winit_window_builder.build(event_loop).unwrap();
-
-        match winit_window.set_cursor_grab(match window_descriptor.cursor_grab_mode {
-            bevy::window::CursorGrabMode::Locked => CursorGrabMode::Locked,
-            bevy::window::CursorGrabMode::Confined => CursorGrabMode::Confined,
-            bevy::window::CursorGrabMode::None => CursorGrabMode::None,
-        }) {
-            Ok(_) => {}
-            Err(winit::error::ExternalError::NotSupported(_)) => {}
-            Err(err) => Err(err).unwrap(),
+        // Do not set the grab mode on window creation if it's none, this can fail on mobile
+        if window.cursor.grab_mode != bevy::window::CursorGrabMode::None {
+            attempt_grab(&winit_window, window.cursor.grab_mode);
         }
 
-        winit_window.set_cursor_visible(window_descriptor.cursor_visible);
-
-        let winit_id = winit_window.id();
-        self.window_id_to_winit.insert(window_id, winit_id);
-        self.winit_to_window_id.insert(winit_id, window_id);
-
-        let position = winit_window
-            .outer_position()
-            .ok()
-            .map(|position| IVec2::new(position.x, position.y));
-        let inner_size = winit_window.inner_size();
-        let scale_factor = winit_window.scale_factor();
-        let raw_window_handle = winit_window.raw_window_handle();
-        let raw_window_handle_wrapper = RawHandleWrapper {
-            window_handle: raw_window_handle,
-            display_handle: winit_window.raw_display_handle(),
-        };
+        winit_window.set_cursor_visible(window.cursor.visible);
 
-        let window_renderer = VulkanoWindowRenderer::new(
-            vulkano_context,
-            winit_window,
-            &window_descriptor_to_vulkano_window_descriptor(
-                window_descriptor,
-                position.map(|p| [p.x as f32, p.y as f32]),
-            ),
-            move |ci| {
-                ci.image_format = Some(vulkano::format::Format::B8G8R8A8_SRGB);
-            },
-            vulkano_context.memory_allocator().clone(),
-        );
-
-        #[cfg(feature = "gui")]
-        {
-            let gui = Gui::new(
-                event_loop,
-                window_renderer.surface(),
-                window_renderer.graphics_queue(),
-                GuiConfig {
-                    is_overlay: _config.is_gui_overlay,
-                    preferred_format: Some(window_renderer.swapchain_format()),
-                    ..Default::default()
-                },
-            );
-            self.windows.insert(winit_id, (window_renderer, gui));
+        // Do not set the cursor hittest on window creation if it's false, as it will always fail on some
+        // platforms and log an unfixable warning.
+        if !window.cursor.hit_test {
+            if let Err(err) = winit_window.set_cursor_hittest(window.cursor.hit_test) {
+                warn!(
+                    "Could not set cursor hit test for window {:?}: {:?}",
+                    window.title, err
+                );
+            }
         }
 
-        #[cfg(not(feature = "gui"))]
-        self.windows.insert(winit_id, window_renderer);
-
-        Window::new(
-            window_id,
-            window_descriptor,
-            inner_size.width,
-            inner_size.height,
-            scale_factor,
-            position,
-            Some(raw_window_handle_wrapper),
-        )
-    }
-
-    #[cfg(not(feature = "gui"))]
-    pub fn get_primary_window_renderer_mut(&mut self) -> Option<&mut VulkanoWindowRenderer> {
-        self.get_window_renderer_mut(WindowId::primary())
-    }
-
-    #[cfg(not(feature = "gui"))]
-    pub fn get_primary_window_renderer(&self) -> Option<&VulkanoWindowRenderer> {
-        self.get_window_renderer(WindowId::primary())
-    }
-
-    #[cfg(not(feature = "gui"))]
-    pub fn get_window_renderer_mut(&mut self, id: WindowId) -> Option<&mut VulkanoWindowRenderer> {
-        self.window_id_to_winit
-            .get(&id)
-            .and_then(|id| self.windows.get_mut(id))
-    }
-
-    #[cfg(not(feature = "gui"))]
-    pub fn get_window_renderer(&self, id: WindowId) -> Option<&VulkanoWindowRenderer> {
-        self.window_id_to_winit
-            .get(&id)
-            .and_then(|id| self.windows.get(id))
-    }
-
-    #[cfg(feature = "gui")]
-    pub fn get_primary_window_renderer_mut(&mut self) -> Option<&mut (VulkanoWindowRenderer, Gui)> {
-        self.get_window_renderer_mut(WindowId::primary())
-    }
-
-    #[cfg(feature = "gui")]
-    pub fn get_primary_window_renderer(&self) -> Option<&(VulkanoWindowRenderer, Gui)> {
-        self.get_window_renderer(WindowId::primary())
-    }
-
-    #[cfg(feature = "gui")]
-    pub fn get_window_renderer_mut(
-        &mut self,
-        id: WindowId,
-    ) -> Option<&mut (VulkanoWindowRenderer, Gui)> {
-        self.window_id_to_winit
-            .get(&id)
-            .and_then(|id| self.windows.get_mut(id))
-    }
-
-    #[cfg(feature = "gui")]
-    pub fn get_window_renderer(&self, id: WindowId) -> Option<&(VulkanoWindowRenderer, Gui)> {
-        self.window_id_to_winit
-            .get(&id)
-            .and_then(|id| self.windows.get(id))
-    }
-
-    pub fn get_primary_winit_window(&self) -> Option<&winit::window::Window> {
-        self.get_winit_window(WindowId::primary())
-    }
+        let vulkano_window = {
+            let pos = winit_window
+                .inner_position()
+                .ok()
+                .map(|p| [p.x as f32, p.y as f32]);
+            let window_renderer = VulkanoWindowRenderer::new(
+                vulkano_context,
+                winit_window,
+                &window_descriptor_to_vulkano_window_descriptor(window, pos),
+                move |ci| {
+                    ci.image_format = Some(vulkano::format::Format::B8G8R8A8_SRGB);
+                },
+            );
 
-    #[cfg(feature = "gui")]
-    pub fn get_winit_window(&self, id: WindowId) -> Option<&winit::window::Window> {
-        self.window_id_to_winit
-            .get(&id)
-            .and_then(|id| self.windows.get(id))
-            .map(|(v_window, _)| v_window.window())
-    }
+            #[cfg(feature = "gui")]
+            {
+                let gui = Gui::new(
+                    event_loop,
+                    window_renderer.surface(),
+                    window_renderer.graphics_queue(),
+                    GuiConfig {
+                        is_overlay: _settings.is_gui_overlay,
+                        preferred_format: Some(window_renderer.swapchain_format()),
+                        ..Default::default()
+                    },
+                );
+                VulkanoWindow {
+                    renderer: window_renderer,
+                    gui,
+                }
+            }
+            #[cfg(not(feature = "gui"))]
+            {
+                VulkanoWindow {
+                    renderer: window_renderer,
+                }
+            }
+        };
 
-    #[cfg(not(feature = "gui"))]
-    pub fn get_winit_window(&self, id: WindowId) -> Option<&winit::window::Window> {
-        self.window_id_to_winit
-            .get(&id)
-            .and_then(|id| self.windows.get(id))
-            .map(|r| r.window())
-    }
+        self.entity_to_winit
+            .insert(entity, vulkano_window.renderer.window().id());
+        self.winit_to_entity
+            .insert(vulkano_window.renderer.window().id(), entity);
 
-    pub fn get_window_id(&self, id: winit::window::WindowId) -> Option<WindowId> {
-        self.winit_to_window_id.get(&id).cloned()
+        self.windows
+            .entry(vulkano_window.renderer.window().id())
+            .insert(vulkano_window)
+            .into_mut()
     }
 
-    #[cfg(not(feature = "gui"))]
-    pub fn iter(&self) -> Iter<winit::window::WindowId, VulkanoWindowRenderer> {
-        self.windows.iter()
+    /// Get the entity associated with the winit window id.
+    ///
+    /// This is mostly just an intermediary step between us and winit.
+    pub fn get_window_entity(&self, winit_id: winit::window::WindowId) -> Option<Entity> {
+        self.winit_to_entity.get(&winit_id).cloned()
     }
 
-    #[cfg(not(feature = "gui"))]
-    pub fn iter_mut(&mut self) -> IterMut<winit::window::WindowId, VulkanoWindowRenderer> {
-        self.windows.iter_mut()
+    /// Get the window that is associated with our entity.
+    pub fn get_vulkano_window(&self, entity: Entity) -> Option<&VulkanoWindow> {
+        self.entity_to_winit
+            .get(&entity)
+            .and_then(|winit_id| self.windows.get(winit_id))
     }
 
-    #[cfg(feature = "gui")]
-    pub fn iter(&self) -> Iter<winit::window::WindowId, (VulkanoWindowRenderer, Gui)> {
-        self.windows.iter()
+    /// Get the window that is associated with our entity.
+    pub fn get_vulkano_window_mut(&mut self, entity: Entity) -> Option<&mut VulkanoWindow> {
+        self.entity_to_winit
+            .get(&entity)
+            .and_then(|winit_id| self.windows.get_mut(winit_id))
     }
 
-    #[cfg(feature = "gui")]
-    pub fn iter_mut(&mut self) -> IterMut<winit::window::WindowId, (VulkanoWindowRenderer, Gui)> {
-        self.windows.iter_mut()
+    /// Remove a window from winit.
+    ///
+    /// This should mostly just be called when the window is closing.
+    pub fn remove_window(&mut self, entity: Entity) -> Option<VulkanoWindow> {
+        let winit_id = self.entity_to_winit.remove(&entity)?;
+        // Don't remove from winit_to_window_id, to track that we used to know about this winit window
+        self.windows.remove(&winit_id)
     }
 }
 
+/// Gets the "best" video mode which fits the given dimensions.
+///
+/// The heuristic for "best" prioritizes width, height, and refresh rate in that order.
 pub fn get_fitting_videomode(
     monitor: &winit::monitor::MonitorHandle,
     width: u32,
@@ -402,6 +261,9 @@ pub fn get_fitting_videomode(
     modes.first().unwrap().clone()
 }
 
+/// Gets the "best" videomode from a monitor.
+///
+/// The heuristic for "best" prioritizes width, height, and refresh rate in that order.
 pub fn get_best_videomode(monitor: &winit::monitor::MonitorHandle) -> winit::monitor::VideoMode {
     let mut modes = monitor.video_modes().collect::<Vec<_>>();
     modes.sort_by(|a, b| {
@@ -419,3 +281,127 @@ pub fn get_best_videomode(monitor: &winit::monitor::MonitorHandle) -> winit::mon
 
     modes.first().unwrap().clone()
 }
+
+pub(crate) fn attempt_grab(
+    winit_window: &winit::window::Window,
+    grab_mode: bevy::window::CursorGrabMode,
+) {
+    let grab_result = match grab_mode {
+        bevy::window::CursorGrabMode::None => {
+            winit_window.set_cursor_grab(winit::window::CursorGrabMode::None)
+        }
+        bevy::window::CursorGrabMode::Confined => winit_window
+            .set_cursor_grab(winit::window::CursorGrabMode::Confined)
+            .or_else(|_e| winit_window.set_cursor_grab(winit::window::CursorGrabMode::Locked)),
+        bevy::window::CursorGrabMode::Locked => winit_window
+            .set_cursor_grab(winit::window::CursorGrabMode::Locked)
+            .or_else(|_e| winit_window.set_cursor_grab(winit::window::CursorGrabMode::Confined)),
+    };
+
+    if let Err(err) = grab_result {
+        let err_desc = match grab_mode {
+            bevy::window::CursorGrabMode::Confined | bevy::window::CursorGrabMode::Locked => "grab",
+            bevy::window::CursorGrabMode::None => "ungrab",
+        };
+
+        bevy::utils::tracing::error!("Unable to {} cursor: {}", err_desc, err);
+    }
+}
+
+pub fn winit_window_position(
+    position: &WindowPosition,
+    resolution: &WindowResolution,
+    mut available_monitors: impl Iterator<Item = MonitorHandle>,
+    primary_monitor: Option<MonitorHandle>,
+    current_monitor: Option<MonitorHandle>,
+) -> Option<PhysicalPosition<i32>> {
+    match position {
+        WindowPosition::Automatic => {
+            /* Window manager will handle position */
+            None
+        }
+        WindowPosition::Centered(monitor_selection) => {
+            use bevy::window::MonitorSelection::*;
+            let maybe_monitor = match monitor_selection {
+                Current => {
+                    if current_monitor.is_none() {
+                        warn!(
+                            "Can't select current monitor on window creation or cannot find \
+                             current monitor!"
+                        );
+                    }
+                    current_monitor
+                }
+                Primary => primary_monitor,
+                Index(n) => available_monitors.nth(*n),
+            };
+
+            if let Some(monitor) = maybe_monitor {
+                let screen_size = monitor.size();
+
+                let scale_factor = resolution.base_scale_factor();
+
+                // Logical to physical window size
+                let (width, height): (u32, u32) =
+                    LogicalSize::new(resolution.width(), resolution.height())
+                        .to_physical::<u32>(scale_factor)
+                        .into();
+
+                let position = PhysicalPosition {
+                    x: screen_size.width.saturating_sub(width) as f64 / 2.
+                        + monitor.position().x as f64,
+                    y: screen_size.height.saturating_sub(height) as f64 / 2.
+                        + monitor.position().y as f64,
+                };
+
+                Some(position.cast::<i32>())
+            } else {
+                warn!("Couldn't get monitor selected with: {monitor_selection:?}");
+                None
+            }
+        }
+        WindowPosition::At(position) => {
+            Some(PhysicalPosition::new(position[0] as f64, position[1] as f64).cast::<i32>())
+        }
+    }
+}
+
+fn window_descriptor_to_vulkano_window_descriptor(
+    wd: &Window,
+    position: Option<[f32; 2]>,
+) -> VulkanoWindowDescriptor {
+    let mut window_descriptor = VulkanoWindowDescriptor::default();
+    window_descriptor.width = wd.width();
+    window_descriptor.height = wd.height();
+    window_descriptor.position = position;
+    window_descriptor.resize_constraints = VulkanoWindowResizeConstraints {
+        min_width: wd.resize_constraints.min_width,
+        min_height: wd.resize_constraints.min_height,
+        max_width: wd.resize_constraints.max_width,
+        max_height: wd.resize_constraints.max_height,
+    };
+    window_descriptor.scale_factor_override = wd.resolution.scale_factor_override();
+    window_descriptor.title = wd.title.clone();
+    window_descriptor.present_mode = match wd.present_mode {
+        PresentMode::Fifo => vulkano::swapchain::PresentMode::Fifo,
+        PresentMode::Immediate => vulkano::swapchain::PresentMode::Immediate,
+        PresentMode::Mailbox => vulkano::swapchain::PresentMode::Mailbox,
+        PresentMode::AutoNoVsync => vulkano::swapchain::PresentMode::Immediate,
+        PresentMode::AutoVsync => vulkano::swapchain::PresentMode::FifoRelaxed,
+    };
+    window_descriptor.resizable = wd.resizable;
+    window_descriptor.decorations = wd.decorations;
+    window_descriptor.cursor_visible = wd.cursor.visible;
+    window_descriptor.cursor_locked = match wd.cursor.grab_mode {
+        bevy::window::CursorGrabMode::Locked => true,
+        _ => false,
+    };
+    window_descriptor.mode = match wd.mode {
+        WindowMode::Windowed => vulkano_util::window::WindowMode::Windowed,
+        WindowMode::Fullscreen => vulkano_util::window::WindowMode::Fullscreen,
+        WindowMode::BorderlessFullscreen => vulkano_util::window::WindowMode::BorderlessFullscreen,
+        WindowMode::SizedFullscreen => vulkano_util::window::WindowMode::SizedFullscreen,
+    };
+    window_descriptor.transparent = wd.transparent;
+    window_descriptor
+}