diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
new file mode 100644
index 0000000..c0e0d51
--- /dev/null
+++ b/.github/workflows/ci.yaml
@@ -0,0 +1,78 @@
+name: CI
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  # Run cargo test
+  test:
+    name: Test Suite
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+      - name: Cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+          key: ${{ runner.os }}-cargo-test-${{ hashFiles('**/Cargo.toml') }}
+      - name: Install stable toolchain
+        uses: dtolnay/rust-toolchain@stable
+      - name: Install Dependencies
+        run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev libwayland-dev
+      - name: Run cargo test
+        run: cargo test
+
+  # Run cargo clippy -- -D warnings
+  clippy_check:
+    name: Clippy
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+      - name: Cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+          key: ${{ runner.os }}-cargo-clippy-${{ hashFiles('**/Cargo.toml') }}
+      - name: Install stable toolchain
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          components: clippy
+      - name: Install Dependencies
+        run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev libwayland-dev
+      - name: Run clippy
+        run: cargo clippy -- -D warnings
+
+  # Run cargo fmt --all -- --check
+  format:
+    name: Format
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+      - name: Install stable toolchain
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          components: rustfmt
+      - name: Run cargo fmt
+        run: cargo fmt --all -- --check
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
new file mode 100644
index 0000000..a290932
--- /dev/null
+++ b/.github/workflows/release.yaml
@@ -0,0 +1,305 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - '*'
+
+env:
+  # update with the name of the main binary
+  binary: bevyrpg
+  add_binaries_to_github_release: true
+  itch_target: redpawn/bevyrpg
+
+  # Before enabling LFS, please take a look at GitHub's documentation for costs and quota limits:
+  # https://docs.github.com/en/repositories/working-with-files/managing-large-files/about-storage-and-bandwidth-usage
+  use_git_lfs: false
+
+
+jobs:
+
+  # Build for wasm
+  release-wasm:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: olegtarasov/get-tag@v2.1.2
+        id: get_version
+      - uses: actions/checkout@v4
+        with:
+          lfs: ${{ env.use_git_lfs }}
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: wasm32-unknown-unknown
+      - name: install wasm-bindgen-cli
+        run: |
+          version=`cargo metadata --format-version 1 | jq --raw-output '.packages[] | select(.name=="wasm-bindgen") | .version'`
+          cargo install -f wasm-bindgen-cli --version $version
+
+      - name: Build
+        run: |
+          cargo build --release --target wasm32-unknown-unknown
+
+      - name: Prepare package
+        run: |
+          wasm-bindgen --no-typescript --out-name bevy_game --out-dir wasm --target web target/wasm32-unknown-unknown/release/${{ env.binary }}.wasm
+          cp -r assets wasm/ || true # Try to copy, but ignore if it can't copy if source directory does not exist 
+
+      - name: Package as a zip
+        working-directory: ./wasm
+        run: |
+          zip --recurse-paths ../${{ env.binary }}.zip .
+
+      - name: Upload binaries to artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          path: ${{ env.binary }}.zip
+          name: wasm
+          retention-days: 1
+
+      - name: Upload binaries to release
+        if: ${{ env.add_binaries_to_github_release == 'true' }}
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: ${{ env.binary }}.zip
+          asset_name: ${{ env.binary }}-wasm-${{ steps.get_version.outputs.tag }}.zip
+          tag: ${{ github.ref }}
+          overwrite: true
+
+  # Build for Linux
+  release-linux:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: olegtarasov/get-tag@v2.1.2
+        id: get_version
+      - uses: actions/checkout@v4
+        with:
+          lfs: ${{ env.use_git_lfs }}
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: x86_64-unknown-linux-gnu
+      - name: install dependencies
+        run: |
+          sudo apt-get update; sudo apt-get install pkg-config libx11-dev libasound2-dev libudev-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libwayland-dev
+
+      - name: Build
+        run: |
+          cargo build --release --target x86_64-unknown-linux-gnu
+
+      - name: Prepare package
+        run: |
+          mkdir linux
+          cp target/x86_64-unknown-linux-gnu/release/${{ env.binary }} linux/
+          cp -r assets linux/ || true # Try to copy, but ignore if it can't copy if source directory does not exist
+
+      - name: Package as a zip
+        working-directory: ./linux
+        run: |
+          zip --recurse-paths ../${{ env.binary }}.zip .
+
+      - name: Upload binaries to artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          path: ${{ env.binary }}.zip
+          name: linux
+          retention-days: 1
+
+      - name: Upload binaries to release
+        if: ${{ env.add_binaries_to_github_release == 'true' }}
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: ${{ env.binary }}.zip
+          asset_name: ${{ env.binary }}-linux-${{ steps.get_version.outputs.tag }}.zip
+          tag: ${{ github.ref }}
+          overwrite: true
+
+  # Build for Windows
+  release-windows:
+    runs-on: windows-latest
+
+    steps:
+      - uses: olegtarasov/get-tag@v2.1.2
+        id: get_version
+      - uses: actions/checkout@v4
+        with:
+          lfs: ${{ env.use_git_lfs }}
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: x86_64-pc-windows-msvc
+
+      - name: Build
+        run: |
+          cargo build --release --target x86_64-pc-windows-msvc
+
+      - name: Prepare package
+        run: |
+          mkdir windows
+          cp target/x86_64-pc-windows-msvc/release/${{ env.binary }}.exe windows/
+          mkdir assets -ea 0 # create the assets directory if it does not exist, it will get ignored in the zip if empty
+          cp -r assets windows/
+
+      - name: Package as a zip
+        run: |
+          Compress-Archive -Path windows/* -DestinationPath ${{ env.binary }}.zip
+
+      - name: Upload binaries to artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          path: ${{ env.binary }}.zip
+          name: windows
+          retention-days: 1
+
+      - name: Upload binaries to release
+        if: ${{ env.add_binaries_to_github_release == 'true' }}
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: ${{ env.binary }}.zip
+          asset_name: ${{ env.binary }}-windows-${{ steps.get_version.outputs.tag }}.zip
+          tag: ${{ github.ref }}
+          overwrite: true
+
+  # Build for MacOS x86_64
+  release-macOS-intel:
+    runs-on: macOS-latest
+
+    steps:
+      - uses: olegtarasov/get-tag@v2.1.2
+        id: get_version
+      - uses: actions/checkout@v4
+        with:
+          lfs: ${{ env.use_git_lfs }}
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: x86_64-apple-darwin
+      - name: Environment Setup
+        run: |
+          export CFLAGS="-fno-stack-check"
+          export MACOSX_DEPLOYMENT_TARGET="10.9"
+
+      - name: Build
+        run: |
+          cargo build --release --target x86_64-apple-darwin
+
+      - name: Prepare Package
+        run: |
+          mkdir -p ${{ env.binary }}.app/Contents/MacOS
+          cp target/x86_64-apple-darwin/release/${{ env.binary }} ${{ env.binary }}.app/Contents/MacOS/
+          cp -r assets ${{ env.binary }}.app/Contents/MacOS/ || true # Try to copy, but ignore if it can't copy if source directory does not exist
+          hdiutil create -fs HFS+ -volname "${{ env.binary }}" -srcfolder ${{ env.binary }}.app ${{ env.binary }}-macOS-intel.dmg
+
+      - name: Upload binaries to artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          path: ${{ env.binary }}-macOS-intel.dmg
+          name: macOS-intel
+          retention-days: 1
+
+      - name: Upload binaries to release
+        if: ${{ env.add_binaries_to_github_release == 'true' }}
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file:  ${{ env.binary }}-macOS-intel.dmg
+          asset_name: ${{ env.binary }}-macOS-intel-${{ steps.get_version.outputs.tag }}.dmg
+          tag: ${{ github.ref }}
+          overwrite: true
+
+  # Build for MacOS Apple Silicon
+  release-macOS-apple-silicon:
+    runs-on: macOS-latest
+
+    steps:
+      - uses: olegtarasov/get-tag@v2.1.2
+        id: get_version
+      - uses: actions/checkout@v4
+        with:
+          lfs: ${{ env.use_git_lfs }}
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: aarch64-apple-darwin
+      - name: Environment 
+        # macOS 11 was the first version to support ARM
+        run: |
+          export MACOSX_DEPLOYMENT_TARGET="11"
+
+      - name: Build
+        run: |
+          cargo build --release --target aarch64-apple-darwin
+
+      - name: Prepare Package
+        run: |
+          mkdir -p ${{ env.binary }}.app/Contents/MacOS
+          cp target/aarch64-apple-darwin/release/${{ env.binary }} ${{ env.binary }}.app/Contents/MacOS/
+          cp -r assets ${{ env.binary }}.app/Contents/MacOS/ || true # Try to copy, but ignore if it can't copy if source directory does not exist
+          hdiutil create -fs HFS+ -volname "${{ env.binary }}-macOS-apple-silicon" -srcfolder ${{ env.binary }}.app ${{ env.binary }}-macOS-apple-silicon.dmg
+
+      - name: Upload binaries to artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          path: ${{ env.binary }}-macOS-apple-silicon.dmg
+          name: macOS-apple-silicon
+          retention-days: 1
+
+      - name: Upload binaries to release
+        if: ${{ env.add_binaries_to_github_release == 'true' }}
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: ${{ env.binary }}-macOS-apple-silicon.dmg
+          asset_name: ${{ env.binary }}-macOS-apple-silicon-${{ steps.get_version.outputs.tag }}.dmg
+          tag: ${{ github.ref }}
+          overwrite: true
+
+  check-if-upload-to-itch-is-configured:
+    runs-on: ubuntu-latest
+    outputs:
+      should-upload: ${{ steps.check-env.outputs.has-itch-target }}
+    steps:
+      - id: check-env
+        run: |
+          if [[ -z "$itch_target" ]]; then
+            echo "has-itch-target=no" >> $GITHUB_OUTPUT
+          else
+            echo "has-itch-target=yes" >> $GITHUB_OUTPUT
+          fi
+
+  upload-to-itch:
+    runs-on: ubuntu-latest
+    needs:
+      - check-if-upload-to-itch-is-configured
+      - release-wasm
+      - release-linux
+      - release-windows
+      - release-macOS-intel
+      - release-macOS-apple-silicon
+    if: ${{ needs.check-if-upload-to-itch-is-configured.outputs.should-upload == 'yes' }}
+
+    steps:
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: ./builds
+
+      - name: Install butler
+        run: |
+          curl -L -o butler.zip https://broth.itch.zone/butler/linux-amd64/LATEST/archive/default
+          unzip butler.zip
+          chmod +x butler
+          ./butler -V
+      - uses: olegtarasov/get-tag@v2.1.2
+        id: get_version
+      - name: Upload to itch.io
+        env:
+          BUTLER_API_KEY: ${{ secrets.BUTLER_CREDENTIALS }}
+        run: |
+          for channel in $(ls builds); do
+            ./butler push \
+                --fix-permissions \
+                --userversion="${{ steps.get_version.outputs.tag }}" \
+                builds/$channel/* \
+                ${{ env.itch_target }}:$channel
+          done
diff --git a/Cargo.lock b/Cargo.lock
index ed89ff4..9ef90bb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -92,7 +92,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
 dependencies = [
  "cfg-if",
- "getrandom",
+ "const-random",
+ "getrandom 0.3.4",
  "once_cell",
  "version_check",
  "zerocopy",
@@ -120,7 +121,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed7572b7ba83a31e20d1b48970ee402d2e3e0537dcfe0a3ff4d6eb7508617d43"
 dependencies = [
  "alsa-sys",
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
+ "cfg-if",
+ "libc",
+]
+
+[[package]]
+name = "alsa"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c88dbbce13b232b26250e1e2e6ac18b6a891a646b8148285036ebce260ac5c3"
+dependencies = [
+ "alsa-sys",
+ "bitflags 2.11.0",
  "cfg-if",
  "libc",
 ]
@@ -142,11 +155,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046"
 dependencies = [
  "android-properties",
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "cc",
  "cesu8",
- "jni",
- "jni-sys",
+ "jni 0.21.1",
+ "jni-sys 0.3.0",
  "libc",
  "log",
  "ndk 0.9.0",
@@ -193,15 +206,15 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c43e7fd8284f025d0bd143c2855618ecdf697db55bde39211e5c9faec7669173"
 dependencies = [
- "heapless",
+ "heapless 0.8.0",
  "nom 7.1.3",
 ]
 
 [[package]]
 name = "anstream"
-version = "0.6.21"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a"
+checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -220,9 +233,9 @@ checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.7"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
+checksum = "52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e"
 dependencies = [
  "utf8parse",
 ]
@@ -266,9 +279,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.100"
+version = "1.0.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
+checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
 
 [[package]]
 name = "approx"
@@ -288,7 +301,7 @@ dependencies = [
  "clipboard-win",
  "image",
  "log",
- "objc2 0.6.3",
+ "objc2 0.6.4",
  "objc2-app-kit 0.3.2",
  "objc2-core-foundation",
  "objc2-core-graphics",
@@ -334,7 +347,7 @@ checksum = "f548ad2c4031f2902e3edc1f29c29e835829437de49562d8eb5dc5584d3a1043"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -363,9 +376,9 @@ dependencies = [
 
 [[package]]
 name = "async-executor"
-version = "1.13.3"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497c00e0fd83a72a79a39fcbd8e3e2f055d6f6c7e025f3b3d91f4f8e76527fb8"
+checksum = "c96bf972d85afc50bf5ab8fe2d54d1586b4e0b46c97c50a0c9e71e2f7bcd812a"
 dependencies = [
  "async-task",
  "concurrent-queue",
@@ -399,7 +412,7 @@ dependencies = [
  "futures-lite",
  "parking",
  "polling",
- "rustix 1.1.3",
+ "rustix 1.1.4",
  "slab",
  "windows-sys 0.61.2",
 ]
@@ -451,9 +464,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "avian3d"
-version = "0.4.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e09c07567e520b22bd6890a055877cd584fc3fd4317e4a0ba599f4833a4b61bc"
+checksum = "b82608b43397affac139547dfa9beb3208034c53e1a3cfe5d4079db1af362104"
 dependencies = [
  "approx",
  "avian_derive",
@@ -461,7 +474,7 @@ dependencies = [
  "bevy_heavy",
  "bevy_math",
  "bevy_transform_interpolation",
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "derive_more",
  "disqualified",
  "glam_matrix_extras",
@@ -484,14 +497,14 @@ dependencies = [
  "proc-macro-error2",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "avian_pickup"
-version = "0.3.1"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1892b9526f9b1d876022bf4de6ba25f5cf4f9055c3798b8c6c0d7b10d38e91ba"
+checksum = "6885afd7ebf54035b69a5c8b525e9e002c76485cf39e8b540f02a2be26a5061d"
 dependencies = [
  "avian3d",
  "bevy_app",
@@ -503,28 +516,33 @@ dependencies = [
  "bevy_time",
  "bevy_transform",
  "bevy_utils",
- "rand",
+ "rand 0.9.2",
 ]
 
 [[package]]
 name = "avian_rerecast"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "788b18d13efb52f03edf536090a6445ed60f899cb069912b27c35d5dc9bfb046"
+checksum = "f90cecd83ba9c404d1192cd70248702de09ffa4dee3f526c22549eeb294e7c31"
 dependencies = [
  "avian3d",
  "bevy_app",
  "bevy_ecs",
  "bevy_math",
  "bevy_rerecast_core",
- "bevy_transform",
 ]
 
 [[package]]
 name = "az"
-version = "1.3.0"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973"
+
+[[package]]
+name = "base64"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be5eb007b7cacc6c660343e96f650fedf4b5a77512399eb952ca6642cf8d13f7"
+checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
 [[package]]
 name = "base64"
@@ -570,18 +588,18 @@ checksum = "1795ebc740ea791ffbe6685e0688ab1effec16c2864e0476db40bfdf0c02cb3d"
 
 [[package]]
 name = "bevy"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76d3ee8652fe0577fd8a99054e147740850140d530be8e044a9be4e23a3e8a24"
+checksum = "1fd310426290cec560221f9750c2f4484be4a8eeea7de3483c423329b465c40e"
 dependencies = [
  "bevy_internal",
 ]
 
 [[package]]
 name = "bevy-inspector-egui"
-version = "0.35.0"
+version = "0.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3692cbc0a76398ee01dde2c49951c8a92c5373c58e8720a0909e9504d21e9ab"
+checksum = "265c78b2d2b770351e2eb90c5bc997c7036d453a4e2cd62e066561fefeecedec"
 dependencies = [
  "bevy-inspector-egui-derive",
  "bevy_app",
@@ -590,7 +608,8 @@ dependencies = [
  "bevy_color",
  "bevy_core_pipeline",
  "bevy_ecs",
- "bevy_egui 0.38.1",
+ "bevy_egui",
+ "bevy_gizmos",
  "bevy_image",
  "bevy_light",
  "bevy_log",
@@ -606,44 +625,45 @@ dependencies = [
  "bevy_window",
  "bytemuck",
  "disqualified",
- "egui 0.33.3",
+ "egui",
  "fuzzy-matcher",
  "image",
  "opener",
  "smallvec",
- "uuid 1.20.0",
+ "uuid 1.22.0",
  "winit",
 ]
 
 [[package]]
 name = "bevy-inspector-egui-derive"
-version = "0.35.0"
+version = "0.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9569b1caad44483de562c6115c773d4311374d1740f5e6e69413d92206363c3"
+checksum = "8405b6aee62eebfc27a95c513e04398869fb7911ea8266ec91675994b11eb749"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "bevy-tnua"
-version = "0.28.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "569a06296255af27bfb307dcc1cb879fa52a398324c4264d545bbc5330f26426"
+checksum = "3fae9541f18c04b2205ccb56b3dc6eace3d23f448b538cfc9beda8604ea7badf"
 dependencies = [
  "bevy",
  "bevy-tnua-macros",
  "bevy-tnua-physics-integration-layer",
+ "ron 0.12.0",
  "serde",
  "thiserror 2.0.18",
 ]
 
 [[package]]
 name = "bevy-tnua-avian3d"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fc60d461db6763898cef4478eb3e44970353c7f70e649d3c75757462f30043a"
+checksum = "04f715310ce1f19ff3e8215c541a6358217824c3ae62d087010053f0347e45aa"
 dependencies = [
  "avian3d",
  "bevy",
@@ -652,56 +672,56 @@ dependencies = [
 
 [[package]]
 name = "bevy-tnua-macros"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c798511265ca8d1a9bf32a4ecbdfeab2363560cded168e8a7f073d0c4965b22"
+checksum = "2838ba099375659a700a86aa03353d0e5ee5d2bb692d8f893cdd49b20494efde"
 dependencies = [
  "convert_case",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "bevy-tnua-physics-integration-layer"
-version = "0.11.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc71ba69d5343b67d9421bb51cb6b021b3c137450fb49277b9550df7793c14f6"
+checksum = "c187fdd14d306c8bf5369bd2cc4bab39d5056643229389e6663d8a5751f2c4a0"
 dependencies = [
  "bevy",
 ]
 
 [[package]]
 name = "bevy-yoleck"
-version = "0.29.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "218dc4beeb01afd923fe9ff44099898d333d9e4fcc9ae8d03d2ebc070628a1da"
+checksum = "b0c23831b2a6dd1fb94259ded2d69197ba14211fbe94837629a7d7f9165ef74a"
 dependencies = [
  "bevy",
  "bevy-yoleck-macros",
- "bevy_egui 0.37.1",
+ "bevy_egui",
  "serde",
  "serde_json",
  "thiserror 2.0.18",
- "uuid 1.20.0",
+ "uuid 1.22.0",
 ]
 
 [[package]]
 name = "bevy-yoleck-macros"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ed721396209f8172af6a86b5397b5be9784776f57f6a22107051c9caf07d586"
+checksum = "0cb61ade46ad84c373ca3b8f4ef56760b910d945562d115891620376fb478e84"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "bevy_a11y"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6702a82db1b383641fc7c503451847cdafb57076c203cd3bfe549d3eeef474c3"
+checksum = "e887b25c84f384ffe3278a17cf0e4b405eaa3c8fbc3db24d05d560a11780676d"
 dependencies = [
  "accesskit",
  "bevy_app",
@@ -713,18 +733,18 @@ dependencies = [
 
 [[package]]
 name = "bevy_android"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42b2d9435e9fe8d7107bb795a6140277872ad5b992cb3934f8d28cfd11040f6f"
+checksum = "a8c58de772ac1148884112e8a456c4f127a94b95a0e42ab5b160b7a11895a241"
 dependencies = [
  "android-activity",
 ]
 
 [[package]]
 name = "bevy_animation"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfaf3ea6d435f4736b3deb60958270443501f5795c7964b1b504abd3be970b4f"
+checksum = "be5bf5b285f0d3fab983b4505e62e195e06930a29007ffc95bdabde834e163a2"
 dependencies = [
  "bevy_animation_macros",
  "bevy_app",
@@ -744,31 +764,31 @@ dependencies = [
  "downcast-rs 2.0.2",
  "either",
  "petgraph",
- "ron 0.10.1",
+ "ron 0.12.0",
  "serde",
  "smallvec",
  "thiserror 2.0.18",
  "thread_local",
  "tracing",
- "uuid 1.20.0",
+ "uuid 1.22.0",
 ]
 
 [[package]]
 name = "bevy_animation_macros"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d577eae7246a1cda461df1b63188619fc6a3c619adba2a8e5a79e9aa51f64671"
+checksum = "7cf35516d0e7ac9ec25df533be1bf8cbaa20596a8e65f36838a3f7803a267d6d"
 dependencies = [
  "bevy_macro_utils",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "bevy_anti_alias"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15820535cc88bc280f55635eb3ea58df2703a434a0cc2343472eaa7e607fb27b"
+checksum = "726cc494eb7d6a84ce6291c23636fd451fa4846604dc059fa93febca4e60a928"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -788,9 +808,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_app"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e4fc5dfe9d1d9b8233e1878353b5e66a3f5910c2131d3abf68f9a4116b2d433"
+checksum = "def9f41aa5bf9b9dec8beda307a332798609cffb9d44f71005e0cfb45164f2f6"
 dependencies = [
  "bevy_derive",
  "bevy_ecs",
@@ -811,23 +831,26 @@ dependencies = [
 
 [[package]]
 name = "bevy_asset"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "357787dbfaba3f73fd185e15d6df70605bddaa774f2ebbcab1aaa031f21fb6c2"
+checksum = "29f86fed15972b9fb1a3f7b092cf0390e67131caaedab15a2707c043e3a3c886"
 dependencies = [
  "async-broadcast",
+ "async-channel",
  "async-fs",
+ "async-io",
  "async-lock",
  "atomicow",
  "bevy_android",
  "bevy_app",
  "bevy_asset_macros",
+ "bevy_diagnostic",
  "bevy_ecs",
  "bevy_platform",
  "bevy_reflect",
  "bevy_tasks",
  "bevy_utils",
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "blake3",
  "crossbeam-channel",
  "derive_more",
@@ -836,14 +859,15 @@ dependencies = [
  "either",
  "futures-io",
  "futures-lite",
+ "futures-util",
  "js-sys",
- "parking_lot 0.12.5",
- "ron 0.10.1",
+ "notify-debouncer-full",
+ "ron 0.12.0",
  "serde",
  "stackfuture",
  "thiserror 2.0.18",
  "tracing",
- "uuid 1.20.0",
+ "uuid 1.22.0",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
@@ -851,9 +875,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_asset_loader"
-version = "0.24.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "472306c894bee7f562442dffbcd8e10c8c48ec0239e8b4af9c13c240340ab2ab"
+checksum = "fa4410f1fabc1ff0411f44394222ff6ccf3348ed100cba7d87a84ff376a145db"
 dependencies = [
  "anyhow",
  "bevy_app",
@@ -876,32 +900,32 @@ dependencies = [
 
 [[package]]
 name = "bevy_asset_loader_derive"
-version = "0.24.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "228284d057a86657530cc0a96176b699b031cfba4bbe303f1b92938a5d66f831"
+checksum = "253fb63838e11b8b5b49052c180113e4e49642f85d4e5335655948651c9e4bb6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "bevy_asset_macros"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afa09271d4ca0bf31fda3a9ad57273775d448a05c4046d9367f71d29968d85b4"
+checksum = "12cb8d948365b06561b43b7d709282e62a6abb756baac5d8e295206d5e156168"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "bevy_audio"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d79e56e072001524100b00e38cfdea302d9fdabbff48109fc67b528b27a237bb"
+checksum = "9d68da32468ce7f4bb2863b71326acfaaa88e9aef8da8306257cd487d40cede4"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -917,19 +941,28 @@ dependencies = [
 
 [[package]]
 name = "bevy_bae"
-version = "0.0.1"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "966b359ec27f2b6697bf99c665abf4240b1474a8afbed0975e3024de78dea296"
+checksum = "60036a11d881b8ed05a3ab547fcdf0a6a503cba2a448850e87e427fc386fe8aa"
 dependencies = [
  "bevy_app",
+ "bevy_derive",
  "bevy_ecs",
+ "bevy_mod_props",
+ "bevy_ptr",
+ "bevy_reflect",
+ "bevy_utils",
+ "disqualified",
+ "estr",
+ "tracing",
+ "variadics_please",
 ]
 
 [[package]]
 name = "bevy_camera"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8af1d5a57fde6e577e7b1db58996afb381618294be75a37b3070a20d309678b0"
+checksum = "37ed9eed054e14341852236d06a7244597b1ace39ff9ae023fbd188ffde88619"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -953,9 +986,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_color"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49504fac6b9897f03b4bdc0189c04ef1ba0a9b37926343aa520a71619e90e116"
+checksum = "2eb41e8310a85811d14a4e75cfc2d6c07ac70661d6a4883509fc960f622970a8"
 dependencies = [
  "bevy_math",
  "bevy_reflect",
@@ -967,15 +1000,34 @@ dependencies = [
  "wgpu-types",
 ]
 
+[[package]]
+name = "bevy_color_bms_bindings"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "693d8f3e5f12a9a0719d4204bf9a4ea6bfdaef4902b38674f40f0abb522ce42b"
+dependencies = [
+ "bevy_app",
+ "bevy_color",
+ "bevy_ecs",
+ "bevy_math",
+ "bevy_mod_scripting_bindings",
+ "bevy_mod_scripting_core",
+ "bevy_mod_scripting_derive",
+ "bevy_reflect",
+ "bytemuck",
+ "wgpu-types",
+]
+
 [[package]]
 name = "bevy_common_assets"
-version = "0.14.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf2d95660d90ec38e1259afa5fe95c5b9f72d822d4dfd2dbfa6ef4c176d3078f"
+checksum = "ad51a6e9def88caadc4ce2a5670382d6ff19fa1e7e7af934326c5c0b376bdd9f"
 dependencies = [
  "anyhow",
- "bevy",
- "csv",
+ "bevy_app",
+ "bevy_asset",
+ "bevy_reflect",
  "ron 0.11.0",
  "serde",
  "thiserror 2.0.18",
@@ -983,13 +1035,13 @@ dependencies = [
 
 [[package]]
 name = "bevy_console"
-version = "0.16.0"
-source = "git+https://github.com/Zrocket/bevy-console.git#1a805cb53d20e7454950c86d22b9398b1e7ad0c6"
+version = "0.17.1"
+source = "git+https://github.com/Zrocket/bevy-console.git#0d6ea70b5a77a2c64f85e1b9e8767030a4876519"
 dependencies = [
  "ansi-parser",
  "bevy",
  "bevy_console_derive",
- "bevy_egui 0.38.1",
+ "bevy_egui",
  "clap",
  "shlex",
  "strip-ansi-escapes",
@@ -999,7 +1051,7 @@ dependencies = [
 [[package]]
 name = "bevy_console_derive"
 version = "0.5.0"
-source = "git+https://github.com/Zrocket/bevy-console.git#1a805cb53d20e7454950c86d22b9398b1e7ad0c6"
+source = "git+https://github.com/Zrocket/bevy-console.git#0d6ea70b5a77a2c64f85e1b9e8767030a4876519"
 dependencies = [
  "better-bae",
  "proc-macro2",
@@ -1009,15 +1061,16 @@ dependencies = [
 
 [[package]]
 name = "bevy_core_pipeline"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6af7e735685a652a8dba41b886f1330faeb57d4c61398917b7e49b09a7a1c3c1"
+checksum = "4d0810e85c2436e50c67448d48a83bf0bb1b5849899619ae2c7ea817221e9172"
 dependencies = [
  "bevy_app",
  "bevy_asset",
  "bevy_camera",
  "bevy_color",
  "bevy_derive",
+ "bevy_diagnostic",
  "bevy_ecs",
  "bevy_image",
  "bevy_math",
@@ -1028,7 +1081,7 @@ dependencies = [
  "bevy_transform",
  "bevy_utils",
  "bevy_window",
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "nonmax",
  "radsort",
  "smallvec",
@@ -1036,22 +1089,81 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "bevy_core_pipeline_bms_bindings"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b05072b6c7bc070409ce5aa8c17f307bdff670d3f09684e692a9904e61778fc"
+dependencies = [
+ "bevy_app",
+ "bevy_asset",
+ "bevy_camera",
+ "bevy_color",
+ "bevy_core_pipeline",
+ "bevy_derive",
+ "bevy_diagnostic",
+ "bevy_ecs",
+ "bevy_image",
+ "bevy_math",
+ "bevy_mod_scripting_bindings",
+ "bevy_mod_scripting_core",
+ "bevy_mod_scripting_derive",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_shader",
+ "bevy_transform",
+ "bevy_utils",
+ "bevy_window",
+ "bitflags 2.11.0",
+ "nonmax",
+ "radsort",
+]
+
 [[package]]
 name = "bevy_derive"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9396b256b366a43d7f61d1f230cdab0a512fb4712cbf7d688f3d6fce4c5ea8a"
+checksum = "318ee0532c3da93749859d18f89a889c638fbc56aabac4d866583df7b951d103"
 dependencies = [
  "bevy_macro_utils",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "bevy_dev_tools"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4f1464a3f5ef5c23d917987714ee89881f9f791e9ff97ecf6600ee846b9569e"
+dependencies = [
+ "bevy_app",
+ "bevy_asset",
+ "bevy_camera",
+ "bevy_color",
+ "bevy_diagnostic",
+ "bevy_ecs",
+ "bevy_image",
+ "bevy_input",
+ "bevy_math",
+ "bevy_picking",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_shader",
+ "bevy_state",
+ "bevy_text",
+ "bevy_time",
+ "bevy_transform",
+ "bevy_ui",
+ "bevy_ui_render",
+ "bevy_window",
+ "tracing",
 ]
 
 [[package]]
 name = "bevy_diagnostic"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1cdb0ed0c8423570fbbb7c4fc2719a203dd40928fefff45f76ef0889685a446"
+checksum = "ec8543a0f7afd56d3499ba80ffab6ef0bad12f93c2d2ca9aa7b1f1b8816c3980"
 dependencies = [
  "atomic-waker",
  "bevy_app",
@@ -1067,9 +1179,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_ecs"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7dd5229dd00d00e70ac6b2fc0a139961252f6ce07d3d268cfcac0da86d5bde4"
+checksum = "c9cf7a3ee41342dd7b5a5d82e200d0e8efb933169247fce853b4ad633d51e87d"
 dependencies = [
  "arrayvec",
  "bevy_ecs_macros",
@@ -1078,7 +1190,7 @@ dependencies = [
  "bevy_reflect",
  "bevy_tasks",
  "bevy_utils",
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "bumpalo",
  "concurrent-queue",
  "derive_more",
@@ -1094,63 +1206,50 @@ dependencies = [
 ]
 
 [[package]]
-name = "bevy_ecs_macros"
-version = "0.17.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4d83bdd2285af4867e76c691406e0a4b55611b583d0c45b6ac7bcec1b45fd48"
-dependencies = [
- "bevy_macro_utils",
- "proc-macro2",
- "quote",
- "syn 2.0.114",
-]
-
-[[package]]
-name = "bevy_egui"
-version = "0.37.1"
+name = "bevy_ecs_bms_bindings"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb0e8ece8ab22670307b166a1737a64eb82d4b63e1db927994ed5cf67a55fb0"
+checksum = "f20293ca63d07db7f78b35af86b4e07a378f439d662a2645821f4d5e04d31274"
 dependencies = [
+ "arrayvec",
  "bevy_app",
- "bevy_asset",
- "bevy_camera",
- "bevy_core_pipeline",
- "bevy_derive",
  "bevy_ecs",
- "bevy_image",
- "bevy_input",
- "bevy_log",
- "bevy_math",
- "bevy_mesh",
+ "bevy_ecs_macros",
+ "bevy_mod_scripting_bindings",
+ "bevy_mod_scripting_core",
+ "bevy_mod_scripting_derive",
  "bevy_platform",
+ "bevy_ptr",
  "bevy_reflect",
- "bevy_render",
- "bevy_shader",
- "bevy_time",
- "bevy_transform",
+ "bevy_tasks",
  "bevy_utils",
- "bevy_window",
- "bevy_winit",
- "bytemuck",
- "crossbeam-channel",
- "egui 0.32.3",
- "encase",
- "getrandom",
- "image",
- "itertools 0.14.0",
- "js-sys",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "wgpu-types",
- "winit",
+ "bitflags 2.11.0",
+ "bumpalo",
+ "concurrent-queue",
+ "fixedbitset",
+ "indexmap",
+ "log",
+ "nonmax",
+ "serde",
+]
+
+[[package]]
+name = "bevy_ecs_macros"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "908baf585e2ea16bd53ef0da57b69580478af0059d2dbdb4369991ac9794b618"
+dependencies = [
+ "bevy_macro_utils",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "bevy_egui"
-version = "0.38.1"
+version = "0.39.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dadb9d5008b404675548c5b0da4e2b2440fb7b91ac789f79185041b9538c73d0"
+checksum = "8d0a7e4806f3f242326d2c6157531c36d710f3bf320ebc0a1678e44635ed0eac"
 dependencies = [
  "arboard",
  "bevy_app",
@@ -1178,9 +1277,9 @@ dependencies = [
  "bevy_winit",
  "bytemuck",
  "crossbeam-channel",
- "egui 0.33.3",
+ "egui",
  "encase",
- "getrandom",
+ "getrandom 0.3.4",
  "image",
  "itertools 0.14.0",
  "js-sys",
@@ -1195,9 +1294,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_encase_derive"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7179e985f3f1b99265cb87fe194db3b00aee8e2914888d621ff9826e1417ee19"
+checksum = "d4fee46eeddcbc00a805ae00ffa973f224671fc5cf0fe1a796963804faeade90"
 dependencies = [
  "bevy_macro_utils",
  "encase_derive_impl",
@@ -1205,13 +1304,13 @@ dependencies = [
 
 [[package]]
 name = "bevy_enhanced_input"
-version = "0.20.1"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbed60aa8f8975dab206c693c6a736c36137e5477a0b58618cf997a952e4ba65"
+checksum = "c3eb80814d4c89323dd5489a6e85e5f83ea0d62127541822e2978d7b2c81b9d7"
 dependencies = [
  "bevy",
  "bevy_enhanced_input_macros",
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "log",
  "smallvec",
  "variadics_please",
@@ -1219,20 +1318,20 @@ dependencies = [
 
 [[package]]
 name = "bevy_enhanced_input_macros"
-version = "0.20.1"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee2b4e69905392d8d11468559b691bee2d59c3dd3082d4d3751ba0d6a94b44fd"
+checksum = "03a283d2eb7bf4ebec559f337ba88ccb246ec17e1237fcfc3ad78a2b9b715614"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "bevy_feathers"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf1e96dab6ae98afae284dc579f6053b18504777ab2dd11f85c7c0b70aaa3da9"
+checksum = "1cb29be8f8443c5cc44e1c4710bbe02877e73703c60228ca043f20529a5496c6"
 dependencies = [
  "accesskit",
  "bevy_a11y",
@@ -1240,6 +1339,7 @@ dependencies = [
  "bevy_asset",
  "bevy_camera",
  "bevy_color",
+ "bevy_derive",
  "bevy_ecs",
  "bevy_input_focus",
  "bevy_log",
@@ -1259,18 +1359,18 @@ dependencies = [
 
 [[package]]
 name = "bevy_flycam"
-version = "0.17.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bcf7c519a030ecb02ff62780f086aa57ab1b888997ca04d56dd6e322a359401"
+checksum = "2edc6e0bffe39013fa213848e70c7fa4a1266e8b3f853d2f07aa5fb888cc61d7"
 dependencies = [
  "bevy",
 ]
 
 [[package]]
 name = "bevy_gilrs"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a39dd8fdfe93314d47355ab3c58da40b648908a368bc536872f75fad4e8f3755"
+checksum = "611827ab0ce43b88c0a695e6603901b5f34687efecaf526c861456c9d8e6fedb"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -1284,50 +1384,67 @@ dependencies = [
 
 [[package]]
 name = "bevy_gizmos"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebb9e3ca4938b48e5111151ce4b08f0e6fc207b854db08fa2d8de15ecabe8f8"
+checksum = "6aaff0dd5f405c83d290c5cd591835f1ae8009894947ab19dadcb323062bd7e7"
 dependencies = [
  "bevy_app",
  "bevy_asset",
  "bevy_camera",
  "bevy_color",
- "bevy_core_pipeline",
  "bevy_ecs",
  "bevy_gizmos_macros",
- "bevy_image",
  "bevy_light",
  "bevy_math",
- "bevy_mesh",
- "bevy_pbr",
  "bevy_reflect",
- "bevy_render",
- "bevy_shader",
- "bevy_sprite_render",
  "bevy_time",
  "bevy_transform",
  "bevy_utils",
- "bytemuck",
- "tracing",
 ]
 
 [[package]]
 name = "bevy_gizmos_macros"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92c4b3c3aac86f0db85d4f708883ebdc735c3f88ac5b84c033874fcdd3540a9d"
+checksum = "6960ea308d7e94adcac5c712553ff86614bba6b663511f3f3812f6bec028b51e"
 dependencies = [
  "bevy_macro_utils",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "bevy_gizmos_render"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a8d18c089102de4c5e9326023ad96ba618a6961029f8102a33640b966883237"
+dependencies = [
+ "bevy_app",
+ "bevy_asset",
+ "bevy_camera",
+ "bevy_core_pipeline",
+ "bevy_ecs",
+ "bevy_gizmos",
+ "bevy_image",
+ "bevy_math",
+ "bevy_mesh",
+ "bevy_pbr",
+ "bevy_render",
+ "bevy_shader",
+ "bevy_sprite_render",
+ "bevy_transform",
+ "bevy_utils",
+ "bytemuck",
+ "tracing",
 ]
 
 [[package]]
 name = "bevy_gltf"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3479fbaf897320a3ee30c1626b4a1bee0be874ca27699c3b2f3494891d103d9b"
+checksum = "5f37fb52655d0439656ca0a1db027d46926e463c81d893d4b1639668e5d7f1c1"
 dependencies = [
+ "async-lock",
  "base64 0.22.1",
  "bevy_animation",
  "bevy_app",
@@ -1359,18 +1476,19 @@ dependencies = [
 
 [[package]]
 name = "bevy_hanabi"
-version = "0.17.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1398ccc1698633a35a4cf65c64f5c71dfd9d131d2e3e9e2fb85f156b6f66586"
+checksum = "d551e95cf661cfc74bd71faf16e7cc8eed7d21b7f0ac8ca8301426338e38be36"
 dependencies = [
  "anyhow",
  "bevy",
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "bytemuck",
  "fixedbitset",
+ "getrandom 0.3.4",
  "naga",
  "naga_oil",
- "rand",
+ "rand 0.9.2",
  "rand_pcg",
  "ron 0.8.1",
  "serde",
@@ -1381,9 +1499,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_heavy"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7c0651daa331c326e1460cb19ee5bf497ed2810982dafca8784db44725f5c4b"
+checksum = "bc496d1d43b890896cf561d8ce3dcf7b7b8e4c03c4e837a49a83a530abccbc5e"
 dependencies = [
  "bevy_math",
  "bevy_reflect",
@@ -1391,20 +1509,55 @@ dependencies = [
 ]
 
 [[package]]
-name = "bevy_image"
-version = "0.17.3"
+name = "bevy_hotpatching_experiments"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d546bbe2486bfa14971517e7ef427a9384749817c201d3afc60de0325cf52f11"
+checksum = "8b64bacf563bc4b37cbc3365b44389bb24991c678749c351ebc670e403469701"
 dependencies = [
  "bevy_app",
- "bevy_asset",
- "bevy_color",
+ "bevy_derive",
  "bevy_ecs",
- "bevy_math",
+ "bevy_ecs_macros",
+ "bevy_hotpatching_experiments_macros",
+ "bevy_internal",
+ "bevy_log",
+ "bevy_platform",
+ "bevy_reflect",
+ "bevy_utils",
+ "crossbeam-channel",
+ "dioxus-cli-config",
+ "dioxus-devtools",
+ "send_wrapper",
+ "serde_json",
+ "web-sys",
+]
+
+[[package]]
+name = "bevy_hotpatching_experiments_macros"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a9f46960e68fb02e19f02483d438eb5d3c35f8f39a19531b25610e32ab5f4f7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "bevy_image"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a71daf9b2afdd032c2b1122d1d501f99126218cb3e9983b3604ec381daa35f22"
+dependencies = [
+ "bevy_app",
+ "bevy_asset",
+ "bevy_color",
+ "bevy_ecs",
+ "bevy_math",
  "bevy_platform",
  "bevy_reflect",
  "bevy_utils",
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "bytemuck",
  "futures-lite",
  "guillotiere",
@@ -1419,11 +1572,22 @@ dependencies = [
  "wgpu-types",
 ]
 
+[[package]]
+name = "bevy_ingame_clock"
+version = "0.3.0"
+source = "git+https://github.com/GuillaumeDelorme/bevy_ingame_clock.git?branch=bevy-0.18-update#2ce5061c5fc5fe58a01a4176fdcbf6351e4785b9"
+dependencies = [
+ "bevy",
+ "chrono",
+ "evalexpr",
+ "serde",
+]
+
 [[package]]
 name = "bevy_input"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ca955b99f4dc2059e9c8574f8d95a5dd5002809fda80d062a94a553c571a467"
+checksum = "dbc8ffbd02df34dfc52faf420a5263985973765e228043adf542fd0d790a6b21"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -1437,11 +1601,28 @@ dependencies = [
  "thiserror 2.0.18",
 ]
 
+[[package]]
+name = "bevy_input_bms_bindings"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec856a68671b49f2b7e60671e695585d5fcf663b0e9478f8e728a4aaabf1fd10"
+dependencies = [
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_input",
+ "bevy_math",
+ "bevy_mod_scripting_bindings",
+ "bevy_mod_scripting_core",
+ "bevy_mod_scripting_derive",
+ "bevy_platform",
+ "bevy_reflect",
+]
+
 [[package]]
 name = "bevy_input_focus"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de4d1d0e833e31beba1f28a77152b35f946e8c45df364ec4969d58788ab9de7f"
+checksum = "08d48a5bceccb9157549a39ab3de4017f5368b65db6471605e9a3f1c19d91bbc"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -1456,9 +1637,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_internal"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f5e645f9e1a24c9667c768b6233beaf4e241739d8ca4fbba59435cc27aabad5"
+checksum = "6a11df62e49897def470471551c02f13c6fb488e55dddb5ab7ef098132e07754"
 dependencies = [
  "bevy_a11y",
  "bevy_android",
@@ -1471,11 +1652,13 @@ dependencies = [
  "bevy_color",
  "bevy_core_pipeline",
  "bevy_derive",
+ "bevy_dev_tools",
  "bevy_diagnostic",
  "bevy_ecs",
  "bevy_feathers",
  "bevy_gilrs",
  "bevy_gizmos",
+ "bevy_gizmos_render",
  "bevy_gltf",
  "bevy_image",
  "bevy_input",
@@ -1510,9 +1693,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_landmass"
-version = "0.10.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81b1eb1c3b8aedee04ce0c44b256e58168cb2c612353beff2d64b303d122679b"
+checksum = "6d3cd3372ac07d952c642099662bd864124d6b93a2c70bfc1f3b3b170ffc64f8"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -1531,9 +1714,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_light"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47093733280976ebd595f6e25f76603d5067ca4eb7544e59ecb0dd2fc5147810"
+checksum = "4d9d2ac64390a9baacb3c0fa0f5456ac1553959d5a387874c102a09aab8b92cc"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -1552,9 +1735,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_log"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1a2d4ea086ac4663ab9dfb056c7b85eee39e18f7e3e9a4ae6e39897eaa155c5"
+checksum = "c2aac1187f83a1ab2eae887564f7fb14b4abb3fbe8b2267a6426663463923120"
 dependencies = [
  "android_log-sys",
  "bevy_app",
@@ -1570,42 +1753,62 @@ dependencies = [
 
 [[package]]
 name = "bevy_macro_utils"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62d984f9f8bd0f0d9fb020492a955e641e30e7a425f3588bf346cb3e61fec3c3"
+checksum = "3b147843b81a7ec548876ff97fa7bfdc646ef2567cb465566259237b39664438"
 dependencies = [
- "parking_lot 0.12.5",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
- "toml_edit",
+ "syn 2.0.117",
+ "toml_edit 0.23.10+spec-1.0.0",
 ]
 
 [[package]]
 name = "bevy_math"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fa74ae5d968749cc073da991757d3c7e3504ac6dbaac5f8c2a54b9d19b0b7ed"
+checksum = "e931fa969f89c83498b22c97432383afe90e90fd1a5e04fa07be8da4d3bcac84"
 dependencies = [
  "approx",
+ "arrayvec",
  "bevy_reflect",
  "derive_more",
  "glam 0.30.10",
  "itertools 0.14.0",
  "libm",
- "rand",
+ "rand 0.9.2",
  "rand_distr",
  "serde",
- "smallvec",
  "thiserror 2.0.18",
  "variadics_please",
 ]
 
+[[package]]
+name = "bevy_math_bms_bindings"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3378219348bc0c4a181d8f01e98eb0c63a8218e572af7da15cbbd05d9c4718ed"
+dependencies = [
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_math",
+ "bevy_mod_scripting_bindings",
+ "bevy_mod_scripting_core",
+ "bevy_mod_scripting_derive",
+ "bevy_reflect",
+ "derive_more",
+ "glam 0.30.10",
+ "itertools 0.14.0",
+ "rand 0.9.2",
+ "rand_distr",
+ "variadics_please",
+]
+
 [[package]]
 name = "bevy_mesh"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd9a0ea86abbd17655bc6f9f8d94461dfcd0322431f752fc03748df8b335eff2"
+checksum = "288f590c8173d4cca3cae5f2ba579accd5ed1a35dd3fab338f427eb39d55f05e"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -1617,7 +1820,7 @@ dependencies = [
  "bevy_platform",
  "bevy_reflect",
  "bevy_transform",
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "bytemuck",
  "derive_more",
  "hexasphere",
@@ -1633,11 +1836,211 @@ version = "0.17.0-dev"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ef8e4b7e61dfe7719bb03c884dc270cd46a82efb40f93e9933b990c5c190c59"
 
+[[package]]
+name = "bevy_mod_props"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2c1a3e9378f4c72f2c3948a29b97836c0dcc8639546236e872a6772b9e5348a"
+dependencies = [
+ "bevy_ecs",
+ "estr",
+ "thiserror 2.0.18",
+]
+
+[[package]]
+name = "bevy_mod_scripting"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6f70faebcb3e19913078641184b4a8062b7f2eb6371f814d9af840bf88b2c75"
+dependencies = [
+ "bevy_app",
+ "bevy_mod_scripting_asset",
+ "bevy_mod_scripting_bindings",
+ "bevy_mod_scripting_bindings_domain",
+ "bevy_mod_scripting_core",
+ "bevy_mod_scripting_derive",
+ "bevy_mod_scripting_display",
+ "bevy_mod_scripting_functions",
+ "bevy_mod_scripting_rhai",
+ "bevy_mod_scripting_script",
+]
+
+[[package]]
+name = "bevy_mod_scripting_asset"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75bb4e3a4960a692d6c9e8e28dd7e3c32018e26d96aa5ae5992aca0670cc93c8"
+dependencies = [
+ "bevy_asset",
+ "bevy_log",
+ "bevy_mod_scripting_derive",
+ "bevy_mod_scripting_display",
+ "bevy_reflect",
+ "serde",
+]
+
+[[package]]
+name = "bevy_mod_scripting_bindings"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "128902e0ef62c7517d6d50add9370a8866c45d28c819850959fa837672ea7211"
+dependencies = [
+ "bevy_app",
+ "bevy_asset",
+ "bevy_diagnostic",
+ "bevy_ecs",
+ "bevy_log",
+ "bevy_mod_scripting_asset",
+ "bevy_mod_scripting_bindings_domain",
+ "bevy_mod_scripting_derive",
+ "bevy_mod_scripting_display",
+ "bevy_mod_scripting_script",
+ "bevy_platform",
+ "bevy_reflect",
+ "bevy_system_reflection",
+ "itertools 0.14.0",
+ "nonmax",
+ "parking_lot 0.12.5",
+ "profiling",
+ "serde",
+ "smallvec",
+ "variadics_please",
+]
+
+[[package]]
+name = "bevy_mod_scripting_bindings_domain"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2cfcf0d4eb06e7c813e626664fe559716fb4b58f14f2b02727a706e83e18793b"
+dependencies = [
+ "bevy_mod_scripting_derive",
+ "bevy_mod_scripting_display",
+ "serde",
+]
+
+[[package]]
+name = "bevy_mod_scripting_core"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fa282ec59178bbe383f3bbeeb801d2c3a436bf1741770dca30fec3cb4357e37"
+dependencies = [
+ "bevy_app",
+ "bevy_asset",
+ "bevy_diagnostic",
+ "bevy_ecs",
+ "bevy_log",
+ "bevy_mod_scripting_asset",
+ "bevy_mod_scripting_bindings",
+ "bevy_mod_scripting_derive",
+ "bevy_mod_scripting_display",
+ "bevy_mod_scripting_script",
+ "bevy_platform",
+ "bevy_reflect",
+ "bevy_system_reflection",
+ "bevy_utils",
+ "fixedbitset",
+ "itertools 0.14.0",
+ "parking_lot 0.12.5",
+ "profiling",
+ "serde",
+ "smallvec",
+ "uuid 1.22.0",
+ "variadics_please",
+]
+
+[[package]]
+name = "bevy_mod_scripting_derive"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62b7a3e03eda8f22d133bcdd294aba8ca36f484099b9a8d01d4afdb07a7d04fd"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "bevy_mod_scripting_display"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86257ca1165e9399de476f34863089fed2886e8347f7972554383db70fba0be0"
+dependencies = [
+ "bevy_asset",
+ "bevy_ecs",
+ "bevy_platform",
+ "bevy_reflect",
+ "parking_lot 0.12.5",
+]
+
+[[package]]
+name = "bevy_mod_scripting_functions"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb496b3743bd85a8d10efccf7dcac1a8532dec719003bb110d55e7bf52e5bfba"
+dependencies = [
+ "bevy_app",
+ "bevy_asset",
+ "bevy_color_bms_bindings",
+ "bevy_core_pipeline_bms_bindings",
+ "bevy_ecs",
+ "bevy_ecs_bms_bindings",
+ "bevy_input_bms_bindings",
+ "bevy_math_bms_bindings",
+ "bevy_mod_scripting_asset",
+ "bevy_mod_scripting_bindings",
+ "bevy_mod_scripting_core",
+ "bevy_mod_scripting_derive",
+ "bevy_mod_scripting_display",
+ "bevy_mod_scripting_rhai",
+ "bevy_mod_scripting_script",
+ "bevy_platform",
+ "bevy_reflect",
+ "bevy_reflect_bms_bindings",
+ "bevy_system_reflection",
+ "bevy_time_bms_bindings",
+ "bevy_transform_bms_bindings",
+ "profiling",
+]
+
+[[package]]
+name = "bevy_mod_scripting_rhai"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f9476fc18be97947a3598a9ef52b64d2c54b181bad85a302a3116e4ff4b147"
+dependencies = [
+ "bevy_app",
+ "bevy_asset",
+ "bevy_ecs",
+ "bevy_log",
+ "bevy_mod_scripting_asset",
+ "bevy_mod_scripting_bindings",
+ "bevy_mod_scripting_core",
+ "bevy_mod_scripting_display",
+ "bevy_mod_scripting_script",
+ "bevy_platform",
+ "parking_lot 0.12.5",
+ "rhai",
+ "strum 0.26.3",
+]
+
+[[package]]
+name = "bevy_mod_scripting_script"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8119db5db4418b437b8cf248330bb99132dfd2c5756f1af9df37c373bf8d4aa9"
+dependencies = [
+ "bevy_asset",
+ "bevy_ecs",
+ "bevy_mod_scripting_asset",
+ "bevy_mod_scripting_display",
+ "bevy_reflect",
+]
+
 [[package]]
 name = "bevy_pbr"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c514b950cda849aa64e9b076a235913577370275125a34a478758505a19d776"
+checksum = "a5ab6944ffc6fd71604c0fbca68cc3e2a3654edfcdbfd232f9d8b88e3d20fdc0"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -1649,6 +2052,7 @@ dependencies = [
  "bevy_ecs",
  "bevy_image",
  "bevy_light",
+ "bevy_log",
  "bevy_math",
  "bevy_mesh",
  "bevy_platform",
@@ -1657,7 +2061,7 @@ dependencies = [
  "bevy_shader",
  "bevy_transform",
  "bevy_utils",
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "bytemuck",
  "derive_more",
  "fixedbitset",
@@ -1671,9 +2075,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_picking"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b371779713b40dea83b24cdb95054fe999fe8372351a317c4fb768859ac5f010"
+checksum = "b7d524dbc8f2c9e73f7ab70c148c8f7886f3c24b8aa8c252a38ba68ed06cbf10"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -1690,25 +2094,24 @@ dependencies = [
  "bevy_window",
  "crossbeam-channel",
  "tracing",
- "uuid 1.20.0",
+ "uuid 1.22.0",
 ]
 
 [[package]]
 name = "bevy_platform"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4691af6d7cfd1b5deb2fc926a43a180a546cdc3fe1e5a013fcee60db9bb2c81f"
+checksum = "ec6b36504169b644acd26a5469fd8d371aa6f1d73ee5c01b1b1181ae1cefbf9b"
 dependencies = [
  "critical-section",
  "foldhash 0.2.0",
  "futures-channel",
- "getrandom",
  "hashbrown 0.16.1",
  "js-sys",
  "portable-atomic",
  "portable-atomic-util",
  "serde",
- "spin",
+ "spin 0.10.0",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-time",
@@ -1716,9 +2119,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_post_process"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b857972f5d56b43b0dce2c843b75b64d5fbbd0f6177f6ecccd75e7e41f72deb"
+checksum = "8f77a4e894aea992e3d6938f1d5898a1cdbb87dba6eebfb95cb4038d0a2600e9"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -1736,7 +2139,7 @@ dependencies = [
  "bevy_transform",
  "bevy_utils",
  "bevy_window",
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "nonmax",
  "radsort",
  "smallvec",
@@ -1746,15 +2149,15 @@ dependencies = [
 
 [[package]]
 name = "bevy_ptr"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17d24d7906c7de556033168b3485de36c59049fbaef0c2c44c715a23e0329b10"
+checksum = "c7a9329e8dc4e01ced480eeec4902e6d7cb56e56ec37f6fbc4323e5c937290a7"
 
 [[package]]
 name = "bevy_reflect"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5472b91928c0f3e4e3988c0d036b00719f19520f53a0c3f8c2af72f00e693c5"
+checksum = "d1dfeb67a9fe4f59003a84f5f99ba6302141c70e926601cbc6abfd4a1eea9ca9"
 dependencies = [
  "assert_type_match",
  "bevy_platform",
@@ -1767,36 +2170,64 @@ dependencies = [
  "erased-serde",
  "foldhash 0.2.0",
  "glam 0.30.10",
+ "indexmap",
  "inventory",
  "petgraph",
  "serde",
  "smallvec",
  "smol_str",
  "thiserror 2.0.18",
- "uuid 1.20.0",
+ "uuid 1.22.0",
+ "variadics_please",
+ "wgpu-types",
+]
+
+[[package]]
+name = "bevy_reflect_bms_bindings"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61ce28f3348189410d73798df8ff38808d03e8e8199a99a23312f3f34af1db9a"
+dependencies = [
+ "assert_type_match",
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_mod_scripting_bindings",
+ "bevy_mod_scripting_core",
+ "bevy_mod_scripting_derive",
+ "bevy_platform",
+ "bevy_ptr",
+ "bevy_reflect",
+ "bevy_reflect_derive",
+ "downcast-rs 2.0.2",
+ "erased-serde",
+ "glam 0.30.10",
+ "inventory",
+ "serde",
+ "smol_str",
+ "uuid 1.22.0",
  "variadics_please",
  "wgpu-types",
 ]
 
 [[package]]
 name = "bevy_reflect_derive"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "083784255162fa39960aa3cf3c23af0e515db2daa7f2e796ae34df993f4d3f6c"
+checksum = "475f68c93e9cd5f17e9167635c8533a4f388f12d38245a202359e4c2721d87ba"
 dependencies = [
  "bevy_macro_utils",
  "indexmap",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
- "uuid 1.20.0",
+ "syn 2.0.117",
+ "uuid 1.22.0",
 ]
 
 [[package]]
 name = "bevy_remote"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e33d2fe54b564ba3924425e9c80f306d4ee8d4c0d1827636e0472cbd5378354a"
+checksum = "c0129e24bf3e281dd52996a9290c35f8c4821ca09e1ce8b8b222671e1ad9da0c"
 dependencies = [
  "anyhow",
  "async-channel",
@@ -1819,9 +2250,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_render"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44117cbc9448b5a3118eb9c65bd9ec4c574be996148793be2443257daae6eb05"
+checksum = "243523e33fe5dfcebc4240b1eb2fc16e855c5d4c0ea6a8393910740956770f44"
 dependencies = [
  "async-channel",
  "bevy_app",
@@ -1844,12 +2275,13 @@ dependencies = [
  "bevy_transform",
  "bevy_utils",
  "bevy_window",
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "bytemuck",
  "derive_more",
  "downcast-rs 2.0.2",
  "encase",
  "fixedbitset",
+ "glam 0.30.10",
  "image",
  "indexmap",
  "js-sys",
@@ -1868,33 +2300,32 @@ dependencies = [
 
 [[package]]
 name = "bevy_render_macros"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9557b7b6b06b1b70c147581f4f410c2de73b6f6f0e82915887020f953bacb5a"
+checksum = "66b6325e9c495a71270446784611e8d7f446f927eac8506c4c099fd10cb4c3ed"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "bevy_rerecast"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ccef48966acc1bf493275aa537bebb4f1e648c88fbe13bcfafdc58683945325"
+checksum = "1b56bf885d077e04dbfe050892a29feb3a20c602e59c80ae84ebe16742dd572e"
 dependencies = [
  "bevy_app",
- "bevy_math",
  "bevy_rerecast_core",
  "bevy_rerecast_editor_integration",
 ]
 
 [[package]]
 name = "bevy_rerecast_core"
-version = "0.3.1"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1866e2ec0adcd4982e199917eafa62a286fecb9111ade1b6636f7ff4aa5b5bd9"
+checksum = "0e57e038905f01f46c55774deb06809d7f570a28a4c5e41dee14b50e817f0ad4"
 dependencies = [
  "anyhow",
  "bevy_app",
@@ -1913,7 +2344,6 @@ dependencies = [
  "bevy_render",
  "bevy_tasks",
  "bevy_transform",
- "bevy_utils",
  "bincode",
  "glam 0.30.10",
  "rerecast",
@@ -1924,9 +2354,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_rerecast_editor_integration"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "895d4328efe2de84d213229b3c664fc89d0ea3cc8881a8501e71f0b21eee856e"
+checksum = "159a74df828813210ac43df3a3055cfe1a42264753af3fe9bebbcce5916fa225"
 dependencies = [
  "anyhow",
  "base64 0.22.1",
@@ -1948,6 +2378,7 @@ dependencies = [
  "bevy_tasks",
  "bevy_transform",
  "bincode",
+ "cosmic-text 0.14.2",
  "flate2",
  "rerecast",
  "serde",
@@ -1959,9 +2390,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_scene"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcf6efd31fdd1e05724c95900bb1055716c8e3633b05fa731ee75db4241c17d"
+checksum = "34cc1047d85ec8048261b63ef675c12f1e6b5782dc0b422fbcee0c140d026bd4"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -1973,16 +2404,17 @@ dependencies = [
  "bevy_transform",
  "bevy_utils",
  "derive_more",
+ "ron 0.12.0",
  "serde",
  "thiserror 2.0.18",
- "uuid 1.20.0",
+ "uuid 1.22.0",
 ]
 
 [[package]]
 name = "bevy_seedling"
-version = "0.6.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb0d2bb3af43e45ea318865e49cf2c33e32f32a986fcaf6d7a4e73a093ce1766"
+checksum = "8c44a95ed28011e116d0056122f88b06c68874e85b7c4f0a17f8f8b1ac127904"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -1994,11 +2426,9 @@ dependencies = [
  "bevy_seedling_macros",
  "bevy_time",
  "bevy_transform",
- "ebur128",
  "firewheel",
  "firewheel-ircam-hrtf",
- "portable-atomic",
- "rand",
+ "rand 0.9.2",
  "smallvec",
  "symphonia",
  "symphonium",
@@ -2006,21 +2436,21 @@ dependencies = [
 
 [[package]]
 name = "bevy_seedling_macros"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71af121c6c880413f48ce79a217312bb951d2b07cbd3f654dc93211c12bd7c05"
+checksum = "adc9ea6172ac34cd08a4035f167d2703b3ae1a50a097c4009858781eb23e800c"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "bevy_shader"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a655de9f64e113a6e37be76401fb0d6cb84ed7cc4f891e70af4e39d26e9080c3"
+checksum = "9eea95f0273c32be13d6a0b799a93bc256ad7830759ede595c404d5234302da2"
 dependencies = [
  "bevy_asset",
  "bevy_platform",
@@ -2035,20 +2465,21 @@ dependencies = [
 
 [[package]]
 name = "bevy_simple_text_input"
-version = "0.12.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1f8709040643f0b7b24991193fcc7a348b54b0465dcbb3fec55e96ecdfa97f2"
+checksum = "c7954421697198757f28a56088eb46e18f227d83b0b8432fa2eeb8e96610580b"
 dependencies = [
  "bevy",
 ]
 
 [[package]]
 name = "bevy_skein"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a00c196f77c534a5dfef52f15c3910fc310f39c3bf09c0ffd9e9eb6ff85b569d"
+checksum = "c8daba67c48822be5e6a3e33aa53b9a925dee1d8e3f75758f1e8c15fa93a0b8d"
 dependencies = [
  "bevy_app",
+ "bevy_asset",
  "bevy_ecs",
  "bevy_gltf",
  "bevy_log",
@@ -2056,6 +2487,8 @@ dependencies = [
  "bevy_reflect",
  "bevy_remote",
  "bevy_scene",
+ "bevy_tasks",
+ "gltf",
  "serde",
  "serde_json",
  "tracing",
@@ -2063,9 +2496,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_sprite"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52b9a80aadf102ef0b012ceba5326253638c891994c303479e9973092e4e1c8b"
+checksum = "96ec5bc0cbdee551b610a46f41d30374bbe42b8951ffc676253c6243ab2b9395"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -2088,18 +2521,18 @@ dependencies = [
 
 [[package]]
 name = "bevy_sprite3d"
-version = "7.0.0"
+version = "8.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66683d51a25c4f28089bda87ece5ccf8ef2c71334fd9a9eba78b352d5f4bed51"
+checksum = "f4d48211f81bf10733ae4b4e90311a62b3ec72f2a80d100ad24be78676d7ecc5"
 dependencies = [
  "bevy",
 ]
 
 [[package]]
 name = "bevy_sprite_render"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eec49a2a9185526f9828559a40b6f66d4c2dbae2df8ea2936d88ba449a5e86a"
+checksum = "b82cb08905e7ddcea2694a95f757ae7f1fd01e6a7304076bad595d2158e4bfe0"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -2119,7 +2552,7 @@ dependencies = [
  "bevy_text",
  "bevy_transform",
  "bevy_utils",
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "bytemuck",
  "derive_more",
  "fixedbitset",
@@ -2129,9 +2562,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_state"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05e8556a55d548844fc067fac6657b62f8073c94bd7e13c86aa7573f4c2a67b3"
+checksum = "0ae0682968e97d29c1eccc8c6bb6283f2678d362779bc03f1bb990967059473b"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -2145,29 +2578,42 @@ dependencies = [
 
 [[package]]
 name = "bevy_state_macros"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcda45913b1d6470c6b751656e72fb3f25ca6b5b7b2ee055b294aaed1eb7e5ba"
+checksum = "73d32f90f9cfcef5a44401db7ce206770daaa1707b0fb95eb7a96a6933f54f1b"
 dependencies = [
  "bevy_macro_utils",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "bevy_sun_move"
 version = "0.2.0"
-source = "git+https://github.com/GuillaumeDelorme/bevy_sun_move?branch=bevy-0.17-update#3fb2efc6f05f5470ebbf4c4a2c3bcd4593ae14c8"
+source = "git+https://github.com/Zrocket/bevy_sun_move?branch=main#bf149740b217dd85d6b6648c1355eef2d51d47e9"
 dependencies = [
  "bevy",
- "rand",
+ "rand 0.9.2",
+]
+
+[[package]]
+name = "bevy_system_reflection"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29d5cc4b995844065ebc4b3b3684548661d543f9b0cbfbd9081813b0ddb3b5f3"
+dependencies = [
+ "bevy_ecs",
+ "bevy_log",
+ "bevy_platform",
+ "bevy_reflect",
+ "dot-writer",
 ]
 
 [[package]]
 name = "bevy_tasks"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcbbfa5a58a16c4228434d3018c23fde3d78dcd76ec5f5b2b482a21f4b158dd3"
+checksum = "384eb04d80aa38664d69988fd30cbbe03e937ecb65c66aa6abe60ce0bca826aa"
 dependencies = [
  "async-channel",
  "async-executor",
@@ -2179,15 +2625,15 @@ dependencies = [
  "crossbeam-queue",
  "derive_more",
  "futures-lite",
- "heapless",
+ "heapless 0.9.2",
  "pin-project",
 ]
 
 [[package]]
 name = "bevy_text"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc144cc6a30ed44a88e342c22d9e3a66a0993a74f792ae07ba79318efb41a86d"
+checksum = "fdc5233291dfc22e584de2535f2e37ae9766d37cb5a01652de2133ba202dcb9b"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -2200,7 +2646,7 @@ dependencies = [
  "bevy_platform",
  "bevy_reflect",
  "bevy_utils",
- "cosmic-text",
+ "cosmic-text 0.16.0",
  "serde",
  "smallvec",
  "sys-locale",
@@ -2211,24 +2657,40 @@ dependencies = [
 
 [[package]]
 name = "bevy_time"
-version = "0.17.3"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5ef9af4e523195e561074cf60fbfad0f4cb8d1db504855fee3c4ce8896c7244"
+dependencies = [
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_platform",
+ "bevy_reflect",
+ "crossbeam-channel",
+ "log",
+ "serde",
+]
+
+[[package]]
+name = "bevy_time_bms_bindings"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32835c3dbe082fbbe7d4f2f37f655073421f2882d4320ac2d59f922474260de4"
+checksum = "f68cb5b0ad269267f33fe7d28e34d7c052f6d72e238db04d2dbdff3f1ea3b3c4"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
+ "bevy_mod_scripting_bindings",
+ "bevy_mod_scripting_core",
+ "bevy_mod_scripting_derive",
  "bevy_platform",
  "bevy_reflect",
- "crossbeam-channel",
- "log",
- "serde",
+ "bevy_time",
 ]
 
 [[package]]
 name = "bevy_transform"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b41fabfeaa53f51ff5ccf4d87e66836293159d50d21f6d3e16c93efb7c30f969"
+checksum = "3c3bb3de7842fef699344beb03f22bdbff16599d788fe0f47fbb3b1e6fa320eb"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -2242,20 +2704,38 @@ dependencies = [
  "thiserror 2.0.18",
 ]
 
+[[package]]
+name = "bevy_transform_bms_bindings"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b339cccf40706f31428291f80feb4d041c1a9029e4237b2a23399d13b2d841e7"
+dependencies = [
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_math",
+ "bevy_mod_scripting_bindings",
+ "bevy_mod_scripting_core",
+ "bevy_mod_scripting_derive",
+ "bevy_reflect",
+ "bevy_tasks",
+ "bevy_transform",
+ "bevy_utils",
+]
+
 [[package]]
 name = "bevy_transform_interpolation"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "284738382605476667bbe80cf0959f4dffb61adbdb0149e22e67f4dbf97a5bc2"
+checksum = "88545c8b0fa8f3502b9a439c71fa6b596ee9e808bfb16f27a51c8c6f7405a657"
 dependencies = [
  "bevy",
 ]
 
 [[package]]
 name = "bevy_ui"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa0fe27b8c641c2537480774dfd9198d56779371b04dd76618db39da4e7c7483"
+checksum = "1691a411014085e0d35f8bb8208e5f973edd7ace061a4b1c41c83de21579dc70"
 dependencies = [
  "accesskit",
  "bevy_a11y",
@@ -2267,6 +2747,7 @@ dependencies = [
  "bevy_ecs",
  "bevy_image",
  "bevy_input",
+ "bevy_input_focus",
  "bevy_math",
  "bevy_picking",
  "bevy_platform",
@@ -2282,14 +2763,14 @@ dependencies = [
  "taffy",
  "thiserror 2.0.18",
  "tracing",
- "uuid 1.20.0",
+ "uuid 1.22.0",
 ]
 
 [[package]]
 name = "bevy_ui_render"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1d2e783bb5f0b748e6360a0055421d5c934b43830b205a84996a75e54330cd7"
+checksum = "c2c35402d8a052f512e3fec1f36b26e83eee713fcca57f965c244ee795e1fcb0"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -2318,13 +2799,14 @@ dependencies = [
 
 [[package]]
 name = "bevy_ui_widgets"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d101911f24ad248701104490114e6933bdf016b2cca849cdb970ea62562b10ef"
+checksum = "b6a63cb818b0de41bdb14990e0ce1aaaa347f871750ab280f80c427e83d72712"
 dependencies = [
  "accesskit",
  "bevy_a11y",
  "bevy_app",
+ "bevy_camera",
  "bevy_ecs",
  "bevy_input",
  "bevy_input_focus",
@@ -2337,9 +2819,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_utils"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "789d04f88c764877a4552e07745b402dbc45f5d0545e6d102558f2f1752a1d89"
+checksum = "2111910cd7a4b1e6ce07eaaeb6f68a2c0ea0ca609ed0d0d506e3eb161101435b"
 dependencies = [
  "bevy_platform",
  "disqualified",
@@ -2348,9 +2830,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_window"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ae54ec7a0fc344278592a688a01b57b32182abc3ca7d47040773c4cbc2e15e0"
+checksum = "6df06e6993a0896bae2fe7644ae6def29a1a92b45dfb1bcebbd92af782be3638"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -2367,9 +2849,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_winit"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "feeaa46d3c4480323e690de8a4ca7f914c074af1f5f70ee3246392992dbf4a0c"
+checksum = "f2de1c13d32ab8528435b58eca7ab874a1068184c6d6f266ee11433ae99d4069"
 dependencies = [
  "accesskit",
  "accesskit_winit",
@@ -2401,15 +2883,15 @@ dependencies = [
 
 [[package]]
 name = "bevy_yarnspinner"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8662fc05b4eede5d10ade44362505bcc6035f5e189f75b9d54052466d53c5cf4"
+checksum = "f5f3775559cb89503909224e3774e6208df9f098b83b0d4508ff59f50f9e9c23"
 dependencies = [
  "anyhow",
  "bevy",
  "csv",
  "glob",
- "rand",
+ "rand 0.9.2",
  "serde",
  "sha2",
  "variadics_please",
@@ -2419,9 +2901,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_yarnspinner_example_dialogue_view"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01834ea874ea33b4fd36f4729915ab80a5d8f87a656c134838a11e34456a87a6"
+checksum = "2f6f7ccb8776d90f1e7c19ebdb73451b0490793af60fa393801bade29341b13c"
 dependencies = [
  "bevy",
  "bevy_yarnspinner",
@@ -2445,11 +2927,14 @@ dependencies = [
  "bevy_asset_loader",
  "bevy_bae",
  "bevy_console",
- "bevy_egui 0.38.1",
+ "bevy_egui",
  "bevy_enhanced_input",
  "bevy_flycam",
  "bevy_hanabi",
+ "bevy_hotpatching_experiments",
+ "bevy_ingame_clock",
  "bevy_landmass",
+ "bevy_mod_scripting",
  "bevy_rerecast",
  "bevy_seedling",
  "bevy_simple_text_input",
@@ -2465,7 +2950,7 @@ dependencies = [
  "lazy_static",
  "nom 8.0.0",
  "polyanya",
- "rand",
+ "rand 0.10.0",
  "ratatui",
  "serde",
  "soft_ratatui",
@@ -2489,7 +2974,7 @@ version = "0.72.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "cexpr",
  "clang-sys",
  "itertools 0.13.0",
@@ -2498,7 +2983,7 @@ dependencies = [
  "regex",
  "rustc-hash 2.1.1",
  "shlex",
- "syn 2.0.114",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -2539,9 +3024,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.10.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
+checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af"
 dependencies = [
  "bytemuck",
  "serde_core",
@@ -2558,7 +3043,7 @@ dependencies = [
  "cc",
  "cfg-if",
  "constant_time_eq",
- "cpufeatures",
+ "cpufeatures 0.2.17",
 ]
 
 [[package]]
@@ -2591,7 +3076,7 @@ version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5"
 dependencies = [
- "objc2 0.6.3",
+ "objc2 0.6.4",
 ]
 
 [[package]]
@@ -2620,9 +3105,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.19.1"
+version = "3.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510"
+checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb"
 
 [[package]]
 name = "bvh2d"
@@ -2650,7 +3135,7 @@ checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -2677,7 +3162,7 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "log",
  "polling",
  "rustix 0.38.44",
@@ -2708,9 +3193,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.55"
+version = "1.2.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47b26a0954ae34af09b50f0de26458fa95369a0d478d8236d3f93082b219bd29"
+checksum = "aebf35691d1bfb0ac386a69bac2fde4dd276fb618cf8bf4f5318fe285e821bb2"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -2745,6 +3230,30 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
+[[package]]
+name = "chacha20"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601"
+dependencies = [
+ "cfg-if",
+ "cpufeatures 0.3.0",
+ "rand_core 0.10.0",
+]
+
+[[package]]
+name = "chrono"
+version = "0.4.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0"
+dependencies = [
+ "iana-time-zone",
+ "js-sys",
+ "num-traits",
+ "wasm-bindgen",
+ "windows-link 0.2.1",
+]
+
 [[package]]
 name = "clang-sys"
 version = "1.8.1"
@@ -2758,9 +3267,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.57"
+version = "4.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6899ea499e3fb9305a65d5ebf6e3d2248c5fab291f300ad0a704fbe142eae31a"
+checksum = "b193af5b67834b676abd72466a96c1024e6a6ad978a1f484bd90b85c94041351"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -2768,9 +3277,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.57"
+version = "4.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b12c8b680195a62a8364d16b8447b01b6c2c8f9aaf68bee653be34d4245e238"
+checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f"
 dependencies = [
  "anstream",
  "anstyle",
@@ -2780,21 +3289,21 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.55"
+version = "4.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a92793da1a46a5f2a02a6f4c46c6496b28c43638adea8306fcb0caa1634f24e5"
+checksum = "1110bd8a634a1ab8cb04345d8d878267d57c3cf1b38d91b71af6686408bbca6a"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.7.7"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3e64b0cc0439b12df2fa678eae89a1c56a529fd067a9115f7827f1fffd22b32"
+checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9"
 
 [[package]]
 name = "clipboard-win"
@@ -2805,6 +3314,15 @@ dependencies = [
  "error-code",
 ]
 
+[[package]]
+name = "cmake"
+version = "0.1.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75443c44cd6b379beb8c5b45d85d0773baf31cce901fe7bb252f4eff3008ef7d"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "codespan-reporting"
 version = "0.12.0"
@@ -2872,6 +3390,46 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32b13ea120a812beba79e34316b3942a857c86ec1593cb34f27bb28272ce2cca"
 
+[[package]]
+name = "const-random"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359"
+dependencies = [
+ "const-random-macro",
+]
+
+[[package]]
+name = "const-random-macro"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"
+dependencies = [
+ "getrandom 0.2.17",
+ "once_cell",
+ "tiny-keccak",
+]
+
+[[package]]
+name = "const_format"
+version = "0.2.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7faa7469a93a566e9ccc1c73fe783b4a65c274c5ace346038dca9c39fe0030ad"
+dependencies = [
+ "const_format_proc_macros",
+]
+
+[[package]]
+name = "const_format_proc_macros"
+version = "0.2.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d57c2eccfb16dbac1f4e61e206105db5820c9d26c3c472bc17c774259ef7744"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-xid",
+]
+
 [[package]]
 name = "const_panic"
 version = "0.2.15"
@@ -2967,11 +3525,20 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "core-foundation 0.10.1",
  "libc",
 ]
 
+[[package]]
+name = "core_maths"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77745e017f5edba1a9c1d854f6f3a52dac8a12dd5af5d2f54aecf61e43d80d30"
+dependencies = [
+ "libm",
+]
+
 [[package]]
 name = "coreaudio-rs"
 version = "0.11.3"
@@ -3012,8 +3579,8 @@ version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da46a9d5a8905cc538a4a5bceb6a4510de7a51049c5588c0114efce102bcbbe8"
 dependencies = [
- "bitflags 2.10.0",
- "fontdb",
+ "bitflags 2.11.0",
+ "fontdb 0.16.2",
  "log",
  "rangemap",
  "rustc-hash 1.1.0",
@@ -3029,20 +3596,44 @@ dependencies = [
  "unicode-segmentation",
 ]
 
+[[package]]
+name = "cosmic-text"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4cadaea21e24c49c0c82116f2b465ae6a49d63c90e428b0f8d9ae1f638ac91f"
+dependencies = [
+ "bitflags 2.11.0",
+ "fontdb 0.23.0",
+ "harfrust",
+ "linebender_resource_handle",
+ "log",
+ "rangemap",
+ "rustc-hash 1.1.0",
+ "self_cell",
+ "skrifa 0.39.0",
+ "smol_str",
+ "swash",
+ "sys-locale",
+ "unicode-bidi",
+ "unicode-linebreak",
+ "unicode-script",
+ "unicode-segmentation",
+]
+
 [[package]]
 name = "cpal"
 version = "0.15.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "873dab07c8f743075e57f524c583985fbaf745602acbe916a01539364369a779"
 dependencies = [
- "alsa",
+ "alsa 0.9.1",
  "core-foundation-sys",
  "coreaudio-rs 0.11.3",
  "dasp_sample",
- "jni",
+ "jni 0.21.1",
  "js-sys",
  "libc",
- "mach2",
+ "mach2 0.4.3",
  "ndk 0.8.0",
  "ndk-context",
  "oboe",
@@ -3054,28 +3645,32 @@ dependencies = [
 
 [[package]]
 name = "cpal"
-version = "0.16.0"
+version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbd307f43cc2a697e2d1f8bc7a1d824b5269e052209e28883e5bc04d095aaa3f"
+checksum = "5b1f9c7312f19fc2fa12fd7acaf38de54e8320ba10d1a02dcbe21038def51ccb"
 dependencies = [
- "alsa",
+ "alsa 0.10.0",
  "coreaudio-rs 0.13.0",
  "dasp_sample",
- "jni",
+ "jni 0.21.1",
  "js-sys",
  "libc",
- "mach2",
+ "mach2 0.5.0",
  "ndk 0.9.0",
  "ndk-context",
  "num-derive",
  "num-traits",
+ "objc2 0.6.4",
  "objc2-audio-toolbox",
+ "objc2-avf-audio",
  "objc2-core-audio",
  "objc2-core-audio-types",
+ "objc2-core-foundation",
+ "objc2-foundation 0.3.2",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "windows 0.54.0",
+ "windows 0.62.2",
 ]
 
 [[package]]
@@ -3087,6 +3682,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "cpufeatures"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "crc32fast"
 version = "1.5.0"
@@ -3145,6 +3749,12 @@ version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
+[[package]]
+name = "crossfig"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40a998414a3656e7a11ca59d55598ce7df58daafd742e783844e80bbd8d500dd"
+
 [[package]]
 name = "crunchy"
 version = "0.2.4"
@@ -3184,12 +3794,12 @@ dependencies = [
 
 [[package]]
 name = "ctrlc"
-version = "3.5.1"
+version = "3.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73736a89c4aff73035ba2ed2e565061954da00d4970fc9ac25dcc85a2a20d790"
+checksum = "e0b1fab2ae45819af2d0731d60f2afe17227ebb1a1538a236da84c93e9a60162"
 dependencies = [
  "dispatch2",
- "nix",
+ "nix 0.31.2",
  "windows-sys 0.61.2",
 ]
 
@@ -3219,7 +3829,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.114",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -3230,16 +3840,7 @@ checksum = "ac3984ec7bd6cfa798e62b4a642426a5be0e68f9401cfc2a01e3fa9ea2fcdb8d"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.114",
-]
-
-[[package]]
-name = "dasp_frame"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2a3937f5fe2135702897535c8d4a5553f8b116f76c1529088797f2eee7c5cd6"
-dependencies = [
- "dasp_sample",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -3256,9 +3857,9 @@ checksum = "d7a1e2f27636f116493b8b860f5546edb47c8d8f8ea73e1d2a20be88e28d1fea"
 
 [[package]]
 name = "deranged"
-version = "0.5.5"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587"
+checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c"
 dependencies = [
  "powerfmt",
 ]
@@ -3282,7 +3883,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn 2.0.114",
+ "syn 2.0.117",
  "unicode-xid",
 ]
 
@@ -3296,6 +3897,88 @@ dependencies = [
  "crypto-common",
 ]
 
+[[package]]
+name = "dioxus-cli-config"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccd67ab405e1915a47df9769cd5408545d1b559d5c01ce7a0f442caef520d1f3"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "dioxus-core"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b389b0e3cc01c7da292ad9b884b088835fdd1671d45fbd2f737506152b22eef0"
+dependencies = [
+ "anyhow",
+ "const_format",
+ "dioxus-core-types",
+ "futures-channel",
+ "futures-util",
+ "generational-box",
+ "longest-increasing-subsequence",
+ "rustc-hash 2.1.1",
+ "rustversion",
+ "serde",
+ "slab",
+ "slotmap",
+ "subsecond",
+ "tracing",
+]
+
+[[package]]
+name = "dioxus-core-types"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfc4b8cdc440a55c17355542fc2089d97949bba674255d84cac77805e1db8c9f"
+
+[[package]]
+name = "dioxus-devtools"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcf89488bad8fb0f18b9086ee2db01f95f709801c10c68be42691a36378a0f2d"
+dependencies = [
+ "dioxus-cli-config",
+ "dioxus-core",
+ "dioxus-devtools-types",
+ "dioxus-signals",
+ "serde",
+ "serde_json",
+ "subsecond",
+ "thiserror 2.0.18",
+ "tracing",
+ "tungstenite",
+]
+
+[[package]]
+name = "dioxus-devtools-types"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e7381d9d7d0a0f66b9d5082d584853c3d53be21d34007073daca98ddf26fc4d"
+dependencies = [
+ "dioxus-core",
+ "serde",
+ "subsecond-types",
+]
+
+[[package]]
+name = "dioxus-signals"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f48020bc23bc9766e7cce986c0fd6de9af0b8cbfd432652ec6b1094439c1ec6"
+dependencies = [
+ "dioxus-core",
+ "futures-channel",
+ "futures-util",
+ "generational-box",
+ "parking_lot 0.12.5",
+ "rustc-hash 2.1.1",
+ "tracing",
+ "warnings",
+]
+
 [[package]]
 name = "disjoint"
 version = "0.8.0"
@@ -3310,14 +3993,14 @@ checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
 
 [[package]]
 name = "dispatch2"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec"
+checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "block2 0.6.2",
  "libc",
- "objc2 0.6.3",
+ "objc2 0.6.4",
 ]
 
 [[package]]
@@ -3328,7 +4011,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -3339,9 +4022,9 @@ checksum = "c9c272297e804878a2a4b707cfcfc6d2328b5bb936944613b4fdf2b9269afdfd"
 
 [[package]]
 name = "dlib"
-version = "0.5.2"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
+checksum = "ab8ecd87370524b461f8557c119c405552c396ed91fc0a8eec68679eab26f94a"
 dependencies = [
  "libloading",
 ]
@@ -3362,9 +4045,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d35627725e918aa4593ca54937cd8ef58078d3b9ab0fd060aee60c9bc3a2050e"
 dependencies = [
  "glam 0.29.3",
- "rand",
+ "rand 0.9.2",
 ]
 
+[[package]]
+name = "dot-writer"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2f7a508d3f95b7cb559acf2231c7efad02fe04061d3165b12513c2dbcc77af0"
+
 [[package]]
 name = "downcast-rs"
 version = "1.2.1"
@@ -3393,28 +4082,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "ebur128"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e227cc62d64d6fe01abbef48134b9c1f17d470cef1e7a56337ad05b1f81df7f9"
-dependencies = [
- "bitflags 1.3.2",
- "dasp_frame",
- "dasp_sample",
- "smallvec",
-]
-
-[[package]]
-name = "ecolor"
-version = "0.32.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94bdf37f8d5bd9aa7f753573fdda9cf7343afa73dd28d7bfe9593bd9798fc07e"
-dependencies = [
- "bytemuck",
- "emath 0.32.3",
-]
-
 [[package]]
 name = "ecolor"
 version = "0.33.3"
@@ -3422,23 +4089,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71ddb8ac7643d1dba1bb02110e804406dd459a838efcb14011ced10556711a8e"
 dependencies = [
  "bytemuck",
- "emath 0.33.3",
-]
-
-[[package]]
-name = "egui"
-version = "0.32.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d5d0306cd61ca75e29682926d71f2390160247f135965242e904a636f51c0dc"
-dependencies = [
- "ahash",
- "bitflags 2.10.0",
- "emath 0.32.3",
- "epaint 0.32.3",
- "nohash-hasher",
- "profiling",
- "smallvec",
- "unicode-segmentation",
+ "emath",
 ]
 
 [[package]]
@@ -3448,9 +4099,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a9b567d356674e9a5121ed3fedfb0a7c31e059fe71f6972b691bcd0bfc284e3"
 dependencies = [
  "ahash",
- "bitflags 2.10.0",
- "emath 0.33.3",
- "epaint 0.33.3",
+ "bitflags 2.11.0",
+ "emath",
+ "epaint",
  "log",
  "nohash-hasher",
  "profiling",
@@ -3464,15 +4115,6 @@ version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 
-[[package]]
-name = "emath"
-version = "0.32.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45fd7bc25f769a3c198fe1cf183124bf4de3bd62ef7b4f1eaf6b08711a3af8db"
-dependencies = [
- "bytemuck",
-]
-
 [[package]]
 name = "emath"
 version = "0.33.3"
@@ -3484,9 +4126,9 @@ dependencies = [
 
 [[package]]
 name = "embedded-graphics"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0649998afacf6d575d126d83e68b78c0ab0e00ca2ac7e9b3db11b4cbe8274ef0"
+checksum = "4e8da660bb0c829b34a56a965490597f82a55e767b91f9543be80ce8ccb416fe"
 dependencies = [
  "az",
  "byteorder",
@@ -3497,9 +4139,9 @@ dependencies = [
 
 [[package]]
 name = "embedded-graphics-core"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba9ecd261f991856250d2207f6d8376946cd9f412a2165d3b75bc87a0bc7a044"
+checksum = "95743bef3ff70fcba3930246c4e6872882bbea0dcc6da2ca860112e0cd4bd09f"
 dependencies = [
  "az",
  "byteorder",
@@ -3516,43 +4158,42 @@ dependencies = [
 
 [[package]]
 name = "ena"
-version = "0.14.3"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d248bdd43ce613d87415282f69b9bb99d947d290b10962dd6c56233312c2ad5"
+checksum = "eabffdaee24bd1bf95c5ef7cec31260444317e72ea56c4c91750e8b7ee58d5f1"
 dependencies = [
  "log",
 ]
 
 [[package]]
 name = "encase"
-version = "0.11.2"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02ba239319a4f60905966390f5e52799d868103a533bb7e27822792332504ddd"
+checksum = "6e3e0ff2ee0b7aa97428308dd9e1e42369cb22f5fb8dc1c55546637443a60f1e"
 dependencies = [
  "const_panic",
  "encase_derive",
- "glam 0.30.10",
  "thiserror 2.0.18",
 ]
 
 [[package]]
 name = "encase_derive"
-version = "0.11.2"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5223d6c647f09870553224f6e37261fe5567bc5a4f4cf13ed337476e79990f2f"
+checksum = "a4d90c5d7d527c6cb8a3b114efd26a6304d9ab772656e73d8f4e32b1f3d601a2"
 dependencies = [
  "encase_derive_impl",
 ]
 
 [[package]]
 name = "encase_derive_impl"
-version = "0.11.2"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1796db3d892515842ca2dfb11124c4bb4a9e58d9f2c5c1072e5bca1b2334507b"
+checksum = "c8bad72d8308f7a382de2391ec978ddd736e0103846b965d7e2a63a75768af30"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -3565,31 +4206,14 @@ dependencies = [
 ]
 
 [[package]]
-name = "enumn"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.114",
-]
-
-[[package]]
-name = "epaint"
-version = "0.32.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63adcea970b7a13094fe97a36ab9307c35a750f9e24bf00bb7ef3de573e0fddb"
-dependencies = [
- "ab_glyph",
- "ahash",
- "bytemuck",
- "ecolor 0.32.3",
- "emath 0.32.3",
- "epaint_default_fonts 0.32.3",
- "nohash-hasher",
- "parking_lot 0.12.5",
- "profiling",
+name = "enumn"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -3601,21 +4225,15 @@ dependencies = [
  "ab_glyph",
  "ahash",
  "bytemuck",
- "ecolor 0.33.3",
- "emath 0.33.3",
- "epaint_default_fonts 0.33.3",
+ "ecolor",
+ "emath",
+ "epaint_default_fonts",
  "log",
  "nohash-hasher",
  "parking_lot 0.12.5",
  "profiling",
 ]
 
-[[package]]
-name = "epaint_default_fonts"
-version = "0.32.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1537accc50c9cab5a272c39300bdd0dd5dca210f6e5e8d70be048df9596e7ca2"
-
 [[package]]
 name = "epaint_default_fonts"
 version = "0.33.3"
@@ -3630,9 +4248,9 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "erased-serde"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89e8918065695684b2b0702da20382d5ae6065cf3327bc2d6436bd49a71ce9f3"
+checksum = "d2add8a07dd6a8d93ff627029c51de145e12686fbc36ecb298ac22e74cf02dec"
 dependencies = [
  "serde",
  "serde_core",
@@ -3655,6 +4273,21 @@ version = "3.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dea2df4cf52843e0452895c455a1a2cfbb842a1e7329671acf418fdc53ed4c59"
 
+[[package]]
+name = "estr"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2e77c7dfb1a984132a140c98a805b5f12f8e8707420dda9a6ad698bc50fc041"
+dependencies = [
+ "byteorder",
+ "crossfig",
+ "hashbrown 0.16.1",
+ "libabort",
+ "lock_api",
+ "rapidhash",
+ "spin 0.10.0",
+]
+
 [[package]]
 name = "euclid"
 version = "0.22.13"
@@ -3664,6 +4297,12 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "evalexpr"
+version = "13.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25929004897f2bbab309121a60400d36992f6d911d09baa6c172f6cc55706601"
+
 [[package]]
 name = "event-listener"
 version = "5.4.1"
@@ -3720,7 +4359,7 @@ checksum = "a0aca10fb742cb43f9e7bb8467c91aa9bcb8e3ffbc6a6f7389bb93ffc920577d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -3741,6 +4380,15 @@ dependencies = [
  "rayon",
 ]
 
+[[package]]
+name = "file-id"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1fc6a637b6dc58414714eddd9170ff187ecb0933d4c7024d1abbd23a3cc26e9"
+dependencies = [
+ "windows-sys 0.60.2",
+]
+
 [[package]]
 name = "find-msvc-tools"
 version = "0.1.9"
@@ -3749,40 +4397,40 @@ checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
 
 [[package]]
 name = "firewheel"
-version = "0.9.4"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1146bdd48bf4c9a9d569aec8adc6e02181cab3459a3ab68fd13a7c4c446fcc66"
+checksum = "13200f66b692d5baac8b84d28fd4ea98787672a7096ccfc4b176290828a2cc37"
 dependencies = [
  "firewheel-core",
  "firewheel-cpal",
  "firewheel-graph",
  "firewheel-nodes",
  "firewheel-pool",
+ "firewheel-rtaudio",
+ "firewheel-symphonium",
  "thiserror 2.0.18",
 ]
 
 [[package]]
 name = "firewheel-core"
-version = "0.9.4"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb6648ce22d15743f658c2d1e416f654578ac94cb654bf526d317e8b98b1dc9d"
+checksum = "114eb9461df56bcffd808e8375919381e3e95d2ba6723b3ef09c33ebdc70d0fd"
 dependencies = [
  "arrayvec",
  "bevy_ecs",
  "bevy_platform",
  "bevy_reflect",
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "firewheel-macros",
- "fixed-resample",
  "glam 0.29.3",
  "glam 0.30.10",
- "log",
+ "glam 0.31.1",
  "num-traits",
  "portable-atomic",
  "ringbuf",
  "rtgc",
  "smallvec",
- "symphonium",
  "thiserror 2.0.18",
  "thunderdome",
  "wmidi",
@@ -3790,45 +4438,45 @@ dependencies = [
 
 [[package]]
 name = "firewheel-cpal"
-version = "0.9.4"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fba656f53192cc704a3149485741bde9dae7f7bb5144dd456e9f315bf707fc56"
+checksum = "14b9dba0b996dd16da0282bf73db4123cf630c9f31ec42c8896361069ddb4c69"
 dependencies = [
  "bevy_platform",
- "cpal 0.16.0",
+ "cpal 0.17.1",
  "fast-interleave",
  "firewheel-core",
  "firewheel-graph",
  "fixed-resample",
- "log",
  "ringbuf",
  "thiserror 2.0.18",
+ "tracing",
 ]
 
 [[package]]
 name = "firewheel-graph"
-version = "0.9.4"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca6572d3d543642920fe531d3394c7a9b47d58b90354b05718ae8881f995f53d"
+checksum = "50e0fbec6ce61420f55a2a80f81a413dece71c2761ee061ac02c4eb648959b72"
 dependencies = [
  "arrayvec",
  "bevy_platform",
  "bevy_reflect",
  "firewheel-core",
- "log",
  "num-traits",
  "ringbuf",
  "smallvec",
  "thiserror 2.0.18",
  "thunderdome",
+ "tracing",
  "triple_buffer",
 ]
 
 [[package]]
 name = "firewheel-ircam-hrtf"
-version = "0.2.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16ef3ba4e1f227a7247ddc94f5850324010ecf7ecf59ee3af5a2c9fcd326b744"
+checksum = "ee18a7c3cf7ef68ee7618d0400b2c32745cde75cbab61676b98179edd4588044"
 dependencies = [
  "bevy_ecs",
  "bevy_reflect",
@@ -3839,37 +4487,36 @@ dependencies = [
 
 [[package]]
 name = "firewheel-macros"
-version = "0.9.4"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4267f39e5142c59aea2dc1e619e6ff684137ce48417cd7889544894e5237048c"
+checksum = "b983faf1d4636812a2b39d77ffb922e06e1bc3b1f61b9a93a25120656ae85dd0"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
- "toml_edit",
+ "syn 2.0.117",
+ "toml_edit 0.23.10+spec-1.0.0",
 ]
 
 [[package]]
 name = "firewheel-nodes"
-version = "0.9.4"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b41622146fb72246d8998ec6b69c30fdd99e08f0a13d61d947dee2ed5a027f4"
+checksum = "de13025a997cd839a2eb589fb21764b1918ea4992964e0e3beb48fec49ef14e2"
 dependencies = [
  "bevy_ecs",
  "bevy_platform",
  "bevy_reflect",
  "firewheel-core",
- "fixed-resample",
  "num-traits",
  "smallvec",
 ]
 
 [[package]]
 name = "firewheel-pool"
-version = "0.9.4"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "659b1b36025a68dc973ceb048a524771dd7b0a1561e71f7e7ab790fe5ca6a8da"
+checksum = "e3012a67d43f3fbd837d52e56b5d82e1ad63970ec2005983e86b408f4659d1c0"
 dependencies = [
  "bevy_platform",
  "firewheel-core",
@@ -3880,6 +4527,32 @@ dependencies = [
  "thunderdome",
 ]
 
+[[package]]
+name = "firewheel-rtaudio"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32644b6ded19a443dc85b6542a26212bbebef5dcc6b3fa7feb83e5aff2621a33"
+dependencies = [
+ "bevy_platform",
+ "firewheel-core",
+ "firewheel-graph",
+ "ringbuf",
+ "rtaudio",
+ "tracing",
+]
+
+[[package]]
+name = "firewheel-symphonium"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4e69d91f25cc3f0997191c0af80f192a4d151806db235fbd1a80b58d01e61b6"
+dependencies = [
+ "bevy_platform",
+ "firewheel-core",
+ "fixed-resample",
+ "symphonium",
+]
+
 [[package]]
 name = "fixed-resample"
 version = "0.9.2"
@@ -3977,7 +4650,6 @@ version = "0.16.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3"
 dependencies = [
- "fontconfig-parser",
  "log",
  "memmap2",
  "slotmap",
@@ -3985,6 +4657,20 @@ dependencies = [
  "ttf-parser 0.20.0",
 ]
 
+[[package]]
+name = "fontdb"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "457e789b3d1202543297a350643cf459f836cade38934e7a4cf6a39e7cde2905"
+dependencies = [
+ "fontconfig-parser",
+ "log",
+ "memmap2",
+ "slotmap",
+ "tinyvec",
+ "ttf-parser 0.25.1",
+]
+
 [[package]]
 name = "foreign-types"
 version = "0.5.0"
@@ -4003,7 +4689,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -4021,26 +4707,35 @@ dependencies = [
  "percent-encoding",
 ]
 
+[[package]]
+name = "fsevent-sys"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "futures-channel"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
+checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d"
 dependencies = [
  "futures-core",
 ]
 
 [[package]]
 name = "futures-core"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d"
 
 [[package]]
 name = "futures-io"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718"
 
 [[package]]
 name = "futures-lite"
@@ -4055,22 +4750,33 @@ dependencies = [
  "pin-project-lite",
 ]
 
+[[package]]
+name = "futures-macro"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+
 [[package]]
 name = "futures-task"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393"
 
 [[package]]
 name = "futures-util"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
+checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6"
 dependencies = [
  "futures-core",
+ "futures-macro",
  "futures-task",
  "pin-project-lite",
- "pin-utils",
  "slab",
 ]
 
@@ -4083,6 +4789,16 @@ dependencies = [
  "thread_local",
 ]
 
+[[package]]
+name = "generational-box"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc4ed190b9de8e734d47a70be59b1e7588b9e8e0d0036e332f4c014e8aed1bc5"
+dependencies = [
+ "parking_lot 0.12.5",
+ "tracing",
+]
+
 [[package]]
 name = "generic-array"
 version = "0.14.7"
@@ -4111,6 +4827,26 @@ dependencies = [
  "spade",
 ]
 
+[[package]]
+name = "geo"
+version = "0.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f3901269ec6d4f6068d3f09e5f02f995bd076398dcd1dfec407cd230b02d11b"
+dependencies = [
+ "earcutr",
+ "float_next_after",
+ "geo-types",
+ "geographiclib-rs",
+ "i_overlay",
+ "log",
+ "num-traits",
+ "rand 0.8.5",
+ "robust",
+ "rstar",
+ "sif-itree",
+ "spade",
+]
+
 [[package]]
 name = "geo-types"
 version = "0.7.18"
@@ -4126,9 +4862,9 @@ dependencies = [
 
 [[package]]
 name = "geographiclib-rs"
-version = "0.2.5"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f611040a2bb37eaa29a78a128d1e92a378a03e0b6e66ae27398d42b1ba9a7841"
+checksum = "c5a7f08910fd98737a6eda7568e7c5e645093e073328eeef49758cfe8b0489c7"
 dependencies = [
  "libm",
 ]
@@ -4139,10 +4875,21 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1bd49230192a3797a9a4d6abe9b3eed6f7fa4c8a8a4947977c6f80025f92cbd8"
 dependencies = [
- "rustix 1.1.3",
+ "rustix 1.1.4",
  "windows-link 0.2.1",
 ]
 
+[[package]]
+name = "getrandom"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.3.4"
@@ -4152,11 +4899,25 @@ dependencies = [
  "cfg-if",
  "js-sys",
  "libc",
- "r-efi",
+ "r-efi 5.3.0",
  "wasip2",
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "getrandom"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi 6.0.0",
+ "rand_core 0.10.0",
+ "wasip2",
+ "wasip3",
+]
+
 [[package]]
 name = "gilrs"
 version = "0.11.1"
@@ -4166,7 +4927,7 @@ dependencies = [
  "fnv",
  "gilrs-core",
  "log",
- "uuid 1.20.0",
+ "uuid 1.22.0",
  "vec_map",
 ]
 
@@ -4181,10 +4942,10 @@ dependencies = [
  "libc",
  "libudev-sys",
  "log",
- "nix",
+ "nix 0.30.1",
  "objc2-core-foundation",
  "objc2-io-kit",
- "uuid 1.20.0",
+ "uuid 1.22.0",
  "vec_map",
  "wasm-bindgen",
  "web-sys",
@@ -4300,16 +5061,23 @@ checksum = "19fc433e8437a212d1b6f1e68c7824af3aed907da60afa994e7f542d18d12aa9"
 dependencies = [
  "approx",
  "bytemuck",
+ "encase",
  "libm",
- "rand",
+ "rand 0.9.2",
  "serde_core",
 ]
 
+[[package]]
+name = "glam"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "556f6b2ea90b8d15a74e0e7bb41671c9bdf38cd9f78c284d750b9ce58a2b5be7"
+
 [[package]]
 name = "glam_matrix_extras"
-version = "0.1.1"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6cb141d04d0bbebc52c325352ae0c930a6d42c77ccd02b7c591a73bd7bc1d859"
+checksum = "c4664468a60479272b880a8bfc00ad2915229b93d2b2d585556fb33f9ba80e72"
 dependencies = [
  "bevy_reflect",
  "glam 0.30.10",
@@ -4339,10 +5107,13 @@ version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3ce1918195723ce6ac74e80542c5a96a40c2b26162c1957a5cd70799b8cacf7"
 dependencies = [
+ "base64 0.13.1",
  "byteorder",
  "gltf-json",
+ "image",
  "lazy_static",
  "serde_json",
+ "urlencoding",
 ]
 
 [[package]]
@@ -4354,7 +5125,7 @@ dependencies = [
  "inflections",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -4384,7 +5155,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "gpu-alloc-types",
 ]
 
@@ -4394,7 +5165,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
 ]
 
 [[package]]
@@ -4415,7 +5186,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b89c83349105e3732062a895becfc71a8f921bb71ecbbdd8ff99263e3b53a0ca"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "gpu-descriptor-types",
  "hashbrown 0.15.5",
 ]
@@ -4426,14 +5197,14 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
 ]
 
 [[package]]
 name = "grid"
-version = "0.15.0"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36119f3a540b086b4e436bb2b588cf98a68863470e0e880f4d0842f112a3183a"
+checksum = "f9e2d4c0a8296178d8802098410ca05d86b17a10bb5ab559b3fb404c1f948220"
 
 [[package]]
 name = "guillotiere"
@@ -4457,6 +5228,19 @@ dependencies = [
  "zerocopy",
 ]
 
+[[package]]
+name = "harfrust"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0caaee032384c10dd597af4579c67dee16650d862a9ccbe1233ff1a379abc07"
+dependencies = [
+ "bitflags 2.11.0",
+ "bytemuck",
+ "core_maths",
+ "read-fonts 0.36.0",
+ "smallvec",
+]
+
 [[package]]
 name = "hash32"
 version = "0.3.1"
@@ -4496,6 +5280,16 @@ name = "heapless"
 version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad"
+dependencies = [
+ "hash32",
+ "stable_deref_trait",
+]
+
+[[package]]
+name = "heapless"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2af2455f757db2b292a9b1768c4b70186d443bcb3b316252d6b540aec1cd89ed"
 dependencies = [
  "hash32",
  "portable-atomic",
@@ -4657,6 +5451,30 @@ version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "35e6d558e6d4c7b82bc51d9c771e7a927862a161a7d87bf2b0541450e0e20915"
 
+[[package]]
+name = "iana-time-zone"
+version = "0.1.65"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "log",
+ "wasm-bindgen",
+ "windows-core 0.62.2",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "icu_collections"
 version = "2.1.1"
@@ -4817,9 +5635,15 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
 ]
 
+[[package]]
+name = "id-arena"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
+
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -4849,9 +5673,9 @@ dependencies = [
 
 [[package]]
 name = "image"
-version = "0.25.9"
+version = "0.25.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6506c6c10786659413faa717ceebcb8f70731c0a60cbae39795fdf114519c1a"
+checksum = "85ab80394333c02fe689eaf900ab500fbd0c2213da414687ebf995a65d5a6104"
 dependencies = [
  "bytemuck",
  "byteorder-lite",
@@ -4859,6 +5683,8 @@ dependencies = [
  "num-traits",
  "png",
  "tiff",
+ "zune-core",
+ "zune-jpeg",
 ]
 
 [[package]]
@@ -4890,11 +5716,11 @@ checksum = "a257582fdcde896fd96463bf2d40eefea0580021c0712a0e2b028b60b47a837a"
 
 [[package]]
 name = "inotify"
-version = "0.11.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3"
+checksum = "bd5b3eaf1a28b758ac0faa5a4254e8ab2705605496f1b1f3fbbc3988ad73d199"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "inotify-sys",
  "libc",
 ]
@@ -4918,7 +5744,7 @@ dependencies = [
  "indoc",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -4935,9 +5761,9 @@ dependencies = [
 
 [[package]]
 name = "inventory"
-version = "0.3.21"
+version = "0.3.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc61209c082fbeb19919bee74b176221b27223e27b65d781eb91af24eb1fb46e"
+checksum = "009ae045c87e7082cb72dab0ccd01ae075dd00141ddc108f43a0ea150a9e7227"
 dependencies = [
  "rustversion",
 ]
@@ -5008,34 +5834,83 @@ dependencies = [
  "cesu8",
  "cfg-if",
  "combine",
- "jni-sys",
+ "jni-sys 0.3.0",
  "log",
  "thiserror 1.0.69",
  "walkdir",
  "windows-sys 0.45.0",
 ]
 
+[[package]]
+name = "jni"
+version = "0.22.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "295dc9997acda1562fdf8d299f56063c936443b60f078e63a5d8d3c34ef2642b"
+dependencies = [
+ "cfg-if",
+ "combine",
+ "jni-macros",
+ "jni-sys 0.4.1",
+ "log",
+ "simd_cesu8",
+ "thiserror 2.0.18",
+ "walkdir",
+ "windows-link 0.2.1",
+]
+
+[[package]]
+name = "jni-macros"
+version = "0.22.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c3d1da60c95c98847b26b9d45f4360fee718b31de746df016d9cd6de916a7ef"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "rustc_version",
+ "simd_cesu8",
+ "syn 2.0.117",
+]
+
 [[package]]
 name = "jni-sys"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
 
+[[package]]
+name = "jni-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6377a88cb3910bee9b0fa88d4f42e1d2da8e79915598f65fb0c7ee14c878af2"
+dependencies = [
+ "jni-sys-macros",
+]
+
+[[package]]
+name = "jni-sys-macros"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264"
+dependencies = [
+ "quote",
+ "syn 2.0.117",
+]
+
 [[package]]
 name = "jobserver"
 version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
 dependencies = [
- "getrandom",
+ "getrandom 0.3.4",
  "libc",
 ]
 
 [[package]]
 name = "js-sys"
-version = "0.3.85"
+version = "0.3.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c942ebf8e95485ca0d52d97da7c5a2c387d0e7f0ba4c35e93bfcaee045955b3"
+checksum = "b49715b7073f385ba4bc528e5747d02e66cb39c6146efb66b781f131f0fb399c"
 dependencies = [
  "once_cell",
  "wasm-bindgen",
@@ -5078,13 +5953,33 @@ version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
 
+[[package]]
+name = "kqueue"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eac30106d7dce88daf4a3fcb4879ea939476d5074a9b7ddd0fb97fa4bed5596a"
+dependencies = [
+ "kqueue-sys",
+ "libc",
+]
+
+[[package]]
+name = "kqueue-sys"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b"
+dependencies = [
+ "bitflags 1.3.2",
+ "libc",
+]
+
 [[package]]
 name = "ktx2"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff7f53bdf698e7aa7ec916411bbdc8078135da11b66db5182675b2227f6c0d07"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
 ]
 
 [[package]]
@@ -5095,7 +5990,7 @@ checksum = "f6a89496cbf307f53baa9d6a33e9d1eaa461452afb67e9c59ebc6b9a6a0cf28c"
 dependencies = [
  "disjoint",
  "dodgy_2d",
- "geo",
+ "geo 0.31.0",
  "glam 0.30.10",
  "kdtree",
  "slotmap",
@@ -5104,9 +5999,9 @@ dependencies = [
 
 [[package]]
 name = "landmass_rerecast"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f2a013115cf28749f915f886c14fe4de31ecf385604d31472e83fa84e4e677a"
+checksum = "7c5a5062ce86cd41d252d93154cb1557279d61c4c543cdf0c579ffe296c9d41f"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -5124,6 +6019,12 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
+[[package]]
+name = "leb128fmt"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
+
 [[package]]
 name = "lewton"
 version = "0.10.2"
@@ -5135,11 +6036,20 @@ dependencies = [
  "tinyvec",
 ]
 
+[[package]]
+name = "libabort"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cec5d1db7977801dd3e593f88a15906cac3c4eb7a69e38b6cc162cb020b22d7d"
+dependencies = [
+ "rustversion-detect",
+]
+
 [[package]]
 name = "libc"
-version = "0.2.180"
+version = "0.2.183"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc"
+checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d"
 
 [[package]]
 name = "libloading"
@@ -5159,13 +6069,14 @@ checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
 
 [[package]]
 name = "libredox"
-version = "0.1.12"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d0b95e02c851351f877147b7deea7b1afb1df71b63aa5f8270716e0c5720616"
+checksum = "1744e39d1d6a9948f4f388969627434e31128196de472883b39f148769bfe30a"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "libc",
- "redox_syscall 0.7.0",
+ "plain",
+ "redox_syscall 0.7.3",
 ]
 
 [[package]]
@@ -5184,9 +6095,15 @@ version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f4de44e98ddbf09375cbf4d17714d18f39195f4f4894e8524501726fd9a8a4a"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
 ]
 
+[[package]]
+name = "linebender_resource_handle"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4a5ff6bcca6c4867b1c4fd4ef63e4db7436ef363e0ad7531d1558856bae64f4"
+
 [[package]]
 name = "linux-raw-sys"
 version = "0.4.15"
@@ -5195,9 +6112,9 @@ checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.11.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
+checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
 
 [[package]]
 name = "litemap"
@@ -5232,6 +6149,12 @@ version = "0.4.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
 
+[[package]]
+name = "longest-increasing-subsequence"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3bd0dd2cd90571056fdb71f6275fada10131182f84899f4b2a916e565d81d86"
+
 [[package]]
 name = "louds-rs"
 version = "0.7.0"
@@ -5259,6 +6182,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "mach2"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a1b95cd5421ec55b445b5ae102f5ea0e768de1f82bd3001e11f426c269c3aea"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "malloc_buf"
 version = "0.0.6"
@@ -5289,15 +6221,24 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.7.6"
+version = "2.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
+
+[[package]]
+name = "memfd"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
+checksum = "ad38eb12aea514a0466ea40a80fd8cc83637065948eb4a426e4aa46261175227"
+dependencies = [
+ "rustix 1.1.4",
+]
 
 [[package]]
 name = "memmap2"
-version = "0.9.9"
+version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "744133e4a0e0a658e1374cf3bf8e415c4052a15a111acd372764c55b4177d490"
+checksum = "714098028fe011992e1c3962653c96b2d578c4b4bce9036e15ff220319b1e0e3"
 dependencies = [
  "libc",
 ]
@@ -5308,7 +6249,7 @@ version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "00c15a6f673ff72ddcc22394663290f870fb224c1bfce55734a75c414150e605"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "block",
  "core-graphics-types 0.2.0",
  "foreign-types",
@@ -5339,11 +6280,23 @@ dependencies = [
  "simd-adler32",
 ]
 
+[[package]]
+name = "mio"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc"
+dependencies = [
+ "libc",
+ "log",
+ "wasi",
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "moxcms"
-version = "0.7.11"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac9557c559cd6fc9867e122e20d2cbefc9ca29d80d027a8e39310920ed2f0a97"
+checksum = "bb85c154ba489f01b25c0d36ae69a87e4a1c73a72631fc6c0eb6dde34a73e44b"
 dependencies = [
  "num-traits",
  "pxfm",
@@ -5360,18 +6313,18 @@ dependencies = [
 
 [[package]]
 name = "naga"
-version = "26.0.0"
+version = "27.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "916cbc7cb27db60be930a4e2da243cf4bc39569195f22fd8ee419cd31d5b662c"
+checksum = "066cf25f0e8b11ee0df221219010f213ad429855f57c494f995590c861a9a7d8"
 dependencies = [
  "arrayvec",
  "bit-set 0.8.0",
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "cfg-if",
  "cfg_aliases",
  "codespan-reporting",
  "half",
- "hashbrown 0.15.5",
+ "hashbrown 0.16.1",
  "hexf-parse",
  "indexmap",
  "libm",
@@ -5387,9 +6340,9 @@ dependencies = [
 
 [[package]]
 name = "naga_oil"
-version = "0.19.1"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b586d3cf5c9b7e13fe2af6e114406ff70773fd80881960378933b63e76f37dd"
+checksum = "310c347db1b30e69581f3b84dc9a5c311ed583f67851b39b77953cb7a066c97f"
 dependencies = [
  "codespan-reporting",
  "data-encoding",
@@ -5442,7 +6395,7 @@ checksum = "973e7178a678cfd059ccec50887658d482ce16b0aa9da3888ddeab5cd5eb4889"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -5451,8 +6404,8 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7"
 dependencies = [
- "bitflags 2.10.0",
- "jni-sys",
+ "bitflags 2.11.0",
+ "jni-sys 0.3.0",
  "log",
  "ndk-sys 0.5.0+25.2.9519653",
  "num_enum",
@@ -5465,8 +6418,8 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
 dependencies = [
- "bitflags 2.10.0",
- "jni-sys",
+ "bitflags 2.11.0",
+ "jni-sys 0.3.0",
  "log",
  "ndk-sys 0.6.0+11769913",
  "num_enum",
@@ -5486,7 +6439,7 @@ version = "0.5.0+25.2.9519653"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691"
 dependencies = [
- "jni-sys",
+ "jni-sys 0.3.0",
 ]
 
 [[package]]
@@ -5495,7 +6448,7 @@ version = "0.6.0+11769913"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873"
 dependencies = [
- "jni-sys",
+ "jni-sys 0.3.0",
 ]
 
 [[package]]
@@ -5504,12 +6457,33 @@ version = "0.30.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+]
+
+[[package]]
+name = "nix"
+version = "0.31.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d6d0705320c1e6ba1d912b5e37cf18071b6c2e9b7fa8215a1e8a7651966f5d3"
+dependencies = [
+ "bitflags 2.11.0",
  "cfg-if",
  "cfg_aliases",
  "libc",
 ]
 
+[[package]]
+name = "no-std-compat"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c"
+dependencies = [
+ "spin 0.5.2",
+]
+
 [[package]]
 name = "nohash-hasher"
 version = "0.2.0"
@@ -5550,11 +6524,51 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
+[[package]]
+name = "notify"
+version = "8.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3"
+dependencies = [
+ "bitflags 2.11.0",
+ "fsevent-sys",
+ "inotify",
+ "kqueue",
+ "libc",
+ "log",
+ "mio",
+ "notify-types",
+ "walkdir",
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "notify-debouncer-full"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "375bd3a138be7bfeff3480e4a623df4cbfb55b79df617c055cd810ba466fa078"
+dependencies = [
+ "file-id",
+ "log",
+ "notify",
+ "notify-types",
+ "walkdir",
+]
+
+[[package]]
+name = "notify-types"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42b8cfee0e339a0337359f3c88165702ac6e600dc01c0cc9579a92d62b08477a"
+dependencies = [
+ "bitflags 2.11.0",
+]
+
 [[package]]
 name = "ntapi"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c70f219e21142367c70c0b30c6a9e3a14d55b4d12a204d897fbec83a0363f081"
+checksum = "c3b335231dfd352ffb0f8017f3b6027a4917f7df785ea2143d8af2adc66980ae"
 dependencies = [
  "winapi",
 ]
@@ -5601,7 +6615,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -5653,7 +6667,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -5683,9 +6697,9 @@ dependencies = [
 
 [[package]]
 name = "objc2"
-version = "0.6.3"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7c2599ce0ec54857b29ce62166b0ed9b4f6f1a70ccc9a71165b6154caca8c05"
+checksum = "3a12a8ed07aefc768292f076dc3ac8c48f3781c8f2d5851dd3d98950e8c5a89f"
 dependencies = [
  "objc2-encode",
 ]
@@ -5696,7 +6710,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "block2 0.5.1",
  "libc",
  "objc2 0.5.2",
@@ -5712,8 +6726,8 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"
 dependencies = [
- "bitflags 2.10.0",
- "objc2 0.6.3",
+ "bitflags 2.11.0",
+ "objc2 0.6.4",
  "objc2-core-graphics",
  "objc2-foundation 0.3.2",
 ]
@@ -5724,22 +6738,32 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6948501a91121d6399b79abaa33a8aa4ea7857fe019f341b8c23ad6e81b79b08"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "libc",
- "objc2 0.6.3",
+ "objc2 0.6.4",
  "objc2-core-audio",
  "objc2-core-audio-types",
  "objc2-core-foundation",
  "objc2-foundation 0.3.2",
 ]
 
+[[package]]
+name = "objc2-avf-audio"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13a380031deed8e99db00065c45937da434ca987c034e13b87e4441f9e4090be"
+dependencies = [
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.2",
+]
+
 [[package]]
 name = "objc2-cloud-kit"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-core-location",
@@ -5764,9 +6788,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1eebcea8b0dbff5f7c8504f3107c68fc061a3eb44932051c8cf8a68d969c3b2"
 dependencies = [
  "dispatch2",
- "objc2 0.6.3",
+ "objc2 0.6.4",
  "objc2-core-audio-types",
  "objc2-core-foundation",
+ "objc2-foundation 0.3.2",
 ]
 
 [[package]]
@@ -5775,8 +6800,8 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a89f2ec274a0cf4a32642b2991e8b351a404d290da87bb6a9a9d8632490bd1c"
 dependencies = [
- "bitflags 2.10.0",
- "objc2 0.6.3",
+ "bitflags 2.11.0",
+ "objc2 0.6.4",
 ]
 
 [[package]]
@@ -5785,7 +6810,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation 0.2.2",
@@ -5797,9 +6822,11 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
+ "block2 0.6.2",
  "dispatch2",
- "objc2 0.6.3",
+ "libc",
+ "objc2 0.6.4",
 ]
 
 [[package]]
@@ -5808,9 +6835,9 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "dispatch2",
- "objc2 0.6.3",
+ "objc2 0.6.4",
  "objc2-core-foundation",
  "objc2-io-surface",
 ]
@@ -5851,7 +6878,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "block2 0.5.1",
  "dispatch",
  "libc",
@@ -5864,8 +6891,10 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"
 dependencies = [
- "bitflags 2.10.0",
- "objc2 0.6.3",
+ "bitflags 2.11.0",
+ "block2 0.6.2",
+ "libc",
+ "objc2 0.6.4",
  "objc2-core-foundation",
 ]
 
@@ -5875,7 +6904,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33fafba39597d6dc1fb709123dfa8289d39406734be322956a69f0931c73bb15"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "libc",
  "objc2-core-foundation",
 ]
@@ -5886,8 +6915,8 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d"
 dependencies = [
- "bitflags 2.10.0",
- "objc2 0.6.3",
+ "bitflags 2.11.0",
+ "objc2 0.6.4",
  "objc2-core-foundation",
 ]
 
@@ -5909,7 +6938,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation 0.2.2",
@@ -5921,7 +6950,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation 0.2.2",
@@ -5944,7 +6973,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-cloud-kit",
@@ -5976,7 +7005,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-core-location",
@@ -5989,7 +7018,7 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7954d36bcb6c14c5e0de867fb"
 dependencies = [
- "jni",
+ "jni 0.21.1",
  "ndk 0.8.0",
  "ndk-context",
  "num-derive",
@@ -6027,9 +7056,12 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.21.3"
+version = "1.21.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
+dependencies = [
+ "portable-atomic",
+]
 
 [[package]]
 name = "once_cell_polyfill"
@@ -6050,23 +7082,14 @@ dependencies = [
 
 [[package]]
 name = "orbclient"
-version = "0.3.50"
+version = "0.3.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52ad2c6bae700b7aa5d1cc30c59bdd3a1c180b09dbaea51e2ae2b8e1cf211fdd"
+checksum = "59aed3b33578edcfa1bc96a321d590d31832b6ad55a26f0313362ce687e9abd6"
 dependencies = [
  "libc",
  "libredox",
 ]
 
-[[package]]
-name = "ordered-float"
-version = "4.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bb71e1b3fa6ca1c61f383464aaf2bb0e2f8e772a1f01d486832464de363b951"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "ordered-float"
 version = "5.1.0"
@@ -6147,7 +7170,7 @@ checksum = "e99471b7b6870f7fe406d5611dd4b4c9b07aa3e5436b1d27e1515f9832bb0c6b"
 dependencies = [
  "approx",
  "arrayvec",
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "downcast-rs 2.0.2",
  "either",
  "ena",
@@ -6157,7 +7180,7 @@ dependencies = [
  "nalgebra",
  "num-derive",
  "num-traits",
- "ordered-float 5.1.0",
+ "ordered-float",
  "rayon",
  "rstar",
  "simba",
@@ -6176,7 +7199,7 @@ checksum = "38fe282b81b60a2aee7f24db25ea73b3c82f6451888eeb5936b621adb87aa653"
 dependencies = [
  "approx",
  "arrayvec",
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "downcast-rs 2.0.2",
  "either",
  "ena",
@@ -6186,7 +7209,7 @@ dependencies = [
  "nalgebra",
  "num-derive",
  "num-traits",
- "ordered-float 5.1.0",
+ "ordered-float",
  "rayon",
  "rstar",
  "simba",
@@ -6229,29 +7252,29 @@ dependencies = [
 
 [[package]]
 name = "pin-project"
-version = "1.1.10"
+version = "1.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a"
+checksum = "f1749c7ed4bcaf4c3d0a3efc28538844fb29bcdd7d2b67b2be7e20ba861ff517"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.10"
+version = "1.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
+checksum = "d9b20ed30f105399776b9c883e68e536ef602a16ae6f596d2c473591d6ad64c6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
+checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
 
 [[package]]
 name = "pin-utils"
@@ -6261,9 +7284,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "piper"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
+checksum = "c835479a4443ded371d6c535cbfd8d31ad92c5d23ae9770a61bc155e4992a3c1"
 dependencies = [
  "atomic-waker",
  "fastrand",
@@ -6276,13 +7299,19 @@ version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
 
+[[package]]
+name = "plain"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
+
 [[package]]
 name = "png"
-version = "0.18.0"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97baced388464909d42d89643fe4361939af9b7ce7a31ee32a168f832a70f2a0"
+checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "crc32fast",
  "fdeflate",
  "flate2",
@@ -6299,18 +7328,18 @@ dependencies = [
  "concurrent-queue",
  "hermit-abi",
  "pin-project-lite",
- "rustix 1.1.3",
+ "rustix 1.1.4",
  "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "polyanya"
-version = "0.15.1"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22713b3da62cf8ce45e53e0e10c4012cb87381216b6fd921f57850cf4b0c0aea"
+checksum = "9a1cb0a84a11080ff93d943a023e9e386c34d3dcc3c988bc6785f990b1964277"
 dependencies = [
  "bvh2d",
- "geo",
+ "geo 0.32.0",
  "glam 0.30.10",
  "hashbrown 0.16.1",
  "log",
@@ -6374,6 +7403,16 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa"
 
+[[package]]
+name = "prettyplease"
+version = "0.2.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
+dependencies = [
+ "proc-macro2",
+ "syn 2.0.117",
+]
+
 [[package]]
 name = "primal-check"
 version = "0.3.4"
@@ -6385,11 +7424,11 @@ dependencies = [
 
 [[package]]
 name = "proc-macro-crate"
-version = "3.4.0"
+version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983"
+checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f"
 dependencies = [
- "toml_edit",
+ "toml_edit 0.25.4+spec-1.1.0",
 ]
 
 [[package]]
@@ -6435,7 +7474,7 @@ dependencies = [
  "proc-macro-error-attr2",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -6452,6 +7491,19 @@ name = "profiling"
 version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3eb8486b569e12e2c32ad3e204dbaba5e4b5b216e9367044f25f1dba42341773"
+dependencies = [
+ "profiling-procmacros",
+]
+
+[[package]]
+name = "profiling-procmacros"
+version = "1.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52717f9a02b6965224f95ca2a81e2e0c5c43baacd28ca057577988930b6c3d5b"
+dependencies = [
+ "quote",
+ "syn 2.0.117",
+]
 
 [[package]]
 name = "prost"
@@ -6473,17 +7525,14 @@ dependencies = [
  "itertools 0.12.1",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "pxfm"
-version = "0.1.27"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7186d3822593aa4393561d186d1393b3923e9d6163d3fbfd6e825e3e6cf3e6a8"
-dependencies = [
- "num-traits",
-]
+checksum = "b5a041e753da8b807c9255f28de81879c78c876392ff2469cde94799b2896b9d"
 
 [[package]]
 name = "quick-error"
@@ -6493,18 +7542,18 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
 
 [[package]]
 name = "quick-xml"
-version = "0.38.4"
+version = "0.39.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b66c2058c55a409d601666cffe35f04333cf1013010882cec174a7467cd4e21c"
+checksum = "958f21e8e7ceb5a1aa7fa87fab28e7c75976e0bfe7e23ff069e0a260f894067d"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.44"
+version = "1.0.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4"
+checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
 dependencies = [
  "proc-macro2",
 ]
@@ -6515,20 +7564,58 @@ version = "5.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
 
+[[package]]
+name = "r-efi"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
+
 [[package]]
 name = "radsort"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "019b4b213425016d7d84a153c4c73afb0946fbb4840e4eece7ba8848b9d6da22"
 
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
+]
+
 [[package]]
 name = "rand"
 version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
 dependencies = [
- "rand_chacha",
- "rand_core",
+ "rand_chacha 0.9.0",
+ "rand_core 0.9.5",
+]
+
+[[package]]
+name = "rand"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc266eb313df6c5c09c1c7b1fbe2510961e5bcd3add930c1e31f7ed9da0feff8"
+dependencies = [
+ "chacha20",
+ "getrandom 0.4.2",
+ "rand_core 0.10.0",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.6.4",
 ]
 
 [[package]]
@@ -6538,7 +7625,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
 dependencies = [
  "ppv-lite86",
- "rand_core",
+ "rand_core 0.9.5",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom 0.2.17",
 ]
 
 [[package]]
@@ -6547,9 +7643,15 @@ version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
 dependencies = [
- "getrandom",
+ "getrandom 0.3.4",
 ]
 
+[[package]]
+name = "rand_core"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c8d0fd677905edcbeedbf2edb6494d676f0e98d54d5cf9bda0b061cb8fb8aba"
+
 [[package]]
 name = "rand_distr"
 version = "0.5.1"
@@ -6557,7 +7659,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8615d50dcf34fa31f7ab52692afec947c4dd0ab803cc87cb3b0b4570ff7463"
 dependencies = [
  "num-traits",
- "rand",
+ "rand 0.9.2",
 ]
 
 [[package]]
@@ -6566,14 +7668,14 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b48ac3f7ffaab7fac4d2376632268aa5f89abdb55f7ebf8f4d11fffccb2320f7"
 dependencies = [
- "rand_core",
+ "rand_core 0.9.5",
 ]
 
 [[package]]
 name = "range-alloc"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d6831663a5098ea164f89cff59c6284e95f4e3c76ce9848d4529f5ccca9bde"
+checksum = "ca45419789ae5a7899559e9512e58ca889e41f04f1f2445e9f4b290ceccd1d08"
 
 [[package]]
 name = "rangemap"
@@ -6581,6 +7683,15 @@ version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "973443cf09a9c8656b574a866ab68dfa19f0867d0340648c7d2f6a71b8a8ea68"
 
+[[package]]
+name = "rapidhash"
+version = "4.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5e48930979c155e2f33aa36ab3119b5ee81332beb6482199a8ecd6029b80b59"
+dependencies = [
+ "rustversion",
+]
+
 [[package]]
 name = "ratatui"
 version = "0.30.0"
@@ -6598,14 +7709,14 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5ef8dea09a92caaf73bff7adb70b76162e5937524058a7e5bff37869cbbec293"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "compact_str",
  "hashbrown 0.16.1",
  "indoc",
  "itertools 0.14.0",
  "kasuari",
  "lru",
- "strum",
+ "strum 0.27.2",
  "thiserror 2.0.18",
  "unicode-segmentation",
  "unicode-truncate",
@@ -6618,14 +7729,14 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d7dbfa023cd4e604c2553483820c5fe8aa9d71a42eea5aa77c6e7f35756612db"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "hashbrown 0.16.1",
  "indoc",
  "instability",
  "itertools 0.14.0",
  "line-clipping",
  "ratatui-core",
- "strum",
+ "strum 0.27.2",
  "time",
  "unicode-segmentation",
  "unicode-width 0.2.2",
@@ -6673,6 +7784,17 @@ dependencies = [
  "font-types",
 ]
 
+[[package]]
+name = "read-fonts"
+version = "0.36.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5eaa2941a4c05443ee3a7b26ab076a553c343ad5995230cc2b1d3e993bdc6345"
+dependencies = [
+ "bytemuck",
+ "core_maths",
+ "font-types",
+]
+
 [[package]]
 name = "realfft"
 version = "3.5.0"
@@ -6712,16 +7834,16 @@ version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
 ]
 
 [[package]]
 name = "redox_syscall"
-version = "0.7.0"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f3fe0889e69e2ae9e41f4d6c4c0181701d00e4697b356fb1f74173a5e0ee27"
+checksum = "6ce70a74e890531977d37e532c34d45e9055d2409ed08ddba14529471ed0be16"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
 ]
 
 [[package]]
@@ -6749,9 +7871,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.9"
+version = "0.8.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a96887878f22d7bad8a3b6dc5b7440e0ada9a245242924394987b21cf2210a4c"
+checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"
 
 [[package]]
 name = "renderdoc-sys"
@@ -6761,13 +7883,13 @@ checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832"
 
 [[package]]
 name = "rerecast"
-version = "0.2.0"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291c39a5bfe61b695f4737fb1faf5692421aca9afe7852254b83610776bcfff5"
+checksum = "dd207dd0644bd506d8017195865d72274dae648923596438255a0da00836f548"
 dependencies = [
  "anyhow",
  "bevy_reflect",
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "glam 0.30.10",
  "serde",
  "slotmap",
@@ -6775,6 +7897,35 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "rhai"
+version = "1.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f9ef5dabe4c0b43d8f1187dc6beb67b53fe607fff7e30c5eb7f71b814b8c2c1"
+dependencies = [
+ "ahash",
+ "bitflags 2.11.0",
+ "no-std-compat",
+ "num-traits",
+ "once_cell",
+ "rhai_codegen",
+ "smallvec",
+ "smartstring",
+ "thin-vec",
+ "web-time",
+]
+
+[[package]]
+name = "rhai_codegen"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4322a2a4e8cf30771dd9f27f7f37ca9ac8fe812dddd811096a98483080dabe6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+
 [[package]]
 name = "ringbuf"
 version = "0.4.8"
@@ -6809,19 +7960,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94"
 dependencies = [
  "base64 0.21.7",
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "serde",
  "serde_derive",
 ]
 
 [[package]]
 name = "ron"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "beceb6f7bf81c73e73aeef6dd1356d9a1b2b4909e1f0fc3e59b034f9572d7b7f"
+checksum = "db09040cc89e461f1a265139777a2bde7f8d8c67c4936f700c63ce3e2904d468"
 dependencies = [
  "base64 0.22.1",
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "serde",
  "serde_derive",
  "unicode-ident",
@@ -6829,14 +7980,15 @@ dependencies = [
 
 [[package]]
 name = "ron"
-version = "0.11.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db09040cc89e461f1a265139777a2bde7f8d8c67c4936f700c63ce3e2904d468"
+checksum = "fd490c5b18261893f14449cbd28cb9c0b637aebf161cd77900bfdedaff21ec32"
 dependencies = [
- "base64 0.22.1",
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
+ "once_cell",
  "serde",
  "serde_derive",
+ "typeid",
  "unicode-ident",
 ]
 
@@ -6852,16 +8004,38 @@ version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "421400d13ccfd26dfa5858199c30a5d76f9c54e0dba7575273025b43c5175dbb"
 dependencies = [
- "heapless",
+ "heapless 0.8.0",
  "num-traits",
  "smallvec",
 ]
 
+[[package]]
+name = "rtaudio"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7384a8837efe4abea0e53f3887b5072cbbd1ee95c298cff4fbd7a9f3ff23a48b"
+dependencies = [
+ "bitflags 2.11.0",
+ "rtaudio-sys",
+ "thiserror 2.0.18",
+ "tracing",
+]
+
+[[package]]
+name = "rtaudio-sys"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "931ec9a72c48e96e8e2f9868aef1d4e452723354779d01159f7399647427b57b"
+dependencies = [
+ "cmake",
+ "pkg-config",
+]
+
 [[package]]
 name = "rtgc"
-version = "0.2.4"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ff37e188d26f62b595065458583a6a7101a52343b112c10a2b277e7a490247d"
+checksum = "91957a630a24c9d05d1a841d2a02d12ebf261f075fa204c5f3879a922b86db09"
 dependencies = [
  "bevy_platform",
 ]
@@ -6931,7 +8105,7 @@ version = "0.38.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "errno",
  "libc",
  "linux-raw-sys 0.4.15",
@@ -6940,14 +8114,14 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "1.1.3"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34"
+checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "errno",
  "libc",
- "linux-raw-sys 0.11.0",
+ "linux-raw-sys 0.12.1",
  "windows-sys 0.61.2",
 ]
 
@@ -6957,13 +8131,19 @@ version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
 
+[[package]]
+name = "rustversion-detect"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cfa9e87e97427c3a1b472eace073b2bc577ad0e1444c128d938b3d5bcdacb17"
+
 [[package]]
 name = "rustybuzz"
 version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cfb9cf8877777222e4a3bc7eb247e398b56baba500c38c1c46842431adc8b55c"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "bytemuck",
  "libm",
  "smallvec",
@@ -6985,9 +8165,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.22"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a50f4cf475b65d88e057964e0e9bb1f0aa9bbb2036dc65c64596b42932536984"
+checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f"
 
 [[package]]
 name = "safe_arch"
@@ -7077,7 +8257,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -7093,6 +8273,17 @@ dependencies = [
  "zmij",
 ]
 
+[[package]]
+name = "sha1"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
+dependencies = [
+ "cfg-if",
+ "cpufeatures 0.2.17",
+ "digest",
+]
+
 [[package]]
 name = "sha2"
 version = "0.10.9"
@@ -7100,7 +8291,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
 dependencies = [
  "cfg-if",
- "cpufeatures",
+ "cpufeatures 0.2.17",
  "digest",
 ]
 
@@ -7119,6 +8310,12 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
+[[package]]
+name = "sif-itree"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7f45b8998ced5134fb1d75732c77842a3e888f19c1ff98481822e8fbfbf930b"
+
 [[package]]
 name = "simba"
 version = "0.9.1"
@@ -7138,6 +8335,22 @@ version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2"
 
+[[package]]
+name = "simd_cesu8"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94f90157bb87cddf702797c5dadfa0be7d266cdf49e22da2fcaa32eff75b2c33"
+dependencies = [
+ "rustc_version",
+ "simdutf8",
+]
+
+[[package]]
+name = "simdutf8"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
+
 [[package]]
 name = "skrifa"
 version = "0.37.0"
@@ -7145,7 +8358,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c31071dedf532758ecf3fed987cdb4bd9509f900e026ab684b4ecb81ea49841"
 dependencies = [
  "bytemuck",
- "read-fonts",
+ "read-fonts 0.35.0",
+]
+
+[[package]]
+name = "skrifa"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c9eb0b904a04d09bd68c65d946617b8ff733009999050f3b851c32fb3cfb60e"
+dependencies = [
+ "bytemuck",
+ "read-fonts 0.36.0",
 ]
 
 [[package]]
@@ -7173,13 +8396,24 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "smartstring"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29"
+dependencies = [
+ "autocfg",
+ "static_assertions",
+ "version_check",
+]
+
 [[package]]
 name = "smithay-client-toolkit"
 version = "0.19.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "calloop",
  "calloop-wayland-source",
  "cursor-icon",
@@ -7223,7 +8457,7 @@ dependencies = [
 [[package]]
 name = "soft_ratatui"
 version = "0.1.3"
-source = "git+https://github.com/gold-silver-copper/soft_ratatui.git?branch=togit#120d4e566f8b578d1fd2b2f4bac67061b07625f9"
+source = "git+https://github.com/Zrocket/soft_ratatui.git?branch=togit#7d69fceeed153121d156b700cf089a8bbceae45e"
 dependencies = [
  "embedded-graphics",
  "embedded-graphics-unicodefonts",
@@ -7243,12 +8477,19 @@ dependencies = [
  "smallvec",
 ]
 
+[[package]]
+name = "spin"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+
 [[package]]
 name = "spin"
 version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d5fe4ccb98d9c292d56fec89a5e07da7fc4cf0dc11e156b41793132775d3e591"
 dependencies = [
+ "lock_api",
  "portable-atomic",
 ]
 
@@ -7258,7 +8499,7 @@ version = "0.3.0+sdk-1.3.268.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
 ]
 
 [[package]]
@@ -7321,13 +8562,35 @@ version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
+[[package]]
+name = "strum"
+version = "0.26.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
+dependencies = [
+ "strum_macros 0.26.4",
+]
+
 [[package]]
 name = "strum"
 version = "0.27.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf"
 dependencies = [
- "strum_macros",
+ "strum_macros 0.27.2",
+]
+
+[[package]]
+name = "strum_macros"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
+dependencies = [
+ "heck 0.5.0",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -7339,7 +8602,35 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "subsecond"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8438668e545834d795d04c4335aafc332ce046106521a29f0a5c6501de34187c"
+dependencies = [
+ "js-sys",
+ "libc",
+ "libloading",
+ "memfd",
+ "memmap2",
+ "serde",
+ "subsecond-types",
+ "thiserror 2.0.18",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
+[[package]]
+name = "subsecond-types"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e72f747606fc19fe81d6c59e491af93ed7dcbcb6aad9d1d18b05129914ec298"
+dependencies = [
+ "serde",
 ]
 
 [[package]]
@@ -7354,7 +8645,7 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "47846491253e976bdd07d0f9cc24b7daf24720d11309302ccbbc6e6b6e53550a"
 dependencies = [
- "skrifa",
+ "skrifa 0.37.0",
  "yazi",
  "zeno",
 ]
@@ -7457,14 +8748,14 @@ dependencies = [
 
 [[package]]
 name = "symphonium"
-version = "0.6.5"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94700d892b055c7c25e2fc5319b43d59434119627a08a5096cdcd0fe5345914f"
+checksum = "eeb5f86fca091cd84bb3b946aae8ab823cbb01921a16b87273e8baa7199fac4c"
 dependencies = [
  "fast-interleave",
  "fixed-resample",
- "log",
  "symphonia",
+ "tracing",
 ]
 
 [[package]]
@@ -7480,9 +8771,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.114"
+version = "2.0.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a"
+checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7497,7 +8788,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -7525,9 +8816,9 @@ dependencies = [
 
 [[package]]
 name = "taffy"
-version = "0.7.7"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab4f4d046dd956a47a7e1a2947083d7ac3e6aa3cfaaead36173ceaa5ab11878c"
+checksum = "41ba83ebaf2954d31d05d67340fd46cebe99da2b7133b0dd68d70c65473a437b"
 dependencies = [
  "arrayvec",
  "grid",
@@ -7544,6 +8835,12 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "thin-vec"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "144f754d318415ac792f9d69fc87abbbfc043ce2ef041c60f16ad828f638717d"
+
 [[package]]
 name = "thiserror"
 version = "1.0.69"
@@ -7570,7 +8867,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -7581,7 +8878,7 @@ checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -7601,9 +8898,9 @@ checksum = "92e170f93360bf9ae6fe3c31116bbf27adb1d054cedd6bc3d7857e34f2d98d0b"
 
 [[package]]
 name = "tiff"
-version = "0.10.3"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af9605de7fee8d9551863fd692cce7637f548dbd9db9180fcc07ccc6d26c336f"
+checksum = "b63feaf3343d35b6ca4d50483f94843803b0f51634937cc2ec519fc32232bc52"
 dependencies = [
  "fax",
  "flate2",
@@ -7615,9 +8912,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.46"
+version = "0.3.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9da98b7d9b7dad93488a84b8248efc35352b0b2657397d4167e7ad67e5d535e5"
+checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c"
 dependencies = [
  "deranged",
  "num-conv",
@@ -7631,6 +8928,15 @@ version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca"
 
+[[package]]
+name = "tiny-keccak"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
+dependencies = [
+ "crunchy",
+]
+
 [[package]]
 name = "tiny-skia"
 version = "0.11.4"
@@ -7694,9 +9000,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.49.0"
+version = "1.50.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86"
+checksum = "27ad5e34374e03cfffefc301becb44e9dc3c17584f414349ebe29ed26661822d"
 dependencies = [
  "pin-project-lite",
 ]
@@ -7710,6 +9016,15 @@ dependencies = [
  "serde_core",
 ]
 
+[[package]]
+name = "toml_datetime"
+version = "1.0.0+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32c2555c699578a4f59f0cc68e5116c8d7cabbd45e1409b989d4be085b53f13e"
+dependencies = [
+ "serde_core",
+]
+
 [[package]]
 name = "toml_edit"
 version = "0.23.10+spec-1.0.0"
@@ -7717,16 +9032,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269"
 dependencies = [
  "indexmap",
- "toml_datetime",
+ "toml_datetime 0.7.5+spec-1.1.0",
+ "toml_parser",
+ "winnow",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.25.4+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7193cbd0ce53dc966037f54351dbbcf0d5a642c7f0038c382ef9e677ce8c13f2"
+dependencies = [
+ "indexmap",
+ "toml_datetime 1.0.0+spec-1.1.0",
  "toml_parser",
  "winnow",
 ]
 
 [[package]]
 name = "toml_parser"
-version = "1.0.6+spec-1.1.0"
+version = "1.0.9+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44"
+checksum = "702d4415e08923e7e1ef96cd5727c0dfed80b4d2fa25db9647fe5eb6f7c5a4c4"
 dependencies = [
  "winnow",
 ]
@@ -7750,7 +9077,7 @@ checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -7860,6 +9187,26 @@ name = "ttf-parser"
 version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2df906b07856748fa3f6e0ad0cbaa047052d4a7dd609e231c4f72cee8c36f31"
+dependencies = [
+ "core_maths",
+]
+
+[[package]]
+name = "tungstenite"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eadc29d668c91fcc564941132e17b28a7ceb2f3ebf0b9dae3e03fd7a6748eb0d"
+dependencies = [
+ "bytes",
+ "data-encoding",
+ "http",
+ "httparse",
+ "log",
+ "rand 0.9.2",
+ "sha1",
+ "thiserror 2.0.18",
+ "utf-8",
+]
 
 [[package]]
 name = "twox-hash"
@@ -7906,7 +9253,7 @@ checksum = "27a7a9b72ba121f6f1f6c3632b85604cac41aedb5ddc70accbebb6cac83de846"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -7935,9 +9282,9 @@ checksum = "1df77b101bcc4ea3d78dafc5ad7e4f58ceffe0b2b16bf446aeb50b6cb4157656"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.22"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
+checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
 
 [[package]]
 name = "unicode-linebreak"
@@ -8019,6 +9366,18 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "urlencoding"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
+
+[[package]]
+name = "utf-8"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
+
 [[package]]
 name = "utf8_iter"
 version = "1.0.4"
@@ -8039,11 +9398,11 @@ checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
 
 [[package]]
 name = "uuid"
-version = "1.20.0"
+version = "1.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee48d38b119b0cd71fe4141b30f5ba9c7c5d9f4e7a3a8b4a674e4b6ef789976f"
+checksum = "a68d3c8f01c0cfa54a75291d83601161799e4a89a39e0929f4b0354d88757a37"
 dependencies = [
- "getrandom",
+ "getrandom 0.4.2",
  "js-sys",
  "serde_core",
  "wasm-bindgen",
@@ -8063,7 +9422,7 @@ checksum = "41b6d82be61465f97d42bd1d15bf20f3b0a3a0905018f38f9d6f6962055b0b5c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -8097,6 +9456,34 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "warnings"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64f68998838dab65727c9b30465595c6f7c953313559371ca8bf31759b3680ad"
+dependencies = [
+ "pin-project",
+ "tracing",
+ "warnings-macro",
+]
+
+[[package]]
+name = "warnings-macro"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59195a1db0e95b920366d949ba5e0d3fc0e70b67c09be15ce5abb790106b0571"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.1+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
+
 [[package]]
 name = "wasip2"
 version = "1.0.2+wasi-0.2.9"
@@ -8106,11 +9493,20 @@ dependencies = [
  "wit-bindgen",
 ]
 
+[[package]]
+name = "wasip3"
+version = "0.4.0+wasi-0.3.0-rc-2026-01-06"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
+dependencies = [
+ "wit-bindgen",
+]
+
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.108"
+version = "0.2.114"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64024a30ec1e37399cf85a7ffefebdb72205ca1c972291c51512360d90bd8566"
+checksum = "6532f9a5c1ece3798cb1c2cfdba640b9b3ba884f5db45973a6f442510a87d38e"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -8121,9 +9517,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.58"
+version = "0.4.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70a6e77fd0ae8029c9ea0063f87c46fde723e7d887703d74ad2616d792e51e6f"
+checksum = "e9c5522b3a28661442748e09d40924dfb9ca614b21c00d3fd135720e48b67db8"
 dependencies = [
  "cfg-if",
  "futures-util",
@@ -8135,9 +9531,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.108"
+version = "0.2.114"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "008b239d9c740232e71bd39e8ef6429d27097518b6b30bdf9086833bd5b6d608"
+checksum = "18a2d50fcf105fb33bb15f00e7a77b772945a2ee45dcf454961fd843e74c18e6"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -8145,35 +9541,69 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.108"
+version = "0.2.114"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5256bae2d58f54820e6490f9839c49780dff84c65aeab9e772f15d5f0e913a55"
+checksum = "03ce4caeaac547cdf713d280eda22a730824dd11e6b8c3ca9e42247b25c631e3"
 dependencies = [
  "bumpalo",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.108"
+version = "0.2.114"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f01b580c9ac74c8d8f0c0e4afb04eeef2acf145458e52c03845ee9cd23e3d12"
+checksum = "75a326b8c223ee17883a4251907455a2431acc2791c98c26279376490c378c16"
 dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "wasm-encoder"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319"
+dependencies = [
+ "leb128fmt",
+ "wasmparser",
+]
+
+[[package]]
+name = "wasm-metadata"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909"
+dependencies = [
+ "anyhow",
+ "indexmap",
+ "wasm-encoder",
+ "wasmparser",
+]
+
+[[package]]
+name = "wasmparser"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
+dependencies = [
+ "bitflags 2.11.0",
+ "hashbrown 0.15.5",
+ "indexmap",
+ "semver",
+]
+
 [[package]]
 name = "wayland-backend"
-version = "0.3.12"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fee64194ccd96bf648f42a65a7e589547096dfa702f7cadef84347b66ad164f9"
+checksum = "aa75f400b7f719bcd68b3f47cd939ba654cedeef690f486db71331eec4c6a406"
 dependencies = [
  "cc",
  "downcast-rs 1.2.1",
- "rustix 1.1.3",
+ "rustix 1.1.4",
  "scoped-tls",
  "smallvec",
  "wayland-sys",
@@ -8181,12 +9611,12 @@ dependencies = [
 
 [[package]]
 name = "wayland-client"
-version = "0.31.12"
+version = "0.31.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8e6faa537fbb6c186cb9f1d41f2f811a4120d1b57ec61f50da451a0c5122bec"
+checksum = "ab51d9f7c071abeee76007e2b742499e535148035bb835f97aaed1338cf516c3"
 dependencies = [
- "bitflags 2.10.0",
- "rustix 1.1.3",
+ "bitflags 2.11.0",
+ "rustix 1.1.4",
  "wayland-backend",
  "wayland-scanner",
 ]
@@ -8197,29 +9627,29 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "cursor-icon",
  "wayland-backend",
 ]
 
 [[package]]
 name = "wayland-cursor"
-version = "0.31.12"
+version = "0.31.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5864c4b5b6064b06b1e8b74ead4a98a6c45a285fe7a0e784d24735f011fdb078"
+checksum = "4b3298683470fbdc6ca40151dfc48c8f2fd4c41a26e13042f801f85002384091"
 dependencies = [
- "rustix 1.1.3",
+ "rustix 1.1.4",
  "wayland-client",
  "xcursor",
 ]
 
 [[package]]
 name = "wayland-protocols"
-version = "0.32.10"
+version = "0.32.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baeda9ffbcfc8cd6ddaade385eaf2393bd2115a69523c735f12242353c3df4f3"
+checksum = "b23b5df31ceff1328f06ac607591d5ba360cf58f90c8fad4ac8d3a55a3c4aec7"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "wayland-backend",
  "wayland-client",
  "wayland-scanner",
@@ -8227,11 +9657,11 @@ dependencies = [
 
 [[package]]
 name = "wayland-protocols-plasma"
-version = "0.3.10"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa98634619300a535a9a97f338aed9a5ff1e01a461943e8346ff4ae26007306b"
+checksum = "d392fc283a87774afc9beefcd6f931582bb97fe0e6ced0b306a62cb1d026527c"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
@@ -8240,11 +9670,11 @@ dependencies = [
 
 [[package]]
 name = "wayland-protocols-wlr"
-version = "0.3.10"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9597cdf02cf0c34cd5823786dce6b5ae8598f05c2daf5621b6e178d4f7345f3"
+checksum = "78248e4cc0eff8163370ba5c158630dcae1f3497a586b826eca2ef5f348d6235"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
@@ -8253,9 +9683,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-scanner"
-version = "0.31.8"
+version = "0.31.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5423e94b6a63e68e439803a3e153a9252d5ead12fd853334e2ad33997e3889e3"
+checksum = "c86287151a309799b821ca709b7345a048a2956af05957c89cb824ab919fa4e3"
 dependencies = [
  "proc-macro2",
  "quick-xml",
@@ -8264,9 +9694,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-sys"
-version = "0.31.8"
+version = "0.31.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e6dbfc3ac5ef974c92a2235805cc0114033018ae1290a72e474aa8b28cbbdfd"
+checksum = "374f6b70e8e0d6bf9461a32988fd553b59ff630964924dad6e4a4eb6bd538d17"
 dependencies = [
  "dlib",
  "log",
@@ -8275,9 +9705,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.85"
+version = "0.3.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "312e32e551d92129218ea9a2452120f4aabc03529ef03e4d0d82fb2780608598"
+checksum = "854ba17bb104abfb26ba36da9729addc7ce7f06f5c0f90f3c391f8461cca21f9"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -8295,15 +9725,15 @@ dependencies = [
 
 [[package]]
 name = "webbrowser"
-version = "1.0.6"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00f1243ef785213e3a32fa0396093424a3a6ea566f9948497e5a2309261a4c97"
+checksum = "fe985f41e291eecef5e5c0770a18d28390addb03331c043964d9e916453d6f16"
 dependencies = [
  "core-foundation 0.10.1",
- "jni",
+ "jni 0.22.3",
  "log",
  "ndk-context",
- "objc2 0.6.3",
+ "objc2 0.6.4",
  "objc2-foundation 0.3.2",
  "url",
  "web-sys",
@@ -8317,16 +9747,16 @@ checksum = "a28ac98ddc8b9274cb41bb4d9d4d5c425b6020c50c46f25559911905610b4a88"
 
 [[package]]
 name = "wgpu"
-version = "26.0.1"
+version = "27.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70b6ff82bbf6e9206828e1a3178e851f8c20f1c9028e74dd3a8090741ccd5798"
+checksum = "bfe68bac7cde125de7a731c3400723cadaaf1703795ad3f4805f187459cd7a77"
 dependencies = [
  "arrayvec",
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "cfg-if",
  "cfg_aliases",
  "document-features",
- "hashbrown 0.15.5",
+ "hashbrown 0.16.1",
  "js-sys",
  "log",
  "naga",
@@ -8344,17 +9774,18 @@ dependencies = [
 
 [[package]]
 name = "wgpu-core"
-version = "26.0.1"
+version = "27.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5f62f1053bd28c2268f42916f31588f81f64796e2ff91b81293515017ca8bd9"
+checksum = "27a75de515543b1897b26119f93731b385a19aea165a1ec5f0e3acecc229cae7"
 dependencies = [
  "arrayvec",
  "bit-set 0.8.0",
  "bit-vec 0.8.0",
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
+ "bytemuck",
  "cfg_aliases",
  "document-features",
- "hashbrown 0.15.5",
+ "hashbrown 0.16.1",
  "indexmap",
  "log",
  "naga",
@@ -8375,42 +9806,42 @@ dependencies = [
 
 [[package]]
 name = "wgpu-core-deps-apple"
-version = "26.0.0"
+version = "27.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18ae5fbde6a4cbebae38358aa73fcd6e0f15c6144b67ef5dc91ded0db125dbdf"
+checksum = "0772ae958e9be0c729561d5e3fd9a19679bcdfb945b8b1a1969d9bfe8056d233"
 dependencies = [
  "wgpu-hal",
 ]
 
 [[package]]
 name = "wgpu-core-deps-wasm"
-version = "26.0.0"
+version = "27.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c03b9f9e1a50686d315fc6debe4980cc45cd37b0e919351917df494e8fdc8885"
+checksum = "9b1027dcf3b027a877e44819df7ceb0e2e98578830f8cd34cd6c3c7c2a7a50b7"
 dependencies = [
  "wgpu-hal",
 ]
 
 [[package]]
 name = "wgpu-core-deps-windows-linux-android"
-version = "26.0.0"
+version = "27.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "720a5cb9d12b3d337c15ff0e24d3e97ed11490ff3f7506e7f3d98c68fa5d6f14"
+checksum = "71197027d61a71748e4120f05a9242b2ad142e3c01f8c1b47707945a879a03c3"
 dependencies = [
  "wgpu-hal",
 ]
 
 [[package]]
 name = "wgpu-hal"
-version = "26.0.6"
+version = "27.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8d0e67224cc7305b3b4eb2cc57ca4c4c3afc665c1d1bee162ea806e19c47bdd"
+checksum = "5b21cb61c57ee198bc4aff71aeadff4cbb80b927beb912506af9c780d64313ce"
 dependencies = [
  "android_system_properties",
  "arrayvec",
  "ash",
  "bit-set 0.8.0",
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "block",
  "bytemuck",
  "cfg-if",
@@ -8421,7 +9852,7 @@ dependencies = [
  "gpu-alloc",
  "gpu-allocator",
  "gpu-descriptor",
- "hashbrown 0.15.5",
+ "hashbrown 0.16.1",
  "js-sys",
  "khronos-egl",
  "libc",
@@ -8431,7 +9862,8 @@ dependencies = [
  "naga",
  "ndk-sys 0.6.0+11769913",
  "objc",
- "ordered-float 4.6.0",
+ "once_cell",
+ "ordered-float",
  "parking_lot 0.12.5",
  "portable-atomic",
  "portable-atomic-util",
@@ -8450,11 +9882,11 @@ dependencies = [
 
 [[package]]
 name = "wgpu-types"
-version = "26.0.0"
+version = "27.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eca7a8d8af57c18f57d393601a1fb159ace8b2328f1b6b5f80893f7d672c9ae2"
+checksum = "afdcf84c395990db737f2dd91628706cb31e86d72e53482320d368e52b5da5eb"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "bytemuck",
  "js-sys",
  "log",
@@ -8646,7 +10078,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -8657,7 +10089,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -8668,7 +10100,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -8679,7 +10111,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -9029,14 +10461,14 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
 
 [[package]]
 name = "winit"
-version = "0.30.12"
+version = "0.30.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c66d4b9ed69c4009f6321f762d6e61ad8a2389cd431b97cb1e146812e9e6c732"
+checksum = "a6755fa58a9f8350bd1e472d4c3fcc25f824ec358933bba33306d0b63df5978d"
 dependencies = [
  "ahash",
  "android-activity",
  "atomic-waker",
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "block2 0.5.1",
  "bytemuck",
  "calloop",
@@ -9081,9 +10513,9 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.7.14"
+version = "0.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829"
+checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945"
 dependencies = [
  "memchr",
 ]
@@ -9093,6 +10525,88 @@ name = "wit-bindgen"
 version = "0.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
+dependencies = [
+ "wit-bindgen-rust-macro",
+]
+
+[[package]]
+name = "wit-bindgen-core"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc"
+dependencies = [
+ "anyhow",
+ "heck 0.5.0",
+ "wit-parser",
+]
+
+[[package]]
+name = "wit-bindgen-rust"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21"
+dependencies = [
+ "anyhow",
+ "heck 0.5.0",
+ "indexmap",
+ "prettyplease",
+ "syn 2.0.117",
+ "wasm-metadata",
+ "wit-bindgen-core",
+ "wit-component",
+]
+
+[[package]]
+name = "wit-bindgen-rust-macro"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a"
+dependencies = [
+ "anyhow",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+ "wit-bindgen-core",
+ "wit-bindgen-rust",
+]
+
+[[package]]
+name = "wit-component"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
+dependencies = [
+ "anyhow",
+ "bitflags 2.11.0",
+ "indexmap",
+ "log",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "wasm-encoder",
+ "wasm-metadata",
+ "wasmparser",
+ "wit-parser",
+]
+
+[[package]]
+name = "wit-parser"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
+dependencies = [
+ "anyhow",
+ "id-arena",
+ "indexmap",
+ "log",
+ "semver",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "unicode-xid",
+ "wasmparser",
+]
 
 [[package]]
 name = "wmidi"
@@ -9134,7 +10648,7 @@ dependencies = [
  "libc",
  "libloading",
  "once_cell",
- "rustix 1.1.3",
+ "rustix 1.1.4",
  "x11rb-protocol",
 ]
 
@@ -9156,7 +10670,7 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "dlib",
  "log",
  "once_cell",
@@ -9177,9 +10691,9 @@ checksum = "3ae8337f8a065cfc972643663ea4279e04e7256de865aa66fe25cec5fb912d3f"
 
 [[package]]
 name = "yarnspinner"
-version = "0.6.3"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fa6b6ab20b81d405fe20aab864a2330461da98ca9c23fb419a9bdf4ba8dbc1"
+checksum = "45be2982985298c3b5672f6ac6d29abe09b28890046f660ad7cad6488701bd93"
 dependencies = [
  "bevy",
  "log",
@@ -9190,16 +10704,16 @@ dependencies = [
 
 [[package]]
 name = "yarnspinner_compiler"
-version = "0.6.2"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b56ae150866ab2d6a04dddc4199cea2b4a175756e132109df379ca8b0ade109d"
+checksum = "76010d5ef17cb0840c742637be466e235b4cafaab3ba045325f7d39e06ca5db7"
 dependencies = [
  "annotate-snippets",
  "antlr-rust",
  "better_any",
  "bevy",
  "instant",
- "rand",
+ "rand 0.9.2",
  "regex",
  "serde",
  "yarnspinner_core",
@@ -9208,9 +10722,9 @@ dependencies = [
 
 [[package]]
 name = "yarnspinner_core"
-version = "0.6.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fab219d508123c0b231c9cb4f67b2a8ca54776036dc8835c294adcadf6cec5a"
+checksum = "2add147b81deab06c639298e9761027b3bd8242b5cf59639aa42b8b449625cf7"
 dependencies = [
  "bevy",
  "hashbrown 0.15.5",
@@ -9228,9 +10742,9 @@ checksum = "9f557dcec770356c5827f42463dd0020d537ef144ec1764086a2375d23c7d86a"
 
 [[package]]
 name = "yarnspinner_runtime"
-version = "0.6.2"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8324923db9dce511a7115bce7d474dd9ed73e4b8aeaba5f4dae21a20e56f9077"
+checksum = "b94f7afd4eb82d3dd21aa0b19dc6052bf4b4af00d550efa9bf5030f522da09c0"
 dependencies = [
  "bevy",
  "bevy_platform",
@@ -9284,7 +10798,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
  "synstructure",
 ]
 
@@ -9296,7 +10810,7 @@ checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
  "synstructure",
 ]
 
@@ -9308,22 +10822,22 @@ checksum = "6df3dc4292935e51816d896edcd52aa30bc297907c26167fec31e2b0c6a32524"
 
 [[package]]
 name = "zerocopy"
-version = "0.8.38"
+version = "0.8.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57cf3aa6855b23711ee9852dfc97dfaa51c45feaba5b645d0c777414d494a961"
+checksum = "f2578b716f8a7a858b7f02d5bd870c14bf4ddbbcf3a4c05414ba6503640505e3"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.38"
+version = "0.8.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a616990af1a287837c4fe6596ad77ef57948f787e46ce28e166facc0cc1cb75"
+checksum = "7e6cc098ea4d3bd6246687de65af3f920c430e236bee1e3bf2e441463f08a02f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -9343,7 +10857,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
  "synstructure",
 ]
 
@@ -9388,7 +10902,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -9399,26 +10913,26 @@ checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "zmij"
-version = "1.0.19"
+version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ff05f8caa9038894637571ae6b9e29466c1f4f829d26c9b28f869a29cbe3445"
+checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
 
 [[package]]
 name = "zune-core"
-version = "0.4.12"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a"
+checksum = "cb8a0807f7c01457d0379ba880ba6322660448ddebc890ce29bb64da71fb40f9"
 
 [[package]]
 name = "zune-jpeg"
-version = "0.4.21"
+version = "0.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29ce2c8a9384ad323cf564b67da86e21d3cfdff87908bc1223ed5c99bc792713"
+checksum = "ec5f41c76397b7da451efd19915684f727d7e1d516384ca6bd0ec43ec94de23c"
 dependencies = [
  "zune-core",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 3f62dba..781e48a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,17 +6,18 @@ edition = "2024"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-anyhow = "1.0.98"
+anyhow = "1.0.100"
 #bevy = { version = "0.15.0", features = ["jpeg"] }
-bevy = { version = "0.17", default-features = false, features = [
+bevy = { version = "0.18.0", default-features = false, features = [
   "std",
   "async_executor",
   "android-game-activity",
   "android_shared_stdcxx",
-  "animation",
+  "gltf_animation",
   "bevy_asset",
   "bevy_color",
   "bevy_core_pipeline",
+  "bevy_dev_tools",
   "bevy_post_process",
   "bevy_anti_alias",
   "bevy_gilrs",
@@ -24,7 +25,7 @@ bevy = { version = "0.17", default-features = false, features = [
   "bevy_gltf",
   "bevy_input_focus",
   "bevy_log",
-  "bevy_mesh_picking_backend",
+  "mesh_picking",
   "bevy_pbr",
   "bevy_picking",
   "bevy_render",
@@ -36,12 +37,12 @@ bevy = { version = "0.17", default-features = false, features = [
   "bevy_light",
   "bevy_shader",
   "bevy_sprite",
-  "bevy_sprite_picking_backend",
+  "sprite_picking",
   "bevy_sprite_render",
   "bevy_state",
   "bevy_text",
   "bevy_ui",
-  "bevy_ui_picking_backend",
+  "ui_picking",
   "bevy_ui_render",
   "bevy_window",
   "bevy_winit",
@@ -68,9 +69,9 @@ serde = "*"
 standard-dist = "*"
 nom = "*"
 
-polyanya = "0.15.1"
+polyanya = "0.16.1"
 itertools = "0.14.0"
-tracing = "0.1.43"
+tracing = "0.1.44"
 ratatui = { version = "0.30.0", default-features = false }
 
 #
@@ -80,35 +81,38 @@ ratatui = { version = "0.30.0", default-features = false }
 # bevy 0.17 ready
 
 # Pull ready
-bevy_sun_move = { git = "https://github.com/GuillaumeDelorme/bevy_sun_move", branch = "bevy-0.17-update" }
-soft_ratatui = { git = "https://github.com/gold-silver-copper/soft_ratatui.git", branch ="togit", features = ["embedded-graphics", "unicodefonts"] }
+bevy_sun_move = { git = "https://github.com/Zrocket/bevy_sun_move", branch = "main" }
+soft_ratatui = { git = "https://github.com/Zrocket/soft_ratatui.git", branch ="togit", features = ["embedded-graphics", "unicodefonts"] }
 
 # bevy 0.18 ready
 bevy_console = { git = "https://github.com/Zrocket/bevy-console.git" }
-avian3d = { version = "0.4", features = ["collider-from-mesh"] }
-avian_rerecast = "0.3.0"
-bevy_rerecast = "0.3.0"
-bevy_seedling = "0.6"
-bevy_yarnspinner = "0.6"
-bevy_hanabi = "0.17.0"
+avian3d = { version = "0.5.0", features = ["collider-from-mesh"] }
+avian_rerecast = "0.4.0"
+bevy_rerecast = "0.4.0"
+bevy_seedling = "0.7.0"
+bevy_yarnspinner = "0.7.0"
+bevy_hanabi = "0.18.0"
 landmass = "0.9.1"
-landmass_rerecast = "0.1.0"
-bevy_landmass = "0.10.0"
-avian_pickup = "0.3"
-bevy_yarnspinner_example_dialogue_view = "0.6.0"
-bevy-tnua-physics-integration-layer = "0.11"
-bevy-inspector-egui = "0.35"
-bevy_asset_loader = {version = "0.24.0-rc.1", features = ["2d", "standard_dynamic_assets"]}
-bevy_enhanced_input = "0.20.0"
-bevy_flycam = "0.17.0"
-bevy-yoleck = "0.29"
-bevy_egui = "0.38"
-bevy_sprite3d = "7.0"
-bevy-tnua-avian3d = "0.9"
-bevy-tnua = "0.28"
-bevy_skein = "0.4"
-bevy_simple_text_input = "0.12"
-bevy_bae = "0.0.1"
+landmass_rerecast = "0.2.0"
+bevy_landmass = "0.11.0"
+avian_pickup = "0.4.0"
+bevy_yarnspinner_example_dialogue_view = "0.7.0"
+bevy-tnua-physics-integration-layer = "0.12.0"
+bevy-inspector-egui = "0.36.0"
+bevy_asset_loader = {version = "0.25.0", features = ["2d", "standard_dynamic_assets"]}
+bevy_enhanced_input = "0.23.1"
+bevy_flycam = "0.18.0"
+bevy-yoleck = "0.31.0"
+bevy_egui = "0.39.0"
+bevy_sprite3d = "8.0.0"
+bevy-tnua-avian3d = "0.10.0"
+bevy-tnua = "0.30.0"
+bevy_skein = "0.5.0"
+bevy_simple_text_input = "0.13.0"
+bevy_bae = "0.1.0"
+bevy_hotpatching_experiments = "0.4.0"
+bevy_mod_scripting = { version = "0.19.0", features = ["rhai"] }
+bevy_ingame_clock = { git = "https://github.com/GuillaumeDelorme/bevy_ingame_clock.git", branch = "bevy-0.18-update" }
 
 [profile.dev]
 opt-level=3
diff --git a/Cargo.toml.backup b/Cargo.toml.backup
new file mode 100644
index 0000000..3f62dba
--- /dev/null
+++ b/Cargo.toml.backup
@@ -0,0 +1,114 @@
+[package]
+name = "bevyrpg"
+version = "0.1.0"
+edition = "2024"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+anyhow = "1.0.98"
+#bevy = { version = "0.15.0", features = ["jpeg"] }
+bevy = { version = "0.17", default-features = false, features = [
+  "std",
+  "async_executor",
+  "android-game-activity",
+  "android_shared_stdcxx",
+  "animation",
+  "bevy_asset",
+  "bevy_color",
+  "bevy_core_pipeline",
+  "bevy_post_process",
+  "bevy_anti_alias",
+  "bevy_gilrs",
+  "bevy_gizmos",
+  "bevy_gltf",
+  "bevy_input_focus",
+  "bevy_log",
+  "bevy_mesh_picking_backend",
+  "bevy_pbr",
+  "bevy_picking",
+  "bevy_render",
+  "bevy_scene",
+  "bevy_image",
+  "experimental_bevy_feathers",
+  "bevy_mesh",
+  "bevy_camera",
+  "bevy_light",
+  "bevy_shader",
+  "bevy_sprite",
+  "bevy_sprite_picking_backend",
+  "bevy_sprite_render",
+  "bevy_state",
+  "bevy_text",
+  "bevy_ui",
+  "bevy_ui_picking_backend",
+  "bevy_ui_render",
+  "bevy_window",
+  "bevy_winit",
+  "custom_cursor",
+  "default_font",
+  "hdr",
+  "ktx2",
+  "multi_threaded",
+  "png",
+  "reflect_auto_register",
+  "smaa_luts",
+  "sysinfo_plugin",
+  "tonemapping_luts",
+  "webgl2",
+  "x11",
+  "wayland",
+  "debug",
+  "zstd_rust",
+] }
+clap = { version = "*", features = ["derive"] }
+lazy_static = "*"
+rand = "*"
+serde = "*"
+standard-dist = "*"
+nom = "*"
+
+polyanya = "0.15.1"
+itertools = "0.14.0"
+tracing = "0.1.43"
+ratatui = { version = "0.30.0", default-features = false }
+
+#
+# BEVY ADDONS
+#
+
+# bevy 0.17 ready
+
+# Pull ready
+bevy_sun_move = { git = "https://github.com/GuillaumeDelorme/bevy_sun_move", branch = "bevy-0.17-update" }
+soft_ratatui = { git = "https://github.com/gold-silver-copper/soft_ratatui.git", branch ="togit", features = ["embedded-graphics", "unicodefonts"] }
+
+# bevy 0.18 ready
+bevy_console = { git = "https://github.com/Zrocket/bevy-console.git" }
+avian3d = { version = "0.4", features = ["collider-from-mesh"] }
+avian_rerecast = "0.3.0"
+bevy_rerecast = "0.3.0"
+bevy_seedling = "0.6"
+bevy_yarnspinner = "0.6"
+bevy_hanabi = "0.17.0"
+landmass = "0.9.1"
+landmass_rerecast = "0.1.0"
+bevy_landmass = "0.10.0"
+avian_pickup = "0.3"
+bevy_yarnspinner_example_dialogue_view = "0.6.0"
+bevy-tnua-physics-integration-layer = "0.11"
+bevy-inspector-egui = "0.35"
+bevy_asset_loader = {version = "0.24.0-rc.1", features = ["2d", "standard_dynamic_assets"]}
+bevy_enhanced_input = "0.20.0"
+bevy_flycam = "0.17.0"
+bevy-yoleck = "0.29"
+bevy_egui = "0.38"
+bevy_sprite3d = "7.0"
+bevy-tnua-avian3d = "0.9"
+bevy-tnua = "0.28"
+bevy_skein = "0.4"
+bevy_simple_text_input = "0.12"
+bevy_bae = "0.0.1"
+
+[profile.dev]
+opt-level=3
diff --git a/assets/Mana/Style_1.png b/assets/Mana/Style_1.png
new file mode 100644
index 0000000..d0b320c
Binary files /dev/null and b/assets/Mana/Style_1.png differ
diff --git a/assets/branding/banner.png b/assets/branding/banner.png
new file mode 100644
index 0000000..3c5db79
Binary files /dev/null and b/assets/branding/banner.png differ
diff --git a/assets/flat.blend b/assets/flat.blend
new file mode 100644
index 0000000..8457e9d
Binary files /dev/null and b/assets/flat.blend differ
diff --git a/assets/flat.blend1 b/assets/flat.blend1
new file mode 100644
index 0000000..10e7712
Binary files /dev/null and b/assets/flat.blend1 differ
diff --git a/assets/icons/geometrica/arrow-block-rotated.png b/assets/icons/geometrica/arrow-block-rotated.png
new file mode 100644
index 0000000..09c780a
Binary files /dev/null and b/assets/icons/geometrica/arrow-block-rotated.png differ
diff --git a/assets/icons/geometrica/arrow-block.png b/assets/icons/geometrica/arrow-block.png
new file mode 100644
index 0000000..842dfc9
Binary files /dev/null and b/assets/icons/geometrica/arrow-block.png differ
diff --git a/assets/icons/geometrica/arrow-shrink-rotated.png b/assets/icons/geometrica/arrow-shrink-rotated.png
new file mode 100644
index 0000000..baef8d2
Binary files /dev/null and b/assets/icons/geometrica/arrow-shrink-rotated.png differ
diff --git a/assets/icons/geometrica/arrow-shrink.png b/assets/icons/geometrica/arrow-shrink.png
new file mode 100644
index 0000000..efcadf9
Binary files /dev/null and b/assets/icons/geometrica/arrow-shrink.png differ
diff --git a/assets/icons/geometrica/arrow-stick-rotated.png b/assets/icons/geometrica/arrow-stick-rotated.png
new file mode 100644
index 0000000..29a0010
Binary files /dev/null and b/assets/icons/geometrica/arrow-stick-rotated.png differ
diff --git a/assets/icons/geometrica/arrow-stick.png b/assets/icons/geometrica/arrow-stick.png
new file mode 100644
index 0000000..e1894af
Binary files /dev/null and b/assets/icons/geometrica/arrow-stick.png differ
diff --git a/assets/icons/geometrica/box-full.png b/assets/icons/geometrica/box-full.png
new file mode 100644
index 0000000..0f72ba8
Binary files /dev/null and b/assets/icons/geometrica/box-full.png differ
diff --git a/assets/icons/geometrica/box-lid.png b/assets/icons/geometrica/box-lid.png
new file mode 100644
index 0000000..ae6c131
Binary files /dev/null and b/assets/icons/geometrica/box-lid.png differ
diff --git a/assets/icons/geometrica/diamond-full.png b/assets/icons/geometrica/diamond-full.png
new file mode 100644
index 0000000..3fc1d8f
Binary files /dev/null and b/assets/icons/geometrica/diamond-full.png differ
diff --git a/assets/icons/geometrica/diamond-outline.png b/assets/icons/geometrica/diamond-outline.png
new file mode 100644
index 0000000..72fd7d5
Binary files /dev/null and b/assets/icons/geometrica/diamond-outline.png differ
diff --git a/assets/icons/geometrica/digit-0.png b/assets/icons/geometrica/digit-0.png
new file mode 100644
index 0000000..562bfe1
Binary files /dev/null and b/assets/icons/geometrica/digit-0.png differ
diff --git a/assets/icons/geometrica/digit-1.png b/assets/icons/geometrica/digit-1.png
new file mode 100644
index 0000000..3bbb86c
Binary files /dev/null and b/assets/icons/geometrica/digit-1.png differ
diff --git a/assets/icons/geometrica/digit-2.png b/assets/icons/geometrica/digit-2.png
new file mode 100644
index 0000000..c4493f1
Binary files /dev/null and b/assets/icons/geometrica/digit-2.png differ
diff --git a/assets/icons/geometrica/digit-3.png b/assets/icons/geometrica/digit-3.png
new file mode 100644
index 0000000..f9092a0
Binary files /dev/null and b/assets/icons/geometrica/digit-3.png differ
diff --git a/assets/icons/geometrica/digit-4.png b/assets/icons/geometrica/digit-4.png
new file mode 100644
index 0000000..6041b3d
Binary files /dev/null and b/assets/icons/geometrica/digit-4.png differ
diff --git a/assets/icons/geometrica/digit-5.png b/assets/icons/geometrica/digit-5.png
new file mode 100644
index 0000000..8c3ac65
Binary files /dev/null and b/assets/icons/geometrica/digit-5.png differ
diff --git a/assets/icons/geometrica/digit-6.png b/assets/icons/geometrica/digit-6.png
new file mode 100644
index 0000000..acd69ee
Binary files /dev/null and b/assets/icons/geometrica/digit-6.png differ
diff --git a/assets/icons/geometrica/digit-7.png b/assets/icons/geometrica/digit-7.png
new file mode 100644
index 0000000..1bec8e6
Binary files /dev/null and b/assets/icons/geometrica/digit-7.png differ
diff --git a/assets/icons/geometrica/digit-8.png b/assets/icons/geometrica/digit-8.png
new file mode 100644
index 0000000..d226c2f
Binary files /dev/null and b/assets/icons/geometrica/digit-8.png differ
diff --git a/assets/icons/geometrica/digit-9.png b/assets/icons/geometrica/digit-9.png
new file mode 100644
index 0000000..3da3240
Binary files /dev/null and b/assets/icons/geometrica/digit-9.png differ
diff --git a/assets/icons/geometrica/edit.png b/assets/icons/geometrica/edit.png
new file mode 100644
index 0000000..5ff35cb
Binary files /dev/null and b/assets/icons/geometrica/edit.png differ
diff --git a/assets/icons/geometrica/frame-big.png b/assets/icons/geometrica/frame-big.png
new file mode 100644
index 0000000..86da598
Binary files /dev/null and b/assets/icons/geometrica/frame-big.png differ
diff --git a/assets/icons/geometrica/frame-diamond.png b/assets/icons/geometrica/frame-diamond.png
new file mode 100644
index 0000000..2c672c4
Binary files /dev/null and b/assets/icons/geometrica/frame-diamond.png differ
diff --git a/assets/icons/geometrica/frame-small.png b/assets/icons/geometrica/frame-small.png
new file mode 100644
index 0000000..f6a711a
Binary files /dev/null and b/assets/icons/geometrica/frame-small.png differ
diff --git a/assets/icons/geometrica/gear-bolt.png b/assets/icons/geometrica/gear-bolt.png
new file mode 100644
index 0000000..9159dbd
Binary files /dev/null and b/assets/icons/geometrica/gear-bolt.png differ
diff --git a/assets/icons/geometrica/gear-full.png b/assets/icons/geometrica/gear-full.png
new file mode 100644
index 0000000..6236dc3
Binary files /dev/null and b/assets/icons/geometrica/gear-full.png differ
diff --git a/assets/icons/geometrica/gear-hole.png b/assets/icons/geometrica/gear-hole.png
new file mode 100644
index 0000000..374e68a
Binary files /dev/null and b/assets/icons/geometrica/gear-hole.png differ
diff --git a/assets/icons/geometrica/gear-shaft.png b/assets/icons/geometrica/gear-shaft.png
new file mode 100644
index 0000000..176f0bd
Binary files /dev/null and b/assets/icons/geometrica/gear-shaft.png differ
diff --git a/assets/icons/geometrica/hexagon-full.png b/assets/icons/geometrica/hexagon-full.png
new file mode 100644
index 0000000..51973ce
Binary files /dev/null and b/assets/icons/geometrica/hexagon-full.png differ
diff --git a/assets/icons/geometrica/hexagon-outline.png b/assets/icons/geometrica/hexagon-outline.png
new file mode 100644
index 0000000..04bc96e
Binary files /dev/null and b/assets/icons/geometrica/hexagon-outline.png differ
diff --git a/assets/icons/geometrica/lens-clear.png b/assets/icons/geometrica/lens-clear.png
new file mode 100644
index 0000000..c602b1a
Binary files /dev/null and b/assets/icons/geometrica/lens-clear.png differ
diff --git a/assets/icons/geometrica/lens-minus.png b/assets/icons/geometrica/lens-minus.png
new file mode 100644
index 0000000..1667992
Binary files /dev/null and b/assets/icons/geometrica/lens-minus.png differ
diff --git a/assets/icons/geometrica/lens-plus.png b/assets/icons/geometrica/lens-plus.png
new file mode 100644
index 0000000..e3fcf50
Binary files /dev/null and b/assets/icons/geometrica/lens-plus.png differ
diff --git a/assets/icons/geometrica/next-full.png b/assets/icons/geometrica/next-full.png
new file mode 100644
index 0000000..42cc295
Binary files /dev/null and b/assets/icons/geometrica/next-full.png differ
diff --git a/assets/icons/geometrica/next-outline.png b/assets/icons/geometrica/next-outline.png
new file mode 100644
index 0000000..8536b6d
Binary files /dev/null and b/assets/icons/geometrica/next-outline.png differ
diff --git a/assets/icons/geometrica/octagon-full.png b/assets/icons/geometrica/octagon-full.png
new file mode 100644
index 0000000..c8e5263
Binary files /dev/null and b/assets/icons/geometrica/octagon-full.png differ
diff --git a/assets/icons/geometrica/octagon-outline.png b/assets/icons/geometrica/octagon-outline.png
new file mode 100644
index 0000000..51168f0
Binary files /dev/null and b/assets/icons/geometrica/octagon-outline.png differ
diff --git a/assets/icons/geometrica/open-arrow-rotated.png b/assets/icons/geometrica/open-arrow-rotated.png
new file mode 100644
index 0000000..d32d02e
Binary files /dev/null and b/assets/icons/geometrica/open-arrow-rotated.png differ
diff --git a/assets/icons/geometrica/open-arrow.png b/assets/icons/geometrica/open-arrow.png
new file mode 100644
index 0000000..2875995
Binary files /dev/null and b/assets/icons/geometrica/open-arrow.png differ
diff --git a/assets/icons/geometrica/open-basic.png b/assets/icons/geometrica/open-basic.png
new file mode 100644
index 0000000..fb4e53e
Binary files /dev/null and b/assets/icons/geometrica/open-basic.png differ
diff --git a/assets/icons/geometrica/options-full.png b/assets/icons/geometrica/options-full.png
new file mode 100644
index 0000000..2e3e446
Binary files /dev/null and b/assets/icons/geometrica/options-full.png differ
diff --git a/assets/icons/geometrica/options-outline.png b/assets/icons/geometrica/options-outline.png
new file mode 100644
index 0000000..2f4bc50
Binary files /dev/null and b/assets/icons/geometrica/options-outline.png differ
diff --git a/assets/icons/geometrica/options-shaft.png b/assets/icons/geometrica/options-shaft.png
new file mode 100644
index 0000000..b40716a
Binary files /dev/null and b/assets/icons/geometrica/options-shaft.png differ
diff --git a/assets/icons/geometrica/page-overlaid.png b/assets/icons/geometrica/page-overlaid.png
new file mode 100644
index 0000000..d4a4ba1
Binary files /dev/null and b/assets/icons/geometrica/page-overlaid.png differ
diff --git a/assets/icons/geometrica/page-overlapping.png b/assets/icons/geometrica/page-overlapping.png
new file mode 100644
index 0000000..be8f0a4
Binary files /dev/null and b/assets/icons/geometrica/page-overlapping.png differ
diff --git a/assets/icons/geometrica/page-transfer-back.png b/assets/icons/geometrica/page-transfer-back.png
new file mode 100644
index 0000000..345632b
Binary files /dev/null and b/assets/icons/geometrica/page-transfer-back.png differ
diff --git a/assets/icons/geometrica/page-transfer-forward.png b/assets/icons/geometrica/page-transfer-forward.png
new file mode 100644
index 0000000..817418d
Binary files /dev/null and b/assets/icons/geometrica/page-transfer-forward.png differ
diff --git a/assets/icons/geometrica/page-transfer-in.png b/assets/icons/geometrica/page-transfer-in.png
new file mode 100644
index 0000000..850f383
Binary files /dev/null and b/assets/icons/geometrica/page-transfer-in.png differ
diff --git a/assets/icons/geometrica/page-transfer-out.png b/assets/icons/geometrica/page-transfer-out.png
new file mode 100644
index 0000000..835950b
Binary files /dev/null and b/assets/icons/geometrica/page-transfer-out.png differ
diff --git a/assets/icons/geometrica/pause-full.png b/assets/icons/geometrica/pause-full.png
new file mode 100644
index 0000000..840a89f
Binary files /dev/null and b/assets/icons/geometrica/pause-full.png differ
diff --git a/assets/icons/geometrica/pause-outline.png b/assets/icons/geometrica/pause-outline.png
new file mode 100644
index 0000000..e2ae188
Binary files /dev/null and b/assets/icons/geometrica/pause-outline.png differ
diff --git a/assets/icons/geometrica/play-full.png b/assets/icons/geometrica/play-full.png
new file mode 100644
index 0000000..6dde771
Binary files /dev/null and b/assets/icons/geometrica/play-full.png differ
diff --git a/assets/icons/geometrica/play-outline.png b/assets/icons/geometrica/play-outline.png
new file mode 100644
index 0000000..3e8af0d
Binary files /dev/null and b/assets/icons/geometrica/play-outline.png differ
diff --git a/assets/icons/geometrica/save-basic.png b/assets/icons/geometrica/save-basic.png
new file mode 100644
index 0000000..224fa3f
Binary files /dev/null and b/assets/icons/geometrica/save-basic.png differ
diff --git a/assets/icons/geometrica/save-block.png b/assets/icons/geometrica/save-block.png
new file mode 100644
index 0000000..7cc1bd3
Binary files /dev/null and b/assets/icons/geometrica/save-block.png differ
diff --git a/assets/icons/geometrica/save-text.png b/assets/icons/geometrica/save-text.png
new file mode 100644
index 0000000..8f0f82c
Binary files /dev/null and b/assets/icons/geometrica/save-text.png differ
diff --git a/assets/icons/geometrica/social-mail.png b/assets/icons/geometrica/social-mail.png
new file mode 100644
index 0000000..9eb8778
Binary files /dev/null and b/assets/icons/geometrica/social-mail.png differ
diff --git a/assets/icons/geometrica/social-rss.png b/assets/icons/geometrica/social-rss.png
new file mode 100644
index 0000000..bf8ee07
Binary files /dev/null and b/assets/icons/geometrica/social-rss.png differ
diff --git a/assets/icons/geometrica/square-full.png b/assets/icons/geometrica/square-full.png
new file mode 100644
index 0000000..d0affd7
Binary files /dev/null and b/assets/icons/geometrica/square-full.png differ
diff --git a/assets/icons/geometrica/square-outline.png b/assets/icons/geometrica/square-outline.png
new file mode 100644
index 0000000..124fa8f
Binary files /dev/null and b/assets/icons/geometrica/square-outline.png differ
diff --git a/assets/icons/geometrica/star-full.png b/assets/icons/geometrica/star-full.png
new file mode 100644
index 0000000..d74d805
Binary files /dev/null and b/assets/icons/geometrica/star-full.png differ
diff --git a/assets/icons/geometrica/star-outline.png b/assets/icons/geometrica/star-outline.png
new file mode 100644
index 0000000..256dfa6
Binary files /dev/null and b/assets/icons/geometrica/star-outline.png differ
diff --git a/assets/icons/geometrica/stick-backslash.png b/assets/icons/geometrica/stick-backslash.png
new file mode 100644
index 0000000..83fdb63
Binary files /dev/null and b/assets/icons/geometrica/stick-backslash.png differ
diff --git a/assets/icons/geometrica/stick-check.png b/assets/icons/geometrica/stick-check.png
new file mode 100644
index 0000000..022100a
Binary files /dev/null and b/assets/icons/geometrica/stick-check.png differ
diff --git a/assets/icons/geometrica/stick-cross.png b/assets/icons/geometrica/stick-cross.png
new file mode 100644
index 0000000..11c3261
Binary files /dev/null and b/assets/icons/geometrica/stick-cross.png differ
diff --git a/assets/icons/geometrica/stick-equals.png b/assets/icons/geometrica/stick-equals.png
new file mode 100644
index 0000000..8981609
Binary files /dev/null and b/assets/icons/geometrica/stick-equals.png differ
diff --git a/assets/icons/geometrica/stick-horizontal.png b/assets/icons/geometrica/stick-horizontal.png
new file mode 100644
index 0000000..852bd44
Binary files /dev/null and b/assets/icons/geometrica/stick-horizontal.png differ
diff --git a/assets/icons/geometrica/stick-plus.png b/assets/icons/geometrica/stick-plus.png
new file mode 100644
index 0000000..8fd2a2e
Binary files /dev/null and b/assets/icons/geometrica/stick-plus.png differ
diff --git a/assets/icons/geometrica/stick-slash.png b/assets/icons/geometrica/stick-slash.png
new file mode 100644
index 0000000..9de5945
Binary files /dev/null and b/assets/icons/geometrica/stick-slash.png differ
diff --git a/assets/icons/geometrica/stick-vertical.png b/assets/icons/geometrica/stick-vertical.png
new file mode 100644
index 0000000..bb310c6
Binary files /dev/null and b/assets/icons/geometrica/stick-vertical.png differ
diff --git a/assets/icons/geometrica/warning-block.png b/assets/icons/geometrica/warning-block.png
new file mode 100644
index 0000000..e305182
Binary files /dev/null and b/assets/icons/geometrica/warning-block.png differ
diff --git a/assets/icons/geometrica/warning-shrink.png b/assets/icons/geometrica/warning-shrink.png
new file mode 100644
index 0000000..d65ba67
Binary files /dev/null and b/assets/icons/geometrica/warning-shrink.png differ
diff --git a/assets/icons/geometrica/warning-stick.png b/assets/icons/geometrica/warning-stick.png
new file mode 100644
index 0000000..6908aab
Binary files /dev/null and b/assets/icons/geometrica/warning-stick.png differ
diff --git a/assets/icons/marker/alert.png b/assets/icons/marker/alert.png
new file mode 100644
index 0000000..7570252
Binary files /dev/null and b/assets/icons/marker/alert.png differ
diff --git a/assets/icons/marker/arrow-down.png b/assets/icons/marker/arrow-down.png
new file mode 100644
index 0000000..da8ecbf
Binary files /dev/null and b/assets/icons/marker/arrow-down.png differ
diff --git a/assets/icons/marker/arrow-left.png b/assets/icons/marker/arrow-left.png
new file mode 100644
index 0000000..3025759
Binary files /dev/null and b/assets/icons/marker/arrow-left.png differ
diff --git a/assets/icons/marker/arrow-right.png b/assets/icons/marker/arrow-right.png
new file mode 100644
index 0000000..87e0355
Binary files /dev/null and b/assets/icons/marker/arrow-right.png differ
diff --git a/assets/icons/marker/arrow-up.png b/assets/icons/marker/arrow-up.png
new file mode 100644
index 0000000..1fdf441
Binary files /dev/null and b/assets/icons/marker/arrow-up.png differ
diff --git a/assets/icons/marker/calendar.png b/assets/icons/marker/calendar.png
new file mode 100644
index 0000000..b0500f7
Binary files /dev/null and b/assets/icons/marker/calendar.png differ
diff --git a/assets/icons/marker/clock.png b/assets/icons/marker/clock.png
new file mode 100644
index 0000000..b438fcc
Binary files /dev/null and b/assets/icons/marker/clock.png differ
diff --git a/assets/icons/marker/comment.png b/assets/icons/marker/comment.png
new file mode 100644
index 0000000..03bc203
Binary files /dev/null and b/assets/icons/marker/comment.png differ
diff --git a/assets/icons/marker/email.png b/assets/icons/marker/email.png
new file mode 100644
index 0000000..304dc25
Binary files /dev/null and b/assets/icons/marker/email.png differ
diff --git a/assets/icons/marker/folder.png b/assets/icons/marker/folder.png
new file mode 100644
index 0000000..ece70ef
Binary files /dev/null and b/assets/icons/marker/folder.png differ
diff --git a/assets/icons/marker/home.png b/assets/icons/marker/home.png
new file mode 100644
index 0000000..f9fefae
Binary files /dev/null and b/assets/icons/marker/home.png differ
diff --git a/assets/icons/marker/link.png b/assets/icons/marker/link.png
new file mode 100644
index 0000000..8fe8c59
Binary files /dev/null and b/assets/icons/marker/link.png differ
diff --git a/assets/icons/marker/next.png b/assets/icons/marker/next.png
new file mode 100644
index 0000000..ffca86b
Binary files /dev/null and b/assets/icons/marker/next.png differ
diff --git a/assets/icons/marker/package.png b/assets/icons/marker/package.png
new file mode 100644
index 0000000..b6555f6
Binary files /dev/null and b/assets/icons/marker/package.png differ
diff --git a/assets/icons/marker/page.png b/assets/icons/marker/page.png
new file mode 100644
index 0000000..d3675e6
Binary files /dev/null and b/assets/icons/marker/page.png differ
diff --git a/assets/icons/marker/pencil.png b/assets/icons/marker/pencil.png
new file mode 100644
index 0000000..781cf0c
Binary files /dev/null and b/assets/icons/marker/pencil.png differ
diff --git a/assets/icons/marker/previous.png b/assets/icons/marker/previous.png
new file mode 100644
index 0000000..3928ca6
Binary files /dev/null and b/assets/icons/marker/previous.png differ
diff --git a/assets/icons/marker/search.png b/assets/icons/marker/search.png
new file mode 100644
index 0000000..457b728
Binary files /dev/null and b/assets/icons/marker/search.png differ
diff --git a/assets/icons/marker/tag.png b/assets/icons/marker/tag.png
new file mode 100644
index 0000000..236ab72
Binary files /dev/null and b/assets/icons/marker/tag.png differ
diff --git a/assets/icons/marker/user.png b/assets/icons/marker/user.png
new file mode 100644
index 0000000..d39eaa1
Binary files /dev/null and b/assets/icons/marker/user.png differ
diff --git a/assets/levels/World.glb b/assets/levels/World.glb
index 7bd0dc0..a93d146 100644
Binary files a/assets/levels/World.glb and b/assets/levels/World.glb differ
diff --git a/assets/levels/flat.glb b/assets/levels/flat.glb
new file mode 100644
index 0000000..ae145c0
Binary files /dev/null and b/assets/levels/flat.glb differ
diff --git a/assets/levels/race.glb b/assets/levels/race.glb
new file mode 100644
index 0000000..4b83d57
Binary files /dev/null and b/assets/levels/race.glb differ
diff --git a/assets/levels/room3.glb b/assets/levels/room3.glb
index 2682531..1c00004 100644
Binary files a/assets/levels/room3.glb and b/assets/levels/room3.glb differ
diff --git a/assets/race.blend b/assets/race.blend
new file mode 100644
index 0000000..624a875
Binary files /dev/null and b/assets/race.blend differ
diff --git a/assets/race.blend1 b/assets/race.blend1
new file mode 100644
index 0000000..7b6e374
Binary files /dev/null and b/assets/race.blend1 differ
diff --git a/assets/room3.blend b/assets/room3.blend
index e444f1d..cd46c7a 100644
Binary files a/assets/room3.blend and b/assets/room3.blend differ
diff --git a/assets/room3.blend1 b/assets/room3.blend1
index 80baeb6..a0ad693 100644
Binary files a/assets/room3.blend1 and b/assets/room3.blend1 differ
diff --git a/assets/shaders/health_ui_material.wgsl b/assets/shaders/health_ui_material.wgsl
new file mode 100644
index 0000000..a649c0d
--- /dev/null
+++ b/assets/shaders/health_ui_material.wgsl
@@ -0,0 +1,21 @@
+// Draws a progress bar with properties defined in CustomUiMaterial
+#import bevy_ui::ui_vertex_output::UiVertexOutput
+
+@group(1) @binding(0) var<uniform> color: vec4<f32>;
+@group(1) @binding(1) var<uniform> slider: vec4<f32>;
+@group(1) @binding(2) var material_color_texture: texture_2d<f32>;
+@group(1) @binding(3) var material_color_sampler: sampler;
+@group(1) @binding(4) var<uniform> border_color: vec4<f32>;
+
+
+@fragment
+fn fragment(in: UiVertexOutput) -> @location(0) vec4<f32> {
+    // sample the texture at this position if it's to the left of the slider value
+    // otherwise return a fully transparent color
+    let output_color = textureSample(material_color_texture, material_color_sampler, in.uv) * color;
+    if in.uv.x < slider.x {
+        return output_color;
+    } else {
+        return vec4(0.0);
+    }
+}
diff --git a/assets/shaders/mana_ui_material.wgsl b/assets/shaders/mana_ui_material.wgsl
new file mode 100644
index 0000000..a649c0d
--- /dev/null
+++ b/assets/shaders/mana_ui_material.wgsl
@@ -0,0 +1,21 @@
+// Draws a progress bar with properties defined in CustomUiMaterial
+#import bevy_ui::ui_vertex_output::UiVertexOutput
+
+@group(1) @binding(0) var<uniform> color: vec4<f32>;
+@group(1) @binding(1) var<uniform> slider: vec4<f32>;
+@group(1) @binding(2) var material_color_texture: texture_2d<f32>;
+@group(1) @binding(3) var material_color_sampler: sampler;
+@group(1) @binding(4) var<uniform> border_color: vec4<f32>;
+
+
+@fragment
+fn fragment(in: UiVertexOutput) -> @location(0) vec4<f32> {
+    // sample the texture at this position if it's to the left of the slider value
+    // otherwise return a fully transparent color
+    let output_color = textureSample(material_color_texture, material_color_sampler, in.uv) * color;
+    if in.uv.x < slider.x {
+        return output_color;
+    } else {
+        return vec4(0.0);
+    }
+}
diff --git a/assets/uiassets.ron b/assets/uiassets.ron
index 35f2ce6..258f291 100644
--- a/assets/uiassets.ron
+++ b/assets/uiassets.ron
@@ -8,4 +8,7 @@
     "health_3": File (
         path: "HP/Style_3.png"
     ),
+    "mana_1": File (
+        path: "Mana/Style_1.png"
+    ),
  })
diff --git a/src/audio.rs b/src/audio.rs
index 3dd5288..a0792a1 100644
--- a/src/audio.rs
+++ b/src/audio.rs
@@ -3,8 +3,9 @@ use bevy_enhanced_input::{action::InputAction, prelude::{Fire, Start}};
 use bevy_seedling::{SeedlingPlugin, pool::SamplerPool, prelude::PoolLabel, sample::SamplePlayer};
 use bevy_tnua::TnuaController;
 use rand::Rng;
+use rand::random_range;
 
-use crate::{BackwardAction, FlashlightAction, ForwardAction, JumpAction, LeftAction, Player, PlayerControlScheme, RightAction, RunAction};
+use crate::{FlashlightAction, JumpAction, MovementAction, Player, PlayerControlScheme, RunAction};
 
 #[derive(Debug, Reflect, Resource)]
 pub struct VolumeSettings {
@@ -29,10 +30,7 @@ impl Plugin for AudioPlugin {
            .register_type::<VolumeSettings>()
            .add_plugins(SeedlingPlugin::default())
            .add_systems(Startup, init_audio)
-           .add_observer(walk_audio::<ForwardAction>)
-           .add_observer(walk_audio::<BackwardAction>)
-           .add_observer(walk_audio::<LeftAction>)
-           .add_observer(walk_audio::<RightAction>)
+           .add_observer(walk_audio::<MovementAction>)
            .add_observer(jump_audio)
            .add_observer(dash_audio)
            .add_observer(flashlight_audio);
@@ -59,7 +57,7 @@ fn walk_audio<T: InputAction>(
     pool_query: Query<&SamplePlayer, With<MovementPool>>,
     tnua_query: Query<&TnuaController<PlayerControlScheme>, With<Player>>,
 ) {
-    if let Ok(_) = pool_query.single() {
+    if pool_query.single().is_ok() {
         return;
     } else if let Ok(tnua_controller) = tnua_query.single()
     && tnua_controller.is_airborne().unwrap() {
@@ -67,7 +65,7 @@ fn walk_audio<T: InputAction>(
     }
 
     let mut rng = rand::rng();
-    let file = format!("audio/footsteps/tile/{}.ogg", rng.random_range(0..8));
+    let file = format!("audio/footsteps/tile/{}.ogg", random_range(0..8));
     commands.spawn(
         (
             MovementPool,
@@ -82,7 +80,7 @@ fn jump_audio(
     pool_query: Query<&SamplePlayer, With<JumpPool>>,
     tnua_query: Query<&TnuaController<PlayerControlScheme>, With<Player>>,
 ) {
-    if let Ok(_) = pool_query.single() {
+    if pool_query.single().is_ok() {
         return;
     } else if let Ok(tnua_controller) = tnua_query.single()
     && tnua_controller.is_airborne().unwrap() {
diff --git a/src/character.rs b/src/character.rs
index 8cf2edf..44cdd15 100644
--- a/src/character.rs
+++ b/src/character.rs
@@ -28,6 +28,14 @@ pub struct Experience(pub i32);
 #[component(on_add = on_level_add)]
 pub struct Level(pub i32);
 
+#[derive(Default, Clone, Component, Reflect)]
+#[reflect(Component)]
+pub struct Hunger(pub i32);
+
+#[derive(Default, Clone, Component, Reflect)]
+#[reflect(Component)]
+pub struct Thirst(pub i32);
+
 #[derive(Bundle)]
 pub struct CharacterBundle {
     pub experience: Experience,
@@ -37,6 +45,8 @@ pub struct CharacterBundle {
     pub max_mana: MaxMana,
     pub max_health: MaxHealth,
     pub ammo_pouch: AmmoPouch,
+    pub hunger: Hunger,
+    pub thirst: Thirst,
 }
 
 impl Default for CharacterBundle {
@@ -49,6 +59,8 @@ impl Default for CharacterBundle {
             max_mana: MaxMana(100),
             max_health: MaxHealth(100),
             ammo_pouch: AmmoPouch(100),
+            hunger: Hunger(0),
+            thirst: Thirst(0),
         }
     }
 }
@@ -59,6 +71,18 @@ pub struct DamageEvent {
     pub ammount: i32,
 }
 
+#[derive(EntityEvent)]
+pub struct ManaEvent {
+    pub entity: Entity,
+    pub ammount: i32,
+}
+
+#[derive(EntityEvent)]
+pub struct HealEvent {
+    pub entity: Entity,
+    pub ammount: i32,
+}
+
 #[derive(EntityEvent)]
 pub struct LevelUpEvent {
     pub entity: Entity,
@@ -84,7 +108,9 @@ impl Plugin for CharacterPlugin {
             .register_type::<Mana>()
             .register_type::<MaxMana>()
             .register_type::<Experience>()
-            .register_type::<Level>();
+            .register_type::<Level>()
+            .register_type::<Hunger>()
+            .register_type::<Thirst>();
     }
 }
 
@@ -94,7 +120,9 @@ fn on_health_add(
 ) {
     world.commands()
         .entity(context.entity)
-        .observe(damage_observer);
+        .observe(damage_observer)
+        .observe(heal_observer)
+        .observe(mana_event_observer);
 }
 
 fn on_level_add(
@@ -112,7 +140,6 @@ fn damage_observer(
     mut commands: Commands,
     mut health_query: Query<&mut Health>,
 ) {
-    println!("{:?}", trigger.entity);
     if let Ok(mut health) = health_query.get_mut(trigger.entity) {
         if health.0 <= trigger.ammount {
             health.0 = 0;
@@ -124,6 +151,31 @@ fn damage_observer(
     }
 }
 
+fn mana_event_observer(
+    trigger: On<ManaEvent>,
+    mut mana_query: Query<&mut Mana>,
+) {
+    if let Ok(mut mana) = mana_query.get_mut(trigger.entity) {
+        if mana.0 <= trigger.ammount {
+            mana.0 = 0;
+        } else {
+            mana.0 -= trigger.event().ammount;
+        }
+    }
+}
+
+fn heal_observer(
+    trigger: On<HealEvent>,
+    mut health_query: Query<(&mut Health, &MaxHealth)>,
+) {
+    if let Ok((mut health, max_health)) = health_query.get_mut(trigger.entity) {
+        health.0 += trigger.event().ammount;
+        if health.0 >= max_health.0 {
+            health.0 = max_health.0;
+        }
+    }
+}
+
 pub fn death_event_observer(
     trigger: On<DeathEvent>,
     mut commands: Commands,
@@ -155,3 +207,9 @@ fn level_up_observer(
         info!("Entity {:?} leveled up!", trigger.entity);
     }
 }
+
+fn sustinance_timer(
+    query: Query<(&mut Hunger, &mut Thirst)>,
+    time: Res<Time>
+) {
+}
diff --git a/src/controller/basis/mod.rs b/src/controller/basis/mod.rs
new file mode 100644
index 0000000..9192046
--- /dev/null
+++ b/src/controller/basis/mod.rs
@@ -0,0 +1,173 @@
+use avian3d::math::AdjustPrecision;
+use bevy::prelude::*;
+use bevy_tnua::{TnuaBasis, TnuaProximitySensor, builtins::TnuaBuiltinWalkHeadroom, ghost_overrides::{TnuaGhostOverwrite, TnuaGhostOverwritesForBasis}, math::{Float, Vector3}, sensor_sets::{ProximitySensorPreparationHelper, TnuaSensors}};
+use serde::{Deserialize, Serialize};
+
+#[derive(Default)]
+#[cfg_attr(feature = "serialize", derive(Serialize, Deserialize))]
+pub struct TnuaSwim {
+    pub desired_motion: Vector3,
+    pub desired_forward: Option<Dir3>,
+}
+
+#[derive(Clone, Serialize, Deserialize)]
+pub struct TnuaSwimConfig {
+    pub speed: Float,
+    pub float_height: Float,
+    pub headroom: Option<TnuaBuiltinWalkHeadroom>,
+    pub acceleration: Float,
+    pub tilt_offset_angvel: Float,
+    pub turning_angvel: Float,
+}
+
+#[derive(Default, Debug)]
+#[cfg_attr(feature = "serialize", derive(Serialize, Deserialize))]
+pub struct TnuaSwimMemory {
+    pub standing_offset: Vector3,
+    effective_velocity: Vector3,
+    vertical_velocity: Float,
+    pub running_velocity: Vector3,
+    extra_headroom: Float,
+}
+
+#[derive(Copy, Clone)]
+pub struct TnuaSwimSensors<'a> {
+    /// The main sensor of the floating character model.
+    pub ground: &'a TnuaProximitySensor,
+
+    /// An upward-facing sensor that checks for obstacles above the character.
+    pub headroom: Option<&'a TnuaProximitySensor>,
+}
+
+impl <'a> TnuaSensors<'a> for TnuaSwimSensors<'a> {
+    type Entities = TnuaSwimSensorsEntities;
+    type GhostOverwrites = TnuaSwimSensorsGhostOverwrites;
+}
+
+#[derive(Component, Default)]
+#[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
+pub struct TnuaSwimSensorsGhostOverwrites {
+    /// The main sensor of the floating character model.
+    pub ground: TnuaGhostOverwrite,
+}
+
+impl TnuaGhostOverwritesForBasis for TnuaSwimSensorsGhostOverwrites {
+    type Entities = TnuaSwimSensorsEntities;
+}
+
+#[derive(Default)]
+pub struct TnuaSwimSensorsEntities {
+    /// The main sensor of the floating character model.
+    pub ground: Option<Entity>,
+
+    /// An upward-facing sensor that checks for
+    pub headroom: Option<Entity>,
+}
+
+impl TnuaBasis for TnuaSwim {
+    type Config = TnuaSwimConfig;
+
+    type Memory = TnuaSwimMemory;
+
+    type Sensors<'a> = TnuaSwimSensors<'a>;
+
+    fn apply(
+            &self,
+            config: &Self::Config,
+            memory: &mut Self::Memory,
+            sensors: &Self::Sensors<'_>,
+            ctx: bevy_tnua::TnuaBasisContext,
+            motor: &mut bevy_tnua::TnuaMotor,
+        ) {
+        memory.extra_headroom = 0.0;
+
+        let impulse_to_offset: Vector3;
+        let slipping_vector: Option<Vector3>;
+
+        if let Some(sensor_output) = &sensors.ground.output {
+            memory.effective_velocity = ctx.tracker.velocity - sensor_output.entity_linvel;
+
+            // Cross product of ground sensor and up direction
+            let sideways_unnormalized = sensor_output
+                .normal
+                .cross(*ctx.up_direction)
+                .adjust_precision();
+
+            // if cross ground normal and up direction are the same
+            if sideways_unnormalized == Vector3::ZERO {
+            }
+            impulse_to_offset = Vector3::ZERO;
+        } else {
+            memory.effective_velocity = ctx.tracker.velocity;
+            impulse_to_offset = Vector3::ZERO;
+        }
+        memory.effective_velocity += impulse_to_offset;
+
+        let velocity_on_plane = memory
+            .effective_velocity
+            .reject_from(ctx.up_direction.adjust_precision());
+
+        let desired_velocity = self.desired_motion * config.speed;
+
+        let desired_boost = desired_velocity - velocity_on_plane;
+    }
+
+    fn get_or_create_sensors<'a: 'b, 'b>(
+            up_direction: Dir3,
+            config: &'a Self::Config,
+            memory: &Self::Memory,
+            entities: &'a mut <Self::Sensors<'static> as bevy_tnua::sensor_sets::TnuaSensors<'static>>::Entities,
+            proximity_sensors_query: &'b Query<(&bevy_tnua::TnuaProximitySensor, Has<bevy_tnua::TnuaGhostSensor>)>,
+            controller_entity: Entity,
+            commands: &mut Commands,
+            has_ghost_overwrites: bool,
+    ) -> Option<Self::Sensors<'b>> {
+        let ground = ProximitySensorPreparationHelper {
+            cast_direction: -up_direction,
+            ghost_sensor: has_ghost_overwrites,
+            ..Default::default()
+        }
+        .prepare_for(
+            &mut entities.ground,
+            proximity_sensors_query,
+            controller_entity,
+            commands
+        );
+
+        let headroom = if let Some(headroom) = config.headroom.as_ref() {
+            ProximitySensorPreparationHelper {
+                cast_direction: up_direction,
+                cast_range: headroom.distance_to_collider_top
+                    + headroom.sensor_extra_distance
+                    + memory.extra_headroom,
+                ..Default::default()
+            }
+            .prepare_for(
+                &mut entities.headroom,
+                proximity_sensors_query,
+                controller_entity,
+                commands
+            )
+        } else {
+            ProximitySensorPreparationHelper::ensure_not_existing(
+                &mut entities.headroom,
+                proximity_sensors_query,
+                commands
+            )
+        };
+
+        Some(Self::Sensors {
+            ground: ground?,
+            headroom,
+        })
+    }
+
+    fn ghost_sensor_overwrites<'a>(
+            ghost_overwrites: &'a mut <Self::Sensors<'static> as bevy_tnua::sensor_sets::TnuaSensors<'static>>::GhostOverwrites,
+            entities: &<Self::Sensors<'static> as bevy_tnua::sensor_sets::TnuaSensors<'static>>::Entities,
+        ) -> impl Iterator<Item = (&'a mut bevy_tnua::ghost_overrides::TnuaGhostOverwrite, Entity)> {
+            [(&mut ghost_overwrites.ground, entities.ground)]
+                .into_iter()
+                .flat_map(|(o, e)| Some((o, e?)))
+    }
+}
diff --git a/src/controller/input.rs b/src/controller/input.rs
index 56dd077..cf697d7 100644
--- a/src/controller/input.rs
+++ b/src/controller/input.rs
@@ -1,13 +1,11 @@
-use avian3d::prelude::{Collider, CollisionLayers, LayerMask, SpatialQueryFilter};
-use bevy::{app::Plugin, asset::Assets, ecs::{component::{self, Component}, lifecycle::HookContext, world::DeferredWorld}, input::keyboard::KeyCode, utils::default};
-use bevy_enhanced_input::{action::Action, actions, bindings, prelude::{EnhancedInputPlugin, Hold, InputAction, InputContextAppExt, Tap}};
-use bevy_tnua::{TnuaConfig, builtins::{TnuaBuiltinClimbConfig, TnuaBuiltinCrouchConfig, TnuaBuiltinDashConfig, TnuaBuiltinJumpConfig, TnuaBuiltinWalkConfig, TnuaBuiltinWallSlideConfig}};
-use bevy_tnua::{TnuaController, TnuaObstacleRadar, control_helpers::{TnuaSimpleAirActionsCounter, TnuaBlipReuseAvoidance}};
+use avian3d::prelude::{Collider, RigidBody};
+use bevy::{app::Plugin, asset::Assets, ecs::{component::Component, lifecycle::HookContext, spawn::SpawnRelated, world::DeferredWorld}, input::{gamepad::{GamepadButton}, keyboard::KeyCode, mouse::MouseButton}, math::Vec2, time::Timer, utils::default};
+use bevy_enhanced_input::{action::Action, actions, bindings, prelude::{Axial, Bindings, Cardinal, DeadZone, EnhancedInputPlugin, Hold, InputAction, InputContextAppExt, SmoothNudge, Tap}, modifier::scale::Scale};
+use bevy_tnua::{TnuaConfig, TnuaController, builtins::{TnuaBuiltinClimbConfig, TnuaBuiltinCrouchConfig, TnuaBuiltinDashConfig, TnuaBuiltinJumpConfig, TnuaBuiltinWalkConfig, TnuaBuiltinWallSlideConfig}, control_helpers::TnuaSimpleAirActionsCounter};
 use bevy_tnua_avian3d::TnuaAvian3dSensorShape;
-use bevy::prelude::SpawnRelated;
-use avian_pickup::actor::{AvianPickupActor, AvianPickupActorHoldConfig};
+use bevy_bae::{plan::Plan, prelude::{Operator, Sequence}, tasks};
 
-use crate::{Player, RayHit, PlayerControlScheme, PlayerControlSchemeConfig, PlayerController, PlayerControllerInput, level::CollisionLayer, PlayerControllerConfig};
+use crate::{IdleTimer, Player, PlayerControlScheme, PlayerControlSchemeConfig, Walk, idle, run_from_player, wander};
 
 pub struct InputPlugin;
 impl Plugin for InputPlugin {
@@ -15,8 +13,15 @@ impl Plugin for InputPlugin {
         app
             .add_plugins(EnhancedInputPlugin)
             .add_input_context::<Player>();
-    }
 }
+}
+#[derive(InputAction)]
+#[action_output(Vec2)]
+pub struct MovementAction;
+
+#[derive(InputAction)]
+#[action_output(Vec2)]
+pub struct LookAction;
 
 #[derive(InputAction)]
 #[action_output(bool)]
@@ -42,22 +47,6 @@ pub struct RunAction;
 #[action_output(bool)]
 pub struct JumpAction;
 
-#[derive(InputAction)]
-#[action_output(bool)]
-pub struct ForwardAction;
-
-#[derive(InputAction)]
-#[action_output(bool)]
-pub struct BackwardAction;
-
-#[derive(InputAction)]
-#[action_output(bool)]
-pub struct LeftAction;
-
-#[derive(InputAction)]
-#[action_output(bool)]
-pub struct RightAction;
-
 #[derive(InputAction)]
 #[action_output(bool)]
 pub struct CrouchAction;
@@ -102,39 +91,49 @@ pub struct OpenQuestAction;
 #[action_output(bool)]
 pub struct FlashlightAction;
 
+#[derive(InputAction)]
+#[action_output(bool)]
+pub struct ShootAction;
+
 #[derive(Component)]
 #[component(on_add = on_tnua_npc_controller_add)]
 #[require(
     TnuaController::<PlayerControlScheme>::default(),
     TnuaAvian3dSensorShape(Collider::cuboid(0.5, 0.5, 0.5)),
     TnuaSimpleAirActionsCounter::<PlayerControlScheme>::default(),
+    RigidBody::Dynamic,
+    Walk::default(),
+    Plan::new(),
 )]
 pub struct TnuaNpcController;
 
-#[derive(Component)]
-#[component(on_add = on_tnua_player_controller_add)]
+#[derive(Component, Default)]
+#[component(on_add = on_tnua_enemy_controller_add)]
 #[require(
-    PlayerController::default(),
-    PlayerControllerInput::default(),
     TnuaController::<PlayerControlScheme>::default(),
-    TnuaAvian3dSensorShape(Collider::capsule(0.1, 0.5)),
+    TnuaAvian3dSensorShape(Collider::cuboid(0.5, 0.5, 0.5)),
     TnuaSimpleAirActionsCounter::<PlayerControlScheme>::default(),
-    PlayerControllerConfig::default(),
-    TnuaObstacleRadar::new(1.0, 3.0),
-    RayHit(None),
-    TnuaBlipReuseAvoidance::<PlayerControlScheme>::default(),
-    AvianPickupActor {
-        prop_filter: SpatialQueryFilter::from_mask(CollisionLayer::Prop),
-        actor_filter: SpatialQueryFilter::from_mask(CollisionLayer::Player),
-        obstacle_filter: SpatialQueryFilter::from_mask(CollisionLayer::Default),
-        hold: AvianPickupActorHoldConfig {
-            pitch_range: -40.0_f32.to_radians()..=75.0_f32.to_radians(),
-            distance_to_allow_holding: 100.0,
-            ..default()
-        },
-        ..default()
-    },
+    RigidBody::Dynamic,
+    Walk::default(),
+    Plan::new(),
+)]
+pub struct TnuaEnemyController;
+
+#[derive(Component, Default)]
+#[require(
+    TnuaController::<PlayerControlScheme>::default(),
+    TnuaAvian3dSensorShape(Collider::cuboid(0.5, 0.5, 0.5)),
+    TnuaSimpleAirActionsCounter::<PlayerControlScheme>::default(),
+    RigidBody::Dynamic,
+    Walk::default(),
 )]
+#[component(on_add = on_tnua_rover_controller_add)]
+pub struct TnuaRoverController;
+
+#[derive(Component, Default)]
+#[require(
+)]
+#[component(on_add = on_tnua_player_controller_add)]
 pub struct TnuaPlayerController;
 
 fn on_tnua_player_controller_add(
@@ -142,49 +141,53 @@ fn on_tnua_player_controller_add(
     context: HookContext,
 ) {
         let bei_input_map = actions!(Player[
+            (
+                Action::<MovementAction>::new(),
+                DeadZone::default(),
+                //SmoothNudge::new(30.0),
+                Bindings::spawn((
+                    Cardinal::wasd_keys(),
+                    Axial::left_stick(),
+                )),
+            ),
+            (
+                Action::<LookAction>::new(),
+                DeadZone::default(),
+                //SmoothNudge::new(10.0),
+                SmoothNudge::default(),
+                Scale::splat(0.08),
+                Bindings::spawn((
+                        //Spawn(Binding::mouse_motion()),
+                        Axial::right_stick(),
+                )),
+            ),
             (
                 Action::<Weapon1Action>::new(),
-                bindings![KeyCode::Digit1],
+                bindings![KeyCode::Digit1, GamepadButton::DPadLeft],
             ),
             (
                 Action::<Weapon2Action>::new(),
-                bindings![KeyCode::Digit2],
+                bindings![KeyCode::Digit2, GamepadButton::DPadUp],
             ),
             (
                 Action::<Weapon3Action>::new(),
-                bindings![KeyCode::Digit3],
+                bindings![KeyCode::Digit3, GamepadButton::DPadRight],
             ),
             (
                 Action::<Weapon4Action>::new(),
-                bindings![KeyCode::Digit4],
+                bindings![KeyCode::Digit4, GamepadButton::DPadDown],
             ),
             (
                 Action::<JumpAction>::new(),
-                bindings![KeyCode::Space],
+                bindings![KeyCode::Space, GamepadButton::South],
             ),
             (
                 Action::<RunAction>::new(),
-                bindings![KeyCode::ShiftLeft],
-            ),
-            (
-                Action::<LeftAction>::new(),
-                bindings![KeyCode::KeyA],
-            ),
-            (
-                Action::<RightAction>::new(),
-                bindings![KeyCode::KeyD],
-            ),
-            (
-                Action::<ForwardAction>::new(),
-                bindings![KeyCode::KeyW],
-            ),
-            (
-                Action::<BackwardAction>::new(),
-                bindings![KeyCode::KeyS],
+                bindings![KeyCode::ShiftLeft, GamepadButton::LeftThumb],
             ),
             (
                 Action::<CrouchAction>::new(),
-                bindings![KeyCode::ControlLeft],
+                bindings![KeyCode::ControlLeft, GamepadButton::LeftTrigger2],
             ),
             (
                 Action::<UpAction>::new(),
@@ -196,21 +199,22 @@ fn on_tnua_player_controller_add(
             ),
             (
                 Action::<InteractAction>::new(),
-                Tap::new(0.5),
-                bindings![KeyCode::KeyE],
+                Tap::new(0.3),
+                bindings![KeyCode::KeyE, GamepadButton::West],
             ),
             (
                 Action::<Interact2Action>::new(),
-                Hold::new(0.5),
-                bindings![KeyCode::KeyE],
+                Hold::new(0.5).one_shot(true),
+                //Tap::new(0.5),
+                bindings![KeyCode::KeyE, GamepadButton::West],
             ),
             (
                 Action::<OpenInventoryAction>::new(),
-                bindings![KeyCode::KeyI],
+                bindings![KeyCode::KeyI, GamepadButton::Select],
             ),
             (
                 Action::<OpenEquipAction>::new(),
-                bindings![KeyCode::KeyK],
+                bindings![KeyCode::KeyK, GamepadButton::Start],
             ),
             (
                 Action::<OpenStatsAction>::new(),
@@ -226,7 +230,11 @@ fn on_tnua_player_controller_add(
             ),
             (
                 Action::<FlashlightAction>::new(),
-                bindings![KeyCode::KeyF],
+                bindings![KeyCode::KeyF, GamepadButton::East],
+            ),
+            (
+                Action::<ShootAction>::new(),
+                bindings![MouseButton::Left, GamepadButton::RightTrigger2],
             ),
         ]);
 
@@ -316,10 +324,123 @@ fn on_tnua_npc_controller_add(
         },
     });
 
+
+    world.commands()
+        .entity(context.entity)
+        .insert((
+                TnuaConfig::<PlayerControlScheme>(handle),
+        ))
+        .insert((
+            Sequence,
+            tasks![
+                Operator::new(wander),
+                Operator::new(idle),
+            ],
+            IdleTimer(Timer::from_seconds(5.0, bevy::time::TimerMode::Once))
+        ));
+}
+
+fn on_tnua_enemy_controller_add(
+    mut world: DeferredWorld,
+    context: HookContext,
+) {
+    let mut control_scheme_configs = world.resource_mut::<Assets<PlayerControlSchemeConfig>>();
+    let handle = control_scheme_configs.add(PlayerControlSchemeConfig {
+        basis: TnuaBuiltinWalkConfig {
+            speed: 10.0,
+            float_height: 1.5,
+            ..default()
+        },
+        jump: TnuaBuiltinJumpConfig {
+            height: 2.0,
+            ..default()
+        },
+        crouch: TnuaBuiltinCrouchConfig {
+            float_offset: -0.7,
+            ..default()
+        },
+        dash: TnuaBuiltinDashConfig {
+            horizontal_distance: 5.0,
+            ..default()
+        },
+        knockback: Default::default(),
+        wall_slide: TnuaBuiltinWallSlideConfig {
+            maintain_distance: Some(0.7),
+            ..default()
+        },
+        wall_jump: TnuaBuiltinJumpConfig {
+            height: 4.0,
+            takeoff_extra_gravity: 90.0, // 3 times the default
+            takeoff_above_velocity: 0.0,
+            horizontal_distance: 2.0,
+            ..default()
+        },
+        climb: TnuaBuiltinClimbConfig {
+            climb_speed: 10.0,
+            ..default()
+        },
+    });
+
     world.commands()
         .entity(context.entity)
         .insert((
                 TnuaConfig::<PlayerControlScheme>(handle),
+        ))
+        .insert((
+            Sequence,
+            tasks![
+                //Operator::new(wander),
+                Operator::new(idle),
+                Operator::new(run_from_player),
+            ],
+            IdleTimer(Timer::from_seconds(5.0, bevy::time::TimerMode::Once))
         ));
 }
 
+fn on_tnua_rover_controller_add(
+    mut world: DeferredWorld,
+    context: HookContext,
+) {
+    let mut control_scheme_configs = world.resource_mut::<Assets<PlayerControlSchemeConfig>>();
+    let handle = control_scheme_configs.add(PlayerControlSchemeConfig {
+        basis: TnuaBuiltinWalkConfig {
+            speed: 10.0,
+            float_height: 1.5,
+            ..default()
+        },
+        jump: TnuaBuiltinJumpConfig {
+            height: 2.0,
+            ..default()
+        },
+        crouch: TnuaBuiltinCrouchConfig {
+            float_offset: -0.7,
+            ..default()
+        },
+        dash: TnuaBuiltinDashConfig {
+            horizontal_distance: 5.0,
+            ..default()
+        },
+        knockback: Default::default(),
+        wall_slide: TnuaBuiltinWallSlideConfig {
+            maintain_distance: Some(0.7),
+            ..default()
+        },
+        wall_jump: TnuaBuiltinJumpConfig {
+            height: 4.0,
+            takeoff_extra_gravity: 90.0, // 3 times the default
+            takeoff_above_velocity: 0.0,
+            horizontal_distance: 2.0,
+            ..default()
+        },
+        climb: TnuaBuiltinClimbConfig {
+            climb_speed: 10.0,
+            ..default()
+        },
+    });
+
+    world.commands()
+        .entity(context.entity)
+        .insert((
+                TnuaConfig::<PlayerControlScheme>(handle),
+        ));
+}
diff --git a/src/controller/interact_controller.rs b/src/controller/interact_controller.rs
index 46914e8..8e78c05 100644
--- a/src/controller/interact_controller.rs
+++ b/src/controller/interact_controller.rs
@@ -1,12 +1,12 @@
 use crate::player::Player;
-use crate::{GameState, InspectEvent, Interact2Action, InteractAction, InteractionEvent, PickupEvent, PlayerCamera, PlayerFlashlight, RESOLUTION_HEIGHT, RESOLUTION_WIDTH, UnInspectMessage};
+use crate::{GameState, InspectEvent, Interact2Action, InteractAction, InteractionEvent, PickupEvent, PlayerCamera, PlayerFlashlight, UnInspectMessage};
 use avian3d::prelude::*;
 use avian_pickup::{
     input::AvianPickupInput,
     prop::HeldProp,
 };
 use bevy::prelude::*;
-use bevy_enhanced_input::prelude::Fire;
+use bevy_enhanced_input::prelude::{Fire};
 
 pub struct InteractControllerPlugin;
 impl Plugin for InteractControllerPlugin {
@@ -30,15 +30,17 @@ pub struct RayHit(pub Option<Entity>);
 #[allow(clippy::type_complexity)]
 pub fn player_raycast(
     camera_query: Query<(&Camera, &GlobalTransform), (Without<HeldProp>, With<PlayerCamera>)>,
+    window_query: Query<&Window>,
     ray_caster: SpatialQuery,
     mut player_query: Query<(Entity, &mut RayHit), With<Player>>,
     mut flashlight_query: Query<Entity, With<PlayerFlashlight>>,
 ) {
     trace!("SYSTEM: player_raycast");
     if let Ok((player, mut ray_hit)) = player_query.single_mut()
-    && let Ok(flashlight) = flashlight_query.single_mut() {
+    && let Ok(flashlight) = flashlight_query.single_mut()
+    && let Ok(window) = window_query.single() {
         for (camera, global_transform) in camera_query.iter() {
-            let center_window = camera.viewport_to_world(global_transform, Vec2 { y: (RESOLUTION_HEIGHT / 2) as f32, x: (RESOLUTION_WIDTH / 2) as f32 }).unwrap();
+            let center_window = camera.viewport_to_world(global_transform, Vec2 { y: (window.resolution.height() / 2.), x: (window.resolution.width() / 2.)}).unwrap();
             let camera_position = global_transform.translation();
             let camera_direction = global_transform.forward();
             if let Some(ray_data) = ray_caster.cast_ray(
diff --git a/src/controller/mod.rs b/src/controller/mod.rs
index 6ba66e0..5668fe7 100644
--- a/src/controller/mod.rs
+++ b/src/controller/mod.rs
@@ -1,3 +1,4 @@
+mod basis;
 mod equip_controller;
 mod input;
 mod interact_controller;
@@ -6,7 +7,7 @@ mod player_controller;
 mod quest_controller;
 mod stats_controller;
 
-use bevy_enhanced_input::prelude::Fire;
+use bevy_enhanced_input::{action::Action, prelude::{ActionEvents, Fire}};
 use equip_controller::*;
 pub use input::*;
 use avian_pickup::prelude::*;
@@ -20,7 +21,7 @@ pub use stats_controller::*;
 
 use bevy::window::{CursorGrabMode, CursorOptions};
 
-use crate::{ActiveWeapon, Item, PlayerCamera, ShootEvent, level::DAGunAssets, shoot, widgets::floating_windows::FloatingWindow};
+use crate::{ActiveWeapon, ComputerNode, ItemDetails, PlayerCamera, ShootEvent, level::DAGunAssets, shoot, widgets::floating_windows::FloatingWindow};
 
 pub struct ControllerPlugin;
 impl Plugin for ControllerPlugin {
@@ -33,6 +34,7 @@ impl Plugin for ControllerPlugin {
             .add_plugins(InventoryControllerPlugin)
             .add_plugins(EquipControllerPlugin)
             .add_plugins(StatsControllerPlugin)
+            .add_plugins(QuestControllerPlugin)
             .add_observer(weapon_1)
             .add_observer(weapon_2)
             .add_observer(weapon_3)
@@ -57,17 +59,17 @@ impl Plugin for ControllerPlugin {
 fn manage_cursor(
     mut windows: Query<&mut CursorOptions>,
     mut commands: Commands,
-    btn: Res<ButtonInput<MouseButton>>,
     key: Res<ButtonInput<KeyCode>>,
+    shoot_action: Single<&ActionEvents, With<Action<ShootAction>>>,
     mut controllers: Query<&mut PlayerController>,
     mut shoot_event_writer: MessageWriter<shoot::ShootEvent>,
     avian_pickup_actor: Single<Entity, With<AvianPickupActor>>,
     mut avian_pickup_input_writer: MessageWriter<AvianPickupInput>,
-    active_windoow: Query<Entity, With<FloatingWindow>>,
+    active_windoow: Query<Entity, (With<FloatingWindow>, Without<ComputerNode>)>,
 ) {
     if let Ok(mut window) = windows.single_mut() {
         if window.grab_mode != CursorGrabMode::Locked {
-            if btn.just_pressed(MouseButton::Left) {
+                if shoot_action.contains(ActionEvents::FIRE) {
                 if !active_windoow.is_empty() {
                     return;
                 }
@@ -77,7 +79,7 @@ fn manage_cursor(
                     controller.enable_input = true;
                 }
             }
-        } else if btn.just_pressed(MouseButton::Left) {
+        } else if shoot_action.contains(ActionEvents::START) {
             avian_pickup_input_writer.write(AvianPickupInput { action: AvianPickupAction::Throw, actor: *avian_pickup_actor });
             shoot_event_writer.write(shoot::ShootEvent);
             commands.trigger(ShootEvent);
@@ -110,7 +112,8 @@ fn weapon_1(
         let gun = commands.spawn((
                 Transform::from_translation(vec3(0.1, -0.2, -0.5)),
                 SceneRoot(asset_server.load(path)),
-                Item {
+                ItemDetails {
+                    name: "Uzi".to_string(),
                     description: crate::Description("gun".to_string()),
                     weight: crate::Weight(0),
                 },
@@ -141,7 +144,8 @@ fn weapon_2(
         let gun = commands.spawn((
                 Transform::from_translation(vec3(0.1, -0.2, -0.5)),
                 SceneRoot(asset_server.load(path)),
-                Item {
+                ItemDetails {
+                    name: "Shotgun".to_string(),
                     description: crate::Description("gun".to_string()),
                     weight: crate::Weight(0),
                 },
@@ -172,7 +176,8 @@ fn weapon_3(
         let gun = commands.spawn((
                 Transform::from_translation(vec3(0.1, -0.2, -0.5)),
                 SceneRoot(asset_server.load(path)),
-                Item {
+                ItemDetails {
+                    name: "Sniper".to_string(),
                     description: crate::Description("gun".to_string()),
                     weight: crate::Weight(0),
                 },
@@ -203,7 +208,8 @@ fn weapon_4(
         let gun = commands.spawn((
                 Transform::from_translation(vec3(0.1, -0.2, -0.5)),
                 SceneRoot(asset_server.load(path)),
-                Item {
+                ItemDetails {
+                    name: "MP5".to_string(),
                     description: crate::Description("gun".to_string()),
                     weight: crate::Weight(0),
                 },
diff --git a/src/controller/player_controller.rs b/src/controller/player_controller.rs
index 50d23cb..c9a118b 100644
--- a/src/controller/player_controller.rs
+++ b/src/controller/player_controller.rs
@@ -1,17 +1,14 @@
 use std::{cmp::Ordering, f32::consts::*};
-use rand::Rng;
 
 use avian3d::{math::{AdjustPrecision, Vector3}, prelude::RigidBodyDisabled};
 use bevy::{input::mouse, prelude::*};
-use bevy_enhanced_input::{action::Action, prelude::{ActionEvents, Fire, Start}};
-use bevy_flycam::MovementSettings;
-use bevy_seedling::sample::{SamplePlayer, SamplePriority};
+use bevy_enhanced_input::{action::Action, prelude::{ActionEvents, Start}};
 use bevy_tnua::{
     TnuaControllerPlugin, TnuaObstacleRadar, TnuaScheme, TnuaUserControlsSystems, builtins::{TnuaBuiltinClimb, TnuaBuiltinCrouch, TnuaBuiltinDash, TnuaBuiltinJump, TnuaBuiltinKnockback, TnuaBuiltinWalk, TnuaBuiltinWallSlide}, control_helpers::{TnuaAirActionDefinition, TnuaAirActionsTracker, TnuaBlipReuseAvoidance, TnuaHasTargetEntity, TnuaSimpleAirActionsCounter}, controller::TnuaController, math::{AsF32, Float}, radar_lens::{TnuaBlipSpatialRelation, TnuaRadarLens}
 };
 use bevy_tnua_avian3d::{TnuaAvian3dPlugin, TnuaSpatialExtAvian3d};
 
-use crate::{BackwardAction, CrouchAction, DownAction, FlashlightAction, ForwardAction, JumpAction, LeftAction, MovementPool, ObstacleQueryHelper, Player, PlayerFlashlight, PlayerState, RightAction, RunAction, UpAction};
+use crate::{CrouchAction, DownAction, FlashlightAction, JumpAction, LookAction, MovementAction, ObstacleQueryHelper, Player, PlayerFlashlight, PlayerState, RunAction, UpAction};
 
 // Used as padding by camera pitching (up/down) to avoid spooky math problems
 const ANGLE_EPSILON: f32 = 0.001953125;
@@ -35,7 +32,7 @@ impl Default for PlayerController {
             pitch: 0.0,
             yaw: 0.0,
             enable_input: true,
-            sensitivity: 0.001,
+            sensitivity: 0.01,
         }
     }
 }
@@ -149,12 +146,10 @@ impl Plugin for PlayerControllerPlugin {
 
 #[allow(clippy::complexity)]
 pub fn player_controller_input(
-    left_action: Single<&ActionEvents, With<Action<LeftAction>>>,
-    right_action: Single<&ActionEvents, With<Action<RightAction>>>,
+    movement_action: Single<&Action<MovementAction>>,
+    look_action: Single<&Action<LookAction>>,
     down_action: Single<&ActionEvents, With<Action<DownAction>>>,
     up_action: Single<&ActionEvents, With<Action<UpAction>>>,
-    forward_action: Single<&ActionEvents, With<Action<ForwardAction>>>,
-    backward_action: Single<&ActionEvents, With<Action<BackwardAction>>>,
     run_action: Single<&ActionEvents, With<Action<RunAction>>>,
     mut mouse_events_reader: MessageReader<mouse::MouseMotion>,
     mut player_controller_query: Query<(&PlayerController, &mut PlayerControllerInput)>,
@@ -164,10 +159,15 @@ pub fn player_controller_input(
             .filter(|(controller, _)| controller.enable_input)
             {
                 let mut mouse_delta = Vec2::ZERO;
-                for mouse_event in mouse_events_reader.read() {
-                    mouse_delta += mouse_event.delta;
+                if mouse_events_reader.is_empty() {
+                    mouse_delta[0] += look_action[0];
+                    mouse_delta[1] -= look_action[1];
+                } else {
+                    for mouse_event in mouse_events_reader.read() {
+                        mouse_delta += mouse_event.delta;
+                        mouse_delta *= player_controller.sensitivity;
+                    }
                 }
-                mouse_delta *= player_controller.sensitivity;
 
                 player_input.pitch = (player_input.pitch - mouse_delta.y)
                     .clamp(-FRAC_PI_2 + ANGLE_EPSILON, FRAC_PI_2 - ANGLE_EPSILON);
@@ -176,19 +176,15 @@ pub fn player_controller_input(
                     player_input.yaw = player_input.yaw.rem_euclid(TAU);
                 }
 
-                let right: f32 = right_action.contains(ActionEvents::FIRED).into();
-                let left: f32 = left_action.contains(ActionEvents::FIRED).into();
-                let up: f32 = up_action.contains(ActionEvents::FIRED).into();
-                let down: f32 = down_action.contains(ActionEvents::FIRED).into();
-                let forward: f32 = forward_action.contains(ActionEvents::FIRED).into();
-                let backward: f32 = backward_action.contains(ActionEvents::FIRED).into();
+                let up: f32 = up_action.contains(ActionEvents::FIRE).into();
+                let down: f32 = down_action.contains(ActionEvents::FIRE).into();
 
                 player_input.movement = Vec3::new(
-                    right - left,
+                    movement_action[0],
                     up - down,
-                   forward - backward
+                    movement_action[1]
                 );
-                player_input.sprint = run_action.contains(ActionEvents::STARTED);
+                player_input.sprint = run_action.contains(ActionEvents::START);
             }
 }
 
@@ -232,7 +228,6 @@ pub fn tnua_player_input(
         ), With<Player>>,
     spatial_ext: TnuaSpatialExtAvian3d,
     obstacle_query: Query<ObstacleQueryHelper>,
-    asset_server: Res<AssetServer>,
 ) {
     // Get player's tnua controller, otherwise return
     let Ok((player_controller_config,
@@ -253,9 +248,11 @@ pub fn tnua_player_input(
     // Creates a 3D rotation matrix from a normalized rotation axis and angle (in radians).
     // returns a 3x3 column major matrix.
     let mut move_to_world = Mat3::from_axis_angle(Vec3::Y, player_controller_input.yaw);
+    //println!("MATRIX: {:?}", move_to_world);
     move_to_world.z_axis *= -1.0; // Forward is -Z
     move_to_world.y_axis = Vec3::Y; // Vertical movement aligned with world up
     let movement_direction = move_to_world * player_controller_input.movement;
+    //println!("{:?}\n", player_controller_input.movement);
 
     air_actions_counter.update(tnua_controller.as_mut());
 
@@ -272,7 +269,7 @@ pub fn tnua_player_input(
     //println!("Action State: {}", action_state.just_pressed(&Action::Jump));
     //if action_state.just_pressed(&Action::Jump) && air_actions_counter.air_count_for(TnuaBuiltinJump::NAME) == 0 {
     //if action_state.pressed(&LeafwingAction::Jump) {
-    if jump_action.contains(ActionEvents::FIRED) {
+    if jump_action.contains(ActionEvents::FIRE) {
         tnua_controller.action(PlayerControlScheme::Jump(Default::default()));
         if *player_state == PlayerState::Sitting {
             *player_state = PlayerState::Grounded;
@@ -281,11 +278,11 @@ pub fn tnua_player_input(
     }
 
     //if action_state.just_pressed(&LeafwingAction::Crouch) {
-    if crouch_action.contains(ActionEvents::STARTED) {
+    if crouch_action.contains(ActionEvents::START) {
         tnua_controller.action_start(PlayerControlScheme::Crouch(Default::default()));
     }
     //if action_state.just_released(&LeafwingAction::Crouch) {
-    if crouch_action.contains(ActionEvents::COMPLETED) {
+    if crouch_action.contains(ActionEvents::COMPLETE) {
         tnua_controller.action_end(PlayerControlSchemeActionDiscriminant::Crouch);
     }
 
@@ -302,7 +299,7 @@ pub fn tnua_player_input(
     };
 
     //if action_state.just_pressed(&LeafwingAction::Run) {
-    if run_action.contains(ActionEvents::STARTED) {
+    if run_action.contains(ActionEvents::START) {
         tnua_controller.action_trigger(PlayerControlScheme::Dash(TnuaBuiltinDash {
             displacement: movement_direction.normalize_or_zero(),
             ..default()
diff --git a/src/devroom.rs b/src/devroom.rs
index 965930e..1ed6ac1 100644
--- a/src/devroom.rs
+++ b/src/devroom.rs
@@ -1,4 +1,5 @@
 use bevy::prelude::*;
+use bevy_landmass::{Agent, Agent3dBundle, AgentSettings, AgentTarget3d, Archipelago3d, ArchipelagoRef3d};
 use bevy_sprite3d::Sprite3d;
 
 use crate::*;
@@ -16,7 +17,7 @@ pub struct DevRoomPlugin;
 impl Plugin for DevRoomPlugin {
     fn build(&self, app: &mut App) {
         app
-            .add_systems(OnEnter(GameState::Gameplay), spawn_sprites)
+            //.add_systems(OnEnter(GameState::Gameplay), spawn_sprites)
             .register_type::<FirstPassCube>()
             .register_type::<MainPassCube>();
     }
@@ -25,19 +26,208 @@ impl Plugin for DevRoomPlugin {
 fn spawn_sprites(
     mut commands: Commands,
     images: Res<ImageAssets>,
-    //mut sprite_params: Sprite3dParams,
-    mut sprite_message: MessageWriter<SpriteMessage>,
+    archipelago: Query<Entity, With<Archipelago3d>>,
 ) {
     info!("SYSTEM: spawn_sprites");
-    sprite_message.write(SpriteMessage { sprite_type: SpriteType::Character, tile_x: 8, tile_y: 0, x: 4.5, y: -4.0, height:1, frames:2 });
-    sprite_message.write(SpriteMessage { sprite_type: SpriteType::Character, tile_x: 4, tile_y: 0, x: 1.5, y: -7.0, height: 4, frames: 2});
-    sprite_message.write(SpriteMessage { sprite_type: SpriteType::Character, tile_x: 6, tile_y: 0, x: 0.5, y: 2.0, height: 4, frames: 2 });
-    sprite_message.write(SpriteMessage { sprite_type: SpriteType::Character, tile_x: 0, tile_y: 19, x: 3.5, y: 1.0, height: 1, frames: 1 });
-    sprite_message.write(SpriteMessage { sprite_type: SpriteType::Character, tile_x: 1, tile_y: 19, x: 4.0, y: 6.0, height: 1, frames: 1 });
-    sprite_message.write(SpriteMessage { sprite_type: SpriteType::Character, tile_x: 4, tile_y: 19, x: 0.0, y: 5.0, height: 1, frames: 1 });
-    sprite_message.write(SpriteMessage { sprite_type: SpriteType::Character, tile_x: 5, tile_y: 19, x: -4.0, y: 5.4, height:1, frames: 1});
-    sprite_message.write(SpriteMessage { sprite_type: SpriteType::Character, tile_x: 2, tile_y: 19, x: -0.5, y: -8.5, height:1, frames: 1 });
-    sprite_message.write(SpriteMessage { sprite_type: SpriteType::Character, tile_x: 13, tile_y: 16, x: 4.2, y: -8., height: 2, frames: 1 });
+    if let Ok(archipelago) = archipelago.single() {
+        commands.spawn((
+                CharacterSprite {
+                    tile_x: 8,
+                    tile_y: 0,
+                    x: 4.5,
+                    y: -4.0,
+                    height: 1,
+                    frames: 2
+                },
+                Agent3dBundle {
+                    agent: Agent::default(),
+                    archipelago_ref: ArchipelagoRef3d::new(archipelago),
+                    settings: AgentSettings {
+                        desired_speed: 5.0,
+                        max_speed: 10.0,
+                        radius: 0.5
+                    },
+                },
+                TnuaNpcController,
+                AgentTarget3d::Point(Vec3::new(15.0, 1.75, 15.0)),
+        ));
+
+        commands.spawn((
+                CharacterSprite {
+                    tile_x: 4,
+                    tile_y: 0,
+                    x: 1.5,
+                    y: -7.0,
+                    height: 4,
+                    frames: 2
+                },
+                Agent3dBundle {
+                    agent: Agent::default(),
+                    archipelago_ref: ArchipelagoRef3d::new(archipelago),
+                    settings: AgentSettings {
+                        desired_speed: 5.0,
+                        max_speed: 10.0,
+                        radius: 0.5
+                    },
+                },
+                TnuaNpcController,
+                AgentTarget3d::Point(Vec3::new(15.0, 1.75, 15.0)),
+        ));
+
+        commands.spawn((
+                CharacterSprite {
+                    tile_x: 6,
+                    tile_y: 0,
+                    x: 0.5,
+                    y: 2.0,
+                    height: 4,
+                    frames: 2
+                },
+                Agent3dBundle {
+                    agent: Agent::default(),
+                    archipelago_ref: ArchipelagoRef3d::new(archipelago),
+                    settings: AgentSettings {
+                        desired_speed: 5.0,
+                        max_speed: 10.0,
+                        radius: 0.5
+                    },
+                },
+                TnuaNpcController,
+                AgentTarget3d::Point(Vec3::new(15.0, 1.75, 15.0)),
+        ));
+
+        commands.spawn((
+                CharacterSprite {
+                    tile_x: 0,
+                    tile_y: 19,
+                    x: 3.5,
+                    y: 1.0,
+                    height: 1,
+                    frames: 1
+                },
+                Agent3dBundle {
+                    agent: Agent::default(),
+                    archipelago_ref: ArchipelagoRef3d::new(archipelago),
+                    settings: AgentSettings {
+                        desired_speed: 5.0,
+                        max_speed: 10.0,
+                        radius: 0.5
+                    },
+                },
+                TnuaNpcController,
+                AgentTarget3d::Point(Vec3::new(15.0, 1.75, 15.0)),
+        ));
+
+        commands.spawn((
+                CharacterSprite {
+                    tile_x: 1,
+                    tile_y: 19,
+                    x: 4.0,
+                    y: 6.0,
+                    height: 1,
+                    frames: 1
+                },
+                Agent3dBundle {
+                    agent: Agent::default(),
+                    archipelago_ref: ArchipelagoRef3d::new(archipelago),
+                    settings: AgentSettings {
+                        desired_speed: 5.0,
+                        max_speed: 10.0,
+                        radius: 0.5
+                    },
+                },
+                TnuaNpcController,
+                AgentTarget3d::Point(Vec3::new(15.0, 1.75, 15.0)),
+        ));
+
+        commands.spawn((
+                CharacterSprite {
+                    tile_x: 4,
+                    tile_y: 19,
+                    x: 0.0,
+                    y: 5.0,
+                    height: 1,
+                    frames: 1
+                },
+                Agent3dBundle {
+                    agent: Agent::default(),
+                    archipelago_ref: ArchipelagoRef3d::new(archipelago),
+                    settings: AgentSettings {
+                        desired_speed: 5.0,
+                        max_speed: 10.0,
+                        radius: 0.5
+                    },
+                },
+                TnuaNpcController,
+                AgentTarget3d::Point(Vec3::new(15.0, 1.75, 15.0)),
+        ));
+
+        commands.spawn((
+                CharacterSprite {
+                    tile_x: 5,
+                    tile_y: 19,
+                    x: -4.0,
+                    y: 5.4,
+                    height: 1,
+                    frames: 1
+                },
+                Agent3dBundle {
+                    agent: Agent::default(),
+                    archipelago_ref: ArchipelagoRef3d::new(archipelago),
+                    settings: AgentSettings {
+                        desired_speed: 5.0,
+                        max_speed: 10.0,
+                        radius: 0.5
+                    },
+                },
+                TnuaNpcController,
+                AgentTarget3d::Point(Vec3::new(15.0, 1.75, 15.0)),
+        ));
+
+        commands.spawn((
+                CharacterSprite {
+                    tile_x: 2,
+                    tile_y: 19,
+                    x: -0.5,
+                    y: -8.5,
+                    height: 1,
+                    frames: 1
+                },
+                Agent3dBundle {
+                    agent: Agent::default(),
+                    archipelago_ref: ArchipelagoRef3d::new(archipelago),
+                    settings: AgentSettings {
+                        desired_speed: 5.0,
+                        max_speed: 10.0,
+                        radius: 0.5
+                    },
+                },
+                TnuaNpcController,
+                AgentTarget3d::Point(Vec3::new(15.0, 1.75, 15.0)),
+        ));
+
+        commands.spawn((
+                CharacterSprite {
+                    tile_x: 13,
+                    tile_y: 16,
+                    x: 4.2,
+                    y: -8.,
+                    height: 2,
+                    frames: 1
+                },
+                Agent3dBundle {
+                    agent: Agent::default(),
+                    archipelago_ref: ArchipelagoRef3d::new(archipelago),
+                    settings: AgentSettings {
+                        desired_speed: 5.0,
+                        max_speed: 10.0,
+                        radius: 0.5
+                    },
+                },
+                TnuaNpcController,
+                AgentTarget3d::Point(Vec3::new(15.0, 1.75, 15.0)),
+        ));
+    }
 
     let atlas = TextureAtlas {
         layout: images.layout2.clone(),
@@ -63,7 +253,7 @@ fn spawn_sprites(
             current: 0,
             timer: Timer::from_seconds(0.2, TimerMode::Repeating),
         },
-        FaceCamera {},
+        FaceCamera,
     ));
 
     let atlas = TextureAtlas {
@@ -85,6 +275,6 @@ fn spawn_sprites(
             ..default()
         },
         Transform::from_xyz(-5., 0.7, 6.5),
-        FaceCamera {},
+        FaceCamera,
     ));
 }
diff --git a/src/dialog.rs b/src/dialog.rs
index cf18385..9524228 100644
--- a/src/dialog.rs
+++ b/src/dialog.rs
@@ -1,7 +1,6 @@
 use bevy::prelude::*;
 use serde::{Deserialize, Serialize};
 use bevy_yarnspinner::prelude::*;
-use bevy_yarnspinner_example_dialogue_view::prelude::*;
 
 #[derive(Debug, Component, Reflect, Eq, PartialEq, Serialize, Deserialize)]
 #[reflect(Component, Serialize, Deserialize)]
@@ -22,10 +21,10 @@ pub struct DialogPlugin;
 impl Plugin for DialogPlugin {
     fn build(&self, app: &mut App) {
         app
-            .add_plugins((
-                    YarnSpinnerPlugin::new(),
-                    ExampleYarnSpinnerDialogueViewPlugin::new(),
-                    ))
+            //.add_plugins((
+            //        YarnSpinnerPlugin::new(),
+            //        ExampleYarnSpinnerDialogueViewPlugin::new(),
+            //        ))
             .register_type::<YarnNode>()
             .add_message::<DialogMessage>()
             .add_observer(dialog_message_observer)
diff --git a/src/effects.rs b/src/effects.rs
deleted file mode 100644
index de19b7c..0000000
--- a/src/effects.rs
+++ /dev/null
@@ -1,42 +0,0 @@
-use bevy::prelude::*;
-
-#[derive(Default, Clone, Component, Reflect, StandardDist)]
-#[reflect(Component)]
-pub struct Poison(pub i32);
-#[derive(Default, Clone, Component, Reflect, StandardDist)]
-#[reflect(Component)]
-pub struct Fire(pub i32);
-#[derive(Default, Clone, Component, Reflect, StandardDist)]
-#[reflect(Component)]
-pub struct Frost(pub i32);
-
-#[derive(Default, Clone, Component, Reflect, StandardDist)]
-#[reflect(Component)]
-pub struct IsPoisoned(pub i32);
-#[derive(Default, Clone, Component, Reflect, StandardDist)]
-#[reflect(Component)]
-pub struct IsOnFire(pub i32);
-#[derive(Default, Clone, Component, Reflect, StandardDist)]
-#[reflect(Component)]
-pub struct IsFrosted(pub i32);
-
-#[derive(Default, Clone, Component, Reflect, StandardDist)]
-#[reflect(Component)]
-pub struct PoisonResistance(pub i32);
-#[derive(Default, Clone, Component, Reflect, StandardDist)]
-#[reflect(Component)]
-pub struct FireResistance(pub i32);
-#[derive(Default, Clone, Component, Reflect, StandardDist)]
-#[reflect(Component)]
-pub struct FrostResisance(pub i32);
-
-pub struct EffectsPlugin;
-
-impl Plugin for EffectsPlugin {
-}
-
-pub fn calc_effect<T: Component, U: Component>(
-    query: Query<AnyOf<(T, U)>>,
-    ) {
-    todo!()
-}
diff --git a/src/enemy.rs b/src/enemy.rs
index 45b60f8..246d1ec 100644
--- a/src/enemy.rs
+++ b/src/enemy.rs
@@ -1,17 +1,25 @@
+use avian3d::prelude::{Collider, CollisionLayers, LayerMask};
 use bevy::{ecs::{lifecycle::HookContext, world::DeferredWorld}, prelude::*};
+use bevy_landmass::{Agent, Agent3dBundle, AgentSettings, AgentTarget3d, Archipelago3d, ArchipelagoRef3d};
 
-use crate::{CharacterBundle, death_event_observer};
+use crate::{CharacterBundle, GameState, TnuaEnemyController, death_event_observer, level::CollisionLayer};
 
 #[derive(Default, Clone, Component, Reflect)]
 #[reflect(Component)]
+#[require(
+    TnuaEnemyController,
+    CollisionLayers::new(CollisionLayer::Player, LayerMask::ALL),
+)]
 #[component(on_add = on_enemy_add)]
+#[type_path("api")]
 pub struct Enemy;
 
 pub struct EnemyPlugin;
 impl Plugin for EnemyPlugin {
     fn build(&self, app: &mut App) {
         app
-            .register_type::<Enemy>();
+            .register_type::<Enemy>()
+            .add_systems(OnEnter(GameState::Gameplay), spawn_enemy_agent);
     }
 }
 
@@ -24,3 +32,31 @@ fn on_enemy_add(
         .insert(CharacterBundle::default())
         .observe(death_event_observer);
 }
+
+fn spawn_enemy_agent(
+    archipelago: Query<Entity, With<Archipelago3d>>,
+    mut commands: Commands,
+    mut meshes: ResMut<Assets<Mesh>>,
+    mut materials: ResMut<Assets<StandardMaterial>>,
+) {
+    if let Ok(archipelago) = archipelago.single() {
+        commands.spawn((
+                Agent3dBundle {
+                    agent: Agent::default(),
+                    archipelago_ref: ArchipelagoRef3d::new(archipelago),
+                    settings: AgentSettings {
+                        desired_speed: 5.0,
+                        max_speed: 10.0,
+                        radius: 0.5,
+                    },
+                },
+                Transform::from_xyz(-5.0, 0.5, -15.0),
+                AgentTarget3d::Point(Vec3::new(15.0, 1.75, 15.0)),
+                Mesh3d(meshes.add(Cuboid::new(1.0, 1.0, 1.0))),
+                MeshMaterial3d(materials.add(Color::WHITE)),
+                Collider::cuboid(1.0, 1.0, 1.0),
+        ))
+        .insert(Name::new("Enemy Cube"))
+        .insert(Enemy);
+    }
+}
diff --git a/src/furniture/chair.rs b/src/furniture/chair.rs
index db6b85a..4cacf72 100644
--- a/src/furniture/chair.rs
+++ b/src/furniture/chair.rs
@@ -1,7 +1,9 @@
+use std::time::Duration;
+
 use avian3d::prelude::RigidBodyDisabled;
 use bevy::{ecs::{lifecycle::HookContext, world::DeferredWorld}, prelude::*};
 
-use crate::{Interactable, InteractionEvent, Player, PlayerState};
+use crate::{CameraInterpolation, Interactable, InteractionEvent, Player, PlayerCamera, PlayerState};
 
 #[derive(Debug, Default, Component, Reflect)]
 #[reflect(Component)]
@@ -9,6 +11,7 @@ use crate::{Interactable, InteractionEvent, Player, PlayerState};
 #[require(
     Interactable,
 )]
+#[type_path("api")]
 pub struct Chair;
 
 pub struct ChairPlugin;
@@ -34,10 +37,13 @@ fn chair_interaction_observer(
     mut commands: Commands,
     mut player_query: Query<(&mut Transform, &mut PlayerState, Entity), With<Player>>,
     transform_query: Query<&GlobalTransform, Without<Player>>,
+    camera_query: Query<Entity, With<PlayerCamera>>,
+    time: Res<Time>,
 ) {
     trace!("OBSERVER: chair_interaction_observer");
     if let Ok((mut player_transform, mut player_state, player_entity)) = player_query.single_mut()
-        && let Ok(chair_transform) = transform_query.get(trigger.entity) {
+        && let Ok(chair_transform) = transform_query.get(trigger.entity)
+        && let Ok(camera_entity) = camera_query.single() {
             *player_transform = Transform {
                 translation: Vec3 { x: chair_transform.translation().x, y: chair_transform.translation().y + 1.0, z: chair_transform.translation().z },
                 rotation: chair_transform.rotation(),
@@ -45,6 +51,11 @@ fn chair_interaction_observer(
             };
             *player_state = PlayerState::Sitting;
             commands.entity(player_entity).insert(RigidBodyDisabled);
+            commands.entity(camera_entity)
+                .insert(CameraInterpolation {
+                    duration: time.elapsed() + Duration::new(1, 0),
+                    start_time: time.elapsed(),
+                });
     }
 }
 
diff --git a/src/furniture/computer.rs b/src/furniture/computer.rs
index cb3107b..216ee6a 100644
--- a/src/furniture/computer.rs
+++ b/src/furniture/computer.rs
@@ -1,9 +1,18 @@
-use avian3d::prelude::{Collider, RigidBody};
+use std::time::Instant;
+
+use avian3d::prelude::RigidBody;
+use bevy::asset::uuid::Uuid;
 use bevy::ecs::lifecycle::HookContext;
 use bevy::ecs::world::DeferredWorld;
+use bevy::input::ButtonState;
+use bevy::picking::PickingSystems;
+use bevy::picking::backend::ray::RayMap;
+use bevy::picking::pointer::{Location, PointerAction, PointerId, PointerInput};
 use bevy::prelude::*;
 use bevy::render::render_resource::{Extent3d, TextureFormat, TextureUsages};
-use bevy::color::palettes::css::GOLD;
+use bevy::color::palettes::css::{BLUE, GRAY, GREEN, RED};
+use bevy::window::{PrimaryWindow, WindowEvent};
+use bevy_ingame_clock::InGameClock;
 use ratatui::style::Stylize;
 use ratatui::widgets::{Block, Borders, Paragraph, Wrap};
 use ratatui::{Frame, Terminal};
@@ -11,9 +20,250 @@ use soft_ratatui::embedded_graphics_unicodefonts::{mono_8x13_atlas, mono_8x13_it
 use soft_ratatui::{EmbeddedGraphics, SoftBackend};
 use bevy::asset::RenderAssetUsages;
 use bevy::camera::RenderTarget;
-use std::f32::consts::PI;
 
-use crate::{GameState, Interactable, InteractionEvent};
+use crate::widgets::floating_windows::{floating_computer_rover_window_root, floating_computer_window_root};
+use crate::{Interactable, Rover, RoverBackwardEvent, RoverCamera, RoverForwardEvent, RoverLeftEvent, RoverRightEvent};
+
+/*
+ * Eventual CRT effect
+ *
+#[derive(AsBindGroup, Asset, TypePath, Debug, Clone)]
+struct ComputerScreenMaterial {
+}
+
+impl UiMaterial for ComputerScreenMaterial {
+    fn fragment_shader() -> bevy::shader::ShaderRef {
+    }
+}
+*/
+
+
+#[derive(Component)]
+#[require(
+    Node {
+        //width: px(300),
+        //height: px(50),
+        flex_direction: FlexDirection::Column,
+        ..default()
+    },
+    BackgroundColor(GREEN.into()),
+    Text("FORWARD".into()),
+)]
+#[component(on_add = on_forward_button_add)]
+pub struct ForwardButton;
+
+fn on_forward_button_add(
+    mut world: DeferredWorld,
+    context: HookContext,
+) {
+    world.commands()
+        .entity(context.entity)
+        .observe(icon_over)
+        .observe(icon_out)
+        .observe(forward_pressed)
+        .observe(forward_released);
+}
+
+#[derive(Component)]
+#[require(
+    Node {
+        //width: px(300),
+        //height: px(50),
+        flex_direction: FlexDirection::Column,
+        ..default()
+    },
+    BackgroundColor(GREEN.into()),
+    Text("BACKWARD".into()),
+)]
+#[component(on_add = on_backward_button_add)]
+pub struct BackwardButton;
+fn on_backward_button_add(
+    mut world: DeferredWorld,
+    context: HookContext,
+) {
+    world.commands()
+        .entity(context.entity)
+        .observe(icon_over)
+        .observe(icon_out)
+        .observe(backward_pressed)
+        .observe(backward_released);
+}
+
+#[derive(Component)]
+#[require(
+    Node {
+        //width: px(300),
+        //height: px(50),
+        flex_direction: FlexDirection::Column,
+        ..default()
+    },
+    Text("LEFT".into()),
+    BackgroundColor(GREEN.into()),
+)]
+#[component(on_add = on_left_button_add)]
+pub struct LeftButton;
+
+fn on_left_button_add(
+    mut world: DeferredWorld,
+    context: HookContext,
+) {
+    world.commands()
+        .entity(context.entity)
+        .observe(icon_over)
+        .observe(icon_out)
+        .observe(left_pressed)
+        .observe(left_released);
+}
+
+#[derive(Component)]
+#[require(
+    Node {
+        //width: px(300),
+        //height: px(50),
+        flex_direction: FlexDirection::Column,
+        ..default()
+    },
+    BackgroundColor(GREEN.into()),
+    Text("RIGHT".into()),
+)]
+#[component(on_add = on_right_button_add)]
+pub struct RightButton;
+
+fn on_right_button_add(
+    mut world: DeferredWorld,
+    context: HookContext,
+
+) {
+    world.commands()
+        .entity(context.entity)
+        .observe(icon_over)
+        .observe(icon_out)
+        .observe(right_pressed)
+        .observe(right_released);
+}
+
+#[derive(Component)]
+pub struct ComputerNode;
+
+#[derive(Component)]
+#[require(
+    Node {
+        position_type: PositionType::Absolute,
+        width: Val::Percent(10.),
+        height: Val::Percent(15.),
+        align_items: AlignItems::Center,
+        border_radius: BorderRadius::all(Val::Px(10.)),
+        left: Val::Px(20.),
+        top: Val::Px(400.),
+        flex_direction: FlexDirection::Column,
+        overflow: Overflow { x: OverflowAxis::Hidden, y: OverflowAxis::Hidden },
+        ..default()
+    },
+    BackgroundColor(BLUE.into()),
+    IconClickTimer(Timer::from_seconds(1.0, TimerMode::Once)),
+)]
+#[component(on_add = on_computer_icon_add)]
+pub struct ComputerIcon;
+
+#[derive(Component)]
+pub struct IconClickTimer(pub Timer);
+
+fn on_computer_icon_add(
+    mut world: DeferredWorld,
+    context: HookContext,
+) {
+    let icon: Handle<Image> = world.resource::<AssetServer>().load("icons/geometrica/save-block.png");
+
+    let icon_node = world.commands().spawn((
+        Node {
+            width: Val::Auto,
+            height: Val::Percent(75.),
+            ..default()
+        },
+        //BackgroundColor(GREEN.into()),
+        //Text::new("TEST"),
+        ImageNode::new(icon),
+    )).id();
+
+    let text_node = world.commands().spawn((
+        Node {
+            width: Val::Auto,
+            height: Val::Percent(25.),
+            ..default()
+        },
+        //BackgroundColor(GOLDENROD.into()),
+        Text::new("TEST"),
+    )).id();
+
+    world.commands()
+        .entity(context.entity)
+        .observe(icon_drag_observer)
+        .observe(icon_over)
+        .observe(icon_out)
+        .observe(icon_double_click_observer)
+        .add_child(icon_node)
+        .add_child(text_node);
+}
+
+#[derive(Component)]
+#[require(
+    Node {
+        position_type: PositionType::Absolute,
+        width: Val::Percent(25.),
+        height: Val::Percent(15.),
+        align_items: AlignItems::Center,
+        padding: UiRect::all(Val::Px(20.)),
+        border_radius: BorderRadius::all(Val::Px(10.)),
+        left: Val::Px(380.),
+        top: Val::Px(50.),
+        ..default()
+    },
+    Text("".into()),
+    BackgroundColor(BLUE.into()),
+)]
+#[component(on_add = on_computer_clock_add)]
+pub struct ComputerClock;
+
+fn on_computer_clock_add(
+    mut world: DeferredWorld,
+    context: HookContext,
+) {
+    world.commands()
+        .entity(context.entity)
+        .observe(icon_drag_observer)
+        .observe(icon_over)
+        .observe(icon_out);
+}
+
+// Marks the cube, to which the UI texture is applied.
+#[derive(Component, Reflect)]
+#[reflect(Component)]
+#[require(
+    Interactable,
+    RigidBody::Static,
+    Transform::from_xyz(15.0, 2.0, 1.5),
+    Name::new("ComputerCube"),
+)]
+#[component(on_add = on_cube_screen_add)]
+struct ComputerScreenCube;
+
+fn on_cube_screen_add(
+    mut world: DeferredWorld,
+    context: HookContext,
+) {
+    let my_material = world.resource::<MyProcGenMaterial>().0.clone();
+    let mut meshes = world.resource_mut::<Assets<Mesh>>();
+
+    let cube_size = 4.0;
+    let cube_handle = meshes.add(Cuboid::new(cube_size, cube_size, cube_size));
+
+    world.commands()
+        .entity(context.entity)
+        .insert(MeshMaterial3d(my_material))
+        .insert(Mesh3d(cube_handle));
+}
+
+const CUBE_POINTER_ID: PointerId = PointerId::Custom(Uuid::from_u128(90870987));
 
 #[derive(Clone, Hash, Debug, Eq, PartialEq, Default, States)]
 pub enum ComputerState {
@@ -31,28 +281,383 @@ pub struct ComputerPlugin;
 impl Plugin for ComputerPlugin {
     fn build(&self, app: &mut App) {
         app.init_resource::<SoftTerminal>()
-            .register_type::<ComputerCube>()
+            .register_type::<ComputerScreenCube>()
             .register_type::<ComputerTextureCam>()
-            .add_systems(OnEnter(GameState::Loading), spawn_computer);
+            .init_resource::<ComputerImage>()
+            .init_resource::<MyProcGenMaterial>()
+            .add_systems(Startup, setup)
+            .add_systems(First, drive_diegetic_pointer.in_set(PickingSystems::Input))
+            .add_systems(Update, update_click_timer)
+            .add_systems(Update, display_time);
     }
 }
 
-static FONT_DATA: &[u8] = include_bytes!("../../assets/iosevka.ttf");
-
 #[derive(Debug, Clone, Component, Reflect)]
 #[reflect(Component)]
-#[component(on_add = on_computer_add)]
 #[require(
-    Interactable,
+    Node {
+        // Cover the whole image
+        width: percent(100),
+        height: percent(100),
+        flex_direction: FlexDirection::Column,
+        justify_content: JustifyContent::Center,
+        align_items: AlignItems::Center,
+        ..default()
+    },
+    BackgroundColor(GRAY.into()),
+    Name::new("ComputerUiNode"),
 )]
-pub struct ComputerCube;
+#[component(on_add = on_computer_ui_node_add)]
+pub struct ComputerUiNode;
+
+fn on_computer_ui_node_add(
+    mut world: DeferredWorld,
+    context: HookContext,
+) {
+    world.commands()
+        .entity(context.entity)
+        .with_children(|parent| {
+            parent
+                .spawn((
+                    ComputerIcon,
+                ));
+            parent
+                .spawn((
+                    ComputerClock,
+                ));
+        });
+}
+
+fn update_click_timer(
+    mut timer_query: Query<&mut IconClickTimer>,
+    time: Res<Time>,
+) {
+    for mut timer in timer_query.iter_mut() {
+        timer.0.tick(time.delta());
+    }
+}
+
+fn icon_double_click_observer(
+    trigger: On<Pointer<Click>>,
+    mut timer_query: Query<&mut IconClickTimer>,
+    mut commands: Commands,
+    computer_ui_query: Query<Entity, With<ComputerUiNode>>,
+    rover_camera_query: Query<Entity, With<RoverCamera>>,
+) {
+    if let Ok(mut timer) = timer_query.get_mut(trigger.entity)
+    && let Ok(computer_ui) = computer_ui_query.single()
+    && let Ok(rover_camrea) = rover_camera_query.single() {
+        if timer.0.is_finished() {
+            timer.0.reset();
+        } else {
+            let window = commands.spawn((
+                    ComputerNode,
+                    floating_computer_rover_window_root("TEST".to_string(), (
+                        Node {
+                            width: Val::Auto,
+                            height: px(300),
+                            border: UiRect::all(px(5)),
+                            overflow: Overflow { x: OverflowAxis::Hidden, y: OverflowAxis::Hidden },
+                            flex_direction: FlexDirection::ColumnReverse,
+                            ..default()
+                        },
+                        ViewportNode::new(rover_camrea),
+                        BorderColor::all(Color::WHITE),
+                        Children::spawn(SpawnWith(|root_parent: &mut ChildSpawner| {
+                            // Button pane
+                            root_parent.spawn((
+                                Node {
+                                    width: px(300),
+                                    height: px(50),
+                                    flex_direction: FlexDirection::Row,
+                                    ..default()
+                                },
+                                Children::spawn(SpawnWith(|buttons_parent: &mut ChildSpawner| {
+                                    // Left Buttons
+                                    buttons_parent.spawn((
+                                        Node {
+                                            width: px(300),
+                                            height: px(50),
+                                            flex_direction: FlexDirection::Column,
+                                            ..default()
+                                        },
+                                        Children::spawn(SpawnWith(|parent: &mut ChildSpawner| {
+                                            parent.spawn((
+                                                ForwardButton,
+                                                //Node {
+                                                //    //width: px(300),
+                                                //    //height: px(50),
+                                                //    flex_direction: FlexDirection::Column,
+                                                //    ..default()
+                                                //},
+                                                //BackgroundColor(GREEN.into()),
+                                                //Text("FORWARD".into()),
+                                            ));
+                                            //.observe(icon_over)
+                                            //.observe(icon_out)
+                                            //.observe(forward_pressed);
+                                            parent.spawn((
+                                                BackwardButton,
+                                                //Node {
+                                                //    //width: px(300),
+                                                //    //height: px(50),
+                                                //    flex_direction: FlexDirection::Column,
+                                                //    ..default()
+                                                //},
+                                                //BackgroundColor(GREEN.into()),
+                                                //Text("BACKWARD".into()),
+                                            ));
+                                            //.observe(icon_over)
+                                            //.observe(icon_out)
+                                            //.observe(backward_pressed);
+                                        })),
+                                    ));
+                                    // Right Buttons
+                                    buttons_parent.spawn((
+                                        Node {
+                                            width: px(300),
+                                            height: px(50),
+                                            flex_direction: FlexDirection::Column,
+                                            ..default()
+                                        },
+                                        Children::spawn(SpawnWith(|parent: &mut ChildSpawner| {
+                                            parent.spawn((
+                                                LeftButton,
+                                                //Node {
+                                                //    //width: px(300),
+                                                //    //height: px(50),
+                                                //    flex_direction: FlexDirection::Column,
+                                                //    ..default()
+                                                //},
+                                                //BackgroundColor(GREEN.into()),
+                                                //Text("LEFT".into()),
+                                            ));
+                                            //.observe(icon_over)
+                                            //.observe(icon_out)
+                                            //.observe(left_pressed);
+                                            parent.spawn((
+                                                RightButton,
+                                                //Node {
+                                                //    //width: px(300),
+                                                //    //height: px(50),
+                                                //    flex_direction: FlexDirection::Column,
+                                                //    ..default()
+                                                //},
+                                                //BackgroundColor(GREEN.into()),
+                                                //Text("RIGHT".into()),
+                                            ));
+                                            //.observe(icon_over)
+                                            //.observe(icon_out)
+                                            //.observe(right_pressed);
+                                        })),
+                                    ));
+                                })),
+                            ));
+                        })),
+                    )),
+            )).id();
+
+            commands.entity(computer_ui).add_child(window);
+        }
+    }
+}
+
+fn icon_drag_observer(
+    drag: On<Pointer<Drag>>,
+    mut nodes: Query<(&mut Node, &ComputedNode)>,
+) {
+    if let Ok((mut node, computed)) = nodes.get_mut(drag.entity) {
+        node.left = Val::Px(drag.pointer_location.position.x - computed.size.x / 2.0);
+        node.top = Val::Px(drag.pointer_location.position.y - 50.0);
+    }
+}
+
+fn icon_over(
+    over: On<Pointer<Over>>,
+    mut colors: Query<&mut BackgroundColor>,
+) {
+    if let Ok(mut colors) = colors.get_mut(over.entity) {
+        colors.0 = RED.into();
+    }
+}
+
+fn icon_out(
+    out: On<Pointer<Out>>,
+    mut colors: Query<&mut BackgroundColor>,
+) {
+    if let Ok(mut colors) = colors.get_mut(out.entity) {
+        colors.0 = BLUE.into();
+    }
+}
+
+fn forward_pressed(
+    _trigger: On<Pointer<Press>>,
+    mut commands: Commands,
+    rover_query: Query<Entity, With<Rover>>,
+) {
+    if let Ok(rover_entity) = rover_query.single() {
+        println!("PRESS");
+        commands.entity(rover_entity).trigger(|entity| RoverForwardEvent { entity });
+    }
+}
+
+fn forward_released(
+    _trigger: On<Pointer<Release>>,
+    mut commands: Commands,
+    rover_query: Query<Entity, With<Rover>>,
+) {
+    if let Ok(rover_entity) = rover_query.single() {
+        println!("RELEASE");
+        commands.entity(rover_entity).trigger(|entity| RoverForwardEvent { entity });
+    }
+}
+
+fn backward_pressed(
+    _trigger: On<Pointer<Press>>,
+    mut commands: Commands,
+    rover_query: Query<Entity, With<Rover>>,
+) {
+    if let Ok(rover_entity) = rover_query.single() {
+        commands.entity(rover_entity).trigger(|entity| RoverBackwardEvent { entity });
+    }
+}
+
+fn backward_released(
+    _trigger: On<Pointer<Release>>,
+    mut commands: Commands,
+    rover_query: Query<Entity, With<Rover>>,
+) {
+    if let Ok(rover_entity) = rover_query.single() {
+        commands.entity(rover_entity).trigger(|entity| RoverBackwardEvent { entity });
+    }
+}
+
+fn left_pressed(
+    _trigger: On<Pointer<Press>>,
+    mut commands: Commands,
+    rover_query: Query<Entity, With<Rover>>,
+) {
+    if let Ok(rover_entity) = rover_query.single() {
+        commands.entity(rover_entity).trigger(|entity| RoverLeftEvent { entity });
+    }
+}
+
+fn left_released(
+    _trigger: On<Pointer<Release>>,
+    mut commands: Commands,
+    rover_query: Query<Entity, With<Rover>>,
+) {
+    if let Ok(rover_entity) = rover_query.single() {
+        commands.entity(rover_entity).trigger(|entity| RoverLeftEvent { entity });
+    }
+}
+
+fn right_pressed(
+    _trigger: On<Pointer<Press>>,
+    mut commands: Commands,
+    rover_query: Query<Entity, With<Rover>>,
+) {
+    if let Ok(rover_entity) = rover_query.single() {
+        commands.entity(rover_entity).trigger(|entity| RoverRightEvent { entity });
+    }
+}
+
+fn right_released(
+    _trigger: On<Pointer<Release>>,
+    mut commands: Commands,
+    rover_query: Query<Entity, With<Rover>>,
+) {
+    if let Ok(rover_entity) = rover_query.single() {
+        commands.entity(rover_entity).trigger(|entity| RoverRightEvent { entity });
+    }
+}
 
 #[derive(Debug, Clone, Component, Reflect)]
 #[reflect(Component)]
+#[require(
+    Camera2d,
+    Camera {
+        order: -1,
+        ..default()
+    },
+    Name::new("ComputerTextureCam"),
+)]
+#[component(on_add = on_computer_texture_cam_add)]
 pub struct ComputerTextureCam;
 
+fn on_computer_texture_cam_add(
+    mut world: DeferredWorld,
+    context: HookContext,
+) {
+    let computer_image = world.resource::<ComputerImage>().0.clone();
+
+    world.commands()
+        .entity(context.entity)
+        .insert(RenderTarget::Image(computer_image.into()));
+}
+
+#[derive(Resource)]
+pub struct ComputerImage(pub Handle<Image>);
+impl FromWorld for ComputerImage {
+    fn from_world(world: &mut World) -> Self {
+        //let mut softatui = world.resource_mut::<SoftTerminal>();
+
+        //let width = softatui.backend().get_pixmap_width() as u32;
+        //let height = softatui.backend().get_pixmap_height() as u32;
+        //let data = softatui.backend().get_pixmap_data_as_rgba();
+
+        //softatui.draw(draw_computer_screen)
+        //    .expect("oops");
+
+        //let mut image = Image::new(
+        let mut image = Image::new_fill(
+            Extent3d {
+                //width,
+                width: 512,
+                //height,
+                height: 512,
+                depth_or_array_layers: 1,
+            },
+            bevy::render::render_resource::TextureDimension::D2,
+            //data,
+            &[0, 0, 0, 0],
+            TextureFormat::Rgba8UnormSrgb,
+            //RenderAssetUsages::RENDER_WORLD | RenderAssetUsages::MAIN_WORLD,
+            RenderAssetUsages::default()
+        );
+        // You need to set these texture usage flags in order to use the image as a render target
+        image.texture_descriptor.usage =
+            TextureUsages::TEXTURE_BINDING | TextureUsages::COPY_DST | TextureUsages::RENDER_ATTACHMENT;
+
+        let mut images = world.resource_mut::<Assets<Image>>();
+
+        let image_handle = images.add(image);
+
+        Self(image_handle)
+    }
+}
+
 #[derive(Resource)]
 pub struct MyProcGenMaterial(pub Handle<StandardMaterial>);
+impl FromWorld for MyProcGenMaterial {
+    fn from_world(world: &mut World) -> Self {
+        let computer_image = world.resource::<ComputerImage>();
+        let computer_image = computer_image.0.clone();
+
+        let mut materials = world.resource_mut::<Assets<StandardMaterial>>();
+
+        let material_handle = materials.add(StandardMaterial {
+            base_color_texture: Some(computer_image.clone()),
+            reflectance: 0.02,
+            unlit: false,
+            emissive: Color::WHITE.into(),
+            emissive_texture: Some(computer_image),
+            ..default()
+        });
+
+        Self(material_handle.clone())
+    }
+}
 
 #[derive(Event)]
 pub struct ChangeScreenEvent {
@@ -80,17 +685,7 @@ impl Default for SoftTerminal {
     }
 }
 
-fn on_computer_add(
-    mut world: DeferredWorld,
-    context: HookContext,
-) {
-    trace!("HOOK: on_computer_add");
-    world.commands()
-        .entity(context.entity)
-        .observe(change_computer_screen);
-}
-
-fn change_computer_screen (
+/*fn change_computer_screen (
     _trigger: On<InteractionEvent>,
     mut softatui: ResMut<SoftTerminal>,
     proc_material: Res<MyProcGenMaterial>,
@@ -99,7 +694,8 @@ fn change_computer_screen (
 ) {
     trace!("SYSTEM: computer_test");
 
-    softatui.draw(new_computer_screen)
+    //softatui.draw(new_computer_screen)
+    softatui.draw(draw_computer_screen)
         .expect("oops");
 
     let width = softatui.backend().get_pixmap_width() as u32;
@@ -128,102 +724,9 @@ fn change_computer_screen (
         | TextureUsages::COPY_DST
         | TextureUsages::RENDER_ATTACHMENT;
     *image = temp;
-}
+}*/
 
-fn spawn_computer(
-    mut commands: Commands,
-    mut meshes: ResMut<Assets<Mesh>>,
-    mut materials: ResMut<Assets<StandardMaterial>>,
-    mut softatui: ResMut<SoftTerminal>,
-    mut images: ResMut<Assets<Image>>,
-) {
-    trace!("SYSTEM: spawn_computer");
-    softatui
-        .draw(draw_computer_screen)
-        .expect("epic fail");
-
-    let width = softatui.backend().get_pixmap_width() as u32;
-    let height = softatui.backend().get_pixmap_height() as u32;
-    let data = softatui.backend().get_pixmap_data_as_rgba();
-
-    let mut image = Image::new(
-        Extent3d {
-            width,
-            height,
-            depth_or_array_layers: 1,
-        },
-        bevy::render::render_resource::TextureDimension::D2,
-        data,
-        TextureFormat::Rgba8UnormSrgb,
-        RenderAssetUsages::RENDER_WORLD | RenderAssetUsages::MAIN_WORLD,
-    );
-    // You need to set these texture usage flags in order to use the image as a render target
-    image.texture_descriptor.usage =
-        TextureUsages::TEXTURE_BINDING | TextureUsages::COPY_DST | TextureUsages::RENDER_ATTACHMENT;
-
-    let image_handle = images.add(image);
-
-    // Light
-    commands.spawn(DirectionalLight::default());
-
-    let texture_camera = commands
-        .spawn((
-            Camera2d,
-            Camera {
-                target: RenderTarget::Image(image_handle.clone().into()),
-                ..default()
-            },
-            ComputerTextureCam,
-            Name::new("ComputerTextureCam"),
-        ))
-        .id();
-
-    commands
-        .spawn((
-            Node {
-                // Cover the whole image
-                width: Val::Percent(100.),
-                height: Val::Percent(100.),
-                flex_direction: FlexDirection::Column,
-                justify_content: JustifyContent::Center,
-                align_items: AlignItems::Center,
-                ..default()
-            },
-            BackgroundColor(GOLD.into()),
-            UiTargetCamera(texture_camera),
-            Name::new("ComputerBox"),
-        ))
-        .with_children(|parent| {
-            parent.spawn(ImageNode::new(image_handle.clone()));
-        });
-
-    let cube_size = 4.0;
-    let cube_handle = meshes.add(Cuboid::new(cube_size, cube_size, cube_size));
-
-    // This material has the texture that has been rendered.
-    let material_handle = materials.add(StandardMaterial {
-        base_color_texture: Some(image_handle.clone()),
-        reflectance: 0.02,
-        unlit: false,
-
-        ..default()
-    });
-
-    commands.insert_resource(MyProcGenMaterial(material_handle.clone()));
-
-    // Cube with material containing the rendered UI texture.
-    commands.spawn((
-        Mesh3d(cube_handle),
-        MeshMaterial3d(material_handle),
-        Transform::from_xyz(15.0, 2.0, 1.5).with_rotation(Quat::from_rotation_y(PI)),
-        Collider::cuboid(4.0, 4.0, 4.0),
-        RigidBody::Static,
-        ComputerCube,
-        Name::new("ComputerCube"),
-    ));
-}
-
-pub fn draw_computer_screen(frame: &mut Frame) {
+/*pub fn draw_computer_screen(frame: &mut Frame) {
     let area = frame.area();
     let textik = format!("Hello bevy! The window area is {}", area);
     frame.render_widget(
@@ -234,7 +737,7 @@ pub fn draw_computer_screen(frame: &mut Frame) {
             .wrap(Wrap { trim: false }),
         area,
     );
-}
+}*/
 
 pub fn new_computer_screen(frame: &mut Frame) {
     let area = frame.area();
@@ -248,3 +751,115 @@ pub fn new_computer_screen(frame: &mut Frame) {
         area,
     );
 }
+
+fn setup(
+    mut commands: Commands,
+) {
+    let texture_camera = commands
+        .spawn(ComputerTextureCam)
+        .id();
+
+    commands
+        .spawn((
+            ComputerUiNode,
+            UiTargetCamera(texture_camera),
+        ));
+
+    // Cube with material containing the rendered UI texture.
+    commands.spawn(ComputerScreenCube);
+
+    commands.spawn(CUBE_POINTER_ID);
+}
+
+/// Because bevy has no way to know how to map a mouse input to the UI texture, we need to write a
+/// system that tells it there is a pointer on the UI texture. We cast a ray into the scene and find
+/// the UV (2D texture) coordinates of the raycast hit. This UV coordinate is effectively the same
+/// as a pointer coordinate on a 2D UI rect.
+#[allow(clippy::too_many_arguments)]
+fn drive_diegetic_pointer(
+    mut cursor_last: Local<Vec2>,
+    mut raycast: MeshRayCast,
+    rays: Res<RayMap>,
+    cubes: Query<&Mesh3d, With<ComputerScreenCube>>,
+    ui_camera: Query<&RenderTarget, With<Camera2d>>,
+    primary_window: Query<Entity, With<PrimaryWindow>>,
+    windows: Query<(Entity, &Window)>,
+    images: Res<Assets<Image>>,
+    manual_texture_views: Res<ManualTextureViews>,
+    mut window_events: MessageReader<WindowEvent>,
+    mut pointer_inputs: MessageWriter<PointerInput>,
+) -> Result {
+    // Get the size of the texture, so we can convert from dimensionless UV coordinates that span
+    // from 0 to 1, to pixel coordinates.
+    let target = ui_camera
+        .single()?
+        .normalize(primary_window.single().ok())
+        .unwrap();
+    let target_info = target
+        .get_render_target_info(windows, &images, &manual_texture_views)
+        .unwrap();
+    let size = target_info.physical_size.as_vec2();
+
+    // Find raycast hits and update the virtual pointer.
+    let raycast_settings = MeshRayCastSettings {
+        visibility: RayCastVisibility::VisibleInView,
+        filter: &|entity| cubes.contains(entity),
+        early_exit_test: &|_| false,
+    };
+    for (_id, ray) in rays.iter() {
+        for (_cube, hit) in raycast.cast_ray(*ray, &raycast_settings) {
+            let position = size * hit.uv.unwrap();
+            if position != *cursor_last {
+                pointer_inputs.write(PointerInput::new(
+                    CUBE_POINTER_ID,
+                    Location {
+                        target: target.clone(),
+                        position,
+                    },
+                    PointerAction::Move {
+                        delta: position - *cursor_last,
+                    },
+                ));
+                *cursor_last = position;
+            }
+        }
+    }
+
+    // Pipe pointer button presses to the virtual pointer on the UI texture.
+    for window_event in window_events.read() {
+        if let WindowEvent::MouseButtonInput(input) = window_event {
+            let button = match input.button {
+                MouseButton::Left => PointerButton::Primary,
+                MouseButton::Right => PointerButton::Secondary,
+                MouseButton::Middle => PointerButton::Middle,
+                _ => continue,
+            };
+            let action = match input.state {
+                ButtonState::Pressed => PointerAction::Press(button),
+                ButtonState::Released => PointerAction::Release(button),
+            };
+            pointer_inputs.write(PointerInput::new(
+                CUBE_POINTER_ID,
+                Location {
+                    target: target.clone(),
+                    position: *cursor_last,
+                },
+                action,
+            ));
+        }
+    }
+
+    Ok(())
+}
+
+fn display_time(
+    clock: Res<InGameClock>,
+    mut clock_text_query: Query<&mut Text, With<ComputerClock>>,
+) {
+    if let Ok(mut clock_text) = clock_text_query.single_mut() {
+        clock_text.0 = format!(
+            "{}",
+            clock.format_datetime(None)
+        );
+    }
+}
diff --git a/src/furniture/door.rs b/src/furniture/door.rs
index a7767f2..1d20512 100644
--- a/src/furniture/door.rs
+++ b/src/furniture/door.rs
@@ -1,8 +1,9 @@
 use bevy::{ecs::{lifecycle::HookContext, world::DeferredWorld}, prelude::*};
 use bevy_seedling::sample::SamplePlayer;
 use rand::Rng;
+use rand::random_range;
 
-use crate::{Interactable, InteractionEvent, level::{BlenderAnimationName, LevelGltf}};
+use crate::{Interactable, InteractionEvent, level::{LevelGltf}};
 
 #[derive(Clone, Hash, Debug, Eq, PartialEq, Default, Component, Reflect)]
 #[reflect(Component)]
@@ -12,10 +13,65 @@ pub enum DoorState {
     Open,
 }
 
+#[derive(Clone, Hash, Debug, Eq, PartialEq, Default, Component, Reflect)]
+#[reflect(Component)]
+pub enum LockedState {
+    #[default]
+    Unlocked,
+    Locked,
+}
+
 #[derive(Resource)]
-pub struct DoorAnimation(pub Handle<AnimationClip>);
+pub struct OpenDoorAnimation(pub Handle<AnimationClip>);
+
+/*impl FromWorld for OpenDoorAnimation {
+    fn from_world(world: &mut World) -> Self {
+    }
+}*/
+
 #[derive(Resource)]
-pub struct DoorGraph(pub Handle<AnimationGraph>);
+pub struct CloseDoorAnimation(pub Handle<AnimationClip>);
+
+/*impl FromWorld for CloseDoorAnimation {
+    fn from_world(world: &mut World) -> Self {
+        let level_gltf = world.resource::<LevelGltf>();
+        if let Some(gltf) = world.resource::<Assets<Gltf>>().get(&level_gltf.0) {
+            let close_animation_clip_handle = gltf.named_animations["closedoor"].clone();
+            Self(close_animation_clip_handle)
+        } else {
+            Self(Handle<AnimationClip::default()>)
+        }
+    }
+}*/
+
+#[derive(Resource)]
+pub struct DoorGraph(pub AnimationGraphHandle);
+
+/*impl FromWorld for DoorGraph {
+    fn from_world(world: &mut World) -> Self {
+        let level_gltf = world.resource::<LevelGltf>();
+        if let Some(gltf) = world.resource::<Assets<Gltf>>().get(&level_gltf.0) {
+            let open_animation_clip_handle = gltf.named_animations["opendoor"].clone();
+            let close_animation_clip_handle = gltf.named_animations["closedoor"].clone();
+            let (animation_graph, _index) = AnimationGraph::from_clips([open_animation_clip_handle, close_animation_clip_handle]);
+
+            let mut animation_graphs = world.resource_mut::<Assets<AnimationGraph>>();
+            let graph = AnimationGraphHandle(animation_graphs.add(animation_graph));
+
+            Self(graph)
+        } else {
+            Self(AnimationGraphHandle::default())
+        }
+    }
+}*/
+
+#[derive(Component)]
+#[relationship(relationship_target = Keys)]
+pub struct KeyOf(pub Entity);
+
+#[derive(Component)]
+#[relationship_target(relationship = KeyOf)]
+pub struct Keys(Vec<Entity>);
 
 #[derive(Debug, Default, Component, Reflect)]
 #[reflect(Component)]
@@ -24,13 +80,16 @@ pub struct DoorGraph(pub Handle<AnimationGraph>);
     Interactable,
     DoorState,
 )]
+#[type_path("api")]
 pub struct DoorComponent;
 
 pub struct DoorPlugin;
 impl Plugin for DoorPlugin {
     fn build(&self, app: &mut App) {
         app.register_type::<DoorComponent>()
-            .register_type::<DoorState>();
+            .register_type::<DoorState>()
+            .register_type::<LockedState>();
+            //.init_resource::<DoorGraph>();
     }
 }
 
@@ -39,6 +98,9 @@ fn on_door_add(
     context: HookContext,
 ) {
     trace!("HOOK: on_door_add");
+
+    //let graph = world.resource::<DoorGraph>().0.clone();
+
     let level_gltf = world.resource::<LevelGltf>();
 
     if let Some(gltf) = world.resource::<Assets<Gltf>>().get(&level_gltf.0) {
@@ -49,8 +111,8 @@ fn on_door_add(
         let mut animation_graphs = world.resource_mut::<Assets<AnimationGraph>>();
         let graph = AnimationGraphHandle(animation_graphs.add(animation_graph));
 
-        world.commands().entity(context.entity)
-            .insert(graph);
+    world.commands().entity(context.entity)
+        .insert(graph);
     }
 
     world.commands()
@@ -63,15 +125,19 @@ fn door_interaction_observer(
     mut commands: Commands,
     asset_server: Res<AssetServer>,
     child_of_query: Query<&ChildOf>,
-    mut door: Query<(Entity, &mut AnimationPlayer, &mut DoorState)>,
+    mut door: Query<(Entity, &mut AnimationPlayer, &mut DoorState, Option<&LockedState>)>,
 ) {
     trace!("OBSERVER: door_event_observer");
     if let Ok(child_of) = child_of_query.get(trigger.entity)
     && let Ok(parent_child_of) = child_of_query.get(child_of.0)
     && let Ok(parent_parent_child_of) = child_of_query.get(parent_child_of.0)
-    && let Ok((_door_entity, mut door_animation_player, mut door_state)) = door.get_mut(parent_parent_child_of.0) {
+    && let Ok((_door_entity, mut door_animation_player, mut door_state, locked_state)) = door.get_mut(parent_parent_child_of.0) {
+        if locked_state.is_some()
+        && locked_state.unwrap() == &LockedState::Locked {
+            return;
+        }
         let mut rng = rand::rng();
-        let file = format!("audio/door/qubodup-DoorOpen0{}.ogg", rng.random_range(0..8));
+        let file = format!("audio/door/qubodup-DoorOpen0{}.ogg", random_range(0..8));
         if *door_state == DoorState::Closed {
             door_animation_player.stop_all();
             door_animation_player.play(1.into());
diff --git a/src/furniture/ladder.rs b/src/furniture/ladder.rs
index 82ea460..6aa0fc5 100644
--- a/src/furniture/ladder.rs
+++ b/src/furniture/ladder.rs
@@ -12,6 +12,7 @@ use crate::{Climbable, Player, PlayerState, level::BlenderTranslationComplete};
     BlenderTranslationComplete,
     Climbable,
 )]
+#[type_path("api")]
 pub struct LadderComponent;
 
 pub struct LadderPlugin;
diff --git a/src/interact.rs b/src/interact.rs
index 69cfac5..01f308d 100644
--- a/src/interact.rs
+++ b/src/interact.rs
@@ -1,5 +1,4 @@
 use bevy::prelude::*;
-use avian_pickup::prelude::*;
 
 #[derive(Component, Default)]
 pub struct Interactable;
@@ -59,7 +58,6 @@ impl Plugin for InteractPlugin {
     fn build(&self, app: &mut App) {
         trace!("InteractPlugin build");
         app
-            .add_plugins(AvianPickupPlugin::default())
             .add_message::<UnInspectMessage>();
     }
 }
diff --git a/src/items/ammo.rs b/src/items/ammo.rs
index cb11df0..825f590 100644
--- a/src/items/ammo.rs
+++ b/src/items/ammo.rs
@@ -1,6 +1,6 @@
-use bevy::{ecs::{lifecycle::HookContext, world::DeferredWorld}, prelude::*, state::commands};
+use bevy::{color::palettes::css::CRIMSON, ecs::{lifecycle::HookContext, world::DeferredWorld}, prelude::*};
 
-use crate::{Interactable, InteractionEvent, UseEvent};
+use crate::{InspectEvent, Interactable, InteractionEvent, ItemDetails, UiInspect, UseEvent, widgets};
 
 #[derive(Debug, Clone, Reflect, Default)]
 pub enum AmmoType {
@@ -14,6 +14,7 @@ pub enum AmmoType {
 #[require(
     Interactable,
 )]
+#[type_path("api")]
 pub struct Ammo;
 
 #[derive(Debug, Clone, Component,  Reflect, Default)]
@@ -37,6 +38,7 @@ fn on_ammo_add(
     world.commands()
         .entity(context.entity)
         .observe(ammo_interaction_observer)
+        .observe(ammo_inspection_observer)
         .observe(ammo_use_observer);
 }
 
@@ -48,10 +50,42 @@ fn ammo_interaction_observer(
     let _ammo = trigger.entity;
 }
 
+fn ammo_inspection_observer(
+    trigger: On<InspectEvent>,
+    name_query: Query<&ItemDetails>,
+    mut commands: Commands,
+) {
+    trace!("OBSERVER: ammo_inspection_observer");
+    if let Ok(name) = name_query.get(trigger.entity) {
+        commands.spawn((
+                Node {
+                    position_type: PositionType::Absolute,
+                    width: Val::Percent(5.),
+                    height: Val::Percent(5.),
+                    left: Val::Percent(55.),
+                    flex_direction: FlexDirection::Column,
+                    justify_content: JustifyContent::Center,
+                    align_self: AlignSelf::Center,
+                    flex_wrap: FlexWrap::Wrap,
+                    ..default()
+                },
+                BackgroundColor(CRIMSON.into()),
+                UiInspect,
+                children![
+                    widgets::label(name.name.clone()),
+                ]
+        ));
+    }
+}
+
 fn ammo_use_observer(
     trigger: On<UseEvent>,
     mut commands: Commands,
+    mut ammo_query: Query<&mut AmmoPouch>,
 ) {
     trace!("OBSERVER: ammo_use_observer");
-    commands.entity(trigger.entity).despawn();
+    if let Ok(mut ammo_pouch) = ammo_query.get_mut(trigger.actor) {
+        ammo_pouch.0 += 10;
+        commands.entity(trigger.entity).despawn();
+    }
 }
diff --git a/src/items/books.rs b/src/items/books.rs
index 5a1d4f1..3ba9c71 100644
--- a/src/items/books.rs
+++ b/src/items/books.rs
@@ -1,6 +1,6 @@
-use bevy::{ecs::{lifecycle::HookContext, world::DeferredWorld}, prelude::*};
+use bevy::{color::palettes::css::CRIMSON, ecs::{lifecycle::HookContext, world::DeferredWorld}, prelude::*};
 
-use crate::{Interactable, InteractionEvent, UseEvent, book_ui::display_book_ui};
+use crate::{InspectEvent, Interactable, InteractionEvent, ItemDetails, UiInspect, UseEvent, book_ui::display_book_ui, widgets};
 
 #[derive(EntityEvent)]
 pub struct OpenBookEvent {
@@ -13,6 +13,7 @@ pub struct OpenBookEvent {
 #[require(
     Interactable,
 )]
+#[type_path("api")]
 pub struct Book {
     pub title: String,
     pub contents: String,
@@ -40,6 +41,8 @@ fn on_book_add(
     world.commands()
         .entity(context.entity)
         .observe(book_interaction_observer)
+        .observe(book_inspection_observer)
+        .observe(book_use_observer)
         .observe(display_book_ui);
 }
 
@@ -51,6 +54,34 @@ fn book_interaction_observer(
     commands.entity(trigger.entity).trigger(|entity| OpenBookEvent { entity });
 }
 
+fn book_inspection_observer(
+    trigger: On<InspectEvent>,
+    name_query: Query<&ItemDetails>,
+    mut commands: Commands,
+) {
+    trace!("OBSERVER: book_inspection_observer");
+    if let Ok(name) = name_query.get(trigger.entity) {
+        commands.spawn((
+                Node {
+                    position_type: PositionType::Absolute,
+                    width: Val::Percent(5.),
+                    height: Val::Percent(5.),
+                    left: Val::Percent(55.),
+                    flex_direction: FlexDirection::Column,
+                    justify_content: JustifyContent::Center,
+                    align_self: AlignSelf::Center,
+                    flex_wrap: FlexWrap::Wrap,
+                    ..default()
+                },
+                BackgroundColor(CRIMSON.into()),
+                UiInspect,
+                children![
+                    widgets::label(name.name.clone()),
+                ]
+        ));
+    }
+}
+
 fn book_use_observer(
     trigger: On<UseEvent>,
     mut commands: Commands,
diff --git a/src/items/container.rs b/src/items/container.rs
index 9e57700..65b5d25 100644
--- a/src/items/container.rs
+++ b/src/items/container.rs
@@ -8,6 +8,7 @@ use crate::{DisplayInventoryEvent, InspectEvent, Interactable, InteractionEvent,
 #[require(
     Interactable,
 )]
+#[type_path("api")]
 pub struct Container;
 
 pub struct ContainerPlugin;
diff --git a/src/items/equip.rs b/src/items/equip.rs
index 526f43e..251208d 100644
--- a/src/items/equip.rs
+++ b/src/items/equip.rs
@@ -1,4 +1,4 @@
-use bevy::{ecs::{component::Component, entity::Entity, lifecycle::HookContext, observer::On, relationship, system::Commands, world::DeferredWorld}, prelude::Plugin, prelude::trace};
+use bevy::{ecs::{component::Component, entity::Entity, lifecycle::HookContext, observer::On, system::Commands, world::DeferredWorld}, prelude::Plugin, prelude::trace};
 
 use crate::UseEvent;
 
diff --git a/src/items/health_pack.rs b/src/items/health_pack.rs
new file mode 100644
index 0000000..f19bf45
--- /dev/null
+++ b/src/items/health_pack.rs
@@ -0,0 +1,106 @@
+use avian_pickup::{input::{AvianPickupAction, AvianPickupInput}, prop::HeldProp};
+use avian3d::prelude::RigidBodyDisabled;
+use bevy::{color::palettes::css::CRIMSON, ecs::{lifecycle::HookContext, world::DeferredWorld}, prelude::*};
+
+use crate::{AddToInventoryEvent, HealEvent, InspectEvent, Interactable, InteractionEvent, ItemDetails, PickupEvent, Shelf, UiInspect, UseEvent, widgets};
+
+#[derive(Component, Reflect, Default)]
+#[reflect(Component)]
+#[component(on_add = on_health_item_add)]
+#[require(
+    Interactable,
+)]
+#[type_path("api")]
+pub struct HealthItem;
+
+pub struct HealthItemPlugin;
+
+impl Plugin for HealthItemPlugin {
+    fn build(&self, app: &mut App) {
+        app.register_type::<HealthItem>();
+    }
+}
+
+fn on_health_item_add(
+    mut world: DeferredWorld,
+    context: HookContext,
+) {
+    trace!("HOOK: on_health_item_add");
+    world.commands()
+        .entity(context.entity)
+        .observe(health_item_interaction_observer)
+        .observe(health_item_pickup_observer)
+        .observe(health_item_inspection_observer)
+        .observe(health_item_use_observer);
+}
+
+fn health_item_interaction_observer(
+    trigger: On<InteractionEvent>,
+    mut commands: Commands,
+    parent_query: Query<&ChildOf>,
+    transform_query: Query<&Transform>,
+    _held_prop_query: Query<&HeldProp>,
+) {
+    trace!("OBSERVER: misc_interaction_observer");
+    let actor = trigger.event().actor;
+    if let Ok(parent) = parent_query.get(trigger.event().entity)
+    && let Ok(parent_transform) = transform_query.get(parent.0)
+    && let Ok(item_transform) = transform_query.get(trigger.event().entity) {
+        commands.entity(parent.0).insert(Shelf(Box::new(parent_transform.clone())));
+        commands.entity(trigger.event().entity).insert(Shelf(Box::new(item_transform.clone())));
+        commands.entity(parent.0).remove::<GlobalTransform>();
+        commands.entity(parent.0).remove::<Transform>();
+        commands.entity(trigger.event().entity).remove::<GlobalTransform>();
+        commands.entity(trigger.event().entity).remove::<Transform>();
+        commands.entity(actor).trigger(|entity| AddToInventoryEvent { entity, item: trigger.event().entity });
+    }
+}
+
+fn health_item_pickup_observer(
+    trigger: On<PickupEvent>,
+    mut commands: Commands,
+    mut avian_pickup_input_writer: MessageWriter<AvianPickupInput>,
+    _held_prop_query: Query<&HeldProp>,
+) {
+    trace!("OBSERVER: misc_interaction_observer");
+    let actor = trigger.event().actor;
+    commands.entity(trigger.event().entity).remove::<RigidBodyDisabled>();
+    avian_pickup_input_writer.write(AvianPickupInput { actor, action: AvianPickupAction::Pull });
+}
+
+fn health_item_inspection_observer(
+    trigger: On<InspectEvent>,
+    name_query: Query<&ItemDetails>,
+    mut commands: Commands,
+) {
+    trace!("OBSERVER: misc_inspection_observer");
+    if let Ok(name) = name_query.get(trigger.entity) {
+        commands.spawn((
+                Node {
+                    position_type: PositionType::Absolute,
+                    width: Val::Percent(5.),
+                    height: Val::Percent(5.),
+                    left: Val::Percent(55.),
+                    flex_direction: FlexDirection::Column,
+                    justify_content: JustifyContent::Center,
+                    align_self: AlignSelf::Center,
+                    flex_wrap: FlexWrap::Wrap,
+                    ..default()
+                },
+                BackgroundColor(CRIMSON.into()),
+                UiInspect,
+                children![
+                    widgets::label(name.name.clone()),
+                ]
+        ));
+    }
+}
+
+fn health_item_use_observer(
+    trigger: On<UseEvent>,
+    mut commands: Commands,
+) {
+    trace!("OBSERVER: health_item_use_observer");
+    commands.entity(trigger.actor).trigger(|entity| HealEvent { entity, ammount: 10 });
+    commands.entity(trigger.entity).despawn();
+}
diff --git a/src/items/mana_pack.rs b/src/items/mana_pack.rs
new file mode 100644
index 0000000..08e58d9
--- /dev/null
+++ b/src/items/mana_pack.rs
@@ -0,0 +1,106 @@
+use avian_pickup::{input::{AvianPickupAction, AvianPickupInput}, prop::HeldProp};
+use avian3d::prelude::RigidBodyDisabled;
+use bevy::{color::palettes::css::CRIMSON, ecs::{lifecycle::HookContext, world::DeferredWorld}, prelude::*};
+
+use crate::{AddToInventoryEvent, InspectEvent, Interactable, InteractionEvent, ItemDetails, ManaEvent, PickupEvent, Shelf, UiInspect, UseEvent, widgets};
+
+#[derive(Component, Reflect, Default)]
+#[reflect(Component)]
+#[component(on_add = on_mana_item_add)]
+#[require(
+    Interactable,
+)]
+#[type_path("api")]
+pub struct ManaItem;
+
+pub struct ManaItemPlugin;
+
+impl Plugin for ManaItemPlugin {
+    fn build(&self, app: &mut App) {
+        app.register_type::<ManaItem>();
+    }
+}
+
+fn on_mana_item_add(
+    mut world: DeferredWorld,
+    context: HookContext,
+) {
+    trace!("HOOK: on_mana_item_add");
+    world.commands()
+        .entity(context.entity)
+        .observe(mana_item_interaction_observer)
+        .observe(mana_item_pickup_observer)
+        .observe(mana_item_inspection_observer)
+        .observe(mana_item_use_observer);
+}
+
+fn mana_item_interaction_observer(
+    trigger: On<InteractionEvent>,
+    mut commands: Commands,
+    parent_query: Query<&ChildOf>,
+    transform_query: Query<&Transform>,
+    _held_prop_query: Query<&HeldProp>,
+) {
+    trace!("OBSERVER: misc_interaction_observer");
+    let actor = trigger.event().actor;
+    if let Ok(parent) = parent_query.get(trigger.event().entity)
+    && let Ok(parent_transform) = transform_query.get(parent.0)
+    && let Ok(item_transform) = transform_query.get(trigger.event().entity) {
+        commands.entity(parent.0).insert(Shelf(Box::new(parent_transform.clone())));
+        commands.entity(trigger.event().entity).insert(Shelf(Box::new(item_transform.clone())));
+        commands.entity(parent.0).remove::<GlobalTransform>();
+        commands.entity(parent.0).remove::<Transform>();
+        commands.entity(trigger.event().entity).remove::<GlobalTransform>();
+        commands.entity(trigger.event().entity).remove::<Transform>();
+        commands.entity(actor).trigger(|entity| AddToInventoryEvent { entity, item: trigger.event().entity });
+    }
+}
+
+fn mana_item_pickup_observer(
+    trigger: On<PickupEvent>,
+    mut commands: Commands,
+    mut avian_pickup_input_writer: MessageWriter<AvianPickupInput>,
+    _held_prop_query: Query<&HeldProp>,
+) {
+    trace!("OBSERVER: misc_interaction_observer");
+    let actor = trigger.event().actor;
+    commands.entity(trigger.event().entity).remove::<RigidBodyDisabled>();
+    avian_pickup_input_writer.write(AvianPickupInput { actor, action: AvianPickupAction::Pull });
+}
+
+fn mana_item_inspection_observer(
+    trigger: On<InspectEvent>,
+    name_query: Query<&ItemDetails>,
+    mut commands: Commands,
+) {
+    trace!("OBSERVER: misc_inspection_observer");
+    if let Ok(name) = name_query.get(trigger.entity) {
+        commands.spawn((
+                Node {
+                    position_type: PositionType::Absolute,
+                    width: Val::Percent(5.),
+                    height: Val::Percent(5.),
+                    left: Val::Percent(55.),
+                    flex_direction: FlexDirection::Column,
+                    justify_content: JustifyContent::Center,
+                    align_self: AlignSelf::Center,
+                    flex_wrap: FlexWrap::Wrap,
+                    ..default()
+                },
+                BackgroundColor(CRIMSON.into()),
+                UiInspect,
+                children![
+                    widgets::label(name.name.clone()),
+                ]
+        ));
+    }
+}
+
+fn mana_item_use_observer(
+    trigger: On<UseEvent>,
+    mut commands: Commands,
+) {
+    trace!("OBSERVER: mana_item_use_observer");
+    commands.entity(trigger.actor).trigger(|entity| ManaEvent { entity, ammount: -10 });
+    commands.entity(trigger.entity).despawn();
+}
diff --git a/src/items/misc.rs b/src/items/misc.rs
index 016f802..fe80be6 100644
--- a/src/items/misc.rs
+++ b/src/items/misc.rs
@@ -2,7 +2,7 @@ use avian_pickup::{input::{AvianPickupAction, AvianPickupInput}, prop::HeldProp}
 use avian3d::prelude::RigidBodyDisabled;
 use bevy::{color::palettes::css::CRIMSON, ecs::{lifecycle::HookContext, world::DeferredWorld}, prelude::*};
 
-use crate::{AddToInventoryEvent, InspectEvent, Interactable, InteractionEvent, PickupEvent, Shelf, UiInspect, widgets};
+use crate::{AddToInventoryEvent, InspectEvent, Interactable, InteractionEvent, ItemDetails, PickupEvent, Shelf, UiInspect, widgets};
 
 #[derive(Component, Reflect, Default)]
 #[reflect(Component)]
@@ -10,6 +10,7 @@ use crate::{AddToInventoryEvent, InspectEvent, Interactable, InteractionEvent, P
 #[require(
     Interactable,
 )]
+#[type_path("api")]
 pub struct MiscItem;
 
 pub struct MiscItemPlugin;
@@ -68,7 +69,7 @@ fn misc_pickup_observer(
 
 fn misc_inspection_observer(
     trigger: On<InspectEvent>,
-    name_query: Query<&Name>,
+    name_query: Query<&ItemDetails>,
     mut commands: Commands,
 ) {
     trace!("OBSERVER: misc_inspection_observer");
@@ -88,7 +89,7 @@ fn misc_inspection_observer(
                 BackgroundColor(CRIMSON.into()),
                 UiInspect,
                 children![
-                    widgets::label(name),
+                    widgets::label(name.name.clone()),
                 ]
         ));
     }
diff --git a/src/items/mod.rs b/src/items/mod.rs
index 54e0429..4194eef 100644
--- a/src/items/mod.rs
+++ b/src/items/mod.rs
@@ -3,6 +3,8 @@ mod armor;
 mod books;
 mod container;
 mod equip;
+mod health_pack;
+mod mana_pack;
 mod misc;
 mod weapons;
 
@@ -56,8 +58,10 @@ pub struct PlugSocketEvent {
     entity: Entity,
 }
 
-#[derive(Component, Clone, Default)]
-pub struct Item {
+#[derive(Component, Reflect, Clone, Default)]
+#[reflect(Component)]
+pub struct ItemDetails {
+    pub name: String,
     pub description: Description,
     pub weight: Weight,
 }
@@ -66,6 +70,7 @@ pub struct ItemPlugin;
 impl Plugin for ItemPlugin {
     fn build(&self, app: &mut App) {
         app
+            .register_type::<ItemDetails>()
             .register_type::<SocketItem>()
             .register_type::<PlugItem>()
             .register_type::<MountPoint>()
@@ -122,6 +127,7 @@ fn register_socket_items(
     }
 }
 
+#[allow(clippy::type_complexity)]
 fn socket_test(
     trigger: On<CollisionStart>,
     mut commands: Commands,
diff --git a/src/level.rs b/src/level.rs
index 2371089..cd02bfc 100644
--- a/src/level.rs
+++ b/src/level.rs
@@ -1,10 +1,10 @@
 use bevy_asset_loader::{asset_collection::AssetCollection, loading_state::{config::ConfigureLoadingState, LoadingState, LoadingStateAppExt}, standard_dynamic_asset::StandardDynamicAssetCollection};
-use bevy_sun_move::{SkyCenter, SunMovePlugin, TimedSkyConfig, random_stars::{RandomStarsPlugin, StarSpawner}};
+use bevy_sun_move::{SkyCenter, TimedSkyConfig, random_stars::StarSpawner};
+
+use crate::{BootStrap, MiscItem, Obstacle};
+use avian3d::{prelude::{ColliderConstructor, CollisionLayers, LayerMask, PhysicsLayer, RigidBody}};
+use bevy::{gltf::Gltf, prelude::*};
 
-use super::GameState;
-use crate::{Climbable, LadderComponent, MiscItem, Obstacle, ladder_collision_observer, ladder_decollision_observer};
-use avian3d::{prelude::{ColliderConstructor, CollidingEntities, CollisionEventsEnabled, CollisionLayers, LayerMask, PhysicsLayer, RigidBody}};
-use bevy::{ecs::{lifecycle::HookContext, world::DeferredWorld}, gltf::Gltf, prelude::*};
 #[derive(Debug, PhysicsLayer, Default, Component, Reflect)]
 #[reflect(Component)]
 pub enum CollisionLayer {
@@ -22,10 +22,12 @@ pub struct CurrentLevel;
 
 #[derive(Debug, Default, Component, Reflect)]
 #[reflect(Component)]
+#[type_path("api")]
 pub struct BlenderAnimations(pub Vec<String>);
 
 #[derive(Debug, Default, Component, Reflect)]
 #[reflect(Component)]
+#[type_path("api")]
 pub struct BlenderAnimationName(pub String);
 
 #[derive(Debug, Default, Component, Reflect)]
@@ -34,6 +36,7 @@ pub struct BlenderAnimationName(pub String);
     ColliderConstructor::ConvexHullFromMesh,
     BlenderTranslationComplete,
 )]
+#[type_path("api")]
 pub struct BlenderCollider;
 
 #[derive(Debug, Default, Component, Reflect)]
@@ -45,10 +48,12 @@ pub struct BlenderCollider;
     ColliderConstructor::ConvexHullFromMesh,
     BlenderTranslationComplete,
 )]
+#[type_path("api")]
 pub struct BlenderProp;
 
 #[derive(Debug, Default, Component, Reflect)]
 #[reflect(Component)]
+#[type_path("api")]
 pub struct BlenderBoxCollider {
     pub size: i32,
 }
@@ -61,14 +66,17 @@ pub struct BlenderBoxCollider {
     ColliderConstructor::ConvexHullFromMesh,
     BlenderTranslationComplete,
 )]
+#[type_path("api")]
 pub struct BlenderColliderConstructor;
 
 #[derive(Debug, Default, Component, Reflect)]
 #[reflect(Component)]
+#[type_path("api")]
 pub struct BlenderNavmesh;
 
 #[derive(Debug, Default, Component, Reflect)]
 #[reflect(Component)]
+#[type_path("api")]
 pub struct BlenderTranslationComplete;
 
 #[derive(Message)]
@@ -98,8 +106,6 @@ pub struct BlenderTranslationPlugin;
 impl Plugin for BlenderTranslationPlugin {
     fn build(&self, app: &mut App) {
         app
-            .add_plugins(SunMovePlugin)
-            .add_plugins(RandomStarsPlugin)
             .register_type::<BlenderCollider>()
             .register_type::<BlenderBoxCollider>()
             .register_type::<BlenderAnimationName>()
@@ -113,7 +119,7 @@ impl Plugin for BlenderTranslationPlugin {
             .add_message::<ChangeLevelMessage>()
             .add_systems(Update, change_level_message_handler)
             .add_loading_state(
-                LoadingState::new(GameState::Preload)
+                LoadingState::new(BootStrap::Preload)
                     .with_dynamic_assets_file::<StandardDynamicAssetCollection>("gunassets.ron")
                     .with_dynamic_assets_file::<StandardDynamicAssetCollection>("devroom.ron")
                     .load_collection::<DAGunAssets>()
@@ -145,19 +151,6 @@ fn change_level_message_handler(
             CurrentLevel,
         ));
 
-        /*commands.spawn((
-            DirectionalLight {
-                //illuminance: light_consts::lux::OVERCAST_DAY,
-                shadows_enabled: true,
-                ..default()
-            },
-            Transform {
-                translation: Vec3::new(0.0, 200.0, 0.0),
-                rotation: Quat::from_rotation_x(-PI / 4.),
-                ..default()
-            },
-        ));*/
-
         let sun_id = commands.spawn((
                 DirectionalLight {
                     shadows_enabled: true,
@@ -174,7 +167,6 @@ fn change_level_message_handler(
             night_duration_secs: 5.0, // 5 seconds of nighttime (15s total cycle)
             max_sun_height_deg: 60.0, // Sun reaches 60 degrees at noon
             planet_tilt_degrees: 23.5, // Earth's tilt (default)
-            ..default()
         };
 
         // Calculate  and spawn the SkyCenter
@@ -194,20 +186,3 @@ fn change_level_message_handler(
 
     }
 }
-
-/*fn animation_preload(
-    mut commands: Commands,
-    level_gltf: Res<LevelGltf>,
-    gltf_assets: Res<Assets<Gltf>>,
-    blender_animation_query: Query<(Entity, &BlenderAnimationName), Without<AnimationGraphHandle>>,
-    mut animation_graphs: ResMut<Assets<AnimationGraph>>,
-){
-    trace!("SYSTEM: animation_preload");
-    if let Some(gltf) = gltf_assets.get(&level_gltf.0) {
-        for (entity, _animation_name) in blender_animation_query.iter() {
-            let animation_clip_handle = gltf.named_animations["opendoor"].clone();
-            let (animation_graph, _index) = AnimationGraph::from_clip(animation_clip_handle);
-            commands.entity(entity).insert(AnimationGraphHandle(animation_graphs.add(animation_graph)));
-        }
-    }
-}*/
diff --git a/src/main.rs b/src/main.rs
index d5f0f29..6260ff3 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,15 +1,29 @@
+use avian_pickup::{AvianPickupPlugin};
+use avian_rerecast::AvianBackendPlugin;
 use avian3d::prelude::*;
 use bevy::{
-    log::LogPlugin, prelude::*, window::{ CursorGrabMode, CursorOptions, WindowResolution,}
+    color::palettes::css::GREEN, log::LogPlugin, prelude::*, text::FontSmoothing, window::{ CursorGrabMode, CursorOptions, WindowResolution,},
+    dev_tools::fps_overlay::{FpsOverlayPlugin, FpsOverlayConfig, FrameTimeGraphConfig},
 };
 use bevy_asset_loader::prelude::*;
+use bevy_bae::BaePlugin;
 use bevy_egui::EguiGlobalSettings;
+use bevy_hanabi::HanabiPlugin;
+use bevy_hotpatching_experiments::SimpleSubsecondPlugin;
+use bevy_ingame_clock::InGameClockPlugin;
 use bevy_inspector_egui::quick::WorldInspectorPlugin;
-use bevy_seedling::SeedlingPlugin;
+use bevy_landmass::{Landmass3dPlugin, debug::Landmass3dDebugPlugin};
+use bevy_mod_scripting::BMSPlugin;
+use bevy_rerecast::NavmeshPlugins;
+use bevy_simple_text_input::TextInputPlugin;
 use bevy_skein::SkeinPlugin;
 use bevy_sprite3d::Sprite3dPlugin;
+use bevy_sun_move::{SunMovePlugin, random_stars::RandomStarsPlugin};
+use bevy_yarnspinner::prelude::YarnSpinnerPlugin;
+use bevy_yarnspinner_example_dialogue_view::ExampleYarnSpinnerDialogueViewPlugin;
 use bevy_yoleck::prelude::*;
 use clap::Parser;
+use landmass_rerecast::LandmassRerecastPlugin;
 
 mod audio;
 mod character;
@@ -28,10 +42,12 @@ mod navmesh;
 mod npc;
 mod particles;
 mod player;
+mod quest;
 mod render;
 mod rover;
 mod shoot;
 mod sprites;
+mod states;
 mod tests;
 mod ui;
 mod utils;
@@ -49,10 +65,12 @@ pub use items::*;
 pub use navmesh::*;
 pub use npc::*;
 pub use player::*;
+pub use quest::*;
 pub use render::*;
 pub use rover::*;
 pub use shoot::*;
 pub use sprites::*;
+pub use states::*;
 pub use ui::*;
 pub use utils::*;
 use level::*;
@@ -68,33 +86,8 @@ struct Args {
     inspector: bool,
     #[clap(long)]
     level: Option<String>,
-}
-
-#[derive(Clone, Hash, Debug, Eq, PartialEq, Default, SubStates, Reflect)]
-#[source(GameState = GameState::Paused)]
-pub enum PauseMenuState {
-    ControllerSettings,
-    GameplaySettings,
-    #[default]
-    MainMenu,
-    Settings,
-    SoundSettings,
-    VideoSettings,
-}
-
-#[derive(Clone, Hash, Debug, Eq, PartialEq, Default, States, Reflect)]
-pub enum GameState {
-    Console,
-    Gameplay,
-    //Inventory,
-    Loading,
-    MainMenu,
-    Paused,
-    #[default]
-    Preload,
-    Postload,
-    GameOver,
-    StartMenu,
+    #[clap(long)]
+    fps: bool,
 }
 
 fn main() {
@@ -128,13 +121,37 @@ fn main() {
                 ..default()
             }),
     )
-    .insert_resource(AmbientLight {
+    .insert_resource(GlobalAmbientLight {
         color: Color::WHITE,
         brightness: 0.5,
         ..default()
     })
+    // Library Plugins
     .add_plugins((
         PhysicsPlugins::default(),
+        AvianPickupPlugin::default(),
+        YarnSpinnerPlugin::new(),
+        ExampleYarnSpinnerDialogueViewPlugin::new(),
+        Sprite3dPlugin,
+        SunMovePlugin,
+        RandomStarsPlugin,
+        Landmass3dPlugin::default(),
+        Landmass3dDebugPlugin::default(),
+        LandmassRerecastPlugin::default(),
+        NavmeshPlugins::default(),
+        AvianBackendPlugin::default(),
+        BaePlugin::default(),
+        HanabiPlugin,
+        TextInputPlugin,
+    ))
+    .add_plugins((
+        SkeinPlugin::default(),
+        SimpleSubsecondPlugin::default(),
+        BMSPlugin,
+        InGameClockPlugin,
+    ))
+    // Crate Plugins
+    .add_plugins((
         GamePlayerPlugin,
         CharacterPlugin,
         DevRoomPlugin,
@@ -148,20 +165,21 @@ fn main() {
         GameRenderPlugin,
         FurniturePlugin,
         ItemPlugin,
-        SkeinPlugin::default(),
+        AudioPlugin,
+        TestsPlugin,
     ))
     .add_plugins((
-            AudioPlugin,
-            TestsPlugin,
-            Sprite3dPlugin,
-            DialogPlugin,
-            NavMeshPlugin,
-            SpritesPlugin,
-            EnemyPlugin,
-            ParticlePlugin,
-            NpcPlugin,
+        StatesPlugin,
+        DialogPlugin,
+        NavMeshPlugin,
+        SpritesPlugin,
+        EnemyPlugin,
+        ParticlePlugin,
+        NpcPlugin,
+        QuestPlugin,
+        RoverPlugin,
     ));
-    app.add_systems(Update, pause_game);
+    app.add_systems(Update, pause_game.run_if(in_state(GameState::Gameplay)));
 
     if args.editor {
         app.add_plugins((
@@ -174,26 +192,29 @@ fn main() {
     if args.inspector {
         app.add_plugins(WorldInspectorPlugin::new());
     }
-    app.register_type::<RigidBody>()
-        .register_type::<GameState>()
-        .register_type::<PauseMenuState>()
-        .init_state::<GameState>()
-        .add_sub_state::<PauseMenuState>()
-        .add_loading_state(
-            LoadingState::new(GameState::Preload)
-                .continue_to_state(GameState::Loading)
-                .on_failure_continue_to_state(GameState::Loading)
-        )
-        .add_loading_state(
-            LoadingState::new(GameState::Loading)
-                .continue_to_state(GameState::Postload)
-                .on_failure_continue_to_state(GameState::Postload)
-        )
-        .add_loading_state(
-            LoadingState::new(GameState::Postload)
-                .continue_to_state(GameState::StartMenu)
-                .on_failure_continue_to_state(GameState::StartMenu)
-        );
+    if args.fps {
+        app.add_plugins(FpsOverlayPlugin {
+            config: FpsOverlayConfig {
+                text_config: TextFont {
+                    font_size: 42.0,
+                    font: default(),
+                    font_smoothing: FontSmoothing::default(),
+                    ..default()
+                },
+                text_color: Color::srgb(0.0, 1.0, 0.0),
+                refresh_interval: core::time::Duration::from_millis(100),
+                enabled: true,
+                frame_time_graph_config: FrameTimeGraphConfig {
+                    enabled: true,
+                    // The minimum acceptable fps
+                    min_fps: 30.0,
+                    // The target fps
+                    target_fps: 144.0,
+                },
+            }
+        });
+    }
+    app.register_type::<RigidBody>();
 
         if let Some(level) = args.level {
             app.world_mut().write_message(ChangeLevelMessage(level));
@@ -209,8 +230,6 @@ fn pause_game(
     game_state: ResMut<State<GameState>>,
     mut  game_state_setter: ResMut<NextState<GameState>>,
     mut physics_time: ResMut<Time<Physics>>,
-    //pause_menu_state: ResMut<State<PauseMenuState>>,
-    //mut pause_menu_state_setter: ResMut<NextState<PauseMenuState>>,
 ) {
     trace!("SYSTEM: pause_game");
     if key.just_pressed(KeyCode::Comma) {
diff --git a/src/navmesh.rs b/src/navmesh.rs
index 2f2cf19..7d1eac3 100644
--- a/src/navmesh.rs
+++ b/src/navmesh.rs
@@ -1,14 +1,12 @@
-use avian3d::{prelude::{Collider, RigidBody}};
-use avian_rerecast::AvianBackendPlugin;
 use bevy::{input::common_conditions::input_just_pressed, prelude::*};
-use bevy_landmass::{Agent, Agent3dBundle, AgentDesiredVelocity3d, AgentSettings, AgentTarget3d, Archipelago3d, ArchipelagoRef3d, Island, Landmass3dPlugin, Velocity3d, debug::{EnableLandmassDebug, Landmass3dDebugPlugin}};
-use bevy_tnua::{builtins::{TnuaBuiltinWalkConfig, TnuaBuiltinWallSlideConfig}, control_helpers::TnuaSimpleAirActionsCounter, prelude::*};
+use bevy_landmass::{AgentDesiredVelocity3d, Archipelago3d, ArchipelagoRef3d, Island, Velocity3d, debug::{EnableLandmassDebug}};
+use bevy_tnua::{control_helpers::TnuaSimpleAirActionsCounter, prelude::*};
 use bevy_tnua::TnuaRigidBodyTracker;
 use landmass::{ArchipelagoOptions, FromAgentRadius, PointSampleDistance3d};
-use landmass_rerecast::{Island3dBundle, LandmassRerecastPlugin, NavMeshHandle3d};
+use landmass_rerecast::{Island3dBundle, NavMeshHandle3d};
 use bevy_rerecast::prelude::*;
 
-use crate::{GameState, Player, PlayerControlScheme, TnuaNpcController};
+use crate::{BootStrap, Player, PlayerControlScheme};
 
 //#[derive(Resource)]
 //struct NavMeshHandle(Handle<Navmesh>);
@@ -47,15 +45,10 @@ pub struct NavMeshPlugin;
 impl Plugin for NavMeshPlugin {
     fn build(&self, app: &mut App) {
         app
-            .add_plugins(Landmass3dPlugin::default())
-            .add_plugins(Landmass3dDebugPlugin::default())
-            .add_plugins(LandmassRerecastPlugin::default())
-            .add_plugins(NavmeshPlugins::default())
-            .add_plugins(AvianBackendPlugin::default())
             .register_type::<Walk>()
             .register_type::<FloatHeight>()
             .register_type::<DesiredPosition>()
-            .add_systems(OnExit(GameState::Postload), landmass_rerecast_setup)
+            .add_systems(OnExit(BootStrap::Postload), landmass_rerecast_setup)
             .add_systems(Update, apply_walking)
             .add_systems(Update, toggle_landmass_debug.run_if(input_just_pressed(KeyCode::F12)));
 
@@ -87,28 +80,6 @@ fn landmass_rerecast_setup(
             generator.generate(NavmeshSettings { cell_size_fraction: 8., agent_radius: 0.5, ..Default::default() }),
         ),
     });
-
-    // Create an agent that will find a path as soon as the nav mesh is generated.
-    /*commands.spawn((
-            Agent3dBundle {
-                agent: Agent::default(),
-                archipelago_ref: ArchipelagoRef3d::new(archipelago),
-                settings: AgentSettings {
-                    desired_speed: 5.0,
-                    max_speed: 10.0,
-                    radius: 0.5
-                },
-            },
-            Transform::from_xyz(-5.0, 0.5, -15.0),
-            AgentTarget3d::Point(Vec3::new(15.0, 1.5, 15.0)),
-            Mesh3d(meshes.add(Cuboid::new(1.0, 1.0, 1.0))),
-            MeshMaterial3d(materials.add(Color::WHITE)),
-            RigidBody::Dynamic,
-            Collider::cuboid(1.0, 1.0, 1.0),
-    ))
-    .insert(TnuaNpcController)
-    .insert(Walk::default())
-    .insert(Name::new("Walking Cube"));*/
 }
 
 fn toggle_landmass_debug(mut debug: ResMut<EnableLandmassDebug>) {
@@ -116,14 +87,26 @@ fn toggle_landmass_debug(mut debug: ResMut<EnableLandmassDebug>) {
 }
 
 fn apply_walking(
-    mut character_query: Query<(&mut TnuaController<PlayerControlScheme>, &AgentDesiredVelocity3d, &mut Velocity3d, &TnuaRigidBodyTracker), Without<Player>>,
+    mut character_query: Query<
+    (
+        &mut TnuaController<PlayerControlScheme>,
+        &AgentDesiredVelocity3d,
+        &mut Velocity3d,
+        &TnuaRigidBodyTracker
+    ),
+        Without<Player>
+    >,
 ) {
     trace!("SYSTEM: apply_walking");
 
     for (mut controller, desired_velocity, mut agent_velocity, tracker) in &mut character_query {
         controller.initiate_action_feeding();
-        let Ok(direction) = Dir3::new(desired_velocity.velocity()) else { return };
-        controller.basis = TnuaBuiltinWalk { desired_motion: direction.normalize_or_zero(), desired_forward: Some(direction) };
+        let Ok(direction) = Dir3::new(desired_velocity.velocity()) else {
+            controller.basis = TnuaBuiltinWalk { desired_motion: desired_velocity.velocity().normalize_or_zero(), desired_forward: None };
+            agent_velocity.velocity = tracker.velocity;
+            return;
+        };
+        controller.basis = TnuaBuiltinWalk { desired_motion: desired_velocity.velocity().normalize_or_zero(), desired_forward: Some(direction) };
         agent_velocity.velocity = tracker.velocity;
     }
 }
diff --git a/src/npc.rs b/src/npc.rs
index 7940c3e..0bcd6a6 100644
--- a/src/npc.rs
+++ b/src/npc.rs
@@ -1,15 +1,20 @@
-use avian3d::prelude::{Collider, RigidBody};
+use avian3d::prelude::{Collider, SpatialQuery, SpatialQueryFilter};
 use bevy::prelude::*;
-use bevy_bae::*;
+use bevy_bae::{prelude::OperatorInput, task::OperatorStatus};
 use bevy_landmass::{Agent, Agent3dBundle, AgentSettings, AgentTarget3d, Archipelago3d, ArchipelagoRef3d};
+use rand::Rng;
+use rand::random_range;
 
-use crate::{GameState, TnuaNpcController, Walk};
+use crate::{Player, TnuaNpcController};
+
+#[derive(Component)]
+pub struct IdleTimer(pub Timer);
 
 pub struct NpcPlugin;
 impl Plugin for NpcPlugin {
     fn build(&self, app: &mut App) {
-       app
-           .add_systems(OnEnter(GameState::Gameplay), spawn_agent);
+       app;
+           //.add_systems(OnEnter(GameState::Gameplay), spawn_agent);
     }
 }
 
@@ -32,14 +37,68 @@ fn spawn_agent(
                     },
                 },
                 Transform::from_xyz(-5.0, 0.5, -15.0),
-                AgentTarget3d::Point(Vec3::new(15.0, 1.5, 15.0)),
+                AgentTarget3d::Point(Vec3::new(15.0, 1.75, 15.0)),
                 Mesh3d(meshes.add(Cuboid::new(1.0, 1.0, 1.0))),
                 MeshMaterial3d(materials.add(Color::WHITE)),
-                RigidBody::Dynamic,
                 Collider::cuboid(1.0, 1.0, 1.0),
         ))
         .insert(TnuaNpcController)
-        .insert(Walk::default())
         .insert(Name::new("Walking Cube"));
     }
 }
+
+pub fn run_from_player(
+    In(input): In<OperatorInput>,
+    spatial_query: SpatialQuery,
+    player_query: Query<(Entity, &Transform), With<Player>>,
+    transform_query: Query<&Transform, Without<Player>>,
+    mut agent_target_query: Query<&mut AgentTarget3d>,
+) -> OperatorStatus {
+    if let Ok((_player_entity, player_transform)) = player_query.single()
+    && let Ok(mut agent_target) = agent_target_query.get_mut(input.entity)
+    && let Ok(agent_transform) = transform_query.get(input.entity)
+    && let Ok(direction) = Dir3::new((player_transform.translation - agent_transform.translation).normalize())
+    && let Some(ray) = spatial_query.cast_ray(
+        agent_transform.translation,
+        direction,
+        100.,
+        true,
+        &SpatialQueryFilter::default().with_excluded_entities([input.entity])
+    )
+    && ray.distance <= 10. {
+        let mut rng = rand::rng();
+        *agent_target = AgentTarget3d::Point(Vec3::new(random_range(-15.0..15.0), 1.75, random_range(-15.0..15.0)));
+        //return OperatorStatus::Ongoing;
+        return OperatorStatus::Success
+    }
+    OperatorStatus::Success
+}
+
+pub fn wander(
+    In(input): In<OperatorInput>,
+    mut agent_target_query: Query<&mut AgentTarget3d>,
+) -> OperatorStatus {
+    if let Ok(mut agent_target) = agent_target_query.get_mut(input.entity) {
+        let mut rng = rand::rng();
+        *agent_target = AgentTarget3d::Point(Vec3::new(random_range(-15.0..15.0), 1.75, random_range(-15.0..15.0)));
+        return OperatorStatus::Success;
+    }
+    OperatorStatus::Failure
+}
+
+pub fn idle(
+    In(input): In<OperatorInput>,
+    mut idle_timer_query: Query<&mut IdleTimer>,
+    time: Res<Time>,
+) -> OperatorStatus {
+    if let Ok(mut idle_timer) = idle_timer_query.get_mut(input.entity) {
+        idle_timer.0.tick(time.delta());
+        if idle_timer.0.just_finished() {
+            idle_timer.0.reset();
+            return OperatorStatus::Success;
+        } else {
+            return OperatorStatus::Ongoing;
+        }
+    }
+    OperatorStatus::Failure
+}
diff --git a/src/particles.rs b/src/particles.rs
index d52c91f..5bb1ce1 100644
--- a/src/particles.rs
+++ b/src/particles.rs
@@ -1,29 +1,231 @@
-use std::{cell::RefCell, rc::Rc};
-
+use avian3d::prelude::*;
 use bevy::{ecs::{lifecycle::HookContext, world::DeferredWorld}, prelude::*};
-use bevy_hanabi::{AccelModifier, Attribute, ColorBlendMask, ColorOverLifetimeModifier, EffectAsset, EffectMaterial, ExprWriter, HanabiPlugin, OrientModifier, ParticleEffect, ParticleTextureModifier, ScalarType, SetAttributeModifier, SetPositionSphereModifier, SetVelocitySphereModifier, SizeOverLifetimeModifier, SpawnerSettings};
+use bevy_hanabi::{AccelModifier, Attribute, ColorBlendMask, ColorOverLifetimeModifier, EffectAsset, EffectMaterial, ExprWriter, OrientModifier, ParticleEffect, ParticleTextureModifier, ScalarType, SetAttributeModifier, SetPositionSphereModifier, SetVelocitySphereModifier, SizeOverLifetimeModifier, SpawnerSettings};
+use bevy_seedling::{prelude::SpatialBasicNode, sample::SamplePlayer, sample_effects};
 
-#[derive(Resource, Default)]
+#[derive(Resource)]
 pub struct FireEffectResource(Handle<EffectAsset>);
 
-#[derive(Resource, Default)]
+impl FromWorld for FireEffectResource {
+    fn from_world(world: &mut World) -> Self {
+        let mut effects = world.resource_mut::<Assets<EffectAsset>>();
+
+        // Define a color gradient from red to transparent black
+        let mut color_gradient = bevy_hanabi::Gradient::new();
+        //color_gradient.add_key(0.0, Vec4::new(1., 1., 1., 1.));
+        color_gradient.add_key(0.0, Vec4::new(1., 0., 0., 1.));
+        color_gradient.add_key(1.0, Vec4::new(1., 0.5, 0., 0.));
+
+        let mut size_gradient = bevy_hanabi::Gradient::new();
+        size_gradient.add_key(0.0, Vec3::new(0., 0., 0.));
+        size_gradient.add_key(0.2, Vec3::new(1., 1., 1.));
+        size_gradient.add_key(1.0, Vec3::new(0., 0., 0.));
+
+        let writer = ExprWriter::new();
+
+        let age = writer.lit(0.).expr();
+        let init_age = SetAttributeModifier::new(Attribute::AGE, age);
+
+        let rotation = (writer.rand(ScalarType::Float) * writer.lit(std::f32::consts::TAU)).expr();
+        let init_rotation = SetAttributeModifier::new(Attribute::F32_0, rotation);
+        let rotation_attr = writer.attr(Attribute::F32_0).expr();
+
+        let age_rot = (writer.attr(Attribute::F32_0) + (writer.lit(40.) * writer.attr(Attribute::AGE))).expr();
+
+        let texture_slot = writer.lit(0u32).expr();
+
+        // Create a new expression module
+        //let mut module = Module::default();
+        let mut module = writer.finish();
+
+        // On spawn, randomly initialize the position of the particle
+        // to be over the surface of a sphere of radius 2 units.
+        let init_pos = SetPositionSphereModifier {
+            center: module.lit(Vec3::ZERO),
+            radius: module.lit(0.4),
+            dimension: bevy_hanabi::ShapeDimension::Volume,
+        };
+
+        // Also initialize a radial initial velocity to 6 units/sec
+        // away from the (same) sphere center.
+        let init_vel = SetVelocitySphereModifier {
+            center: module.lit(Vec3::ZERO),
+            //speed: module.lit(6.),
+            speed: module.lit(Vec3::new(0., 5., 0.)),
+        };
+
+        // Initialize the total lifetime of the particle, that is
+        // the time for which it's simulated and rendered. This modifier
+        // is almost always required, otherwise the particles will stay
+        // alive forever, and new particles can't be spawned instead.
+        let lifetime = module.lit(0.5); // literal value "10.0"
+        let init_lifetime = SetAttributeModifier::new(Attribute::LIFETIME, lifetime);
+
+        // Every frame, add a gravity-like acceleration downward
+        let accel = module.lit(Vec3::new(0., 3., 0.));
+        let update_accel = AccelModifier::new(accel);
+
+        module.add_texture_slot("color");
+
+        // Create the effect asset
+        let effect = EffectAsset::new(
+            // Maximum number of particles alive at a time
+            5000,
+            // Spawn at a rate of 5 particles per second
+            SpawnerSettings::rate(500.0.into()),
+            // Move the expression module into the asset
+            module,
+        )
+        .with_name("FireEffect")
+        .init(init_pos)
+        .init(init_vel)
+        .init(init_lifetime)
+        .init(init_age)
+        .init(init_rotation)
+        .update(update_accel)
+        // Render the particles with a color gradient over their
+        // lifetime. This maps the gradient key 0 to the particle spawn
+        // time, and the gradient key 1 to the particle death (10s).
+        .render(ColorOverLifetimeModifier {
+            gradient: color_gradient,
+            blend: bevy_hanabi::ColorBlendMode::Overwrite,
+            mask: ColorBlendMask::RGBA,
+        })
+        .render(OrientModifier {
+            mode: bevy_hanabi::OrientMode::FaceCameraPosition,
+            rotation: Some(rotation_attr),
+            //rotation: None,
+        }.with_rotation(age_rot))
+        .render(SizeOverLifetimeModifier {
+            gradient: size_gradient,
+            screen_space_size: false,
+        })
+        .render(ParticleTextureModifier {
+            texture_slot,
+            sample_mapping: bevy_hanabi::ImageSampleMapping::ModulateOpacityFromR,
+        });
+
+        // Insert into the asset system
+        let effect_asset = effects.add(effect);
+
+        Self(effect_asset)
+    }
+}
+
+#[derive(Resource)]
 pub struct SmokeEffectResource(Handle<EffectAsset>);
 
+impl FromWorld for SmokeEffectResource {
+    fn from_world(world: &mut World) -> Self {
+        let mut effects = world.resource_mut::<Assets<EffectAsset>>();
+        let mut color_gradient = bevy_hanabi::Gradient::new();
+        color_gradient.add_key(0.0, Vec4::new(0., 0., 0., 0.));
+        color_gradient.add_key(0.5, Vec4::new(1., 1., 1., 0.5));
+        color_gradient.add_key(1.0, Vec4::new(0., 0., 0., 0.));
+
+        let mut size_gradient = bevy_hanabi::Gradient::new();
+        size_gradient.add_key(0.0, Vec3::new(0., 0., 0.));
+        size_gradient.add_key(0.2, Vec3::new(1., 1., 1.));
+        size_gradient.add_key(1.0, Vec3::new(0., 0., 0.));
+
+        let writer = ExprWriter::new();
+
+        let age = writer.lit(0.).expr();
+        let init_age = SetAttributeModifier::new(Attribute::AGE, age);
+
+        let rotation = (writer.rand(ScalarType::Float) * writer.lit(std::f32::consts::TAU)).expr();
+        let init_rotation = SetAttributeModifier::new(Attribute::F32_0, rotation);
+        let rotation_attr = writer.attr(Attribute::F32_0).expr();
+
+        let age_rot = (writer.attr(Attribute::F32_0) + (writer.lit(40.) * writer.attr(Attribute::AGE))).expr();
+
+        let texture_slot = writer.lit(0u32).expr();
+
+        let mut module = writer.finish();
+
+        let init_pos = SetPositionSphereModifier {
+            center: module.lit(Vec3::ZERO),
+            radius: module.lit(0.4),
+            dimension: bevy_hanabi::ShapeDimension::Volume,
+        };
+
+        let init_vel = SetVelocitySphereModifier {
+            center: module.lit(Vec3::ZERO),
+            speed: module.lit(Vec3::new(0., 4., 0.)),
+        };
+
+        let lifetime = module.lit(1.0); // literal value "10.0"
+        let init_lifetime = SetAttributeModifier::new(Attribute::LIFETIME, lifetime);
+
+        let accel = module.lit(Vec3::new(0., 3., 0.));
+        let update_accel = AccelModifier::new(accel);
+
+        module.add_texture_slot("color");
+
+        let effect = EffectAsset::new(
+            5000,
+            SpawnerSettings::rate(50.0.into()),
+            module
+        )
+        .with_name("SmokeEffect")
+        .init(init_pos)
+        .init(init_vel)
+        .init(init_lifetime)
+        .init(init_age)
+        .init(init_rotation)
+        .update(update_accel)
+        .render(ColorOverLifetimeModifier {
+            gradient: color_gradient,
+            blend: bevy_hanabi::ColorBlendMode::Overwrite,
+            mask: ColorBlendMask::RGBA,
+        })
+        .render(OrientModifier {
+            mode: bevy_hanabi::OrientMode::FaceCameraPosition,
+            rotation: Some(rotation_attr),
+            //rotation: None,
+        }.with_rotation(age_rot))
+        .render(SizeOverLifetimeModifier {
+            gradient: size_gradient,
+            screen_space_size: false,
+        })
+        .render(ParticleTextureModifier {
+            texture_slot,
+            sample_mapping: bevy_hanabi::ImageSampleMapping::ModulateOpacityFromR,
+        });
+
+        let effect_asset = effects.add(effect);
+
+        Self(effect_asset)
+    }
+}
+
 #[derive(Component, Reflect)]
 #[reflect(Component)]
+#[require(
+    CollisionEventsEnabled,
+)]
 #[component(on_add = on_particle_tester_add)]
+#[type_path("api")]
 pub struct ParticleTester;
 
+#[derive(Component, Reflect)]
+#[reflect(Component)]
+#[require(
+    CollisionEventsEnabled,
+)]
+#[type_path("api")]
+pub struct Flamable;
+
 pub struct ParticlePlugin;
 impl Plugin for ParticlePlugin {
     fn build(&self, app: &mut App) {
        app
-           .add_plugins(HanabiPlugin)
            .register_type::<ParticleTester>()
+           .register_type::<Flamable>()
            .init_resource::<FireEffectResource>()
-           .init_resource::<SmokeEffectResource>()
-           .add_systems(Startup, smoke_effect)
-           .add_systems(Startup, fire_effect);
+           .init_resource::<SmokeEffectResource>();
+           //.add_systems(Startup, smoke_effect)
+           //.add_systems(Startup, fire_effect);
     }
 }
 
@@ -35,6 +237,8 @@ fn on_particle_tester_add(
     let fire_resource = world.resource::<FireEffectResource>().0.clone();
     let smoke_resource = world.resource::<SmokeEffectResource>().0.clone();
     let texture_handle: Handle<Image> = asset_server.load("particles/cloud.png");
+    let sample_player = SamplePlayer::new(asset_server.load("audio/fire-1.ogg")).looping();
+
     let fire_emitter = world.commands().spawn((
             ParticleEffect::new(fire_resource),
             EffectMaterial {
@@ -47,194 +251,25 @@ fn on_particle_tester_add(
                 images: vec![texture_handle.clone()],
             },
     )).id();
-    world.commands().entity(context.entity).add_child(fire_emitter).add_child(smoke_emitter);
-}
 
-fn smoke_effect(
-    mut effects: ResMut<Assets<EffectAsset>>,
-    mut smoke_resource: ResMut<SmokeEffectResource>,
-) {
-    let mut color_gradient = bevy_hanabi::Gradient::new();
-    color_gradient.add_key(0.0, Vec4::new(0., 0., 0., 0.));
-    color_gradient.add_key(0.5, Vec4::new(1., 1., 1., 0.5));
-    color_gradient.add_key(1.0, Vec4::new(0., 0., 0., 0.));
-
-    let mut size_gradient = bevy_hanabi::Gradient::new();
-    size_gradient.add_key(0.0, Vec3::new(0., 0., 0.));
-    size_gradient.add_key(0.2, Vec3::new(1., 1., 1.));
-    size_gradient.add_key(1.0, Vec3::new(0., 0., 0.));
-
-    let writer = ExprWriter::new();
-
-    let age = writer.lit(0.).expr();
-    let init_age = SetAttributeModifier::new(Attribute::AGE, age);
-
-    let rotation = (writer.rand(ScalarType::Float) * writer.lit(std::f32::consts::TAU)).expr();
-    let init_rotation = SetAttributeModifier::new(Attribute::F32_0, rotation);
-    let rotation_attr = writer.attr(Attribute::F32_0).expr();
-
-    let age_rot = (writer.attr(Attribute::F32_0) + (writer.lit(40.) * writer.attr(Attribute::AGE))).expr();
-
-    let texture_slot = writer.lit(0u32).expr();
-
-    let mut module = writer.finish();
-
-    let init_pos = SetPositionSphereModifier {
-        center: module.lit(Vec3::ZERO),
-        radius: module.lit(0.4),
-        dimension: bevy_hanabi::ShapeDimension::Volume,
-    };
-
-    let init_vel = SetVelocitySphereModifier {
-        center: module.lit(Vec3::ZERO),
-        speed: module.lit(Vec3::new(0., 4., 0.)),
-    };
-
-    let lifetime = module.lit(1.0); // literal value "10.0"
-    let init_lifetime = SetAttributeModifier::new(Attribute::LIFETIME, lifetime);
-
-    let accel = module.lit(Vec3::new(0., 3., 0.));
-    let update_accel = AccelModifier::new(accel);
-
-    module.add_texture_slot("color");
-
-    let effect = EffectAsset::new(
-        5000,
-        SpawnerSettings::rate(50.0.into()),
-        module
-    )
-    .with_name("SmokeEffect")
-    .init(init_pos)
-    .init(init_vel)
-    .init(init_lifetime)
-    .init(init_age)
-    .init(init_rotation)
-    .update(update_accel)
-    .render(ColorOverLifetimeModifier {
-        gradient: color_gradient,
-        blend: bevy_hanabi::ColorBlendMode::Overwrite,
-        mask: ColorBlendMask::RGBA,
-    })
-    .render(OrientModifier {
-        mode: bevy_hanabi::OrientMode::FaceCameraPosition,
-        rotation: Some(rotation_attr),
-        //rotation: None,
-    }.with_rotation(age_rot))
-    .render(SizeOverLifetimeModifier {
-        gradient: size_gradient,
-        screen_space_size: false,
-    })
-    .render(ParticleTextureModifier {
-        texture_slot,
-        sample_mapping: bevy_hanabi::ImageSampleMapping::ModulateOpacityFromR,
-    });
-
-    let effect_asset = effects.add(effect);
-
-    smoke_resource.0 = effect_asset;
+    world.commands()
+        .entity(context.entity)
+        .insert((
+            sample_player,
+            sample_effects!(SpatialBasicNode::default())
+        ))
+        .add_child(fire_emitter)
+        .add_child(smoke_emitter)
+        .observe(fire_collision_observer);
 }
 
-fn fire_effect(
-    mut effects: ResMut<Assets<EffectAsset>>,
-    mut fire_resource: ResMut<FireEffectResource>,
+fn fire_collision_observer(
+    trigger: On<CollisionStart>,
+    mut commands: Commands,
+    flamable_query: Query<Entity, (With<Flamable>, Without<ParticleTester>)>,
 ) {
-    // Define a color gradient from red to transparent black
-    let mut color_gradient = bevy_hanabi::Gradient::new();
-    //color_gradient.add_key(0.0, Vec4::new(1., 1., 1., 1.));
-    color_gradient.add_key(0.0, Vec4::new(1., 0., 0., 1.));
-    color_gradient.add_key(1.0, Vec4::new(1., 0.5, 0., 0.));
-
-    let mut size_gradient = bevy_hanabi::Gradient::new();
-    size_gradient.add_key(0.0, Vec3::new(0., 0., 0.));
-    size_gradient.add_key(0.2, Vec3::new(1., 1., 1.));
-    size_gradient.add_key(1.0, Vec3::new(0., 0., 0.));
-
-    let writer = ExprWriter::new();
-
-    let age = writer.lit(0.).expr();
-    let init_age = SetAttributeModifier::new(Attribute::AGE, age);
-
-    let rotation = (writer.rand(ScalarType::Float) * writer.lit(std::f32::consts::TAU)).expr();
-    let init_rotation = SetAttributeModifier::new(Attribute::F32_0, rotation);
-    let rotation_attr = writer.attr(Attribute::F32_0).expr();
-
-    let age_rot = (writer.attr(Attribute::F32_0) + (writer.lit(40.) * writer.attr(Attribute::AGE))).expr();
-
-    let texture_slot = writer.lit(0u32).expr();
-
-    // Create a new expression module
-    //let mut module = Module::default();
-    let mut module = writer.finish();
-
-    // On spawn, randomly initialize the position of the particle
-    // to be over the surface of a sphere of radius 2 units.
-    let init_pos = SetPositionSphereModifier {
-        center: module.lit(Vec3::ZERO),
-        radius: module.lit(0.4),
-        dimension: bevy_hanabi::ShapeDimension::Volume,
-    };
-
-    // Also initialize a radial initial velocity to 6 units/sec
-    // away from the (same) sphere center.
-    let init_vel = SetVelocitySphereModifier {
-        center: module.lit(Vec3::ZERO),
-        //speed: module.lit(6.),
-        speed: module.lit(Vec3::new(0., 5., 0.)),
-    };
-
-    // Initialize the total lifetime of the particle, that is
-    // the time for which it's simulated and rendered. This modifier
-    // is almost always required, otherwise the particles will stay
-    // alive forever, and new particles can't be spawned instead.
-    let lifetime = module.lit(0.5); // literal value "10.0"
-    let init_lifetime = SetAttributeModifier::new(Attribute::LIFETIME, lifetime);
-
-    // Every frame, add a gravity-like acceleration downward
-    let accel = module.lit(Vec3::new(0., 3., 0.));
-    let update_accel = AccelModifier::new(accel);
-
-    module.add_texture_slot("color");
-
-    // Create the effect asset
-    let effect = EffectAsset::new(
-        // Maximum number of particles alive at a time
-        5000,
-        // Spawn at a rate of 5 particles per second
-        SpawnerSettings::rate(500.0.into()),
-        // Move the expression module into the asset
-        module,
-    )
-    .with_name("FireEffect")
-    .init(init_pos)
-    .init(init_vel)
-    .init(init_lifetime)
-    .init(init_age)
-    .init(init_rotation)
-    .update(update_accel)
-    // Render the particles with a color gradient over their
-    // lifetime. This maps the gradient key 0 to the particle spawn
-    // time, and the gradient key 1 to the particle death (10s).
-    .render(ColorOverLifetimeModifier {
-        gradient: color_gradient,
-        blend: bevy_hanabi::ColorBlendMode::Overwrite,
-        mask: ColorBlendMask::RGBA,
-    })
-    .render(OrientModifier {
-        mode: bevy_hanabi::OrientMode::FaceCameraPosition,
-        rotation: Some(rotation_attr),
-        //rotation: None,
-    }.with_rotation(age_rot))
-    .render(SizeOverLifetimeModifier {
-        gradient: size_gradient,
-        screen_space_size: false,
-    })
-    .render(ParticleTextureModifier {
-        texture_slot,
-        sample_mapping: bevy_hanabi::ImageSampleMapping::ModulateOpacityFromR,
-    });
-
-    // Insert into the asset system
-    let effect_asset = effects.add(effect);
-
-    fire_resource.0 = effect_asset;
+    if let Ok(flamable_entity) = flamable_query.get(trigger.event().collider2) {
+        commands.entity(flamable_entity)
+            .insert(ParticleTester);
+    }
 }
diff --git a/src/player.rs b/src/player.rs
index 2f993cd..35d8258 100644
--- a/src/player.rs
+++ b/src/player.rs
@@ -1,9 +1,13 @@
-use avian3d::{prelude::{CoefficientCombine, Collider, Friction, GravityScale, LockedAxes, RigidBody, SpatialQuery, SpatialQueryFilter}};
-use bevy::{camera::Exposure, core_pipeline::tonemapping::Tonemapping, ecs::{lifecycle::HookContext, world::DeferredWorld}, input::common_conditions::input_just_pressed, pbr::{Atmosphere, AtmosphereSettings}, post_process::bloom::Bloom, prelude::*, render::view::Hdr};
+use avian_pickup::actor::{AvianPickupActor, AvianPickupActorHoldConfig};
+use avian3d::prelude::{CoefficientCombine, Collider, CollisionLayers, Friction, GravityScale, LayerMask, LockedAxes, RigidBody, SpatialQuery, SpatialQueryFilter};
+use bevy::{camera::Exposure, core_pipeline::tonemapping::Tonemapping, ecs::{lifecycle::HookContext, world::DeferredWorld}, input::common_conditions::input_just_pressed, pbr::{Atmosphere, AtmosphereSettings, ScatteringMedium}, post_process::bloom::Bloom, prelude::*, render::view::Hdr};
 use bevy_egui::PrimaryEguiContext;
 use bevy_flycam::{FlyCam, NoCameraPlayerPlugin};
+use bevy_tnua::{TnuaController, TnuaObstacleRadar, control_helpers::{TnuaBlipReuseAvoidance, TnuaSimpleAirActionsCounter}};
+use bevy_tnua_avian3d::TnuaAvian3dSensorShape;
+use bevy_seedling::spatial::SpatialListener3D;
 
-use crate::{CameraConfig, CharacterBundle, CollisionLayer, DeathEvent, Description, Experience, GameState, Health, Item, Mana, MaxHealth, MaxMana, PlayerControlSchemeConfig, RenderPlayer, TnuaPlayerController, Walk, Weight, add_to_inventory_observer, display_equip_event_observer, display_inventory_event_observer, display_quest_event_observer, display_stats_event_observer, level::DAGunAssets, remove_from_inventory_observer};
+use crate::{BootStrap, CameraConfig, CharacterBundle, CollisionLayer, DeathEvent, Description, Experience, FetchQuest, FloatHeight, GameState, Health, ItemDetails, Mana, MaxHealth, MaxMana, PlayerControlScheme, PlayerController, PlayerControllerConfig, PlayerControllerInput, Quest, QuestOf, RayHit, RenderPlayer, TnuaPlayerController, Walk, Weight, add_to_inventory_observer, display_equip_event_observer, display_inventory_event_observer, display_quest_event_observer, display_stats_event_observer, level::DAGunAssets, remove_from_inventory_observer};
 
 #[derive(Clone, Component, Hash, Debug, Eq, PartialEq, Default, States)]
 pub enum PlayerState {
@@ -15,24 +19,57 @@ pub enum PlayerState {
     NoClip,
 }
 
+#[derive(Clone, Component, Hash, Debug, Eq, PartialEq, Default, States)]
+pub enum CameraState {
+    #[default]
+    Player,
+    Indipendent,
+}
+
 #[derive(Component, Reflect, Default)]
 #[reflect(Component)]
 #[require(
     Name::new("Player"),
+    TnuaPlayerController,
+    CameraConfig {
+        height_offset: 0.0,
+        //radius_scale: 0.75,
+    },
     Collider::capsule(0.1, 0.5),
     Friction {
         combine_rule: CoefficientCombine::Min,
         ..default()
     },
+    SpatialListener3D,
+    RayHit(None),
+    Walk::default(),
+    FloatHeight(1.5),
     RigidBody::Dynamic,
     LockedAxes::ROTATION_LOCKED,
+    CollisionLayers::new(CollisionLayer::Player, LayerMask::ALL),
     GravityScale(1.0),
-    CameraConfig {
-        height_offset: 0.0,
-        //radius_scale: 0.75,
-    },
-    Walk::default(),
+    //TnuaGravity(Vec3::ZERO),
     PlayerState::Grounded,
+    TnuaObstacleRadar::new(1.0, 3.0),
+    TnuaBlipReuseAvoidance::<PlayerControlScheme>::default(),
+    PlayerControllerConfig::default(),
+    TnuaSimpleAirActionsCounter::<PlayerControlScheme>::default(),
+    TnuaController::<PlayerControlScheme>::default(),
+    PlayerController::default(),
+    PlayerControllerInput::default(),
+    TnuaAvian3dSensorShape(Collider::capsule(0.1, 0.5)),
+    AvianPickupActor {
+        prop_filter: SpatialQueryFilter::from_mask(CollisionLayer::Prop),
+        actor_filter: SpatialQueryFilter::from_mask(CollisionLayer::Player),
+        obstacle_filter: SpatialQueryFilter::from_mask(CollisionLayer::Default),
+        hold: AvianPickupActorHoldConfig {
+            pitch_range: -40.0_f32.to_radians()..=75.0_f32.to_radians(),
+            distance_to_allow_holding: 100.0,
+            preferred_distance: 1.5,
+            ..default()
+        },
+        ..default()
+    }
 )]
 #[component(on_add = on_player_add)]
 pub struct Player;
@@ -44,38 +81,51 @@ pub struct Player;
         clear_color: ClearColorConfig::Custom(Srgba::rgb(0.0, 0.0, 0.0).into()),
         ..default()
     },
-    Hdr,
     Camera3d { ..default() },
-    Atmosphere::EARTH,
+    Projection::Perspective(PerspectiveProjection {
+        fov: std::f32::consts::PI / 2.0,
+        ..default()
+    }),
     AtmosphereSettings {
         aerial_view_lut_max_distance: 3.2e5,
         scene_units_to_m: 1e+4,
         ..Default::default()
     },
+    Hdr,
     Exposure::SUNLIGHT,
     Tonemapping::AcesFitted,
-    Bloom::NATURAL,
-    Projection::Perspective(PerspectiveProjection {
-        fov: std::f32::consts::PI / 2.0,
-        ..default()
-    }),
     Transform {
         translation: Vec3 { y: 2., ..default() },
         ..default()
     },
+    Bloom::NATURAL,
 )]
+#[component(on_add = on_player_camera_add)]
 pub struct PlayerCamera;
 
 #[derive(Component, Reflect, Default)]
 #[reflect(Component)]
+pub struct CameraTarget(pub Transform);
+
+#[derive(Component, Reflect, Default)]
+#[reflect(Component)]
+#[require(
+    SpotLight {
+        intensity: 1_000_000.0,
+        shadows_enabled: true,
+        ..default()
+    },
+)]
 pub struct PlayerFlashlight;
 
 #[derive(Component, Reflect, Default)]
 #[reflect(Component)]
+#[type_path("api")]
 pub struct PlayerSpawner;
 
 #[derive(Component, Reflect, Default)]
 #[reflect(Component)]
+#[type_path("api")]
 pub struct PlayerTrigger;
 
 #[derive(Component, Reflect, Default)]
@@ -90,6 +140,7 @@ impl Plugin for GamePlayerPlugin {
     fn build(&self, app: &mut App) {
         info!("GamePlayerPlugin build");
         app.register_type::<Player>()
+            .init_state::<CameraState>()
             .add_plugins(NoCameraPlayerPlugin)
             .insert_resource(bevy_flycam::KeyBindings {
                 move_ascend: KeyCode::PageUp,
@@ -100,11 +151,10 @@ impl Plugin for GamePlayerPlugin {
             .register_type::<PlayerSpawner>()
             .register_type::<PlayerTrigger>()
             .add_message::<SpawnPlayerMessage>()
-            //.add_systems(OnEnter(GameState::Postload), spawn_player_observer)
             .add_systems(Update, spawn_player_observer.run_if(resource_exists::<DAGunAssets>))
-            .add_systems(OnEnter(GameState::Postload), init_player)
+            .add_systems(OnEnter(BootStrap::Postload), init_player)
             .add_systems(Update, (
-                    player_forward.run_if(in_state(GameState::Gameplay)),
+                    player_forward.run_if(/*in_state(GameState::Gameplay)*/ in_state(CameraState::Player)),
                     check_player_triggers.run_if(in_state(GameState::Gameplay)),
                 )
             )
@@ -118,6 +168,16 @@ fn on_player_add(
 ) {
     world.commands()
         .entity(context.entity)
+        .insert(
+            CharacterBundle {
+                mana: Mana(100),
+                max_mana: MaxMana(100),
+                health: Health(100),
+                max_health: MaxHealth(100),
+                experience: Experience(100),
+                ..default()
+            },
+        )
         .observe(player_death_event_observer)
         .observe(add_to_inventory_observer::<Player>)
         .observe(remove_from_inventory_observer::<Player>)
@@ -127,6 +187,19 @@ fn on_player_add(
         .observe(display_stats_event_observer);
 }
 
+fn on_player_camera_add(
+    mut world: DeferredWorld,
+    context: HookContext,
+) {
+    let mut scattering_mediums = world.resource_mut::<Assets<ScatteringMedium>>();
+    let scattering_mediums_handle = scattering_mediums.add(ScatteringMedium::default());
+
+    world.commands()
+        .entity(context.entity)
+        .insert(Atmosphere::earthlike(scattering_mediums_handle))
+        .insert(PrimaryEguiContext);
+}
+
 fn init_player(
     mut spawn_player_message_writer: MessageWriter<SpawnPlayerMessage>,
 ) {
@@ -166,7 +239,8 @@ fn spawn_player_observer(
                 Transform::from_translation(vec3(0.1, -0.2, -0.5)),
                 //SceneRoot(asset_server.load("guns/uzi.glb#Scene0")),
                 SceneRoot(asset_server.load(uzi)),
-                Item {
+                ItemDetails {
+                    name: "gun".to_string(),
                     description: Description("gun".to_string()),
                     weight: Weight(0),
                 },
@@ -175,6 +249,7 @@ fn spawn_player_observer(
             ))
             .id();
 
+
         // Player
         debug!("Creating Player");
 
@@ -183,37 +258,31 @@ fn spawn_player_observer(
                 (
                     spawn_point,
                     Player,
-                    TnuaPlayerController,
-                    CharacterBundle {
-                        mana: Mana(100),
-                        max_mana: MaxMana(100),
-                        health: Health(100),
-                        max_health: MaxHealth(100),
-                        experience: Experience(100),
-                        ..default()
-                    },
                 ),
             ))
             .id();
 
+        commands.spawn((
+            Quest {
+                description: "TEST".to_string()
+            },
+            FetchQuest::new(1, "Water".to_string()),
+            QuestOf(logical_entity),
+            ));
+
         // Camera
+
         debug!("Creating Camera");
         if let Ok(mut render_player) = player_camera_query.single_mut() {
             *render_player = RenderPlayer { logical_entity };
         } else {
             let flashlight = commands
                 .spawn((
-                    SpotLight {
-                        intensity: 1_000_000.0,
-                        shadows_enabled: true,
-                        ..default()
-                    },
                     PlayerFlashlight,
                 ))
                 .id();
             commands
                 .spawn((
-                    PrimaryEguiContext,
                     RenderPlayer { logical_entity },
                     PlayerCamera,
                 ))
@@ -252,14 +321,6 @@ fn player_forward(
             let forward = cam_transform.forward();
             player_transform.look_to(*forward, Vec3::Y);
     }
-
-
-    /*if let Ok(cam_transform) = cam_transform.single() {
-        let forward = cam_transform.forward();
-        if let Ok(mut player_transform) = player_transform.single_mut() {
-            player_transform.look_to(*forward, Vec3::Y);
-        }
-    }*/
 }
 
 fn check_player_triggers(
diff --git a/src/quest.rs b/src/quest.rs
new file mode 100644
index 0000000..1688de7
--- /dev/null
+++ b/src/quest.rs
@@ -0,0 +1,112 @@
+use bevy::prelude::*;
+
+use crate::{Inventory, ItemDetails, MiscItem, Player};
+
+#[derive(Component)]
+#[require(
+    QuestState,
+)]
+pub struct Quest {
+    pub description: String,
+}
+
+#[derive(Resource, Reflect, Debug, Deref, Default, PartialEq)]
+#[reflect(Resource)]
+pub struct CurrentQuest(Option<Entity>);
+
+#[derive(Component)]
+pub struct CompleteddQuest;
+
+#[derive(EntityEvent)]
+pub struct AssignQuestEvent {
+    entity: Entity,
+}
+
+#[derive(Component)]
+#[relationship(relationship_target = SubQuests)]
+pub struct SubQuestOf(pub Entity);
+
+#[derive(Component)]
+#[relationship_target(relationship = SubQuestOf)]
+pub struct SubQuests(Vec<Entity>);
+
+#[derive(Component)]
+pub struct FetchQuest {
+    current: i32,
+    pub ammount: i32,
+    pub item: String,
+}
+
+impl FetchQuest {
+    pub fn new(ammount: i32, item: String) -> Self {
+        Self { current: 0, ammount, item }
+    }
+}
+
+#[derive(Component)]
+pub struct KillQuest {
+    target: Entity,
+}
+
+pub struct FindQuest;
+
+pub struct EscortQuest;
+
+#[derive(Default, Component)]
+pub enum QuestState {
+    #[default]
+    Incomplete,
+    Completed,
+    Botched,
+}
+
+#[derive(Component)]
+#[relationship(relationship_target = Quests)]
+pub struct QuestOf(pub Entity);
+
+#[derive(Component)]
+#[relationship_target(relationship = QuestOf, linked_spawn)]
+pub struct Quests(Vec<Entity>);
+
+#[derive(Component)]
+pub struct NextQuest(pub Entity);
+
+#[derive(Component)]
+pub struct LoggedQuest;
+
+pub struct QuestPlugin;
+impl Plugin for QuestPlugin {
+    fn build(&self, app: &mut App) {
+       app
+           .add_systems(Update, check_fetch_quest);
+    }
+}
+
+pub fn assign_quest_event_observer<T: Sync + Send + 'static>(
+    trigger: On<AssignQuestEvent>,
+) {
+}
+
+pub fn check_fetch_quest(
+    mut quest_query: Query<(Entity, &mut FetchQuest, &mut QuestState), With<Quest>>,
+    inventory_query: Query<&Inventory, With<Player>>,
+    item_details_query: Query<&ItemDetails, With<MiscItem>>,
+) {
+    let mut count = 0;
+    for mut quest in quest_query.iter_mut() {
+        if let Ok(inventory) = inventory_query.single() {
+            for item in inventory.iter() {
+                if let Ok(details) = item_details_query.get(item)
+                && details.name == quest.1.item {
+                    count += 1;
+                }
+            }
+            quest.1.current = count;
+            if quest.1.ammount <= quest.1.current {
+                *quest.2 = QuestState::Completed;
+            } else {
+                *quest.2 = QuestState::Incomplete;
+            }
+        }
+    }
+}
diff --git a/src/render.rs b/src/render.rs
index 5553f9b..9810694 100644
--- a/src/render.rs
+++ b/src/render.rs
@@ -1,7 +1,9 @@
-use bevy::prelude::*;
+use std::time::Duration;
+
+use bevy::{ecs::{lifecycle::HookContext, world::DeferredWorld}, prelude::*};
 use avian3d::collision::collider::Collider;
 
-use crate::PlayerController;
+use crate::{CameraState, PlayerController};
 
 pub const RESOLUTION_HEIGHT: u32 = 720;
 pub const RESOLUTION_WIDTH: u32 = 1280;
@@ -11,6 +13,15 @@ pub struct CameraConfig {
     pub height_offset: f32,
 }
 
+#[derive(Component)]
+#[component(on_add = on_camera_interpolation_add)]
+pub struct CameraInterpolation {
+    pub duration: Duration,
+    pub start_time: Duration,
+    //pub start_pos: Transform,
+    //pub desired_pos: Transform,
+}
+
 #[derive(Component)]
 pub struct RenderPlayer {
     pub logical_entity: Entity,
@@ -23,11 +34,20 @@ impl Plugin for GameRenderPlugin {
         app.add_systems(
             Update,
             //player_controller_render.run_if(in_state(GameState::Gameplay)),
-            player_controller_render
-        );
+            player_controller_render.run_if(in_state(CameraState::Player)
+        ))
+        .add_systems(Update, interpolate_camera.run_if(in_state(CameraState::Indipendent)));
     }
 }
 
+fn on_camera_interpolation_add(
+    mut world: DeferredWorld,
+    _context: HookContext,
+) {
+    let mut camera_state = world.resource_mut::<NextState<CameraState>>();
+    camera_state.set(CameraState::Indipendent);
+}
+
 pub fn player_controller_render(
     //mut render_query: Query<(&mut Transform, &RenderPlayer), With<RenderPlayer>>,
     mut render_query: Query<(&mut Transform, &RenderPlayer)>,
@@ -37,6 +57,7 @@ pub fn player_controller_render(
     >,
 ) {
     trace!("SYSTEM: player_controller_render");
+
     for (mut render_transform, render_player) in render_query.iter_mut() {
         if let Ok((logical_transform, collider, controller, camera_config)) =
             logical_query.get(render_player.logical_entity)
@@ -65,3 +86,46 @@ fn collider_y_offset(collider: &Collider) -> Vec3 {
             panic!("Controller must use a cylinder or capsule collider")
         }
 }
+
+fn interpolate_camera(
+    mut commands: Commands,
+    time: Res<Time>,
+    mut camera_query: Query<(Entity, &CameraInterpolation, &mut Transform, &mut RenderPlayer)>,
+    logical_query: Query<
+        (&Transform, &Collider, &PlayerController, &CameraConfig),
+        Without<RenderPlayer>,
+    >,
+    mut camera_state: ResMut<NextState<CameraState>>,
+) {
+    for (
+        camera_entity,
+        camera_interp,
+        mut camera_transform,
+        render_player,
+    ) in camera_query.iter_mut() {
+        if let Ok((logical_transform, logical_collider, logical_controller, logical_camera_config)) = logical_query.get(render_player.logical_entity) {
+
+            if camera_interp.duration <= time.elapsed() {
+                commands.entity(camera_entity).remove::<CameraInterpolation>();
+                camera_state.set(CameraState::Player);
+                return;
+            }
+
+            let collider_offset = collider_y_offset(logical_collider);
+            let camera_offset = Vec3::Y * logical_camera_config.height_offset;
+            let desired_transform = logical_transform.translation + collider_offset + camera_offset;
+            let desired_rotation = Quat::from_euler(EulerRot::YXZ, logical_controller.yaw, logical_controller.pitch, 0.0);
+            let normalized_time = (time.elapsed() - camera_interp.start_time).div_duration_f32(camera_interp.duration - time.elapsed());
+            let ease_function = EaseFunction::SmoothStep;
+
+            if let Some(ease_normal) = ease_function.sample(normalized_time) {
+                camera_transform.translation = camera_transform.translation.slerp(desired_transform, ease_normal);
+                camera_transform.rotation = camera_transform.rotation.slerp(desired_rotation, ease_normal);
+            } else {
+                commands.entity(camera_entity).remove::<CameraInterpolation>();
+                camera_state.set(CameraState::Player);
+                return;
+            }
+        }
+    }
+}
diff --git a/src/rover.rs b/src/rover.rs
index 218db4a..4ea1030 100644
--- a/src/rover.rs
+++ b/src/rover.rs
@@ -1,15 +1,246 @@
-use bevy::prelude::*;
+use bevy::{asset::RenderAssetUsages, camera::RenderTarget, ecs::{lifecycle::HookContext, world::DeferredWorld}, prelude::*, render::render_resource::{TextureDimension, TextureFormat, TextureUsages}};
+use bevy_enhanced_input::prelude::Start;
+use bevy_tnua::{TnuaController, prelude::TnuaBuiltinWalk};
+use bevy_landmass::{AgentTarget3d};
+use avian3d::prelude::Collider;
+
+use crate::{GameState, PlayerControlScheme, TnuaRoverController};
 
 #[derive(Component, Reflect, Debug)]
 #[reflect(Component)]
+#[require(
+    TnuaRoverController,
+    RoverMovementInput,
+    AgentTarget3d,
+    Collider::cuboid(0.5, 0.5, 0.5),
+)]
+#[component(on_add = on_rover_add)]
 pub struct Rover;
 
-#[derive(Event)]
-pub struct RoverCommandEvent {}
+fn on_rover_add(
+    mut world: DeferredWorld,
+    context: HookContext,
+) {
+    let rover_camera = world.commands().spawn(RoverCamera).id();
+
+    world.commands()
+        .entity(context.entity)
+        .add_child(rover_camera)
+        .observe(on_rover_forward_observer)
+        .observe(on_rover_backward_observer)
+        .observe(on_rover_left_observer)
+        .observe(on_rover_right_observer)
+        .observe(on_rover_pickup_observer)
+        .insert(Collider::cuboid(1.0, 1.0, 1.0));
+}
+
+fn spawn_rover(
+    mut commands: Commands,
+    mut meshes: ResMut<Assets<Mesh>>,
+    mut materials: ResMut<Assets<StandardMaterial>>,
+) {
+    commands.spawn((
+            Rover,
+            Transform::from_xyz(15.0, 1.75, 15.0),
+            Mesh3d(meshes.add(Cuboid::new(1.0, 1.0, 1.0))),
+            MeshMaterial3d(materials.add(Color::WHITE)),
+    ));
+}
+
+#[derive(Resource)]
+pub struct RoverCamreaRenderImage(pub Handle<Image>);
+impl FromWorld for RoverCamreaRenderImage {
+    fn from_world(world: &mut World) -> Self {
+        // Set up a texture for the 3D camrea to render to.
+        // The size of the texture will be based on the viewport's ui size.
+        let mut image = Image::new_uninit(
+            default(),
+            TextureDimension::D2,
+            TextureFormat::Bgra8UnormSrgb,
+            RenderAssetUsages::all(),
+        );
+        image.texture_descriptor.usage =
+            TextureUsages::TEXTURE_BINDING | TextureUsages::COPY_DST | TextureUsages::RENDER_ATTACHMENT;
+
+        let mut images = world.resource_mut::<Assets<Image>>();
+        let image_handle = images.add(image);
+
+        Self(image_handle)
+    }
+}
+
+#[derive(Component, Reflect)]
+#[reflect(Component)]
+#[require(
+    Name::new("Rover Camrea"),
+)]
+#[component(on_add = on_rover_camrea_add)]
+pub struct RoverCamera;
+
+fn on_rover_camrea_add(
+    mut world: DeferredWorld,
+    context: HookContext,
+) {
+    let render_image = world.resource::<RoverCamreaRenderImage>().0.clone();
+
+    world.commands()
+        .entity(context.entity)
+        .insert((
+            Camera3d::default(),
+            Camera {
+                order: -1,
+                ..default()
+            },
+            RenderTarget::Image(render_image.into()),
+        ));
+}
+
+#[derive(Component)]
+pub struct ForwardHeld;
+
+#[derive(Component)]
+pub struct BackwardHeld;
+
+#[derive(Component)]
+pub struct LeftHeld;
+
+#[derive(Component)]
+pub struct RightHeld;
+
+#[derive(EntityEvent)]
+pub struct RoverForwardEvent {
+    pub entity: Entity,
+}
+
+#[derive(EntityEvent)]
+pub struct RoverBackwardEvent {
+    pub entity: Entity,
+}
+
+#[derive(EntityEvent)]
+pub struct RoverLeftEvent {
+    pub entity: Entity,
+}
+
+#[derive(EntityEvent)]
+pub struct RoverRightEvent {
+    pub entity: Entity,
+}
+
+#[derive(EntityEvent)]
+pub struct RoverPickupEvent {
+    pub entity: Entity,
+}
+
+#[derive(Component, Default, Debug)]
+pub struct RoverMovementInput {
+    pub rotation: Quat,
+    pub movement: Vec3,
+}
 
 pub struct RoverPlugin;
 impl Plugin for RoverPlugin {
     fn build(&self, app: &mut App) {
-        app;
+        app
+            .register_type::<Rover>()
+            .init_resource::<RoverCamreaRenderImage>()
+            .add_systems(OnEnter(GameState::Gameplay), spawn_rover)
+            .add_systems(Update, apply_rover_movement.run_if(in_state(GameState::Gameplay)));
+    }
+}
+
+fn apply_rover_movement(
+    mut rover_query: Query<(&mut TnuaController<PlayerControlScheme>, &RoverMovementInput, &mut Transform), With<Rover>>,
+) {
+    if let Ok((mut tnua_controller, input, mut transform)) = rover_query.single_mut() {
+        tnua_controller.initiate_action_feeding();
+
+        tnua_controller.basis = TnuaBuiltinWalk {
+            desired_motion: input.movement.normalize_or_zero(),
+            ..default()
+        };
+
+        transform.rotate(input.rotation);
+    }
+}
+
+fn on_rover_forward_observer(
+    _trigger: On<RoverForwardEvent>,
+    mut rover_query: Query<(&GlobalTransform, &mut RoverMovementInput), With<Rover>>,
+    mut toggle: Local<bool>,
+) {
+    if let Ok((global_transform, mut input)) = rover_query.single_mut() {
+        let mut move_to_world = Mat3::from_quat(global_transform.rotation());
+        move_to_world.z_axis *= -1.0;
+        move_to_world.y_axis = Vec3::Y;
+        let movement_direction = move_to_world * Vec3::Z;
+
+        if !*toggle {
+            input.movement = movement_direction;
+            *toggle = true;
+        } else {
+            input.movement = Vec3::ZERO;
+            *toggle = false;
+        }
+
     }
 }
+
+fn on_rover_backward_observer(
+    _trigger: On<RoverBackwardEvent>,
+    mut rover_query: Query<(&GlobalTransform, &mut RoverMovementInput), With<Rover>>,
+    mut toggle: Local<bool>,
+) {
+    if let Ok((global_transform, mut input)) = rover_query.single_mut() {
+        let mut move_to_world = Mat3::from_quat(global_transform.rotation());
+        move_to_world.z_axis *= -1.0;
+        move_to_world.y_axis = Vec3::Y;
+        let movement_direction = move_to_world * -Vec3::Z;
+
+        if !*toggle {
+            input.movement = movement_direction;
+            *toggle = true;
+        } else {
+            input.movement = Vec3::ZERO;
+            *toggle = false;
+        }
+    }
+}
+
+fn on_rover_right_observer(
+    _trigger: On<RoverRightEvent>,
+    mut rover_query: Query<&mut RoverMovementInput, With<Rover>>,
+    mut toggle: Local<bool>,
+) {
+    if let Ok(mut input) = rover_query.single_mut() {
+        if !*toggle {
+            input.rotation = Quat::from_rotation_y(-0.1);
+            *toggle = true;
+        } else {
+            input.rotation = Quat::from_rotation_y(0.);
+            *toggle = false;
+        }
+    }
+}
+
+fn on_rover_left_observer(
+    _trigger: On<RoverLeftEvent>,
+    mut rover_query: Query<&mut RoverMovementInput, With<Rover>>,
+    mut toggle: Local<bool>,
+) {
+    if let Ok(mut input) = rover_query.single_mut() {
+        if !*toggle {
+            input.rotation = Quat::from_rotation_y(0.1);
+            *toggle = true;
+        } else {
+            input.rotation = Quat::from_rotation_y(0.);
+            *toggle = false;
+        }
+    }
+}
+
+fn on_rover_pickup_observer(
+    _trigger: On<RoverPickupEvent>,
+    mut rover_query: Query<(Entity, &mut TnuaController<PlayerControlScheme>, &GlobalTransform), With<Rover>>,
+) {
+}
diff --git a/src/shoot.rs b/src/shoot.rs
index 97cd3a2..e8e0450 100644
--- a/src/shoot.rs
+++ b/src/shoot.rs
@@ -73,9 +73,7 @@ impl Plugin for ShootPlugin {
             .register_type::<Grenade>()
             .register_type::<Rocket>()
             .register_type::<Cooldown>()
-            //.add_systems(Update, shoot.run_if(in_state(GameState::Gameplay)));
             .add_systems(Update, (
-                //shoot_grenade.run_if(in_state(GameState::Gameplay)),
                 shoot_rocket.run_if(in_state(GameState::Gameplay)),
                 grenade_fuse.run_if(in_state(GameState::Gameplay)),
                 ),
@@ -133,8 +131,6 @@ pub fn shoot_grenade(
     mut commands: Commands,
     mut shoot_messages: MessageReader<ShootEvent>,
     camera_transform_query: Query<&GlobalTransform, With<PlayerCamera>>,
-    mut meshes: ResMut<Assets<Mesh>>,
-    mut materials: ResMut<Assets<StandardMaterial>>,
 ) {
     trace!("Message Handler: shoot_grenade");
     for _message in shoot_messages.read() {
diff --git a/src/sprites.rs b/src/sprites.rs
index 5b788d6..6344139 100644
--- a/src/sprites.rs
+++ b/src/sprites.rs
@@ -1,9 +1,10 @@
 use std::time::Duration;
 
-use bevy::prelude::*;
+use bevy::{ecs::{lifecycle::HookContext, world::DeferredWorld}, prelude::*};
 use bevy_sprite3d::*;
 
 use rand::Rng;
+use rand::random_range;
 
 use crate::*;
 
@@ -14,7 +15,7 @@ pub struct SpriteBundle {
     animation: Animation,
 }
 
-#[derive(Component)]
+#[derive(Component, Default)]
 pub struct Talkable;
 
 fn sprite_interaction_observer(
@@ -24,6 +25,81 @@ fn sprite_interaction_observer(
     commands.trigger(DialogMessage { actor: trigger.entity });
 }
 
+#[derive(Component)]
+#[require(
+    FaceCamera,
+    YarnNode::default(),
+    Talkable,
+    Sprite3d {
+        pixels_per_metre: 16.,
+        double_sided: false,
+        ..default()
+    },
+    Collider::cuboid(0.5, 1., 0.5),
+)]
+#[component(on_add = on_character_sprite_add)]
+pub struct CharacterSprite {
+    pub tile_x: usize,
+    pub tile_y: usize,
+    pub x: f32,
+    pub y: f32,
+    pub height: usize,
+    pub frames: usize,
+}
+
+fn on_character_sprite_add(
+    mut world: DeferredWorld,
+    context: HookContext,
+) {
+    let images = world.resource::<ImageAssets>();
+    if let Some(character_sprite) = world.get::<CharacterSprite>(context.entity) {
+
+        let frames = character_sprite.frames;
+        let tile_x = character_sprite.tile_x;
+        let tile_y = character_sprite.tile_y;
+        let x = character_sprite.x;
+        let y = character_sprite.y;
+
+        let atlas = TextureAtlas {
+            index: character_sprite.tile_x,
+            layout: images.layout.clone(),
+        };
+
+        let image = images.image.clone();
+
+        if character_sprite.frames > 1 {
+            let mut rng = rand::rng();
+            let mut timer = Timer::from_seconds(0.4, TimerMode::Repeating);
+            timer.set_elapsed(Duration::from_secs_f32(random_range(0.0..0.4)));
+
+
+            world.commands()
+                .entity(context.entity)
+                .insert(Animation {
+                    frames: (0..frames)
+                        .map(|j| j + tile_x + tile_y * 30_usize)
+                        .collect(),
+                    current: 0,
+                    timer: timer.clone(),
+                });
+        }
+
+        world.commands()
+            .entity(context.entity)
+            .insert(CharacterBundle::default())
+            .insert(Sprite {
+                image,
+                texture_atlas: Some(atlas),
+                ..default()
+            })
+            .insert(
+                Transform::from_xyz(x, 1., y),
+            )
+        .observe(sprite_interaction_observer);
+    }
+
+}
+
 #[derive(Component, Clone, Hash, Debug, Eq, PartialEq, Default)]
 pub enum SpriteType {
     #[default]
@@ -31,6 +107,69 @@ pub enum SpriteType {
     Item,
 }
 
+#[derive(Component)]
+#[require(
+    Sprite3d {
+        pixels_per_metre: 16.,
+        double_sided: false,
+        ..default()
+    },
+    FaceCamera,
+)]
+#[component(on_add = on_item_sprite_add)]
+pub struct ItemSprite {
+    pub tile_x: usize,
+    pub tile_y: usize,
+    pub x: f32,
+    pub y: f32,
+    pub height: usize,
+    pub frames: usize,
+}
+
+fn on_item_sprite_add(
+    mut world: DeferredWorld,
+    context: HookContext,
+) {
+    let images = world.resource::<ImageAssets>();
+    if let Some(item_sprite) = world.get::<ItemSprite>(context.entity) {
+
+        let atlas = TextureAtlas {
+            index: item_sprite.tile_x,
+            layout: images.layout.clone(),
+        };
+
+        let image = images.image.clone();
+
+        if item_sprite.frames > 1 {
+            let mut rng = rand::rng();
+            let mut timer = Timer::from_seconds(0.4, TimerMode::Repeating);
+            timer.set_elapsed(Duration::from_secs_f32(random_range(0.0..0.4)));
+
+            let frames = item_sprite.frames;
+            let tile_x = item_sprite.tile_x;
+            let tile_y = item_sprite.tile_y;
+
+            world.commands()
+                .entity(context.entity)
+                .insert(Animation {
+                    frames: (0..frames)
+                        .map(|j| j + tile_x + tile_y * 30_usize)
+                        .collect(),
+                    current: 0,
+                    timer: timer.clone(),
+                });
+        }
+
+        world.commands()
+            .entity(context.entity)
+            .insert(Sprite {
+                image,
+                texture_atlas: Some(atlas),
+                ..default()
+            });
+    }
+}
+
 #[derive(AssetCollection, Resource, Default)]
 pub struct ImageAssets {
     #[asset(texture_atlas(
@@ -79,7 +218,7 @@ pub struct Animation {
     pub timer: Timer,
 }
 
-#[derive(Component)]
+#[derive(Component, Default)]
 pub struct FaceCamera;
 
 pub struct SpritesPlugin;
@@ -89,7 +228,7 @@ impl Plugin for SpritesPlugin {
         app
             .insert_resource(ImageAssets::default())
             .add_loading_state(
-                LoadingState::new(GameState::Preload)
+                LoadingState::new(BootStrap::Preload)
                     .load_collection::<ImageAssets>(),
             )
             .add_message::<SpriteMessage>()
@@ -105,8 +244,6 @@ impl Plugin for SpritesPlugin {
 fn sprite_handler(
     mut commands: Commands,
     mut sprite_events: MessageReader<SpriteMessage>,
-    images: Res<ImageAssets>,
-    //mut sprite_params: Sprite3dParams,
 ) {
     trace!("Event Handler: sprite_handler");
     let mut rng = rand::rng();
@@ -114,96 +251,41 @@ fn sprite_handler(
     for event in sprite_events.read() {
         info!("event {} {}", event.tile_x, event.tile_y);
         info!("Sprite Event read");
-        let mut atlas = TextureAtlas {
-            index: event.tile_x,
-            ..default()
-        };
 
         let mut timer = Timer::from_seconds(0.4, TimerMode::Repeating);
         info!("Timer declared");
-        timer.set_elapsed(Duration::from_secs_f32(rng.random_range(0.0..0.4)));
-        atlas.layout = images.layout.clone();
+        timer.set_elapsed(Duration::from_secs_f32(random_range(0.0..0.4)));
         info!("atlas layout decalred");
 
         match event.sprite_type {
             SpriteType::Character => {
-                let atlas = TextureAtlas {
-                    layout: images.layout.clone(),
-                    index: event.tile_x,
-                };
-
                 info!("Character Sprite");
-                let mut c = commands.spawn((
-                    Sprite3d {
-                        pixels_per_metre: 16.,
-                        double_sided: false,
-                        ..default()
-                    },
-                    Sprite {
-                        image: images.image.clone(),
-                        texture_atlas: Some(atlas),
-                        ..default()
-                    },
-                    //.bundle_with_atlas(&mut sprite_params, atlas),
-                    FaceCamera {},
-                    CharacterBundle::default(),
-                    Collider::cuboid(0.5, 1., 0.5),
-                    YarnNode::default(),
-                    //KinematicCharacterController::default(),
-                    RigidBody::Static,
-                    Transform::from_xyz(event.x, 1., event.y),
-                    Talkable,
+                commands.spawn((
+                        CharacterSprite {
+                            tile_x: event.tile_x,
+                            tile_y: event.tile_y,
+                            x: event.x,
+                            y: event.y,
+                            height: event.height,
+                            frames: event.frames,
+                        },
+                    //Transform::from_xyz(event.x, 1., event.y),
                 ));
                 info!("Character Spawned");
                 info!("Character frames: {}", event.frames);
-                if event.frames > 1 {
-                    //info!("Character Frame");
-                    c.insert(Animation {
-                        frames: (0..event.frames)
-                            .map(|j| j + event.tile_x + event.tile_y * 30_usize)
-                            .collect(),
-                        current: 0,
-                        timer: timer.clone(),
-                    });
-                }
-                c.observe(sprite_interaction_observer);
             }
             SpriteType::Item => {
-                let atlas = TextureAtlas {
-                    layout: images.layout.clone(),
-                    index: event.tile_x,
-                };
-
                 info!("Item Sprite");
-                let mut c = commands.spawn((
-                    /*Sprite3dBuilder {
-                        image: images.tileset.clone(),
-                        pixels_per_metre: 16.,
-                        double_sided: false,
-                        ..default()
-                    }*/
-                        Sprite3d {
-                            pixels_per_metre: 16.,
-                            double_sided: false,
-                            ..default()
-                    },
-                    //.bundle_with_atlas(&mut sprite_params, atlas),
-                    Sprite {
-                        image: images.image.clone(),
-                        texture_atlas: Some(atlas),
-                        ..default()
+                commands.spawn((
+                    ItemSprite {
+                        tile_x: event.tile_x,
+                        tile_y: event.tile_y,
+                        x: event.x,
+                        y: event.y,
+                        height: event.height,
+                        frames: event.frames,
                     },
-                    FaceCamera {},
                 ));
-                if event.frames > 1 {
-                    c.insert(Animation {
-                        frames: (0..event.frames)
-                            .map(|j| j + event.tile_x + event.tile_y * 30_usize)
-                            .collect(),
-                        current: 0,
-                        timer: timer.clone(),
-                    });
-                }
             }
         }
     }
diff --git a/src/states.rs b/src/states.rs
new file mode 100644
index 0000000..7d884b5
--- /dev/null
+++ b/src/states.rs
@@ -0,0 +1,96 @@
+use bevy::prelude::*;
+use bevy_asset_loader::loading_state::{LoadingState, LoadingStateAppExt};
+
+pub struct StatesPlugin;
+
+impl Plugin for StatesPlugin {
+    fn build(&self, app: &mut App) {
+        app
+            .register_type::<MetaState>()
+            .register_type::<GameLoadingState>()
+            .register_type::<BootStrap>()
+            .register_type::<GameState>()
+            .register_type::<UiState>()
+            .register_type::<MenuState>()
+            .init_state::<BootStrap>()
+            .init_state::<MenuState>()
+            .init_state::<UiState>()
+            .add_sub_state::<GameState>()
+            .add_sub_state::<MetaState>()
+            .add_loading_state(
+                LoadingState::new(BootStrap::Preload)
+                    .continue_to_state(BootStrap::Loading)
+                    .on_failure_continue_to_state(BootStrap::Loading)
+            )
+            .add_loading_state(
+                LoadingState::new(BootStrap::Loading)
+                    .continue_to_state(BootStrap::Postload)
+                    .on_failure_continue_to_state(BootStrap::Postload)
+            )
+            .add_loading_state(
+                LoadingState::new(BootStrap::Postload)
+                    .continue_to_state(BootStrap::Finished)
+                    .on_failure_continue_to_state(BootStrap::Finished)
+            );
+    }
+}
+
+#[derive(Clone, Hash, Debug, Eq, PartialEq, Default, States, Reflect)]
+pub enum BootStrap {
+    #[default]
+    Preload,
+    Loading,
+    Postload,
+    Finished,
+}
+
+#[derive(Clone, Hash, Debug, Eq, PartialEq, Default, SubStates, Reflect)]
+#[source(BootStrap = BootStrap::Finished)]
+pub enum MetaState {
+    Splash,
+    #[default]
+    MainMenu,
+    Gameplay,
+}
+
+#[derive(Clone, Hash, Debug, Eq, PartialEq, Default, States, Reflect)]
+pub enum GameLoadingState {
+    #[default]
+    Preload,
+    Loading,
+    Postload,
+    Finished,
+}
+
+#[derive(Clone, Hash, Debug, Eq, PartialEq, Default, SubStates, Reflect)]
+#[source(MetaState = MetaState::Gameplay)]
+pub enum GameState {
+    #[default]
+    Gameplay,
+    Paused,
+    GameOver,
+    Loading
+}
+
+#[derive(Clone, Hash, Debug, Eq, PartialEq, Default, States, Reflect)]
+pub enum UiState {
+    #[default]
+    Off,
+    Inventory,
+    Stats,
+    QuestLog,
+    Equiptment,
+}
+
+#[derive(Clone, Hash, Debug, Eq, PartialEq, Default, States, Reflect)]
+pub enum MenuState {
+    #[default]
+    Off,
+    Settings,
+    ControllerSettings,
+    Credits,
+    GameplaySettings,
+    SoundSettings,
+    VideoSettings,
+    MainMenu,
+}
diff --git a/src/tests.rs b/src/tests.rs
index 1e7addd..abb92f6 100644
--- a/src/tests.rs
+++ b/src/tests.rs
@@ -1,7 +1,7 @@
 use bevy::{input::common_conditions::input_just_pressed, prelude::*};
 use bevy_asset_loader::dynamic_asset::DynamicAssetCollections;
 
-use crate::{AddToInventoryEvent, DamageEvent, Description, DisplayEquipEvent, Equiptable, GameState, Health, Item, Player, RemoveMessage, widgets::floating_windows::floating_window_root };
+use crate::{AddToInventoryEvent, DamageEvent, Description, DisplayEquipEvent, Equiptable, GameState, Health, ItemDetails, Mana, ManaEvent, Player};
 use super::Weight;
 
 pub struct TestsPlugin;
@@ -11,6 +11,7 @@ impl Plugin for TestsPlugin {
             .add_systems(Update, (
                     //dynamic_asset_test
                     health_test,
+                    mana_test,
                     //inventory_add_test,
                     inventory_add_test,
                     //inventory_remove_test,
@@ -43,11 +44,23 @@ fn health_test(
 ) {
     trace!("SYSTEM: health_test");
     if let Ok((player_entity, _player)) = player.single_mut()
-    && key.just_pressed(KeyCode::KeyK) {
+    && key.just_pressed(KeyCode::KeyV) {
         commands.entity(player_entity).trigger(|entity| DamageEvent { entity, ammount: 5 });
     }
 }
 
+fn mana_test(
+    mut commands: Commands,
+    key: Res<ButtonInput<KeyCode>>,
+    mut player: Query<(Entity, &Mana), With<Player>>,
+) {
+    trace!("SYSTEM: health_test");
+    if let Ok((player_entity, _player)) = player.single_mut()
+    && key.just_pressed(KeyCode::KeyC) {
+        commands.entity(player_entity).trigger(|entity| ManaEvent { entity, ammount: 5 });
+    }
+}
+
 fn inventory_add_test(
     mut commands: Commands,
     key: Res<ButtonInput<KeyCode>>,
@@ -56,7 +69,8 @@ fn inventory_add_test(
     trace!("SYSTEM: inventory_add_test");
     if let Ok(player) = player_query.single_mut() && key.just_pressed(KeyCode::KeyJ) {
         let item = commands.spawn((
-                Item {
+                ItemDetails {
+                    name: "Test".to_string(),
                     description: Description("Test".to_string()),
                     weight: Weight(0),
                 },
diff --git a/src/ui/crosshair.rs b/src/ui/crosshair.rs
index e1643b6..9325191 100644
--- a/src/ui/crosshair.rs
+++ b/src/ui/crosshair.rs
@@ -1,42 +1,57 @@
-use bevy::prelude::*;
+use bevy::{ecs::{lifecycle::HookContext, world::DeferredWorld}, prelude::*, window::WindowResized};
 use super::*;
 
 #[derive(Component, Reflect)]
+#[require(
+    Node {
+        position_type: PositionType::Absolute,
+        display: Display::Flex,
+        flex_direction: FlexDirection::Column,
+        align_self: AlignSelf::Center,
+        justify_self: JustifySelf::Center,
+        left: Val::Vw(45.0),
+        ..default()
+    },
+)]
+#[component(on_add = on_crosshair_add)]
 pub struct UiCrosshair;
 
 #[derive(Debug, Clone, Deref, Component, Reflect)]
 pub struct Cooldown(Timer);
 
+fn on_crosshair_add(
+    mut world: DeferredWorld,
+    context: HookContext,
+) {
+    let asset_server = world.resource::<AssetServer>();
+
+    let image: Handle<Image> = asset_server.load("new_crosshairs/dot.png");
+
+    world.commands()
+        .entity(context.entity)
+        .insert(ImageNode {
+            image,
+            ..default()
+        });
+}
+
 pub struct CrosshairPlugin;
 impl Plugin for CrosshairPlugin {
     fn build(&self, app: &mut App) {
         app
             .add_systems(OnEnter(GameState::Gameplay), draw_crosshair)
             .add_systems(Update, cooldown_tick)
+            .add_systems(Update, on_window_resize)
             .add_observer(cooldown_observer);
     }
 }
 
-pub fn draw_crosshair(mut commands: Commands, asset_server: Res<AssetServer>) {
+pub fn draw_crosshair(mut commands: Commands) {
     trace!("draw_crosshair");
-    let crosshair: Handle<Image> = asset_server.load("new_crosshairs/dot.png");
     commands
         .spawn((
-            ImageNode {
-                image: crosshair.clone(),
-                ..default()
-            },
-            Node {
-                position_type: PositionType::Absolute,
-                display: Display::Flex,
-                flex_direction: FlexDirection::Column,
-                align_self: AlignSelf::Center,
-                justify_self: JustifySelf::Center,
-                left: Val::Vw(45.0),
-                ..default()
-            },
-        ))
-        .insert(UiCrosshair);
+            UiCrosshair,
+        ));
 }
 
 pub fn cooldown_observer(
@@ -57,3 +72,15 @@ pub fn cooldown_tick(
         cooldown.0.tick(time.delta());
     }
 }
+
+fn on_window_resize(
+    mut commands: Commands,
+    crosshair_query: Query<Entity, With<UiCrosshair>>,
+    resize_reader: MessageReader<WindowResized>,
+) {
+    if let Ok(crosshair_entity) = crosshair_query.single()
+    && !resize_reader.is_empty() {
+        commands.entity(crosshair_entity).despawn();
+        commands.spawn(UiCrosshair);
+    }
+}
diff --git a/src/ui/equip_ui.rs b/src/ui/equip_ui.rs
index deaec46..32bbff4 100644
--- a/src/ui/equip_ui.rs
+++ b/src/ui/equip_ui.rs
@@ -1,8 +1,6 @@
-use std::marker::PhantomData;
+use bevy::{color::palettes::css::DARK_GREEN, ecs::{entity::Entity, event::EntityEvent, hierarchy::{ChildSpawner, Children}, name::Name, observer::On, query::With, relationship::RelationshipTarget, spawn::{SpawnRelated, SpawnWith}, system::{Commands, Query, Res, ResMut}}, prelude::{Node, Plugin, Text}, state::{state::{NextState, State}, state_scoped::DespawnOnExit}, ui::{BackgroundColor, Overflow}, utils::default};
 
-use bevy::{color::palettes::css::{DARK_GRAY, DARK_GREEN}, ecs::{component::Component, entity::Entity, event::EntityEvent, hierarchy::{ChildSpawner, Children}, name::Name, observer::On, query::With, relationship::RelationshipTarget, spawn::{SpawnRelated, SpawnWith}, system::{Commands, Query}}, prelude::{Node, Plugin, Text}, reflect::enum_debug, ui::{BackgroundColor, Overflow}, utils::default};
-
-use crate::{Equiptment, Player, widgets::floating_windows::floating_window_root};
+use crate::{Equiptment, Player, UiState, widgets::floating_windows::floating_window_root};
 
 
 #[derive(EntityEvent)]
@@ -13,7 +11,7 @@ pub struct DisplayEquipEvent {
 pub struct EquipUiPlugin;
 impl Plugin for EquipUiPlugin {
     fn build(&self, app: &mut bevy::app::App) {
-       app; 
+       app;
     }
 }
 
@@ -31,7 +29,15 @@ pub fn display_equip_event_observer(
     mut commands: Commands,
     equiptment_query: Query<&Equiptment>,
     name_query: Query<&Name>,
+    menu_state: Res<State<UiState>>,
+    mut menu_state_setter: ResMut<NextState<UiState>>,
 ) {
+    if *menu_state == UiState::Equiptment {
+        return;
+    }
+
+    menu_state_setter.set(UiState::Equiptment);
+
     let mut equip_vec = vec![];
     if let Ok(equiptment) = equiptment_query.get(trigger.entity) {
         for item in equiptment.iter() {
@@ -41,6 +47,7 @@ pub fn display_equip_event_observer(
         }
     }
     commands.spawn((
+            DespawnOnExit(UiState::Equiptment),
             floating_window_root("Equiptment".to_string(),
                 (
                     Node {
@@ -50,7 +57,7 @@ pub fn display_equip_event_observer(
                         ..default()
                     },
                     Children::spawn(SpawnWith(|parent: &mut ChildSpawner| {
-                        for (name, entity) in equip_vec {
+                        for (name, _entity) in equip_vec {
                             parent.spawn((
                                     Node {
                                         ..default()
diff --git a/src/ui/inventory_ui.rs b/src/ui/inventory_ui.rs
index 4bc76a2..ec5b92f 100644
--- a/src/ui/inventory_ui.rs
+++ b/src/ui/inventory_ui.rs
@@ -1,4 +1,4 @@
-use bevy::{app::{HierarchyPropagatePlugin, Propagate}, color::palettes::css::{DARK_BLUE, DARK_GRAY, DARK_GREEN, DARK_KHAKI, DARK_RED}, ecs::system::SystemId, ui_widgets::observe};
+use bevy::{app::{HierarchyPropagatePlugin, Propagate}, color::palettes::css::{DARK_BLUE, DARK_GRAY, DARK_GREEN, DARK_KHAKI, DARK_RED}, ecs::{lifecycle::HookContext, system::SystemId, world::DeferredWorld}};
 
 use crate::widgets::{anchored::{Anchor, AnchorDirection, AnchorOption, AnchorTarget, DropdownMenu}, floating_window_focus::{FocusDetectShouldClose, FocusParernt}, floating_window_ordering::UiZOrderLayer, floating_windows::floating_window_root, tooltip::{TooltipChild, TooltipParent, TooltipSource}};
 
@@ -13,8 +13,44 @@ pub struct ParentMenu(Vec<Entity>);
 pub struct ChildMenu(pub Entity);
 
 #[derive(Component, Reflect)]
+#[require(
+    Node {
+        flex_grow: 1.,
+        //flex_direction: FlexDirection::Column,
+        display: Display::Grid,
+        //grid_auto_flow: GridAutoFlow::Column,
+        grid_template_columns: vec![
+            GridTrack::auto(),
+            GridTrack::auto(),
+            GridTrack::auto(),
+            GridTrack::auto(),
+            GridTrack::auto(),
+        ],
+        //aspect_ratio: Some(1.0),
+        padding: UiRect::all(px(24)),
+        row_gap: px(12),
+        column_gap: px(12),
+        overflow: Overflow { x: OverflowAxis::Hidden, y: OverflowAxis::Hidden },
+        ..default()
+    },
+    BackgroundColor::from(DARK_GRAY),
+)]
+#[component(on_add = on_inventory_ui_add)]
 pub struct UiInventory;
 
+#[derive(Component, Reflect)]
+#[require(
+    Node {
+        height: Val::Px(80.),
+        width: Val::Px(80.),
+        ..default()
+    },
+    BackgroundColor::from(DARK_GREEN),
+    TooltipSource,
+)]
+#[component(on_add = on_inventory_item_ui_add)]
+pub struct UiInventoryItem;
+
 #[derive(EntityEvent)]
 pub struct DisplayInventoryEvent {
     pub entity: Entity,
@@ -33,6 +69,27 @@ pub struct Owner {
 #[derive(Component, Debug)]
 pub struct InvRef(pub Entity);
 
+fn on_inventory_ui_add(
+    mut world: DeferredWorld,
+    context: HookContext,
+) {
+    world.commands()
+        .entity(context.entity)
+        .observe(transfer_item_observer)
+        .observe(refresh_window_observer);
+}
+
+fn on_inventory_item_ui_add(
+    mut world: DeferredWorld,
+    context: HookContext,
+) {
+    world.commands()
+        .entity(context.entity)
+        .observe(inventory_tooltip_observer)
+        .observe(inventory_tooltip_unhover_observer)
+        .observe(inventory_item_drowpdown_observer);
+}
+
 pub struct InventoryUIPlugin;
 impl Plugin for InventoryUIPlugin {
     fn build(&self, app: &mut App) {
@@ -46,71 +103,51 @@ pub fn display_inventory_event_observer(
     trigger: On<DisplayInventoryEvent>,
     mut commands: Commands,
     name_query: Query<&Name>,
+    item_query: Query<&ItemDetails>,
     inventory: Query<&Inventory>,
+    menu_state: Res<State<UiState>>,
+    mut menu_state_setter: ResMut<NextState<UiState>>,
 ) {
     trace!("OBSERVER: display_inventory_event_observer");
+
+    if *menu_state == UiState::Inventory {
+        return;
+    }
+
+    menu_state_setter.set(UiState::Inventory);
+
     let Ok(name) = name_query.get(trigger.entity) else {
         return;
     };
-
     let mut item_vec = vec![];
 
     if let Ok(inventory_handle) = inventory.get(trigger.entity) {
         for item in inventory_handle.iter() {
-            if let Ok(item_name) = name_query.get(item) {
-                trace!("Pushing item: {:?}, item_name: {:?}, to item_vec", item, item_name);
+            if let Ok(item_name) = item_query.get(item) {
+                trace!("Pushing item: {:?}, item_name: {:?}, to item_vec", item, item_name.name);
                 item_vec.push((item_name.clone(), item.clone(), trigger.entity.clone()));
             }
         }
     }
 
     commands.spawn((
+        DespawnOnExit(UiState::Inventory),
         floating_window_root(
             format!("{} Inventory", name),
         (
+            UiInventory,
             Children::spawn(SpawnWith(|parent: &mut ChildSpawner| {
                 for (item, entity, inv) in item_vec {
                     parent.spawn(
                 (
-                            Node {
-                                //height: Val::Percent(100.),
-                                //width: Val::Percent(100.),
-                                ..default()
-                            },
-                            Text(item.to_string()),
-                            BackgroundColor::from(DARK_GREEN),
+                            UiInventoryItem,
+                            Text(item.name),
                             Owner { item_owner: entity, inv_owner: inv },
                             Propagate( Owner { item_owner: entity, inv_owner: inv }),
-                            TooltipSource,
-                        ))
-                        .observe(inventory_tooltip_observer)
-                        .observe(inventory_tooltip_unhover_observer)
-                        .observe(inventory_item_drowpdown_observer);
+                        ));
                 }
             })),
-            Node {
-                flex_grow: 1.,
-                //flex_direction: FlexDirection::Column,
-                display: Display::Grid,
-                //grid_auto_flow: GridAutoFlow::Column,
-                grid_template_columns: vec![
-                    GridTrack::auto(),
-                    GridTrack::auto(),
-                    GridTrack::auto(),
-                    GridTrack::auto(),
-                    GridTrack::auto(),
-                ],
-                //aspect_ratio: Some(1.0),
-                padding: UiRect::all(px(24)),
-                row_gap: px(12),
-                column_gap: px(12),
-                overflow: Overflow { x: OverflowAxis::Hidden, y: OverflowAxis::Hidden },
-                ..default()
-            },
-            BackgroundColor::from(DARK_GRAY),
             InvRef(trigger.entity),
-            observe(transfer_item_observer),
-            observe(refresh_window_observer),
         ),
         ),
     ));
@@ -126,7 +163,7 @@ fn refresh_window_observer(
     trigger: On<RefreshInventory>,
     mut commands: Commands,
     mut children_query: Query<(Entity, Option<&mut Children>, &mut InvRef)>,
-    name_query: Query<&Name>,
+    item_query: Query<&ItemDetails>,
     inventory: Query<&Inventory>,
 ) {
     trace!("OBSERVER: refresh_window_observer");
@@ -144,8 +181,8 @@ fn refresh_window_observer(
 
         if let Ok(inventory_handle) = inventory.get(invref.0) {
             for item in inventory_handle.iter() {
-                if let Ok(item_name) = name_query.get(item) {
-                    trace!("Pushing item: {:?}, item_name: {:?}, to item_vec", item, item_name);
+                if let Ok(item_name) = item_query.get(item) {
+                    trace!("Pushing item: {:?}, item_name: {:?}, to item_vec", item, item_name.name);
                     item_vec.push((item_name.clone(), item.clone(), invref.0.clone()));
                 }
             }
@@ -153,21 +190,13 @@ fn refresh_window_observer(
 
         for (item, entity, inv) in item_vec {
             let child = commands.spawn((
-                    Node {
-                        //height: Val::Percent(100.),
-                        //width: Val::Percent(100.),
-                        ..default()
-                    },
-                    Text(item.to_string()),
-                    BackgroundColor::from(DARK_GREEN),
+                    UiInventoryItem,
+                    Text(item.name),
                     Owner { item_owner: entity, inv_owner: inv },
                     Propagate( Owner { item_owner: entity, inv_owner: inv }),
-                    TooltipSource)).id();
+                )).id();
             commands.entity(parent_entity)
-                .add_child(child)
-                .observe(inventory_tooltip_observer)
-                .observe(inventory_tooltip_unhover_observer)
-                .observe(inventory_item_drowpdown_observer);
+                .add_child(child);
         }
     }
 }
@@ -200,7 +229,7 @@ fn transfer_item_observer(
 fn inventory_tooltip_observer(
     trigger: On<Pointer<Over>>,
     mut commands: Commands,
-    item_query: Query<&Item>,
+    item_query: Query<&ItemDetails>,
     owner_query: Query<&Owner>,
 ) {
     trace!("OBSERVER: inventory_tooltip_observer");
diff --git a/src/ui/menu/controller_settings.rs b/src/ui/menu/controller_settings.rs
index b1bed58..433831b 100644
--- a/src/ui/menu/controller_settings.rs
+++ b/src/ui/menu/controller_settings.rs
@@ -1,6 +1,6 @@
 use bevy::prelude::*;
 
-use crate::{PauseMenuState, widgets::{self, ui_root}};
+use crate::{MenuState, widgets::{self, ui_root}};
 
 #[derive(Component, Reflect)]
 pub struct UiControllerSettings;
@@ -10,7 +10,7 @@ impl Plugin for ControllerSettingsMenuUiPlugin {
     fn build(&self, app: &mut bevy::app::App) {
        app
            .register_type::<UiControllerSettings>()
-           .add_systems(OnEnter(PauseMenuState::ControllerSettings), spawn_controller_settings_menu);
+           .add_systems(OnEnter(MenuState::ControllerSettings), spawn_controller_settings_menu);
     }
 }
 
@@ -19,7 +19,7 @@ fn spawn_controller_settings_menu(
 ) {
     commands.spawn((
             ui_root("Controller Settings"),
-            DespawnOnExit(PauseMenuState::ControllerSettings),
+            DespawnOnExit(MenuState::ControllerSettings),
             GlobalZIndex(2),
             UiControllerSettings,
             children![
@@ -44,7 +44,7 @@ fn spawn_controller_settings_menu(
 
 fn back_to_settings_menu(
     _: On<Pointer<Click>>,
-    mut pause_menu_state: ResMut<NextState<PauseMenuState>>,
+    mut pause_menu_state: ResMut<NextState<MenuState>>,
 ) {
-    pause_menu_state.set(PauseMenuState::Settings);
+    pause_menu_state.set(MenuState::Settings);
 }
diff --git a/src/ui/menu/credits.rs b/src/ui/menu/credits.rs
new file mode 100644
index 0000000..2846aa3
--- /dev/null
+++ b/src/ui/menu/credits.rs
@@ -0,0 +1,39 @@
+use bevy::prelude::*;
+
+use crate::MenuState;
+
+use super::widgets;
+
+#[derive(Component, Reflect)]
+pub struct UiCredits;
+
+pub struct CreditsMenuUiPlugin;
+impl Plugin for CreditsMenuUiPlugin {
+    fn build(&self, app: &mut App) {
+       app
+           .register_type::<UiCredits>()
+           .add_systems(OnEnter(MenuState::Credits), spawn_credits_menu);
+    }
+}
+
+fn spawn_credits_menu(
+    mut commands: Commands,
+) {
+    commands.spawn((
+            widgets::ui_root("Credits Menu"),
+            DespawnOnExit(MenuState::Credits),
+            GlobalZIndex(2),
+            UiCredits,
+            children![
+                widgets::label("Red Pawn"),
+                widgets::button("Back", exit_credits_menu)
+            ]
+    ));
+}
+
+fn exit_credits_menu(
+    _: On<Pointer<Click>>,
+    mut pause_menu_state: ResMut<NextState<MenuState>>,
+) {
+    pause_menu_state.set(MenuState::Off);
+}
diff --git a/src/ui/menu/gameplay_settings.rs b/src/ui/menu/gameplay_settings.rs
index 16c548c..be121af 100644
--- a/src/ui/menu/gameplay_settings.rs
+++ b/src/ui/menu/gameplay_settings.rs
@@ -1,6 +1,6 @@
 use bevy::prelude::*;
 
-use crate::{PauseMenuState, widgets::{self, ui_root}};
+use crate::{MenuState, widgets::{self, ui_root}};
 
 #[derive(Component, Reflect)]
 pub struct UiGameplaySettings;
@@ -10,7 +10,7 @@ impl Plugin for GameplaySettingsMenuUiPlugin {
     fn build(&self, app: &mut bevy::app::App) {
        app
            .register_type::<UiGameplaySettings>()
-           .add_systems(OnEnter(PauseMenuState::GameplaySettings), spawn_gameplay_settings_menu);
+           .add_systems(OnEnter(MenuState::GameplaySettings), spawn_gameplay_settings_menu);
     }
 }
 
@@ -19,7 +19,7 @@ fn spawn_gameplay_settings_menu(
 ) {
     commands.spawn((
             ui_root("Gameplay Settings"),
-            DespawnOnExit(PauseMenuState::GameplaySettings),
+            DespawnOnExit(MenuState::GameplaySettings),
             GlobalZIndex(2),
             UiGameplaySettings,
             children![
@@ -30,7 +30,7 @@ fn spawn_gameplay_settings_menu(
 
 fn back_to_settings_menu(
     _: On<Pointer<Click>>,
-    mut pause_menu_state: ResMut<NextState<PauseMenuState>>,
+    mut pause_menu_state: ResMut<NextState<MenuState>>,
 ) {
-    pause_menu_state.set(PauseMenuState::Settings);
+    pause_menu_state.set(MenuState::Settings);
 }
diff --git a/src/ui/menu/loading.rs b/src/ui/menu/loading.rs
new file mode 100644
index 0000000..ae35f53
--- /dev/null
+++ b/src/ui/menu/loading.rs
@@ -0,0 +1,31 @@
+use bevy::prelude::*;
+
+use super::widgets;
+
+use crate::{GameLoadingState};
+
+#[derive(Component, Reflect)]
+pub struct UiLoading;
+
+pub struct LoadingMenuUiPlugin;
+impl Plugin for LoadingMenuUiPlugin {
+    fn build(&self, app: &mut bevy::app::App) {
+       app
+           .register_type::<UiLoading>()
+           .add_systems(OnEnter(GameLoadingState::Loading), spawn_loading_menu);
+    }
+}
+
+fn spawn_loading_menu(
+    mut commands: Commands,
+) {
+    commands.spawn((
+            widgets::ui_root("Loading Menu"),
+            DespawnOnExit(GameLoadingState::Loading),
+            GlobalZIndex(2),
+            UiLoading,
+            children![
+                widgets::label("Loading"),
+            ]
+    ));
+}
diff --git a/src/ui/menu/mod.rs b/src/ui/menu/mod.rs
index 2f047a7..bf0e653 100644
--- a/src/ui/menu/mod.rs
+++ b/src/ui/menu/mod.rs
@@ -1,10 +1,12 @@
 use bevy::prelude::*;
-use crate::{GameState, PauseMenuState, menu::{controller_settings::ControllerSettingsMenuUiPlugin, gameplay_settings::GameplaySettingsMenuUiPlugin, settings::SettingsMenuUiPlugin, sound_settings::SoundSettingsMenuUiPlugin, video_settings::VideoSettingsMenuUiPlugin}};
+use crate::{MenuState, credits::CreditsMenuUiPlugin, menu::{controller_settings::ControllerSettingsMenuUiPlugin, gameplay_settings::GameplaySettingsMenuUiPlugin, settings::SettingsMenuUiPlugin, sound_settings::SoundSettingsMenuUiPlugin, video_settings::VideoSettingsMenuUiPlugin}};
 
 use super::widgets;
 
 pub mod controller_settings;
+pub mod credits;
 pub mod gameplay_settings;
+pub mod loading;
 pub mod settings;
 pub mod sound_settings;
 pub mod video_settings;
@@ -17,10 +19,11 @@ impl Plugin for MenuUiPlugin {
     fn build(&self, app: &mut App) {
         app
             .register_type::<UiMenu>()
-            .add_systems(OnEnter(PauseMenuState::MainMenu), spawn_pause_menu)
+            .add_systems(OnEnter(MenuState::MainMenu), spawn_pause_menu)
             .add_plugins((
                     SettingsMenuUiPlugin,
                     ControllerSettingsMenuUiPlugin,
+                    CreditsMenuUiPlugin,
                     GameplaySettingsMenuUiPlugin,
                     SoundSettingsMenuUiPlugin,
                     VideoSettingsMenuUiPlugin,
@@ -33,17 +36,25 @@ fn spawn_pause_menu(
 ) {
     commands.spawn((
             widgets::ui_root("Pause Menu"),
-            DespawnOnExit(PauseMenuState::MainMenu),
+            DespawnOnExit(MenuState::MainMenu),
             GlobalZIndex(2),
             children![
-                widgets::button("Settings", enter_settings_menu)
+                widgets::button("Settings", enter_settings_menu),
+                widgets::button("Credits", enter_pause_menu),
             ]
     ));
 }
 
 fn enter_settings_menu(
     _: On<Pointer<Click>>,
-    mut pause_menu_state: ResMut<NextState<PauseMenuState>>,
+    mut pause_menu_state: ResMut<NextState<MenuState>>,
 ) {
-    pause_menu_state.set(PauseMenuState::Settings);
+    pause_menu_state.set(MenuState::Settings);
+}
+
+fn enter_pause_menu(
+    _: On<Pointer<Click>>,
+    mut pause_menu_state: ResMut<NextState<MenuState>>,
+) {
+    pause_menu_state.set(MenuState::Credits);
 }
diff --git a/src/ui/menu/settings.rs b/src/ui/menu/settings.rs
index 2182717..3d2d8b6 100644
--- a/src/ui/menu/settings.rs
+++ b/src/ui/menu/settings.rs
@@ -2,7 +2,7 @@ use bevy::prelude::*;
 
 use super::widgets;
 
-use crate::{PauseMenuState};
+use crate::{MenuState};
 
 #[derive(Component, Reflect)]
 pub struct UiSettings;
@@ -12,7 +12,7 @@ impl Plugin for SettingsMenuUiPlugin {
     fn build(&self, app: &mut bevy::app::App) {
        app
            .register_type::<UiSettings>()
-           .add_systems(OnEnter(PauseMenuState::Settings), spawn_settings_menu);
+           .add_systems(OnEnter(MenuState::Settings), spawn_settings_menu);
     }
 }
 
@@ -21,7 +21,7 @@ fn spawn_settings_menu(
 ) {
     commands.spawn((
             widgets::ui_root("Settings Menu"),
-            DespawnOnExit(PauseMenuState::Settings),
+            DespawnOnExit(MenuState::Settings),
             GlobalZIndex(2),
             UiSettings,
             children![
@@ -29,42 +29,42 @@ fn spawn_settings_menu(
                 widgets::button("Controller Settings", enter_controller_settings_menu),
                 widgets::button("Video Settings", enter_video_settings_menu),
                 widgets::button("Sound Settings", enter_sound_settings_menu),
-                widgets::button("Back", back_to_main_menu),
+                widgets::button("Back", exit_settings_menu),
             ]
     ));
 }
 
-fn back_to_main_menu(
+fn exit_settings_menu(
     _: On<Pointer<Click>>,
-    mut pause_menu_state: ResMut<NextState<PauseMenuState>>,
+    mut pause_menu_state: ResMut<NextState<MenuState>>,
 ) {
-    pause_menu_state.set(PauseMenuState::MainMenu);
+    pause_menu_state.set(MenuState::Off);
 }
 
 fn enter_sound_settings_menu(
     _: On<Pointer<Click>>,
-    mut pause_menu_state: ResMut<NextState<PauseMenuState>>,
+    mut pause_menu_state: ResMut<NextState<MenuState>>,
 ) {
-    pause_menu_state.set(PauseMenuState::SoundSettings);
+    pause_menu_state.set(MenuState::SoundSettings);
 }
 
 fn enter_video_settings_menu(
     _: On<Pointer<Click>>,
-    mut pause_menu_state: ResMut<NextState<PauseMenuState>>,
+    mut pause_menu_state: ResMut<NextState<MenuState>>,
 ) {
-    pause_menu_state.set(PauseMenuState::VideoSettings);
+    pause_menu_state.set(MenuState::VideoSettings);
 }
 
 fn enter_controller_settings_menu(
     _: On<Pointer<Click>>,
-    mut pause_menu_state: ResMut<NextState<PauseMenuState>>,
+    mut pause_menu_state: ResMut<NextState<MenuState>>,
 ) {
-    pause_menu_state.set(PauseMenuState::ControllerSettings);
+    pause_menu_state.set(MenuState::ControllerSettings);
 }
 
 fn enter_gameplay_settings_menu(
     _: On<Pointer<Click>>,
-    mut pause_menu_state: ResMut<NextState<PauseMenuState>>,
+    mut pause_menu_state: ResMut<NextState<MenuState>>,
 ) {
-    pause_menu_state.set(PauseMenuState::GameplaySettings);
+    pause_menu_state.set(MenuState::GameplaySettings);
 }
diff --git a/src/ui/menu/sound_settings.rs b/src/ui/menu/sound_settings.rs
index 7be3b7a..93c3e06 100644
--- a/src/ui/menu/sound_settings.rs
+++ b/src/ui/menu/sound_settings.rs
@@ -1,6 +1,6 @@
 use bevy::prelude::*;
 
-use crate::{PauseMenuState, widgets::{self, ui_root}};
+use crate::{MenuState, widgets::{self, ui_root}};
 
 #[derive(Component, Reflect)]
 pub struct UiSoundSettings;
@@ -10,7 +10,7 @@ impl Plugin for SoundSettingsMenuUiPlugin {
     fn build(&self, app: &mut bevy::app::App) {
        app
            .register_type::<UiSoundSettings>()
-           .add_systems(OnEnter(PauseMenuState::SoundSettings), spawn_sound_settings_menu);
+           .add_systems(OnEnter(MenuState::SoundSettings), spawn_sound_settings_menu);
     }
 }
 
@@ -19,7 +19,7 @@ fn spawn_sound_settings_menu(
 ) {
     commands.spawn((
             ui_root("Sound Settings"),
-            DespawnOnExit(PauseMenuState::SoundSettings),
+            DespawnOnExit(MenuState::SoundSettings),
             GlobalZIndex(2),
             UiSoundSettings,
             children![
@@ -51,7 +51,7 @@ fn spawn_sound_settings_menu(
 
 fn back_to_settings_menu(
     _: On<Pointer<Click>>,
-    mut pause_menu_state: ResMut<NextState<PauseMenuState>>,
+    mut pause_menu_state: ResMut<NextState<MenuState>>,
 ) {
-    pause_menu_state.set(PauseMenuState::Settings);
+    pause_menu_state.set(MenuState::Settings);
 }
diff --git a/src/ui/menu/video_settings.rs b/src/ui/menu/video_settings.rs
index 298eee6..eb8fb71 100644
--- a/src/ui/menu/video_settings.rs
+++ b/src/ui/menu/video_settings.rs
@@ -1,6 +1,6 @@
 use bevy::prelude::*;
 
-use crate::{PauseMenuState,  widgets::{self, ui_root}};
+use crate::{MenuState,  widgets::{self, ui_root}};
 
 #[derive(Component, Reflect)]
 pub struct UiVideoSettings;
@@ -10,7 +10,7 @@ impl Plugin for VideoSettingsMenuUiPlugin {
     fn build(&self, app: &mut bevy::app::App) {
        app
            .register_type::<UiVideoSettings>()
-           .add_systems(OnEnter(PauseMenuState::VideoSettings), spawn_video_settings_menu);
+           .add_systems(OnEnter(MenuState::VideoSettings), spawn_video_settings_menu);
     }
 }
 
@@ -19,7 +19,7 @@ fn spawn_video_settings_menu(
 ) {
     commands.spawn((
             ui_root("Video Settings"),
-            DespawnOnExit(PauseMenuState::VideoSettings),
+            DespawnOnExit(MenuState::VideoSettings),
             GlobalZIndex(2),
             UiVideoSettings,
             children![
@@ -37,7 +37,7 @@ fn spawn_video_settings_menu(
 
 fn back_to_settings_menu(
     _: On<Pointer<Click>>,
-    mut pause_menu_state: ResMut<NextState<PauseMenuState>>,
+    mut pause_menu_state: ResMut<NextState<MenuState>>,
 ) {
-    pause_menu_state.set(PauseMenuState::Settings);
+    pause_menu_state.set(MenuState::Settings);
 }
diff --git a/src/ui/mod.rs b/src/ui/mod.rs
index 0b18746..a6763ff 100644
--- a/src/ui/mod.rs
+++ b/src/ui/mod.rs
@@ -11,20 +11,19 @@ pub mod status_bar;
 pub mod widgets;
 pub mod menu;
 pub mod palette;
-pub mod quest;
+pub mod quest_ui;
 pub mod inspect;
 pub mod start_menu;
 pub mod game_over;
 pub mod stats_ui;
 
-use bevy_simple_text_input::TextInputPlugin;
 use crosshair::*;
 pub use equip_ui::*;
 pub use inventory_ui::*;
 use status_bar::*;
 //use dialog_ui::*;
 pub use menu::*;
-pub use quest::*;
+pub use quest_ui::*;
 pub use inspect::*;
 pub use start_menu::*;
 pub use game_over::*;
@@ -40,6 +39,8 @@ pub struct DAUiAssets {
     health_2: Handle<Image>,
     #[asset(key = "health_3")]
     health_3: Handle<Image>,
+    #[asset(key = "mana_1")]
+    mana_1: Handle<Image>,
 }
 
 #[derive(Debug, Clone, Component, Reflect)]
@@ -61,7 +62,6 @@ pub struct UiPlugin;
 impl Plugin for UiPlugin {
     fn build(&self, app: &mut App) {
         app
-            .add_plugins(TextInputPlugin)
             .register_type::<DAUiAssets>()
             .add_plugins((
                     AnchoredUiPlugin,
@@ -77,7 +77,7 @@ impl Plugin for UiPlugin {
                     EquipUiPlugin,
             ))
             .add_loading_state(
-                LoadingState::new(GameState::Preload)
+                LoadingState::new(BootStrap::Preload)
                     .with_dynamic_assets_file::<StandardDynamicAssetCollection>("uiassets.ron")
                     .load_collection::<DAUiAssets>()
             );
diff --git a/src/ui/quest.rs b/src/ui/quest.rs
deleted file mode 100644
index ab6ba38..0000000
--- a/src/ui/quest.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-use bevy::{color::palettes::css::DARK_GREEN, prelude::*};
-
-use crate::widgets::floating_windows::floating_window_root;
-
-#[derive(Component, Reflect)]
-pub struct UiQuest;
-
-#[derive(EntityEvent)]
-pub struct DisplayQuestEvent {
-    pub entity: Entity,
-}
-
-pub struct QuestUiPlugin;
-impl Plugin for QuestUiPlugin {
-    fn build(&self, app: &mut App) {
-       app; 
-    }
-}
-
-pub fn display_quest_event_observer(
-    trigger: On<DisplayQuestEvent>,
-    mut commands: Commands,
-) {
-    trace!("OBSERVER: display_quest_event_observer");
-
-    commands.spawn((
-            floating_window_root("Quest Log".into(),
-                (
-                    Children::spawn(SpawnWith(|parent: &mut ChildSpawner| {
-                        parent.spawn((
-                                Node {
-                                    ..default()
-                                },
-                                BackgroundColor::from(DARK_GREEN),
-                        ));
-                    }))
-            ))
-    ));
-}
diff --git a/src/ui/quest_ui.rs b/src/ui/quest_ui.rs
new file mode 100644
index 0000000..c1d10f3
--- /dev/null
+++ b/src/ui/quest_ui.rs
@@ -0,0 +1,117 @@
+use bevy::{color::palettes::css::{DARK_GREEN, DARK_VIOLET}, ecs::{lifecycle::HookContext, world::DeferredWorld}, prelude::*};
+
+use crate::{UiState, widgets::floating_windows::floating_window_root};
+
+#[derive(Component, Reflect)]
+#[require(
+    Node {
+        flex_grow: 1.,
+        ..default()
+    }
+)]
+#[component(on_add = on_ui_quest_add)]
+pub struct UiQuest;
+
+fn on_ui_quest_add(
+    mut world: DeferredWorld,
+    context: HookContext,
+) {
+    world.commands()
+        .entity(context.entity);
+}
+
+#[derive(EntityEvent)]
+pub struct DisplayQuestEvent {
+    pub entity: Entity,
+}
+
+pub struct QuestUiPlugin;
+impl Plugin for QuestUiPlugin {
+    fn build(&self, app: &mut App) {
+       app;
+    }
+}
+
+pub fn display_quest_event_observer(
+    _trigger: On<DisplayQuestEvent>,
+    mut commands: Commands,
+    menu_state: Res<State<UiState>>,
+    mut menu_state_setter: ResMut<NextState<UiState>>,
+) {
+    trace!("OBSERVER: display_quest_event_observer");
+
+    if *menu_state == UiState::QuestLog {
+        return;
+    }
+
+    menu_state_setter.set(UiState::QuestLog);
+
+    commands.spawn((
+        DespawnOnExit(UiState::QuestLog),
+floating_window_root("Quest Log".into(),
+(
+        UiQuest,
+        Children::spawn(SpawnWith(|parent: &mut ChildSpawner| {
+            parent.spawn((
+                    Node {
+                        flex_grow: 1.,
+                        flex_direction: FlexDirection::Column,
+                        ..default()
+                    },
+                    BackgroundColor::from(DARK_GREEN),
+                    Children::spawn(SpawnWith(|parent: &mut ChildSpawner| {
+                        parent.spawn((
+                                Node {
+                                    align_self: AlignSelf::Center,
+                                    ..default()
+                                },
+                                Text("Active".into())
+                        ));
+                        parent.spawn((
+                                Node {
+                                    ..default()
+                                },
+                                Text("quest 1".into())
+                        ));
+                        parent.spawn((
+                                Node {
+                                    align_self: AlignSelf::Center,
+                                    ..default()
+                                },
+                                Text("Inactive".into())
+                        ));
+                        parent.spawn((
+                                Node {
+                                    ..default()
+                                },
+                                Text("quest 2".into())
+                        ));
+                    })),
+            ));
+            parent.spawn((
+                    Node {
+                        flex_grow: 1.,
+                        flex_direction: FlexDirection::Column,
+                        ..default()
+                    },
+                    //Text("Quest".into()),
+                    BackgroundColor::from(DARK_VIOLET),
+                    Children::spawn(SpawnWith(|parent: &mut ChildSpawner| {
+                        parent.spawn((
+                            Node {
+                                align_self: AlignSelf::Center,
+                                ..default()
+                            },
+                            Text("Quest".into()),
+                        ));
+                        parent.spawn((
+                            Node {
+                                ..default()
+                            },
+                            Text("ZZZZZZZZZZZz".into()),
+                        ));
+                    })),
+            ));
+        }))
+    ))));
+}
diff --git a/src/ui/start_menu.rs b/src/ui/start_menu.rs
index 9ece3ac..1028cdd 100644
--- a/src/ui/start_menu.rs
+++ b/src/ui/start_menu.rs
@@ -1,6 +1,6 @@
 use bevy::prelude::*;
 
-use crate::{GameState, widgets};
+use crate::{MenuState, MetaState, widgets};
 
 #[derive(Component, Reflect)]
 pub struct UiStartMenu;
@@ -9,7 +9,7 @@ pub struct StartMenuUiPlugin;
 impl Plugin for StartMenuUiPlugin {
     fn build(&self, app: &mut App) {
        app
-           .add_systems(OnEnter(GameState::StartMenu), spawn_start_menu);
+           .add_systems(OnEnter(MetaState::MainMenu), spawn_start_menu);
     }
 }
 
@@ -18,17 +18,33 @@ fn spawn_start_menu(
 ) {
     commands.spawn((
         widgets::ui_root("Start Menu"),
-        DespawnOnExit(GameState::StartMenu),
+        DespawnOnExit(MetaState::MainMenu),
         GlobalZIndex(2),
         children![
             widgets::button("Start Game", start_game),
+            widgets::button("Settings", start_settings),
+            widgets::button("Credits", start_credits),
         ]
     ));
 }
 
+fn start_credits(
+    _trigger: On<Pointer<Click>>,
+    mut game_state: ResMut<NextState<MenuState>>,
+) {
+    game_state.set(MenuState::Credits);
+}
+
+fn start_settings(
+    _trigger: On<Pointer<Click>>,
+    mut game_state: ResMut<NextState<MenuState>>,
+) {
+    game_state.set(MenuState::Settings);
+}
+
 fn start_game(
     _trigger: On<Pointer<Click>>,
-    mut game_state: ResMut<NextState<GameState>>,
+    mut game_state: ResMut<NextState<MetaState>>,
 ) {
-    game_state.set(GameState::Gameplay);
+    game_state.set(MetaState::Gameplay);
 }
diff --git a/src/ui/stats_ui.rs b/src/ui/stats_ui.rs
index 7f43361..0eb3589 100644
--- a/src/ui/stats_ui.rs
+++ b/src/ui/stats_ui.rs
@@ -1,9 +1,6 @@
-use std::marker::PhantomData;
-
-use bevy::{color::palettes::css::DARK_GRAY, ecs::{component::Component, entity::Entity, event::EntityEvent, hierarchy::{ChildSpawner, Children}, observer::On, query::With, spawn::{SpawnRelated, SpawnWith}, system::{Commands, Query}}, prelude::{Node, Plugin}, reflect::enum_debug, ui::{BackgroundColor, Overflow, widget::Text}, utils::default};
-
-use crate::{Experience, Health, Level, Player, widgets::floating_windows::floating_window_root};
+use bevy::{ecs::{entity::Entity, event::EntityEvent, observer::On, query::With, system::{Commands, Query, Res, ResMut}}, prelude::{Node, Plugin}, state::{state::{NextState, State}, state_scoped::DespawnOnExit}, ui::{Overflow, widget::Text}, utils::default};
 
+use crate::{Experience, Level, Player, UiState, widgets::floating_windows::floating_window_root};
 
 #[derive(EntityEvent)]
 pub struct DisplayStatsEvent {
@@ -13,7 +10,7 @@ pub struct DisplayStatsEvent {
 pub struct StatsUiPlugin;
 impl Plugin for StatsUiPlugin {
     fn build(&self, app: &mut bevy::app::App) {
-       app; 
+       app;
     }
 }
 
@@ -29,8 +26,16 @@ pub fn spawn_stats_ui(
 pub fn display_stats_event_observer(
     _trigger: On<DisplayStatsEvent>,
     mut commands: Commands,
-    player_query: Query<(&Level, &Experience), With<Player>>
+    player_query: Query<(&Level, &Experience), With<Player>>,
+    menu_state: Res<State<UiState>>,
+    mut menu_state_setter: ResMut<NextState<UiState>>,
 ) {
+    if *menu_state == UiState::Stats {
+        return;
+    }
+
+    menu_state_setter.set(UiState::Stats);
+
     if let Ok((level, experience)) = player_query.single() {
         let level_node = commands.spawn((
             Node {
@@ -38,13 +43,16 @@ pub fn display_stats_event_observer(
             },
             Text::new(format!("Level: {}", level.0)),
         )).id();
+
         let experience_node = commands.spawn((
             Node {
                 ..default()
             },
             Text::new(format!("Experience: {}", experience.0)),
         )).id();
+
         commands.spawn((
+                DespawnOnExit(UiState::Stats),
                 floating_window_root("Stats".to_string(),
                     (
                         Node {
diff --git a/src/ui/status_bar.rs b/src/ui/status_bar.rs
index 7786a66..c1a0930 100644
--- a/src/ui/status_bar.rs
+++ b/src/ui/status_bar.rs
@@ -1,84 +1,203 @@
-use bevy::color::palettes::css::{BLUE, GREEN};
+use bevy::{color::palettes::css::GREEN, ecs::{lifecycle::HookContext, world::DeferredWorld}, prelude::*, render::render_resource::AsBindGroup};
 
 use super::*;
 
+const HEALTH_SHADER_ASSET_PATH: &str = "shaders/health_ui_material.wgsl";
+const MANA_SHADER_ASSET_PATH: &str = "shaders/mana_ui_material.wgsl";
+
+#[derive(AsBindGroup, Asset, TypePath, Debug, Clone)]
+struct HealthUiMaterial {
+    /// Color multiplied with the image
+    #[uniform(0)]
+    color: Vec4,
+    /// Represents how much of the image is visible
+    /// Goes from 0 to 1
+    /// A `Vec4` is used here because Bevy with webgl2 requires that uniforms are 16-byte aligned but only the first component is read.
+    #[uniform(1)]
+    slider: Vec4,
+    /// Image used to represent the slider
+    #[texture(2)]
+    #[sampler(3)]
+    color_texture: Handle<Image>,
+    /// Color of the image's border
+    #[uniform(4)]
+    border_color: Vec4,
+}
+
+impl UiMaterial for HealthUiMaterial {
+    fn fragment_shader() -> bevy::shader::ShaderRef {
+        HEALTH_SHADER_ASSET_PATH.into()
+    }
+}
+
+#[derive(AsBindGroup, Asset, TypePath, Debug, Clone)]
+struct ManaUiMaterial {
+    /// Color multiplied with the image
+    #[uniform(0)]
+    color: Vec4,
+    /// Represents how much of the image is visible
+    /// Goes from 0 to 1
+    /// A `Vec4` is used here because Bevy with webgl2 requires that uniforms are 16-byte aligned but only the first component is read.
+    #[uniform(1)]
+    slider: Vec4,
+    /// Image used to represent the slider
+    #[texture(2)]
+    #[sampler(3)]
+    color_texture: Handle<Image>,
+    /// Color of the image's border
+    #[uniform(4)]
+    border_color: Vec4,
+}
+
+impl UiMaterial for ManaUiMaterial {
+    fn fragment_shader() -> bevy::shader::ShaderRef {
+        MANA_SHADER_ASSET_PATH.into()
+    }
+}
+
 #[derive(Component, Reflect)]
+#[require(
+    Node {
+        width: Val::Percent(100.),
+        height: Val::Percent(10.),
+        justify_self: JustifySelf::Start,
+        ..default()
+    },
+    BackgroundColor(GREEN.into()),
+    Visibility::Visible,
+)]
+#[component(on_add = on_ui_status_add)]
 pub struct UiStatus;
 
+#[derive(Component, Reflect)]
+#[require(
+    Node { ..default() },
+    Button,
+    Text("Player Mana".to_string()),
+    TextColor(Color::WHITE),
+    //BackgroundColor::from(BLUE),
+    ZIndex(10),
+)]
+#[component(on_add = on_mana_ui_node_add)]
+pub struct ManaUiNode;
+
+#[derive(Component, Reflect)]
+#[require(
+    Node {
+        ..default()
+    },
+    Button,
+    Text("Player Health".to_string()),
+    TextColor(Color::WHITE),
+    ZIndex(10),
+)]
+#[component(on_add = on_health_ui_node_add)]
+pub struct HealthUiNode;
+
 pub struct StatusUIPlugin;
 impl Plugin for StatusUIPlugin {
     fn build(&self, app: &mut App) {
        app
-           .add_systems(OnEnter(GameState::Gameplay), draw_status_ui);
+           .add_plugins(UiMaterialPlugin::<HealthUiMaterial>::default())
+           .add_plugins(UiMaterialPlugin::<ManaUiMaterial>::default())
+           .add_systems(OnEnter(GameState::Gameplay), draw_status_ui)
+           .add_systems(Update, animate_health_material)
+           .add_systems(Update, animate_mana_material);
     }
 }
 
+fn on_health_ui_node_add(
+    mut world: DeferredWorld,
+    context: HookContext,
+) {
+    let asset_server = world.resource::<AssetServer>();
+    let font = asset_server.load("FiraSans-Bold.ttf");
+
+    let ui_assets = world.resource::<DAUiAssets>();
+    let image = ui_assets.health_1.clone();
+
+    let mut ui_materials = world.resource_mut::<Assets<HealthUiMaterial>>();
+    let material = ui_materials.add(HealthUiMaterial {
+        color: LinearRgba::WHITE.to_f32_array().into(),
+        slider: Vec4::splat(0.5),
+        color_texture: image,
+        border_color: LinearRgba::WHITE.to_f32_array().into(),
+    });
+
+    world.commands()
+        .entity(context.entity)
+        .insert(TextFont {
+            font,
+            font_size: 50.0,
+            ..default()
+        })
+        .insert((
+                MaterialNode(material),
+        ));
+}
+
+fn on_mana_ui_node_add(
+    mut world: DeferredWorld,
+    context: HookContext,
+) {
+    let asset_server = world.resource::<AssetServer>();
+    let font = asset_server.load("FiraSans-Bold.ttf");
+
+    let ui_assets = world.resource::<DAUiAssets>();
+    let image = ui_assets.mana_1.clone();
+
+    let mut ui_materials = world.resource_mut::<Assets<ManaUiMaterial>>();
+    let material = ui_materials.add(ManaUiMaterial {
+        color: LinearRgba::WHITE.to_f32_array().into(),
+        slider: Vec4::splat(0.5),
+        color_texture: image,
+        border_color: LinearRgba::WHITE.to_f32_array().into(),
+    });
+
+    world.commands()
+        .entity(context.entity)
+        .insert(TextFont {
+            font,
+            font_size: 50.0,
+            ..default()
+        })
+    .insert((
+            MaterialNode(material),
+    ));
+}
+
+fn on_ui_status_add(
+    mut world: DeferredWorld,
+    context: HookContext,
+) {
+    world.commands()
+        .entity(context.entity);
+}
+
 pub fn draw_status_ui(
     mut commands: Commands,
-    asset_server: Res<AssetServer>,
-    ui_assets: Res<DAUiAssets>,
     health_query: Query<(&Health, &MaxHealth), With<Player>>,
     mana_query: Query<(&Mana, &MaxMana), With<Player>>,
 ) {
     trace!("draw_status_ui");
-    /*let health_ui_icons: [Handle<Image>; 3] = [
-        asset_server.load("HP/Style_1.png"),
-        asset_server.load("HP/Style_2.png"),
-        asset_server.load("HP/Style_3.png"),
-    ];*/
-    /*let health_ui_icons: [Handle<Image>; 3] = [
-        ui_assets.health_1.clone_weak(),
-        ui_assets.health_2.clone_weak(),
-        ui_assets.health_3.clone_weak(),
-    ];*/
     if let Ok((_mana, _max_mana)) = mana_query.single()
         && let Ok((_health, _max_health)) = health_query.single() {
+
             let status_bar_node = commands
                 .spawn((
-                    Node {
-                        width: Val::Percent(100.),
-                        height: Val::Percent(10.),
-                        justify_self: JustifySelf::Start,
-                        ..default()
-                    },
-                    BackgroundColor(GREEN.into()),
-                    Visibility::Visible,
                     UiStatus,
                 ))
                 .id();
 
             let player_health_node = commands
                 .spawn((
-                    Node { ..default() },
-                    Button,
-                    Text("Player Health".to_string()),
-                    TextColor(Color::WHITE),
-                    TextFont {
-                        font: asset_server.load("FiraSans-Bold.ttf"),
-                        font_size: 50.0,
-                        ..default()
-                    },
-                    ZIndex(10),
-                    ImageNode {
-                        //image: health_ui_icons[0].clone().into(),
-                        image: ui_assets.health_1.clone().into(),
-                        ..default()
-                    },
+                    HealthUiNode,
                 ))
                 .id();
+
             let player_mana_node = commands
                 .spawn((
-                    Node { ..default() },
-                    Button,
-                    Text("Player Mana".to_string()),
-                    TextColor(Color::WHITE),
-                    TextFont {
-                        font: asset_server.load("FiraSans-Bold.ttf"),
-                        font_size: 50.0,
-                        ..default()
-                    },
-                    BackgroundColor::from(BLUE),
-                    ZIndex(10),
+                    ManaUiNode,
                 ))
                 .id();
 
@@ -86,3 +205,50 @@ pub fn draw_status_ui(
             commands.entity(status_bar_node).add_child(player_mana_node);
     }
 }
+
+fn animate_health_material(
+    mut materials: ResMut<Assets<HealthUiMaterial>>,
+    query: Query<&MaterialNode<HealthUiMaterial>>,
+    health_query: Query<(&Health, &MaxHealth), With<Player>>,
+    time: Res<Time>,
+) {
+    //let duration = 2.0;
+    for handle in &query {
+        if let Some(material) = materials.get_mut(handle)
+        && let Ok((health, max_health)) = health_query.single() {
+            let value = health.0 as f32 / max_health.0 as f32;
+            // rainbow color effect
+            let new_color = Color::hsl((time.elapsed_secs() * 60.0) % 360.0, 1., 0.5);
+            let border_color = Color::hsl((time.elapsed_secs() * 60.0) % 360.0, 0.75, 0.75);
+            material.color = new_color.to_linear().to_vec4();
+            material.slider.x =
+                //((time.elapsed_secs() % (duration * 2.0)) - duration).abs() / duration;
+                value;
+            material.border_color = border_color.to_linear().to_vec4();
+        }
+    }
+}
+
+fn animate_mana_material(
+    mut materials: ResMut<Assets<ManaUiMaterial>>,
+    query: Query<&MaterialNode<ManaUiMaterial>>,
+    mana_query: Query<(&Mana, &MaxMana), With<Player>>,
+    time: Res<Time>,
+) {
+    //let duration = 2.0;
+    for handle in &query {
+        if let Some(material) = materials.get_mut(handle)
+        && let Ok((mana, max_mana)) = mana_query.single() {
+            let value = mana.0 as f32 / max_mana.0 as f32;
+            //println!("{:?}", value);
+            // rainbow color effect
+            let new_color = Color::hsl((time.elapsed_secs() * 60.0) % 360.0, 1., 0.5);
+            let border_color = Color::hsl((time.elapsed_secs() * 60.0) % 360.0, 0.75, 0.75);
+            material.color = new_color.to_linear().to_vec4();
+            material.slider.x =
+                //((time.elapsed_secs() % (duration * 2.0)) - duration).abs() / duration;
+                value;
+            material.border_color = border_color.to_linear().to_vec4();
+        }
+    }
+}
diff --git a/src/ui/widgets/anchored.rs b/src/ui/widgets/anchored.rs
index 53c1c70..b2f2ddc 100644
--- a/src/ui/widgets/anchored.rs
+++ b/src/ui/widgets/anchored.rs
@@ -1,4 +1,4 @@
-use bevy::{app::{Plugin, PostUpdate}, ecs::{component::Component, entity::Entity, hierarchy::Children, query::With, system::{Query, Single}}, math::{BVec2, Vec2, bounding::{Aabb2d, BoundingVolume}}, transform::components::GlobalTransform, ui::{ComputedNode, ComputedUiRenderTargetInfo, LayoutConfig, Node, UiGlobalTransform, Val}, window::{PrimaryWindow, Window}};
+use bevy::{app::{Plugin, PostUpdate}, ecs::{component::Component, entity::Entity, hierarchy::Children, query::With, system::{Query, Single}}, math::{BVec2, Vec2, bounding::{Aabb2d, BoundingVolume}}, ui::{ComputedNode, ComputedUiRenderTargetInfo, LayoutConfig, Node, UiGlobalTransform, Val}, window::{PrimaryWindow, Window}};
 
 use crate::widgets::{floating_windows::apply_position, utils::aabb_overlap};
 
diff --git a/src/ui/widgets/floating_window_focus.rs b/src/ui/widgets/floating_window_focus.rs
index bd366f1..4683366 100644
--- a/src/ui/widgets/floating_window_focus.rs
+++ b/src/ui/widgets/floating_window_focus.rs
@@ -1,4 +1,4 @@
-use bevy::{app::Plugin, ecs::{component::Component, entity::{self, Entity}, event::EntityEvent, hierarchy::ChildOf, observer::On, query::With, system::{Commands, Query}}, picking::events::{Pointer, Press}, platform::collections::HashSet};
+use bevy::{app::Plugin, ecs::{component::Component, entity::Entity, event::EntityEvent, hierarchy::ChildOf, observer::On, query::With, system::{Commands, Query}}, picking::events::{Pointer, Press}, platform::collections::HashSet};
 
 /// If contents of entity are interacted with, focus should be kept
 /// for given focus parent entity and its parents recursively
@@ -34,7 +34,7 @@ impl Plugin for FloatingUiFocusPlugin {
     fn build(&self, app: &mut bevy::app::App) {
        app
            .add_observer(update_should_close)
-           .add_observer(should_close_current_tree_observer); 
+           .add_observer(should_close_current_tree_observer);
     }
 }
 
diff --git a/src/ui/widgets/floating_windows.rs b/src/ui/widgets/floating_windows.rs
index fe453f5..0cea04e 100644
--- a/src/ui/widgets/floating_windows.rs
+++ b/src/ui/widgets/floating_windows.rs
@@ -1,5 +1,6 @@
 use bevy::{color::palettes::css::{CRIMSON, DARK_CYAN, DARK_GREEN, DARK_VIOLET}, feathers::cursor::{self, CursorIconPlugin}, math::{I8Vec2, bounding::Aabb2d}, picking::hover::Hovered, prelude::*, ui::Pressed, window::SystemCursorIcon};
 use rand::Rng;
+use rand::random_range;
 
 use crate::widgets::floating_window_ordering::UiZOrderLayer;
 
@@ -122,15 +123,15 @@ impl Default for FloatingWindow {
 pub fn init_floating_window(
     mut window_query: Query<(&mut FloatingWindow, &mut Node), Added<FloatingWindow>>,
 ) {
-    let mut rng = rand::rng();
-    for (mut window, mut node) in window_query.iter_mut() {
+    //let mut rng = rand::rng();
+    for (window, mut node) in window_query.iter_mut() {
         node.min_width = window.initial_width;
         node.min_height = window.initial_height;
         node.max_width = window.initial_width;
         node.max_height = window.initial_height;
 
-        node.left = px(rng.random_range(10..500i32) as f32);
-        node.top = px(rng.random_range(10..500i32) as f32);
+        node.left = px(random_range(10..500i32) as f32);
+        node.top = px(random_range(10..500i32) as f32);
     }
 }
 
@@ -817,6 +818,106 @@ pub fn floating_window_root(title: String, contents_bundle: impl Bundle) -> impl
     )
 }
 
+pub fn floating_computer_window_root(title: String, contents_bundle: impl Bundle) -> impl Bundle {
+    (
+        Node {
+            flex_direction: FlexDirection::Column,
+            position_type: PositionType::Absolute,
+            min_height: Val::Px(30.),
+            //overflow: Overflow { x: OverflowAxis::Hidden, y: OverflowAxis::Hidden },
+            ..default()
+        },
+        FloatingWindow {
+            initial_width: Val::Vw(40.),
+            initial_height: Val::Vh(30.),
+            min_width: Val::Px(200.),
+            min_height: Val::Px(30.),
+            ..default()
+        },
+        BackgroundColor::from(CRIMSON),
+        Children::spawn( SpawnWith(|parent: &mut ChildSpawner| {
+            parent.spawn((resizable_borders(5., BackgroundColor::from(DARK_GREEN)), WindowResize));
+            parent.spawn(title_bar(title));
+            parent.spawn(contents_bundle)
+                .observe(block_pointer_events);
+        })),
+        bevy::ui_widgets::observe(|trigger: On<CloseWindowEvent>, mut commands: Commands| {
+            commands.entity(trigger.entity).despawn();
+        }),
+        bevy::ui_widgets::observe(
+            |trigger: On<MinimizeWindowEvent>,
+            mut window_query: Query<&mut Node>,
+            | {
+                if let Ok(mut window_node) = window_query.get_mut(trigger.entity) {
+                    window_node.height = Val::Px(30.);
+                    window_node.min_height = Val::Px(30.);
+                }
+        }),
+        bevy::ui_widgets::observe(
+            |trigger: On<MaximizeWindowEvent>,
+            mut window_query: Query<&mut Node>,
+            | {
+                if let Ok(mut window_node) = window_query.get_mut(trigger.entity) {
+                    window_node.height = Val::Vh(100.);
+                    window_node.width = Val::Vw(100.);
+                    window_node.min_height = Val::Px(30.);
+                    window_node.min_width = Val::Px(200.);
+                }
+            }
+        )
+    )
+}
+
+pub fn floating_computer_rover_window_root(title: String, contents_bundle: impl Bundle) -> impl Bundle {
+    (
+        Node {
+            flex_direction: FlexDirection::Column,
+            position_type: PositionType::Absolute,
+            min_height: Val::Px(30.),
+            //overflow: Overflow { x: OverflowAxis::Hidden, y: OverflowAxis::Hidden },
+            ..default()
+        },
+        FloatingWindow {
+            initial_width: Val::Vw(60.),
+            initial_height: Val::Vh(60.),
+            min_width: Val::Px(200.),
+            min_height: Val::Px(30.),
+            ..default()
+        },
+        BackgroundColor::from(CRIMSON),
+        Children::spawn( SpawnWith(|parent: &mut ChildSpawner| {
+            parent.spawn((resizable_borders(5., BackgroundColor::from(DARK_GREEN)), WindowResize));
+            parent.spawn(title_bar(title));
+            parent.spawn(contents_bundle)
+                .observe(block_pointer_events);
+        })),
+        bevy::ui_widgets::observe(|trigger: On<CloseWindowEvent>, mut commands: Commands| {
+            commands.entity(trigger.entity).despawn();
+        }),
+        bevy::ui_widgets::observe(
+            |trigger: On<MinimizeWindowEvent>,
+            mut window_query: Query<&mut Node>,
+            | {
+                if let Ok(mut window_node) = window_query.get_mut(trigger.entity) {
+                    window_node.height = Val::Px(30.);
+                    window_node.min_height = Val::Px(30.);
+                }
+        }),
+        bevy::ui_widgets::observe(
+            |trigger: On<MaximizeWindowEvent>,
+            mut window_query: Query<&mut Node>,
+            | {
+                if let Ok(mut window_node) = window_query.get_mut(trigger.entity) {
+                    window_node.height = Val::Vh(100.);
+                    window_node.width = Val::Vw(100.);
+                    window_node.min_height = Val::Px(30.);
+                    window_node.min_width = Val::Px(200.);
+                }
+            }
+        )
+    )
+}
+
 pub fn title_bar(title: String) -> impl Bundle {
     (
         Node {
diff --git a/src/ui/widgets/mod.rs b/src/ui/widgets/mod.rs
index 2b4380d..710f0d2 100644
--- a/src/ui/widgets/mod.rs
+++ b/src/ui/widgets/mod.rs
@@ -66,7 +66,7 @@ pub fn label_base(text: impl Into<String>, font_size: f32) -> impl Bundle {
     )
 }
 
-pub fn button<E, B, M, I>(text: impl Into<String>, action: I) -> impl Bundle 
+pub fn button<E, B, M, I>(text: impl Into<String>, action: I) -> impl Bundle
 where
     E: EntityEvent,
     B: Bundle,
@@ -81,10 +81,10 @@ where
                 height: Val::Px(80.0),
                 align_items: AlignItems::Center,
                 justify_content: JustifyContent::Center,
+                border_radius: BorderRadius::MAX,
                 ..default()
             },
             BackgroundColor::from(DARK_GREEN),
-            BorderRadius::MAX,
         ),
     )
 }
@@ -138,9 +138,9 @@ where
                 height: Val::Px(80.0),
                 align_items: AlignItems::Center,
                 justify_content: JustifyContent::Center,
+                border_radius: BorderRadius::MAX,
                 ..default()
             },
-            BorderRadius::MAX,
         )
     )
 }
diff --git a/src/ui/widgets/tooltip.rs b/src/ui/widgets/tooltip.rs
index dc7eb25..cfb74cd 100644
--- a/src/ui/widgets/tooltip.rs
+++ b/src/ui/widgets/tooltip.rs
@@ -1,5 +1,3 @@
-use std::default;
-
 use bevy::{app::{Plugin, PostUpdate}, ecs::{component::Component, entity::Entity, observer::On, query::With, resource::Resource, system::{Query, Res, ResMut}}, picking::events::{Out, Over, Pointer}, time::Time};
 
 #[derive(Component)]
@@ -13,7 +11,7 @@ pub struct TooltipParent(Vec<Entity>);
 /// Marks entity as tooltip source. When hovered.
 ///
 /// It will count towards timers for deploying tooltip.
-#[derive(Component)]
+#[derive(Component, Default)]
 pub struct TooltipSource;
 
 /// Global settings when tooltips should be displayed
diff --git a/src/utils/util_systems.rs b/src/utils/util_systems.rs
index b842acc..79e32ad 100644
--- a/src/utils/util_systems.rs
+++ b/src/utils/util_systems.rs
@@ -24,12 +24,12 @@ pub trait MeshExt {
 
 impl MeshExt for Mesh {
     fn transform(&mut self, transform: Transform) {
-        for coords in self.read_coords_mut(Mesh::ATTRIBUTE_POSITION.clone()) {
+        for coords in self.read_coords_mut(Mesh::ATTRIBUTE_POSITION) {
             let vec3 = (*coords).into();
             let transformed = transform.transform_point(vec3);
             *coords = transformed.into();
         }
-        for normal in self.read_coords_mut(Mesh::ATTRIBUTE_NORMAL.clone()) {
+        for normal in self.read_coords_mut(Mesh::ATTRIBUTE_NORMAL) {
             let vec3 = (*normal).into();
             let transformed = transform.rotation.mul_vec3(vec3);
             *normal = transformed.into();