diff --git a/.cargo/config.toml b/.cargo/config.toml
index 9e4a448..12bbde1 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,29 +1,14 @@
-# Add the contents of this file to `config.toml` to enable "fast build" configuration. Please read the notes below.
-
-# NOTE: For maximum performance, build using a nightly compiler
-# If you are using rust stable, remove the "-Zshare-generics=y" below.
-
 [target.x86_64-unknown-linux-gnu]
 linker = "clang"
-rustflags = ["-Clink-arg=-fuse-ld=lld", "-Zshare-generics=y"]
+rustflags = ["-Clink-arg=-fuse-ld=lld"]
 
 # NOTE: you must install [Mach-O LLD Port](https://lld.llvm.org/MachO/index.html) on mac. you can easily do this by installing llvm which includes lld with the "brew" package manager:
 # `brew install llvm`
 [target.x86_64-apple-darwin]
-rustflags = [
-  "-C",
-  "link-arg=-fuse-ld=/usr/local/opt/llvm/bin/ld64.lld",
-  "-Zshare-generics=y",
-]
+rustflags = ["-C", "link-arg=-fuse-ld=/usr/local/opt/llvm/bin/ld64.lld"]
 
-# Commented out to try and fix the issue with the linker not being found
-# [target.aarch64-apple-darwin]
-# rustflags = [
-#   "-C",
-#   "link-arg=-fuse-ld=/opt/homebrew/opt/llvm/bin/ld64.lld",
-#   "-Zshare-generics=y",
-# ]
+[target.aarch64-apple-darwin]
+rustflags = ["-C", "link-arg=-fuse-ld=/usr/local/opt/llvm/bin/ld64.lld"]
 
 [target.x86_64-pc-windows-msvc]
 linker = "rust-lld.exe"
-rustflags = ["-Zshare-generics=n"]
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index a4299fa..d1ca2a9 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -37,16 +37,6 @@ jobs:
         uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4
       - name: Install Dependencies
         run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev
-      - name: Cache
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4
-        with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target
-          key: ${{ runner.os }}-docs-${{ hashFiles('**/Cargo.toml') }}
       - name: Build Docs
         run: |
           cargo doc --workspace --no-deps
@@ -58,7 +48,7 @@ jobs:
             echo "::warning title=Invalid file permissions automatically fixed::$line"
           done
       - name: Setup Pages
-        uses: actions/configure-pages@983d7736d9b0ae728b81ab479565c72886d7745b # v4
+        uses: actions/configure-pages@1f0c5cde4bc74cd7e1254d0cb4de8d49e9068c7d # v4
       - name: Upload artifact
         uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa # v3
   deploy:
@@ -79,4 +69,4 @@ jobs:
           egress-policy: audit
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@d6db90164ac5ed86f2b6aed7e0febac5b3c0c03e # v4
+        uses: actions/deploy-pages@decdde0ac072f6dcbe43649d82d9c635fff5b4e4 # v4
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a5ee4eb..148c4f5 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,7 +11,6 @@ env:
   add_binaries_to_github_release: true
   itch_target: nwesterhausen/elementalist
   tag_name: ${{ github.ref_name }}
-  nightly_toolchain: nightly-2024-01-17
   # sccache enablement
   SCCACHE_GHA_ENABLED: true
   RUSTC_WRAPPER: sccache
@@ -42,10 +41,10 @@ jobs:
       - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4
       - name: Run sccache-cache
         uses: mozilla-actions/sccache-action@2e7f9ec7921547d4b46598398ca573513895d0bd # 0.0.4
-      - uses: dtolnay/rust-toolchain@bb45937a053e097f8591208d8e74c90db1873d07 # master
+      - uses: dtolnay/rust-toolchain@be73d7920c329f220ce78e0234b8f96b7ae60248 # master
         with:
           targets: x86_64-unknown-linux-gnu
-          toolchain: ${{ env.nightly_toolchain }}
+          toolchain: stable
       - 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
@@ -100,10 +99,10 @@ jobs:
       - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4
       - name: Run sccache-cache
         uses: mozilla-actions/sccache-action@2e7f9ec7921547d4b46598398ca573513895d0bd # 0.0.4
-      - uses: dtolnay/rust-toolchain@bb45937a053e097f8591208d8e74c90db1873d07 # master
+      - uses: dtolnay/rust-toolchain@be73d7920c329f220ce78e0234b8f96b7ae60248 # master
         with:
           targets: x86_64-pc-windows-msvc
-          toolchain: ${{ env.nightly_toolchain }}
+          toolchain: stable
 
       - name: Build
         run: |
@@ -154,10 +153,10 @@ jobs:
       - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4
       - name: Run sccache-cache
         uses: mozilla-actions/sccache-action@2e7f9ec7921547d4b46598398ca573513895d0bd # 0.0.4
-      - uses: dtolnay/rust-toolchain@bb45937a053e097f8591208d8e74c90db1873d07 # master
+      - uses: dtolnay/rust-toolchain@be73d7920c329f220ce78e0234b8f96b7ae60248 # master
         with:
           targets: x86_64-apple-darwin, aarch64-apple-darwin
-          toolchain: ${{ env.nightly_toolchain }}
+          toolchain: stable
       - name: Environment Setup
         run: |
           export CFLAGS="-fno-stack-check"
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index fa0bab1..c464a70 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -11,7 +11,6 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
-  nightly_toolchain: nightly-2024-01-17
   # sccache enablement
   SCCACHE_GHA_ENABLED: true
   RUSTC_WRAPPER: sccache
@@ -36,10 +35,10 @@ jobs:
         run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev
       - name: Run sccache-cache
         uses: mozilla-actions/sccache-action@2e7f9ec7921547d4b46598398ca573513895d0bd # 0.0.4
-      - uses: dtolnay/rust-toolchain@bb45937a053e097f8591208d8e74c90db1873d07 # master
+      - uses: dtolnay/rust-toolchain@be73d7920c329f220ce78e0234b8f96b7ae60248 # master
         with:
           targets: x86_64-unknown-linux-gnu
-          toolchain: ${{ env.nightly_toolchain }}
+          toolchain: stable
       - name: Build
         run: cargo build
       - name: Show sccache stats
@@ -64,15 +63,11 @@ jobs:
         run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev
       - name: Run sccache-cache
         uses: mozilla-actions/sccache-action@2e7f9ec7921547d4b46598398ca573513895d0bd # 0.0.4
-      - uses: dtolnay/rust-toolchain@bb45937a053e097f8591208d8e74c90db1873d07 # master
+      - uses: dtolnay/rust-toolchain@be73d7920c329f220ce78e0234b8f96b7ae60248 # master
         with:
           targets: x86_64-unknown-linux-gnu
-          toolchain: ${{ env.nightly_toolchain }}
-      - name: Install Nightly Toolchain
-        uses: dtolnay/rust-toolchain@bb45937a053e097f8591208d8e74c90db1873d07 # stable
-        with:
+          toolchain: stable
           components: clippy
-          toolchain: nightly-2024-01-17
       - name: Run clippy
         run: cargo clippy -- -D warnings
   test:
@@ -89,10 +84,10 @@ jobs:
         run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev
       - name: Run sccache-cache
         uses: mozilla-actions/sccache-action@2e7f9ec7921547d4b46598398ca573513895d0bd # 0.0.4
-      - uses: dtolnay/rust-toolchain@bb45937a053e097f8591208d8e74c90db1873d07 # master
+      - uses: dtolnay/rust-toolchain@be73d7920c329f220ce78e0234b8f96b7ae60248 # master
         with:
           targets: x86_64-unknown-linux-gnu
-          toolchain: ${{ env.nightly_toolchain }}
+          toolchain: stable
       - uses: taiki-e/install-action@e553ccd87e21fd7eeca7478760ec8dbf0bd45831 # v2.33.3
         with:
           tool: cargo-nextest
diff --git a/Cargo.lock b/Cargo.lock
index 9722604..e5101c9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -41,7 +41,7 @@ checksum = "cd3b6ae1eabbfbced10e840fd3fce8a93ae84f174b3e4ba892ab7bcb42e477a7"
 dependencies = [
  "accesskit",
  "accesskit_consumer",
- "objc2",
+ "objc2 0.3.0-beta.3.patch-leaks.3",
  "once_cell",
 ]
 
@@ -61,25 +61,17 @@ dependencies = [
 
 [[package]]
 name = "accesskit_winit"
-version = "0.15.0"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88e39fcec2e10971e188730b7a76bab60647dacc973d4591855ebebcadfaa738"
+checksum = "45f8f7c9f66d454d5fd8e344c8c8c7324b57194e1041b955519fc58a01e77a25"
 dependencies = [
  "accesskit",
  "accesskit_macos",
  "accesskit_windows",
+ "raw-window-handle 0.6.0",
  "winit",
 ]
 
-[[package]]
-name = "addr2line"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
-dependencies = [
- "gimli",
-]
-
 [[package]]
 name = "adler"
 version = "1.0.2"
@@ -108,6 +100,12 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "aligned-vec"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1"
+
 [[package]]
 name = "allocator-api2"
 version = "0.2.16"
@@ -138,20 +136,23 @@ dependencies = [
 
 [[package]]
 name = "android-activity"
-version = "0.4.3"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64529721f27c2314ced0890ce45e469574a73e5e6fdd6e9da1860eb29285f5e0"
+checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289"
 dependencies = [
  "android-properties",
- "bitflags 1.3.2",
+ "bitflags 2.4.2",
  "cc",
+ "cesu8",
+ "jni 0.21.1",
  "jni-sys",
  "libc",
  "log",
- "ndk",
+ "ndk 0.8.0",
  "ndk-context",
- "ndk-sys",
- "num_enum 0.6.1",
+ "ndk-sys 0.5.0+25.2.9519653",
+ "num_enum 0.7.2",
+ "thiserror",
 ]
 
 [[package]]
@@ -190,6 +191,12 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "arbitrary"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110"
+
 [[package]]
 name = "arboard"
 version = "3.3.0"
@@ -197,8 +204,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aafb29b107435aa276664c1db8954ac27a6e105cdad3c88287a199eb0e313c08"
 dependencies = [
  "clipboard-win",
- "core-graphics",
- "image",
+ "core-graphics 0.22.3",
+ "image 0.24.8",
  "log",
  "objc",
  "objc-foundation",
@@ -206,7 +213,18 @@ dependencies = [
  "parking_lot",
  "thiserror",
  "winapi",
- "x11rb",
+ "x11rb 0.12.0",
+]
+
+[[package]]
+name = "arg_enum_proc_macro"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -221,6 +239,12 @@ version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
+[[package]]
+name = "as-raw-xcb-connection"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b"
+
 [[package]]
 name = "ash"
 version = "0.37.3+1.3.251"
@@ -240,17 +264,6 @@ dependencies = [
  "futures-core",
 ]
 
-[[package]]
-name = "async-channel"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
-dependencies = [
- "concurrent-queue",
- "event-listener 2.5.3",
- "futures-core",
-]
-
 [[package]]
 name = "async-channel"
 version = "2.2.0"
@@ -270,33 +283,23 @@ version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c"
 dependencies = [
- "async-lock 3.3.0",
+ "async-lock",
  "async-task",
  "concurrent-queue",
- "fastrand 2.0.1",
- "futures-lite 2.2.0",
+ "fastrand",
+ "futures-lite",
  "slab",
 ]
 
 [[package]]
 name = "async-fs"
-version = "1.6.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06"
+checksum = "bc19683171f287921f2405677dd2ed2549c3b3bda697a563ebc3a121ace2aba1"
 dependencies = [
- "async-lock 2.8.0",
- "autocfg",
+ "async-lock",
  "blocking",
- "futures-lite 1.13.0",
-]
-
-[[package]]
-name = "async-lock"
-version = "2.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b"
-dependencies = [
- "event-listener 2.5.3",
+ "futures-lite",
 ]
 
 [[package]]
@@ -316,6 +319,12 @@ version = "4.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799"
 
+[[package]]
+name = "atomic-arena"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5450eca8ce5abcfd5520727e975ebab30ccca96030550406b0ca718b224ead10"
+
 [[package]]
 name = "atomic-waker"
 version = "1.1.2"
@@ -329,25 +338,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
-name = "backtrace"
-version = "0.3.69"
+name = "av1-grain"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+checksum = "6678909d8c5d46a42abcf571271e15fdbc0a225e3646cf23762cd415046c78bf"
 dependencies = [
- "addr2line",
- "cc",
- "cfg-if",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
+ "anyhow",
+ "arrayvec",
+ "log",
+ "nom",
+ "num-rational",
+ "v_frame",
 ]
 
 [[package]]
-name = "base64"
-version = "0.13.1"
+name = "avif-serialize"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+checksum = "876c75a42f6364451a033496a14c44bffe41f5f4a8236f697391f11024e596d2"
+dependencies = [
+ "arrayvec",
+]
 
 [[package]]
 name = "base64"
@@ -357,18 +368,18 @@ checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
 [[package]]
 name = "bevy"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4bc7e09282a82a48d70ade0c4c1154b0fd7882a735a39c66766a5d0f4718ea9"
+checksum = "611dd99f412e862610adb43e2243b16436c6d8009f6d9dbe8ce3d6d840b34029"
 dependencies = [
  "bevy_internal",
 ]
 
 [[package]]
 name = "bevy-inspector-egui"
-version = "0.22.1"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c3efee9165f9be9c6a180c6a9bbb4bd39ee0a98a594f4cb7127704e15415cdd"
+checksum = "a437cb56d4ca4d3b770889e0bd9c464cfd8e68ef370e232bd39cb4f40d880a7f"
 dependencies = [
  "bevy-inspector-egui-derive",
  "bevy_app",
@@ -386,8 +397,10 @@ dependencies = [
  "bevy_time",
  "bevy_utils",
  "bevy_window",
- "egui 0.24.1",
- "image",
+ "egui",
+ "egui-dropdown",
+ "fuzzy-matcher",
+ "image 0.24.8",
  "once_cell",
  "pretty-type-name",
  "smallvec",
@@ -395,9 +408,9 @@ dependencies = [
 
 [[package]]
 name = "bevy-inspector-egui-derive"
-version = "0.22.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ec77479f56958ed1b2802c3129ebc704d12245627b2d4dae61f11e6ed5c21b1"
+checksum = "975d905908c2d621b5a55a6925ac331feac19df430e4c8818b35ef1b95142b14"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -406,9 +419,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_a11y"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68080288c932634f6563d3a8299efe0ddc9ea6787539c4c771ba250d089a94f0"
+checksum = "5bf80cd6d0dca4073f9b34b16f1d187a4caa035fd841892519431783bbc9e287"
 dependencies = [
  "accesskit",
  "bevy_app",
@@ -418,9 +431,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_animation"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7aa37683b1281e1ba8cf285644e6e3f0704f14b3901c5ee282067ff7ff6f4a56"
+checksum = "aa4ef4c35533df3f0c4e938cf6a831456ea563775bab799336f74331140c7665"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -437,9 +450,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_app"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d41731817993f92e4363dd3335558e779e290bc71eefc0b5547052b85810907e"
+checksum = "8bce3544afc010ffed39c136f6d5a9322d20d38df1394d468ba9106caa0434cb"
 dependencies = [
  "bevy_derive",
  "bevy_ecs",
@@ -453,13 +466,13 @@ dependencies = [
 
 [[package]]
 name = "bevy_asset"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "935984568f75867dd7357133b06f4b1502cd2be55e4642d483ce597e46e63bff"
+checksum = "ac185d8e29c7eb0194f8aae7af3f7234f7ca7a448293be1d3d0d8fef435f65ec"
 dependencies = [
  "async-broadcast",
  "async-fs",
- "async-lock 2.8.0",
+ "async-lock",
  "bevy_app",
  "bevy_asset_macros",
  "bevy_ecs",
@@ -472,7 +485,7 @@ dependencies = [
  "crossbeam-channel",
  "downcast-rs",
  "futures-io",
- "futures-lite 1.13.0",
+ "futures-lite",
  "js-sys",
  "parking_lot",
  "ron",
@@ -485,9 +498,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_asset_macros"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f48b9bbe4ec605e4910b5cd1e1a0acbfbe0b80af5f3bcc4489a9fdd1e80058c"
+checksum = "cb82d1aac8251378c45a8d0ad788d1bf75f54db28c1750f84f1fd7c00127927a"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
@@ -497,9 +510,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_audio"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18a69889e1bfa4dbac4e641536b94f91c441da55796ad9832e77836b8264688b"
+checksum = "f4fe7f952e5e0a343fbde43180db7b8e719ad78594480c91b26876623944a3a1"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -515,9 +528,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_core"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3daa24502a14839509f02407bc7e48299fe84d260877de23b60662de0f4f4b6c"
+checksum = "f7b1b340b8d08f48ecd51b97589d261f5023a7b073d25e300382c49146524103"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -531,9 +544,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_core_pipeline"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4b77c4fca6e90edbe2e72da7bc9aa7aed7dfdfded0920ae0a0c845f5e11084a"
+checksum = "626a5aaadbdd69eae020c5856575d2d0113423ae1ae1351377e20956d940052c"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -553,9 +566,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_derive"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f484318350462c58ba3942a45a656c1fd6b6e484a6b6b7abc3a787ad1a51e500"
+checksum = "028ae2a34678055185d7f1beebb1ebe6a8dcf3733e139e4ee1383a7f29ae8ba6"
 dependencies = [
  "bevy_macro_utils",
  "quote",
@@ -564,9 +577,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_diagnostic"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa38ca5967d335cc1006a0e0f1a86c350e2f15fd1878449f61d04cd57a7c4060"
+checksum = "01a104acfdc5280accd01a3524810daf3bda72924e3da0c8a9ec816a57eef4e3"
 dependencies = [
  "bevy_app",
  "bevy_core",
@@ -574,23 +587,23 @@ dependencies = [
  "bevy_log",
  "bevy_time",
  "bevy_utils",
+ "const-fnv1a-hash",
  "sysinfo",
 ]
 
 [[package]]
 name = "bevy_ecs"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7709fbd22f81fb681534cd913c41e1cd18b17143368743281195d7f024b61aea"
+checksum = "b85406d5febbbdbcac4444ef61cd9a816f2f025ed692a3fc5439a32153070304"
 dependencies = [
- "async-channel 1.9.0",
+ "async-channel",
  "bevy_ecs_macros",
  "bevy_ptr",
  "bevy_reflect",
  "bevy_tasks",
  "bevy_utils",
  "downcast-rs",
- "event-listener 2.5.3",
  "fixedbitset",
  "rustc-hash",
  "serde",
@@ -600,9 +613,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_ecs_macros"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8843aa489f159f25cdcd9fee75cd7d221a7098a71eaa72cb2d6b40ac4e3f1ba"
+checksum = "9a3ce4b65d7c5f1990e729df75cec2ea6e2241b4a0c37b31c281a04c59c11b7b"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
@@ -612,22 +625,30 @@ dependencies = [
 
 [[package]]
 name = "bevy_egui"
-version = "0.24.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c90c01202dbcebc03315a01ea71553b35e1f20b0da6b1cc8c2605344032a3d96"
+checksum = "eac153cb176b04eb0734c60fbc2912aa6fb2539f5b64ba832661c1c4cf9e298a"
 dependencies = [
  "arboard",
  "bevy",
- "egui 0.24.1",
+ "console_log",
+ "crossbeam-channel",
+ "egui",
+ "js-sys",
+ "log",
  "thread_local",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
  "webbrowser",
+ "winit",
 ]
 
 [[package]]
 name = "bevy_encase_derive"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5328a3715e933ebbff07d0e99528dc423c4f7a53590ed1ac19a120348b028990"
+checksum = "6c3d301922e76b16819e17c8cc43b34e92c13ccd06ad19dfa3e52a91a0e13e5c"
 dependencies = [
  "bevy_macro_utils",
  "encase_derive_impl",
@@ -635,9 +656,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_gilrs"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b81ca2ebf66cbc7f998f1f142b15038ffe3c4ae1d51f70adda26dcf51b0c4ca"
+checksum = "96364a1875ee4545fcf825c78dc065ddb9a3b2a509083ef11142f9de0eb8aa17"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -651,15 +672,17 @@ dependencies = [
 
 [[package]]
 name = "bevy_gizmos"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db232274ddca2ae452eb2731b98267b795d133ddd14013121bc7daddde1c7491"
+checksum = "bdca80b7b4db340eb666d69374a0195b3935759120d0b990fcef8b27d0fb3680"
 dependencies = [
  "bevy_app",
  "bevy_asset",
  "bevy_core",
  "bevy_core_pipeline",
  "bevy_ecs",
+ "bevy_gizmos_macros",
+ "bevy_log",
  "bevy_math",
  "bevy_pbr",
  "bevy_reflect",
@@ -669,13 +692,25 @@ dependencies = [
  "bevy_utils",
 ]
 
+[[package]]
+name = "bevy_gizmos_macros"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a949eb8b4538a6e4d875321cda2b63dc0fb0317cf18c8245ca5a32f24f6d26d"
+dependencies = [
+ "bevy_macro_utils",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
 [[package]]
 name = "bevy_gltf"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85adc6b1fc86687bf67149e0bafaa4d6da432232fa956472d1b37f19121d3ace"
+checksum = "031d0c2a7c0353bb9ac08a5130e58b9a2de3cdaa3c31b5da00b22a9e4732a155"
 dependencies = [
- "base64 0.13.1",
+ "base64",
  "bevy_animation",
  "bevy_app",
  "bevy_asset",
@@ -701,15 +736,17 @@ dependencies = [
 
 [[package]]
 name = "bevy_hanabi"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "127702dc9ccba4eb286c54b3307c0ff18d59b35e4de4e361d8e49fee3abe0b59"
+checksum = "6f63879a7274ed0d629f7240b0acc4c262aca0276503bdc182552b0f69cba163"
 dependencies = [
  "anyhow",
  "bevy",
  "bitflags 2.4.2",
  "bytemuck",
  "copyless",
+ "naga",
+ "naga_oil",
  "rand",
  "rand_pcg",
  "ron",
@@ -720,9 +757,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_hierarchy"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06bd477152ce2ae1430f5e0a4f19216e5785c22fee1ab23788b5982dc59d1a55"
+checksum = "a9f9f843e43d921f07658c24eae74285efc7a335c87998596f3f365155320c69"
 dependencies = [
  "bevy_app",
  "bevy_core",
@@ -730,14 +767,13 @@ dependencies = [
  "bevy_log",
  "bevy_reflect",
  "bevy_utils",
- "smallvec",
 ]
 
 [[package]]
 name = "bevy_input"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cab9a599189b2a694c182d60cd52219dd9364f9892ff542d87799b8e45d9e6dc"
+checksum = "a9cb5b2f3747ffb00cf7e3d6b52f7384476921cd31f0cfd3d1ddff31f83d9252"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -745,14 +781,15 @@ dependencies = [
  "bevy_reflect",
  "bevy_utils",
  "serde",
+ "smol_str",
  "thiserror",
 ]
 
 [[package]]
 name = "bevy_internal"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f124bece9831afd80897815231072d51bfe3ac58c6bb58eca8880963b6d0487c"
+checksum = "7af89c7083830b1d65fcf0260c3d2537c397fe8ce871471b6e97198a4704f23e"
 dependencies = [
  "bevy_a11y",
  "bevy_animation",
@@ -787,11 +824,25 @@ dependencies = [
  "bevy_winit",
 ]
 
+[[package]]
+name = "bevy_kira_audio"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bf58fed4b6fd13df35e77002821cf459948131de4ac262c3b6a175d8fe28fd3"
+dependencies = [
+ "anyhow",
+ "bevy",
+ "kira",
+ "parking_lot",
+ "thiserror",
+ "uuid",
+]
+
 [[package]]
 name = "bevy_log"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dc10ba1d225a8477b9e80a1bf797d8a8b8274e83c9b24fb4d9351aec9229755"
+checksum = "cfd5bcc3531f8008897fb03cc8751b86d0d29ef94f8fd38b422f9603b7ae80d0"
 dependencies = [
  "android_log-sys",
  "bevy_app",
@@ -805,22 +856,22 @@ dependencies = [
 
 [[package]]
 name = "bevy_macro_utils"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e566640c6b6dced73d2006c764c2cffebe1a82be4809486c4a5d7b4b50efed4d"
+checksum = "ac4401c25b197e7c1455a4875a90b61bba047a9e8d290ce029082c818ab1a21c"
 dependencies = [
  "proc-macro2",
  "quote",
  "rustc-hash",
  "syn 2.0.48",
- "toml_edit 0.20.2",
+ "toml_edit 0.21.1",
 ]
 
 [[package]]
 name = "bevy_math"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58ddc2b76783939c530178f88e5711a1b01044d7b02db4033e2eb8b43b6cf4ec"
+checksum = "6f312b1b8aa6d3965b65040b08e33efac030db3071f20b44f9da9c4c3dfcaf76"
 dependencies = [
  "glam",
  "serde",
@@ -828,18 +879,18 @@ dependencies = [
 
 [[package]]
 name = "bevy_mikktspace"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ec4962977a746d870170532fc92759e04d3dbcae8b7b82e7ca3bb83b1d75277"
+checksum = "3075c01f2b1799945892d5310fc1836e47c045dfe6af5878a304a475931a0c5f"
 dependencies = [
  "glam",
 ]
 
 [[package]]
 name = "bevy_pbr"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "520bfd2a898c74f84ea52cfb8eb061f37373ad15e623489d5f75d27ebd6138fe"
+checksum = "c31c72bf12e50ff76c9ed9a7c51ceb88bfea9865d00f24d95b12344fffe1e270"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -855,7 +906,6 @@ dependencies = [
  "bitflags 2.4.2",
  "bytemuck",
  "fixedbitset",
- "naga_oil",
  "radsort",
  "smallvec",
  "thread_local",
@@ -864,8 +914,7 @@ dependencies = [
 [[package]]
 name = "bevy_pkv"
 version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c91c1f9dc84f86cb77ba29677e9fa45975e3de72aeb8e9bf72abd637a7fe6dd6"
+source = "git+https://github.com/johanhelsing/bevy_pkv?rev=af0b750b1dbfc8db58dbb2bd07c5eda72e714b79#af0b750b1dbfc8db58dbb2bd07c5eda72e714b79"
 dependencies = [
  "bevy_ecs",
  "cfg_aliases",
@@ -881,15 +930,15 @@ dependencies = [
 
 [[package]]
 name = "bevy_ptr"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c77ec20c8fafcdc196508ef5ccb4f0400a8d193cb61f7b14a36ed9a25ad423cf"
+checksum = "86afa4a88ee06b10fe1e6f28a796ba2eedd16804717cbbb911df0cbb0cd6677b"
 
 [[package]]
 name = "bevy_rapier2d"
-version = "0.24.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "457bb7e63adc64000033baf83813c2592a11f9579a0fe574f09f943d88d6815c"
+checksum = "dc1f2ef2ae7fcf68ccb33f95c1dfc7c679bbc0e33b7f2e461353073065ff6e1e"
 dependencies = [
  "bevy",
  "bitflags 2.4.2",
@@ -900,28 +949,27 @@ dependencies = [
 
 [[package]]
 name = "bevy_reflect"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7921f15fc944c9c8ad01d7dbcea6505b8909c6655cd9382bab1407181556038"
+checksum = "133dfab8d403d0575eeed9084e85780bbb449dcf75dd687448439117789b40a2"
 dependencies = [
  "bevy_math",
  "bevy_ptr",
  "bevy_reflect_derive",
  "bevy_utils",
  "downcast-rs",
- "erased-serde 0.3.31",
+ "erased-serde",
  "glam",
  "serde",
- "smallvec",
  "smol_str",
  "thiserror",
 ]
 
 [[package]]
 name = "bevy_reflect_derive"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4a8c5475f216e751ef4452a1306b00711f33d2d04d9f149e4c845dfeb6753a0"
+checksum = "ce1679a4dfdb2c9ff24ca590914c3cec119d7c9e1b56fa637776913acc030386"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
@@ -932,11 +980,11 @@ dependencies = [
 
 [[package]]
 name = "bevy_render"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdefdd3737125b0d94a6ff20bb70fa8cfe9d7d5dcd72ba4dfe6c5f1d30d9f6e4"
+checksum = "d3b194b7029b7541ef9206ac3cb696d3cb37f70bd3260d293fc00d378547e892"
 dependencies = [
- "async-channel 1.9.0",
+ "async-channel",
  "bevy_app",
  "bevy_asset",
  "bevy_core",
@@ -959,16 +1007,15 @@ dependencies = [
  "codespan-reporting",
  "downcast-rs",
  "encase",
- "futures-lite 1.13.0",
+ "futures-lite",
  "hexasphere",
- "image",
+ "image 0.24.8",
  "js-sys",
  "ktx2",
  "naga",
  "naga_oil",
  "ruzstd",
  "serde",
- "smallvec",
  "thiserror",
  "thread_local",
  "wasm-bindgen",
@@ -978,9 +1025,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_render_macros"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64d86bfc5a1e7fbeeaec0c4ceab18155530f5506624670965db3415f75826bea"
+checksum = "4aa6d99b50375bb7f63be2c3055dfe2f926f7b3c4db108bb0b1181b4f02766aa"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
@@ -990,9 +1037,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_scene"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7df078b5e406e37c8a1c6ba0d652bf105fde713ce3c3efda7263fe27467eee5"
+checksum = "2c3c82eaff0b22949183a75a7e2d7fc4ece808235918b34c5b282aab52c3563a"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -1003,7 +1050,6 @@ dependencies = [
  "bevy_render",
  "bevy_transform",
  "bevy_utils",
- "ron",
  "serde",
  "thiserror",
  "uuid",
@@ -1011,9 +1057,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_sprite"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7cc0c9d946e17e3e0aaa202f182837bc796c4f862b2e5a805134f873f21cf7f"
+checksum = "5ea977d7d7c48fc4ba283d449f09528c4e70db17c9048e32e99ecd9890d72223"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -1037,23 +1083,23 @@ dependencies = [
 
 [[package]]
 name = "bevy_tasks"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4fefa7fe0da8923525f7500e274f1bd60dbd79918a25cf7d0dfa0a6ba15c1cf"
+checksum = "b20f243f6fc4c4ba10c2dbff891e947ddae947bb20b263f43e023558b35294bd"
 dependencies = [
- "async-channel 1.9.0",
+ "async-channel",
  "async-executor",
  "async-task",
  "concurrent-queue",
- "futures-lite 1.13.0",
+ "futures-lite",
  "wasm-bindgen-futures",
 ]
 
 [[package]]
 name = "bevy_text"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a9a79d49ca06170d69149949b134c14e8b99ace1444c1ca2cd4743b19d5b055"
+checksum = "006990d27551dbc339774178e833290952511621662fd5ca23a4e6e922ab2d9f"
 dependencies = [
  "ab_glyph",
  "bevy_app",
@@ -1073,9 +1119,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_time"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6250d76eed3077128b6a3d004f9f198b01107800b9824051e32bb658054e837"
+checksum = "9738901b6b251d2c9250542af7002d6f671401fc3b74504682697c5ec822f210"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -1088,9 +1134,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_transform"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d541e0c292edbd96afae816ee680e02247422423ccd5dc635c1e211a20ed64be"
+checksum = "ba73744a95bc4b8683e91cea3e79b1ad0844c1d677f31fbbc1814c79a5b4f8f0"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -1103,9 +1149,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_ui"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d785e3b75dabcb2a8ad0d50933f8f3446d59e512cabc2d2a145e28c2bb8792ba"
+checksum = "fafe872906bac6d7fc8ecff166f56b4253465b2895ed88801499aa113548ccc6"
 dependencies = [
  "bevy_a11y",
  "bevy_app",
@@ -1126,34 +1172,34 @@ dependencies = [
  "bevy_window",
  "bytemuck",
  "serde",
- "smallvec",
  "taffy",
  "thiserror",
 ]
 
 [[package]]
 name = "bevy_utils"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7915222f4a08ccc782e08d10b751b42e5f9d786e697d0cb3fd09333cb7e8b6ea"
+checksum = "94a06aca1c1863606416b892f4c79e300dbc6211b6690953269051a431c2cca0"
 dependencies = [
  "ahash",
  "bevy_utils_proc_macros",
  "getrandom",
- "hashbrown 0.14.3",
- "instant",
+ "hashbrown",
  "nonmax",
  "petgraph",
+ "smallvec",
  "thiserror",
  "tracing",
  "uuid",
+ "web-time",
 ]
 
 [[package]]
 name = "bevy_utils_proc_macros"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7aafecc952b6b8eb1a93c12590bd867d25df2f4ae1033a01dfdfc3c35ebccfff"
+checksum = "31ae98e9c0c08b0f5c90e22cd713201f759b98d4fd570b99867a695f8641859a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1162,9 +1208,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_window"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41ee72bf7f974000e9b31bb971a89387f1432ba9413f35c4fef59fef49767260"
+checksum = "cb627efd7622a61398ac0d3674f93c997cffe16f13c59fb8ae8a05c9e28de961"
 dependencies = [
  "bevy_a11y",
  "bevy_app",
@@ -1173,15 +1219,16 @@ dependencies = [
  "bevy_math",
  "bevy_reflect",
  "bevy_utils",
- "raw-window-handle",
+ "raw-window-handle 0.6.0",
  "serde",
+ "smol_str",
 ]
 
 [[package]]
 name = "bevy_winit"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1eb71f287eca9006dda998784c7b931e400ae2cc4c505da315882a8b082f21ad"
+checksum = "55105324a201941ae587790f83f6d9caa327e0baa0205558ec41e5ee05a1f703"
 dependencies = [
  "accesskit_winit",
  "approx",
@@ -1196,7 +1243,7 @@ dependencies = [
  "bevy_utils",
  "bevy_window",
  "crossbeam-channel",
- "raw-window-handle",
+ "raw-window-handle 0.6.0",
  "wasm-bindgen",
  "web-sys",
  "winit",
@@ -1258,6 +1305,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "bitstream-io"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06c9989a51171e2e81038ab168b6ae22886fe9ded214430dbb4f41c28cf176da"
+
 [[package]]
 name = "blake3"
 version = "1.5.0"
@@ -1283,7 +1336,16 @@ version = "0.1.0-beta.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fa55741ee90902547802152aaf3f8e5248aab7e21468089560d4c8840561146"
 dependencies = [
- "objc-sys",
+ "objc-sys 0.2.0-beta.2",
+]
+
+[[package]]
+name = "block-sys"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7"
+dependencies = [
+ "objc-sys 0.3.2",
 ]
 
 [[package]]
@@ -1292,8 +1354,18 @@ version = "0.2.0-alpha.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42"
 dependencies = [
- "block-sys",
- "objc2-encode",
+ "block-sys 0.1.0-beta.1",
+ "objc2-encode 2.0.0-pre.2",
+]
+
+[[package]]
+name = "block2"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68"
+dependencies = [
+ "block-sys 0.2.1",
+ "objc2 0.4.1",
 ]
 
 [[package]]
@@ -1302,21 +1374,21 @@ version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118"
 dependencies = [
- "async-channel 2.2.0",
- "async-lock 3.3.0",
+ "async-channel",
+ "async-lock",
  "async-task",
- "fastrand 2.0.1",
+ "fastrand",
  "futures-io",
- "futures-lite 2.2.0",
+ "futures-lite",
  "piper",
  "tracing",
 ]
 
 [[package]]
 name = "built"
-version = "0.7.2"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41bfbdb21256b87a8b5e80fab81a8eed158178e812fd7ba451907518b2742f16"
+checksum = "38d17f4d6e4dc36d1a02fbedc2753a096848e7c1b0772f7654eab8e2c927dd53"
 dependencies = [
  "git2",
 ]
@@ -1353,6 +1425,12 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
+[[package]]
+name = "byteorder-lite"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
+
 [[package]]
 name = "bytes"
 version = "1.5.0"
@@ -1361,16 +1439,28 @@ checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
 
 [[package]]
 name = "calloop"
-version = "0.10.6"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52e0d00eb1ea24371a97d2da6201c6747a633dc6dc1988ef503403b4c59504a8"
+checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.2",
  "log",
- "nix 0.25.1",
- "slotmap",
+ "polling",
+ "rustix",
+ "slab",
  "thiserror",
- "vec_map",
+]
+
+[[package]]
+name = "calloop-wayland-source"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02"
+dependencies = [
+ "calloop",
+ "rustix",
+ "wayland-backend",
+ "wayland-client",
 ]
 
 [[package]]
@@ -1398,6 +1488,16 @@ dependencies = [
  "nom",
 ]
 
+[[package]]
+name = "cfg-expr"
+version = "0.15.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02"
+dependencies = [
+ "smallvec",
+ "target-lexicon",
+]
+
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@@ -1449,19 +1549,44 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
 [[package]]
-name = "com-rs"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642"
-
-[[package]]
-name = "combine"
-version = "4.6.6"
+name = "com"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4"
+checksum = "7e17887fd17353b65b1b2ef1c526c83e26cd72e74f598a8dc1bee13a48f3d9f6"
 dependencies = [
- "bytes",
- "memchr",
+ "com_macros",
+]
+
+[[package]]
+name = "com_macros"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d375883580a668c7481ea6631fc1a8863e33cc335bf56bfad8d7e6d4b04b13a5"
+dependencies = [
+ "com_macros_support",
+ "proc-macro2",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "com_macros_support"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad899a1087a9296d5644792d7cb72b8e34c1bec8e7d4fbc002230169a6e8710c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "combine"
+version = "4.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4"
+dependencies = [
+ "bytes",
+ "memchr",
 ]
 
 [[package]]
@@ -1483,6 +1608,22 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "console_log"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be8aed40e4edbf4d3b4431ab260b63fdc40f5780a4766824329ea0f1eefe3c0f"
+dependencies = [
+ "log",
+ "web-sys",
+]
+
+[[package]]
+name = "const-fnv1a-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32b13ea120a812beba79e34316b3942a857c86ec1593cb34f27bb28272ce2cca"
+
 [[package]]
 name = "const_panic"
 version = "0.2.8"
@@ -1545,6 +1686,19 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "core-graphics"
+version = "0.23.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "core-graphics-types",
+ "foreign-types 0.5.0",
+ "libc",
+]
+
 [[package]]
 name = "core-graphics-types"
 version = "0.1.3"
@@ -1590,7 +1744,7 @@ dependencies = [
  "js-sys",
  "libc",
  "mach2",
- "ndk",
+ "ndk 0.7.0",
  "ndk-context",
  "oboe",
  "once_cell",
@@ -1672,11 +1826,17 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
 
+[[package]]
+name = "cursor-icon"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991"
+
 [[package]]
 name = "d3d12"
-version = "0.7.0"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20"
+checksum = "3e3d747f100290a1ca24b752186f61f6637e1deffe3bf6320de6fcb29510a307"
 dependencies = [
  "bitflags 2.4.2",
  "libloading 0.8.1",
@@ -1715,6 +1875,16 @@ dependencies = [
  "dirs-sys",
 ]
 
+[[package]]
+name = "dirs-next"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf36e65a80337bea855cd4ef9b8401ffce06a7baedf2e85ec467b1ac3f6e82b6"
+dependencies = [
+ "cfg-if",
+ "dirs-sys-next",
+]
+
 [[package]]
 name = "dirs-sys"
 version = "0.4.1"
@@ -1727,6 +1897,17 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "dirs-sys-next"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
+dependencies = [
+ "libc",
+ "redox_users",
+ "winapi",
+]
+
 [[package]]
 name = "dispatch"
 version = "0.2.0"
@@ -1748,40 +1929,13 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
 
-[[package]]
-name = "duplicate"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de78e66ac9061e030587b2a2e75cc88f22304913c907b11307bca737141230cb"
-dependencies = [
- "heck",
- "proc-macro-error",
-]
-
-[[package]]
-name = "ecolor"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b7637fc2e74d17e52931bac90ff4fc061ac776ada9c7fa272f24cdca5991972"
-dependencies = [
- "bytemuck",
-]
-
 [[package]]
 name = "ecolor"
 version = "0.27.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "20930a432bbd57a6d55e07976089708d4893f3d556cf42a0d79e9e321fa73b10"
-
-[[package]]
-name = "egui"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c55bcb864b764eb889515a38b8924757657a250738ad15126637ee2df291ee6b"
 dependencies = [
- "ahash",
- "epaint 0.24.1",
- "nohash-hasher",
+ "bytemuck",
 ]
 
 [[package]]
@@ -1791,19 +1945,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "584c5d1bf9a67b25778a3323af222dbe1a1feb532190e103901187f92c7fe29a"
 dependencies = [
  "ahash",
- "epaint 0.27.2",
+ "epaint",
  "nohash-hasher",
 ]
 
 [[package]]
-name = "egui_dock"
-version = "0.12.0"
+name = "egui-dropdown"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3b8d9a54c0ed60f2670ad387c269663b4771431f090fa586906cf5f0bc586f4"
+checksum = "240e9423d44c6fd18a72208b442b1101ac871f9636c06d30cc6555d125f57db0"
 dependencies = [
- "duplicate",
- "egui 0.27.2",
- "paste",
+ "egui",
 ]
 
 [[package]]
@@ -1814,17 +1966,16 @@ checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
 
 [[package]]
 name = "elementalist"
-version = "0.6.0"
+version = "0.7.0"
 dependencies = [
  "bevy",
- "bevy-inspector-egui",
  "bevy_hanabi",
+ "bevy_kira_audio",
  "bevy_rapier2d",
  "built",
- "egui_dock",
+ "elementalist_game_library",
  "embed-resource",
- "game_library",
- "image",
+ "image 0.25.1",
  "leafwing-input-manager",
  "rand",
  "tracing",
@@ -1832,12 +1983,23 @@ dependencies = [
 ]
 
 [[package]]
-name = "emath"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a045c6c0b44b35e98513fc1e9d183ab42881ac27caccb9fa345465601f56cce4"
+name = "elementalist_game_library"
+version = "2.6.0"
 dependencies = [
- "bytemuck",
+ "bevy",
+ "bevy-inspector-egui",
+ "bevy_hanabi",
+ "bevy_kira_audio",
+ "bevy_pkv",
+ "bevy_rapier2d",
+ "noise",
+ "platform-dirs",
+ "rand",
+ "serde",
+ "serde_default_utils",
+ "serde_yaml",
+ "tracing",
+ "walkdir",
 ]
 
 [[package]]
@@ -1845,12 +2007,15 @@ name = "emath"
 version = "0.27.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e4c3a552cfca14630702449d35f41c84a0d15963273771c6059175a803620f3f"
+dependencies = [
+ "bytemuck",
+]
 
 [[package]]
 name = "embed-resource"
-version = "2.4.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6985554d0688b687c5cb73898a34fbe3ad6c24c58c238a4d91d5e840670ee9d"
+checksum = "3bde55e389bea6a966bd467ad1ad7da0ae14546a5bc794d16d1e55e7fca44881"
 dependencies = [
  "cc",
  "memchr",
@@ -1862,9 +2027,9 @@ dependencies = [
 
 [[package]]
 name = "encase"
-version = "0.6.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fce2eeef77fd4a293a54b62aa00ac9daebfbcda4bf8998c5a815635b004aa1c"
+checksum = "95ed933078d2e659745df651f4c180511cd582e5b9414ff896e7d50d207e3103"
 dependencies = [
  "const_panic",
  "encase_derive",
@@ -1874,18 +2039,18 @@ dependencies = [
 
 [[package]]
 name = "encase_derive"
-version = "0.6.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e520cde08cbf4f7cc097f61573ec06ce467019803de8ae82fb2823fa1554a0e"
+checksum = "f4ce1449c7d19eba6cc0abd231150ad81620a8dce29601d7f8d236e5d431d72a"
 dependencies = [
  "encase_derive_impl",
 ]
 
 [[package]]
 name = "encase_derive_impl"
-version = "0.6.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fe2568f851fd6144a45fa91cfed8fe5ca8fc0b56ba6797bfc1ed2771b90e37c"
+checksum = "92959a9e8d13eaa13b8ae8c7b583c3bf1669ca7a8e7708a088d12587ba86effc"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1893,18 +2058,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "epaint"
-version = "0.24.1"
+name = "encoding_rs"
+version = "0.8.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d1b9e000d21bab9b535ce78f9f7745be28b3f777f6c7223936561c5c7fefab8"
+checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
 dependencies = [
- "ab_glyph",
- "ahash",
- "bytemuck",
- "ecolor 0.24.1",
- "emath 0.24.1",
- "nohash-hasher",
- "parking_lot",
+ "cfg-if",
 ]
 
 [[package]]
@@ -1915,8 +2074,9 @@ checksum = "b381f8b149657a4acf837095351839f32cd5c4aec1817fc4df84e18d76334176"
 dependencies = [
  "ab_glyph",
  "ahash",
- "ecolor 0.27.2",
- "emath 0.27.2",
+ "bytemuck",
+ "ecolor",
+ "emath",
  "nohash-hasher",
  "parking_lot",
 ]
@@ -1929,20 +2089,21 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "erased-serde"
-version = "0.3.31"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c"
+checksum = "55d05712b2d8d88102bc9868020c9e5c7a1f5527c452b9b97450a1d006140ba7"
 dependencies = [
  "serde",
 ]
 
 [[package]]
-name = "erased-serde"
-version = "0.4.2"
+name = "errno"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55d05712b2d8d88102bc9868020c9e5c7a1f5527c452b9b97450a1d006140ba7"
+checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
 dependencies = [
- "serde",
+ "libc",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -2028,15 +2189,6 @@ dependencies = [
  "zune-inflate",
 ]
 
-[[package]]
-name = "fastrand"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
-dependencies = [
- "instant",
-]
-
 [[package]]
 name = "fastrand"
 version = "2.0.1"
@@ -2146,28 +2298,13 @@ version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
 
-[[package]]
-name = "futures-lite"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
-dependencies = [
- "fastrand 1.9.0",
- "futures-core",
- "futures-io",
- "memchr",
- "parking",
- "pin-project-lite",
- "waker-fn",
-]
-
 [[package]]
 name = "futures-lite"
 version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba"
 dependencies = [
- "fastrand 2.0.1",
+ "fastrand",
  "futures-core",
  "futures-io",
  "parking",
@@ -2175,21 +2312,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "game_library"
-version = "1.5.0"
+name = "fuzzy-matcher"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94"
 dependencies = [
- "bevy",
- "bevy-inspector-egui",
- "bevy_hanabi",
- "bevy_pkv",
- "bevy_rapier2d",
- "noise",
- "rand",
- "serde",
- "serde_default_utils",
- "serde_yaml",
- "tracing",
- "walkdir",
+ "thread_local",
 ]
 
 [[package]]
@@ -2202,6 +2330,16 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "gethostname"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818"
+dependencies = [
+ "libc",
+ "windows-targets 0.48.5",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.2.12"
@@ -2259,12 +2397,6 @@ dependencies = [
  "windows 0.52.0",
 ]
 
-[[package]]
-name = "gimli"
-version = "0.28.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
-
 [[package]]
 name = "git2"
 version = "0.18.2"
@@ -2278,13 +2410,25 @@ dependencies = [
  "url",
 ]
 
+[[package]]
+name = "gl_generator"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d"
+dependencies = [
+ "khronos_api",
+ "log",
+ "xml-rs",
+]
+
 [[package]]
 name = "glam"
-version = "0.24.2"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945"
+checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3"
 dependencies = [
  "bytemuck",
+ "mint",
  "serde",
 ]
 
@@ -2296,9 +2440,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
 [[package]]
 name = "glow"
-version = "0.12.3"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca0fe580e4b60a8ab24a868bc08e2f03cbcb20d3d676601fa909386713333728"
+checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1"
 dependencies = [
  "js-sys",
  "slotmap",
@@ -2342,6 +2486,15 @@ dependencies = [
  "serde_json",
 ]
 
+[[package]]
+name = "glutin_wgl_sys"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead"
+dependencies = [
+ "gl_generator",
+]
+
 [[package]]
 name = "glyph_brush_layout"
 version = "0.2.3"
@@ -2374,15 +2527,15 @@ dependencies = [
 
 [[package]]
 name = "gpu-allocator"
-version = "0.22.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce95f9e2e11c2c6fadfce42b5af60005db06576f231f5c92550fdded43c423e8"
+checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884"
 dependencies = [
- "backtrace",
  "log",
+ "presser",
  "thiserror",
  "winapi",
- "windows 0.44.0",
+ "windows 0.52.0",
 ]
 
 [[package]]
@@ -2393,7 +2546,7 @@ checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c"
 dependencies = [
  "bitflags 2.4.2",
  "gpu-descriptor-types",
- "hashbrown 0.14.3",
+ "hashbrown",
 ]
 
 [[package]]
@@ -2431,12 +2584,6 @@ dependencies = [
  "crunchy",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
 [[package]]
 name = "hashbrown"
 version = "0.14.3"
@@ -2450,14 +2597,14 @@ dependencies = [
 
 [[package]]
 name = "hassle-rs"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0"
+checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890"
 dependencies = [
- "bitflags 1.3.2",
- "com-rs",
+ "bitflags 2.4.2",
+ "com",
  "libc",
- "libloading 0.7.4",
+ "libloading 0.8.1",
  "thiserror",
  "widestring",
  "winapi",
@@ -2465,15 +2612,15 @@ dependencies = [
 
 [[package]]
 name = "heck"
-version = "0.4.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "hexasphere"
-version = "9.1.0"
+version = "10.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cb3df16a7bcb1b5bc092abd55e14f77ca70aea14445026e264586fc62889a10"
+checksum = "f33ddb7f7143d9e703c072e88b98cd8b9719f174137a671429351bd2ee43c02a"
 dependencies = [
  "constgebra",
  "glam",
@@ -2494,6 +2641,17 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "icrate"
+version = "0.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319"
+dependencies = [
+ "block2 0.3.0",
+ "dispatch",
+ "objc2 0.4.1",
+]
+
 [[package]]
 name = "idna"
 version = "0.5.0"
@@ -2506,32 +2664,57 @@ dependencies = [
 
 [[package]]
 name = "image"
-version = "0.24.9"
+version = "0.24.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "034bbe799d1909622a74d1193aa50147769440040ff36cb2baa947609b0a4e23"
+dependencies = [
+ "bytemuck",
+ "byteorder",
+ "color_quant",
+ "num-traits",
+ "png",
+ "tiff",
+]
+
+[[package]]
+name = "image"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d"
+checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11"
 dependencies = [
  "bytemuck",
  "byteorder",
  "color_quant",
  "exr",
  "gif",
- "jpeg-decoder",
+ "image-webp",
  "num-traits",
  "png",
  "qoi",
+ "ravif",
+ "rayon",
+ "rgb",
  "tiff",
+ "zune-core",
+ "zune-jpeg",
 ]
 
 [[package]]
-name = "indexmap"
-version = "1.9.3"
+name = "image-webp"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+checksum = "d730b085583c4d789dfd07fdcf185be59501666a90c97c40162b37e4fdad272d"
 dependencies = [
- "autocfg",
- "hashbrown 0.12.3",
+ "byteorder-lite",
+ "thiserror",
 ]
 
+[[package]]
+name = "imgref"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126"
+
 [[package]]
 name = "indexmap"
 version = "2.2.2"
@@ -2539,7 +2722,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.3",
+ "hashbrown",
 ]
 
 [[package]]
@@ -2569,15 +2752,14 @@ dependencies = [
 ]
 
 [[package]]
-name = "instant"
-version = "0.1.12"
+name = "interpolate_name"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60"
 dependencies = [
- "cfg-if",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -2675,9 +2857,6 @@ name = "jpeg-decoder"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
-dependencies = [
- "rayon",
-]
 
 [[package]]
 name = "js-sys"
@@ -2690,15 +2869,36 @@ dependencies = [
 
 [[package]]
 name = "khronos-egl"
-version = "4.1.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3"
+checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76"
 dependencies = [
  "libc",
- "libloading 0.7.4",
+ "libloading 0.8.1",
  "pkg-config",
 ]
 
+[[package]]
+name = "khronos_api"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
+
+[[package]]
+name = "kira"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8968f1eda49cdf4f6406fd5ffe590c3ca2778a1b0e50b5684974b138a99dfb2f"
+dependencies = [
+ "atomic-arena",
+ "cpal",
+ "glam",
+ "mint",
+ "ringbuf",
+ "send_wrapper",
+ "symphonia",
+]
+
 [[package]]
 name = "ktx2"
 version = "0.3.0"
@@ -2722,27 +2922,24 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "leafwing-input-manager"
-version = "0.11.2"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e0ad1622a1664b055990aac9efd90a9012b82737847e6a85d36ce38d2bf7c4"
+checksum = "def515aa1461ed6ed5d55d53cea6c7149a3076c331cfea1d920682884bfaf839"
 dependencies = [
  "bevy",
  "derive_more",
- "fixedbitset",
  "itertools",
  "leafwing_input_manager_macros",
- "multimap",
- "once_cell",
  "serde",
 ]
 
 [[package]]
 name = "leafwing_input_manager_macros"
-version = "0.11.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cde8ae98d45607e4015d0b772d4a234788ebd7a41f09879f408c7f772b81e5bf"
+checksum = "5d065e4f0771d9cc597e76d648da18476ad01fd50cd60ee585ee500f9cd8d696"
 dependencies = [
- "proc-macro-crate 2.0.2",
+ "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
  "syn 2.0.48",
@@ -2752,18 +2949,7 @@ dependencies = [
 name = "lebe"
 version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
-
-[[package]]
-name = "lewton"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "777b48df9aaab155475a83a7df3070395ea1ac6902f5cd062b8f2b028075c030"
-dependencies = [
- "byteorder",
- "ogg",
- "tinyvec",
-]
+checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
 
 [[package]]
 name = "libc"
@@ -2771,6 +2957,17 @@ version = "0.2.153"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
 
+[[package]]
+name = "libfuzzer-sys"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7"
+dependencies = [
+ "arbitrary",
+ "cc",
+ "once_cell",
+]
+
 [[package]]
 name = "libgit2-sys"
 version = "0.16.2+1.7.2"
@@ -2853,6 +3050,12 @@ dependencies = [
  "vcpkg",
 ]
 
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
+
 [[package]]
 name = "lock_api"
 version = "0.4.11"
@@ -2869,6 +3072,15 @@ version = "0.4.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
 
+[[package]]
+name = "loop9"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062"
+dependencies = [
+ "imgref",
+]
+
 [[package]]
 name = "mach2"
 version = "0.4.2"
@@ -2906,6 +3118,16 @@ dependencies = [
  "rawpointer",
 ]
 
+[[package]]
+name = "maybe-rayon"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519"
+dependencies = [
+ "cfg-if",
+ "rayon",
+]
+
 [[package]]
 name = "memchr"
 version = "2.7.1"
@@ -2914,22 +3136,13 @@ checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
 
 [[package]]
 name = "memmap2"
-version = "0.5.10"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327"
+checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322"
 dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "memoffset"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
-dependencies = [
- "autocfg",
-]
-
 [[package]]
 name = "memoffset"
 version = "0.7.1"
@@ -2941,9 +3154,9 @@ dependencies = [
 
 [[package]]
 name = "metal"
-version = "0.26.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "623b5e6cefd76e58f774bd3cc0c6f5c7615c58c03a97815245a25c3c9bdee318"
+checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25"
 dependencies = [
  "bitflags 2.4.2",
  "block",
@@ -2971,37 +3184,22 @@ dependencies = [
 ]
 
 [[package]]
-name = "mio"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
-dependencies = [
- "libc",
- "log",
- "wasi",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "multimap"
-version = "0.9.1"
+name = "mint"
+version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1a5d38b9b352dbd913288736af36af41c48d61b1a8cd34bcecd727561b7d511"
-dependencies = [
- "serde",
-]
+checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff"
 
 [[package]]
 name = "naga"
-version = "0.13.0"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1ceaaa4eedaece7e4ec08c55c640ba03dbb73fb812a6570a59bcf1930d0f70e"
+checksum = "8878eb410fc90853da3908aebfe61d73d26d4437ef850b70050461f939509899"
 dependencies = [
  "bit-set",
  "bitflags 2.4.2",
  "codespan-reporting",
  "hexf-parse",
- "indexmap 1.9.3",
+ "indexmap",
  "log",
  "num-traits",
  "pp-rs",
@@ -3014,18 +3212,18 @@ dependencies = [
 
 [[package]]
 name = "naga_oil"
-version = "0.10.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ac54c77b3529887f9668d3dd81e955e58f252b31a333f836e3548c06460b958"
+checksum = "c0ea62ae0f2787456afca7209ca180522b41f00cbe159ee369eba1e07d365cd1"
 dependencies = [
  "bit-set",
  "codespan-reporting",
  "data-encoding",
- "indexmap 1.9.3",
+ "indexmap",
  "naga",
  "once_cell",
  "regex",
- "regex-syntax 0.7.5",
+ "regex-syntax 0.8.2",
  "rustc-hash",
  "thiserror",
  "tracing",
@@ -3034,9 +3232,9 @@ dependencies = [
 
 [[package]]
 name = "nalgebra"
-version = "0.32.3"
+version = "0.32.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "307ed9b18cc2423f29e83f84fd23a8e73628727990181f18641a8b5dc2ab1caa"
+checksum = "4541eb06dce09c0241ebbaab7102f0a01a0c8994afed2e5d0d66775016e25ac2"
 dependencies = [
  "approx",
  "glam",
@@ -3068,9 +3266,24 @@ checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0"
 dependencies = [
  "bitflags 1.3.2",
  "jni-sys",
- "ndk-sys",
+ "ndk-sys 0.4.1+23.1.7779620",
  "num_enum 0.5.11",
- "raw-window-handle",
+ "raw-window-handle 0.5.2",
+ "thiserror",
+]
+
+[[package]]
+name = "ndk"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7"
+dependencies = [
+ "bitflags 2.4.2",
+ "jni-sys",
+ "log",
+ "ndk-sys 0.5.0+25.2.9519653",
+ "num_enum 0.7.2",
+ "raw-window-handle 0.6.0",
  "thiserror",
 ]
 
@@ -3090,28 +3303,29 @@ dependencies = [
 ]
 
 [[package]]
-name = "nix"
-version = "0.24.3"
+name = "ndk-sys"
+version = "0.5.0+25.2.9519653"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
+checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691"
 dependencies = [
- "bitflags 1.3.2",
- "cfg-if",
- "libc",
- "memoffset 0.6.5",
+ "jni-sys",
 ]
 
+[[package]]
+name = "new_debug_unreachable"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
+
 [[package]]
 name = "nix"
-version = "0.25.1"
+version = "0.24.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4"
+checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
 dependencies = [
- "autocfg",
  "bitflags 1.3.2",
  "cfg-if",
  "libc",
- "memoffset 0.6.5",
 ]
 
 [[package]]
@@ -3123,7 +3337,7 @@ dependencies = [
  "bitflags 1.3.2",
  "cfg-if",
  "libc",
- "memoffset 0.7.1",
+ "memoffset",
 ]
 
 [[package]]
@@ -3170,6 +3384,12 @@ version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "610a5acd306ec67f907abe5567859a3c693fb9886eb1f012ab8f2a47bef3db51"
 
+[[package]]
+name = "noop_proc_macro"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8"
+
 [[package]]
 name = "ntapi"
 version = "0.4.1"
@@ -3189,6 +3409,17 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "num-bigint"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
 [[package]]
 name = "num-complex"
 version = "0.4.5"
@@ -3236,6 +3467,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
 dependencies = [
  "autocfg",
+ "num-bigint",
  "num-integer",
  "num-traits",
 ]
@@ -3261,11 +3493,11 @@ dependencies = [
 
 [[package]]
 name = "num_enum"
-version = "0.6.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1"
+checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845"
 dependencies = [
- "num_enum_derive 0.6.1",
+ "num_enum_derive 0.7.2",
 ]
 
 [[package]]
@@ -3282,11 +3514,11 @@ dependencies = [
 
 [[package]]
 name = "num_enum_derive"
-version = "0.6.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6"
+checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b"
 dependencies = [
- "proc-macro-crate 1.3.1",
+ "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
  "syn 2.0.48",
@@ -3319,15 +3551,31 @@ version = "0.2.0-beta.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7"
 
+[[package]]
+name = "objc-sys"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7c71324e4180d0899963fc83d9d241ac39e699609fc1025a850aadac8257459"
+
 [[package]]
 name = "objc2"
 version = "0.3.0-beta.3.patch-leaks.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7e01640f9f2cb1220bbe80325e179e532cb3379ebcd1bf2279d703c19fe3a468"
 dependencies = [
- "block2",
- "objc-sys",
- "objc2-encode",
+ "block2 0.2.0-alpha.6",
+ "objc-sys 0.2.0-beta.2",
+ "objc2-encode 2.0.0-pre.2",
+]
+
+[[package]]
+name = "objc2"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d"
+dependencies = [
+ "objc-sys 0.3.2",
+ "objc2-encode 3.0.0",
 ]
 
 [[package]]
@@ -3336,9 +3584,15 @@ version = "2.0.0-pre.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512"
 dependencies = [
- "objc-sys",
+ "objc-sys 0.2.0-beta.2",
 ]
 
+[[package]]
+name = "objc2-encode"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666"
+
 [[package]]
 name = "objc_exception"
 version = "0.1.2"
@@ -3357,15 +3611,6 @@ dependencies = [
  "objc",
 ]
 
-[[package]]
-name = "object"
-version = "0.32.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "oboe"
 version = "0.5.0"
@@ -3373,7 +3618,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8868cc237ee02e2d9618539a23a8d228b9bb3fc2e7a5b11eed3831de77c395d0"
 dependencies = [
  "jni 0.20.0",
- "ndk",
+ "ndk 0.7.0",
  "ndk-context",
  "num-derive 0.3.3",
  "num-traits",
@@ -3389,15 +3634,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "ogg"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6951b4e8bf21c8193da321bcce9c9dd2e13c858fe078bf9054a288b419ae5d6e"
-dependencies = [
- "byteorder",
-]
-
 [[package]]
 name = "once_cell"
 version = "1.19.0"
@@ -3503,7 +3739,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
 dependencies = [
  "fixedbitset",
- "indexmap 2.2.2",
+ "indexmap",
 ]
 
 [[package]]
@@ -3519,7 +3755,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4"
 dependencies = [
  "atomic-waker",
- "fastrand 2.0.1",
+ "fastrand",
  "futures-io",
 ]
 
@@ -3529,6 +3765,15 @@ version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb"
 
+[[package]]
+name = "platform-dirs"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e188d043c1a692985f78b5464853a263f1a27e5bd6322bad3a4078ee3c998a38"
+dependencies = [
+ "dirs-next",
+]
+
 [[package]]
 name = "png"
 version = "0.17.11"
@@ -3542,6 +3787,20 @@ dependencies = [
  "miniz_oxide",
 ]
 
+[[package]]
+name = "polling"
+version = "3.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24f040dee2588b4963afb4e420540439d126f73fdacf4a9c486a96d840bac3c9"
+dependencies = [
+ "cfg-if",
+ "concurrent-queue",
+ "pin-project-lite",
+ "rustix",
+ "tracing",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "pp-rs"
 version = "0.2.1"
@@ -3557,6 +3816,12 @@ version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
+[[package]]
+name = "presser"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa"
+
 [[package]]
 name = "pretty-type-name"
 version = "1.0.1"
@@ -3575,36 +3840,11 @@ dependencies = [
 
 [[package]]
 name = "proc-macro-crate"
-version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b00f26d3400549137f92511a46ac1cd8ce37cb5598a96d382381458b992a5d24"
-dependencies = [
- "toml_datetime",
- "toml_edit 0.20.2",
-]
-
-[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
 dependencies = [
- "proc-macro2",
- "quote",
- "version_check",
+ "toml_edit 0.21.1",
 ]
 
 [[package]]
@@ -3621,6 +3861,19 @@ name = "profiling"
 version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0f0f7f43585c34e4fdd7497d746bc32e14458cf11c69341cc0587b1d825dde42"
+dependencies = [
+ "profiling-procmacros",
+]
+
+[[package]]
+name = "profiling-procmacros"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd"
+dependencies = [
+ "quote",
+ "syn 2.0.48",
+]
 
 [[package]]
 name = "qoi"
@@ -3631,6 +3884,21 @@ dependencies = [
  "bytemuck",
 ]
 
+[[package]]
+name = "quick-error"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
+
+[[package]]
+name = "quick-xml"
+version = "0.31.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "quote"
 version = "1.0.35"
@@ -3721,12 +3989,68 @@ dependencies = [
  "simba",
 ]
 
+[[package]]
+name = "rav1e"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd87ce80a7665b1cce111f8a16c1f3929f6547ce91ade6addf4ec86a8dda5ce9"
+dependencies = [
+ "arbitrary",
+ "arg_enum_proc_macro",
+ "arrayvec",
+ "av1-grain",
+ "bitstream-io",
+ "built",
+ "cfg-if",
+ "interpolate_name",
+ "itertools",
+ "libc",
+ "libfuzzer-sys",
+ "log",
+ "maybe-rayon",
+ "new_debug_unreachable",
+ "noop_proc_macro",
+ "num-derive 0.4.2",
+ "num-traits",
+ "once_cell",
+ "paste",
+ "profiling",
+ "rand",
+ "rand_chacha",
+ "simd_helpers",
+ "system-deps",
+ "thiserror",
+ "v_frame",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "ravif"
+version = "0.11.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc13288f5ab39e6d7c9d501759712e6969fcc9734220846fc9ed26cae2cc4234"
+dependencies = [
+ "avif-serialize",
+ "imgref",
+ "loop9",
+ "quick-error",
+ "rav1e",
+ "rayon",
+ "rgb",
+]
+
 [[package]]
 name = "raw-window-handle"
 version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9"
 
+[[package]]
+name = "raw-window-handle"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544"
+
 [[package]]
 name = "rawpointer"
 version = "0.2.1"
@@ -3835,12 +4159,6 @@ version = "0.6.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
-[[package]]
-name = "regex-syntax"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
-
 [[package]]
 name = "regex-syntax"
 version = "0.8.2"
@@ -3853,6 +4171,24 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b"
 
+[[package]]
+name = "rgb"
+version = "0.8.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8"
+dependencies = [
+ "bytemuck",
+]
+
+[[package]]
+name = "ringbuf"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79abed428d1fd2a128201cec72c5f6938e2da607c6f3745f769fabea399d950a"
+dependencies = [
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "rmp"
 version = "0.8.12"
@@ -3888,7 +4224,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b1bb7b48ee48471f55da122c0044fcc7600cfcc85db88240b89cb832935e611"
 dependencies = [
  "cpal",
- "lewton",
 ]
 
 [[package]]
@@ -3897,18 +4232,12 @@ version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94"
 dependencies = [
- "base64 0.21.7",
+ "base64",
  "bitflags 2.4.2",
  "serde",
  "serde_derive",
 ]
 
-[[package]]
-name = "rustc-demangle"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
-
 [[package]]
 name = "rustc-hash"
 version = "1.1.0"
@@ -3924,14 +4253,27 @@ dependencies = [
  "semver",
 ]
 
+[[package]]
+name = "rustix"
+version = "0.38.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
+dependencies = [
+ "bitflags 2.4.2",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "ruzstd"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3ffab8f9715a0d455df4bbb9d21e91135aab3cd3ca187af0cd0c3c3f868fdc"
+checksum = "58c4eb8a81997cf040a091d1f7e1938aeab6749d3a0dfa73af43cdc32393483d"
 dependencies = [
  "byteorder",
- "thiserror-core",
+ "derive_more",
  "twox-hash",
 ]
 
@@ -3973,9 +4315,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "sctk-adwaita"
-version = "0.5.4"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cda4e97be1fd174ccc2aae81c8b694e803fa99b34e8fd0f057a9d70698e3ed09"
+checksum = "82b2eaf3a5b264a521b988b2e73042e742df700c4f962cde845d1541adb46550"
 dependencies = [
  "ab_glyph",
  "log",
@@ -3988,7 +4330,13 @@ dependencies = [
 name = "semver"
 version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0"
+checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0"
+
+[[package]]
+name = "send_wrapper"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
 
 [[package]]
 name = "serde"
@@ -4053,11 +4401,11 @@ dependencies = [
 
 [[package]]
 name = "serde_yaml"
-version = "0.9.34+deprecated"
+version = "0.9.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
+checksum = "8fd075d994154d4a774f95b51fb96bdc2832b0ea48425c92546073816cda1f2f"
 dependencies = [
- "indexmap 2.2.2",
+ "indexmap",
  "itoa",
  "ryu",
  "serde",
@@ -4098,6 +4446,15 @@ version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
 
+[[package]]
+name = "simd_helpers"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6"
+dependencies = [
+ "quote",
+]
+
 [[package]]
 name = "slab"
 version = "0.4.9"
@@ -4127,21 +4484,27 @@ dependencies = [
 
 [[package]]
 name = "smithay-client-toolkit"
-version = "0.16.1"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "870427e30b8f2cbe64bf43ec4b86e88fe39b0a84b3f15efd9c9c2d020bc86eb9"
+checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.2",
  "calloop",
- "dlib",
- "lazy_static",
+ "calloop-wayland-source",
+ "cursor-icon",
+ "libc",
  "log",
  "memmap2",
- "nix 0.24.3",
- "pkg-config",
+ "rustix",
+ "thiserror",
+ "wayland-backend",
  "wayland-client",
+ "wayland-csd-frame",
  "wayland-cursor",
  "wayland-protocols",
+ "wayland-protocols-wlr",
+ "wayland-scanner",
+ "xkeysym",
 ]
 
 [[package]]
@@ -4159,7 +4522,7 @@ version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61addf9117b11d1f5b4bf6fe94242ba25f59d2d4b2080544b771bd647024fd00"
 dependencies = [
- "hashbrown 0.14.3",
+ "hashbrown",
  "num-traits",
  "robust",
  "smallvec",
@@ -4176,12 +4539,11 @@ dependencies = [
 
 [[package]]
 name = "spirv"
-version = "0.2.0+1.5.4"
+version = "0.3.0+sdk-1.3.268.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830"
+checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844"
 dependencies = [
- "bitflags 1.3.2",
- "num-traits",
+ "bitflags 2.4.2",
 ]
 
 [[package]]
@@ -4208,6 +4570,77 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8fb1df15f412ee2e9dfc1c504260fa695c1c3f10fe9f4a6ee2d2184d7d6450e2"
 
+[[package]]
+name = "symphonia"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "815c942ae7ee74737bb00f965fa5b5a2ac2ce7b6c01c0cc169bbeaf7abd5f5a9"
+dependencies = [
+ "lazy_static",
+ "symphonia-codec-vorbis",
+ "symphonia-core",
+ "symphonia-format-ogg",
+ "symphonia-metadata",
+]
+
+[[package]]
+name = "symphonia-codec-vorbis"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a98765fb46a0a6732b007f7e2870c2129b6f78d87db7987e6533c8f164a9f30"
+dependencies = [
+ "log",
+ "symphonia-core",
+ "symphonia-utils-xiph",
+]
+
+[[package]]
+name = "symphonia-core"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "798306779e3dc7d5231bd5691f5a813496dc79d3f56bf82e25789f2094e022c3"
+dependencies = [
+ "arrayvec",
+ "bitflags 1.3.2",
+ "bytemuck",
+ "lazy_static",
+ "log",
+]
+
+[[package]]
+name = "symphonia-format-ogg"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ada3505789516bcf00fc1157c67729eded428b455c27ca370e41f4d785bfa931"
+dependencies = [
+ "log",
+ "symphonia-core",
+ "symphonia-metadata",
+ "symphonia-utils-xiph",
+]
+
+[[package]]
+name = "symphonia-metadata"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc622b9841a10089c5b18e99eb904f4341615d5aa55bbf4eedde1be721a4023c"
+dependencies = [
+ "encoding_rs",
+ "lazy_static",
+ "log",
+ "symphonia-core",
+]
+
+[[package]]
+name = "symphonia-utils-xiph"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "484472580fa49991afda5f6550ece662237b00c6f562c7d9638d1b086ed010fe"
+dependencies = [
+ "symphonia-core",
+ "symphonia-metadata",
+]
+
 [[package]]
 name = "syn"
 version = "1.0.109"
@@ -4232,16 +4665,29 @@ dependencies = [
 
 [[package]]
 name = "sysinfo"
-version = "0.29.11"
+version = "0.30.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666"
+checksum = "1fb4f3438c8f6389c864e61221cbc97e9bca98b4daf39a5beb7bea660f528bb2"
 dependencies = [
  "cfg-if",
  "core-foundation-sys",
  "libc",
  "ntapi",
  "once_cell",
- "winapi",
+ "windows 0.52.0",
+]
+
+[[package]]
+name = "system-deps"
+version = "6.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349"
+dependencies = [
+ "cfg-expr",
+ "heck",
+ "pkg-config",
+ "toml",
+ "version-compare",
 ]
 
 [[package]]
@@ -4256,6 +4702,12 @@ dependencies = [
  "slotmap",
 ]
 
+[[package]]
+name = "target-lexicon"
+version = "0.12.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
+
 [[package]]
 name = "termcolor"
 version = "1.4.1"
@@ -4274,26 +4726,6 @@ dependencies = [
  "thiserror-impl",
 ]
 
-[[package]]
-name = "thiserror-core"
-version = "1.0.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c001ee18b7e5e3f62cbf58c7fe220119e68d902bb7443179c0c8aef30090e999"
-dependencies = [
- "thiserror-core-impl",
-]
-
-[[package]]
-name = "thiserror-core-impl"
-version = "1.0.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4c60d69f36615a077cc7663b9cb8e42275722d23e58a7fa3d2c7f2915d09d04"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.48",
-]
-
 [[package]]
 name = "thiserror-impl"
 version = "1.0.56"
@@ -4328,23 +4760,23 @@ dependencies = [
 
 [[package]]
 name = "tiny-skia"
-version = "0.8.4"
+version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df8493a203431061e901613751931f047d1971337153f96d0e5e363d6dbf6a67"
+checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab"
 dependencies = [
  "arrayref",
  "arrayvec",
  "bytemuck",
  "cfg-if",
- "png",
+ "log",
  "tiny-skia-path",
 ]
 
 [[package]]
 name = "tiny-skia-path"
-version = "0.8.4"
+version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adbfb5d3f3dd57a0e11d12f4f13d4ebbbc1b5c15b7ab0a156d030b21da5f677c"
+checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93"
 dependencies = [
  "arrayref",
  "bytemuck",
@@ -4380,9 +4812,9 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.3"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
+checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
 dependencies = [
  "serde",
 ]
@@ -4393,7 +4825,7 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.2.2",
+ "indexmap",
  "toml_datetime",
  "winnow",
 ]
@@ -4404,13 +4836,24 @@ version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
 dependencies = [
- "indexmap 2.2.2",
+ "indexmap",
  "serde",
  "serde_spanned",
  "toml_datetime",
  "winnow",
 ]
 
+[[package]]
+name = "toml_edit"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "winnow",
+]
+
 [[package]]
 name = "tracing"
 version = "0.1.40"
@@ -4522,7 +4965,7 @@ version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c43148481c7b66502c48f35b8eef38b6ccdc7a9f04bd4cc294226d901ccc9bc7"
 dependencies = [
- "erased-serde 0.4.2",
+ "erased-serde",
  "inventory",
  "once_cell",
  "serde",
@@ -4561,6 +5004,12 @@ dependencies = [
  "tinyvec",
 ]
 
+[[package]]
+name = "unicode-segmentation"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+
 [[package]]
 name = "unicode-width"
 version = "0.1.11"
@@ -4575,9 +5024,9 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
 
 [[package]]
 name = "unsafe-libyaml"
-version = "0.2.11"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
+checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b"
 
 [[package]]
 name = "url"
@@ -4597,9 +5046,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a"
 dependencies = [
  "getrandom",
+ "rand",
  "serde",
 ]
 
+[[package]]
+name = "v_frame"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6f32aaa24bacd11e488aa9ba66369c7cd514885742c9fe08cfe85884db3e92b"
+dependencies = [
+ "aligned-vec",
+ "num-traits",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "valuable"
 version = "0.1.0"
@@ -4618,6 +5079,12 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
 
+[[package]]
+name = "version-compare"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b"
+
 [[package]]
 name = "version_check"
 version = "0.9.4"
@@ -4644,12 +5111,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "waker-fn"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690"
-
 [[package]]
 name = "walkdir"
 version = "2.5.0"
@@ -4733,83 +5194,129 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838"
 
 [[package]]
-name = "wayland-client"
-version = "0.29.5"
+name = "wayland-backend"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715"
+checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40"
 dependencies = [
- "bitflags 1.3.2",
+ "cc",
  "downcast-rs",
- "libc",
- "nix 0.24.3",
+ "rustix",
  "scoped-tls",
- "wayland-commons",
- "wayland-scanner",
+ "smallvec",
  "wayland-sys",
 ]
 
 [[package]]
-name = "wayland-commons"
-version = "0.29.5"
+name = "wayland-client"
+version = "0.31.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902"
+checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f"
 dependencies = [
- "nix 0.24.3",
- "once_cell",
- "smallvec",
- "wayland-sys",
+ "bitflags 2.4.2",
+ "rustix",
+ "wayland-backend",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-csd-frame"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e"
+dependencies = [
+ "bitflags 2.4.2",
+ "cursor-icon",
+ "wayland-backend",
 ]
 
 [[package]]
 name = "wayland-cursor"
-version = "0.29.5"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661"
+checksum = "71ce5fa868dd13d11a0d04c5e2e65726d0897be8de247c0c5a65886e283231ba"
 dependencies = [
- "nix 0.24.3",
+ "rustix",
  "wayland-client",
  "xcursor",
 ]
 
 [[package]]
 name = "wayland-protocols"
-version = "0.29.5"
+version = "0.31.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6"
+checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.2",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-protocols-plasma"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479"
+dependencies = [
+ "bitflags 2.4.2",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-protocols-wlr"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6"
+dependencies = [
+ "bitflags 2.4.2",
+ "wayland-backend",
  "wayland-client",
- "wayland-commons",
+ "wayland-protocols",
  "wayland-scanner",
 ]
 
 [[package]]
 name = "wayland-scanner"
-version = "0.29.5"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53"
+checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283"
 dependencies = [
  "proc-macro2",
+ "quick-xml",
  "quote",
- "xml-rs",
 ]
 
 [[package]]
 name = "wayland-sys"
-version = "0.29.5"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4"
+checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af"
 dependencies = [
  "dlib",
- "lazy_static",
+ "log",
+ "once_cell",
  "pkg-config",
 ]
 
 [[package]]
 name = "web-sys"
-version = "0.3.68"
+version = "0.3.67"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "web-time"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446"
+checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -4827,7 +5334,7 @@ dependencies = [
  "log",
  "ndk-context",
  "objc",
- "raw-window-handle",
+ "raw-window-handle 0.5.2",
  "url",
  "web-sys",
 ]
@@ -4840,18 +5347,19 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
 
 [[package]]
 name = "wgpu"
-version = "0.17.2"
+version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "752e44d3998ef35f71830dd1ad3da513e628e2e4d4aedb0ab580f850827a0b41"
+checksum = "0bfe9a310dcf2e6b85f00c46059aaeaf4184caa8e29a1ecd4b7a704c3482332d"
 dependencies = [
  "arrayvec",
  "cfg-if",
+ "cfg_aliases",
  "js-sys",
  "log",
  "naga",
  "parking_lot",
  "profiling",
- "raw-window-handle",
+ "raw-window-handle 0.6.0",
  "smallvec",
  "static_assertions",
  "wasm-bindgen",
@@ -4864,19 +5372,22 @@ dependencies = [
 
 [[package]]
 name = "wgpu-core"
-version = "0.17.1"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f8a44dd301a30ceeed3c27d8c0090433d3da04d7b2a4042738095a424d12ae7"
+checksum = "6b15e451d4060ada0d99a64df44e4d590213496da7c4f245572d51071e8e30ed"
 dependencies = [
  "arrayvec",
  "bit-vec",
  "bitflags 2.4.2",
+ "cfg_aliases",
  "codespan-reporting",
+ "indexmap",
  "log",
  "naga",
+ "once_cell",
  "parking_lot",
  "profiling",
- "raw-window-handle",
+ "raw-window-handle 0.6.0",
  "rustc-hash",
  "smallvec",
  "thiserror",
@@ -4887,9 +5398,9 @@ dependencies = [
 
 [[package]]
 name = "wgpu-hal"
-version = "0.17.2"
+version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a80bf0e3c77399bb52850cb0830af9bad073d5cfcb9dd8253bef8125c42db17"
+checksum = "e3bb47856236bfafc0bc591a925eb036ac19cd987624a447ff353e7a7e7e6f72"
 dependencies = [
  "android_system_properties",
  "arrayvec",
@@ -4897,9 +5408,11 @@ dependencies = [
  "bit-set",
  "bitflags 2.4.2",
  "block",
+ "cfg_aliases",
  "core-graphics-types",
  "d3d12",
  "glow",
+ "glutin_wgl_sys",
  "gpu-alloc",
  "gpu-allocator",
  "gpu-descriptor",
@@ -4912,10 +5425,11 @@ dependencies = [
  "metal",
  "naga",
  "objc",
+ "once_cell",
  "parking_lot",
  "profiling",
  "range-alloc",
- "raw-window-handle",
+ "raw-window-handle 0.6.0",
  "renderdoc-sys",
  "rustc-hash",
  "smallvec",
@@ -4928,9 +5442,9 @@ dependencies = [
 
 [[package]]
 name = "wgpu-types"
-version = "0.17.0"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee64d7398d0c2f9ca48922c902ef69c42d000c759f3db41e355f4a570b052b67"
+checksum = "895fcbeb772bfb049eb80b2d6e47f6c9af235284e9703c96fc0218a42ffd5af2"
 dependencies = [
  "bitflags 2.4.2",
  "js-sys",
@@ -4993,15 +5507,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
-[[package]]
-name = "windows"
-version = "0.44.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b"
-dependencies = [
- "windows-targets 0.42.2",
-]
-
 [[package]]
 name = "windows"
 version = "0.46.0"
@@ -5263,37 +5768,50 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
 
 [[package]]
 name = "winit"
-version = "0.28.7"
+version = "0.29.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9596d90b45384f5281384ab204224876e8e8bf7d58366d9b795ad99aa9894b94"
+checksum = "4c824f11941eeae66ec71111cc2674373c772f482b58939bb4066b642aa2ffcf"
 dependencies = [
+ "ahash",
  "android-activity",
- "bitflags 1.3.2",
+ "atomic-waker",
+ "bitflags 2.4.2",
+ "bytemuck",
+ "calloop",
  "cfg_aliases",
  "core-foundation",
- "core-graphics",
- "dispatch",
- "instant",
+ "core-graphics 0.23.1",
+ "cursor-icon",
+ "icrate",
+ "js-sys",
  "libc",
  "log",
- "mio",
- "ndk",
- "objc2",
+ "memmap2",
+ "ndk 0.8.0",
+ "ndk-sys 0.5.0+25.2.9519653",
+ "objc2 0.4.1",
  "once_cell",
  "orbclient",
  "percent-encoding",
- "raw-window-handle",
+ "raw-window-handle 0.6.0",
  "redox_syscall 0.3.5",
+ "rustix",
  "sctk-adwaita",
  "smithay-client-toolkit",
+ "smol_str",
+ "unicode-segmentation",
  "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "wayland-backend",
  "wayland-client",
- "wayland-commons",
  "wayland-protocols",
- "wayland-scanner",
+ "wayland-protocols-plasma",
  "web-sys",
- "windows-sys 0.45.0",
+ "web-time",
+ "windows-sys 0.48.0",
  "x11-dl",
+ "x11rb 0.13.0",
+ "xkbcommon-dl",
 ]
 
 [[package]]
@@ -5307,9 +5825,9 @@ dependencies = [
 
 [[package]]
 name = "winreg"
-version = "0.52.0"
+version = "0.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
+checksum = "937f3df7948156640f46aacef17a70db0de5917bda9c92b0f751f3a955b588fc"
 dependencies = [
  "cfg-if",
  "windows-sys 0.48.0",
@@ -5332,11 +5850,26 @@ version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1641b26d4dec61337c35a1b1aaf9e3cba8f46f0b43636c609ab0291a648040a"
 dependencies = [
- "gethostname",
+ "gethostname 0.3.0",
  "nix 0.26.4",
  "winapi",
  "winapi-wsapoll",
- "x11rb-protocol",
+ "x11rb-protocol 0.12.0",
+]
+
+[[package]]
+name = "x11rb"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a"
+dependencies = [
+ "as-raw-xcb-connection",
+ "gethostname 0.4.3",
+ "libc",
+ "libloading 0.8.1",
+ "once_cell",
+ "rustix",
+ "x11rb-protocol 0.13.0",
 ]
 
 [[package]]
@@ -5348,6 +5881,12 @@ dependencies = [
  "nix 0.26.4",
 ]
 
+[[package]]
+name = "x11rb-protocol"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34"
+
 [[package]]
 name = "xcursor"
 version = "0.3.5"
@@ -5360,6 +5899,25 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a"
 
+[[package]]
+name = "xkbcommon-dl"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5"
+dependencies = [
+ "bitflags 2.4.2",
+ "dlib",
+ "log",
+ "once_cell",
+ "xkeysym",
+]
+
+[[package]]
+name = "xkeysym"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621"
+
 [[package]]
 name = "xml-rs"
 version = "0.8.19"
@@ -5386,6 +5944,12 @@ dependencies = [
  "syn 2.0.48",
 ]
 
+[[package]]
+name = "zune-core"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a"
+
 [[package]]
 name = "zune-inflate"
 version = "0.2.54"
@@ -5394,3 +5958,12 @@ checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02"
 dependencies = [
  "simd-adler32",
 ]
+
+[[package]]
+name = "zune-jpeg"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448"
+dependencies = [
+ "zune-core",
+]
diff --git a/Cargo.toml b/Cargo.toml
index c67ec4a..64f7585 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -18,3 +18,19 @@ lto = true
 codegen-units = 1
 panic = "abort"
 strip = "symbols"
+
+# Some very strict lints.
+[workspace.lints.rust]
+unsafe_code = "forbid"
+missing_docs = "warn"
+unreachable_code = "warn"
+unreachable_patterns = "warn"
+[workspace.lints.clippy]
+enum_glob_use = "deny"
+pedantic = "deny"
+nursery = "deny"
+unwrap_used = "deny"
+module_name_repetitions = "allow"
+needless_pass_by_value = "allow"
+cast_possible_truncation = "allow"
+cast_precision_loss = "allow"
diff --git a/game/Cargo.toml b/game/Cargo.toml
index 210c476..98f6dae 100644
--- a/game/Cargo.toml
+++ b/game/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "elementalist"
-version = "0.6.0"
+version = "0.7.0"
 edition = "2021"
 build = "build.rs"
 
@@ -13,45 +13,54 @@ features = ["git2"]
 
 [build-dependencies]
 # Used to set the icon of the .exe file on Windows.
-embed-resource = "2.4.2"
+embed-resource = "2.4.1"
 
 [dependencies]
-# When running the game in development, use the dynamic linking feature of Bevy to speed
-# up compilation times. `cargo run --features bevy/dynamic_linking` will enable this.
-bevy = "0.12.1"
 # Input abstraction layer, makes for easy input handling and rebinding.
-leafwing-input-manager = "0.11.2"
+leafwing-input-manager = "0.13.3"
 # Used for logging. This might be able to be replaced with a re-pub from bevy.
 tracing = "0.1.40"
-# The game library contains a lot of resources, logic and compoents used in the game.
-game_library = { path = "../game_library" }
+# The game library contains a lot of resources, logic and components used in the game.
+elementalist_game_library = { path = "../game_library" }
 # For setting the icon on Windows, we use this, which must match the version in bevy.
-winit = "0.28"
+winit = "0.29.10"
 # Used to load our icon for the window.
-image = "0.24"
+image = "0.25.1"
 # Random noise generation library
 rand = "0.8.5"
-# DEBUG ONLY: docking support for the inspector egui
-egui_dock = "0.12.0"
-# DEBUG ONLY: inspector for bevy
-bevy-inspector-egui = "0.22.1"
 # Particle system
-bevy_hanabi = { version = "0.9.0", default-features = false, features = ["2d"] }
+bevy_hanabi = { version = "0.10.0", default-features = false, features = [
+  "2d",
+] }
 # Physics engine
-bevy_rapier2d = { version = "0.24.0", features = ["parallel"] }
+bevy_rapier2d = { version = "0.25.0", features = ["parallel"] }
+# Audio system plugin
+bevy_kira_audio = "0.19"
 
-# Some very strict lints.
-[lints.rust]
-unsafe_code = "forbid"
-missing_docs = "warn"
-unreachable_code = "warn"
-unreachable_patterns = "warn"
-[lints.clippy]
-enum_glob_use = "deny"
-pedantic = "deny"
-nursery = "deny"
-unwrap_used = "deny"
-module_name_repetitions = "allow"
-needless_pass_by_value = "allow"
-cast_possible_truncation = "allow"
-cast_precision_loss = "allow"
+[dependencies.bevy]
+version = "0.13"
+default-features = false
+features = [
+  "animation",
+  "bevy_asset",
+  "bevy_gilrs",
+  "bevy_scene",
+  "bevy_winit",
+  "bevy_core_pipeline",
+  "bevy_pbr",
+  "bevy_gltf",
+  "bevy_render",
+  "bevy_sprite",
+  "bevy_text",
+  "bevy_ui",
+  "multi-threaded",
+  "png",
+  "hdr",
+  "x11",
+  "bevy_gizmos",
+  "android_shared_stdcxx",
+  "tonemapping_luts",
+  "default_font",
+  "webgl2",
+  "bevy_debug_stepping",
+]
diff --git a/game/assets/backterria/ground_32.png b/game/assets/backterria/ground_32.png
new file mode 100644
index 0000000..15f551f
Binary files /dev/null and b/game/assets/backterria/ground_32.png differ
diff --git a/game/assets/backterria/natural_props.png b/game/assets/backterria/natural_props.png
new file mode 100644
index 0000000..b3f047a
Binary files /dev/null and b/game/assets/backterria/natural_props.png differ
diff --git a/game/assets/backterria/roguelike.png b/game/assets/backterria/roguelike.png
new file mode 100644
index 0000000..7233d70
Binary files /dev/null and b/game/assets/backterria/roguelike.png differ
diff --git a/game/assets/tileset/talisman_engraving.png b/game/assets/tileset/talisman_engraving.png
new file mode 100644
index 0000000..b2f2c85
Binary files /dev/null and b/game/assets/tileset/talisman_engraving.png differ
diff --git a/game/assets/tileset/talismans.png b/game/assets/tileset/talismans.png
new file mode 100644
index 0000000..e3055ef
Binary files /dev/null and b/game/assets/tileset/talismans.png differ
diff --git a/game/src/app_systems.rs b/game/src/app_systems.rs
index c48fb59..ab4cd6d 100644
--- a/game/src/app_systems.rs
+++ b/game/src/app_systems.rs
@@ -1,7 +1,7 @@
 use bevy::prelude::*;
 use bevy::winit::WinitWindows;
-use game_library::colors;
-use game_library::font_resource::FontResource;
+use elementalist_game_library::colors;
+use elementalist_game_library::font_resource::FontResource;
 use winit::window::Icon;
 
 use crate::app_info;
diff --git a/game/src/camera/creation.rs b/game/src/camera/creation.rs
index 193180f..c893b9a 100644
--- a/game/src/camera/creation.rs
+++ b/game/src/camera/creation.rs
@@ -1,6 +1,6 @@
 use bevy::prelude::*;
 
-use game_library::CameraScaleLevel;
+use elementalist_game_library::CameraScaleLevel;
 
 #[derive(Component)]
 pub struct MainCamera;
diff --git a/game/src/dev_systems.rs b/game/src/dev_systems.rs
index d42f44e..a950130 100644
--- a/game/src/dev_systems.rs
+++ b/game/src/dev_systems.rs
@@ -1,16 +1,14 @@
-use bevy::{prelude::*, window::PrimaryWindow};
-use bevy_inspector_egui::bevy_egui::{EguiContext, EguiPlugin};
-use bevy_inspector_egui::egui::{self, Align2};
+use bevy::prelude::*;
 
-use game_library::settings::{
+use elementalist_game_library::settings::{
     AccessibilitySettings, GameplaySettings, VideoSettings, VolumeSettings,
 };
-use game_library::Xp;
-use game_library::{
+use elementalist_game_library::Xp;
+use elementalist_game_library::{
     enums::Skill,
     font_resource::{FontChoice, FontResource},
-    Acceleration, Attribute, CameraScaleLevel, CursorPosition, Health, Mana, MovementBundle,
-    SpellChoices, Stat, StatBonus, Volume,
+    Acceleration, Attribute, CameraScaleLevel, CursorPosition, Health, Mana, MovementBundle, Stat,
+    StatBonus, Volume,
 };
 
 pub struct DevSystemsPlugin;
@@ -18,8 +16,7 @@ pub struct DevSystemsPlugin;
 impl Plugin for DevSystemsPlugin {
     fn build(&self, app: &mut App) {
         #[cfg(debug_assertions)]
-        app.add_plugins(EguiPlugin)
-            .register_type::<Attribute>()
+        app.register_type::<Attribute>()
             .register_type::<Skill>()
             .register_type::<Stat>()
             .register_type::<StatBonus>()
@@ -28,7 +25,6 @@ impl Plugin for DevSystemsPlugin {
             .register_type::<Health>()
             .register_type::<Xp>()
             .register_type::<Acceleration>()
-            .register_type::<SpellChoices>()
             .register_type::<CursorPosition>()
             .register_type::<CameraScaleLevel>()
             .register_type::<MovementBundle>()
@@ -37,67 +33,6 @@ impl Plugin for DevSystemsPlugin {
             .register_type::<VolumeSettings>()
             .register_type::<VideoSettings>()
             .register_type::<GameplaySettings>()
-            .register_type::<AccessibilitySettings>()
-            .add_plugins(bevy_inspector_egui::DefaultInspectorConfigPlugin)
-            .add_systems(Update, inspector_ui);
+            .register_type::<AccessibilitySettings>();
     }
 }
-
-fn inspector_ui(world: &mut World) {
-    let Ok(egui_context) = world
-        .query_filtered::<&mut EguiContext, With<PrimaryWindow>>()
-        .get_single(world)
-    else {
-        tracing::error!("Failed to get egui context for inspector ui");
-        return;
-    };
-    let mut egui_context = egui_context.clone();
-
-    egui::Window::new("Inspector")
-        .anchor(Align2::RIGHT_TOP, (0., 32.))
-        .default_open(false)
-        .show(egui_context.get_mut(), |ui| {
-            // The world inspector plugin
-            bevy_inspector_egui::bevy_inspector::ui_for_world(world, ui);
-
-            // Add a collapsable section for the SpellChoices resource.
-            egui::CollapsingHeader::new("Spell Choices")
-                .default_open(false)
-                .show(ui, |ui| {
-                    // The resource inspector plugin
-                    bevy_inspector_egui::bevy_inspector::ui_for_resource::<SpellChoices>(world, ui);
-                });
-            // Add collapsable sections for the settings resources.
-            egui::CollapsingHeader::new("Volume Settings")
-                .default_open(false)
-                .show(ui, |ui| {
-                    bevy_inspector_egui::bevy_inspector::ui_for_resource::<VolumeSettings>(
-                        world, ui,
-                    );
-                });
-            // Add collapsable sections for the settings resources.
-            egui::CollapsingHeader::new("Video Settings")
-                .default_open(false)
-                .show(ui, |ui| {
-                    bevy_inspector_egui::bevy_inspector::ui_for_resource::<VideoSettings>(
-                        world, ui,
-                    );
-                });
-            // Add collapsable sections for the settings resources.
-            egui::CollapsingHeader::new("Gameplay Settings")
-                .default_open(false)
-                .show(ui, |ui| {
-                    bevy_inspector_egui::bevy_inspector::ui_for_resource::<GameplaySettings>(
-                        world, ui,
-                    );
-                });
-            // Add collapsable sections for the settings resources.
-            egui::CollapsingHeader::new("Accessibility Settings")
-                .default_open(false)
-                .show(ui, |ui| {
-                    bevy_inspector_egui::bevy_inspector::ui_for_resource::<AccessibilitySettings>(
-                        world, ui,
-                    );
-                });
-        });
-}
diff --git a/game/src/events/menu_interaction.rs b/game/src/events/menu_interaction.rs
index 7b4f0ee..2f4f46c 100644
--- a/game/src/events/menu_interaction.rs
+++ b/game/src/events/menu_interaction.rs
@@ -34,10 +34,10 @@ impl MenuInteraction {
     /// Returns the default keybinds for this action on keyboard & mouse.
     pub const fn default_keyboard_mouse_input(self) -> UserInput {
         match self {
-            Self::Up => UserInput::Single(InputKind::Keyboard(KeyCode::W)),
-            Self::Down => UserInput::Single(InputKind::Keyboard(KeyCode::S)),
-            Self::Select => UserInput::Single(InputKind::Keyboard(KeyCode::Space)),
-            Self::Back => UserInput::Single(InputKind::Keyboard(KeyCode::Escape)),
+            Self::Up => UserInput::Single(InputKind::PhysicalKey(KeyCode::KeyW)),
+            Self::Down => UserInput::Single(InputKind::PhysicalKey(KeyCode::KeyS)),
+            Self::Select => UserInput::Single(InputKind::PhysicalKey(KeyCode::Space)),
+            Self::Back => UserInput::Single(InputKind::PhysicalKey(KeyCode::Escape)),
         }
     }
     /// Returns the default gamepad input for this action.
@@ -49,14 +49,19 @@ impl MenuInteraction {
             Self::Back => UserInput::Single(InputKind::GamepadButton(GamepadButtonType::South)),
         }
     }
+    /// Returns the variants of this enum.
+    #[must_use]
+    pub const fn variants() -> [Self; 4] {
+        [Self::Up, Self::Down, Self::Select, Self::Back]
+    }
 
     /// Returns the default input mapping for this action.
     pub fn default_input_map() -> InputMap<Self> {
         let mut input_map = InputMap::default();
 
         for variant in Self::variants() {
-            input_map.insert(variant.default_keyboard_mouse_input(), variant);
-            input_map.insert(variant.default_gamepad_input(), variant);
+            input_map.insert(variant, variant.default_keyboard_mouse_input());
+            input_map.insert(variant, variant.default_gamepad_input());
         }
 
         input_map
diff --git a/game/src/events/player_action.rs b/game/src/events/player_action.rs
index 52c4011..2cccf31 100644
--- a/game/src/events/player_action.rs
+++ b/game/src/events/player_action.rs
@@ -35,23 +35,23 @@ pub enum PlayerAction {
 
 impl PlayerAction {
     /// Returns the default keybinds for this action on keyboard & mouse.
-    pub fn default_keyboard_mouse_input(self) -> UserInput {
+    pub const fn default_keyboard_mouse_input(self) -> UserInput {
         match self {
             Self::Move => UserInput::VirtualDPad(VirtualDPad::wasd()),
             Self::Look => UserInput::VirtualDPad(VirtualDPad::arrow_keys()),
             Self::CastPrimary => UserInput::Single(InputKind::Mouse(MouseButton::Left)),
             Self::CastSecondary => UserInput::Single(InputKind::Mouse(MouseButton::Right)),
-            Self::CastDefensive => UserInput::Single(InputKind::Keyboard(KeyCode::Space)),
-            Self::CastUltimate => UserInput::Single(InputKind::Keyboard(KeyCode::E)),
-            Self::ToggleAutoCast => UserInput::Single(InputKind::Keyboard(KeyCode::Q)),
-            Self::ToggleAutoAim => UserInput::Single(InputKind::Keyboard(KeyCode::T)),
-            Self::Interact => UserInput::Single(InputKind::Keyboard(KeyCode::F)),
-            Self::Pause => UserInput::Single(InputKind::Keyboard(KeyCode::Escape)),
-            Self::StatusOverlay => UserInput::Single(InputKind::Keyboard(KeyCode::Tab)),
+            Self::CastDefensive => UserInput::Single(InputKind::PhysicalKey(KeyCode::Space)),
+            Self::CastUltimate => UserInput::Single(InputKind::PhysicalKey(KeyCode::KeyE)),
+            Self::ToggleAutoCast => UserInput::Single(InputKind::PhysicalKey(KeyCode::KeyQ)),
+            Self::ToggleAutoAim => UserInput::Single(InputKind::PhysicalKey(KeyCode::KeyT)),
+            Self::Interact => UserInput::Single(InputKind::PhysicalKey(KeyCode::KeyF)),
+            Self::Pause => UserInput::Single(InputKind::PhysicalKey(KeyCode::Escape)),
+            Self::StatusOverlay => UserInput::Single(InputKind::PhysicalKey(KeyCode::Tab)),
         }
     }
     /// Returns the default gamepad input for this action.
-    pub fn default_gamepad_input(self) -> UserInput {
+    pub const fn default_gamepad_input(self) -> UserInput {
         match self {
             Self::Move => UserInput::Single(InputKind::DualAxis(DualAxis::left_stick())),
             Self::Look => UserInput::Single(InputKind::DualAxis(DualAxis::right_stick())),
@@ -80,14 +80,31 @@ impl PlayerAction {
             }
         }
     }
+    /// Returns the variants of this enum.
+    #[must_use]
+    pub const fn variants() -> [Self; 11] {
+        [
+            Self::Move,
+            Self::Look,
+            Self::CastPrimary,
+            Self::CastSecondary,
+            Self::CastDefensive,
+            Self::CastUltimate,
+            Self::ToggleAutoCast,
+            Self::ToggleAutoAim,
+            Self::Interact,
+            Self::Pause,
+            Self::StatusOverlay,
+        ]
+    }
 
     /// Returns the default input map for this action.
     pub fn default_input_map() -> InputMap<Self> {
         let mut input_map = InputMap::default();
 
         for variant in Self::variants() {
-            input_map.insert(variant.default_keyboard_mouse_input(), variant);
-            input_map.insert(variant.default_gamepad_input(), variant);
+            input_map.insert(variant, variant.default_keyboard_mouse_input());
+            input_map.insert(variant, variant.default_gamepad_input());
         }
 
         input_map
diff --git a/game/src/game_overlays/mod.rs b/game/src/game_overlays/mod.rs
index 2fcc7b4..d5d27b7 100644
--- a/game/src/game_overlays/mod.rs
+++ b/game/src/game_overlays/mod.rs
@@ -1,5 +1,6 @@
 mod plugin;
 mod skill_book;
 mod status_screen;
+mod talismans;
 
 pub use plugin::GameOverlaysPlugin;
diff --git a/game/src/game_overlays/plugin.rs b/game/src/game_overlays/plugin.rs
index 9a2674c..de272a6 100644
--- a/game/src/game_overlays/plugin.rs
+++ b/game/src/game_overlays/plugin.rs
@@ -1,6 +1,6 @@
 use bevy::prelude::*;
 
-use game_library::state::Overlay;
+use elementalist_game_library::state::Overlay;
 
 use super::{skill_book::SkillBookUiPlugin, status_screen::StatusScreenPlugin};
 
@@ -9,7 +9,7 @@ pub struct GameOverlaysPlugin;
 
 impl Plugin for GameOverlaysPlugin {
     fn build(&self, app: &mut App) {
-        app.add_state::<Overlay>()
+        app.init_state::<Overlay>()
             .add_plugins((StatusScreenPlugin, SkillBookUiPlugin));
     }
 }
diff --git a/game/src/game_overlays/skill_book.rs b/game/src/game_overlays/skill_book.rs
index ffcc888..5d4c758 100644
--- a/game/src/game_overlays/skill_book.rs
+++ b/game/src/game_overlays/skill_book.rs
@@ -1,8 +1,8 @@
 //! The skill book UI overlay.
 use bevy::prelude::*;
-use game_library::{
+use elementalist_game_library::{
     colors, data_loader::storage::GameData, enums::Skill, font_resource::FontResource,
-    state::Overlay,
+    images::StoredTextureAtlas, state::Overlay,
 };
 
 pub struct SkillBookUiPlugin;
@@ -16,8 +16,11 @@ impl Plugin for SkillBookUiPlugin {
 }
 
 /// system to change system to skill screen when pressing 'k'
-fn toggle_skill_screen(mut next_overlay: ResMut<NextState<Overlay>>, input: Res<Input<KeyCode>>) {
-    if input.just_pressed(KeyCode::K) {
+fn toggle_skill_screen(
+    mut next_overlay: ResMut<NextState<Overlay>>,
+    input: Res<ButtonInput<KeyCode>>,
+) {
+    if input.just_pressed(KeyCode::KeyK) {
         next_overlay.set(Overlay::SkillScreen);
     }
 }
@@ -76,7 +79,7 @@ const RIGHT_COLUMN_SKILLS: [Skill; 9] = [
 
 fn add_skill_to_ui(
     font: Handle<Font>,
-    icon_tileset: Handle<TextureAtlas>,
+    icon_tileset: StoredTextureAtlas,
     skill: Skill,
     commands: &mut Commands,
 ) -> Entity {
@@ -130,9 +133,12 @@ fn add_skill_to_ui(
         .id();
     let skill_icon = commands
         .spawn(AtlasImageBundle {
-            texture_atlas: icon_tileset,
-            texture_atlas_image: UiTextureAtlasImage {
+            texture_atlas: TextureAtlas {
+                layout: icon_tileset.atlas_handle.clone(),
                 index: skill.icon_index(),
+            },
+            image: UiImage {
+                texture: icon_tileset.texture_handle,
                 ..default()
             },
             ..default()
diff --git a/game/src/game_overlays/status_screen.rs b/game/src/game_overlays/status_screen.rs
index 0a007ce..fdfdd54 100644
--- a/game/src/game_overlays/status_screen.rs
+++ b/game/src/game_overlays/status_screen.rs
@@ -1,13 +1,13 @@
 //! This may end up a full module. It is the plugin/systems for the status screen overlay.
 use bevy::prelude::*;
-use game_library::{
+use elementalist_game_library::{
     font_resource::FontResource,
     state::{AppState, Overlay},
     StatBundle,
 };
 use leafwing_input_manager::action_state::ActionState;
 
-use crate::{despawn_with_tag, events::PlayerAction, player::Player, resources::style_prefab};
+use crate::{despawn_with_tag, events::PlayerAction, player::Player, style_prefab};
 
 pub(super) struct StatusScreenPlugin;
 
@@ -87,7 +87,7 @@ fn toggle_status_screen(
     query: Query<&ActionState<PlayerAction>, With<Player>>,
 ) {
     if let Ok(action_state) = query.get_single() {
-        if action_state.just_pressed(PlayerAction::StatusOverlay) {
+        if action_state.just_pressed(&PlayerAction::StatusOverlay) {
             if *state == Overlay::Status {
                 next_state.set(Overlay::None);
             } else {
diff --git a/game/src/game_overlays/talismans.rs b/game/src/game_overlays/talismans.rs
new file mode 100644
index 0000000..4d4411d
--- /dev/null
+++ b/game/src/game_overlays/talismans.rs
@@ -0,0 +1,16 @@
+//! Draw some talismans
+
+// use elementalist_game_library::spells::talisman::{Behavior, Shaping, SpellTalisman, Tier};
+
+// /// A few sample talismans to display
+// pub const SAMPLE_TALISMANS: [SpellTalisman; 9] = [
+//     SpellTalisman::new(Tier::Mundane, Shaping::Cone, Behavior::Debuff),
+//     SpellTalisman::new(Tier::Rare, Shaping::Projectile, Behavior::Damage),
+//     SpellTalisman::new(Tier::Legendary, Shaping::AreaOfEffect, Behavior::Heal),
+//     SpellTalisman::new(Tier::Uncommon, Shaping::Line, Behavior::Damage),
+//     SpellTalisman::new(Tier::Common, Shaping::Touch, Behavior::Debuff),
+//     SpellTalisman::new(Tier::Epic, Shaping::AreaOfEffect, Behavior::Utility),
+//     SpellTalisman::new(Tier::Divine, Shaping::OnSelf, Behavior::Polymorph),
+//     SpellTalisman::new(Tier::Astral, Shaping::Melee, Behavior::Teleport),
+//     SpellTalisman::new(Tier::Unique, Shaping::AreaOfEffect, Behavior::Summon),
+// ];
diff --git a/game/src/in_game/plugin.rs b/game/src/in_game/plugin.rs
index 845eaa0..2016e2f 100644
--- a/game/src/in_game/plugin.rs
+++ b/game/src/in_game/plugin.rs
@@ -1,5 +1,5 @@
 use bevy::prelude::*;
-use game_library::state::{AppState, Game};
+use elementalist_game_library::state::{AppState, Game};
 
 /// Plugin and control flow for the settings menu.
 pub struct InGamePlugin;
diff --git a/game/src/main.rs b/game/src/main.rs
index ed9d5d1..45b41f9 100644
--- a/game/src/main.rs
+++ b/game/src/main.rs
@@ -12,9 +12,10 @@ use bevy::{
     render::{render_resource::WgpuFeatures, settings::WgpuSettings, RenderPlugin},
 };
 use bevy_rapier2d::prelude::*;
-use game_library::{
-    data_loader::storage::GameData, state::Game, GeneratedMaps, GenerationSeed, Layer, LayerPlugin,
-    MarkersToBiomes, NoisePlugin, PhysicsPlugin, SchedulingPlugin,
+use elementalist_game_library::{
+    data_loader::storage::GameData, images::ImagesPlugin, save_file::SaveFilePlugin, state::Game,
+    AudioPlugin, GeneratedMaps, GenerationSeed, Layer, LayerPlugin, MarkersToBiomes, NoisePlugin,
+    PhysicsPlugin, SchedulingPlugin,
 };
 use in_game::InGamePlugin;
 use leafwing_input_manager::plugin::InputManagerPlugin;
@@ -33,6 +34,7 @@ mod resources;
 mod settings_menu;
 mod spells;
 mod splash_screen;
+mod style_prefab;
 
 pub use app_systems::despawn_with_tag;
 use events::{MenuInteraction, PlayerAction};
@@ -82,10 +84,12 @@ fn main() {
                 .set(LogPlugin {
                     level: log_level,
                     filter: log_filter.to_string(),
+                    update_subscriber: None,
                 })
                 // Add our the wgpu settings per bevy_hanabi
                 .set(RenderPlugin {
                     render_creation: wgpu_settings.into(),
+                    ..default()
                 }),
         )
         // Add the gameplay plugins
@@ -105,6 +109,8 @@ fn main() {
         // Some test plugins for environment stuff
         .add_systems(OnEnter(Game::Playing), spawn_random_environment)
         .add_systems(OnExit(Game::Playing), despawn_with_tag::<EnvironmentStuff>)
+        // For the generated map, with a 32x32 tile size.
+        .insert_resource(GeneratedMaps::new((120, 120)).with_tile_dimension(32.0))
         // Launch
         .run();
 }
@@ -119,9 +125,11 @@ impl Plugin for ElementalistDefaultPlugins {
         // Never attempts to look up meta files. The default meta configuration will be used for each asset.
         app.insert_resource(AssetMetaCheck::Never);
         // The clear color is the color the screen is cleared to before each frame is drawn
-        app.insert_resource(ClearColor(game_library::colors::CLEAR_COLOR));
+        app.insert_resource(ClearColor(elementalist_game_library::colors::CLEAR_COLOR));
         // Add the window icon
         app.add_systems(Startup, app_systems::set_window_icon);
+        // Add the save game system
+        app.add_plugins(SaveFilePlugin);
         // Add camera plugin
         app.add_plugins(camera::CameraPlugin);
         // Add the schedule plugin
@@ -130,6 +138,8 @@ impl Plugin for ElementalistDefaultPlugins {
         app.add_plugins(PhysicsPlugin);
         // Add the layer plugin
         app.add_plugins(LayerPlugin);
+        // Add the images plugin
+        app.add_plugins(ImagesPlugin);
     }
 }
 
@@ -158,6 +168,8 @@ struct ElementalistGameplayPlugins;
 impl Plugin for ElementalistGameplayPlugins {
     fn build(&self, app: &mut App) {
         app.add_plugins((
+            // Add the audio plugin
+            AudioPlugin,
             // Add the plugin for the player
             player::PlayerPlugin,
             // Add the plugin for the spells
@@ -181,8 +193,8 @@ fn spawn_random_environment(
     seed: Res<GenerationSeed>,
 ) {
     // get the biomes for the current map
-    let Some(realm) = game_data.realms.get("simple test realm") else {
-        tracing::error!("No realm found for 'simple test realm'");
+    let Some(realm) = game_data.realms.get("backterria-simple") else {
+        tracing::error!("No realm found for 'backterria-simple'");
         return;
     };
 
@@ -200,7 +212,7 @@ fn spawn_random_environment(
             };
 
             let Some(ground) = game_data.tile_atlas.get(rnd_ground.0) else {
-                tracing::error!("Failed to load ground tileselt: {}", rnd_ground.0);
+                tracing::error!("Failed to load ground tileset: {}", rnd_ground.0);
                 continue;
             };
             let ground_id = rnd_ground.1;
@@ -208,8 +220,11 @@ fn spawn_random_environment(
             let ground_transform = Transform::from_translation(ground_translation);
             commands.spawn((
                 SpriteSheetBundle {
-                    texture_atlas: ground.clone(),
-                    sprite: bevy::sprite::TextureAtlasSprite::new(ground_id),
+                    atlas: TextureAtlas {
+                        layout: ground.atlas_handle.clone(),
+                        index: ground_id,
+                    },
+                    texture: ground.texture_handle.clone(),
                     transform: ground_transform,
                     ..Default::default()
                 },
@@ -258,8 +273,11 @@ fn spawn_random_environment(
 
                 commands.spawn((
                     SpriteSheetBundle {
-                        texture_atlas: tileset.clone(),
-                        sprite: bevy::sprite::TextureAtlasSprite::new(tile_index),
+                        atlas: TextureAtlas {
+                            layout: tileset.atlas_handle.clone(),
+                            index: tile_index,
+                        },
+                        texture: tileset.texture_handle.clone(),
                         transform: obj_transform,
                         ..Default::default()
                     },
diff --git a/game/src/main_menu/button_actions.rs b/game/src/main_menu/button_actions.rs
index 4cbd5cb..9c38fce 100644
--- a/game/src/main_menu/button_actions.rs
+++ b/game/src/main_menu/button_actions.rs
@@ -1,53 +1,59 @@
 use bevy::prelude::*;
 
 use super::MenuState;
-use game_library::state::{AppState, Overlay};
-
-/// All of the various "buttons" that can be clicked in any of the main menu screens
-#[derive(Component, Debug, Eq, PartialEq, Hash, Clone, Copy)]
-pub enum ButtonAction {
-    StartGame,
-    Settings,
-    Quit,
-}
+use elementalist_game_library::{
+    buttons::ButtonSystem,
+    state::{AppState, Overlay},
+};
 
+/// Component to identify buttons that are part of the main menu.
 #[derive(Component, Debug, Clone, PartialEq, Eq, Hash)]
 pub(super) struct MainMenuButton;
 
-/// System to handle the main menu button actions
-///
-/// * `interaction_query`: grabs all the buttons that have been interacted with, with the components
-///    Interaction and `ButtonAction` that have a changed interaction value (i.e. the button has been
-///   pressed)
-/// * `app_exit_events`: can be used to send an `AppExit` event to exit the game
-/// * `menu_state(next)`: lets us change the menu state for the next frame
-/// * `game_state(next)`: lets us change the game state for the next frame
-#[allow(clippy::type_complexity)]
-pub fn menu_actions(
-    interaction_query: Query<
-        (&Interaction, &ButtonAction),
-        (Changed<Interaction>, With<Button>, With<MainMenuButton>),
-    >,
+/// System to handle pressing the Start Game button in the main menu.
+pub(super) fn start_game_oneshot(
     mut menu_state: ResMut<NextState<MenuState>>,
     mut game_state: ResMut<NextState<AppState>>,
-    mut overlay_state: ResMut<NextState<Overlay>>,
 ) {
-    // Loop through all the buttons that have been interacted with
-    for (interaction, menu_button_action) in &interaction_query {
-        // If the button has been pressed, match the button action
-        if *interaction == Interaction::Pressed {
-            // Check which button action has been pressed (i.e. what action we attached to the button)
-            match menu_button_action {
-                ButtonAction::Quit => game_state.set(AppState::CleanUp),
-                ButtonAction::StartGame => {
-                    game_state.set(AppState::InGame);
-                    menu_state.set(MenuState::Disabled);
-                }
-                ButtonAction::Settings => {
-                    // Set the game state to the settings menu
-                    overlay_state.set(Overlay::Settings);
-                }
-            }
-        }
-    }
+    game_state.set(AppState::InGame);
+    menu_state.set(MenuState::Disabled);
+}
+
+/// System to handle pressing the Settings button in the main menu.
+pub(super) fn settings_oneshot(mut overlay_state: ResMut<NextState<Overlay>>) {
+    overlay_state.set(Overlay::Settings);
+}
+
+/// System to handle pressing the Quit button in the main menu.
+pub(super) fn quit_button_oneshot(mut game_state: ResMut<NextState<AppState>>) {
+    game_state.set(AppState::CleanUp)
+}
+
+/// Resource for storing the buttons for future reference, instead of re-registering the systems
+/// whenever we enter the main menu.
+#[derive(Resource)]
+pub(super) struct MenuButtons {
+    pub start: ButtonSystem,
+    pub settings: ButtonSystem,
+    pub quit: ButtonSystem,
+}
+
+/// System to register the buttons for future reference.
+///
+/// This inserts a resource with the button systems, which can be used to handle button presses in other systems.
+pub(super) fn register_buttons(world: &mut World) {
+    let start = ButtonSystem {
+        pressed_event: Some(world.register_system(start_game_oneshot)),
+    };
+    let settings = ButtonSystem {
+        pressed_event: Some(world.register_system(settings_oneshot)),
+    };
+    let quit = ButtonSystem {
+        pressed_event: Some(world.register_system(quit_button_oneshot)),
+    };
+    world.insert_resource(MenuButtons {
+        start,
+        settings,
+        quit,
+    });
 }
diff --git a/game/src/main_menu/screens/main_screen.rs b/game/src/main_menu/main_screen.rs
similarity index 83%
rename from game/src/main_menu/screens/main_screen.rs
rename to game/src/main_menu/main_screen.rs
index a2b5c38..3d26c31 100644
--- a/game/src/main_menu/screens/main_screen.rs
+++ b/game/src/main_menu/main_screen.rs
@@ -1,19 +1,22 @@
 use bevy::prelude::*;
-use game_library::font_resource::FontResource;
+use elementalist_game_library::font_resource::FontResource;
 
 use crate::{
-    main_menu::{
-        button_actions::{ButtonAction, MainMenuButton},
-        plugin::OnMainMenuScreen,
-    },
-    resources::style_prefab,
+    main_menu::{button_actions::MainMenuButton, plugin::OnMainMenuScreen},
+    style_prefab,
 };
 
+use super::button_actions::MenuButtons;
+
 /// System to setup the main menu screen
 ///
 /// When the main menu screen is entered, we spawn the main menu entities. This includes the
 /// background, the title, and the buttons.
-pub fn main_menu_setup(mut commands: Commands, fonts: Res<FontResource>) {
+pub fn main_menu_setup(
+    mut commands: Commands,
+    fonts: Res<FontResource>,
+    buttons: Res<MenuButtons>,
+) {
     // Common style for all buttons on the screen
     commands
         .spawn((style_prefab::main_menu_full_node_bundle(), OnMainMenuScreen))
@@ -31,7 +34,7 @@ pub fn main_menu_setup(mut commands: Commands, fonts: Res<FontResource>) {
                     menu_buttons
                         .spawn((
                             style_prefab::menu_button_bundle(),
-                            ButtonAction::StartGame,
+                            buttons.start.clone(),
                             MainMenuButton,
                         ))
                         .with_children(|button| {
@@ -45,7 +48,7 @@ pub fn main_menu_setup(mut commands: Commands, fonts: Res<FontResource>) {
                     menu_buttons
                         .spawn((
                             style_prefab::menu_button_bundle(),
-                            ButtonAction::Settings,
+                            buttons.settings.clone(),
                             MainMenuButton,
                         ))
                         .with_children(|button| {
@@ -59,7 +62,7 @@ pub fn main_menu_setup(mut commands: Commands, fonts: Res<FontResource>) {
                     menu_buttons
                         .spawn((
                             style_prefab::menu_button_bundle(),
-                            ButtonAction::Quit,
+                            buttons.quit.clone(),
                             MainMenuButton,
                         ))
                         .with_children(|button| {
diff --git a/game/src/main_menu/mod.rs b/game/src/main_menu/mod.rs
index a855bff..a6bea5f 100644
--- a/game/src/main_menu/mod.rs
+++ b/game/src/main_menu/mod.rs
@@ -1,6 +1,6 @@
 mod button_actions;
+mod main_screen;
 mod plugin;
-mod screens;
 
 pub use plugin::MainMenuPlugin;
 pub use plugin::MenuState;
diff --git a/game/src/main_menu/plugin.rs b/game/src/main_menu/plugin.rs
index fb95384..5288089 100644
--- a/game/src/main_menu/plugin.rs
+++ b/game/src/main_menu/plugin.rs
@@ -1,9 +1,9 @@
 use bevy::prelude::*;
 
 use crate::despawn_with_tag;
-use game_library::state::AppState;
+use elementalist_game_library::state::AppState;
 
-use super::{button_actions::menu_actions, screens};
+use super::{button_actions, main_screen};
 
 // State used for the current menu screen
 #[derive(Clone, Copy, Default, Eq, PartialEq, Debug, Hash, States)]
@@ -40,13 +40,13 @@ impl Plugin for MainMenuPlugin {
     fn build(&self, app: &mut App) {
         app
             // Add a resource to track which menu state we are in
-            .add_state::<MenuState>()
+            .init_state::<MenuState>()
+            // Register the button actions
+            .add_systems(Startup, button_actions::register_buttons)
             // Transition to the main menu when entering the main menu state (starts tracking our MenuState at Main)
             .add_systems(OnEnter(AppState::MainMenu), transition_to_main_menu)
-            // Add system to update the buttons on hover, etc
-            .add_systems(Update, menu_actions.run_if(in_state(AppState::MainMenu)))
             // Main main screen
-            .add_systems(OnEnter(MenuState::Main), screens::main_menu)
+            .add_systems(OnEnter(MenuState::Main), main_screen::main_menu_setup)
             .add_systems(
                 OnExit(MenuState::Main),
                 despawn_with_tag::<OnMainMenuScreen>,
diff --git a/game/src/main_menu/screens/mod.rs b/game/src/main_menu/screens/mod.rs
deleted file mode 100644
index 7de3d66..0000000
--- a/game/src/main_menu/screens/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-mod main_screen;
-
-pub use main_screen::main_menu_setup as main_menu;
diff --git a/game/src/player/animation.rs b/game/src/player/animation.rs
index e7585c3..3c23135 100644
--- a/game/src/player/animation.rs
+++ b/game/src/player/animation.rs
@@ -1,141 +1,25 @@
 //! Animation states and systems for the player's avatar.
 use bevy::prelude::*;
-use game_library::events::CastSpell;
+use elementalist_game_library::{
+    events::CastSpell,
+    images::{AnimationActionState, AnimationStatus},
+};
 
 use super::avatar::PlayerAvatar;
 
-/// The different states that the player's avatar can be in.
-#[derive(Debug, Clone, Copy, Default, Eq, PartialEq, Hash, States)]
-pub(super) enum PlayerAnimation {
-    /// The player's avatar is idle.
-    #[default]
-    Idle,
-    /// The player's avatar is walking.
-    Walking,
-}
-
-/// Supplemental animations states for the player's avatar.
-///
-/// These can be combined with the `PlayerAnimation` states to create more complex animations.
-#[derive(Debug, Clone, Copy, Default, Eq, PartialEq, Hash, States)]
-pub(super) enum PlayerAnimationSupplemental {
-    /// None
-    #[default]
-    None,
-    /// Casting a spell
-    Casting,
-}
-
-/// Facing direction of the player's avatar.
-#[derive(Debug, Clone, Copy, Default, Eq, PartialEq, Hash, States)]
-pub(super) enum PlayerFacing {
-    /// The player's avatar is facing left.
-    #[default]
-    Left,
-    /// The player's avatar is facing right.
-    Right,
-}
-
-/// Timer that will be used to update the player's avatar's animation.
-#[derive(Debug, Default, Resource)]
-pub(super) struct PlayerAnimationTimer(pub Timer);
-
-const WALKING_ANIMATION: [usize; 4] = [0, 1, 0, 2];
-const CASTING_WALKING_ANIMATION: [usize; 4] = [5, 6, 7, 8];
-const IDLE_ANIMATION: [usize; 1] = [3];
-const CASTING_IDLE_ANIMATION: [usize; 1] = [4];
-
-/// The frame of the animation that the player's avatar is currently on.
-#[derive(Debug, Default, Resource, Clone, Copy, PartialEq, Eq, Hash)]
-pub(super) struct AnimationFrame(pub usize);
-
-impl AnimationFrame {
-    /// The maximum number of frames in the animation.
-    pub const MAX: usize = 3;
-
-    /// Resets the frame to 0.
-    pub fn reset(&mut self) {
-        self.0 = 0;
-    }
-    /// Advances the frame by 1, wrapping around to 0 after hitting `MAX`.
-    pub fn next(&mut self) {
-        self.0 = (self.0 + 1) % Self::MAX;
-    }
-    /// Give the frame in the context of an animation's length.
-    #[must_use]
-    pub const fn get(self, length: usize) -> usize {
-        self.0 % length
-    }
-    /// Returns true if the frame is at the end of the animation.
-    #[must_use]
-    pub const fn is_fin(self) -> bool {
-        self.0 == Self::MAX - 1
-    }
-}
-
 /// Set the casting animation when spell casting event is triggered.
 pub(super) fn set_casting_animation(
-    mut supplemental_state_next: ResMut<NextState<PlayerAnimationSupplemental>>,
     mut er_cast_spell: EventReader<CastSpell>,
-    mut frame: ResMut<AnimationFrame>,
+    mut player_animation: Query<&mut AnimationStatus, With<PlayerAvatar>>,
 ) {
     // If the player is casting a spell, set the supplemental state to casting.
     if er_cast_spell.read().next().is_some() {
-        supplemental_state_next.set(PlayerAnimationSupplemental::Casting);
-        frame.reset();
-    }
-}
-
-/// Advance the animation frame every 0.1 seconds.
-pub(super) fn advance_animation_timer(
-    time: Res<Time>,
-    mut timer: ResMut<PlayerAnimationTimer>,
-    mut frame: ResMut<AnimationFrame>,
-) {
-    if !timer.0.tick(time.delta()).just_finished() {
-        return;
-    }
-    frame.next();
-}
-
-/// The system that updates the avatar's animation based on its state.
-///
-/// Tracks a local "frame" that goes from 0 to 3, and updates the sprite index based on the current
-/// state. We advance the frame every 0.1 seconds.
-pub fn update_avatar_animation(
-    mut sprite_query: Query<&mut TextureAtlasSprite, With<PlayerAvatar>>,
-    state: Res<State<PlayerAnimation>>,
-    supplemental_state: Res<State<PlayerAnimationSupplemental>>,
-    facing: Res<State<PlayerFacing>>,
-    mut supplemental_state_next: ResMut<NextState<PlayerAnimationSupplemental>>,
-    frame: Res<AnimationFrame>,
-) {
-    // should be just one player avatar & sprite
-    let Ok(mut sprite) = sprite_query.get_single_mut() else {
-        tracing::error!("update_avatar_animation: failed to get player sprite");
-        return;
-    };
-
-    // Flip the sprite based on the facing state
-    sprite.flip_x = *facing.get() == PlayerFacing::Left;
-
-    match (state.get(), supplemental_state.get()) {
-        (PlayerAnimation::Walking, PlayerAnimationSupplemental::None) => {
-            sprite.index = WALKING_ANIMATION[frame.get(WALKING_ANIMATION.len())];
-        }
-        (PlayerAnimation::Walking, PlayerAnimationSupplemental::Casting) => {
-            sprite.index = CASTING_WALKING_ANIMATION[frame.get(CASTING_WALKING_ANIMATION.len())];
-        }
-        (PlayerAnimation::Idle, PlayerAnimationSupplemental::None) => {
-            sprite.index = IDLE_ANIMATION[frame.get(IDLE_ANIMATION.len())];
-        }
-        (PlayerAnimation::Idle, PlayerAnimationSupplemental::Casting) => {
-            sprite.index = CASTING_IDLE_ANIMATION[frame.get(CASTING_IDLE_ANIMATION.len())];
-        }
-    }
+        // Expect just one result from the query
+        let Ok(mut status) = player_animation.get_single_mut() else {
+            tracing::warn!("set_casting_animation: Failure to get animation status for player");
+            return;
+        };
 
-    // If we're casting, reset the supplemental state after the casting animation is done
-    if frame.is_fin() && supplemental_state.get() == &PlayerAnimationSupplemental::Casting {
-        supplemental_state_next.set(PlayerAnimationSupplemental::None);
+        status.action = AnimationActionState::Cast;
     }
 }
diff --git a/game/src/player/avatar.rs b/game/src/player/avatar.rs
index b20ea1f..5726e38 100644
--- a/game/src/player/avatar.rs
+++ b/game/src/player/avatar.rs
@@ -1,11 +1,13 @@
 use bevy::prelude::*;
 use bevy_rapier2d::prelude::*;
-use game_library::{
+use elementalist_game_library::{
     colors,
     data_loader::storage::GameData,
     enums::StatEnum,
+    images::AnimationBundle,
     progress_bar::{BarState, ProgressBarConfig},
-    Health, Layer, Mana, MovementBundle, SpellChoices, StatBundle, Xp,
+    spells::SpellSelection,
+    Health, Layer, Mana, MovementBundle, StatBundle, Xp,
 };
 
 use super::{
@@ -13,6 +15,8 @@ use super::{
     Player,
 };
 
+const INITIAL_SPRITE_INDEX: usize = 3;
+
 /// `PlayerAvatar` is a marker component for the player's avatar, i.e. the entity that the player
 /// controls. This is used to ensure that only one player avatar is spawned at a time. It also
 /// lets us allow a player controller to continue to control the menu and other things without
@@ -29,7 +33,7 @@ pub struct PlayerAvatar;
 /// This will put the avatar as a child of the player entity, which should exist already.
 pub fn spawn_player_avatar(
     mut commands: Commands,
-    mut spell_choices: ResMut<SpellChoices>,
+    mut spell_choices: ResMut<SpellSelection>,
     game_data: Res<GameData>,
     existing_players: Query<&PlayerAvatar>,
 ) {
@@ -56,13 +60,14 @@ pub fn spawn_player_avatar(
 
     commands.spawn((
         PlayerBundle {
+            animation: AnimationBundle::new("player-avatar"),
             movement: MovementBundle::default(),
             sprite: SpriteSheetBundle {
-                texture_atlas: tileset.clone(),
-                sprite: TextureAtlasSprite {
-                    index: 3,
-                    ..default()
+                atlas: TextureAtlas {
+                    layout: tileset.atlas_handle.clone(),
+                    index: INITIAL_SPRITE_INDEX,
                 },
+                texture: tileset.texture_handle.clone(),
                 transform: Transform {
                     translation: Vec3::new(0.0, 0.0, 150.0),
                     scale: Vec3::splat(0.85),
diff --git a/game/src/player/bundle.rs b/game/src/player/bundle.rs
index aedeef5..68aa1b6 100644
--- a/game/src/player/bundle.rs
+++ b/game/src/player/bundle.rs
@@ -1,6 +1,8 @@
 use bevy::prelude::*;
 use bevy_rapier2d::prelude::*;
-use game_library::{enums::StatEnum, Health, Layer, Mana, MovementBundle, StatBundle, Xp};
+use elementalist_game_library::{
+    enums::StatEnum, images::AnimationBundle, Health, Layer, Mana, MovementBundle, StatBundle, Xp,
+};
 
 /// Base stats for the player. These are the stats that the player starts with, and are used to
 /// initiate the [`StatBundle`] for the player.
@@ -65,6 +67,8 @@ pub struct PlayerBundle {
     pub movement: MovementBundle,
     /// The player's sprite bundle.
     pub sprite: SpriteSheetBundle,
+    /// Animation (entity sprite)
+    pub animation: AnimationBundle,
     /// The player's health.
     pub health: Health,
     /// The player's mana.
diff --git a/game/src/player/menu_control.rs b/game/src/player/menu_control.rs
index 2d8ec6e..5e9532a 100644
--- a/game/src/player/menu_control.rs
+++ b/game/src/player/menu_control.rs
@@ -1,5 +1,5 @@
 use bevy::prelude::*;
-use game_library::state::{Overlay, Settings};
+use elementalist_game_library::state::{Overlay, Settings};
 use leafwing_input_manager::action_state::ActionState;
 
 use crate::{events::MenuInteraction, player::Player};
@@ -12,16 +12,16 @@ pub fn menu_input(
     mut next_overlay_state: ResMut<NextState<Overlay>>,
 ) {
     let action_state = query.single();
-    if action_state.just_pressed(MenuInteraction::Up) {
+    if action_state.just_pressed(&MenuInteraction::Up) {
         tracing::debug!("Up (in Menu)");
     }
-    if action_state.just_pressed(MenuInteraction::Down) {
+    if action_state.just_pressed(&MenuInteraction::Down) {
         tracing::debug!("Down (in Menu)");
     }
-    if action_state.just_pressed(MenuInteraction::Select) {
+    if action_state.just_pressed(&MenuInteraction::Select) {
         tracing::debug!("Select (in Menu)");
     }
-    if action_state.just_pressed(MenuInteraction::Back) {
+    if action_state.just_pressed(&MenuInteraction::Back) {
         if *menu_state == Settings::Main {
             next_overlay_state.set(Overlay::None);
             next_menu_state.set(Settings::Disabled);
diff --git a/game/src/player/movement.rs b/game/src/player/movement.rs
index 02bc1c8..41a4c55 100644
--- a/game/src/player/movement.rs
+++ b/game/src/player/movement.rs
@@ -1,22 +1,21 @@
 use bevy::prelude::*;
 use bevy_rapier2d::prelude::*;
-use game_library::{enums::StatEnum, StatBundle};
+use elementalist_game_library::{
+    enums::StatEnum,
+    images::{AnimationMovementState, AnimationStatus},
+    StatBundle,
+};
 use leafwing_input_manager::action_state::ActionState;
 
 use crate::{events::PlayerAction, player::Player};
 
-use super::{
-    animation::{PlayerAnimation, PlayerFacing},
-    avatar::PlayerAvatar,
-};
+use super::avatar::PlayerAvatar;
 
 /// Handle player input for movement
 pub fn player_movement_controls(
-    mut query: Query<&mut KinematicCharacterController, With<Player>>,
+    mut query: Query<(&mut KinematicCharacterController, &mut AnimationStatus), With<Player>>,
     action_query: Query<&ActionState<PlayerAction>, With<Player>>,
     stat_query: Query<&StatBundle, With<Player>>,
-    mut sprite_state_next: ResMut<NextState<PlayerAnimation>>,
-    mut player_facing_next: ResMut<NextState<PlayerFacing>>,
 ) {
     let Ok(action_state) = action_query.get_single() else {
         tracing::error!("player_movement_controls: failed to get action state");
@@ -34,24 +33,24 @@ pub fn player_movement_controls(
     };
 
     // we expect just one `KinematicCharacterController` for the player
-    let Ok(mut controller) = query.get_single_mut() else {
-        tracing::error!("player_movement_controls: failed to get player controller");
+    let Ok((mut controller, mut status)) = query.get_single_mut() else {
+        tracing::error!("player_movement_controls: failed to get player components");
         return;
     };
 
-    if action_state.pressed(PlayerAction::Move) {
-        sprite_state_next.set(PlayerAnimation::Walking);
-        if let Some(axis_pair) = action_state.clamped_axis_pair(PlayerAction::Move) {
+    if action_state.pressed(&PlayerAction::Move) {
+        // update the animation only when needed
+        status.movement = AnimationMovementState::Walk;
+
+        if let Some(axis_pair) = action_state.clamped_axis_pair(&PlayerAction::Move) {
             controller.translation = Some(axis_pair.xy().normalize_or_zero() * (speed.value()));
 
-            if axis_pair.x() < 0.0 {
-                player_facing_next.set(PlayerFacing::Left);
-            } else {
-                player_facing_next.set(PlayerFacing::Right);
+            if axis_pair.x() > 0.0 || axis_pair.x() < 0.0 {
+                status.facing_left = axis_pair.x() < 0.0;
             }
         }
     } else {
-        sprite_state_next.set(PlayerAnimation::Idle);
+        status.movement = AnimationMovementState::Idle;
     }
 }
 
diff --git a/game/src/player/player_control.rs b/game/src/player/player_control.rs
index f6aec37..39f2dee 100644
--- a/game/src/player/player_control.rs
+++ b/game/src/player/player_control.rs
@@ -1,9 +1,9 @@
 use bevy::prelude::*;
-use game_library::{
+use elementalist_game_library::{
     events::CastSpell,
     settings::GameplaySettings,
+    spells::SpellSelection,
     state::{AppState, Overlay},
-    SpellChoices,
 };
 use leafwing_input_manager::action_state::ActionState;
 
@@ -32,7 +32,7 @@ impl Plugin for PlayerControlsPlugin {
 /// System to handle player casting primary spell
 fn player_cast_primary_spell_system(
     mut ew_cast_spell: EventWriter<CastSpell>,
-    spell_choices: Res<SpellChoices>,
+    spell_choices: Res<SpellSelection>,
     query: Query<&ActionState<PlayerAction>, With<Player>>,
 ) {
     let Ok(action_state) = query.get_single() else {
@@ -40,9 +40,9 @@ fn player_cast_primary_spell_system(
         return;
     };
 
-    if action_state.just_pressed(PlayerAction::CastPrimary) {
+    if action_state.just_pressed(&PlayerAction::CastPrimary) {
         // Cast a the primary spell
-        if let Some(spell_id) = spell_choices.primary.clone() {
+        if let Some(spell_id) = spell_choices.primary() {
             ew_cast_spell.send(CastSpell(spell_id));
         } else {
             tracing::warn!("No primary spell selected");
@@ -53,7 +53,7 @@ fn player_cast_primary_spell_system(
 /// System to handle player casting secondary spell
 fn player_cast_secondary_spell_system(
     mut ew_cast_spell: EventWriter<CastSpell>,
-    spell_choices: Res<SpellChoices>,
+    spell_choices: Res<SpellSelection>,
     query: Query<&ActionState<PlayerAction>, With<Player>>,
 ) {
     let Ok(action_state) = query.get_single() else {
@@ -61,9 +61,9 @@ fn player_cast_secondary_spell_system(
         return;
     };
 
-    if action_state.just_pressed(PlayerAction::CastSecondary) {
+    if action_state.just_pressed(&PlayerAction::CastSecondary) {
         // Cast a the secondary spell
-        if let Some(spell_id) = spell_choices.secondary.clone() {
+        if let Some(spell_id) = spell_choices.secondary() {
             ew_cast_spell.send(CastSpell(spell_id));
         } else {
             tracing::warn!("No secondary spell selected");
@@ -74,7 +74,7 @@ fn player_cast_secondary_spell_system(
 /// System to handle player casting defensive spell
 fn player_cast_defensive_spell_system(
     mut ew_cast_spell: EventWriter<CastSpell>,
-    spell_choices: Res<SpellChoices>,
+    spell_choices: Res<SpellSelection>,
     query: Query<&ActionState<PlayerAction>, With<Player>>,
 ) {
     let Ok(action_state) = query.get_single() else {
@@ -82,9 +82,9 @@ fn player_cast_defensive_spell_system(
         return;
     };
 
-    if action_state.just_pressed(PlayerAction::CastDefensive) {
+    if action_state.just_pressed(&PlayerAction::CastDefensive) {
         // Cast a the defensive spell
-        if let Some(spell_id) = spell_choices.defensive.clone() {
+        if let Some(spell_id) = spell_choices.tertiary() {
             ew_cast_spell.send(CastSpell(spell_id));
         } else {
             tracing::warn!("No defensive spell selected");
@@ -95,7 +95,7 @@ fn player_cast_defensive_spell_system(
 /// System to handle player casting ultimate spell
 fn player_cast_ultimate_spell_system(
     mut ew_cast_spell: EventWriter<CastSpell>,
-    spell_choices: Res<SpellChoices>,
+    spell_choices: Res<SpellSelection>,
     query: Query<&ActionState<PlayerAction>, With<Player>>,
 ) {
     let Ok(action_state) = query.get_single() else {
@@ -103,9 +103,9 @@ fn player_cast_ultimate_spell_system(
         return;
     };
 
-    if action_state.just_pressed(PlayerAction::CastUltimate) {
+    if action_state.just_pressed(&PlayerAction::CastUltimate) {
         // Cast a the ultimate spell
-        if let Some(spell_id) = spell_choices.ultimate.clone() {
+        if let Some(spell_id) = spell_choices.ultimate() {
             ew_cast_spell.send(CastSpell(spell_id));
         } else {
             tracing::warn!("No ultimate spell selected");
@@ -120,14 +120,14 @@ fn player_control_system(query: Query<&ActionState<PlayerAction>, With<Player>>)
         return;
     };
 
-    if action_state.pressed(PlayerAction::Look) {
-        if let Some(axis_pair) = action_state.clamped_axis_pair(PlayerAction::Look) {
+    if action_state.pressed(&PlayerAction::Look) {
+        if let Some(axis_pair) = action_state.clamped_axis_pair(&PlayerAction::Look) {
             println!("Look: {axis_pair:?}");
         } else {
             println!("Look");
         }
     }
-    if action_state.just_pressed(PlayerAction::Interact) {
+    if action_state.just_pressed(&PlayerAction::Interact) {
         println!("Interact");
     }
 }
@@ -142,10 +142,10 @@ fn player_toggle_auto_system(
         return;
     };
 
-    if action_state.just_pressed(PlayerAction::ToggleAutoCast) {
+    if action_state.just_pressed(&PlayerAction::ToggleAutoCast) {
         gameplay_settings.auto_cast = !gameplay_settings.auto_cast;
     }
-    if action_state.just_pressed(PlayerAction::ToggleAutoAim) {
+    if action_state.just_pressed(&PlayerAction::ToggleAutoAim) {
         gameplay_settings.auto_aim = !gameplay_settings.auto_aim;
     }
 }
@@ -165,7 +165,7 @@ fn player_press_pause_system(
         return;
     };
 
-    if action_state.just_pressed(PlayerAction::Pause) {
+    if action_state.just_pressed(&PlayerAction::Pause) {
         // Pause the game (automatically happens when in [`Overlay::Settings`]) and open the settings menu
         next_overlay_state.set(Overlay::Settings);
     }
diff --git a/game/src/player/plugin.rs b/game/src/player/plugin.rs
index 1ac68ee..bb34507 100644
--- a/game/src/player/plugin.rs
+++ b/game/src/player/plugin.rs
@@ -1,5 +1,5 @@
 use bevy::prelude::*;
-use game_library::{state::Game, Health, Xp};
+use elementalist_game_library::{state::Game, Health, Xp};
 
 use super::{
     animation,
@@ -28,23 +28,12 @@ impl Plugin for PlayerPlugin {
                 (
                     movement::player_movement_controls,
                     movement::update_player_z_index,
-                    animation::advance_animation_timer,
                     animation::set_casting_animation,
-                    animation::update_avatar_animation,
                 )
                     .run_if(in_state(Game::Playing)),
             )
             // Remove player when leaving game
-            .add_systems(OnExit(Game::Playing), despawn_with_tag::<PlayerAvatar>)
-            // Animation stuff
-            .add_state::<animation::PlayerAnimation>()
-            .add_state::<animation::PlayerAnimationSupplemental>()
-            .add_state::<animation::PlayerFacing>()
-            .init_resource::<animation::AnimationFrame>()
-            .insert_resource(animation::PlayerAnimationTimer(Timer::from_seconds(
-                0.1,
-                TimerMode::Repeating,
-            )));
+            .add_systems(OnExit(Game::Playing), despawn_with_tag::<PlayerAvatar>);
 
         // Testing stuff
         app.add_systems(Update, subtract_health)
@@ -73,14 +62,14 @@ fn camera_movement(
 fn subtract_health(
     mut player_health: Query<&mut Health, With<PlayerAvatar>>,
     mut player_xp: Query<&mut Xp, With<PlayerAvatar>>,
-    keyboard_input: Res<Input<KeyCode>>,
+    keyboard_input: Res<ButtonInput<KeyCode>>,
 ) {
-    if keyboard_input.just_pressed(KeyCode::H) {
+    if keyboard_input.just_pressed(KeyCode::KeyH) {
         for mut health in &mut player_health {
             health.value -= 1;
         }
     }
-    if keyboard_input.just_pressed(KeyCode::X) {
+    if keyboard_input.just_pressed(KeyCode::KeyX) {
         for mut xp in &mut player_xp {
             xp.add(1);
         }
diff --git a/game/src/resources/cursor_position.rs b/game/src/resources/cursor_position.rs
index cb97a78..7180876 100644
--- a/game/src/resources/cursor_position.rs
+++ b/game/src/resources/cursor_position.rs
@@ -1,5 +1,5 @@
 use bevy::{prelude::*, window::PrimaryWindow};
-use game_library::CursorPosition;
+use elementalist_game_library::CursorPosition;
 
 use crate::camera::MainCamera;
 
diff --git a/game/src/resources/fonts.rs b/game/src/resources/fonts.rs
index 08c7647..ffca839 100644
--- a/game/src/resources/fonts.rs
+++ b/game/src/resources/fonts.rs
@@ -1,5 +1,5 @@
 use bevy::prelude::*;
-use game_library::{font_resource::FontResource, settings::AccessibilitySettings};
+use elementalist_game_library::{font_resource::FontResource, settings::AccessibilitySettings};
 
 /// Set the initial fonts.
 pub fn set_initial_fonts(
diff --git a/game/src/resources/mod.rs b/game/src/resources/mod.rs
index ce4049a..2194048 100644
--- a/game/src/resources/mod.rs
+++ b/game/src/resources/mod.rs
@@ -8,8 +8,6 @@ mod cursor_position;
 mod fonts;
 mod plugin;
 
-pub mod buttons;
 pub mod movement;
-pub mod style_prefab;
 
 pub use plugin::ElementalistResourcesPlugin;
diff --git a/game/src/resources/movement.rs b/game/src/resources/movement.rs
index 9ce36bf..81b63e9 100644
--- a/game/src/resources/movement.rs
+++ b/game/src/resources/movement.rs
@@ -1,6 +1,6 @@
 use bevy::prelude::*;
 use bevy_rapier2d::prelude::*;
-use game_library::{
+use elementalist_game_library::{
     state::{Game, Overlay},
     Acceleration,
 };
diff --git a/game/src/resources/plugin.rs b/game/src/resources/plugin.rs
index 0061262..4be03ff 100644
--- a/game/src/resources/plugin.rs
+++ b/game/src/resources/plugin.rs
@@ -1,16 +1,18 @@
 use bevy::prelude::*;
 
 use bevy_hanabi::HanabiPlugin;
-use game_library::{
+use elementalist_game_library::{
+    buttons,
     data_loader::DataLoaderPlugin,
     font_resource::{change_font, ChangeFont, FontResource},
     progress_bar::ProgressBarPlugin,
     settings::SettingsPlugin,
+    spells::SpellSelection,
     state::{AppState, Game, Save, Settings},
-    CursorPosition, Health, Mana, SpellChoices, Xp,
+    CursorPosition, Health, Mana, Xp,
 };
 
-use crate::{app_systems, resources::buttons};
+use crate::app_systems;
 
 use super::{
     cleanup::cleanup_then_exit, cursor_position::update_cursor_position, fonts::set_initial_fonts,
@@ -36,10 +38,10 @@ pub struct ElementalistResourcesPlugin;
 impl Plugin for ElementalistResourcesPlugin {
     fn build(&self, app: &mut App) {
         // The app states
-        app.add_state::<AppState>()
-            .add_state::<Game>()
-            .add_state::<Settings>()
-            .add_state::<Save>();
+        app.init_state::<AppState>()
+            .init_state::<Game>()
+            .init_state::<Settings>()
+            .init_state::<Save>();
 
         // Data loading plugin
         app.add_plugins(DataLoaderPlugin);
@@ -65,7 +67,7 @@ impl Plugin for ElementalistResourcesPlugin {
             // The cursor position resource, used to aim spells or know cursor coordinates easily
             .insert_resource(CursorPosition::default())
             // The player's spell choices
-            .insert_resource(SpellChoices::default())
+            .insert_resource(SpellSelection::default())
             // The font resource has handles to the fonts used in the game to save loading assets constantly
             // and to easily allow the user to change the font (e.g. for accessibility)
             .add_event::<ChangeFont>()
@@ -85,9 +87,9 @@ impl Plugin for ElementalistResourcesPlugin {
                 update_cursor_position,
                 // Changes the font when the user changes the font (responds to [`ChangeFont`])
                 change_font,
-                // Handles the button VISUAL interactions (e.g. hover, click, pressed, etc.) but not the logic attached
-                // to the button (e.g. what happens when you click the button)
-                buttons::interaction_system,
+                // Handles the button VISUAL interactions (e.g. hover, click, pressed, etc.)
+                // Also handles the logic
+                buttons::handle_button_events,
             ),
         )
         .add_systems(
diff --git a/game/src/resources/style_prefab.rs b/game/src/resources/style_prefab.rs
deleted file mode 100644
index 7506e86..0000000
--- a/game/src/resources/style_prefab.rs
+++ /dev/null
@@ -1,194 +0,0 @@
-use bevy::prelude::*;
-use game_library::colors;
-
-/// Shared button style for the settings menus.
-#[must_use]
-pub fn menu_button_bundle() -> ButtonBundle {
-    ButtonBundle {
-        background_color: Color::NONE.into(),
-        style: Style {
-            margin: UiRect::px(10., 10., 0., 20.),
-            justify_content: JustifyContent::Center,
-            align_items: AlignItems::Start,
-            ..default()
-        },
-        ..default()
-    }
-}
-
-/// Shared button style for the settings menus
-#[must_use]
-pub fn menu_button_text(text: impl Into<String>, font: Handle<Font>) -> TextBundle {
-    TextBundle::from_section(
-        text,
-        TextStyle {
-            font_size: 40.0,
-            color: colors::TEXT_COLOR,
-            font,
-        },
-    )
-}
-
-/// Shared node style for the settings menus.
-///
-/// This node holds the menu buttons.
-#[must_use]
-pub fn settings_menu_column_node_bundle() -> NodeBundle {
-    NodeBundle {
-        style: Style {
-            flex_direction: FlexDirection::Column,
-            align_items: AlignItems::Start,
-            width: Val::Percent(50.0),
-            margin: UiRect::px(20., 0., 40., 0.),
-            ..default()
-        },
-        ..default()
-    }
-}
-
-/// Shared node style for the settings menus.
-///
-/// This node holds everything (title and then button node and buttons)
-#[must_use]
-pub fn settings_menu_full_node_bundle() -> NodeBundle {
-    NodeBundle {
-        style: Style {
-            align_items: AlignItems::Center,
-            flex_direction: FlexDirection::Column,
-            padding: UiRect::all(Val::Px(10.0)),
-            width: Val::Percent(100.0),
-            height: Val::Percent(100.0),
-            ..default()
-        },
-        ..default()
-    }
-}
-
-/// Shared text bundle for settings menu titles.
-///
-/// This is the title of the menu.
-#[must_use]
-pub fn settings_menu_title_bundle(text: impl Into<String>, font: Handle<Font>) -> TextBundle {
-    TextBundle {
-        text: Text::from_section(
-            text,
-            TextStyle {
-                font_size: 72.0,
-                color: colors::TEXT_COLOR,
-                font,
-            },
-        ),
-        style: Style {
-            align_self: AlignSelf::Center,
-            ..default()
-        },
-        ..default()
-    }
-}
-
-/// Shared row node style for the settings menus.
-#[must_use]
-pub fn settings_menu_button_row_node_bundle() -> NodeBundle {
-    NodeBundle {
-        style: Style {
-            flex_direction: FlexDirection::Row,
-            align_items: AlignItems::Stretch,
-            ..default()
-        },
-        ..default()
-    }
-}
-
-/// Shared text bundle for settings menu "info" text. (The values of the settings)
-#[must_use]
-pub fn settings_menu_info_text_bundle(text: impl Into<String>, font: Handle<Font>) -> TextBundle {
-    TextBundle::from_section(
-        text,
-        TextStyle {
-            font_size: 40.0,
-            color: colors::TEXT_COLOR,
-            font,
-        },
-    )
-}
-
-/// Node style for the main menu column.
-#[must_use]
-pub fn main_menu_column_node_bundle() -> NodeBundle {
-    NodeBundle {
-        style: Style {
-            flex_direction: FlexDirection::Column,
-            align_items: AlignItems::Start,
-            width: Val::Percent(100.0),
-            margin: UiRect::px(20., 0., 40., 0.),
-            ..default()
-        },
-        ..default()
-    }
-}
-
-/// Parent node style for the main menu.
-#[must_use]
-pub fn main_menu_full_node_bundle() -> NodeBundle {
-    NodeBundle {
-        style: Style {
-            align_items: AlignItems::Start,
-            flex_direction: FlexDirection::Column,
-            padding: UiRect::all(Val::Px(10.0)),
-            width: Val::Percent(100.0),
-            height: Val::Percent(100.0),
-            ..default()
-        },
-        ..default()
-    }
-}
-
-/// Game title text bundle for the main menu.
-#[must_use]
-pub fn main_menu_title_bundle(text: impl Into<String>, font: Handle<Font>) -> TextBundle {
-    TextBundle {
-        text: Text::from_section(
-            text,
-            TextStyle {
-                font,
-                font_size: 112.0,
-                color: colors::TEXT_COLOR,
-            },
-        ),
-        style: Style {
-            align_self: AlignSelf::Center,
-            ..default()
-        },
-        ..default()
-    }
-}
-
-/// The stats node style for the status screen. We want the stats to be in a column down the left
-/// side of the screen.
-#[must_use]
-pub fn status_screen_stats_node_bundle() -> NodeBundle {
-    NodeBundle {
-        style: Style {
-            flex_direction: FlexDirection::Column,
-            align_items: AlignItems::Start,
-            width: Val::Percent(50.0),
-            margin: UiRect::px(20., 0., 40., 0.),
-            ..default()
-        },
-        ..default()
-    }
-}
-
-/// Status screen shows the player's stats. The text is the stat name and value, and we need ot make
-/// it small enough to fit a lot of stats on the screen.
-#[must_use]
-pub fn status_screen_text_bundle(text: impl Into<String>, font: Handle<Font>) -> TextBundle {
-    TextBundle::from_section(
-        text,
-        TextStyle {
-            font_size: 16.0,
-            color: colors::TEXT_COLOR,
-            font,
-        },
-    )
-}
diff --git a/game/src/settings_menu/accessibility.rs b/game/src/settings_menu/accessibility.rs
index b1f3483..82d2852 100644
--- a/game/src/settings_menu/accessibility.rs
+++ b/game/src/settings_menu/accessibility.rs
@@ -1,17 +1,17 @@
 //! Has systems for the display settings menu.
 
 use bevy::prelude::*;
-use game_library::{
+use elementalist_game_library::{
     font_resource::{ChangeFont, FontChoice, FontResource},
     settings::{next_font_family, AccessibilitySettings, SettingCategory, SettingChanged},
     state::Settings,
 };
 
-use crate::{despawn_with_tag, resources::style_prefab};
+use crate::{despawn_with_tag, style_prefab};
 
 use super::{
     base::SettingsMenuEntity,
-    button_actions::{ButtonAction, SettingsMenuButton},
+    button_actions::{SettingsButtons, SettingsMenuButton},
     events::{ChangeSetting, IndividualSetting},
 };
 
@@ -22,6 +22,7 @@ struct AccessibilitySettingsMenuEntity;
 fn show_accessibility_settings(
     mut commands: Commands,
     fonts: Res<FontResource>,
+    settings_buttons: Res<SettingsButtons>,
     accessibility_settings: Res<AccessibilitySettings>,
 ) {
     commands
@@ -47,7 +48,7 @@ fn show_accessibility_settings(
                             // Button for rotating font family
                             row.spawn((
                                 style_prefab::menu_button_bundle(),
-                                ButtonAction::RotateFontFamily,
+                                settings_buttons.rotate_font_family.clone(),
                                 SettingsMenuButton,
                             ))
                             .with_children(|button| {
@@ -69,7 +70,7 @@ fn show_accessibility_settings(
                     menu_buttons
                         .spawn((
                             style_prefab::menu_button_bundle(),
-                            ButtonAction::BackToMenu,
+                            settings_buttons.back_to_menu.clone(),
                             SettingsMenuButton,
                         ))
                         .with_children(|button| {
diff --git a/game/src/settings_menu/audio.rs b/game/src/settings_menu/audio.rs
index 7c5ed3c..6bc42f1 100644
--- a/game/src/settings_menu/audio.rs
+++ b/game/src/settings_menu/audio.rs
@@ -1,17 +1,17 @@
 //! Has systems for the display settings menu.
 
 use bevy::prelude::*;
-use game_library::{
+use elementalist_game_library::{
     font_resource::FontResource,
     settings::{SettingCategory, SettingChanged, VolumeSettings},
     state::Settings,
 };
 
-use crate::{despawn_with_tag, resources::style_prefab};
+use crate::{despawn_with_tag, style_prefab};
 
 use super::{
     base::SettingsMenuEntity,
-    button_actions::{ButtonAction, SettingsMenuButton},
+    button_actions::{SettingsButtons, SettingsMenuButton},
     events::{ChangeSetting, IndividualSetting},
 };
 
@@ -21,6 +21,7 @@ struct AudioSettingsMenuEntity;
 
 fn show_audio_settings(
     mut commands: Commands,
+    settings_buttons: Res<SettingsButtons>,
     fonts: Res<FontResource>,
     volume_settings: Res<VolumeSettings>,
 ) {
@@ -49,7 +50,7 @@ fn show_audio_settings(
                             // Button for main volume
                             row.spawn((
                                 style_prefab::menu_button_bundle(),
-                                ButtonAction::IncrementMainVolume,
+                                settings_buttons.increment_main_volume.clone(),
                                 SettingsMenuButton,
                             ))
                             .with_children(|button| {
@@ -74,7 +75,7 @@ fn show_audio_settings(
                             // Button for music volume
                             row.spawn((
                                 style_prefab::menu_button_bundle(),
-                                ButtonAction::IncrementMusicVolume,
+                                settings_buttons.increment_music_volume.clone(),
                                 SettingsMenuButton,
                             ))
                             .with_children(|button| {
@@ -99,7 +100,7 @@ fn show_audio_settings(
                             // Button for sound effects volume
                             row.spawn((
                                 style_prefab::menu_button_bundle(),
-                                ButtonAction::IncrementSoundEffectsVolume,
+                                settings_buttons.increment_sound_effects.clone(),
                                 SettingsMenuButton,
                             ))
                             .with_children(|button| {
@@ -121,7 +122,7 @@ fn show_audio_settings(
                     menu_buttons
                         .spawn((
                             style_prefab::menu_button_bundle(),
-                            ButtonAction::BackToMenu,
+                            settings_buttons.back_to_menu.clone(),
                             SettingsMenuButton,
                         ))
                         .with_children(|button| {
diff --git a/game/src/settings_menu/base.rs b/game/src/settings_menu/base.rs
index 3019e03..4f704cb 100644
--- a/game/src/settings_menu/base.rs
+++ b/game/src/settings_menu/base.rs
@@ -1,9 +1,9 @@
 //! Base systems for the menu.
 
 use bevy::{prelude::*, sprite::MaterialMesh2dBundle, window::PrimaryWindow};
-use game_library::colors::BACKGROUND_COLOR_50;
+use elementalist_game_library::colors::BACKGROUND_COLOR_50;
 
-use game_library::state::Settings;
+use elementalist_game_library::state::Settings;
 
 /// An entity tag for ease of cleanup when the menu is disabled.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Component)]
@@ -36,7 +36,7 @@ pub(super) fn clear_background(
     commands.spawn((
         MaterialMesh2dBundle {
             mesh: meshes
-                .add(shape::Quad::new(Vec2::new(window.width(), window.height())).into())
+                .add(Rectangle::new(window.width(), window.height()))
                 .into(),
             material: materials.add(ColorMaterial::from(BACKGROUND_COLOR_50)),
             transform: Transform::from_xyz(0., 0., 10.),
diff --git a/game/src/settings_menu/button_actions.rs b/game/src/settings_menu/button_actions.rs
index 31ae8d2..e491eae 100644
--- a/game/src/settings_menu/button_actions.rs
+++ b/game/src/settings_menu/button_actions.rs
@@ -2,116 +2,201 @@
 
 use bevy::prelude::*;
 
-use game_library::state::{AppState, Overlay, Settings};
+use elementalist_game_library::{
+    buttons::ButtonSystem,
+    state::{AppState, Overlay, Settings},
+};
 
 use super::events::{ChangeSetting, IndividualSetting};
 
-/// All of the various "buttons" that can be clicked in any of the main menu screens
-#[derive(Component, Debug, Eq, PartialEq, Hash, Clone, Copy)]
-pub(super) enum ButtonAction {
-    /// Close the menu.
-    CloseMenu,
-    /// Go back to the "main" settings menu.
-    BackToMenu,
-    /// Go to the audio menu
-    SettingsAudio,
-    /// Go to the display menu
-    SettingsDisplay,
-    /// Go to the controls menu
-    SettingsControls,
-    /// Go to the gameplay menu
-    SettingsGameplay,
-    /// Go to the accessibility menu
-    SettingsAccessibility,
-    /// Toggle Auto-Cast
-    ToggleAutoCast,
-    /// Toggle Auto-Aim
-    ToggleAutoAim,
-    /// Change the font family
-    RotateFontFamily,
-    /// Increment the main volume
-    IncrementMainVolume,
-    /// Increment the music volume
-    IncrementMusicVolume,
-    /// Increment the sound effects volume
-    IncrementSoundEffectsVolume,
-    /// Go to the Main Menu of the game
-    GoToMainGameMenu,
+/// Resource to hold all the button systems for the settings menu.
+#[derive(Resource)]
+pub(super) struct SettingsButtons {
+    /// Button to close the menu
+    pub close: ButtonSystem,
+    /// Button to go back to the main settings menu
+    pub back_to_menu: ButtonSystem,
+    /// Button to go to the audio settings
+    pub show_audio_settings: ButtonSystem,
+    /// Button to go to the display settings
+    pub show_video_settings: ButtonSystem,
+    /// Button to go to the controls settings
+    pub show_controls_settings: ButtonSystem,
+    /// Button to go to the gameplay settings
+    pub show_gameplay_settings: ButtonSystem,
+    /// Button to go to the accessibility settings
+    pub show_accessibility_settings: ButtonSystem,
+    /// Button to toggle auto-cast
+    pub toggle_auto_cast: ButtonSystem,
+    /// Button to toggle auto-aim
+    pub toggle_auto_aim: ButtonSystem,
+    /// Button to change font family
+    pub rotate_font_family: ButtonSystem,
+    /// Button to increment the main volume
+    /// increases the volume of all sounds and music played in the game.
+    pub increment_main_volume: ButtonSystem,
+    /// Button to increment music volume
+    pub increment_music_volume: ButtonSystem,
+    /// Button to increment sound effects volume
+    pub increment_sound_effects: ButtonSystem,
+    /// Button to go back to the main menu
+    pub quit_to_main_menu: ButtonSystem,
 }
 
 #[derive(Component, Debug, Clone, PartialEq, Eq, Hash)]
 pub(super) struct SettingsMenuButton;
 
-/// System to handle the main menu button actions
-///
-/// * `interaction_query`: grabs all the buttons that have been interacted with, with the components
-///    Interaction and `ButtonAction` that have a changed interaction value (i.e. the button has been
-///   pressed)
-/// * `app_exit_events`: can be used to send an `AppExit` event to exit the game
-/// * `menu_state(next)`: lets us change the menu state for the next frame
-/// * `game_state(next)`: lets us change the game state for the next frame
-#[allow(clippy::type_complexity)]
-pub fn menu_actions(
-    interaction_query: Query<
-        (&Interaction, &ButtonAction),
-        (Changed<Interaction>, With<Button>, With<SettingsMenuButton>),
-    >,
+/// System for handling "settings menu close" action
+pub(super) fn button_close_settings(
     mut menu_state: ResMut<NextState<Settings>>,
-    mut game_state: ResMut<NextState<AppState>>,
     mut overlay_state: ResMut<NextState<Overlay>>,
+) {
+    menu_state.set(Settings::Disabled);
+    overlay_state.set(Overlay::None);
+}
+
+/// System for handling "back to main settings menu" action
+pub(super) fn button_back_to_menu(mut menu_state: ResMut<NextState<Settings>>) {
+    menu_state.set(Settings::Main);
+}
+
+/// System to handle "go to audio settings" action
+pub(super) fn button_go_to_audio_settings(mut menu_state: ResMut<NextState<Settings>>) {
+    menu_state.set(Settings::Audio);
+}
+
+/// System to handle "go to display settings" action
+pub(super) fn button_go_to_display_settings(mut menu_state: ResMut<NextState<Settings>>) {
+    menu_state.set(Settings::Display);
+}
+
+/// System to handle "go to controls settings" action
+pub(super) fn button_go_to_controls_settings(mut menu_state: ResMut<NextState<Settings>>) {
+    menu_state.set(Settings::Controls);
+}
+
+/// System to handle "go to gameplay settings" action
+pub(super) fn button_go_to_gameplay_settings(mut menu_state: ResMut<NextState<Settings>>) {
+    menu_state.set(Settings::Gameplay);
+}
+
+/// System to handle "go to accessibility settings" action
+pub(super) fn button_go_to_accessibility_settings(mut menu_state: ResMut<NextState<Settings>>) {
+    menu_state.set(Settings::Accessibility);
+}
+
+/// System to handle "go to main menu" action
+pub(super) fn button_go_to_main(
+    mut menu_state: ResMut<NextState<Settings>>,
+    mut game_state: ResMut<NextState<AppState>>,
+) {
+    menu_state.set(Settings::Disabled);
+    game_state.set(AppState::MainMenu);
+}
+
+/// System to handle "toggle auto cast" action
+pub(super) fn button_toggle_auto_cast(mut ew_change_setting: EventWriter<ChangeSetting>) {
+    ew_change_setting.send(ChangeSetting {
+        setting: IndividualSetting::AutoCast,
+    });
+}
+
+/// System to handle "toggle auto aim" action
+pub(super) fn button_toggle_auto_aim(mut ew_change_setting: EventWriter<ChangeSetting>) {
+    ew_change_setting.send(ChangeSetting {
+        setting: IndividualSetting::AutoAim,
+    });
+}
+
+/// System to handle "rotate font family" action
+pub(super) fn button_rotate_font_family(mut ew_change_setting: EventWriter<ChangeSetting>) {
+    ew_change_setting.send(ChangeSetting {
+        setting: IndividualSetting::FontFamily,
+    });
+}
+
+/// System to handle "increment main volume" action
+pub(super) fn button_increment_main_volume(mut ew_change_setting: EventWriter<ChangeSetting>) {
+    ew_change_setting.send(ChangeSetting {
+        setting: IndividualSetting::MainVolume,
+    });
+}
+
+/// System to handle "increment music volume" action
+pub(super) fn button_increment_music_volume(mut ew_change_setting: EventWriter<ChangeSetting>) {
+    ew_change_setting.send(ChangeSetting {
+        setting: IndividualSetting::MusicVolume,
+    });
+}
+
+/// System to handle "increment sound effects volume" action
+pub(super) fn button_increment_sound_effects_volume(
     mut ew_change_setting: EventWriter<ChangeSetting>,
 ) {
-    // Loop through all the buttons that have been interacted with
-    for (interaction, menu_button_action) in &interaction_query {
-        // If the button has been pressed, match the button action
-        if *interaction == Interaction::Pressed {
-            // Check which button action has been pressed (i.e. what action we attached to the button)
-            match menu_button_action {
-                ButtonAction::CloseMenu => {
-                    menu_state.set(Settings::Disabled);
-                    overlay_state.set(Overlay::None);
-                }
-                ButtonAction::GoToMainGameMenu => {
-                    menu_state.set(Settings::Disabled);
-                    game_state.set(AppState::MainMenu);
-                }
-                ButtonAction::BackToMenu => menu_state.set(Settings::Main),
-                ButtonAction::SettingsAudio => menu_state.set(Settings::Audio),
-                ButtonAction::SettingsDisplay => menu_state.set(Settings::Display),
-                ButtonAction::SettingsControls => menu_state.set(Settings::Controls),
-                ButtonAction::SettingsGameplay => menu_state.set(Settings::Gameplay),
-                ButtonAction::SettingsAccessibility => menu_state.set(Settings::Accessibility),
-                ButtonAction::ToggleAutoCast => {
-                    ew_change_setting.send(ChangeSetting {
-                        setting: IndividualSetting::AutoCast,
-                    });
-                }
-                ButtonAction::ToggleAutoAim => {
-                    ew_change_setting.send(ChangeSetting {
-                        setting: IndividualSetting::AutoAim,
-                    });
-                }
-                ButtonAction::RotateFontFamily => {
-                    ew_change_setting.send(ChangeSetting {
-                        setting: IndividualSetting::FontFamily,
-                    });
-                }
-                ButtonAction::IncrementMainVolume => {
-                    ew_change_setting.send(ChangeSetting {
-                        setting: IndividualSetting::MainVolume,
-                    });
-                }
-                ButtonAction::IncrementMusicVolume => {
-                    ew_change_setting.send(ChangeSetting {
-                        setting: IndividualSetting::MusicVolume,
-                    });
-                }
-                ButtonAction::IncrementSoundEffectsVolume => {
-                    ew_change_setting.send(ChangeSetting {
-                        setting: IndividualSetting::SoundEffectsVolume,
-                    });
-                }
-            }
-        }
-    }
+    ew_change_setting.send(ChangeSetting {
+        setting: IndividualSetting::SoundEffectsVolume,
+    });
+}
+
+/// System to create the button resources for the settings menu.
+pub(super) fn initialize_settings_buttons(world: &mut World) {
+    let close = ButtonSystem {
+        pressed_event: Some(world.register_system(button_close_settings)),
+    };
+    let back_to_menu = ButtonSystem {
+        pressed_event: Some(world.register_system(button_back_to_menu)),
+    };
+    let show_audio_settings = ButtonSystem {
+        pressed_event: Some(world.register_system(button_go_to_audio_settings)),
+    };
+    let show_video_settings = ButtonSystem {
+        pressed_event: Some(world.register_system(button_go_to_display_settings)),
+    };
+    let show_controls_settings = ButtonSystem {
+        pressed_event: Some(world.register_system(button_go_to_controls_settings)),
+    };
+    let show_gameplay_settings = ButtonSystem {
+        pressed_event: Some(world.register_system(button_go_to_gameplay_settings)),
+    };
+    let show_accessibility_settings = ButtonSystem {
+        pressed_event: Some(world.register_system(button_go_to_accessibility_settings)),
+    };
+    let toggle_auto_cast = ButtonSystem {
+        pressed_event: Some(world.register_system(button_toggle_auto_cast)),
+    };
+    let toggle_auto_aim = ButtonSystem {
+        pressed_event: Some(world.register_system(button_toggle_auto_aim)),
+    };
+    let rotate_font_family = ButtonSystem {
+        pressed_event: Some(world.register_system(button_rotate_font_family)),
+    };
+    let increment_main_volume = ButtonSystem {
+        pressed_event: Some(world.register_system(button_increment_main_volume)),
+    };
+    let increment_music_volume = ButtonSystem {
+        pressed_event: Some(world.register_system(button_increment_music_volume)),
+    };
+    let increment_sound_effects = ButtonSystem {
+        pressed_event: Some(world.register_system(button_increment_sound_effects_volume)),
+    };
+    let quit_to_main_menu = ButtonSystem {
+        pressed_event: Some(world.register_system(button_go_to_main)),
+    };
+
+    world.insert_resource(SettingsButtons {
+        close,
+        back_to_menu,
+        show_audio_settings,
+        show_video_settings,
+        show_controls_settings,
+        show_gameplay_settings,
+        show_accessibility_settings,
+        toggle_auto_cast,
+        toggle_auto_aim,
+        rotate_font_family,
+        increment_main_volume,
+        increment_music_volume,
+        increment_sound_effects,
+        quit_to_main_menu,
+    });
 }
diff --git a/game/src/settings_menu/controls.rs b/game/src/settings_menu/controls.rs
index 43025c7..8ab5946 100644
--- a/game/src/settings_menu/controls.rs
+++ b/game/src/settings_menu/controls.rs
@@ -1,21 +1,25 @@
 //! Has systems for the display settings menu.
 
 use bevy::prelude::*;
-use game_library::font_resource::FontResource;
-use game_library::state::Settings;
+use elementalist_game_library::font_resource::FontResource;
+use elementalist_game_library::state::Settings;
 
-use crate::{despawn_with_tag, resources::style_prefab};
+use crate::{despawn_with_tag, style_prefab};
 
 use super::{
     base::SettingsMenuEntity,
-    button_actions::{ButtonAction, SettingsMenuButton},
+    button_actions::{SettingsButtons, SettingsMenuButton},
 };
 
 /// Component for tagging entities that are part of the display settings menu.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Component)]
 struct ControlsSettingsMenuEntity;
 
-fn show_controls_settings(mut commands: Commands, fonts: Res<FontResource>) {
+fn show_controls_settings(
+    mut commands: Commands,
+    settings_buttons: Res<SettingsButtons>,
+    fonts: Res<FontResource>,
+) {
     commands
         .spawn((
             style_prefab::settings_menu_full_node_bundle(),
@@ -36,7 +40,7 @@ fn show_controls_settings(mut commands: Commands, fonts: Res<FontResource>) {
                     menu_buttons
                         .spawn((
                             style_prefab::menu_button_bundle(),
-                            ButtonAction::BackToMenu,
+                            settings_buttons.back_to_menu.clone(),
                             SettingsMenuButton,
                         ))
                         .with_children(|button| {
diff --git a/game/src/settings_menu/display.rs b/game/src/settings_menu/display.rs
index 662a23f..a048263 100644
--- a/game/src/settings_menu/display.rs
+++ b/game/src/settings_menu/display.rs
@@ -1,13 +1,15 @@
 //! Has systems for the display settings menu.
 
 use bevy::prelude::*;
-use game_library::{font_resource::FontResource, settings::VideoSettings, state::Settings};
+use elementalist_game_library::{
+    font_resource::FontResource, settings::VideoSettings, state::Settings,
+};
 
-use crate::{despawn_with_tag, resources::style_prefab};
+use crate::{despawn_with_tag, style_prefab};
 
 use super::{
     base::SettingsMenuEntity,
-    button_actions::{ButtonAction, SettingsMenuButton},
+    button_actions::{SettingsButtons, SettingsMenuButton},
 };
 
 /// Component for tagging entities that are part of the display settings menu.
@@ -16,6 +18,7 @@ struct DisplaySettingsMenuEntity;
 
 fn show_display_settings(
     mut commands: Commands,
+    settings_buttons: Res<SettingsButtons>,
     fonts: Res<FontResource>,
     video_settings: Res<VideoSettings>,
 ) {
@@ -75,7 +78,7 @@ fn show_display_settings(
                     menu_buttons
                         .spawn((
                             style_prefab::menu_button_bundle(),
-                            ButtonAction::BackToMenu,
+                            settings_buttons.back_to_menu.clone(),
                             SettingsMenuButton,
                         ))
                         .with_children(|button| {
diff --git a/game/src/settings_menu/gameplay.rs b/game/src/settings_menu/gameplay.rs
index 7b7297e..81e86e0 100644
--- a/game/src/settings_menu/gameplay.rs
+++ b/game/src/settings_menu/gameplay.rs
@@ -1,17 +1,17 @@
 //! Has systems for the display settings menu.
 
 use bevy::prelude::*;
-use game_library::{
+use elementalist_game_library::{
     font_resource::FontResource,
     settings::{GameplaySettings, SettingCategory, SettingChanged},
     state::Settings,
 };
 
-use crate::{despawn_with_tag, resources::style_prefab};
+use crate::{despawn_with_tag, style_prefab};
 
 use super::{
     base::SettingsMenuEntity,
-    button_actions::{ButtonAction, SettingsMenuButton},
+    button_actions::{SettingsButtons, SettingsMenuButton},
     events::{ChangeSetting, IndividualSetting},
 };
 
@@ -22,6 +22,7 @@ struct GameplaySettingsMenuEntity;
 fn show_gameplay_settings(
     mut commands: Commands,
     fonts: Res<FontResource>,
+    settings_buttons: Res<SettingsButtons>,
     gameplay_settings: Res<GameplaySettings>,
 ) {
     commands
@@ -47,7 +48,7 @@ fn show_gameplay_settings(
                             // Button for auto-aim
                             row.spawn((
                                 style_prefab::menu_button_bundle(),
-                                ButtonAction::ToggleAutoAim,
+                                settings_buttons.toggle_auto_aim.clone(),
                                 SettingsMenuButton,
                             ))
                             .with_children(|button| {
@@ -72,7 +73,7 @@ fn show_gameplay_settings(
                             // Button for auto-cast
                             row.spawn((
                                 style_prefab::menu_button_bundle(),
-                                ButtonAction::ToggleAutoCast,
+                                settings_buttons.toggle_auto_cast.clone(),
                                 SettingsMenuButton,
                             ))
                             .with_children(|button| {
@@ -94,7 +95,7 @@ fn show_gameplay_settings(
                     menu_buttons
                         .spawn((
                             style_prefab::menu_button_bundle(),
-                            ButtonAction::BackToMenu,
+                            settings_buttons.back_to_menu.clone(),
                             SettingsMenuButton,
                         ))
                         .with_children(|button| {
diff --git a/game/src/settings_menu/main.rs b/game/src/settings_menu/main.rs
index a3ff7df..54950c2 100644
--- a/game/src/settings_menu/main.rs
+++ b/game/src/settings_menu/main.rs
@@ -1,13 +1,13 @@
 //! Main menu systems.
 use bevy::prelude::*;
-use game_library::font_resource::FontResource;
-use game_library::state::AppState;
+use elementalist_game_library::font_resource::FontResource;
+use elementalist_game_library::state::AppState;
 
-use crate::resources::style_prefab;
+use crate::style_prefab;
 
 use super::{
     base::SettingsMenuEntity,
-    button_actions::{ButtonAction, SettingsMenuButton},
+    button_actions::{SettingsButtons, SettingsMenuButton},
 };
 
 /// Tags for the (main) menu buttons/text/etc.
@@ -18,6 +18,7 @@ pub struct BaseSettingsMenuEntity;
 #[allow(clippy::too_many_lines)]
 pub fn show_main_menu(
     mut commands: Commands,
+    settings_buttons: Res<SettingsButtons>,
     fonts: Res<FontResource>,
     current_state: Res<State<AppState>>,
 ) {
@@ -41,7 +42,7 @@ pub fn show_main_menu(
                     menu_buttons
                         .spawn((
                             style_prefab::menu_button_bundle(),
-                            ButtonAction::SettingsAudio,
+                            settings_buttons.show_audio_settings.clone(),
                             SettingsMenuButton,
                         ))
                         .with_children(|button| {
@@ -54,7 +55,7 @@ pub fn show_main_menu(
                     menu_buttons
                         .spawn((
                             style_prefab::menu_button_bundle(),
-                            ButtonAction::SettingsDisplay,
+                            settings_buttons.show_video_settings.clone(),
                             SettingsMenuButton,
                         ))
                         .with_children(|button| {
@@ -67,7 +68,7 @@ pub fn show_main_menu(
                     menu_buttons
                         .spawn((
                             style_prefab::menu_button_bundle(),
-                            ButtonAction::SettingsControls,
+                            settings_buttons.show_controls_settings.clone(),
                             SettingsMenuButton,
                         ))
                         .with_children(|button| {
@@ -80,7 +81,7 @@ pub fn show_main_menu(
                     menu_buttons
                         .spawn((
                             style_prefab::menu_button_bundle(),
-                            ButtonAction::SettingsGameplay,
+                            settings_buttons.show_gameplay_settings.clone(),
                             SettingsMenuButton,
                         ))
                         .with_children(|button| {
@@ -93,7 +94,7 @@ pub fn show_main_menu(
                     menu_buttons
                         .spawn((
                             style_prefab::menu_button_bundle(),
-                            ButtonAction::SettingsAccessibility,
+                            settings_buttons.show_accessibility_settings.clone(),
                             SettingsMenuButton,
                         ))
                         .with_children(|button| {
@@ -106,7 +107,7 @@ pub fn show_main_menu(
                     menu_buttons
                         .spawn((
                             style_prefab::menu_button_bundle(),
-                            ButtonAction::CloseMenu,
+                            settings_buttons.close.clone(),
                             SettingsMenuButton,
                         ))
                         .with_children(|button| {
@@ -120,7 +121,7 @@ pub fn show_main_menu(
                         menu_buttons
                             .spawn((
                                 style_prefab::menu_button_bundle(),
-                                ButtonAction::GoToMainGameMenu,
+                                settings_buttons.quit_to_main_menu.clone(),
                                 SettingsMenuButton,
                             ))
                             .with_children(|button| {
diff --git a/game/src/settings_menu/mod.rs b/game/src/settings_menu/mod.rs
index c347cbe..f206729 100644
--- a/game/src/settings_menu/mod.rs
+++ b/game/src/settings_menu/mod.rs
@@ -4,7 +4,7 @@
 //! in the middle of the screen, and the background to be blurred out; that way it can be used in
 //! any context and still be readable.
 //!
-//! See [`game_library::settings`] for the settings resources and other things.
+//! See [`elementalist_game_library::settings`] for the settings resources and other things.
 //!
 //! This module will have to handle drawing things to the screen and sending the appropriate
 //! events on setting changes.
diff --git a/game/src/settings_menu/plugin.rs b/game/src/settings_menu/plugin.rs
index 2806ef1..b97f39a 100644
--- a/game/src/settings_menu/plugin.rs
+++ b/game/src/settings_menu/plugin.rs
@@ -4,13 +4,13 @@
 use bevy::prelude::*;
 
 use crate::despawn_with_tag;
-use game_library::state::{Overlay, Settings};
+use elementalist_game_library::state::{Overlay, Settings};
 
 use super::{
     accessibility::AccessibilitySettingsMenuPlugin,
     audio::AudioSettingsMenuPlugin,
     base::{clear_background, transition_to_base_menu, SettingsMenuBackground, SettingsMenuEntity},
-    button_actions::menu_actions,
+    button_actions::initialize_settings_buttons,
     controls::ControlsSettingsMenuPlugin,
     display::DisplaySettingsMenuPlugin,
     events::ChangeSetting,
@@ -23,8 +23,9 @@ pub struct SettingsMenuPlugin;
 
 impl Plugin for SettingsMenuPlugin {
     fn build(&self, app: &mut App) {
-        app.add_state::<Settings>();
+        app.init_state::<Settings>();
         app.add_event::<ChangeSetting>();
+        app.add_systems(Startup, initialize_settings_buttons);
         // Add system to setup the menu
         app.add_systems(
             OnEnter(Settings::Main),
@@ -50,8 +51,6 @@ impl Plugin for SettingsMenuPlugin {
             DisplaySettingsMenuPlugin,
             GameplaySettingsMenuPlugin,
         ));
-        // Add system to update the buttons on hover, and respond to button presses
-        app.add_systems(Update, menu_actions.run_if(in_state(Overlay::Settings)));
         // Add system to transition to the next state when the settings menu is entered
         app.add_systems(OnEnter(Overlay::Settings), transition_to_base_menu);
         // Add system to transition to the next state when the settings menu is exited
diff --git a/game/src/spells/cast_spell.rs b/game/src/spells/cast_spell.rs
index bf58ec0..ab74df5 100644
--- a/game/src/spells/cast_spell.rs
+++ b/game/src/spells/cast_spell.rs
@@ -2,9 +2,13 @@
 use bevy::prelude::*;
 use bevy_hanabi::{ParticleEffect, ParticleEffectBundle};
 use bevy_rapier2d::prelude::*;
-use game_library::{
-    data_loader::storage::GameData, enums::ParticleAttachment, events::CastSpell, math,
-    Acceleration, CursorPosition, InternalId, Layer, MovementBundle, SpellBundle, SpellLifetime,
+use elementalist_game_library::{
+    data_loader::storage::GameData,
+    enums::ParticleAttachment,
+    events::CastSpell,
+    math,
+    spells::{SpellBundle, SpellLifetime},
+    Acceleration, CursorPosition, InternalId, Layer, MovementBundle,
 };
 
 use crate::player::Player;
@@ -13,7 +17,6 @@ use super::components::SpellEntity;
 
 const SPELL_SPRITE_SCALE: f32 = 0.5;
 const SPELL_SPEED_MULTIPLIER: f32 = 100.0;
-const SPELL_ACCELERATION: f32 = 5.0;
 
 pub(super) fn cast_spells(
     mut commands: Commands,
@@ -33,10 +36,10 @@ pub(super) fn cast_spells(
             continue;
         };
 
-        let Some(texture_atlas) = game_data.tile_atlas.get(&spell.sprite_tileset) else {
+        let Some(texture_atlas) = game_data.tile_atlas.get(spell.sprite_tileset()) else {
             tracing::error!(
                 "cast_spells: No texture atlas found for {} (spell:{})",
-                spell.sprite_tileset,
+                spell.sprite_tileset(),
                 spell.get_internal_id()
             );
             continue;
@@ -52,17 +55,20 @@ pub(super) fn cast_spells(
         let spell_projectile = commands
             .spawn((
                 SpellBundle {
-                    lifetime: SpellLifetime::new(spell.duration),
+                    lifetime: SpellLifetime::new(spell.duration()),
                     movement: MovementBundle {
                         velocity: Velocity {
-                            linvel: slope_vec * (spell.speed * SPELL_SPEED_MULTIPLIER),
+                            linvel: slope_vec * (spell.speed() * SPELL_SPEED_MULTIPLIER),
                             ..default()
                         },
-                        acceleration: Acceleration::new(slope_vec * SPELL_ACCELERATION),
+                        acceleration: Acceleration::new(slope_vec * spell.acceleration()),
                     },
                     sprite: SpriteSheetBundle {
-                        texture_atlas: texture_atlas.clone(),
-                        sprite: spell.texture_atlas_index(),
+                        atlas: TextureAtlas {
+                            layout: texture_atlas.atlas_handle.clone(),
+                            index: spell.sprite_tileset_index(),
+                        },
+                        texture: texture_atlas.texture_handle.clone(),
                         transform: Transform {
                             translation: player_transform.translation - Vec3::new(0.0, 0.0, 0.1),
                             rotation: Quat::from_rotation_z(slope_vec.y.atan2(slope_vec.x)),
@@ -80,7 +86,7 @@ pub(super) fn cast_spells(
 
         // check for any particles that go on the projectile
         let projectile_particles = spell
-            .particles
+            .particles()
             .iter()
             .filter_map(|particle_link| {
                 if particle_link.attachment == ParticleAttachment::Projectile {
diff --git a/game/src/spells/components.rs b/game/src/spells/components.rs
index 11e773f..51f4de7 100644
--- a/game/src/spells/components.rs
+++ b/game/src/spells/components.rs
@@ -1,5 +1,5 @@
 use bevy::prelude::*;
-use game_library::SpellLifetime;
+use elementalist_game_library::spells::SpellLifetime;
 
 /// Despawns spells when their lifetime expires, and updates their lifetime
 pub fn despawn_expired_spells(
diff --git a/game/src/spells/plugin.rs b/game/src/spells/plugin.rs
index 0964245..2de884e 100644
--- a/game/src/spells/plugin.rs
+++ b/game/src/spells/plugin.rs
@@ -1,7 +1,7 @@
 use crate::despawn_with_tag;
 use bevy::prelude::*;
-use game_library::state::AppState;
-use game_library::{events::CastSpell, state::Overlay};
+use elementalist_game_library::state::AppState;
+use elementalist_game_library::{events::CastSpell, state::Overlay};
 
 use super::{
     cast_spell::cast_spells,
diff --git a/game/src/splash_screen/plugin.rs b/game/src/splash_screen/plugin.rs
index ecfd932..d0077d3 100644
--- a/game/src/splash_screen/plugin.rs
+++ b/game/src/splash_screen/plugin.rs
@@ -2,7 +2,7 @@ use bevy::prelude::*;
 
 use super::{components::OnSplashScreen, scene::splash_setup, systems::countdown};
 use crate::despawn_with_tag;
-use game_library::state::AppState;
+use elementalist_game_library::state::AppState;
 
 // This plugin will display a splash screen with Bevy logo for 1 second before switching to the menu
 pub struct SplashScreenPlugin;
diff --git a/game/src/splash_screen/systems.rs b/game/src/splash_screen/systems.rs
index edcc414..619a400 100644
--- a/game/src/splash_screen/systems.rs
+++ b/game/src/splash_screen/systems.rs
@@ -1,7 +1,7 @@
 use bevy::prelude::*;
 
 use super::resources::SplashTimer;
-use game_library::state::AppState;
+use elementalist_game_library::state::AppState;
 
 // Tick the timer, and change state when finished
 pub fn countdown(
diff --git a/game/src/style_prefab/inventory.rs b/game/src/style_prefab/inventory.rs
new file mode 100644
index 0000000..df31e31
--- /dev/null
+++ b/game/src/style_prefab/inventory.rs
@@ -0,0 +1,4 @@
+//! Player inventory, includes
+//! - Current spell choice
+//! - Status
+//! - Absorbed elemental essences (inventory)
diff --git a/game/src/style_prefab/main_menu.rs b/game/src/style_prefab/main_menu.rs
new file mode 100644
index 0000000..9aee057
--- /dev/null
+++ b/game/src/style_prefab/main_menu.rs
@@ -0,0 +1,81 @@
+use bevy::prelude::*;
+use elementalist_game_library::colors;
+
+/// Shared button style for the settings menus.
+#[must_use]
+pub fn menu_button_bundle() -> ButtonBundle {
+    ButtonBundle {
+        background_color: Color::NONE.into(),
+        style: Style {
+            margin: UiRect::px(10., 10., 0., 20.),
+            justify_content: JustifyContent::Center,
+            align_items: AlignItems::Start,
+            ..default()
+        },
+        ..default()
+    }
+}
+
+/// Shared button style for the settings menus
+#[must_use]
+pub fn menu_button_text(text: impl Into<String>, font: Handle<Font>) -> TextBundle {
+    TextBundle::from_section(
+        text,
+        TextStyle {
+            font_size: 40.0,
+            color: colors::TEXT_COLOR,
+            font,
+        },
+    )
+}
+
+/// Node style for the main menu column.
+#[must_use]
+pub fn main_menu_column_node_bundle() -> NodeBundle {
+    NodeBundle {
+        style: Style {
+            flex_direction: FlexDirection::Column,
+            align_items: AlignItems::Start,
+            width: Val::Percent(100.0),
+            margin: UiRect::px(20., 0., 40., 0.),
+            ..default()
+        },
+        ..default()
+    }
+}
+
+/// Parent node style for the main menu.
+#[must_use]
+pub fn main_menu_full_node_bundle() -> NodeBundle {
+    NodeBundle {
+        style: Style {
+            align_items: AlignItems::Start,
+            flex_direction: FlexDirection::Column,
+            padding: UiRect::all(Val::Px(10.0)),
+            width: Val::Percent(100.0),
+            height: Val::Percent(100.0),
+            ..default()
+        },
+        ..default()
+    }
+}
+
+/// Game title text bundle for the main menu.
+#[must_use]
+pub fn main_menu_title_bundle(text: impl Into<String>, font: Handle<Font>) -> TextBundle {
+    TextBundle {
+        text: Text::from_section(
+            text,
+            TextStyle {
+                font,
+                font_size: 112.0,
+                color: colors::TEXT_COLOR,
+            },
+        ),
+        style: Style {
+            align_self: AlignSelf::Center,
+            ..default()
+        },
+        ..default()
+    }
+}
diff --git a/game/src/style_prefab/mod.rs b/game/src/style_prefab/mod.rs
new file mode 100644
index 0000000..d5cff0b
--- /dev/null
+++ b/game/src/style_prefab/mod.rs
@@ -0,0 +1,10 @@
+//! Helper functions for assembling consistent style for UI elements.
+mod inventory;
+mod main_menu;
+mod settings_menu;
+mod status_screen;
+mod talismans;
+
+pub use main_menu::*;
+pub use settings_menu::*;
+pub use status_screen::*;
diff --git a/game/src/style_prefab/settings_menu.rs b/game/src/style_prefab/settings_menu.rs
new file mode 100644
index 0000000..a23d76f
--- /dev/null
+++ b/game/src/style_prefab/settings_menu.rs
@@ -0,0 +1,85 @@
+use bevy::prelude::*;
+use elementalist_game_library::colors;
+
+/// Shared node style for the settings menus.
+///
+/// This node holds the menu buttons.
+#[must_use]
+pub fn settings_menu_column_node_bundle() -> NodeBundle {
+    NodeBundle {
+        style: Style {
+            flex_direction: FlexDirection::Column,
+            align_items: AlignItems::Start,
+            width: Val::Percent(50.0),
+            margin: UiRect::px(20., 0., 40., 0.),
+            ..default()
+        },
+        ..default()
+    }
+}
+
+/// Shared node style for the settings menus.
+///
+/// This node holds everything (title and then button node and buttons)
+#[must_use]
+pub fn settings_menu_full_node_bundle() -> NodeBundle {
+    NodeBundle {
+        style: Style {
+            align_items: AlignItems::Center,
+            flex_direction: FlexDirection::Column,
+            padding: UiRect::all(Val::Px(10.0)),
+            width: Val::Percent(100.0),
+            height: Val::Percent(100.0),
+            ..default()
+        },
+        ..default()
+    }
+}
+
+/// Shared text bundle for settings menu titles.
+///
+/// This is the title of the menu.
+#[must_use]
+pub fn settings_menu_title_bundle(text: impl Into<String>, font: Handle<Font>) -> TextBundle {
+    TextBundle {
+        text: Text::from_section(
+            text,
+            TextStyle {
+                font_size: 72.0,
+                color: colors::TEXT_COLOR,
+                font,
+            },
+        ),
+        style: Style {
+            align_self: AlignSelf::Center,
+            ..default()
+        },
+        ..default()
+    }
+}
+
+/// Shared row node style for the settings menus.
+#[must_use]
+pub fn settings_menu_button_row_node_bundle() -> NodeBundle {
+    NodeBundle {
+        style: Style {
+            flex_direction: FlexDirection::Row,
+            align_items: AlignItems::Stretch,
+            ..default()
+        },
+        ..default()
+    }
+}
+
+/// Shared text bundle for settings menu "info" text. (The values of the settings)
+#[must_use]
+pub fn settings_menu_info_text_bundle(text: impl Into<String>, font: Handle<Font>) -> TextBundle {
+    TextBundle::from_section(
+        text,
+        TextStyle {
+            font_size: 40.0,
+            color: colors::TEXT_COLOR,
+            font,
+        },
+    )
+}
diff --git a/game/src/style_prefab/status_screen.rs b/game/src/style_prefab/status_screen.rs
new file mode 100644
index 0000000..586e7e2
--- /dev/null
+++ b/game/src/style_prefab/status_screen.rs
@@ -0,0 +1,32 @@
+use bevy::prelude::*;
+use elementalist_game_library::colors;
+
+/// The stats node style for the status screen. We want the stats to be in a column down the left
+/// side of the screen.
+#[must_use]
+pub fn status_screen_stats_node_bundle() -> NodeBundle {
+    NodeBundle {
+        style: Style {
+            flex_direction: FlexDirection::Column,
+            align_items: AlignItems::Start,
+            width: Val::Percent(50.0),
+            margin: UiRect::px(20., 0., 40., 0.),
+            ..default()
+        },
+        ..default()
+    }
+}
+
+/// Status screen shows the player's stats. The text is the stat name and value, and we need to make
+/// it small enough to fit a lot of stats on the screen.
+#[must_use]
+pub fn status_screen_text_bundle(text: impl Into<String>, font: Handle<Font>) -> TextBundle {
+    TextBundle::from_section(
+        text,
+        TextStyle {
+            font_size: 16.0,
+            color: colors::TEXT_COLOR,
+            font,
+        },
+    )
+}
diff --git a/game/src/style_prefab/talismans.rs b/game/src/style_prefab/talismans.rs
new file mode 100644
index 0000000..ae557db
--- /dev/null
+++ b/game/src/style_prefab/talismans.rs
@@ -0,0 +1 @@
+//! Displays spell talismans
diff --git a/game_assets/talisman_engraving.aseprite b/game_assets/talisman_engraving.aseprite
new file mode 100644
index 0000000..f9c7d2f
Binary files /dev/null and b/game_assets/talisman_engraving.aseprite differ
diff --git a/game_assets/talismans.aseprite b/game_assets/talismans.aseprite
new file mode 100644
index 0000000..56ccac7
Binary files /dev/null and b/game_assets/talismans.aseprite differ
diff --git a/game_data/_schemas/animation_state.json b/game_data/_schemas/animation_state.json
new file mode 100644
index 0000000..7e2b0d0
--- /dev/null
+++ b/game_data/_schemas/animation_state.json
@@ -0,0 +1,65 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://schemas.nwest.one/games/elementalist/animation_state.json",
+  "title": "Elementalist Sprite Animation State",
+  "description": "An available state of an animation for an elementalist sprite",
+  "type": "string",
+  "oneOf": [
+    {
+      "const": "Idle",
+      "description": "The idle animation"
+    },
+    {
+      "const": "Walk",
+      "description": "The walking animation"
+    },
+    {
+      "const": "Run",
+      "description": "The running animation"
+    },
+    {
+      "const": "Jump",
+      "description": "The jumping animation"
+    },
+    {
+      "const": "Cast",
+      "description": "The casting animation"
+    },
+    {
+      "const": "Attack",
+      "description": "The attacking animation"
+    },
+    {
+      "const": "WalkCast",
+      "description": "The casting animation that occurs while walking"
+    },
+    {
+      "const": "WalkAttack",
+      "description": "The attacking animation that occurs while walking"
+    },
+    {
+      "const": "RunCast",
+      "description": "The casting animation that occurs while running"
+    },
+    {
+      "const": "RunAttack",
+      "description": "The attacking animation that occurs while running"
+    },
+    {
+      "const": "Death",
+      "description": "The death animation"
+    },
+    {
+      "const": "Hurt",
+      "description": "The hurt animation"
+    },
+    {
+      "const": "Stun",
+      "description": "The stunned animation"
+    },
+    {
+      "const": "Dead",
+      "description": "The dead animation (for when the character is dead)"
+    }
+  ]
+}
diff --git a/game_data/_schemas/biome.json b/game_data/_schemas/biome.json
index 702d4bc..8035bd5 100644
--- a/game_data/_schemas/biome.json
+++ b/game_data/_schemas/biome.json
@@ -4,46 +4,166 @@
 	"title": "Elementalist Biome",
 	"description": "The available biomes for the Elementalist game.",
 	"type": "string",
-	"enum": [
-		"Rainforest",
-		"SeasonalDeciduousRainforest",
-		"SeasonalSemidecidousRainforest",
-		"GiantRainforest",
-		"DeciduousForest",
-		"ConiferousForest",
-		"Taiga",
-		"Woodland",
-		"Shrubland",
-		"Savanna",
-		"Grassland",
-		"Tundra",
-		"Desert",
-		"Scrub",
-		"Bog",
-		"FreshwaterSwamp",
-		"SaltwaterSwamp",
-		"Saltmarsh",
-		"Wetland",
-		"LargeLake",
-		"RiverDelta",
-		"CoastalRiver",
-		"InlandRiver",
-		"Floodplain",
-		"UplandRiver",
-		"EndorheicBasin",
-		"OceanicIsland",
-		"Sea",
-		"DeepSea",
-		"SeaShelf",
-		"CoralReef",
-		"KelpForest",
-		"Glacier",
-		"IceSheet",
-		"Barren",
-		"Indoor",
-		"Urban",
-		"Cultivated",
-		"Forested",
-		"Rangeland"
+	"oneOf": [
+		{
+			"const": "Rainforest",
+			"description": "A dense, warm, wet forest, typically found in tropical areas."
+		},
+		{
+			"const": "SeasonalDeciduousRainforest",
+			"description": "A warm, wet forest that loses its leaves in the dry season."
+		},
+		{
+			"const": "SeasonalSemidecidousRainforest",
+			"description": "A warm, wet forest that loses some of its leaves in the dry season."
+		},
+		{
+			"const": "GiantRainforest",
+			"description": "A dense, warm, wet forest with very large trees."
+		},
+		{
+			"const": "DeciduousForest",
+			"description": "A forest that loses its leaves in the winter."
+		},
+		{
+			"const": "ConiferousForest",
+			"description": "A forest of coniferous trees."
+		},
+		{
+			"const": "Taiga",
+			"description": "A cold forest of coniferous trees."
+		},
+		{
+			"const": "Woodland",
+			"description": "An area of land covered with trees."
+		},
+		{
+			"const": "Shrubland",
+			"description": "An area of land covered with shrubs."
+		},
+		{
+			"const": "Savanna",
+			"description": "A grassy plain in tropical and subtropical regions, with few trees."
+		},
+		{
+			"const": "Grassland",
+			"description": "A large open area of country covered with grass, especially one used for grazing."
+		},
+		{
+			"const": "Tundra",
+			"description": "A vast, flat, treeless Arctic region of Europe, Asia, and North America in which the subsoil is permanently frozen."
+		},
+		{
+			"const": "Desert",
+			"description": "A dry, barren area of land, especially one covered with sand, that is characteristically desolate, waterless, and without vegetation."
+		},
+		{
+			"const": "Scrub",
+			"description": "An area covered with low-growing or stunted trees."
+		},
+		{
+			"const": "Bog",
+			"description": "An area of wet, spongy ground with soil composed mainly of decayed vegetable matter."
+		},
+		{
+			"const": "FreshwaterSwamp",
+			"description": "A swamp with fresh water."
+		},
+		{
+			"const": "SaltwaterSwamp",
+			"description": "A swamp with salt water."
+		},
+		{
+			"const": "Saltmarsh",
+			"description": "An area of coastal grassland that is regularly flooded by seawater."
+		},
+		{
+			"const": "Wetland",
+			"description": "An area of land that is covered with a shallow layer of water during some or all of the year."
+		},
+		{
+			"const": "LargeLake",
+			"description": "A large body of water surrounded by land."
+		},
+		{
+			"const": "RiverDelta",
+			"description": "A landform that forms from deposition of sediment carried by a river as the flow leaves its mouth and enters slower-moving or standing water."
+		},
+		{
+			"const": "CoastalRiver",
+			"description": "A river that flows into the sea."
+		},
+		{
+			"const": "InlandRiver",
+			"description": "A river that flows into a lake or another river."
+		},
+		{
+			"const": "Floodplain",
+			"description": "An area of low-lying ground adjacent to a river, formed mainly of river sediments and subject to flooding."
+		},
+		{
+			"const": "UplandRiver",
+			"description": "A river that flows through hilly or mountainous country."
+		},
+		{
+			"const": "EndorheicBasin",
+			"description": "A closed drainage basin that retains water and allows no outflow to other bodies of water such as rivers or oceans."
+		},
+		{
+			"const": "OceanicIsland",
+			"description": "An island that is not part of a continent."
+		},
+		{
+			"const": "Sea",
+			"description": "The expanse of salt water that covers most of the earth's surface and surrounds its landmasses."
+		},
+		{
+			"const": "DeepSea",
+			"description": "The deepest part of the ocean."
+		},
+		{
+			"const": "SeaShelf",
+			"description": "The relatively shallow (200m) area of the sea floor surrounding the continents."
+		},
+		{
+			"const": "CoralReef",
+			"description": "A ridge of rock in the sea formed by the growth and deposit of coral."
+		},
+		{
+			"const": "KelpForest",
+			"description": "A large underwater area with a high density of kelp."
+		},
+		{
+			"const": "Glacier",
+			"description": "A slowly moving mass or river of ice formed by the accumulation and compaction of snow on mountains or near the poles."
+		},
+		{
+			"const": "IceSheet",
+			"description": "A mass of glacial ice, more than 50,000 square kilometers (19,000 square miles)."
+		},
+		{
+			"const": "Barren",
+			"description": "Too poor to produce much or any vegetation."
+		},
+		{
+			"const": "Indoor",
+			"description": "Inside a building."
+		},
+		{
+			"const": "Urban",
+			"description": "In, relating to, or characteristic of a city or town."
+		},
+		{
+			"const": "Cultivated",
+			"description": "Prepared and used for raising crops."
+		},
+		{
+			"const": "Forested",
+			"description": "Covered with trees or forests."
+		},
+		{
+			"const": "Rangeland",
+			"description": "Land used for grazing and browsing animals."
+		}
 	]
 }
diff --git a/game_data/_schemas/biome_altitude.json b/game_data/_schemas/biome_altitude.json
index 0ffb098..2119d91 100644
--- a/game_data/_schemas/biome_altitude.json
+++ b/game_data/_schemas/biome_altitude.json
@@ -4,12 +4,30 @@
   "title": "Elementalist Biome Altitude",
   "description": "The available altitudes for biomes in the Elementalist game.",
   "type": "string",
-  "enum": [
-    "Alvar",
-    "Alpine",
-    "Subalpine",
-    "Montane",
-    "LowerMontane",
-    "Premontane"
+  "oneOf": [
+    {
+      "const": "Alvar",
+      "description": "An alvar altitude is characterized by average temperatures less than 1.5 degrees Celsius"
+    },
+    {
+      "const": "Alpine",
+      "description": "An alpine altitude is characterized by average temperatures within 1.5 to 3 degrees Celsius"
+    },
+    {
+      "const": "Subalpine",
+      "description": "A subalpine altitude is characterized by average temperatures within 3 to 6 degrees Celsius"
+    },
+    {
+      "const": "Montane",
+      "description": "A montane altitude is characterized by average temperatures within 6 to 12 degrees Celsius"
+    },
+    {
+      "const": "LowerMontane",
+      "description": "A lower montane altitude is characterized by average temperatures within 12 to 24 degrees Celsius"
+    },
+    {
+      "const": "Premontane",
+      "description": "A premontane altitude is characterized by average temperatures higher than 24 degrees Celsius"
+    }
   ]
 }
diff --git a/game_data/_schemas/biome_data.json b/game_data/_schemas/biome_data.json
index 68f0f97..fcb3be6 100644
--- a/game_data/_schemas/biome_data.json
+++ b/game_data/_schemas/biome_data.json
@@ -34,7 +34,13 @@
       "items": {
         "$ref": "https://schemas.nwest.one/games/elementalist/biome_simple_object.json"
       }
-    },
-    "required": ["biome", "humidity", "altitude", "latitude", "groundTilesets"]
-  }
+    }
+  },
+  "required": [
+    "biome",
+    "humidity",
+    "altitude",
+    "latitude",
+    "groundTilesets"
+  ]
 }
diff --git a/game_data/_schemas/biome_humidity.json b/game_data/_schemas/biome_humidity.json
index b42ff24..ef3471c 100644
--- a/game_data/_schemas/biome_humidity.json
+++ b/game_data/_schemas/biome_humidity.json
@@ -4,14 +4,38 @@
   "title": "Elementalist Biome Humidity",
   "description": "The available humidities for biomes in the Elementalist game.",
   "type": "string",
-  "enum": [
-    "Superarid",
-    "Perarid",
-    "Arid",
-    "Semiarid",
-    "Subhumid",
-    "Humid",
-    "Perhumid",
-    "Superhumid"
+  "oneOf": [
+    {
+      "const": "Superaird",
+      "description": "Superarid - less than 100mm of precipitation per year."
+    },
+    {
+      "const": "Perarid",
+      "description": "Perarid - 100-200mm of precipitation per year."
+    },
+    {
+      "const": "Arid",
+      "description": "Arid - 200-400mm of precipitation per year."
+    },
+    {
+      "const": "Semiarid",
+      "description": "Semiarid - 400-800mm of precipitation per year."
+    },
+    {
+      "const": "Subhumid",
+      "description": "Subhumid - 800-1600mm of precipitation per year."
+    },
+    {
+      "const": "Humid",
+      "description": "Humid - 1600-3200mm of precipitation per year."
+    },
+    {
+      "const": "Perhumid",
+      "description": "Perhumid - 3200-6400mm of precipitation per year."
+    },
+    {
+      "const": "Superhumid",
+      "description": "Superhumid - more than 6400mm of precipitation per year."
+    }
   ]
 }
diff --git a/game_data/_schemas/biome_latitude.json b/game_data/_schemas/biome_latitude.json
index d859bd4..f3d83f8 100644
--- a/game_data/_schemas/biome_latitude.json
+++ b/game_data/_schemas/biome_latitude.json
@@ -4,13 +4,34 @@
 	"title": "Elementalist Biome Latitude",
 	"description": "The available latitudinal regions for biomes in the Elementalist game.",
 	"type": "string",
-	"enum": [
-		"Tropical",
-		"Subtropical",
-		"WarmTemperate",
-		"CoolTemperate",
-		"Boreal",
-		"Subpolar",
-		"Polar"
+	"oneOf": [
+		{
+			"const": "Tropical",
+			"description": "Found closest to the equator, tropical biomes are hot and humid, with a wide variety of plant and animal life."
+		},
+		{
+			"const": "Subtropical",
+			"description": "Slightly further from the equator, subtropical biomes are still warm and humid, but with a wider range of seasonal variation."
+		},
+		{
+			"const": "WarmTemperate",
+			"description": "Warm temperate biomes are found in the middle latitudes, with warm summers and mild winters."
+		},
+		{
+			"const": "CoolTemperate",
+			"description": "Cool temperate biomes are found in the higher middle latitudes, with warm summers and cold winters."
+		},
+		{
+			"const": "Boreal",
+			"description": "Boreal biomes are found in the subarctic regions, with short, cool summers and long, cold winters."
+		},
+		{
+			"const": "Subpolar",
+			"description": "Subpolar biomes are found in the arctic regions, with short, cool summers and long, very cold winters."
+		},
+		{
+			"const": "Polar",
+			"description": "Polar biomes are found at the poles, with very cold temperatures year-round."
+		}
 	]
 }
diff --git a/game_data/_schemas/color.json b/game_data/_schemas/color.json
index 1e04b87..0d2512d 100644
--- a/game_data/_schemas/color.json
+++ b/game_data/_schemas/color.json
@@ -4,58 +4,164 @@
   "title": "Elementalist Color",
   "description": "The supported colors for the Elementalist game. See https://nwesterhausen.github.io/elementalist/game_library/colors",
   "type": "string",
-  "enum": [
-    "Rangitoto",
-    "CostaDelSol",
-    "Sushi",
-    "Conifer",
-    "Manz",
-    "Hampton",
-    "Olivine",
-    "Laurel",
-    "Nandor",
-    "OuterSpace",
-    "EbonyClay",
-    "Mirage",
-    "CloudBurst",
-    "SanJuan",
-    "SteelBlue",
-    "Downy",
-    "WaterLeaf",
-    "Mystic",
-    "Loblolly",
-    "RegentGray",
-    "PaleSky",
-    "BrightGray",
-    "LondonHue",
-    "SandDune",
-    "Bossanova",
-    "Jacarta",
-    "Revolver",
-    "WineBerry",
-    "PurpleAlternateDark",
-    "TawnyPort",
-    "ChestnutRose",
-    "SeaPink",
-    "Chalky",
-    "Anzac",
-    "Copper",
-    "MuleFawn",
-    "Terracotta",
-    "Mojo",
-    "SolidPink",
-    "Buccaneer",
-    "CocoaBrown",
-    "Millbrook",
-    "SpicyMix",
-    "SantaFe",
-    "Russett",
-    "Matterhorn",
-    "Thunder",
-    "DarkerThunder",
-    "Ferra",
-    "LighterSandDune",
-    "Mongoose",
-    "Kangaroo"
+  "oneOf": [
+    {
+      "const": "Rangitoto",
+      "description": "A dark green-brown, #3f4328"
+    },
+    {
+      "const": "CostaDelSol",
+      "description": "A deeper green, #5f7132"
+    },
+    {
+      "const": "Sushi"
+    },
+    {
+      "const": "Conifer"
+    },
+    {
+      "const": "Manz"
+    },
+    {
+      "const": "Hampton"
+    },
+    {
+      "const": "Olivine"
+    },
+    {
+      "const": "Laurel"
+    },
+    {
+      "const": "Nandor"
+    },
+    {
+      "const": "OuterSpace"
+    },
+    {
+      "const": "EbonyClay"
+    },
+    {
+      "const": "Mirage"
+    },
+    {
+      "const": "CloudBurst"
+    },
+    {
+      "const": "SanJuan"
+    },
+    {
+      "const": "SteelBlue"
+    },
+    {
+      "const": "Downy"
+    },
+    {
+      "const": "WaterLeaf"
+    },
+    {
+      "const": "Mystic"
+    },
+    {
+      "const": "Loblolly"
+    },
+    {
+      "const": "RegentGray"
+    },
+    {
+      "const": "PaleSky"
+    },
+    {
+      "const": "BrightGray"
+    },
+    {
+      "const": "LondonHue"
+    },
+    {
+      "const": "SandDune"
+    },
+    {
+      "const": "Bossanova"
+    },
+    {
+      "const": "Jacarta"
+    },
+    {
+      "const": "Revolver"
+    },
+    {
+      "const": "WineBerry"
+    },
+    {
+      "const": "PurpleAlternateDark"
+    },
+    {
+      "const": "TawnyPort"
+    },
+    {
+      "const": "ChestnutRose"
+    },
+    {
+      "const": "SeaPink"
+    },
+    {
+      "const": "Chalky"
+    },
+    {
+      "const": "Anzac"
+    },
+    {
+      "const": "Copper"
+    },
+    {
+      "const": "MuleFawn"
+    },
+    {
+      "const": "Terracotta"
+    },
+    {
+      "const": "Mojo"
+    },
+    {
+      "const": "SolidPink"
+    },
+    {
+      "const": "Buccaneer"
+    },
+    {
+      "const": "CocoaBrown"
+    },
+    {
+      "const": "Millbrook"
+    },
+    {
+      "const": "SpicyMix"
+    },
+    {
+      "const": "SantaFe"
+    },
+    {
+      "const": "Russett"
+    },
+    {
+      "const": "Matterhorn"
+    },
+    {
+      "const": "Thunder"
+    },
+    {
+      "const": "DarkerThunder"
+    },
+    {
+      "const": "Ferra"
+    },
+    {
+      "const": "LighterSandDune"
+    },
+    {
+      "const": "Mongoose"
+    },
+    {
+      "const": "Kangaroo"
+    }
   ]
 }
diff --git a/game_data/_schemas/entity_sprite.json b/game_data/_schemas/entity_sprite.json
new file mode 100644
index 0000000..6e40cb1
--- /dev/null
+++ b/game_data/_schemas/entity_sprite.json
@@ -0,0 +1,17 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://schemas.nwest.one/games/elementalist/entity_sprite.json",
+  "title": "Elementalist Entity Sprite Schema",
+  "description": "Definition of an entity sprite for the Elementalist game",
+  "type": "object",
+  "properties": {
+    "animations": {
+      "title": "Animation Definitions",
+      "description": "Animations for the sprite",
+      "type": "array",
+      "items": {
+        "$ref": "https://schemas.nwest.one/games/elementalist/sprite_animation.json"
+      }
+    }
+  }
+}
diff --git a/game_data/_schemas/game_system.json b/game_data/_schemas/game_system.json
index 2f9cdb0..13e739e 100644
--- a/game_data/_schemas/game_system.json
+++ b/game_data/_schemas/game_system.json
@@ -4,5 +4,30 @@
   "title": "Elementalist Game System",
   "description": "A system in the Elementalist game",
   "type": "string",
-  "enum": ["Spell", "Tileset", "Particle", "Realm", "SimpleObject"]
+  "oneOf": [
+    {
+      "const": "Spell",
+      "title": "A spell that can be learned and cast by a player"
+    },
+    {
+      "const": "Tileset",
+      "title": "A spritesheet"
+    },
+    {
+      "const": "Particle",
+      "title": "A particle effect that can be used to create a visual effect"
+    },
+    {
+      "const": "Realm",
+      "title": "A realm that can be explored by a player"
+    },
+    {
+      "const": "SimpleObject",
+      "title": "A simple object that can be placed in a realm"
+    },
+    {
+      "const": "EntitySprite",
+      "title": "A sprite that can be used to represent an entity. Includes animations and other visual effects"
+    }
+  ]
 }
diff --git a/game_data/_schemas/header.json b/game_data/_schemas/header.json
index 8a060d9..b9d29c6 100644
--- a/game_data/_schemas/header.json
+++ b/game_data/_schemas/header.json
@@ -46,8 +46,22 @@
     "validGameInternalVersion": {
       "description": "Internal version of the game that this data file is valid for. This is used to ensure that the data file is not loaded for an incompatible game version.",
       "type": "integer",
-      "enum": [1]
+      "oneOf": [
+        {
+          "const": 1,
+          "description": "Version 0 of the game, this encompasses all of 0.x since it's the first version and there's no consideration for backwards compatibility or API stability.",
+          "title": "Versions 0.x of the game"
+        }
+      ]
     }
   },
-  "required": ["uniqueId", "system", "author", "description", "displayVersion", "internalVersion", "validGameInternalVersion"]
+  "required": [
+    "uniqueId",
+    "system",
+    "author",
+    "description",
+    "displayVersion",
+    "internalVersion",
+    "validGameInternalVersion"
+  ]
 }
diff --git a/game_data/_schemas/magic_school.json b/game_data/_schemas/magic_school.json
index c1519dd..ab20e6e 100644
--- a/game_data/_schemas/magic_school.json
+++ b/game_data/_schemas/magic_school.json
@@ -4,24 +4,78 @@
   "title": "The schools of magic in the Elementalist game",
   "description": "The family of magic the spell belongs to",
   "type": "string",
-  "enum": [
-    "fire",
-    "lightning",
-    "water",
-    "earth",
-    "air",
-    "ice",
-    "force",
-    "light",
-    "dark",
-    "arcane",
-    "life",
-    "death",
-    "enhancement",
-    "reduction",
-    "summoning",
-    "necromancy",
-    "polymorph",
-    "time"
+  "oneOf": [
+    {
+      "const": "Fire",
+      "description": "The school of fire magic"
+    },
+    {
+      "const": "Lightning",
+      "description": "The school of lightning magic"
+    },
+    {
+      "const": "Water",
+      "description": "The school of water magic"
+    },
+    {
+      "const": "Earth",
+      "description": "The school of earth magic"
+    },
+    {
+      "const": "Air",
+      "description": "The school of air magic"
+    },
+    {
+      "const": "Ice",
+      "description": "The school of ice magic"
+    },
+    {
+      "const": "Force",
+      "description": "The school of force magic"
+    },
+    {
+      "const": "Light",
+      "description": "The school of light magic"
+    },
+    {
+      "const": "Dark",
+      "description": "The school of dark magic"
+    },
+    {
+      "const": "Arcane",
+      "description": "The school of arcane magic"
+    },
+    {
+      "const": "Life",
+      "description": "The school of life magic"
+    },
+    {
+      "const": "Death",
+      "description": "The school of death magic"
+    },
+    {
+      "const": "Enhancement",
+      "description": "The school of enhancement magic"
+    },
+    {
+      "const": "Reduction",
+      "description": "The school of reduction magic"
+    },
+    {
+      "const": "Summoning",
+      "description": "The school of summoning magic"
+    },
+    {
+      "const": "Necromancy",
+      "description": "The school of necromancy magic"
+    },
+    {
+      "const": "Polymorph",
+      "description": "The school of polymorph magic"
+    },
+    {
+      "const": "Time",
+      "description": "The school of time magic"
+    }
   ]
 }
diff --git a/game_data/_schemas/particle_effect.json b/game_data/_schemas/particle_effect.json
index 617a142..d46c46e 100644
--- a/game_data/_schemas/particle_effect.json
+++ b/game_data/_schemas/particle_effect.json
@@ -38,16 +38,27 @@
         "modifierType": {
           "description": "The type of modifier to use for the initial position",
           "type": "string",
-          "enum": ["circle"]
+          "enum": [
+            "circle"
+          ]
         },
         "radius": {
           "description": "The radius of the circle to spawn particles in",
           "type": "number"
         },
         "shapeDimension": {
-          "description": "The shape dimension to use for the initial position. Volume is anywhere within the circle, Surface is only on the edge of the circle.",
+          "description": "The shape dimension to use for the initial position.",
           "type": "string",
-          "enum": ["volume", "surface"]
+          "oneOf": [
+            {
+              "const": "volume",
+              "description": "Volume is anywhere within the circle"
+            },
+            {
+              "const": "surface",
+              "description": "Surface is only on the edge of the circle"
+            }
+          ]
         }
       }
     },
diff --git a/game_data/_schemas/skill.json b/game_data/_schemas/skill.json
new file mode 100644
index 0000000..86174ca
--- /dev/null
+++ b/game_data/_schemas/skill.json
@@ -0,0 +1,98 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://schemas.nwest.one/games/elementalist/skill.json",
+  "title": "Skill in the Elementalist game",
+  "description": "A skill governs the player's magical abilities for the various schools of magic.",
+  "type": "string",
+  "oneOf": [
+    {
+      "title": "Fire magic",
+      "description": "Pyromancy is the school of fire magic.",
+      "const": "Pyromancy"
+    },
+    {
+      "title": "Lightning magic",
+      "description": "Fulgomancy is the school of lightning magic.",
+      "const": "Fulgomancy"
+    },
+    {
+      "title": "Water magic",
+      "description": "Hydromancy is the school of water magic.",
+      "const": "Hydromancy"
+    },
+    {
+      "title": "Earth magic",
+      "description": "Geomancy is the school of earth magic.",
+      "const": "Geomancy"
+    },
+    {
+      "title": "Air magic",
+      "description": "Aeromancy is the school of air magic.",
+      "const": "Aeromancy"
+    },
+    {
+      "title": "Ice magic",
+      "description": "Cryomancy is the school of ice magic.",
+      "const": "Cryomancy"
+    },
+    {
+      "title": "Force magic",
+      "description": "Trudomancy is the school of force magic.",
+      "const": "Trudomancy"
+    },
+    {
+      "title": "Light magic",
+      "description": "Photomancy is the school of light magic.",
+      "const": "Photomancy"
+    },
+    {
+      "title": "Dark magic",
+      "description": "Umbramancy is the school of dark magic.",
+      "const": "Umbramancy"
+    },
+    {
+      "title": "Arcane magic",
+      "description": "Arcanomancy is the school of arcane magic.",
+      "const": "Arcanomancy"
+    },
+    {
+      "title": "Life magic",
+      "description": "Vitomancy is the school of life magic.",
+      "const": "Vitomancy"
+    },
+    {
+      "title": "Death magic",
+      "description": "Mortomancy is the school of death magic.",
+      "const": "Mortomancy"
+    },
+    {
+      "title": "Enhancement magic",
+      "description": "Ampiliomancy is the school of enhancement magic.",
+      "const": "Ampiliomancy"
+    },
+    {
+      "title": "Reduction magic",
+      "description": "Diminiomancy is the school of reduction magic.",
+      "const": "Diminiomancy"
+    },
+    {
+      "title": "Summoning magic",
+      "description": "Citomancy is the school of summoning magic.",
+      "const": "Citomancy"
+    },
+    {
+      "title": "Necromancy is the school of necromancy.",
+      "const": "Necromancy"
+    },
+    {
+      "title": "Polymorph magic",
+      "description": "Mutatiomancy is the school of polymorph magic.",
+      "const": "Mutatiomancy"
+    },
+    {
+      "title": "Time magic",
+      "description": "Chronomancy is the school of time magic.",
+      "const": "Chronomancy"
+    }
+  ]
+}
diff --git a/game_data/_schemas/spell_data.json b/game_data/_schemas/spell_data.json
index 7554ce3..20a7cdb 100644
--- a/game_data/_schemas/spell_data.json
+++ b/game_data/_schemas/spell_data.json
@@ -13,128 +13,157 @@
 			"description": "A description of the spell",
 			"type": "string"
 		},
-		"longDescription": {
+		"lore": {
 			"description": "A longer, more thematic description of the spell that can be used in-game to add lore and flavor",
 			"type": "string"
 		},
-		"manaCost": {
-			"description": "The cost of the spell",
-			"type": "integer"
+		"talisman": {
+			"description": "The spell talisman which creates this spell",
+			"$ref": "https://schemas.nwest.one/games/elementalist/spell_talisman.json"
+		},
+		"skill": {
+			"description": "The skill which powers this spell",
+			"$ref": "https://schemas.nwest.one/games/elementalist/skill.json"
 		},
 		"castSlot": {
-			"description": "The slot the spell is cast in",
+			"description": "The slot the spell can fit in",
 			"type": "string",
-			"enum": ["primary", "secondary", "defensive", "ultimate"]
+			"default": "Cantrip",
+			"oneOf": [
+				{
+					"const": "Cantrip",
+					"title": "Cantrips are typically basic attacks that don't cost mana and are a player's primary means of dealing damage. They are typically the most spammable spell in a player's arsenal."
+				},
+				{
+					"const": "Slot",
+					"title": "Slotted spells are the primary spells a player uses. They are typically more powerful than cantrips and have a variety of effects."
+				},
+				{
+					"const": "Ultimate",
+					"title": "Ultimate spells are the most powerful spells a player can cast. They are typically on a long cooldown and have a variety of powerful effects."
+				}
+			]
 		},
-		"castTime": {
-			"description": "The time it takes to cast the spell",
-			"type": "number",
-			"inclusiveMinimum": 0
+		"castType": {
+			"description": "The type of cast the spell uses",
+			"type": "string",
+			"default": "Instant",
+			"oneOf": [
+				{
+					"const": "Instant",
+					"title": "Instant spells are cast immediately."
+				},
+				{
+					"const": "Channel",
+					"title": "Channel spells must be maintained to be active."
+				},
+				{
+					"const": "Cast",
+					"title": "Cast spells are cast over a period of time and can be interrupted. Only when the cast is complete does the spell take effect."
+				}
+			]
 		},
 		"cooldown": {
 			"description": "The time it takes to cool down after casting the spell",
+			"default": 0,
 			"type": "number",
 			"inclusiveMinimum": 0
 		},
-		"magic": {
-			"description": "The family of magic the spell belongs to",
-			"$ref": "https://schemas.nwest.one/games/elementalist/magic_school.json"
+		"castTime": {
+			"description": "The time it takes to cast the spell",
+			"default": 0,
+			"type": "number",
+			"inclusiveMinimum": 0
 		},
-		"flags": {
-			"description": "Flags to specify general behavior",
-			"type": "array",
-			"items": {
-				"type": "string",
-				"enum": [
-					"aoe",
-					"self",
-					"target",
-					"projectile",
-					"instant",
-					"homing",
-					"cone",
-					"line",
-					"beam",
-					"wall",
-					"ground",
-					"summon",
-					"buff",
-					"debuff",
-					"heal",
-					"damage",
-					"movement",
-					"touch",
-					"sustained",
-					"dot",
-					"circle",
-					"square"
-				]
-			}
+		"manaCost": {
+			"description": "The cost of the spell",
+			"default": 0,
+			"type": "number",
+			"inclusiveMinimum": 0
 		},
-		"spellTier": {
-			"description": "The tier of the spell, used to indicate how soon it can be unlocked or learned. One of the tier 0 spells will be a free choice when learning a type of magic.",
-			"type": "integer",
-			"enum": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+		"range": {
+			"description": "The range of the spell, used to determine how far it can travel",
+			"type": "number",
+			"default": 100,
+			"inclusiveMinimum": 0
 		},
 		"speed": {
 			"description": "The speed of the spell, used to determine how quickly it travels",
 			"type": "number",
+			"default": 100,
 			"inclusiveMinimum": 0
 		},
-		"range": {
-			"description": "The range of the spell, used to determine how far it can travel",
+		"acceleration": {
+			"description": "The acceleration of the spell, used to determine how quickly it gets up to max speed.",
 			"type": "number",
+			"default": 20,
 			"inclusiveMinimum": 0
 		},
 		"duration": {
 			"description": "The duration of the spell, used to determine how long it lasts",
 			"type": "number",
+			"default": 5,
 			"inclusiveMinimum": 0
 		},
-		"damage": {
+		"baseDamage": {
 			"description": "The damage of the spell, used to determine how much damage it does",
 			"type": "number",
+			"default": 0,
 			"inclusiveMinimum": 0
 		},
-		"healing": {
+		"baseHealing": {
 			"description": "The healing of the spell, used to determine how much healing it does",
 			"type": "number",
+			"default": 0,
 			"inclusiveMinimum": 0
 		},
+		"buffs": {
+			"description": "The buffs applied by the spell",
+			"$ref": "https://schemas.nwest.one/games/elementalist/stat_effect.json"
+		},
+		"debuffs": {
+			"description": "The debuffs applied by the spell",
+			"$ref": "https://schemas.nwest.one/games/elementalist/stat_effect.json"
+		},
 		"radius": {
 			"description": "The radius of the spell, used to determine how large the area of effect is",
 			"type": "number",
+			"default": 0,
 			"inclusiveMinimum": 0
 		},
 		"angle": {
 			"description": "The angle of the spell, used to determine how wide the area of effect is",
 			"type": "number",
+			"default": 0,
 			"inclusiveMinimum": 0
 		},
-		"collider": {
-			"description": "The collider of the spell, used to determine how it interacts with the world",
-			"$ref": "https://schemas.nwest.one/games/elementalist/collider.json"
-		},
-		"debuffs": {
-			"description": "The debuffs applied by the spell",
-			"$ref": "https://schemas.nwest.one/games/elementalist/stat_effect.json"
+		"iconTileset": {
+			"description": "The tileset with the icon of the spell (path in the assets folder)",
+			"type": "string",
+			"default": "placeholder"
 		},
-		"buffs": {
-			"description": "The buffs applied by the spell",
-			"$ref": "https://schemas.nwest.one/games/elementalist/stat_effect.json"
+		"iconIndex": {
+			"description": "The index of the icon in the tileset",
+			"type": "integer",
+			"default": 0,
+			"inclusiveMinimum": 0
 		},
-		"castType": {
-			"description": "The type of cast the spell uses",
-			"type": "string",
-			"enum": ["instant", "channeled", "cast"]
+		"spriteTileset": {
+			"description": "The sprite of the spell (path in the assets folder)",
+			"default": "placeholder",
+			"type": "string"
 		},
-		"castCategory": {
-			"description": "The broad category of the spell",
-			"type": "string",
-			"enum": ["touch", "projectile", "ground", "summon", "onSelf"]
+		"spriteIndex": {
+			"description": "The index of the sprite in the tileset",
+			"type": "integer",
+			"default": 0,
+			"inclusiveMinimum": 0
 		},
 		"particles": {
-			"required": ["particleId", "attachment"],
+			"required": [
+				"particleId",
+				"attachment"
+			],
 			"description": "Particles to attach to the spell",
 			"type": "array",
 			"items": {
@@ -147,49 +176,59 @@
 					"attachment": {
 						"description": "The attachment point of the particle",
 						"type": "string",
-						"enum": [
-							"Cast",
-							"Projectile",
-							"Impact",
-							"Target",
-							"Caster",
-							"Ground",
-							"Summon"
+						"default": "Projectile",
+						"oneOf": [
+							{
+								"const": "Cast",
+								"description": "Emit particles from the caster when the spell is cast."
+							},
+							{
+								"const": "Projectile",
+								"description": "The particles emitted by the projectile."
+							},
+							{
+								"const": "Impact",
+								"description": "The particles emitted when the spell impacts."
+							},
+							{
+								"const": "Target",
+								"description": "The particles emitted from the target when impacted."
+							},
+							{
+								"const": "Caster",
+								"description": "The particles emitted from the caster while casting (sustained)."
+							},
+							{
+								"const": "Ground",
+								"description": "The particles emitted from the ground."
+							},
+							{
+								"const": "Summon",
+								"description": "The particles emitted from the summoned entity."
+							}
 						]
 					}
 				}
+			},
+			"spellTier": {
+				"depreciated": true,
+				"description": "The tier of the spell (covered by the Talisman now)",
+				"type": "string"
+			},
+			"magic": {
+				"deprecated": true,
+				"description": "The magic type of the spell (defined in Skill now)",
+				"type": "string"
 			}
-		},
-		"iconTileset": {
-			"description": "The tileset with the icon of the spell (path in the assets folder)",
-			"type": "string"
-		},
-		"iconIndex": {
-			"description": "The index of the icon in the tileset",
-			"type": "integer",
-			"inclusiveMinimum": 0
-		},
-		"spriteTileset": {
-			"description": "The sprite of the spell (path in the assets folder)",
-			"type": "string"
-		},
-		"spriteIndex": {
-			"description": "The index of the sprite in the tileset",
-			"type": "integer",
-			"inclusiveMinimum": 0
 		}
 	},
 	"required": [
 		"name",
 		"description",
-		"manaCost",
+		"talisman",
+		"skill",
 		"castSlot",
-		"castTime",
-		"cooldown",
-		"spellTier",
-		"flags",
 		"castType",
-		"castCategory",
 		"spriteTileset",
 		"spriteIndex"
 	]
diff --git a/game_data/_schemas/spell_tag.json b/game_data/_schemas/spell_tag.json
deleted file mode 100644
index 2d1718e..0000000
--- a/game_data/_schemas/spell_tag.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://schemas.nwest.one/games/elementalist/spell_tag.json",
-  "title": "Extended Spell Properties",
-  "description": "Extra properties that can apply to one or more spells",
-  "type": "object",
-  "properties": {
-    "name": {
-      "description": "The name of the tag",
-      "type": "string"
-    },
-    "description": {
-      "description": "A description of the tag",
-      "type": "string"
-    },
-    "extendedDescription": {
-      "description": "A longer description of the tag",
-      "type": "string"
-    }
-  },
-  "required": ["name", "description"]
-}
diff --git a/game_data/_schemas/spell_talisman.json b/game_data/_schemas/spell_talisman.json
new file mode 100644
index 0000000..63e0080
--- /dev/null
+++ b/game_data/_schemas/spell_talisman.json
@@ -0,0 +1,134 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://schemas.nwest.one/games/elementalist/spell_talisman.json",
+  "title": "Elementalist Spell Talisman Schema",
+  "description": "A spell talisman defines the properties of a spell, and is used to create a spell in the game.",
+  "type": "object",
+  "properties": {
+    "shaping": {
+      "description": "The shaping of the spell talisman. This defines the shape of the spell.",
+      "type": "string",
+      "oneOf": [
+        {
+          "const": "Projectile",
+          "title": "Projectile spells are cast at a target and travel away from the caster."
+        },
+        {
+          "const": "AreaOfEffect",
+          "title": "Area of Effect spells affect all targets within a specified area."
+        },
+        {
+          "const": "Cone",
+          "title": "Cone spells affect all targets within a specified cone."
+        },
+        {
+          "const": "Line",
+          "title": "Line spells affect all targets within a specified line."
+        },
+        {
+          "const": "Touch",
+          "title": "Touch spells are cast by touching the target."
+        },
+        {
+          "const": "OnSelf",
+          "title": "On Self spells affect the caster."
+        },
+        {
+          "const": "Melee",
+          "title": "Melee spells are cast at a target within melee range."
+        }
+      ]
+    },
+    "behavior": {
+      "description": "The behavior of the spell talisman. This defines the behavior of the spell.",
+      "type": "string",
+      "oneOf": [
+        {
+          "const": "Damage",
+          "title": "Damage spells deal damage to the target."
+        },
+        {
+          "const": "Heal",
+          "title": "Heal spells heal the target."
+        },
+        {
+          "const": "Buff",
+          "title": "Buff spells provide a beneficial effect to the target."
+        },
+        {
+          "const": "Debuff",
+          "title": "Debuff spells provide a detrimental effect to the target."
+        },
+        {
+          "const": "Utility",
+          "title": "Utility spells provide a non-damaging effect to the target."
+        },
+        {
+          "const": "Summon",
+          "title": "Summon spells summon a creature to fight for the caster."
+        },
+        {
+          "const": "Polymorph",
+          "title": "Polymorph spells change the form of the target."
+        },
+        {
+          "const": "Teleport",
+          "title": "Teleport spells move the target to a different location."
+        }
+      ]
+    },
+    "tier": {
+      "description": "The tier of the spell talisman. This (loosely) defines the power of the spell.",
+      "type": "string",
+      "oneOf": [
+        {
+          "const": "Mundane",
+          "title": "Tier 0: Mundane"
+        },
+        {
+          "const": "Common",
+          "title": "Tier 1: Common"
+        },
+        {
+          "const": "Uncommon",
+          "title": "Tier 2: Uncommon"
+        },
+        {
+          "const": "Rare",
+          "title": "Tier 3: Rare"
+        },
+        {
+          "const": "Epic",
+          "title": "Tier 4: Epic"
+        },
+        {
+          "const": "Legendary",
+          "title": "Tier 5: Legendary"
+        },
+        {
+          "const": "Mythic",
+          "title": "Tier 6: Mythic"
+        },
+        {
+          "const": "Divine",
+          "title": "Tier 7 (highest): Divine"
+        },
+        {
+          "const": "Unique",
+          "title": "Special tier: Unique",
+          "description": "Unique tier should only be used for restricted spells that are unique to a specific character or have other requirements. It cannot be inscribed by the player."
+        },
+        {
+          "const": "Astral",
+          "title": "Special tier: Astral",
+          "description": "Astral tier spells are a step above divine. An astral talisman is not possible in the normal game."
+        }
+      ]
+    }
+  },
+  "required": [
+    "shaping",
+    "behavior",
+    "tier"
+  ]
+}
diff --git a/game_data/_schemas/sprite.json b/game_data/_schemas/sprite.json
new file mode 100644
index 0000000..5dc961d
--- /dev/null
+++ b/game_data/_schemas/sprite.json
@@ -0,0 +1,21 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://schemas.nwest.one/games/elementalist/sprite.json",
+  "title": "Elementalist Sprite Schema",
+  "description": "A sprite describes the animations and appearance of a game object.",
+  "type": "object",
+  "properties": {
+    "header": {
+      "description": "Metadata about the sprite",
+      "$ref": "https://schemas.nwest.one/games/elementalist/header.json"
+    },
+    "data": {
+      "description": "The sprite data",
+      "$ref": "https://schemas.nwest.one/games/elementalist/entity_sprite.json"
+    }
+  },
+  "required": [
+    "header",
+    "data"
+  ]
+}
diff --git a/game_data/_schemas/sprite_animation.json b/game_data/_schemas/sprite_animation.json
new file mode 100644
index 0000000..04757ab
--- /dev/null
+++ b/game_data/_schemas/sprite_animation.json
@@ -0,0 +1,35 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://schemas.nwest.one/games/elementalist/sprite_animation.json",
+  "title": "Elementalist Sprite Animation Schema",
+  "description": "An animation for use in a sprite sheet",
+  "type": "object",
+  "properties": {
+    "state": {
+      "title": "Animation State",
+      "description": "The state of animation this represents",
+      "$ref": "https://schemas.nwest.one/games/elementalist/animation_state.json"
+    },
+    "tileset": {
+      "description": "The tileset to use for this animation, identified by its unique_id (from the tileset's header)",
+      "type": "string"
+    },
+    "tileIndices": {
+      "description": "The indices of the tiles to use for this animation",
+      "type": "array",
+      "items": {
+        "type": "integer"
+      }
+    },
+    "frameDuration": {
+      "description": "The duration of each frame in seconds",
+      "type": "number"
+    }
+  },
+  "required": [
+    "state",
+    "tileset",
+    "tileIndices",
+    "frameDuration"
+  ]
+}
diff --git a/game_data/_schemas/stat.json b/game_data/_schemas/stat.json
new file mode 100644
index 0000000..e6ff2b3
--- /dev/null
+++ b/game_data/_schemas/stat.json
@@ -0,0 +1,137 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://schemas.nwest.one/games/elementalist/stat.json",
+  "title": "Elementalist Entity Stat",
+  "description": "A statistic for an entity in the Elementalist game",
+  "type": "string",
+  "oneOf": [
+    {
+      "const": "health",
+      "description": "The amount of health an entity has"
+    },
+    {
+      "const": "mana",
+      "description": "The amount of mana an entity has"
+    },
+    {
+      "const": "damageReduction",
+      "description": "The amount of damage reduction an entity has"
+    },
+    {
+      "const": "damageResistance",
+      "description": "The amount of damage resistance an entity has"
+    },
+    {
+      "const": "damageReflection",
+      "description": "The amount of damage reflection an entity has"
+    },
+    {
+      "const": "damageAmplification",
+      "description": "The amount of damage amplification an entity has"
+    },
+    {
+      "const": "criticalStrikeChance",
+      "description": "The chance of a critical strike"
+    },
+    {
+      "const": "criticalStrikeDamage",
+      "description": "The amount of damage a critical strike does"
+    },
+    {
+      "const": "lifeSteal",
+      "description": "The amount of life stolen from an attack"
+    },
+    {
+      "const": "manaSteal",
+      "description": "The amount of mana stolen from an attack"
+    },
+    {
+      "const": "movementSpeed",
+      "description": "The speed at which an entity moves"
+    },
+    {
+      "const": "stunResistance",
+      "description": "The resistance to being stunned"
+    },
+    {
+      "const": "healthRegeneration",
+      "description": "The amount of health regenerated per second"
+    },
+    {
+      "const": "manaRegeneration",
+      "description": "The amount of mana regenerated per second"
+    },
+    {
+      "const": "projectileSpeed",
+      "description": "The speed of a projectile"
+    },
+    {
+      "const": "projectileSize",
+      "description": "The size of a projectile"
+    },
+    {
+      "const": "projectileLifetime",
+      "description": "The lifetime of a projectile"
+    },
+    {
+      "const": "dodgeChance",
+      "description": "The chance to dodge an attack"
+    },
+    {
+      "const": "attackDamage",
+      "description": "The amount of damage an attack does"
+    },
+    {
+      "const": "attackSpeed",
+      "description": "The speed at which an entity attacks"
+    },
+    {
+      "const": "attackRange",
+      "description": "The range of an attack"
+    },
+    {
+      "const": "physicalDamageReduction",
+      "description": "The amount of physical damage reduction an entity has"
+    },
+    {
+      "const": "physicalDamageResistance",
+      "description": "The amount of physical damage resistance an entity has"
+    },
+    {
+      "const": "physicalDamageReflection",
+      "description": "The amount of physical damage reflection an entity has"
+    },
+    {
+      "const": "physicalDamageAmplification",
+      "description": "The amount of physical damage amplification an entity has"
+    },
+    {
+      "const": "magicDamage",
+      "description": "The amount of magic damage an entity does"
+    },
+    {
+      "const": "cooldownReduction",
+      "description": "The amount of cooldown reduction an entity has"
+    },
+    {
+      "const": "spellRange",
+      "description": "The range of a spell"
+    },
+    {
+      "const": "magicDamageReduction",
+      "description": "The amount of magic damage reduction an entity has"
+    },
+    {
+      "const": "magicDamageResistance",
+      "description": "The amount of magic damage resistance an entity has"
+    },
+    {
+      "const": "magicDamageReflection",
+      "description": "The amount of magic damage reflection an entity has"
+    },
+    {
+      "const": "magicDamageAmplification",
+      "description": "The amount of magic damage amplification an entity has"
+    }
+  ]
+}
diff --git a/game_data/_schemas/stat_effect.json b/game_data/_schemas/stat_effect.json
index 6fb0b48..a4ad9b1 100644
--- a/game_data/_schemas/stat_effect.json
+++ b/game_data/_schemas/stat_effect.json
@@ -26,7 +26,28 @@
     "affectedEntity": {
       "description": "The entities affected by the effect",
       "type": "string",
-      "enum": ["any", "player", "enemy", "ally", "none"]
+      "oneOf": [
+        {
+          "const": "Any",
+          "description": "Affects any entity type (player, enemy, ally)"
+        },
+        {
+          "const": "Player",
+          "description": "Affects only the player"
+        },
+        {
+          "const": "Enemy",
+          "description": "Affects only enemies"
+        },
+        {
+          "const": "Ally",
+          "description": "Affects only allies"
+        },
+        {
+          "const": "None",
+          "description": "Affects no entities"
+        }
+      ]
     },
     "affectedStats": {
       "description": "The stats affected by the effect",
@@ -36,41 +57,7 @@
         "properties": {
           "stat": {
             "description": "The affected stat",
-            "type": "string",
-            "enum": [
-              "health",
-              "mana",
-              "damageReduction",
-              "damageResistance",
-              "damageReflection",
-              "damageAmplification",
-              "criticalStrikeChance",
-              "criticalStrikeDamage",
-              "lifeSteal",
-              "manaSteal",
-              "movementSpeed",
-              "stunResistance",
-              "healthRegeneration",
-              "manaRegeneration",
-              "projectileSpeed",
-              "projectileSize",
-              "projectileLifetime",
-              "dodgeChance",
-              "attackDamage",
-              "attackSpeed",
-              "attackRange",
-              "physicalDamageReduction",
-              "physicalDamageResistance",
-              "physicalDamageReflection",
-              "physicalDamageAmplification",
-              "magicDamage",
-              "cooldownReduction",
-              "spellRange",
-              "magicDamageReduction",
-              "magicDamageResistance",
-              "magicDamageReflection",
-              "magicDamageAmplification"
-            ]
+            "$ref": "https://schemas.nwest.one/games/elementalist/stat.json"
           },
           "amount": {
             "description": "The amount the stat is affected by (can be negative)",
@@ -79,12 +66,32 @@
           "affectType": {
             "description": "The type of affect the debuff has on the stat",
             "type": "string",
-            "enum": ["add", "multiply"]
+            "oneOf": [
+              {
+                "const": "add",
+                "description": "Add the amount to the stat"
+              },
+              {
+                "const": "multiply",
+                "description": "Multiply the stat by the amount"
+              }
+            ]
           }
         }
       },
-      "required": ["stat", "amount", "affectType"]
+      "required": [
+        "stat",
+        "amount",
+        "affectType"
+      ]
     }
   },
-  "required": ["affectedEntity", "affectedStats", "name", "description", "duration", "maxStacks"]
+  "required": [
+    "affectedEntity",
+    "affectedStats",
+    "name",
+    "description",
+    "duration",
+    "maxStacks"
+  ]
 }
diff --git a/game_data/realms/backterria.yml b/game_data/realms/backterria.yml
new file mode 100644
index 0000000..9f86592
--- /dev/null
+++ b/game_data/realms/backterria.yml
@@ -0,0 +1,24 @@
+# yaml-language-server: $schema=https://schemas.nwest.one/games/elementalist/realm.json
+header:
+  uniqueId: backterria-simple
+  system: Realm
+  author: Nicholas Westerhausen
+  description: A simple test realm using the backterria sprites/tilesets.
+  internalVersion: 1
+  displayVersion: v1.0
+  validGameInternalVersion: 1
+data:
+  name: Simple Backterria-drawn Realm
+  description: A realm of grasslands and small hills.
+  primaryElement: Earth
+  biomes:
+    - altitude: Alpine
+      biome: Tundra
+      humidity: Arid
+      latitude: Subpolar
+      simpleObjects: []
+      groundTilesets:
+        - id: backterria_ground
+          weights:
+            - tile: 420
+              weight: 1
diff --git a/game_data/realms/simple.yaml b/game_data/realms/simple.yaml
index 35c9457..ff0367d 100644
--- a/game_data/realms/simple.yaml
+++ b/game_data/realms/simple.yaml
@@ -10,7 +10,7 @@ header:
 data:
   name: Simple Realm
   description: A simple test realm
-  primaryElement: earth
+  primaryElement: Earth
   biomes:
     - biome: Floodplain
       altitude: LowerMontane
diff --git a/game_data/spells/aging_bolt.yaml b/game_data/spells/aging_bolt.yaml
index 8a04f83..e40aab2 100644
--- a/game_data/spells/aging_bolt.yaml
+++ b/game_data/spells/aging_bolt.yaml
@@ -2,18 +2,15 @@
 data:
   name: Aging Bolt
   description: Shoot a bolt of aging magic at a target.
+  talisman:
+    shaping: Projectile
+    behavior: Damage
+    tier: Mundane
   manaCost: 1
-  castSlot: primary
-  castTime: 0
+  castSlot: Cantrip
   cooldown: 2.50
-  magic: time
-  skill: chronomancy
-  spellTier: 0
-  flags:
-    - debuff
-    - projectile
-  castCategory: projectile
-  castType: instant
+  skill: Chronomancy
+  castType: Instant
   spriteTileset: spell_projectiles
   spriteIndex: 11
   particles:
diff --git a/game_data/spells/burning_touch.yaml b/game_data/spells/burning_touch.yaml
index d283e80..4fe6404 100644
--- a/game_data/spells/burning_touch.yaml
+++ b/game_data/spells/burning_touch.yaml
@@ -10,16 +10,13 @@ header:
 data:
   name: Burning Touch
   description: Ignite a target by touch
-  manaCost: 0
-  spellTier: 0
-  castSlot: primary
-  castTime: 0
+  castSlot: Cantrip
   cooldown: 2.00
-  magic: fire
-  flags:
-    - touch
-    - instant
-  castType: instant
-  castCategory: touch
+  talisman:
+    shaping: Touch
+    behavior: Damage
+    tier: Mundane
+  skill: Pyromancy
+  castType: Instant
   spriteTileset: tileset/spell_icons.png
   spriteIndex: 0
diff --git a/game_data/spells/charged_turf.yaml b/game_data/spells/charged_turf.yaml
index 79b2989..a2bac90 100644
--- a/game_data/spells/charged_turf.yaml
+++ b/game_data/spells/charged_turf.yaml
@@ -11,14 +11,14 @@ data:
   name: Charged Turf
   description: Create an area of electrically charged turf at the target location.
   manaCost: 3
-  castSlot: secondary
-  castTime: 0
+  castSlot: Slot
   cooldown: 6.0
-  magic: lightning
-  spellTier: 3
-  flags:
-    - aoe
-  castType: instant
+  talisman:
+    shaping: AreaOfEffect
+    behavior: Damage
+    tier: Uncommon
+  skill: Fulgomancy
+  castType: Instant
   castCategory: ground
   spriteTileset: tileset/ground_effects.png
   spriteIndex: 0
diff --git a/game_data/spells/death_bolt.yaml b/game_data/spells/death_bolt.yaml
index 3e02cfe..cb57855 100644
--- a/game_data/spells/death_bolt.yaml
+++ b/game_data/spells/death_bolt.yaml
@@ -10,18 +10,17 @@ header:
 data:
   name: Death Bolt
   description: Launch a homing bolt of death energy at a target.
-  manaCost: 0
-  castSlot: primary
-  castTime: 0
+  castSlot: Cantrip
   cooldown: 7.5
-  magic: death
-  spellTier: 2
+  baseDamage: 3
+  talisman:
+    shaping: Projectile
+    behavior: Damage
+    tier: Common
+  skill: Mortomancy
   spriteTileset: spell_projectiles
   spriteIndex: 0
-  flags:
-    - projectile
-  castType: instant
-  castCategory: projectile
+  castType: Instant
   particles:
     - attachment: Projectile
       particleId: death-bolt
diff --git a/game_data/spells/death_dart.yaml b/game_data/spells/death_dart.yaml
index d0b7d7c..1b122f8 100644
--- a/game_data/spells/death_dart.yaml
+++ b/game_data/spells/death_dart.yaml
@@ -10,18 +10,17 @@ header:
 data:
   name: Death Dart
   description: Launch a dart of death energy at the target.
-  manaCost: 0
-  castSlot: primary
-  castTime: 0
+  castSlot: Cantrip
   cooldown: 7.5
-  magic: death
-  spellTier: 0
+  skill: Mortomancy
   spriteTileset: spell_projectiles
   spriteIndex: 1
-  flags:
-    - projectile
-  castType: instant
-  castCategory: projectile
+  baseDamage: 1
+  talisman:
+    shaping: Projectile
+    behavior: Damage
+    tier: Mundane
+  castType: Instant
   particles:
     - attachment: Projectile
       particleId: death-dart
diff --git a/game_data/spells/enhance_strength.yaml b/game_data/spells/enhance_strength.yaml
index fe9e9a3..986d255 100644
--- a/game_data/spells/enhance_strength.yaml
+++ b/game_data/spells/enhance_strength.yaml
@@ -11,14 +11,13 @@ data:
   name: Enhance Strength
   description: Enhance the strength of the target (typically the caster).
   manaCost: 2
-  castSlot: secondary
-  castTime: 0
+  castType: Instant
+  castSlot: Slot
   cooldown: .10
-  magic: enhancement
-  spellTier: 0
-  flags:
-    - buff
-  castType: instant
-  castCategory: onSelf
   spriteTileset: tileset/spell_icons.png
   spriteIndex: 0
+  talisman:
+    shaping: OnSelf
+    behavior: Buff
+    tier: Mundane
+  skill: Ampiliomancy
diff --git a/game_data/spells/fire_bolt.yaml b/game_data/spells/fire_bolt.yaml
index 55a2797..95b44af 100644
--- a/game_data/spells/fire_bolt.yaml
+++ b/game_data/spells/fire_bolt.yaml
@@ -10,15 +10,14 @@ header:
 data:
   name: Fire Bolt
   description: Propel a mote of flame at your target.
-  manaCost: 0
-  spellTier: 0
-  magic: fire
-  castSlot: primary
-  castTime: 0
+  castSlot: Cantrip
   cooldown: 1.50
   spriteTileset: spell_projectiles
   spriteIndex: 2
-  flags:
-    - projectile
-  castType: instant
-  castCategory: projectile
+  castType: Instant
+  talisman:
+    shaping: Projectile
+    behavior: Damage
+    tier: Common
+  baseDamage: 2
+  skill: Pyromancy
diff --git a/game_data/spells/fire_pillar.yaml b/game_data/spells/fire_pillar.yaml
index 3abba9c..0fdb777 100644
--- a/game_data/spells/fire_pillar.yaml
+++ b/game_data/spells/fire_pillar.yaml
@@ -11,14 +11,13 @@ data:
   name: Fire Pillar
   description: Create a pillar of flames at the target location.
   manaCost: 2
-  castSlot: secondary
-  castTime: 0
+  castSlot: Slot
   cooldown: 3.30
-  magic: fire
-  spellTier: 2
-  flags:
-    - wall
-  castType: instant
-  castCategory: ground
+  castType: Instant
   spriteTileset: tileset/ground_effects.png
   spriteIndex: 0
+  talisman:
+    shaping: AreaOfEffect
+    behavior: Utility
+    tier: Uncommon
+  skill: Pyromancy
diff --git a/game_data/spells/fireball.yaml b/game_data/spells/fireball.yaml
index 0a589ec..560042f 100644
--- a/game_data/spells/fireball.yaml
+++ b/game_data/spells/fireball.yaml
@@ -11,8 +11,13 @@ data:
   name: Fireball
   description: Launch a ball of fire that explodes on contact.
   manaCost: 3
-  castSlot: secondary
-  castTime: 0
+  castSlot: Slot
   cooldown: 5
-  magic: fire
-  spellTier: 3
+  talisman:
+    shaping: Projectile
+    behavior: Damage
+    tier: Uncommon
+  skill: Pyromancy
+  castType: Instant
+  spriteTileset: placeholder
+  spriteIndex: 0
diff --git a/game_data/spells/flame_burst.yaml b/game_data/spells/flame_burst.yaml
index ac2b9d7..55a19dc 100644
--- a/game_data/spells/flame_burst.yaml
+++ b/game_data/spells/flame_burst.yaml
@@ -10,12 +10,15 @@ header:
 data:
   name: Flame Burst
   description: Send a cloud of flame towards your target
-  castSlot: secondary
+  castSlot: Slot
   spellTier: 1
   manaCost: 1
-  castTime: 0
   cooldown: 3
-  magic: fire
-  tags:
-    - cone
-    - aoe
+  talisman:
+    shaping: Cone
+    behavior: Damage
+    tier: Common
+  skill: Pyromancy
+  castType: Instant
+  spriteTileset: placeholder
+  spriteIndex: 0
diff --git a/game_data/spells/flamethrower.yaml b/game_data/spells/flamethrower.yaml
index b0168a0..53aa9fb 100644
--- a/game_data/spells/flamethrower.yaml
+++ b/game_data/spells/flamethrower.yaml
@@ -10,13 +10,15 @@ header:
 data:
   name: Flamethrower
   description: Sustain a fiery stream of flames.
-  magic: fire
-  spellTier: 2
+  talisman:
+    shaping: Line
+    behavior: Damage
+    tier: Uncommon
+  skill: Pyromancy
+  castType: Channel
+  spriteTileset: placeholder
+  spriteIndex: 0
   cooldown: 5.00
   castTime: 1.50
   manaCost: 1
-  castSlot: secondary
-  flags:
-    - sustained
-    - line
-    - aoe
+  castSlot: Slot
diff --git a/game_data/spells/flash.yaml b/game_data/spells/flash.yaml
index 05bf5c6..7be63b1 100644
--- a/game_data/spells/flash.yaml
+++ b/game_data/spells/flash.yaml
@@ -10,9 +10,13 @@ header:
 data:
   name: Flash
   description: Create a blinding flash of light.
-  manaCost: 0
-  castSlot: secondary
-  castTime: 0
+  castSlot: Slot
   cooldown: 3.50
-  magic: light
-  spellTier: 0
+  talisman:
+    shaping: AreaOfEffect
+    behavior: Utility
+    tier: Mundane
+  skill: Photomancy
+  castType: Instant
+  spriteTileset: placeholder
+  spriteIndex: 0
diff --git a/game_data/spells/freeze_ray.yaml b/game_data/spells/freeze_ray.yaml
index 7470d66..992cf0d 100644
--- a/game_data/spells/freeze_ray.yaml
+++ b/game_data/spells/freeze_ray.yaml
@@ -10,9 +10,15 @@ header:
 data:
   name: Freeze Ray
   description: Launch a ray of freezing magic towards your target.
+  talisman:
+    shaping: Line
+    behavior: Damage
+    tier: Uncommon
+  skill: Cryomancy
+  castType: Cast
+  spriteTileset: placeholder
+  spriteIndex: 0
   manaCost: 2
-  castSlot: secondary
+  castSlot: Slot
   castTime: 5.0
   cooldown: 3.00
-  magic: ice
-  spellTier: 2
diff --git a/game_data/spells/geyser.yaml b/game_data/spells/geyser.yaml
index 9799e92..8cf9948 100644
--- a/game_data/spells/geyser.yaml
+++ b/game_data/spells/geyser.yaml
@@ -11,9 +11,14 @@ data:
   name: Geyser
   description: Cause a geyser of scalding water to erupt.
   manaCost: 3
-  castSlot: secondary
+  castSlot: Slot
   castTime: .15
   cooldown: 5.00
-  castType: cast
-  magic: water
-  spellTier: 3
+  castType: Cast
+  talisman:
+    shaping: AreaOfEffect
+    behavior: Utility
+    tier: Uncommon
+  skill: Hydromancy
+  spriteTileset: placeholder
+  spriteIndex: 0
diff --git a/game_data/spells/gust.yaml b/game_data/spells/gust.yaml
index ba61a74..dbbf196 100644
--- a/game_data/spells/gust.yaml
+++ b/game_data/spells/gust.yaml
@@ -10,11 +10,13 @@ header:
 data:
   name: Gust
   description: Shoot a gust of air at the target.
-  manaCost: 0
-  castSlot: primary
-  castTime: 0
+  castSlot: Cantrip
   cooldown: 5.0
-  magic: air
-  spellTier: 0
   spriteTileset: spell_projectiles
   spriteIndex: 3
+  talisman:
+    shaping: Projectile
+    behavior: Damage
+    tier: Mundane
+  skill: Aeromancy
+  castType: Instant
diff --git a/game_data/spells/ice_dart.yaml b/game_data/spells/ice_dart.yaml
index 691f916..1039669 100644
--- a/game_data/spells/ice_dart.yaml
+++ b/game_data/spells/ice_dart.yaml
@@ -10,17 +10,16 @@ header:
 data:
   name: Ice Dart
   description: Shoot a dart of ice at your target.
-  manaCost: 0
-  castSlot: primary
-  castTime: 0
   cooldown: .33
-  magic: ice
-  spellTier: 0
   spriteTileset: spell_projectiles
   spriteIndex: 4
-  flags: []
-  castType: instant
-  castCategory: projectile
+  talisman:
+    shaping: Projectile
+    behavior: Damage
+    tier: Mundane
+  skill: Cryomancy
+  castSlot: Cantrip
+  castType: Instant
   particles:
     - attachment: Projectile
       particleId: ice-dart
diff --git a/game_data/spells/ice_patch.yaml b/game_data/spells/ice_patch.yaml
index a3226e8..6f0a876 100644
--- a/game_data/spells/ice_patch.yaml
+++ b/game_data/spells/ice_patch.yaml
@@ -11,9 +11,14 @@ data:
   name: Ice Patch
   description: Conjure a sheet of ice on the ground.
   manaCost: 3
-  castSlot: secondary
+  castSlot: Slot
   castTime: .25
   cooldown: 6.00
-  castType: cast
-  magic: ice
-  spellTier: 3
+  castType: Cast
+  talisman:
+    shaping: AreaOfEffect
+    behavior: Debuff
+    tier: Rare
+  skill: Cryomancy
+  spriteTileset: placeholder
+  spriteIndex: 0
diff --git a/game_data/spells/ice_pillar.yaml b/game_data/spells/ice_pillar.yaml
index 858cfbd..b300249 100644
--- a/game_data/spells/ice_pillar.yaml
+++ b/game_data/spells/ice_pillar.yaml
@@ -10,14 +10,16 @@ header:
 data:
   name: Ice Pillar
   description: A frozen pillar of ice forms at a target location.
-  castSlot: secondary
+  castSlot: Slot
   castTime: 1
   cooldown: 5
   manaCost: 1
+  talisman:
+    shaping: AreaOfEffect
+    behavior: Utility
+    tier: Uncommon
+  skill: Cryomancy
+  castType: Cast
+  spriteTileset: placeholder
+  spriteIndex: 0
   spellTier: 1
-  magic: ice
-  flags:
-    - target
-    - aoe
-    - ground
-    - wall
diff --git a/game_data/spells/ice_spike.yaml b/game_data/spells/ice_spike.yaml
index e86dd48..64cbd98 100644
--- a/game_data/spells/ice_spike.yaml
+++ b/game_data/spells/ice_spike.yaml
@@ -11,12 +11,17 @@ data:
   name: Ice Spike
   description: Launch a spike of ice at your target.
   manaCost: 2
-  castSlot: secondary
-  castTime: 0
+  castSlot: Slot
   cooldown: 5
-  magic: ice
-  spellTier: 3
-  long_description: >-
+  talisman:
+    shaping: Projectile
+    behavior: Damage
+    tier: Rare
+  skill: Cryomancy
+  castType: Instant
+  spriteTileset: placeholder
+  spriteIndex: 0
+  lore: >-
     Launch a wickedly sharp spike of ice towards your target. In practice, the spike has such momentum to be able to go straight through your
     practice target.
 
diff --git a/game_data/spells/lightning_ball.yaml b/game_data/spells/lightning_ball.yaml
index 1e6a8d3..969e401 100644
--- a/game_data/spells/lightning_ball.yaml
+++ b/game_data/spells/lightning_ball.yaml
@@ -10,10 +10,14 @@ header:
 data:
   name: Lightning Ball
   description: Launch a ball of pure lightning towards a target.
-  manaCost: 0
-  castSlot: primary
-  castTime: 0
+  castSlot: Slot
   cooldown: 1.75
-  magic: lightning
-  spellTier: 3
   long_description: As the ball travels it will launch a lightning bolt at the closest target to it up to 4 times before its exhausted.
+  talisman:
+    shaping: Projectile
+    behavior: Damage
+    tier: Rare
+  skill: Fulgomancy
+  castType: Instant
+  spriteTileset: placeholder
+  spriteIndex: 0
diff --git a/game_data/spells/lightning_bolt.yaml b/game_data/spells/lightning_bolt.yaml
index 4aefa03..562c74f 100644
--- a/game_data/spells/lightning_bolt.yaml
+++ b/game_data/spells/lightning_bolt.yaml
@@ -10,11 +10,13 @@ header:
 data:
   name: Lightning Bolt
   description: Shoot a bolt of lightning at a target.
-  manaCost: 0
-  castSlot: primary
-  castTime: 0
+  castSlot: Cantrip
   cooldown: 1
-  magic: lightning
-  spellTier: 1
   spriteTileset: spell_projectiles
   spriteIndex: 9
+  talisman:
+    shaping: Projectile
+    behavior: Damage
+    tier: Common
+  skill: Fulgomancy
+  castType: Instant
diff --git a/game_data/spells/lightning_storm.yaml b/game_data/spells/lightning_storm.yaml
index a24b7f1..3659239 100644
--- a/game_data/spells/lightning_storm.yaml
+++ b/game_data/spells/lightning_storm.yaml
@@ -11,9 +11,14 @@ data:
   name: Lightning Storm
   description: Create a localized storm of lightning at a target location.
   manaCost: 2
-  castSlot: secondary
-  castTime: 0
+  castSlot: Slot
   cooldown: 4
-  magic: lightning
-  spellTier: 2
   long_description: Constantly has lightning coming down for a short duration.
+  talisman:
+    shaping: AreaOfEffect
+    behavior: Damage
+    tier: Uncommon
+  skill: Fulgomancy
+  castType: Instant
+  spriteTileset: placeholder
+  spriteIndex: 0
diff --git a/game_data/spells/magic_mirror.yaml b/game_data/spells/magic_mirror.yaml
index dbc21fd..978025c 100644
--- a/game_data/spells/magic_mirror.yaml
+++ b/game_data/spells/magic_mirror.yaml
@@ -11,8 +11,13 @@ data:
   name: Magic Mirror
   description: Create a wall of arcane energy which negates magic that passes through it.
   manaCost: 1
-  castSlot: secondary
-  castTime: 0
+  castSlot: Slot
   cooldown: 4.25
-  magic: arcane
-  spellTier: 0
+  talisman:
+    shaping: AreaOfEffect
+    behavior: Utility
+    tier: Common
+  skill: Arcanomancy
+  castType: Instant
+  spriteTileset: placeholder
+  spriteIndex: 0
diff --git a/game_data/spells/magic_missile.yaml b/game_data/spells/magic_missile.yaml
index 78c912c..0148e55 100644
--- a/game_data/spells/magic_missile.yaml
+++ b/game_data/spells/magic_missile.yaml
@@ -10,11 +10,13 @@ header:
 data:
   name: Magic Missile
   description: Shoot a magic missile at the target.
-  manaCost: 0
-  castSlot: primary
-  castTime: 0
   cooldown: .25
-  magic: force
-  spellTier: 0
   spriteTileset: spell_projectiles
   spriteIndex: 6
+  talisman:
+    shaping: Projectile
+    behavior: Damage
+    tier: Mundane
+  skill: Arcanomancy
+  castSlot: Cantrip
+  castType: Instant
diff --git a/game_data/spells/mana_dart.yaml b/game_data/spells/mana_dart.yaml
index 5a953ac..be38723 100644
--- a/game_data/spells/mana_dart.yaml
+++ b/game_data/spells/mana_dart.yaml
@@ -11,11 +11,14 @@ data:
   name: Mana Dart
   description: Shoot a dart of compressed mana at the target.
   manaCost: 1
-  castSlot: primary
-  castTime: 0
   cooldown: .10
-  magic: arcane
-  spellTier: 0
-  long_description: It takes mana to make mana.
+  lore: It takes mana to make mana.
   spriteTileset: spell_projectiles
   spriteIndex: 7
+  talisman:
+    shaping: Projectile
+    behavior: Damage
+    tier: Mundane
+  skill: Arcanomancy
+  castSlot: Cantrip
+  castType: Instant
diff --git a/game_data/spells/mini_black_hole.yaml b/game_data/spells/mini_black_hole.yaml
index 6043ab7..f2887bf 100644
--- a/game_data/spells/mini_black_hole.yaml
+++ b/game_data/spells/mini_black_hole.yaml
@@ -11,12 +11,15 @@ data:
   name: Miniature Black Hole
   description: Launch a magically stable, miniature black hole towards a target.
   manaCost: 2
-  castSlot: secondary
-  castTime: 0
+  castSlot: Slot
   cooldown: 5.75
-  magic: dark
-  spellTier: 3
   spriteTileset: spell_projectiles
   spriteIndex: 0
-  long_description:
+  lore:
     As the black hole travels, the area it affects becomes larger and larger. Though magically stable, it can also affect the caster.
+  talisman:
+    shaping: Projectile
+    behavior: Damage
+    tier: Uncommon
+  skill: Umbramancy
+  castType: Instant
diff --git a/game_data/spells/mud_splatter.yaml b/game_data/spells/mud_splatter.yaml
index 03793a0..95c35e3 100644
--- a/game_data/spells/mud_splatter.yaml
+++ b/game_data/spells/mud_splatter.yaml
@@ -11,8 +11,13 @@ data:
   name: Mud Splatter
   description: Launch a bunch of mud and rocks towards the target.
   manaCost: 2
-  castSlot: secondary
-  castTime: 0
   cooldown: 5
-  magic: earth
-  spellTier: 3
+  talisman:
+    shaping: Projectile
+    behavior: Damage
+    tier: Uncommon
+  skill: Geomancy
+  castSlot: Slot
+  castType: Instant
+  spriteTileset: placeholder
+  spriteIndex: 0
diff --git a/game_data/spells/nature_bolt.yaml b/game_data/spells/nature_bolt.yaml
index 12d187c..d3de26e 100644
--- a/game_data/spells/nature_bolt.yaml
+++ b/game_data/spells/nature_bolt.yaml
@@ -10,11 +10,13 @@ header:
 data:
   name: Nature Bolt
   description: Shoot a bundle of razor sharp leaves at the target.
-  manaCost: 0
-  castSlot: primary
-  castTime: 0
   cooldown: 5.0
-  magic: life
-  spellTier: 0
   spriteTileset: spell_projectiles
   spriteIndex: 8
+  talisman:
+    shaping: Projectile
+    behavior: Damage
+    tier: Mundane
+  skill: Vitomancy
+  castSlot: Cantrip
+  castType: Instant
diff --git a/game_data/spells/overgrowth.yaml b/game_data/spells/overgrowth.yaml
index cb158dd..bae3d99 100644
--- a/game_data/spells/overgrowth.yaml
+++ b/game_data/spells/overgrowth.yaml
@@ -11,9 +11,14 @@ data:
   name: Overgrown
   description: Grow a wall of plants at the target location.
   manaCost: 2
-  castSlot: secondary
+  castSlot: Slot
   castTime: .15
   cooldown: 4.00
-  castType: cast
-  magic: life
-  spellTier: 0
+  castType: Cast
+  talisman:
+    shaping: AreaOfEffect
+    behavior: Utility
+    tier: Mundane
+  skill: Vitomancy
+  spriteTileset: placeholder
+  spriteIndex: 0
diff --git a/game_data/spells/path_of_coals.yaml b/game_data/spells/path_of_coals.yaml
index 24caf4d..37f0cd4 100644
--- a/game_data/spells/path_of_coals.yaml
+++ b/game_data/spells/path_of_coals.yaml
@@ -11,8 +11,13 @@ data:
   name: Path of Coals
   description: Create an area of burning hot coals on the ground.
   manaCost: 2
-  castSlot: secondary
-  castTime: 0
+  castSlot: Slot
   cooldown: 2.50
-  magic: fire
-  spellTier: 2
+  talisman:
+    shaping: AreaOfEffect
+    behavior: Damage
+    tier: Uncommon
+  skill: Pyromancy
+  castType: Instant
+  spriteTileset: placeholder
+  spriteIndex: 0
diff --git a/game_data/spells/quicksand.yaml b/game_data/spells/quicksand.yaml
index 864a8af..ff7b38b 100644
--- a/game_data/spells/quicksand.yaml
+++ b/game_data/spells/quicksand.yaml
@@ -11,9 +11,14 @@ data:
   name: Quicksand
   description: Create an area of quicksand at the target location.
   manaCost: 4
-  castSlot: secondary
+  castSlot: Slot
   castTime: .15
   cooldown: 8.00
-  castType: cast
-  magic: earth
-  spellTier: 4
+  castType: Cast
+  talisman:
+    shaping: AreaOfEffect
+    behavior: Debuff
+    tier: Rare
+  skill: Geomancy
+  spriteTileset: placeholder
+  spriteIndex: 0
diff --git a/game_data/spells/reduce_strength.yaml b/game_data/spells/reduce_strength.yaml
index 2133307..5b41004 100644
--- a/game_data/spells/reduce_strength.yaml
+++ b/game_data/spells/reduce_strength.yaml
@@ -11,8 +11,13 @@ data:
   name: Reduce Strength
   description: Reduce the strength of the target.
   manaCost: 2
-  castSlot: secondary
-  castTime: 0
+  castSlot: Slot
   cooldown: 5
-  magic: reduction
-  spellTier: 0
+  talisman:
+    shaping: Projectile
+    behavior: Debuff
+    tier: Common
+  skill: Diminiomancy
+  castType: Instant
+  spriteTileset: placeholder
+  spriteIndex: 0
diff --git a/game_data/spells/rock_pillar.yaml b/game_data/spells/rock_pillar.yaml
index 0910170..1c7f683 100644
--- a/game_data/spells/rock_pillar.yaml
+++ b/game_data/spells/rock_pillar.yaml
@@ -11,8 +11,13 @@ data:
   name: Rock Pillar
   description: Summon a pillar of rock at the target location.
   manaCost: 2
-  castSlot: secondary
-  castTime: 0
   cooldown: 2.50
-  magic: earth
-  spellTier: 2
+  talisman:
+    shaping: AreaOfEffect
+    behavior: Utility
+    tier: Uncommon
+  skill: Geomancy
+  castSlot: Slot
+  castType: Instant
+  spriteTileset: placeholder
+  spriteIndex: 0
diff --git a/game_data/spells/snares.yaml b/game_data/spells/snares.yaml
index ce6e27f..b94d711 100644
--- a/game_data/spells/snares.yaml
+++ b/game_data/spells/snares.yaml
@@ -9,11 +9,16 @@ header:
   validGameInternalVersion: 1
 data:
   name: Snares
-  description: Create an area of excellerated root growth, ensnaring entities that walk through.
+  description: Create an area of accelerated root growth, ensnaring entities that walk through.
   manaCost: 3
-  castSlot: secondary
   castTime: .15
   cooldown: 5.00
-  castType: cast
-  magic: life
-  spellTier: 1
+  talisman:
+    shaping: AreaOfEffect
+    behavior: Debuff
+    tier: Rare
+  skill: Vitomancy
+  castSlot: Slot
+  castType: Instant
+  spriteTileset: placeholder
+  spriteIndex: 0
diff --git a/game_data/spells/spark.yaml b/game_data/spells/spark.yaml
index 76c6f94..ae8d694 100644
--- a/game_data/spells/spark.yaml
+++ b/game_data/spells/spark.yaml
@@ -10,20 +10,16 @@ header:
 data:
   name: Spark
   description: Shoot a spark of electricity at your target.
-  spellTier: 0
-  magic: lightning
-  castSlot: primary
-  manaCost: 0
-  castTime: 0
+  castSlot: Cantrip
   cooldown: 2.50
-  flags:
-    - instant
-    - target
-    - homing
+  talisman:
+    shaping: Projectile
+    behavior: Damage
+    tier: Mundane
+  skill: Fulgomancy
   spriteTileset: spell_projectiles
   spriteIndex: 9
-  castCategory: projectile
-  castType: instant
+  castType: Instant
   particles:
     - attachment: Projectile
       particleId: spark
diff --git a/game_data/spells/stone_dart.yaml b/game_data/spells/stone_dart.yaml
index ec9c649..1b9749c 100644
--- a/game_data/spells/stone_dart.yaml
+++ b/game_data/spells/stone_dart.yaml
@@ -10,11 +10,13 @@ header:
 data:
   name: Stone Dart
   description: Shoot a dart of rock at your target.
-  manaCost: 0
-  castSlot: primary
-  castTime: 0
   cooldown: .33
-  magic: earth
-  spellTier: 0
   spriteTileset: spell_projectiles
   spriteIndex: 10
+  talisman:
+    shaping: Projectile
+    behavior: Damage
+    tier: Mundane
+  skill: Geomancy
+  castSlot: Cantrip
+  castType: Instant
diff --git a/game_data/spells/summon_imp.yaml b/game_data/spells/summon_imp.yaml
index 18ab676..9176417 100644
--- a/game_data/spells/summon_imp.yaml
+++ b/game_data/spells/summon_imp.yaml
@@ -11,8 +11,13 @@ data:
   name: Summon Imp
   description: Summon an imp to fight for you.
   manaCost: 1
-  castSlot: primary
-  castTime: 0
   cooldown: 2
-  magic: summoning
-  spellTier: 0
+  talisman:
+    shaping: OnSelf
+    behavior: Summon
+    tier: Mundane
+  skill: Citomancy
+  castSlot: Cantrip
+  castType: Instant
+  spriteTileset: placeholder
+  spriteIndex: 0
diff --git a/game_data/spells/summon_undead.yaml b/game_data/spells/summon_undead.yaml
index 9c10d22..f55b39a 100644
--- a/game_data/spells/summon_undead.yaml
+++ b/game_data/spells/summon_undead.yaml
@@ -10,9 +10,13 @@ header:
 data:
   name: Summon Undead (Basic)
   description: Summon a random basic-tier undead at a location.
-  manaCost: 0
-  castSlot: primary
-  castTime: 0
   cooldown: 5
-  magic: necromancy
-  spellTier: 0
+  talisman:
+    shaping: OnSelf
+    behavior: Summon
+    tier: Mundane
+  skill: Necromancy
+  castSlot: Cantrip
+  castType: Instant
+  spriteTileset: placeholder
+  spriteIndex: 0
diff --git a/game_data/spells/tornado.yaml b/game_data/spells/tornado.yaml
index 6d9f45f..aadc4f5 100644
--- a/game_data/spells/tornado.yaml
+++ b/game_data/spells/tornado.yaml
@@ -11,9 +11,14 @@ data:
   name: Tornado
   description: Summon a tornado at the target location.
   manaCost: 2
-  castSlot: secondary
+  castSlot: Slot
   castTime: 5.0
   cooldown: 5.00
-  castType: cast
-  magic: air
-  spellTier: 2
+  castType: Cast
+  talisman:
+    shaping: AreaOfEffect
+    behavior: Damage
+    tier: Rare
+  skill: Aeromancy
+  spriteTileset: placeholder
+  spriteIndex: 0
diff --git a/game_data/spells/transform_into_ogre.yaml b/game_data/spells/transform_into_ogre.yaml
index d3d2d2e..3f29128 100644
--- a/game_data/spells/transform_into_ogre.yaml
+++ b/game_data/spells/transform_into_ogre.yaml
@@ -11,8 +11,13 @@ data:
   name: Transform into Ogre
   description: Polymorph yourself into an ogre.
   manaCost: 4
-  castSlot: secondary
-  castTime: 0
+  castSlot: Slot
   cooldown: .20
-  magic: polymorph
-  spellTier: 0
+  talisman:
+    shaping: OnSelf
+    behavior: Buff
+    tier: Uncommon
+  skill: Mutatiomancy
+  castType: Instant
+  spriteTileset: placeholder
+  spriteIndex: 0
diff --git a/game_data/spells/undead_zone.yaml b/game_data/spells/undead_zone.yaml
index a1f66fa..9d05420 100644
--- a/game_data/spells/undead_zone.yaml
+++ b/game_data/spells/undead_zone.yaml
@@ -11,8 +11,14 @@ data:
   name: Zone of Undeath
   description: Create an area with a necrotic area. Enemies that die within have a chance to turn into your undead.
   manaCost: 3
-  castSlot: secondary
   castTime: 1
   cooldown: 7
-  magic: necromancy
-  spellTier: 3
+  talisman:
+    shaping: AreaOfEffect
+    behavior: Debuff
+    tier: Uncommon
+  skill: Necromancy
+  castSlot: Slot
+  castType: Cast
+  spriteTileset: placeholder
+  spriteIndex: 0
diff --git a/game_data/spells/updrafts.yaml b/game_data/spells/updrafts.yaml
index aee6872..4c12d0e 100644
--- a/game_data/spells/updrafts.yaml
+++ b/game_data/spells/updrafts.yaml
@@ -11,9 +11,14 @@ data:
   name: Updraft
   description: Create an area with a strong updraft.
   manaCost: 3
-  castSlot: secondary
-  castTime: 0
   cooldown: 6
-  magic: air
-  spellTier: 3
-  long_description: Entities entering the updraft area are buffeted upward and move slowly through it. Caster gets a speed boost.
+  lore: Entities entering the updraft area are buffeted upward and move slowly through it. Caster gets a speed boost.
+  talisman:
+    shaping: AreaOfEffect
+    behavior: Debuff
+    tier: Uncommon
+  skill: Aeromancy
+  castSlot: Slot
+  castType: Instant
+  spriteTileset: placeholder
+  spriteIndex: 0
diff --git a/game_data/spells/vine_whip.yaml b/game_data/spells/vine_whip.yaml
index 0172f7f..2385911 100644
--- a/game_data/spells/vine_whip.yaml
+++ b/game_data/spells/vine_whip.yaml
@@ -10,10 +10,14 @@ header:
 data:
   name: Vine Whip
   description: Create a vine and whip it towards the target.
-  manaCost: 0
-  castSlot: primary
-  castTime: 0
   cooldown: 1.25
-  magic: life
-  spellTier: 1
-  long_description: Can be whipped up to 3 times.
+  lore: Can be whipped up to 3 times.
+  talisman:
+    shaping: Melee
+    behavior: Damage
+    tier: Mundane
+  skill: Vitomancy
+  castSlot: Cantrip
+  castType: Instant
+  spriteTileset: placeholder
+  spriteIndex: 0
diff --git a/game_data/spells/water_bolt.yaml b/game_data/spells/water_bolt.yaml
index 5d19f4f..1ad54a2 100644
--- a/game_data/spells/water_bolt.yaml
+++ b/game_data/spells/water_bolt.yaml
@@ -10,17 +10,16 @@ header:
 data:
   name: Water Bolt
   description: Send a glob of water at your target.
-  manaCost: 0
-  castSlot: primary
-  castTime: 0
   cooldown: 2
-  magic: water
-  spellTier: 0
   spriteTileset: spell_projectiles
   spriteIndex: 12
-  flags: []
-  castType: instant
-  castCategory: projectile
+  talisman:
+    shaping: Projectile
+    behavior: Damage
+    tier: Mundane
+  skill: Hydromancy
+  castSlot: Cantrip
+  castType: Instant
   particles:
     - attachment: Projectile
       particleId: water-bolt
diff --git a/game_data/spells/water_jet.yaml b/game_data/spells/water_jet.yaml
index 3c2591c..63154d4 100644
--- a/game_data/spells/water_jet.yaml
+++ b/game_data/spells/water_jet.yaml
@@ -11,8 +11,13 @@ data:
   name: Water Jet
   description: Spray a powerful jet of water at your target.
   manaCost: 1
-  castSlot: secondary
-  castTime: 0
   cooldown: 2.50
-  magic: water
-  spellTier: 2
+  talisman:
+    shaping: Cone
+    behavior: Damage
+    tier: Uncommon
+  skill: Hydromancy
+  castSlot: Slot
+  castType: Instant
+  spriteTileset: placeholder
+  spriteIndex: 0
diff --git a/game_data/spells/whirlpool.yaml b/game_data/spells/whirlpool.yaml
index fce395c..5ad4364 100644
--- a/game_data/spells/whirlpool.yaml
+++ b/game_data/spells/whirlpool.yaml
@@ -11,8 +11,13 @@ data:
   name: Whirlpool
   description: Create a whirlpool that pulls those stuck in it towards it center.
   manaCost: 3
-  castSlot: defensive
-  castTime: 0
   cooldown: 8
-  magic: water
-  spellTier: 2
+  talisman:
+    shaping: AreaOfEffect
+    behavior: Debuff
+    tier: Uncommon
+  skill: Hydromancy
+  castSlot: Slot
+  castType: Instant
+  spriteTileset: placeholder
+  spriteIndex: 0
diff --git a/game_data/spells/wind.yaml b/game_data/spells/wind.yaml
index e439177..005678b 100644
--- a/game_data/spells/wind.yaml
+++ b/game_data/spells/wind.yaml
@@ -11,8 +11,14 @@ data:
   name: Wind
   description: Sustain a gust of wind away from the caster.
   manaCost: 1
-  castSlot: secondary
-  castTime: 0
+  castTime: 0.5
   cooldown: 2.50
-  magic: air
-  spellTier: 1
+  talisman:
+    shaping: Cone
+    behavior: Damage
+    tier: Uncommon
+  skill: Aeromancy
+  castSlot: Slot
+  castType: Channel
+  spriteTileset: placeholder
+  spriteIndex: 0
diff --git a/game_data/spells/zone_of_charm.yaml b/game_data/spells/zone_of_charm.yaml
index b1fbf99..2dc3105 100644
--- a/game_data/spells/zone_of_charm.yaml
+++ b/game_data/spells/zone_of_charm.yaml
@@ -11,12 +11,17 @@ data:
   name: Zone of Charming
   description: Create an area with an aura of charm magic at the target location.
   manaCost: 3
-  castSlot: secondary
+  castSlot: Slot
   castTime: .25
   cooldown: 5.00
-  castType: cast
-  magic: arcane
-  spellTier: 3
-  long_description:
+  castType: Cast
+  talisman:
+    shaping: AreaOfEffect
+    behavior: Debuff
+    tier: Rare
+  skill: Arcanomancy
+  spriteTileset: placeholder
+  spriteIndex: 0
+  lore:
     Entities already in the zone when it's cast become charmed instantly, fighting for the caster. Entities entering after the zone has been
     created take a bit of time before becoming charmed.
diff --git a/game_data/sprites/player.yml b/game_data/sprites/player.yml
new file mode 100644
index 0000000..c7479a3
--- /dev/null
+++ b/game_data/sprites/player.yml
@@ -0,0 +1,40 @@
+# yaml-language-server: $schema=https://schemas.nwest.one/games/elementalist/sprite.json
+header:
+  uniqueId: player-avatar
+  system: EntitySprite
+  author: Nicholas Westerhausen
+  description: The sprite animation details for the player's avatar
+  internalVersion: 1
+  displayVersion: v1.0
+  validGameInternalVersion: 1
+data:
+  animations:
+    - state: Idle
+      tileset: wizard
+      tileIndices:
+        - 3
+      frameDuration: 0.1
+    - state: Walk
+      tileset: wizard
+      tileIndices:
+        - 0
+        - 1
+        - 0
+        - 2
+      frameDuration: 0.1
+    - state: Cast
+      tileset: wizard
+      tileIndices:
+        - 4
+        - 4
+        - 4
+        - 4
+      frameDuration: 0.1
+    - state: WalkCast
+      tileset: wizard
+      tileIndices:
+        - 5
+        - 6
+        - 7
+        - 8
+      frameDuration: 0.1
diff --git a/game_data/tilesets/backterria_ground.yml b/game_data/tilesets/backterria_ground.yml
new file mode 100644
index 0000000..3596d69
--- /dev/null
+++ b/game_data/tilesets/backterria_ground.yml
@@ -0,0 +1,19 @@
+# yaml-language-server: $schema=https://schemas.nwest.one/games/elementalist/tileset.json
+header:
+  uniqueId: backterria_ground
+  system: Tileset
+  author: Backterria
+  description: 32x32 Ground Tiles
+  internalVersion: 1
+  displayVersion: v1.0
+  validGameInternalVersion: 1
+data:
+  path: backterria/ground_32.png
+  tileWidth: 32
+  tileHeight: 32
+  tilesetWidth: 42
+  tilesetHeight: 12
+  horizontalOffset: 0
+  horizontalPadding: 0
+  verticalOffset: 0
+  verticalPadding: 0
diff --git a/game_data/tilesets/roguelike.yml b/game_data/tilesets/roguelike.yml
new file mode 100644
index 0000000..b3c5a72
--- /dev/null
+++ b/game_data/tilesets/roguelike.yml
@@ -0,0 +1,19 @@
+# yaml-language-server: $schema=https://schemas.nwest.one/games/elementalist/tileset.json
+header:
+  uniqueId: backterria-rl
+  system: Tileset
+  author: Backterria
+  description: Roguelike tileset
+  internalVersion: 1
+  displayVersion: v1.0
+  validGameInternalVersion: 1
+data:
+  path: backterria/roguelike.png
+  tileWidth: 16
+  tileHeight: 16
+  tilesetWidth: 51
+  tilesetHeight: 39
+  horizontalOffset: 0
+  horizontalPadding: 0
+  verticalOffset: 0
+  verticalPadding: 0
diff --git a/game_data/tilesets/talisman_engraving.yml b/game_data/tilesets/talisman_engraving.yml
new file mode 100644
index 0000000..04a80e3
--- /dev/null
+++ b/game_data/tilesets/talisman_engraving.yml
@@ -0,0 +1,15 @@
+# yaml-language-server: $schema=https://schemas.nwest.one/games/elementalist/tileset.json
+header:
+  uniqueId: talisman_engraving
+  author: Nicholas Westerhausen
+  description: Engravings which go on talismans
+  internalVersion: 1
+  displayVersion: v1.0
+  validGameInternalVersion: 1
+  system: Tileset
+data:
+  path: tileset/talisman_engraving.png
+  tileWidth: 16
+  tileHeight: 16
+  tilesetWidth: 8
+  tilesetHeight: 2
diff --git a/game_data/tilesets/talismans.yml b/game_data/tilesets/talismans.yml
new file mode 100644
index 0000000..e1c53a8
--- /dev/null
+++ b/game_data/tilesets/talismans.yml
@@ -0,0 +1,15 @@
+# yaml-language-server: $schema=https://schemas.nwest.one/games/elementalist/tileset.json
+header:
+  uniqueId: talismans
+  author: Nicholas Westerhausen
+  description: Base talismans before engravings
+  internalVersion: 1
+  displayVersion: v1.0
+  validGameInternalVersion: 1
+  system: Tileset
+data:
+  path: tileset/talismans.png
+  tileWidth: 32
+  tileHeight: 32
+  tilesetWidth: 4
+  tilesetHeight: 3
diff --git a/game_library/Cargo.toml b/game_library/Cargo.toml
index eb89244..7ff1eb7 100644
--- a/game_library/Cargo.toml
+++ b/game_library/Cargo.toml
@@ -1,42 +1,57 @@
 [package]
-name = "game_library"
-version = "1.5.0"
+name = "elementalist_game_library"
+version = "2.6.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+
 [dependencies]
-bevy = "0.12.1"
-bevy-inspector-egui = "0.22.1"
-bevy_hanabi = "0.9.0"
-# Local disk storage in a key-value store. Settings are stored with this.
-bevy_pkv = "0.9.1"
+bevy-inspector-egui = "0.24.0"
+bevy_hanabi = "0.10.0"
+# Local disk storage in a key-value store. Settings are stored with this. Has to track main until next release.
+bevy_pkv = { git = "https://github.com/johanhelsing/bevy_pkv", rev = "af0b750b1dbfc8db58dbb2bd07c5eda72e714b79" } # main
 noise = "0.9.0"
 serde = "1.0.198"
 serde_default_utils = "0.2.1"
-serde_yaml = "0.9.34"
+serde_yaml = "0.9.32"
 tracing = "0.1.40"
 walkdir = "2.5.0"
-bevy_rapier2d = { version = "0.24.0", features = [
+bevy_rapier2d = { version = "0.25.0", features = [
     "parallel",
     "debug-render-2d",
 ] }
+platform-dirs = "0.3.0"
+bevy_kira_audio = "0.19.0"
+
+[dependencies.bevy]
+version = "0.13"
+default-features = false
+features = [
+    "animation",
+    "bevy_asset",
+    "bevy_gilrs",
+    "bevy_scene",
+    "bevy_winit",
+    "bevy_core_pipeline",
+    "bevy_pbr",
+    "bevy_gltf",
+    "bevy_render",
+    "bevy_sprite",
+    "bevy_text",
+    "bevy_ui",
+    "multi-threaded",
+    "png",
+    "hdr",
+    "x11",
+    "bevy_gizmos",
+    "android_shared_stdcxx",
+    "tonemapping_luts",
+    "default_font",
+    "webgl2",
+    "bevy_debug_stepping",
+]
 
 [dependencies.rand]
 version = "0.8.5"
 features = ["small_rng"]
-
-
-[lints.rust]
-unsafe_code = "forbid"
-missing_docs = "deny"
-unreachable_code = "warn"
-unreachable_patterns = "warn"
-
-[lints.clippy]
-enum_glob_use = "deny"
-pedantic = "deny"
-nursery = "deny"
-unwrap_used = "deny"
-cast_possible_truncation = "allow"
-cast_precision_loss = "allow"
diff --git a/game_library/src/acceleration.rs b/game_library/src/acceleration.rs
index b294b36..fd64ec2 100644
--- a/game_library/src/acceleration.rs
+++ b/game_library/src/acceleration.rs
@@ -1,7 +1,7 @@
 //! Acceleration component
 //!
 //! Contains the acceleration component and its implementations. The acceleration component is part of
-//! the [`game_library::MovementBundle`]. It is used to store the acceleration value of an entity.
+//! the [`elementalist_game_library::MovementBundle`]. It is used to store the acceleration value of an entity.
 //! (Acceleration is the change in velocity over time).
 
 use bevy::prelude::*;
@@ -37,7 +37,7 @@ impl Acceleration {
     /// # Examples
     ///
     /// ```
-    /// use game_library::Acceleration;
+    /// use elementalist_game_library::Acceleration;
     /// use bevy::math::Vec2;
     ///
     /// let acceleration = Acceleration::new(Vec2::new(1.0, 1.0));
diff --git a/game_library/src/attribute.rs b/game_library/src/attribute.rs
index 576e49c..53e4b7f 100644
--- a/game_library/src/attribute.rs
+++ b/game_library/src/attribute.rs
@@ -8,7 +8,7 @@
 //!
 //! ```no_run
 //! use bevy::prelude::*;
-//! use game_library::Attribute;
+//! use elementalist_game_library::Attribute;
 //!
 //! #[derive(Component)]
 //! struct Health(Attribute);
@@ -93,7 +93,7 @@ impl Attribute {
     /// # Examples
     ///
     /// ```no_run
-    /// use game_library::Attribute;
+    /// use elementalist_game_library::Attribute;
     ///
     /// let mut attribute = Attribute::new(10_u32);
     /// assert_eq!(attribute.is_empty(), false);
@@ -116,7 +116,7 @@ impl Attribute {
     /// # Examples
     ///
     /// ```no_run
-    /// use game_library::Attribute;
+    /// use elementalist_game_library::Attribute;
     ///
     /// let mut attribute = Attribute::new(10_u32);
     /// assert_eq!(attribute.is_full(), true);
@@ -142,7 +142,7 @@ impl Attribute {
     /// # Examples
     ///
     /// ```no_run
-    /// use game_library::Attribute;
+    /// use elementalist_game_library::Attribute;
     ///
     /// let mut attribute = Attribute::new(10_u32);
     /// assert_eq!(attribute.remaining(), 1.0);
@@ -182,7 +182,7 @@ impl Attribute {
     /// # Examples
     ///
     /// ```no_run
-    /// use game_library::Attribute;
+    /// use elementalist_game_library::Attribute;
     ///
     /// let mut attribute = Attribute::new(10_u32);
     /// assert_eq!(attribute.percentage_remaining(), 100);
@@ -221,7 +221,7 @@ impl Attribute {
     /// # Examples
     ///
     /// ```no_run
-    /// use game_library::Attribute;
+    /// use elementalist_game_library::Attribute;
     ///
     /// let attribute = Attribute::new(10_u32);
     /// ```
@@ -247,7 +247,7 @@ impl Attribute {
     /// # Examples
     ///
     /// ```no_run
-    /// use game_library::Attribute;
+    /// use elementalist_game_library::Attribute;
     ///
     /// let attribute = Attribute::new_with_current(5_u32, 10_u32);
     ///
@@ -280,7 +280,7 @@ impl Attribute {
     /// # Examples
     ///
     /// ```no_run
-    /// use game_library::Attribute;
+    /// use elementalist_game_library::Attribute;
     ///
     /// let mut attribute = Attribute::new(10_u32);
     ///
@@ -330,7 +330,7 @@ impl Attribute {
     /// # Examples
     ///
     /// ```no_run
-    /// use game_library::Attribute;
+    /// use elementalist_game_library::Attribute;
     ///
     /// let mut attribute = Attribute::new(10_u32);
     ///
@@ -384,7 +384,7 @@ impl Attribute {
     /// # Examples
     ///
     /// ```no_run
-    /// use game_library::Attribute;
+    /// use elementalist_game_library::Attribute;
     ///
     /// let mut attribute = Attribute::new(10_u32);
     ///
@@ -411,7 +411,7 @@ impl Attribute {
     /// # Examples
     ///
     /// ```no_run
-    /// use game_library::Attribute;
+    /// use elementalist_game_library::Attribute;
     ///
     /// let mut attribute = Attribute::new_with_current(5_u32, 10_u32);
     ///
@@ -451,7 +451,7 @@ impl Attribute {
     /// # Examples
     ///
     /// ```no_run
-    /// use game_library::Attribute;
+    /// use elementalist_game_library::Attribute;
     ///
     /// let mut attribute = Attribute::new_with_current(5_u32, 10_u32);
     ///
@@ -499,7 +499,7 @@ impl Attribute {
     /// # Examples
     ///
     /// ```no_run
-    /// use game_library::Attribute;
+    /// use elementalist_game_library::Attribute;
     ///
     /// let mut attribute = Attribute::new_with_current(5_u32, 10_u32);
     ///
@@ -529,7 +529,7 @@ impl Attribute {
     /// # Examples
     ///
     /// ```no_run
-    /// use game_library::Attribute;
+    /// use elementalist_game_library::Attribute;
     ///
     /// let mut attribute = Attribute::new_with_current(5_u32, 100_u32);
     ///
@@ -567,7 +567,7 @@ impl Attribute {
     /// # Examples
     ///
     /// ```no_run
-    /// use game_library::Attribute;
+    /// use elementalist_game_library::Attribute;
     ///
     /// let mut attribute = Attribute::new_with_current(5_u32, 100_u32);
     ///
@@ -592,7 +592,7 @@ impl Attribute {
     /// # Examples
     ///
     /// ```no_run
-    /// use game_library::Attribute;
+    /// use elementalist_game_library::Attribute;
     ///
     /// let mut attribute = Attribute::new(10_u32);
     ///
@@ -620,7 +620,7 @@ impl Attribute {
     /// # Examples
     ///
     /// ```no_run
-    /// use game_library::Attribute;
+    /// use elementalist_game_library::Attribute;
     ///
     /// let mut attribute = Attribute::new(10_u32);
     ///
@@ -955,25 +955,19 @@ impl From<Attribute> for u32 {
 
 impl From<Attribute> for u16 {
     fn from(value: Attribute) -> Self {
-        Self::try_from(value.current).map_or_else(
-            |_| {
-                tracing::warn!("attribute value {} too big for u16", value.current);
-                Self::MAX
-            },
-            |value| value,
-        )
+        Self::try_from(value.current).unwrap_or_else(|_| {
+            tracing::warn!("attribute value {} too big for u16", value.current);
+            Self::MAX
+        })
     }
 }
 
 impl From<Attribute> for u8 {
     fn from(value: Attribute) -> Self {
-        Self::try_from(value.current).map_or_else(
-            |_| {
-                tracing::warn!("attribute value {} too big for u8", value.current);
-                Self::MAX
-            },
-            |value| value,
-        )
+        Self::try_from(value.current).unwrap_or_else(|_| {
+            tracing::warn!("attribute value {} too big for u8", value.current);
+            Self::MAX
+        })
     }
 }
 
@@ -985,37 +979,28 @@ impl From<Attribute> for i64 {
 
 impl From<Attribute> for i32 {
     fn from(value: Attribute) -> Self {
-        Self::try_from(value.current).map_or_else(
-            |_| {
-                tracing::warn!("attribute value {} too big for i32", value.current);
-                Self::MAX
-            },
-            |value| value,
-        )
+        Self::try_from(value.current).unwrap_or_else(|_| {
+            tracing::warn!("attribute value {} too big for i32", value.current);
+            Self::MAX
+        })
     }
 }
 
 impl From<Attribute> for i16 {
     fn from(value: Attribute) -> Self {
-        Self::try_from(value.current).map_or_else(
-            |_| {
-                tracing::warn!("attribute value {} too big for i16", value.current);
-                Self::MAX
-            },
-            |value| value,
-        )
+        Self::try_from(value.current).unwrap_or_else(|_| {
+            tracing::warn!("attribute value {} too big for i16", value.current);
+            Self::MAX
+        })
     }
 }
 
 impl From<Attribute> for i8 {
     fn from(value: Attribute) -> Self {
-        Self::try_from(value.current).map_or_else(
-            |_| {
-                tracing::warn!("attribute value {} too big for i8", value.current);
-                Self::MAX
-            },
-            |value| value,
-        )
+        Self::try_from(value.current).unwrap_or_else(|_| {
+            tracing::warn!("attribute value {} too big for i8", value.current);
+            Self::MAX
+        })
     }
 }
 
diff --git a/game_library/src/audio/mod.rs b/game_library/src/audio/mod.rs
new file mode 100644
index 0000000..9d15278
--- /dev/null
+++ b/game_library/src/audio/mod.rs
@@ -0,0 +1,14 @@
+//! Audio module for the game library. Handles audio playback and management.
+//!
+//! Things that this will contain:
+//!
+//! - Systems to respond to events (cast spell, level up, etc)
+//! - Systems to respond to game state (paused, etc)
+//!
+//! All sounds played will query the settings to determine volume, etc.
+
+mod player_interaction;
+mod plugin;
+
+#[allow(clippy::module_name_repetitions)]
+pub use plugin::AudioPlugin;
diff --git a/game_library/src/audio/player_interaction.rs b/game_library/src/audio/player_interaction.rs
new file mode 100644
index 0000000..d440980
--- /dev/null
+++ b/game_library/src/audio/player_interaction.rs
@@ -0,0 +1 @@
+//! Sounds that play in response to the player.
diff --git a/game_library/src/audio/plugin.rs b/game_library/src/audio/plugin.rs
new file mode 100644
index 0000000..c49a0b1
--- /dev/null
+++ b/game_library/src/audio/plugin.rs
@@ -0,0 +1,14 @@
+//! Plugin for audio. Adds any systems, events, resources used for our audio system.
+use bevy::prelude::*;
+
+/// Audio plugin
+#[allow(clippy::module_name_repetitions)]
+pub struct AudioPlugin;
+
+impl Plugin for AudioPlugin {
+    fn build(&self, app: &mut App) {
+        // Add the Kira audio plugin
+        app.add_plugins(bevy_kira_audio::AudioPlugin);
+        // Add our systems, etc
+    }
+}
diff --git a/game_library/src/biome.rs b/game_library/src/biome.rs
index 4715fb8..dd8fc2a 100644
--- a/game_library/src/biome.rs
+++ b/game_library/src/biome.rs
@@ -67,7 +67,7 @@ impl BiomeData {
         Some((tileset.id.as_str(), tile.tile))
     }
 
-    /// Flat map of objects against the `OJECT_POOL` for the biome.
+    /// Flat map of objects against the `OBJECT_POOL` for the biome.
     #[must_use]
     pub fn object_pool(&self, seed: u64) -> Vec<Option<&str>> {
         let mut pool = Vec::with_capacity(OBJECT_POOL);
diff --git a/game/src/resources/buttons.rs b/game_library/src/buttons.rs
similarity index 52%
rename from game/src/resources/buttons.rs
rename to game_library/src/buttons.rs
index 6779596..efe86d9 100644
--- a/game/src/resources/buttons.rs
+++ b/game_library/src/buttons.rs
@@ -1,27 +1,38 @@
-use bevy::prelude::*;
+use bevy::{ecs::system::SystemId, prelude::*};
 
-use game_library::colors;
+use crate::colors;
 
-/// Tag component used to mark which setting is currently selected
+/// Component representing a button. This component is used to create buttons in the UI.
+///
+/// Each button has a `SystemId` which should be the id of a system that will handle the button's
+/// "pressed" event. The `SystemId` is generated by calling `world.register_system` on the world.
+#[derive(Component, Clone, Debug)]
+pub struct ButtonSystem {
+    /// The id of the system that will handle the "pressed" event of the button
+    pub pressed_event: Option<SystemId>,
+    // pub hover_event: Option<SystemId>,
+    // pub reset_event: Option<SystemId>,
+}
+
+/// Tag component used to mark which setting is currently selected (e.g. in a radio group or a toggle)
 #[derive(Component)]
 pub struct SelectedOption;
 
-/// System for changing button colors when hovered, etc
-///
-/// * `interaction_query`: grabs all the buttons that have been interacted with, with the components
-///   Interaction, children, and if they are a selected option (e.g. part of a radio group). It grabs
-///   what has changed about the interaction (i.e. if it has changed at all)
-/// * `text_query`: let's us grab the text component of the button
-#[allow(clippy::type_complexity)]
-pub fn interaction_system(
-    mut interaction_query: Query<
-        (&Interaction, &Children, Option<&SelectedOption>),
-        (Changed<Interaction>, With<Button>),
+/// System which handles button events.
+pub fn handle_button_events(
+    button_query: Query<
+        (
+            &Interaction,
+            &Children,
+            &ButtonSystem,
+            Option<&SelectedOption>,
+        ),
+        Changed<Interaction>,
     >,
+    mut commands: Commands,
     mut text_query: Query<&mut Text>,
 ) {
-    // Loop through all the buttons that have been interacted with (and all the components we grabbed)
-    for (interaction, children, selected) in &mut interaction_query {
+    for (interaction, children, button_system, selected) in &button_query {
         // Try to grab the text component of the button, and if we can't we will just skip (continue)
         // We are changing the text color and not the button color because drawing big squares is dumb. :)
         let Ok(mut text) = text_query.get_mut(children[0]) else {
@@ -30,9 +41,13 @@ pub fn interaction_system(
         };
         // Match the interaction and selected option to change the text color
         // i.e., hover, not-hover & selected, pressed, and not-pressed & not selected. (or close that that)
+        // If interaction is Pressed, run the pressed event system
         match (*interaction, selected) {
             (Interaction::Pressed, _) | (Interaction::None, Some(_)) => {
                 text.sections[0].style.color = colors::SELECTED_TEXT_COLOR;
+                if let Some(pressed_event) = button_system.pressed_event {
+                    commands.run_system(pressed_event);
+                }
             }
             (Interaction::Hovered, Some(_)) => {
                 text.sections[0].style.color = colors::HOVERED_TEXT_COLOR_ALTERNATE;
diff --git a/game_library/src/camera_scale.rs b/game_library/src/camera_scale.rs
index ba89931..1b4c418 100644
--- a/game_library/src/camera_scale.rs
+++ b/game_library/src/camera_scale.rs
@@ -20,7 +20,7 @@
 //!
 //! ```no_run
 //! use bevy::prelude::*;
-//! use game_library::CameraScaleLevel;
+//! use elementalist_game_library::CameraScaleLevel;
 //!
 //! #[derive(Component)]
 //! struct MainCamera;
@@ -104,7 +104,7 @@ impl CameraScaleLevel {
     /// # Example
     ///
     /// ```no_run
-    /// use game_library::CameraScaleLevel;
+    /// use elementalist_game_library::CameraScaleLevel;
     ///
     /// let level = CameraScaleLevel::default();
     ///
@@ -121,7 +121,7 @@ impl CameraScaleLevel {
     /// # Example
     ///
     /// ```no_run
-    /// use game_library::CameraScaleLevel;
+    /// use elementalist_game_library::CameraScaleLevel;
     ///
     /// let mut level = CameraScaleLevel::default();
     ///
@@ -147,7 +147,7 @@ impl CameraScaleLevel {
     /// # Example
     ///
     /// ```no_run
-    /// use game_library::CameraScaleLevel;
+    /// use elementalist_game_library::CameraScaleLevel;
     ///
     /// let mut level = CameraScaleLevel::default();
     ///
diff --git a/game_library/src/cursor_position.rs b/game_library/src/cursor_position.rs
index 9f1453a..b35bbec 100644
--- a/game_library/src/cursor_position.rs
+++ b/game_library/src/cursor_position.rs
@@ -5,7 +5,7 @@
 //! ```no_run
 //! use bevy::prelude::*;
 //! use bevy::window::PrimaryWindow;
-//! use game_library::CursorPosition;
+//! use elementalist_game_library::CursorPosition;
 //!
 //! #[derive(Component)]
 //! struct MainCamera;
diff --git a/game_library/src/data_loader/entity_sprites.rs b/game_library/src/data_loader/entity_sprites.rs
new file mode 100644
index 0000000..38c5995
--- /dev/null
+++ b/game_library/src/data_loader/entity_sprites.rs
@@ -0,0 +1,48 @@
+//! Loads sprites from the data files and stores them in the entity sprite store.
+use bevy::prelude::*;
+
+use crate::{enums::GameSystem, images::EntitySprite};
+
+use super::{
+    events::{DataFileFound, LoadedEntitySpriteData},
+    loader::read_data_file,
+    storage::GameData,
+    DataFile,
+};
+
+/// System to load an entity sprite.
+pub(super) fn load_entity_sprites(
+    mut er_realm_df: EventReader<LoadedEntitySpriteData>,
+    mut game_data: ResMut<GameData>,
+) {
+    for data_file in er_realm_df.read() {
+        let unique_id = &data_file.entity_sprite_data.header.unique_id;
+        let entity_sprite = &data_file.entity_sprite_data.data;
+
+        game_data
+            .entity_sprites
+            .insert(String::from(unique_id), entity_sprite.clone());
+    }
+}
+
+/// System to parse an entity sprite data file.
+pub(super) fn parse_entity_sprite_file(
+    mut er_df_found: EventReader<DataFileFound>,
+    mut ew_entity_sprite_df: EventWriter<LoadedEntitySpriteData>,
+) {
+    for event in er_df_found.read() {
+        if event.header.system == GameSystem::EntitySprite {
+            let entity_sprite_data: DataFile<EntitySprite> =
+                if let Some(d) = read_data_file(&event.filepath) {
+                    d
+                } else {
+                    warn!(
+                        "load_data_file_dir: failed to read entity sprite data from {}",
+                        event.header.unique_id
+                    );
+                    continue;
+                };
+            ew_entity_sprite_df.send(LoadedEntitySpriteData { entity_sprite_data });
+        }
+    }
+}
diff --git a/game_library/src/data_loader/events.rs b/game_library/src/data_loader/events.rs
index 45b6222..4663d6f 100644
--- a/game_library/src/data_loader/events.rs
+++ b/game_library/src/data_loader/events.rs
@@ -6,45 +6,64 @@
 //!
 //! * [`LoadedSpellData`] - Fired when spell data is loaded.
 
+use std::path::PathBuf;
+
 use bevy::ecs::event::Event;
 
 use crate::{
-    particle::Particle, realm_data::Realm, simple_object::SimpleObject, SpellData, Tileset,
+    images::EntitySprite, particle::Particle, realm_data::Realm, simple_object::SimpleObject,
+    spells::Spell, Tileset,
 };
 
-use super::DataFile;
+use super::{DataFile, DataFileHeader};
 
+/// Event that is fired when a valid data file is found.
 #[derive(Event)]
+pub struct DataFileFound {
+    /// The header of the data file
+    pub header: DataFileHeader,
+    /// The path to the data file
+    pub filepath: PathBuf,
+}
+
 /// Event that is fired when a spell is loaded.
+#[derive(Event)]
 pub struct LoadedSpellData {
     /// The spell data that was loaded.
-    pub spell_data: DataFile<SpellData>,
+    pub spell_data: DataFile<Spell>,
 }
 
-#[derive(Event)]
 /// Event that is fired when a tileset is loaded.
+#[derive(Event)]
 pub struct LoadedTilesetData {
     /// The tileset data that was loaded.
     pub tileset_data: DataFile<Tileset>,
 }
 
-#[derive(Event)]
 /// Event that is fired when a particle is loaded.
+#[derive(Event)]
 pub struct LoadedParticleData {
     /// The particle data that was loaded.
     pub particle_data: DataFile<Particle>,
 }
 
-#[derive(Event)]
 /// Event that is fired when a realm is loaded.
+#[derive(Event)]
 pub struct LoadedRealmData {
     /// The realm data that was loaded.
     pub realm_data: DataFile<Realm>,
 }
 
-#[derive(Event)]
 /// Event that is fired when a realm is loaded.
+#[derive(Event)]
 pub struct LoadedSimpleObjectData {
     /// The realm data that was loaded.
     pub object_data: DataFile<SimpleObject>,
 }
+
+/// Event that is fired when an entity sprite is loaded.
+#[derive(Event)]
+pub struct LoadedEntitySpriteData {
+    /// The realm data that was loaded.
+    pub entity_sprite_data: DataFile<EntitySprite>,
+}
diff --git a/game_library/src/data_loader/header_def.rs b/game_library/src/data_loader/header_def.rs
index 0985f89..d9f8aed 100644
--- a/game_library/src/data_loader/header_def.rs
+++ b/game_library/src/data_loader/header_def.rs
@@ -1,7 +1,7 @@
 use serde::{Deserialize, Serialize};
 use std::hash::Hash;
 
-use crate::{enums::GameSystem, InternalId, Tileset};
+use crate::{enums::GameSystem, spells::Spell, InternalId, Tileset};
 
 /// Each data file includes header information about the data in the file.
 #[derive(Debug, Serialize, Deserialize)]
@@ -75,7 +75,7 @@ impl<D: Hash + InternalId + 'static> DataFile<D> {
     }
     /// Get the data file as a spell. Otherwise, return None.
     #[must_use]
-    pub fn as_spell(&self) -> Option<crate::SpellData> {
+    pub fn as_spell(&self) -> Option<Spell> {
         if self.header.system != GameSystem::Spell {
             return None;
         }
diff --git a/game_library/src/data_loader/loader.rs b/game_library/src/data_loader/loader.rs
index bceaa84..e762def 100644
--- a/game_library/src/data_loader/loader.rs
+++ b/game_library/src/data_loader/loader.rs
@@ -1,27 +1,21 @@
 use bevy::prelude::*;
 use serde_yaml;
-use std::hash::Hash;
+use std::{hash::Hash, path::Path};
 use walkdir::WalkDir;
 
-use crate::{
-    data_loader::DATA_FILE_DIR, enums::GameSystem, particle::Particle, realm_data::Realm,
-    simple_object::SimpleObject, InternalId, SpellData, Tileset,
-};
+use crate::InternalId;
 
 use super::{
-    events::{
-        LoadedParticleData, LoadedRealmData, LoadedSimpleObjectData, LoadedSpellData,
-        LoadedTilesetData,
-    },
+    events::DataFileFound,
     header_def::{DataFile, DataFileHeader},
-    DataFileHeaderOnly,
+    DataFileDirs, DataFileHeaderOnly,
 };
 
 /// Read in an ingestible file and return the header information from it.
 /// This will return None if the file is un-readable or ill-formatted.
 /// What this does return on success is the `FileHeader`, mainly the unique ID for the file,
 /// the version info, the system it has data for, author, and description.
-pub fn read_file_header(path: &str) -> Option<DataFileHeader> {
+pub(super) fn read_file_header(path: &str) -> Option<DataFileHeader> {
     // Attempt to open the file passed in
     let f = match std::fs::File::open(path) {
         Ok(f) => f,
@@ -43,14 +37,16 @@ pub fn read_file_header(path: &str) -> Option<DataFileHeader> {
 
 /// Read in an ingestible file and return it. This is generic because all ingestible files
 /// are the same, they only differ in the struct that is returned.
-pub fn read_data_file<T: serde::de::DeserializeOwned + Hash + InternalId>(
-    path: &str,
+pub(super) fn read_data_file<T: serde::de::DeserializeOwned + Hash + InternalId, P: AsRef<Path>>(
+    path: &P,
 ) -> Option<DataFile<T>> {
+    let path = path.as_ref();
+
     // Attempt to open the file passed in
     let f = match std::fs::File::open(path) {
         Ok(f) => f,
         Err(e) => {
-            tracing::error!("read_file_data: failed to open {}, {}", path, e);
+            tracing::error!("read_file_data: failed to open {}, {}", path.display(), e);
             return None;
         }
     };
@@ -58,140 +54,47 @@ pub fn read_data_file<T: serde::de::DeserializeOwned + Hash + InternalId>(
     let ingest: DataFile<T> = match serde_yaml::from_reader(f) {
         Ok(f) => f,
         Err(e) => {
-            tracing::error!("read_file_data: failed to parse {}, {}", path, e);
+            tracing::error!("read_file_data: failed to parse {}, {}", path.display(), e);
             return None;
         }
     };
     Some(ingest)
 }
 
-/// Reading in the directory of ingestible files:
-/// 1. Should be recursive to get all subdirs
-/// 2. Should organize the files before reading them all in
-///     i.   Read headers for all files
-///     ii.  Discard any that are for wrong game version
-///     iii. Store [filename, header] in a list for each system
-///     iv.  Sort the ingest data lists using any specified ordinal constraints
-/// 3. Add the data to the database in system load order (TDB)
-/// 4. Validate skill -> class, magic -> skill,class, and other relationships are valid
-#[allow(clippy::too_many_lines)]
-pub fn load_data_file_dir(
-    mut ew_spell_df: EventWriter<LoadedSpellData>,
-    mut ew_tileset_df: EventWriter<LoadedTilesetData>,
-    mut ew_particle_df: EventWriter<LoadedParticleData>,
-    mut ew_realm_df: EventWriter<LoadedRealmData>,
-    mut ew_simple_object_df: EventWriter<LoadedSimpleObjectData>,
+/// Check for valid data files in the data file directories and fire an event for ones that are valid.
+#[allow(clippy::needless_pass_by_value)]
+pub(super) fn read_data_file_dirs(
+    directories: Res<DataFileDirs>,
+    mut ew_df_found: EventWriter<DataFileFound>,
 ) {
-    // let start = std::time::Instant::now();
-
-    let mut possible_ingests: Vec<String> = WalkDir::new(DATA_FILE_DIR)
-        .into_iter()
-        .filter_map(std::result::Result::ok)
-        .filter(|entry| {
-            entry.file_type().is_file()
-                && entry
-                    .path()
-                    .extension()
-                    .is_some_and(|ext| ext == "yaml" || ext == "yml")
-        })
-        .map(|e| e.path().to_string_lossy().to_string())
-        .collect();
-
-    let mut spells_read: usize = 0;
-    let mut tilesets_read: usize = 0;
-    let mut particles_read: usize = 0;
-    let mut realms_read: usize = 0;
-    let mut simple_objects_read: usize = 0;
-
-    for d in &mut possible_ingests {
-        let filepath = d.as_str();
-        let h = read_file_header(filepath);
-        if let Some(header) = h {
-            tracing::trace!(
-                "load_data_file_dir: read header of {} from {}",
-                header.unique_id,
-                &filepath
-            );
-            match header.system {
-                GameSystem::Spell => {
-                    let spell_data: DataFile<SpellData> = if let Some(d) = read_data_file(filepath)
-                    {
-                        d
-                    } else {
-                        tracing::debug!(
-                            "load_data_file_dir: failed to read spell data from {}",
-                            header.unique_id
-                        );
-                        continue;
-                    };
-                    ew_spell_df.send(LoadedSpellData { spell_data });
-                    spells_read += 1;
-                }
-                GameSystem::Tileset => {
-                    let tileset_data: DataFile<Tileset> = if let Some(d) = read_data_file(filepath)
-                    {
-                        d
-                    } else {
-                        tracing::debug!(
-                            "load_data_file_dir: failed to read tileset data from {}",
-                            header.unique_id
-                        );
-                        continue;
-                    };
-                    ew_tileset_df.send(LoadedTilesetData { tileset_data });
-                    tilesets_read += 1;
-                }
-                GameSystem::Particle => {
-                    let particle_data: DataFile<Particle> =
-                        if let Some(d) = read_data_file(filepath) {
-                            d
-                        } else {
-                            tracing::debug!(
-                                "load_data_file_dir: failed to read particle data from {}",
-                                header.unique_id
-                            );
-                            continue;
-                        };
-                    ew_particle_df.send(LoadedParticleData { particle_data });
-                    particles_read += 1;
-                }
-                GameSystem::Realm => {
-                    let realm_data: DataFile<Realm> = if let Some(d) = read_data_file(filepath) {
-                        d
-                    } else {
-                        tracing::debug!(
-                            "load_data_file_dir: failed to read realm data from {}",
-                            header.unique_id
-                        );
-                        continue;
-                    };
-                    ew_realm_df.send(LoadedRealmData { realm_data });
-                    realms_read += 1;
-                }
-                GameSystem::SimpleObject => {
-                    let object_data: DataFile<SimpleObject> =
-                        if let Some(d) = read_data_file(filepath) {
-                            d
-                        } else {
-                            tracing::debug!(
-                                "load_data_file_dir: failed to read simple object data from {}",
-                                header.unique_id
-                            );
-                            continue;
-                        };
-                    ew_simple_object_df.send(LoadedSimpleObjectData { object_data });
-                    simple_objects_read += 1;
-                }
+    for d in directories.directories() {
+        let possible_ingests: Vec<String> = WalkDir::new(d)
+            .into_iter()
+            .filter_map(std::result::Result::ok)
+            .filter(|entry| {
+                entry.file_type().is_file()
+                    && entry
+                        .path()
+                        .extension()
+                        .is_some_and(|ext| ext == "yaml" || ext == "yml")
+            })
+            .map(|e| e.path().to_string_lossy().to_string())
+            .collect();
+        for d in possible_ingests {
+            let filepath = d.as_str();
+            let h = read_file_header(filepath);
+            if let Some(header) = h {
+                tracing::debug!(
+                    "read_data_file_dirs: read {:?} header of {} from {}",
+                    header.system,
+                    header.unique_id,
+                    &filepath
+                );
+                ew_df_found.send(DataFileFound {
+                    header,
+                    filepath: filepath.into(),
+                });
             }
         }
     }
-    // let duration = start.elapsed();
-    tracing::info!(
-        "loaded {} spells, {} tilesets, {} particles, {} realms, {} simple objects",
-        spells_read,
-        tilesets_read,
-        particles_read,
-        realms_read,
-        simple_objects_read
-    );
 }
diff --git a/game_library/src/data_loader/mod.rs b/game_library/src/data_loader/mod.rs
index ffdc915..6e02e45 100644
--- a/game_library/src/data_loader/mod.rs
+++ b/game_library/src/data_loader/mod.rs
@@ -6,19 +6,19 @@
 pub mod events;
 pub mod storage;
 
+mod entity_sprites;
 mod header_def;
 mod loader;
 mod particles;
 mod plugin;
 mod realms;
+mod resources;
 mod simple_objects;
 mod spells;
 mod tilesets;
 
-/// The directory where the game data files are stored
-pub const DATA_FILE_DIR: &str = "game_data";
-
 pub use header_def::*;
-pub use loader::*;
 #[allow(clippy::module_name_repetitions)]
 pub use plugin::DataLoaderPlugin;
+pub use resources::CreateMissingDirs;
+pub use resources::DataFileDirs;
diff --git a/game_library/src/data_loader/particles.rs b/game_library/src/data_loader/particles.rs
index 5995d1a..82b078a 100644
--- a/game_library/src/data_loader/particles.rs
+++ b/game_library/src/data_loader/particles.rs
@@ -2,7 +2,14 @@
 use bevy::prelude::*;
 use bevy_hanabi::prelude::*;
 
-use super::{events::LoadedParticleData, storage::GameData};
+use crate::{enums::GameSystem, particle::Particle};
+
+use super::{
+    events::{DataFileFound, LoadedParticleData},
+    loader::read_data_file,
+    storage::GameData,
+    DataFile,
+};
 
 /// System to load a particle effect.
 pub(super) fn load_particle_effects(
@@ -58,3 +65,25 @@ pub(super) fn load_particle_effects(
         game_data.particles.insert(String::from(unique_id), effect);
     }
 }
+
+/// System to parse a particle data file.
+pub(super) fn parse_particle_file(
+    mut er_df_found: EventReader<DataFileFound>,
+    mut ew_particle_df: EventWriter<LoadedParticleData>,
+) {
+    for event in er_df_found.read() {
+        if event.header.system == GameSystem::Particle {
+            let particle_data: DataFile<Particle> = if let Some(d) = read_data_file(&event.filepath)
+            {
+                d
+            } else {
+                warn!(
+                    "load_data_file_dir: failed to read particle data from {}",
+                    event.header.unique_id
+                );
+                continue;
+            };
+            ew_particle_df.send(LoadedParticleData { particle_data });
+        }
+    }
+}
diff --git a/game_library/src/data_loader/plugin.rs b/game_library/src/data_loader/plugin.rs
index c98f8e9..296792a 100644
--- a/game_library/src/data_loader/plugin.rs
+++ b/game_library/src/data_loader/plugin.rs
@@ -1,17 +1,20 @@
 use bevy::prelude::*;
 
 use super::{
+    entity_sprites::{load_entity_sprites, parse_entity_sprite_file},
     events::{
-        LoadedParticleData, LoadedRealmData, LoadedSimpleObjectData, LoadedSpellData,
-        LoadedTilesetData,
+        DataFileFound, LoadedEntitySpriteData, LoadedParticleData, LoadedRealmData,
+        LoadedSimpleObjectData, LoadedSpellData, LoadedTilesetData,
     },
-    load_data_file_dir,
-    particles::load_particle_effects,
-    realms::load_realms,
-    simple_objects::load_simple_objects,
-    spells::load_spells,
+    loader::read_data_file_dirs,
+    particles::{load_particle_effects, parse_particle_file},
+    realms::{load_realms, parse_realm_file},
+    resources::validate_data_file_dirs,
+    simple_objects::{load_simple_objects, parse_simple_object_file},
+    spells::{load_spells, parse_spell_file},
     storage::GameData,
-    tilesets::load_tilesets,
+    tilesets::{load_tilesets, parse_tileset_file},
+    DataFileDirs,
 };
 
 /// The plugin for the data loader.
@@ -26,21 +29,32 @@ impl Plugin for DataLoaderPlugin {
             .add_event::<LoadedTilesetData>()
             .add_event::<LoadedParticleData>()
             .add_event::<LoadedRealmData>()
-            .add_event::<LoadedSimpleObjectData>();
+            .add_event::<LoadedSimpleObjectData>()
+            .add_event::<LoadedEntitySpriteData>()
+            .add_event::<DataFileFound>();
 
         // Set up the resources used and the systems to store the data
-        app.init_resource::<GameData>().add_systems(
-            Update,
-            (
-                load_tilesets,
-                load_simple_objects,
-                load_particle_effects,
-                load_realms,
-                load_spells,
-            ),
-        );
+        app.init_resource::<DataFileDirs>()
+            .init_resource::<GameData>()
+            .add_systems(
+                Update,
+                (
+                    parse_tileset_file,
+                    parse_entity_sprite_file,
+                    parse_simple_object_file,
+                    parse_particle_file,
+                    parse_realm_file,
+                    parse_spell_file,
+                    load_tilesets,
+                    load_entity_sprites,
+                    load_simple_objects,
+                    load_particle_effects,
+                    load_realms,
+                    load_spells,
+                ),
+            );
 
         // Add the system to load the data
-        app.add_systems(Startup, load_data_file_dir);
+        app.add_systems(Startup, (validate_data_file_dirs, read_data_file_dirs));
     }
 }
diff --git a/game_library/src/data_loader/realms.rs b/game_library/src/data_loader/realms.rs
index 328a107..27c1475 100644
--- a/game_library/src/data_loader/realms.rs
+++ b/game_library/src/data_loader/realms.rs
@@ -1,9 +1,16 @@
 //! Loads particles from the data files and stores them in the particle effect store.
 use bevy::prelude::*;
 
-use super::{events::LoadedRealmData, storage::GameData};
+use crate::{enums::GameSystem, Realm};
 
-/// System to load a particle effect.
+use super::{
+    events::{DataFileFound, LoadedRealmData},
+    loader::read_data_file,
+    storage::GameData,
+    DataFile,
+};
+
+/// System to load a realm.
 pub(super) fn load_realms(
     mut er_realm_df: EventReader<LoadedRealmData>,
     mut game_data: ResMut<GameData>,
@@ -11,9 +18,30 @@ pub(super) fn load_realms(
     for data_file in er_realm_df.read() {
         let unique_id = &data_file.realm_data.header.unique_id;
         let realm = &data_file.realm_data.data;
-
+        info!("load_realms: loaded realm {} as {}", realm.name, unique_id);
         game_data
             .realms
             .insert(String::from(unique_id), realm.clone());
     }
 }
+
+/// System to parse a realm data file.
+pub(super) fn parse_realm_file(
+    mut er_df_found: EventReader<DataFileFound>,
+    mut ew_realm_df: EventWriter<LoadedRealmData>,
+) {
+    for event in er_df_found.read() {
+        if event.header.system == GameSystem::Realm {
+            let realm_data: DataFile<Realm> = if let Some(d) = read_data_file(&event.filepath) {
+                d
+            } else {
+                warn!(
+                    "load_data_file_dir: failed to read realm data from {}",
+                    event.header.unique_id
+                );
+                continue;
+            };
+            ew_realm_df.send(LoadedRealmData { realm_data });
+        }
+    }
+}
diff --git a/game_library/src/data_loader/resources.rs b/game_library/src/data_loader/resources.rs
new file mode 100644
index 0000000..8f1791d
--- /dev/null
+++ b/game_library/src/data_loader/resources.rs
@@ -0,0 +1,102 @@
+//! Resources include the directories that included data is pulled from.
+use bevy::prelude::*;
+use std::path::PathBuf;
+
+use crate::save_file::SaveFileDirectories;
+
+/// The (relative) directory where the game data files are stored
+pub const DATA_FILE_DIR: &str = "game_data";
+
+/// A 'mods' directory that can be used to store mods for the game. It is located in the game
+/// directory itself (by the game executable).
+pub const MODS_DIR: &str = "mods";
+
+/// Plugins directory should be inserted into the 'settings' directory.
+pub const PLUGIN_DIR_NAME: &str = "plugins";
+
+/// Resource for the directories to check for data recursively.
+///
+/// This resource makes adding new directories (like mods or plugins?) easier.
+#[derive(Debug, Resource, Clone, Reflect)]
+pub struct DataFileDirs {
+    directories: Vec<PathBuf>,
+}
+
+impl Default for DataFileDirs {
+    fn default() -> Self {
+        Self {
+            directories: vec![PathBuf::from(DATA_FILE_DIR), PathBuf::from(MODS_DIR)],
+        }
+    }
+}
+
+impl DataFileDirs {
+    /// Add a directory to the list of directories to check for data files.
+    pub fn add_directory(&mut self, directory: PathBuf) {
+        self.directories.push(directory);
+    }
+
+    /// Get the list of directories to check for data files.
+    #[must_use]
+    pub fn directories(&self) -> &[PathBuf] {
+        self.directories.as_slice()
+    }
+
+    /// Validate that the directories exist. Optionally create them if they don't.
+    ///
+    /// If they don't exist and we aren't creating them, remove them from the list.
+    ///
+    /// ## Parameters
+    ///
+    /// - `create`: If true, create the directories if they don't exist.
+    ///
+    /// ## Returns
+    ///
+    /// The number of directories that were removed from the list.
+    #[must_use]
+    pub fn validate_directories(&mut self, create: bool) -> usize {
+        let mut removed = 0;
+        self.directories.retain(|dir| {
+            if dir.is_dir() {
+                true
+            } else if create {
+                info!("Creating directory: {}", dir.display());
+                std::fs::create_dir_all(dir).is_ok()
+            } else {
+                removed += 1;
+                false
+            }
+        });
+        removed
+    }
+}
+
+/// Resource to indicate if we should create missing directories.
+#[derive(Debug, Default, Resource, Clone, Reflect)]
+pub struct CreateMissingDirs(pub bool);
+
+/// System to add any new directories from our directory resource and also validate them.
+#[allow(clippy::needless_pass_by_value)]
+pub(super) fn validate_data_file_dirs(
+    create_missing_dirs: Option<Res<CreateMissingDirs>>,
+    directory_paths: Res<SaveFileDirectories>,
+    mut data_file_dirs: ResMut<DataFileDirs>,
+) {
+    // No reason not to create the directories if they don't exist.
+    let mut create_dirs = true;
+    // Always prefer the value from the resource if it exists.
+    if let Some(create) = create_missing_dirs {
+        create_dirs = create.0;
+    }
+
+    // Add a 'plugins' directory to the list of directories to check for data files.
+    data_file_dirs.add_directory(directory_paths.settings.join(PLUGIN_DIR_NAME));
+
+    let removed = data_file_dirs.validate_directories(create_dirs);
+    if removed > 0 {
+        info!(
+            "Removed {} non-existent directories from the list of data file directories",
+            removed
+        );
+    }
+}
diff --git a/game_library/src/data_loader/simple_objects.rs b/game_library/src/data_loader/simple_objects.rs
index 8579174..c4eb4f7 100644
--- a/game_library/src/data_loader/simple_objects.rs
+++ b/game_library/src/data_loader/simple_objects.rs
@@ -1,7 +1,14 @@
 //! Loads particles from the data files and stores them in the particle effect store.
 use bevy::prelude::*;
 
-use super::{events::LoadedSimpleObjectData, storage::GameData};
+use crate::{enums::GameSystem, SimpleObject};
+
+use super::{
+    events::{DataFileFound, LoadedSimpleObjectData},
+    loader::read_data_file,
+    storage::GameData,
+    DataFile,
+};
 
 /// System to load a particle effect.
 pub(super) fn load_simple_objects(
@@ -27,3 +34,25 @@ pub(super) fn load_simple_objects(
             .insert(String::from(unique_id), simple_obj.clone());
     }
 }
+
+/// System to parse a simple object data file.
+pub(super) fn parse_simple_object_file(
+    mut er_df_found: EventReader<DataFileFound>,
+    mut ew_simple_object_df: EventWriter<LoadedSimpleObjectData>,
+) {
+    for event in er_df_found.read() {
+        if event.header.system == GameSystem::SimpleObject {
+            let object_data: DataFile<SimpleObject> =
+                if let Some(d) = read_data_file(&event.filepath) {
+                    d
+                } else {
+                    debug!(
+                        "load_data_file_dir: failed to read simple object data from {}",
+                        event.header.unique_id
+                    );
+                    continue;
+                };
+            ew_simple_object_df.send(LoadedSimpleObjectData { object_data });
+        }
+    }
+}
diff --git a/game_library/src/data_loader/spells.rs b/game_library/src/data_loader/spells.rs
index c16b1b0..f5ad8c8 100644
--- a/game_library/src/data_loader/spells.rs
+++ b/game_library/src/data_loader/spells.rs
@@ -1,9 +1,17 @@
 use bevy::prelude::*;
 
-use crate::InternalId;
+use crate::{enums::GameSystem, spells::Spell};
 
-use super::{events::LoadedSpellData, storage::GameData};
+use super::{
+    events::{DataFileFound, LoadedSpellData},
+    loader::read_data_file,
+    storage::GameData,
+    DataFile,
+};
 
+/// System to load spell data into the spells vault for usage in the game.
+///
+/// This responds to the `LoadedSpellData` event and loads the spell data into the `GameData` resource.
 pub(super) fn load_spells(
     mut events: EventReader<LoadedSpellData>,
     mut game_data: ResMut<GameData>,
@@ -12,17 +20,36 @@ pub(super) fn load_spells(
         return;
     }
 
-    tracing::info!("Load spells event with {} spells", events.len());
+    debug!("Load spells event with {} spells", events.len());
     for event in events.read() {
         let unique_id = &event.spell_data.header.unique_id;
-        let mut spell = event.spell_data.data.clone();
-        spell.update_internal_id();
+        let spell = event.spell_data.data.clone().with_unique_id(unique_id);
 
         game_data.spells.insert(unique_id.clone(), spell);
-        tracing::debug!(
-            "load_spells: loaded spell {} as {}",
-            event.spell_data.data.name,
-            unique_id
-        );
+        info!("Loaded {}", event.spell_data.data);
+    }
+}
+
+/// System to parse the spell data files and load them into the game.
+///
+/// This responds to the `DataFileFound` event and reads the spell data from the file, and upon success, sends a `LoadedSpellData` event.
+pub(super) fn parse_spell_file(
+    mut er_df_found: EventReader<DataFileFound>,
+    mut ew_spell_df: EventWriter<LoadedSpellData>,
+) {
+    for event in er_df_found.read() {
+        if event.header.system == GameSystem::Spell {
+            let spell_data: DataFile<Spell> = if let Some(d) = read_data_file(&event.filepath) {
+                d
+            } else {
+                warn!(
+                    "parse_spell_file: failed to read spell data from {}; {}",
+                    event.header.unique_id,
+                    event.filepath.display()
+                );
+                continue;
+            };
+            ew_spell_df.send(LoadedSpellData { spell_data });
+        }
     }
 }
diff --git a/game_library/src/data_loader/storage.rs b/game_library/src/data_loader/storage.rs
index d8fa276..95f31dc 100644
--- a/game_library/src/data_loader/storage.rs
+++ b/game_library/src/data_loader/storage.rs
@@ -2,7 +2,12 @@
 use bevy::{prelude::*, utils::hashbrown::HashMap};
 use bevy_hanabi::EffectAsset;
 
-use crate::{realm_data::Realm, SimpleObject, SpellData};
+use crate::{
+    images::{EntitySprite, StoredTextureAtlas},
+    realm_data::Realm,
+    spells::Spell,
+    SimpleObject,
+};
 
 /// The vault resource is a generic resource that holds data that is stored by a unique id.
 ///
@@ -55,13 +60,15 @@ impl<T> Vault<T> {
 #[derive(Resource, Default, Debug, Clone)]
 pub struct GameData {
     /// The spells that have been loaded into the game.
-    pub spells: Vault<SpellData>,
+    pub spells: Vault<Spell>,
     /// The tile atlases that have been loaded into the game.
-    pub tile_atlas: Vault<Handle<TextureAtlas>>,
+    pub tile_atlas: Vault<StoredTextureAtlas>,
     /// The particles that have been loaded into the game.
     pub particles: Vault<Handle<EffectAsset>>,
     /// Loaded realm definitions
     pub realms: Vault<Realm>,
     /// Loaded simple objects
     pub simple_objects: Vault<SimpleObject>,
+    /// Loaded entity sprites
+    pub entity_sprites: Vault<EntitySprite>,
 }
diff --git a/game_library/src/data_loader/tilesets.rs b/game_library/src/data_loader/tilesets.rs
index 47aa53c..527ebb7 100644
--- a/game_library/src/data_loader/tilesets.rs
+++ b/game_library/src/data_loader/tilesets.rs
@@ -2,13 +2,20 @@
 
 use bevy::prelude::*;
 
-use super::{events::LoadedTilesetData, storage::GameData};
+use crate::{enums::GameSystem, images::StoredTextureAtlas, Tileset};
+
+use super::{
+    events::{DataFileFound, LoadedTilesetData},
+    loader::read_data_file,
+    storage::GameData,
+    DataFile,
+};
 
 /// Load the tilesets into the game and store a handle under the `unique_id`.
 #[allow(clippy::needless_pass_by_value, clippy::module_name_repetitions)]
 pub fn load_tilesets(
     mut er_tileset_df: EventReader<LoadedTilesetData>,
-    mut texture_atlases: ResMut<Assets<TextureAtlas>>,
+    mut texture_atlases: ResMut<Assets<TextureAtlasLayout>>,
     mut game_data: ResMut<GameData>,
     asset_server: Res<AssetServer>,
 ) {
@@ -17,8 +24,7 @@ pub fn load_tilesets(
         let tileset = &tileset.tileset_data.data;
 
         let texture_handle = asset_server.load(&tileset.path);
-        let texture_atlas = TextureAtlas::from_grid(
-            texture_handle,
+        let texture_atlas = TextureAtlasLayout::from_grid(
             Vec2::new(tileset.tile_width, tileset.tile_height),
             tileset.tileset_width,
             tileset.tileset_height,
@@ -28,8 +34,33 @@ pub fn load_tilesets(
 
         let atlas_handle = texture_atlases.add(texture_atlas);
 
-        game_data
-            .tile_atlas
-            .insert(String::from(unique_id), atlas_handle);
+        game_data.tile_atlas.insert(
+            String::from(unique_id),
+            StoredTextureAtlas {
+                atlas_handle,
+                texture_handle,
+            },
+        );
+    }
+}
+
+/// System to parse a tileset data file.
+pub(super) fn parse_tileset_file(
+    mut er_df_found: EventReader<DataFileFound>,
+    mut ew_tileset_df: EventWriter<LoadedTilesetData>,
+) {
+    for event in er_df_found.read() {
+        if event.header.system == GameSystem::Tileset {
+            let tileset_data: DataFile<Tileset> = if let Some(d) = read_data_file(&event.filepath) {
+                d
+            } else {
+                warn!(
+                    "load_data_file_dir: failed to read tileset data from {}",
+                    event.header.unique_id
+                );
+                continue;
+            };
+            ew_tileset_df.send(LoadedTilesetData { tileset_data });
+        }
     }
 }
diff --git a/game_library/src/enums/cast_slot.rs b/game_library/src/enums/cast_slot.rs
index aaedfe3..09aa36f 100644
--- a/game_library/src/enums/cast_slot.rs
+++ b/game_library/src/enums/cast_slot.rs
@@ -8,18 +8,13 @@ use serde::{Deserialize, Serialize};
 #[derive(
     Debug, Clone, Copy, PartialEq, Eq, Hash, Component, Resource, Serialize, Deserialize, Reflect,
 )]
-#[serde(rename_all = "camelCase")]
 pub enum CastSlot {
-    /// Primary spells typically have no mana cost and a short cooldown. Typically used for basic
-    /// attacks.
-    Primary,
-    /// Secondary spells will have a mana cost (usually) and can range from really powerful to
-    /// other kinds of spells. Typically used for something that is not a basic attack.
-    Secondary,
-    /// Defensive spells are typically used to defend against attacks or to heal. The common
-    /// type of spell used for this slot is a shield or barrier. Other things might generate a
-    /// wall or other obstacle.
-    Defensive,
+    /// Cantrips are typically basic attacks that don't cost mana and are a player's primary means
+    /// of dealing damage. They are typically the most spammable spell in a player's arsenal.
+    Cantrip,
+    /// Slotted spells are the primary spells a player uses. They are typically more powerful than
+    /// cantrips and have a variety of effects.
+    Slot,
     /// Ultimate spells are not in the player's spellbook, instead they are learned organically
     /// while in the "primal realm." They are typically very powerful and have a long cooldown.
     Ultimate,
@@ -28,10 +23,9 @@ pub enum CastSlot {
 impl std::fmt::Display for CastSlot {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            Self::Primary => write!(f, "Primary"),
-            Self::Secondary => write!(f, "Secondary"),
-            Self::Defensive => write!(f, "Defensive"),
-            Self::Ultimate => write!(f, "Ultimate"),
+            Self::Cantrip => write!(f, "Cantrip"),
+            Self::Slot => write!(f, "Spell"),
+            Self::Ultimate => write!(f, "Ultimate Spell"),
         }
     }
 }
diff --git a/game_library/src/enums/cast_type.rs b/game_library/src/enums/cast_type.rs
index b1fd19c..529aa30 100644
--- a/game_library/src/enums/cast_type.rs
+++ b/game_library/src/enums/cast_type.rs
@@ -8,7 +8,6 @@ use serde::{Deserialize, Serialize};
 #[derive(
     Debug, Clone, Copy, PartialEq, Eq, Hash, Component, Resource, Serialize, Deserialize, Reflect,
 )]
-#[serde(rename_all = "camelCase")]
 pub enum CastType {
     /// The spell is cast instantly
     Instant,
diff --git a/game_library/src/enums/game_systems.rs b/game_library/src/enums/game_systems.rs
index 8e058a6..bb7afd2 100644
--- a/game_library/src/enums/game_systems.rs
+++ b/game_library/src/enums/game_systems.rs
@@ -15,6 +15,8 @@ pub enum GameSystem {
     Realm,
     /// The simple object system is responsible for loading simple objects
     SimpleObject,
+    /// Entity sprites define the sprites for entities. They reference tilesets.
+    EntitySprite,
 }
 
 /// The order in which the game systems should be loaded.
@@ -30,13 +32,17 @@ pub enum GameSystem {
 /// - Skill perks / trees
 /// - Monsters
 #[allow(dead_code)]
-pub const ORDERED: [GameSystem; 5] = [
+pub const ORDERED: [GameSystem; 6] = [
+    // Tilesets have no dependencies
     GameSystem::Tileset,
+    // Particles have no dependencies
+    GameSystem::Particle,
     // Simple objects can reference tilesets
     GameSystem::SimpleObject,
+    // Entity sprites reference tilesets
+    GameSystem::EntitySprite,
+    // Spells reference tilesets and particle effects
+    GameSystem::Spell,
     // Realms reference simple objects and tilesets
     GameSystem::Realm,
-    GameSystem::Particle,
-    // Spells reference tilesets
-    GameSystem::Spell,
 ];
diff --git a/game_library/src/enums/magic.rs b/game_library/src/enums/magic.rs
index 585efc3..c66ea55 100644
--- a/game_library/src/enums/magic.rs
+++ b/game_library/src/enums/magic.rs
@@ -12,7 +12,6 @@ use crate::enums::Skill;
 #[derive(
     Debug, Clone, Copy, PartialEq, Eq, Hash, Component, Resource, Serialize, Deserialize, Reflect,
 )]
-#[serde(rename_all = "camelCase")]
 #[allow(clippy::module_name_repetitions)]
 pub enum MagicType {
     /// Fire magic, pyromancy
diff --git a/game_library/src/enums/skill.rs b/game_library/src/enums/skill.rs
index e9cbbf1..7222dbe 100644
--- a/game_library/src/enums/skill.rs
+++ b/game_library/src/enums/skill.rs
@@ -27,7 +27,6 @@ use crate::enums::MagicType;
     Reflect,
     InspectorOptions,
 )]
-#[serde(rename_all = "camelCase")]
 pub enum Skill {
     /// Pyromancy is the school of fire magic.
     Pyromancy,
diff --git a/game_library/src/events.rs b/game_library/src/events.rs
index 6bfd109..1d83b07 100644
--- a/game_library/src/events.rs
+++ b/game_library/src/events.rs
@@ -10,12 +10,12 @@ use bevy::prelude::*;
 ///
 /// # Internal Value
 ///
-/// * `String` - The `get_internal_id()` of the [`game_library::Spell`]
+/// * `String` - The `get_internal_id()` of the [`elementalist_game_library::Spell`]
 ///
 /// # Examples
 ///
 /// ```no_run
-/// use game_library::events::CastSpell;
+/// use elementalist_game_library::events::CastSpell;
 ///
 /// let event = CastSpell("Firebolt01Primary".to_string());
 /// ```
diff --git a/game_library/src/experience.rs b/game_library/src/experience.rs
index 8148054..b1b3848 100644
--- a/game_library/src/experience.rs
+++ b/game_library/src/experience.rs
@@ -20,7 +20,7 @@
 //! If you want to define a custom curve, you should create the component with the desired values:
 //!
 //! ```no_run
-//! use game_library::Xp;
+//! use elementalist_game_library::Xp;
 //!
 //! let xp = Xp {
 //!   value: 0,
@@ -62,7 +62,7 @@ use crate::progress_bar::Percentage;
 ///
 /// ```no_run
 /// use bevy::prelude::*;
-/// use game_library::Xp;
+/// use elementalist_game_library::Xp;
 ///
 /// #[derive(Component)]
 /// struct Player;
@@ -132,7 +132,7 @@ impl Xp {
     /// # Examples
     ///
     /// ```no_run
-    /// use game_library::Xp;
+    /// use elementalist_game_library::Xp;
     ///
     /// let xp = Xp {
     ///   value: 0,
diff --git a/game_library/src/images/animation.rs b/game_library/src/images/animation.rs
new file mode 100644
index 0000000..04a219f
--- /dev/null
+++ b/game_library/src/images/animation.rs
@@ -0,0 +1,90 @@
+//! Animation definitions for entity sprites.
+use bevy::prelude::*;
+use serde::{Deserialize, Serialize};
+use std::hash::Hash;
+
+/// The different animation states for an entity sprite.
+///
+/// Not every entity sprite will have all of these states. Any left undefined in the basic definition will
+/// fall back to the default state (idle).
+#[derive(
+    Debug,
+    Clone,
+    Copy,
+    PartialEq,
+    Eq,
+    Hash,
+    Reflect,
+    Serialize,
+    Deserialize,
+    Component,
+    Resource,
+    Default,
+)]
+pub enum Animation {
+    /// The default state, typically standing still.
+    #[default]
+    Idle,
+    /// The walking state.
+    Walk,
+    /// The running state.
+    Run,
+    /// The jumping state.
+    Jump,
+    /// The spell-casting state.
+    Cast,
+    /// The melee attack state.
+    Attack,
+    /// A dying state
+    Death,
+    /// A state for getting hurt
+    Hurt,
+    /// A state for being stunned
+    Stun,
+    /// A state for being dead.
+    Dead,
+    // Combinations for walk + other
+    /// The walking and spell-casting state.
+    WalkCast,
+    /// The walking and melee attack state.
+    WalkAttack,
+    // Combinations for run + other
+    /// The running and spell-casting state.
+    RunCast,
+    /// The running and melee attack state.
+    RunAttack,
+}
+
+/// An animation definition for an entity sprite.
+#[derive(Debug, Clone, PartialEq, Reflect, Serialize, Deserialize, Component, Resource)]
+#[serde(rename_all = "camelCase")]
+#[allow(clippy::module_name_repetitions)]
+pub struct AnimationDefinition {
+    /// The animation state.
+    pub state: Animation,
+    /// The tileset to use for the animation (by unique_id)
+    pub tileset: String,
+    /// The tile indices for the animation.
+    pub tile_indices: Vec<usize>,
+    /// The duration of each frame in the animation.
+    pub frame_duration: f32,
+}
+
+impl Hash for AnimationDefinition {
+    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+        self.state.hash(state);
+        self.tileset.hash(state);
+        self.tile_indices.hash(state);
+    }
+}
+
+impl Default for AnimationDefinition {
+    fn default() -> Self {
+        Self {
+            state: Animation::Idle,
+            tileset: String::from("placeholder"),
+            tile_indices: vec![0],
+            frame_duration: 0.0,
+        }
+    }
+}
diff --git a/game_library/src/images/animation_bundle.rs b/game_library/src/images/animation_bundle.rs
new file mode 100644
index 0000000..c61399f
--- /dev/null
+++ b/game_library/src/images/animation_bundle.rs
@@ -0,0 +1,60 @@
+//! Bundle with all the components needed to create an animation.
+use bevy::prelude::*;
+
+use super::{
+    Animation, AnimationActionState, AnimationFrame, AnimationMovementState,
+    AnimationReactionState, AnimationTimer,
+};
+
+/// Component to hold the `unique_id` of the entity sprite.
+#[derive(Debug, Clone, PartialEq, Eq, Hash, Component)]
+pub struct EntitySpriteId {
+    /// The `unique_id` of the entity sprite.
+    pub unique_id: String,
+}
+
+/// Component to describe the entity's current movement information.
+#[derive(Debug, Default, Clone, PartialEq, Eq, Hash, Component)]
+pub struct AnimationStatus {
+    /// True if the entity is facing left.
+    pub facing_left: bool,
+    /// Movement status of the entity.
+    pub movement: AnimationMovementState,
+    /// Action status of the entity.
+    pub action: AnimationActionState,
+    /// Reaction status of the entity.
+    pub reaction: AnimationReactionState,
+}
+
+/// Bundle with all the components needed to create an animation.
+#[derive(Debug, Clone, Bundle)]
+pub struct AnimationBundle {
+    /// The entity sprite `unique_id`.
+    pub entity_sprite_id: EntitySpriteId,
+    /// The current frame of the animation.
+    pub animation_frame: AnimationFrame,
+    /// The timer that will be used to update the animation.
+    pub animation_timer: AnimationTimer,
+    /// The movement status of the entity.
+    pub animation_status: AnimationStatus,
+    /// The current combined animation state.
+    pub animation: Animation,
+}
+
+impl AnimationBundle {
+    /// Create a new animation bundle.
+    #[must_use]
+    pub fn new(entity_sprite_id: &str) -> Self {
+        let mut timer = AnimationTimer::new(2.0);
+        timer.pause();
+        Self {
+            entity_sprite_id: EntitySpriteId {
+                unique_id: entity_sprite_id.to_string(),
+            },
+            animation_frame: AnimationFrame::default(),
+            animation_timer: AnimationTimer::default(),
+            animation_status: AnimationStatus::default(),
+            animation: Animation::default(),
+        }
+    }
+}
diff --git a/game_library/src/images/animation_frame.rs b/game_library/src/images/animation_frame.rs
new file mode 100644
index 0000000..613b7b1
--- /dev/null
+++ b/game_library/src/images/animation_frame.rs
@@ -0,0 +1,45 @@
+//! Component for tracking the current frame of an animation.
+use bevy::prelude::*;
+
+const MAX_SUPPORTED_ANIMATION_FRAMES: usize = 30;
+
+/// The frame of the animation that the sprite is currently on.
+///
+/// This is used to track the current frame of an animation, and to advance the frame.
+#[derive(Debug, Default, Resource, Clone, Copy, PartialEq, Eq, Hash, Component)]
+pub struct AnimationFrame {
+    /// The current frame of the animation.
+    pub frame: usize,
+}
+
+impl AnimationFrame {
+    /// The maximum number of frames supported by the animation frame tracker.
+    pub const MAX: usize = MAX_SUPPORTED_ANIMATION_FRAMES;
+
+    /// Create a new animation frame tracker.
+    #[must_use]
+    pub const fn new() -> Self {
+        Self { frame: 0 }
+    }
+
+    /// Resets the frame to 0.
+    pub fn reset(&mut self) {
+        self.frame = 0;
+    }
+    /// Advances the frame by 1, wrapping around to 0 after hitting `Self::MAX`.
+    pub fn next(&mut self) {
+        self.frame = (self.frame + 1) % Self::MAX;
+    }
+    /// Give the frame in the context of an animation's length.
+    ///
+    /// This is a safe way to get a frame that is within the bounds of an animation's length.
+    #[must_use]
+    pub const fn get(self, length: usize) -> usize {
+        self.frame % length
+    }
+    /// Returns true if the frame is at the end of the animation.
+    #[must_use]
+    pub const fn is_fin(self, length: usize) -> bool {
+        self.frame >= length
+    }
+}
diff --git a/game_library/src/images/animation_system.rs b/game_library/src/images/animation_system.rs
new file mode 100644
index 0000000..33213b7
--- /dev/null
+++ b/game_library/src/images/animation_system.rs
@@ -0,0 +1,221 @@
+//! System that handles the animation of entities with a `Sprite` component.
+//!
+//! This has to regard the `Animation` component and the `AnimationDefinition` component.
+use bevy::prelude::*;
+
+use crate::data_loader::storage::GameData;
+
+use super::{
+    animation_bundle::AnimationStatus,
+    state::{Action, Movement, Reaction},
+    Animation, AnimationFrame, AnimationTimer, EntitySpriteId,
+};
+
+/// System that updates the `tile_atlas` texture based on the current animation state.
+#[allow(clippy::needless_pass_by_value)]
+pub(super) fn update_tile_atlas_textures(
+    mut query: Query<
+        (
+            &mut TextureAtlas,
+            &EntitySpriteId,
+            &Animation,
+            &mut Handle<Image>,
+        ),
+        Changed<Animation>,
+    >,
+    game_data: Res<GameData>,
+) {
+    for (mut texture_atlas, sprite_id, animation_state, mut image) in &mut query {
+        // attempt to get the entity sprite
+        let Some(entity_sprite) = game_data.entity_sprites.get(&sprite_id.unique_id) else {
+            warn!("Entity sprite with id {} not found", sprite_id.unique_id);
+            continue;
+        };
+
+        let current_animation = entity_sprite.get_animation(*animation_state);
+
+        // get the tile_atlas for the current animation
+        let Some(tile_atlas) = game_data.tile_atlas.get(&current_animation.tileset) else {
+            warn!("Tileset with id {} not found", current_animation.tileset);
+            continue;
+        };
+
+        // update the texture atlas
+        *image = tile_atlas.texture_handle.clone();
+        texture_atlas.layout = tile_atlas.atlas_handle.clone();
+    }
+}
+
+/// System that handles the drawing and animation of sprites.
+#[allow(clippy::needless_pass_by_value)]
+pub(super) fn draw_sprites(
+    time: Res<Time>,
+    mut query: Query<(
+        &mut TextureAtlas,
+        &mut Sprite,
+        &mut AnimationTimer,
+        &mut AnimationFrame,
+        &Animation,
+        &EntitySpriteId,
+        &mut AnimationStatus,
+    )>,
+    game_data: Res<GameData>,
+) {
+    // Loop over all the entities with the `AnimatedSpriteBundle` component (which should match our query)
+    for (
+        mut texture_atlas,
+        mut sprite,
+        mut timer,
+        mut frame,
+        &animation_state,
+        sprite_id,
+        mut status,
+    ) in &mut query
+    {
+        // attempt to get the entity sprite
+        let Some(entity_sprite) = game_data.entity_sprites.get(&sprite_id.unique_id) else {
+            warn!("Entity sprite with id {} not found", sprite_id.unique_id);
+            continue;
+        };
+
+        let current_animation = entity_sprite.get_animation(animation_state);
+
+        if timer.advance(&time) {
+            // Advance the frame
+            frame.next();
+
+            // Get the current frame index and update the texture atlas
+            let frame_index = frame.get(current_animation.tile_indices.len());
+            if let Some(texture_index) = current_animation.tile_indices.get(frame_index) {
+                texture_atlas.index = *texture_index;
+            } else {
+                warn!(
+                    "Frame index {} not found in animation {:?}",
+                    frame_index, animation_state
+                );
+            }
+
+            // Per animation state, check if the animation is finished and reset the state if it is.
+            if status.reaction != Reaction::None {
+                // Check if the frame is at the end of the animation.
+                if frame.is_fin(current_animation.tile_indices.len()) {
+                    info!(
+                        "Reaction animation finished on sprite_id {}",
+                        sprite_id.unique_id
+                    );
+                    // Set the reaction to `Reaction::None`.
+                    status.reaction = Reaction::None;
+                }
+            } else if status.action != Action::None {
+                // Check if the frame is at the end of the animation.
+                if frame.is_fin(current_animation.tile_indices.len()) {
+                    info!(
+                        "Action animation finished on sprite_id {}",
+                        sprite_id.unique_id
+                    );
+                    // Reset the frame.
+                    frame.reset();
+                    // Set the action to `Action::None`.
+                    status.action = Action::None;
+                }
+            }
+        }
+
+        // Check if the reaction is `Reaction::None`.
+
+        // Set the sprite's flip_x based on the facing direction.
+        sprite.flip_x = status.facing_left;
+    }
+}
+
+/// Transitions the animation state based on the `AnimationStatus`. This automatically transitions from
+/// an active state to idle when the action is no longer active.
+#[allow(clippy::needless_pass_by_value)]
+pub(super) fn update_current_animation(
+    mut query: Query<(
+        &mut Animation,
+        &AnimationStatus,
+        &mut AnimationTimer,
+        &mut AnimationFrame,
+        &EntitySpriteId,
+    )>,
+    game_data: Res<GameData>,
+) {
+    for (mut animation, status, mut timer, mut frame, entity_sprite) in &mut query {
+        // determine the current animation
+        // this is based on the status, looking first at the reaction, then the action, and finally the movement
+        let current_animation =
+            get_current_animation(status.reaction, status.action, status.movement);
+
+        // if the current animation is different from the previous one, update the animation
+        if *animation != current_animation {
+            info!(
+                "Transitioning from {:?} to {:?}",
+                *animation, current_animation
+            );
+            *animation = current_animation;
+
+            // Get the entity sprite
+            let Some(entity_sprite) = game_data.entity_sprites.get(&entity_sprite.unique_id) else {
+                warn!(
+                    "Entity sprite with id {} not found",
+                    entity_sprite.unique_id
+                );
+                continue;
+            };
+
+            // Get the current animation definition
+            let current_animation_definition = entity_sprite.get_animation(current_animation);
+
+            // Reset the frame and timer
+            frame.reset();
+            timer.update(current_animation_definition.frame_duration);
+        }
+    }
+}
+
+/// Function which takes the three states and returns the current animation state.
+/// This is based on the priority of reaction > movement + action > movement.
+///
+/// This is used to determine the final animation state.
+///
+/// ## Parameters
+///
+/// - `reaction` - The reaction status of the entity.
+/// - `action` - The action status of the entity.
+/// - `movement` - The movement status of the entity.
+///
+/// ## Returns
+///
+/// The current animation state.
+#[must_use]
+const fn get_current_animation(
+    reaction: Reaction,
+    action: Action,
+    movement: Movement,
+) -> Animation {
+    match reaction {
+        Reaction::None => match action {
+            Action::None => match movement {
+                Movement::Idle => Animation::Idle,
+                Movement::Walk => Animation::Walk,
+                Movement::Run => Animation::Run,
+                Movement::Jump => Animation::Jump,
+            },
+            Action::Cast => match movement {
+                Movement::Walk => Animation::WalkCast,
+                Movement::Run => Animation::RunCast,
+                _ => Animation::Cast,
+            },
+            Action::Attack => match movement {
+                Movement::Walk => Animation::WalkAttack,
+                Movement::Run => Animation::RunAttack,
+                _ => Animation::Attack,
+            },
+        },
+        Reaction::Hurt => Animation::Hurt,
+        Reaction::Stun => Animation::Stun,
+        Reaction::Dead => Animation::Dead,
+        Reaction::Death => Animation::Death,
+    }
+}
diff --git a/game_library/src/images/animation_timer.rs b/game_library/src/images/animation_timer.rs
new file mode 100644
index 0000000..fb533b2
--- /dev/null
+++ b/game_library/src/images/animation_timer.rs
@@ -0,0 +1,75 @@
+//! Timer to control when animations should advance.
+use bevy::prelude::*;
+
+/// Timer that will be used to update the animation. This is specialized for animations.
+///
+/// Set the duration and update the timer with the `advance` method.
+///
+/// The duration can be changed with the `update_duration` method. This will reset the timer.
+#[derive(Debug, Default, Resource, Clone, Component)]
+pub struct AnimationTimer {
+    /// The timer.
+    timer: Timer,
+    /// The duration of the timer.
+    duration: f32,
+}
+
+impl AnimationTimer {
+    /// Create a new animation timer.
+    ///
+    /// ## Parameters
+    ///
+    /// - `duration`: The duration of the timer in seconds.
+    #[must_use]
+    pub fn new(duration: f32) -> Self {
+        Self {
+            timer: Timer::from_seconds(duration, TimerMode::Repeating),
+            duration,
+        }
+    }
+
+    /// Get the duration of the timer.
+    #[must_use]
+    pub const fn duration(&self) -> f32 {
+        self.duration
+    }
+
+    /// Update the animation state and timer duration.
+    ///
+    /// This will reset the timer.
+    ///
+    /// ## Parameters
+    ///
+    /// - `duration`: The new duration of the timer in seconds.
+    pub fn update(&mut self, duration: f32) {
+        self.duration = duration;
+        self.timer = Timer::from_seconds(duration, TimerMode::Repeating);
+    }
+
+    /// Advance the timer.
+    ///
+    /// Returns true if the timer has just finished.
+    ///
+    /// # Parameters
+    ///
+    /// - `time`: The time resource to use to advance the timer. (i.e. `Res<Time>`)
+    pub fn advance(&mut self, time: &Time) -> bool {
+        self.timer.tick(time.delta()).just_finished()
+    }
+
+    /// Check if timer is finished.
+    #[must_use]
+    pub fn finished(&self) -> bool {
+        self.timer.finished()
+    }
+
+    /// Pause the timer.
+    pub fn pause(&mut self) {
+        self.timer.pause();
+    }
+
+    /// Resume the timer.
+    pub fn resume(&mut self) {
+        self.timer.unpause();
+    }
+}
diff --git a/game_library/src/images/entity_sprite.rs b/game_library/src/images/entity_sprite.rs
new file mode 100644
index 0000000..9338ca0
--- /dev/null
+++ b/game_library/src/images/entity_sprite.rs
@@ -0,0 +1,108 @@
+//! Definition for an entity's sprite.
+//!
+//! This is used to define the sprite for an entity. This is used in the game system to display the entity's sprite
+//! and to handle collision with the entity. It includes what tileset to use, and the tile indices for any sprite
+//! animations.
+use bevy::prelude::*;
+use serde::{Deserialize, Serialize};
+
+use crate::InternalId;
+
+use super::{Animation, AnimationDefinition};
+
+/// The sprite for an entity.
+#[derive(Debug, Clone, PartialEq, Hash, Reflect, Serialize, Deserialize, Component, Resource)]
+#[serde(rename_all = "camelCase")]
+pub struct EntitySprite {
+    /// The unique id of the entity sprite.
+    #[serde(default = "String::new")]
+    unique_id: String,
+    /// The animation definitions for the entity sprite.
+    animations: Vec<AnimationDefinition>,
+}
+
+impl EntitySprite {
+    /// Create a new empty entity sprite.
+    #[must_use]
+    pub fn new(unique_id: &str, idle_animation: AnimationDefinition) -> Self {
+        Self {
+            unique_id: unique_id.to_string(),
+            animations: vec![idle_animation],
+        }
+    }
+
+    /// Add an animation definition to the entity sprite.
+    pub fn add_animation(&mut self, animation: AnimationDefinition) {
+        // Check if the animation already exists
+        for a in &mut self.animations {
+            if a.state == animation.state {
+                info!(
+                    "Updating animation: {:?} in entity sprite {}",
+                    animation.state, self.unique_id
+                );
+                *a = animation;
+                return;
+            }
+        }
+        // If it doesn't exist, add it
+        self.animations.push(animation);
+    }
+
+    /// Get the animation definition for the given state.
+    ///
+    /// If it doesn't exist, return the default animation.
+    #[must_use]
+    pub fn get_animation(&self, state: Animation) -> AnimationDefinition {
+        for a in &self.animations {
+            if a.state == state {
+                return a.clone();
+            }
+        }
+        // If the animation doesn't exist, return the default animation
+        warn!(
+            "Animation {:?} not found in entity sprite {}. Returning default animation.",
+            state, self.unique_id
+        );
+
+        // The default idle animation should always exist, but in case it doesn't, return a default animation
+        self.animations.first().map_or_else(
+            || {
+                error!(
+                    "No default animation found for entity sprite {}. This should never happen.",
+                    self.unique_id
+                );
+                AnimationDefinition::default()
+            },
+            std::clone::Clone::clone,
+        )
+    }
+
+    /// Get the unique id of the entity sprite.
+    #[must_use]
+    pub fn unique_id(&self) -> &str {
+        &self.unique_id
+    }
+
+    /// Get the animation definitions for the entity sprite.
+    #[must_use]
+    pub const fn animations(&self) -> &Vec<AnimationDefinition> {
+        &self.animations
+    }
+}
+
+impl InternalId for EntitySprite {
+    fn get_internal_id(&self) -> String {
+        self.unique_id.clone()
+    }
+
+    fn update_internal_id(&mut self) {}
+}
+
+impl Default for EntitySprite {
+    fn default() -> Self {
+        Self {
+            unique_id: String::from("non-existent-entity-sprite"),
+            animations: vec![AnimationDefinition::default()],
+        }
+    }
+}
diff --git a/game_library/src/images/mod.rs b/game_library/src/images/mod.rs
new file mode 100644
index 0000000..c59587d
--- /dev/null
+++ b/game_library/src/images/mod.rs
@@ -0,0 +1,24 @@
+//! Image helpers: tileset, spritesheet, and helper structs.
+mod animation;
+mod animation_bundle;
+mod animation_frame;
+mod animation_system;
+mod animation_timer;
+mod entity_sprite;
+mod plugin;
+mod state;
+mod texture_atlas;
+mod tileset;
+
+pub use animation::{Animation, AnimationDefinition};
+pub use animation_bundle::{AnimationBundle, AnimationStatus, EntitySpriteId};
+pub use animation_frame::AnimationFrame;
+pub use animation_timer::AnimationTimer;
+pub use entity_sprite::EntitySprite;
+#[allow(clippy::module_name_repetitions)]
+pub use plugin::ImagesPlugin;
+pub use state::Action as AnimationActionState;
+pub use state::Movement as AnimationMovementState;
+pub use state::Reaction as AnimationReactionState;
+pub use texture_atlas::StoredTextureAtlas;
+pub use tileset::Tileset;
diff --git a/game_library/src/images/plugin.rs b/game_library/src/images/plugin.rs
new file mode 100644
index 0000000..410f216
--- /dev/null
+++ b/game_library/src/images/plugin.rs
@@ -0,0 +1,32 @@
+//! Plugin for the image modules (animations, etc)
+
+use bevy::prelude::*;
+
+use crate::state::Game;
+
+use super::animation_system::{draw_sprites, update_current_animation, update_tile_atlas_textures};
+
+/// Plugin for the image modules (animations, etc)
+///
+/// Runs the systems for image animations and updates.
+///
+/// 1. `draw_sprites` - Draws the sprites on the screen. This advances the animation frames and adjust the facing direction of the sprite.
+/// 2. `transition_to_idle` - Transitions the sprite to the idle animation if the casting or attack animation finishes.
+///
+/// These only run if the game state is `Game::Playing`.
+#[allow(clippy::module_name_repetitions)]
+pub struct ImagesPlugin;
+
+impl Plugin for ImagesPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_systems(
+            Update,
+            (
+                update_tile_atlas_textures,
+                draw_sprites,
+                update_current_animation,
+            )
+                .run_if(in_state(Game::Playing)),
+        );
+    }
+}
diff --git a/game_library/src/images/state.rs b/game_library/src/images/state.rs
new file mode 100644
index 0000000..e844931
--- /dev/null
+++ b/game_library/src/images/state.rs
@@ -0,0 +1,85 @@
+//! This module contains the different states that an entity can be in. These states are used to determine the final animation state.
+
+use bevy::prelude::*;
+use serde::{Deserialize, Serialize};
+
+/// The different movement states for an entity. This is used to determine the final animation state.
+#[derive(
+    Debug,
+    Default,
+    Clone,
+    Copy,
+    PartialEq,
+    Eq,
+    Hash,
+    Reflect,
+    Serialize,
+    Deserialize,
+    Component,
+    Resource,
+)]
+pub enum Movement {
+    /// The entity is idle.
+    #[default]
+    Idle,
+    /// The entity is walking.
+    Walk,
+    /// The entity is running.
+    Run,
+    /// The entity is jumping.
+    Jump,
+}
+
+/// The different action states for an entity. This is used to determine the final animation state.
+#[derive(
+    Debug,
+    Default,
+    Clone,
+    Copy,
+    PartialEq,
+    Eq,
+    Hash,
+    Reflect,
+    Serialize,
+    Deserialize,
+    Component,
+    Resource,
+)]
+pub enum Action {
+    /// The entity is not taking any action.
+    #[default]
+    None,
+    /// The entity is casting a spell.
+    Cast,
+    /// The entity is attacking.
+    Attack,
+}
+
+/// The different reaction states for an entity. This is used to determine the final animation state.
+#[derive(
+    Debug,
+    Default,
+    Clone,
+    Copy,
+    PartialEq,
+    Eq,
+    Hash,
+    Reflect,
+    Serialize,
+    Deserialize,
+    Component,
+    Resource,
+)]
+pub enum Reaction {
+    /// The entity is not reacting to anything.
+    #[default]
+    None,
+    /// The entity is hurt.
+    Hurt,
+    /// The entity is stunned.
+    Stun,
+    /// The entity is dead.
+    Dead,
+    /// The entity is dying
+    Death,
+}
diff --git a/game_library/src/images/texture_atlas.rs b/game_library/src/images/texture_atlas.rs
new file mode 100644
index 0000000..d59ac25
--- /dev/null
+++ b/game_library/src/images/texture_atlas.rs
@@ -0,0 +1,12 @@
+//! Texture atlas resource for storing the texture atlas handle and the texture handle.
+use bevy::prelude::*;
+
+/// `TextureAtlas` has been changed in bevy 0.13 so we need to track the texture handle and the texture atlas.
+#[derive(Resource, Debug, Clone, Default)]
+#[allow(clippy::module_name_repetitions)]
+pub struct StoredTextureAtlas {
+    /// The texture handle of the texture atlas layout.
+    pub atlas_handle: Handle<TextureAtlasLayout>,
+    /// The texture handle used by the atlas.
+    pub texture_handle: Handle<Image>,
+}
diff --git a/game_library/src/tileset.rs b/game_library/src/images/tileset.rs
similarity index 98%
rename from game_library/src/tileset.rs
rename to game_library/src/images/tileset.rs
index 5eaf37c..1da6461 100644
--- a/game_library/src/tileset.rs
+++ b/game_library/src/images/tileset.rs
@@ -1,4 +1,6 @@
 //! Tileset data. Instructions for what tilesets to load.
+//!
+//! This is the basic data required for us to be able to load in a tileset.
 use bevy::math::Vec2;
 use bevy::reflect::Reflect;
 use std::{any::Any, hash::Hash};
diff --git a/game_library/src/lib.rs b/game_library/src/lib.rs
index 6a49c92..fac02ed 100644
--- a/game_library/src/lib.rs
+++ b/game_library/src/lib.rs
@@ -20,19 +20,24 @@
 //! The remaining items are specific to the Elementalist game.
 //!
 
+pub mod buttons;
 pub mod colors;
 pub mod data_loader;
 pub mod enums;
 pub mod events;
 pub mod font_resource;
+pub mod images;
 pub mod math;
 pub mod menu_helper;
 pub mod progress_bar;
+pub mod save_file;
 pub mod settings;
+pub mod spells;
 pub mod state;
 
 mod acceleration;
 mod attribute;
+mod audio;
 mod biome;
 mod camera_scale;
 mod cursor_position;
@@ -50,25 +55,22 @@ mod schedule;
 mod shared_traits;
 mod simple_object;
 mod skill;
-mod spell_bundle;
-mod spell_choices;
-mod spell_data;
-mod spell_lifetime;
 mod stat;
 mod stat_bonus;
 mod stat_bundle;
 mod stat_effect;
-mod tileset;
 mod volume;
 
 pub use acceleration::Acceleration;
 pub use attribute::Attribute;
+pub use audio::AudioPlugin;
 pub use biome::BiomeData;
 pub use camera_scale::CameraScaleLevel;
 pub use cursor_position::CursorPosition;
 pub use depth_2d::{Layer, LayerPlugin};
 pub use experience::Xp;
 pub use health::Health;
+pub use images::Tileset;
 pub use mana::Mana;
 pub use markers_to_biomes::MarkersToBiomes;
 pub use movement_bundle::MovementBundle;
@@ -78,16 +80,12 @@ pub use noise::NoisePlugin;
 pub use physics::PhysicsPlugin;
 pub use realm_data::Realm;
 pub use schedule::*;
+pub use shared_traits::DisplayInformation;
 pub use shared_traits::InternalId;
 pub use simple_object::SimpleObject;
 pub use skill::Skills;
-pub use spell_bundle::SpellBundle;
-pub use spell_choices::SpellChoices;
-pub use spell_data::SpellData;
-pub use spell_lifetime::SpellLifetime;
 pub use stat::Stat;
 pub use stat_bonus::StatBonus;
 pub use stat_bundle::StatBundle;
 pub use stat_effect::StatEffect;
-pub use tileset::Tileset;
 pub use volume::Volume;
diff --git a/game_library/src/noise/resources.rs b/game_library/src/noise/resources.rs
index 0613b07..2b898a2 100644
--- a/game_library/src/noise/resources.rs
+++ b/game_library/src/noise/resources.rs
@@ -18,7 +18,7 @@ impl GenerationSeed {
 ///
 /// This is used to store the results of the noise generation, and then
 /// used to generate the actual realm. The default map size is 1000x1000.
-#[derive(Debug, Clone, Eq, PartialEq, Hash, Resource)]
+#[derive(Debug, Clone, Resource)]
 pub struct GeneratedMaps {
     /// The biome map.
     pub biome_map: Vec<Vec<Marker>>,
@@ -28,11 +28,15 @@ pub struct GeneratedMaps {
     width: usize,
     /// The height of the map. Each tile is 16x16 px.
     height: usize,
+    /// Default dimension for an individual tile (one side).
+    tile_dimension: f32,
 }
 
 impl GeneratedMaps {
     /// The default size of the map.
     pub const DEFAULT_SIZE: (usize, usize) = (100, 100);
+    /// Tile size in pixels. One side because they are square.
+    pub const DEFAULT_TILE_SIZE: f32 = 16.0;
 
     /// Create a new Empty `GeneratedMaps` with the given size.
     #[must_use]
@@ -42,6 +46,7 @@ impl GeneratedMaps {
             object_map: Vec::with_capacity(size.0),
             width: size.0,
             height: size.1,
+            tile_dimension: Self::DEFAULT_TILE_SIZE,
         };
         for _ in 0..size.0 {
             empty_map.biome_map.push(Vec::with_capacity(size.1));
@@ -51,6 +56,13 @@ impl GeneratedMaps {
         empty_map
     }
 
+    /// Update the tile dimension.
+    #[must_use]
+    pub const fn with_tile_dimension(mut self, tile_dimension: f32) -> Self {
+        self.tile_dimension = tile_dimension;
+        self
+    }
+
     /// Ask for the biome at the given position.
     ///
     /// Each tile is a 16x16 px but is accessed via the x and y coordinates of the tile.
@@ -87,8 +99,14 @@ impl GeneratedMaps {
     pub fn map_to_world(&self, pos: (usize, usize)) -> Vec3 {
         #[allow(clippy::cast_precision_loss)]
         Vec3::new(
-            (pos.0 as f32).mul_add(16.0, self.width as f32 * -8.0),
-            (pos.1 as f32).mul_add(16.0, self.height as f32 * -8.0),
+            (pos.0 as f32).mul_add(
+                self.tile_dimension,
+                self.width as f32 * (self.tile_dimension * -0.5),
+            ),
+            (pos.1 as f32).mul_add(
+                self.tile_dimension,
+                self.height as f32 * (self.tile_dimension * -0.5),
+            ),
             0.0,
         )
     }
@@ -142,8 +160,14 @@ impl GeneratedMaps {
             clippy::cast_sign_loss
         )]
         (
-            pos.x.mul_add(1. / 16.0, self.width as f32 * -8.0) as usize,
-            pos.y.mul_add(1. / 16.0, self.height as f32 * -8.0) as usize,
+            pos.x.mul_add(
+                1. / self.tile_dimension,
+                self.width as f32 * (self.tile_dimension * -0.5),
+            ) as usize,
+            pos.y.mul_add(
+                1. / self.tile_dimension,
+                self.height as f32 * (self.tile_dimension * -0.5),
+            ) as usize,
         )
     }
 
diff --git a/game_library/src/physics/plugin.rs b/game_library/src/physics/plugin.rs
index 7e78db3..d0ec3b7 100644
--- a/game_library/src/physics/plugin.rs
+++ b/game_library/src/physics/plugin.rs
@@ -41,7 +41,7 @@ impl Plugin for PhysicsPlugin {
 #[allow(clippy::needless_pass_by_value)]
 fn toggle_debug_rendering(
     mut debug_render_context: ResMut<DebugRenderContext>,
-    keyboard_input: Res<Input<KeyCode>>,
+    keyboard_input: Res<ButtonInput<KeyCode>>,
 ) {
     if keyboard_input.just_pressed(KeyCode::F3) {
         debug_render_context.enabled = !debug_render_context.enabled;
diff --git a/game_library/src/progress_bar/config.rs b/game_library/src/progress_bar/config.rs
index f64d150..492f97f 100644
--- a/game_library/src/progress_bar/config.rs
+++ b/game_library/src/progress_bar/config.rs
@@ -156,7 +156,7 @@ impl<T: Percentage + Component> ProgressBarConfig<T> {
     /// This is a [`Quad`] with the size of the progress bar.
     #[must_use]
     pub fn background_mesh(&self) -> Mesh {
-        shape::Quad::new(self.size).into()
+        Rectangle::new(self.size.x, self.size.y).into()
     }
     /// Get the mesh for the progress bar foreground.
     ///
@@ -164,11 +164,7 @@ impl<T: Percentage + Component> ProgressBarConfig<T> {
     /// bar background scaled by the percentage.
     #[must_use]
     pub fn foreground_mesh(&self, percentage: &T) -> Mesh {
-        shape::Quad::new(Vec2::new(
-            self.size.x * percentage.percentage(),
-            self.size.y,
-        ))
-        .into()
+        Rectangle::new(self.size.x * percentage.percentage(), self.size.y).into()
     }
     /// Get the current [`BarState`] for the given percentage.
     #[must_use]
diff --git a/game_library/src/progress_bar/plugin.rs b/game_library/src/progress_bar/plugin.rs
index 3ceb2f1..f1c51a1 100644
--- a/game_library/src/progress_bar/plugin.rs
+++ b/game_library/src/progress_bar/plugin.rs
@@ -86,12 +86,10 @@ fn spawn_progress_bars<T: Percentage + Component>(
 ) {
     for (entity, percentage, config) in query.iter() {
         // spawn progress bar
-        let foreground_color = materials.add(config.color(percentage).into());
-        let foreground_color_moderate =
-            materials.add(config.color_for_state(&BarState::Moderate).into());
-        let foreground_color_critical =
-            materials.add(config.color_for_state(&BarState::Critical).into());
-        let background_color = materials.add(config.background_color().into());
+        let foreground_color = materials.add(config.color(percentage));
+        let foreground_color_moderate = materials.add(config.color_for_state(&BarState::Moderate));
+        let foreground_color_critical = materials.add(config.color_for_state(&BarState::Critical));
+        let background_color = materials.add(config.background_color());
 
         let Ok(entity_transform) = transform_query.get(entity) else {
             tracing::warn!("Failed to get parent transform for progress bar");
@@ -151,40 +149,42 @@ fn update<T: Percentage + Component>(
     parent_query: Query<(&T, &ProgressBarConfig<T>, &WithProgressBar<T>, &Children), Changed<T>>,
     mut mesh_query: Query<&mut Transform>,
 ) {
-    parent_query.for_each(|(percentage, config, progress_bar, children)| {
-        let (_, foreground) = progress_bar.get();
-
-        // loop over child entity ids
-        for child in children {
-            // if this isn't the foreground entity, skip it
-            if *child != foreground {
-                continue;
-            }
-
-            tracing::info!(
-                "Updating progress bar for entity with percentage {}",
-                percentage.percentage()
-            );
-
-            // grab the mutable mesh
-            let Ok(mut transform) = mesh_query.get_mut(*child) else {
-                tracing::warn!(
-                    "Failed to get foreground mesh for progress bar Entity {foreground:?}"
+    parent_query
+        .iter()
+        .for_each(|(percentage, config, progress_bar, children)| {
+            let (_, foreground) = progress_bar.get();
+
+            // loop over child entity ids
+            for child in children {
+                // if this isn't the foreground entity, skip it
+                if *child != foreground {
+                    continue;
+                }
+
+                tracing::info!(
+                    "Updating progress bar for entity with percentage {}",
+                    percentage.percentage()
                 );
-                return;
-            };
-
-            // update the mesh
-            commands
-                .entity(*child)
-                .insert(progress_bar.get_material(config, percentage));
-            // update the transform
-            transform.scale = Vec3::new(percentage.percentage(), 1.0, 1.0);
-            // update the translation.x to be the percentage of the parent's width
-            transform.translation.x =
-                config.position_translation.x + (percentage.percentage() * config.size.x / 2.0);
-        }
-    });
+
+                // grab the mutable mesh
+                let Ok(mut transform) = mesh_query.get_mut(*child) else {
+                    tracing::warn!(
+                        "Failed to get foreground mesh for progress bar Entity {foreground:?}"
+                    );
+                    return;
+                };
+
+                // update the mesh
+                commands
+                    .entity(*child)
+                    .insert(progress_bar.get_material(config, percentage));
+                // update the transform
+                transform.scale = Vec3::new(percentage.percentage(), 1.0, 1.0);
+                // update the translation.x to be the percentage of the parent's width
+                transform.translation.x =
+                    config.position_translation.x + (percentage.percentage() * config.size.x / 2.0);
+            }
+        });
 }
 
 #[allow(clippy::needless_pass_by_value)]
diff --git a/game_library/src/save_file/data.rs b/game_library/src/save_file/data.rs
new file mode 100644
index 0000000..4e26bbb
--- /dev/null
+++ b/game_library/src/save_file/data.rs
@@ -0,0 +1,202 @@
+//! Struct definitions for the save file data.
+
+use std::path::Path;
+
+use crate::{enums::Skill, spells::talisman::SpellTalisman, Skills, Xp};
+use bevy::{prelude::*, utils::hashbrown::HashMap};
+use serde::{Deserialize, Serialize};
+
+/// Struct for the save file data. This is serialized and deserialized to and from a file.
+/// (This the data that is saved and loaded). It should be everything to bring a player
+/// back to the state they were in when they saved. What it doesn't support is coming back
+/// to an exact position in a realm or dungeon, and we don't support that.
+///
+/// The save file data is stored in a directory provided by the `platform_dirs` crate.
+///
+/// During the game, the save file data is stored in a `SaveFile` resource. New relevant
+/// data is added to the `SaveFile` resource as the player progresses through the game.
+/// The only data not constantly added is stat tracking, which is tracked in its own resource,
+/// and then added to the `SaveFile` resource when the game is saved.
+///
+/// Player skills are part of this file, and they can be referenced directly from this resource
+/// while in the game.
+#[derive(Serialize, Deserialize, Debug, Reflect, Clone, Resource)]
+pub struct SaveFile {
+    /// Name of the save file
+    pub name: String,
+    /// Created talismans
+    created_talismans: Vec<SpellTalisman>,
+    /// Researched talismans
+    researched_talismans: Vec<SpellTalisman>,
+    /// Player skills
+    player_skills: Skills,
+    /// Unlocked skill perks for each skill (not implemented yet)
+    unlocked_skill_perks: String,
+    /// Inventory (essences, items, etc.) (not implemented yet)
+    inventory: String,
+    /// Stat tracking (not implemented yet)
+    stat_tracking: String,
+}
+
+impl Default for SaveFile {
+    fn default() -> Self {
+        Self {
+            name: String::from("New Game"),
+            created_talismans: Vec::new(),
+            researched_talismans: Vec::new(),
+            player_skills: Skills {
+                tracks: HashMap::new(),
+            },
+            unlocked_skill_perks: String::new(),
+            inventory: String::new(),
+            stat_tracking: String::new(),
+        }
+    }
+}
+
+impl SaveFile {
+    /// Create a new save file with specified name
+    ///
+    /// # Parameters
+    ///
+    /// * `name` - Name of the save file
+    #[must_use]
+    pub fn new(name: &str) -> Self {
+        Self {
+            name: String::from(name),
+            ..Self::default()
+        }
+    }
+
+    /// Load a save file by name from a path.
+    ///
+    /// The save files currently are just a YAML formatted file with the '.sav' extension.
+    ///
+    /// # Parameters
+    ///
+    /// * `path` - Path to the save file
+    #[must_use]
+    pub fn load<P: AsRef<Path>>(path: &P) -> Option<Self> {
+        let path = path.as_ref();
+        if path.exists() {
+            let Ok(file) = std::fs::File::open(path) else {
+                error!("Unable to open save file: {}", path.display());
+                return None;
+            };
+            let reader = std::io::BufReader::new(file);
+            let Ok(save_file) = serde_yaml::from_reader(reader) else {
+                error!("Unable to load save file: {}", path.display());
+                return None;
+            };
+            Some(save_file)
+        } else {
+            None
+        }
+    }
+
+    /// Save the save file in a directory. This will use the name of the save file to create a '.sav' file.
+    ///
+    /// # Parameters
+    ///
+    /// * `directory` - Directory to save the file in
+    pub fn save<P: AsRef<Path>>(&self, directory: &P) {
+        let path = directory.as_ref().join(format!("{}.sav", self.name));
+        let Ok(file) = std::fs::File::create(&path) else {
+            error!("Unable to create save file: {}", self.name);
+            return;
+        };
+        let writer = std::io::BufWriter::new(file);
+        match serde_yaml::to_writer(writer, self) {
+            Ok(()) => {
+                info!("Save file saved: {}", self.name);
+                debug!("Saved to: {}", &path.display());
+            }
+            Err(e) => error!("Unable to save save file: {}", e),
+        };
+    }
+
+    /// Add a created talisman to the save file
+    ///
+    /// # Parameters
+    ///
+    /// * `talisman` - The created talisman
+    pub fn add_created_talisman(&mut self, talisman: SpellTalisman) {
+        self.created_talismans.push(talisman);
+    }
+
+    /// Add a researched talisman to the save file
+    ///
+    /// # Parameters
+    ///
+    /// * `talisman` - The researched talisman
+    pub fn add_researched_talisman(&mut self, talisman: SpellTalisman) {
+        self.researched_talismans.push(talisman);
+    }
+
+    /// Get all skill data (useful for broad operations on all skills)
+    #[must_use]
+    pub fn get_skills(&self) -> Skills {
+        self.player_skills.clone()
+    }
+
+    /// Get xp for a skill
+    ///
+    /// # Parameters
+    ///
+    /// * `skill` - The skill to get xp for
+    #[must_use]
+    pub fn get_xp(&self, skill: Skill) -> Option<&Xp> {
+        self.player_skills.get_xp(skill)
+    }
+
+    /// Get the level for a skill
+    ///
+    /// # Parameters
+    ///
+    /// * `skill` - The skill to get the level for
+    #[must_use]
+    pub fn get_level(&self, skill: Skill) -> Option<u32> {
+        self.player_skills.get_level(skill)
+    }
+
+    /// Get the percentage to the next level for a skill
+    ///
+    /// # Parameters
+    ///
+    /// * `skill` - The skill to get the percentage to the next level for
+    #[must_use]
+    pub fn get_percentage_to_next_level(&self, skill: Skill) -> Option<f32> {
+        self.player_skills.get_percentage_to_next_level(skill)
+    }
+
+    /// Add xp to a skill
+    ///
+    /// # Parameters
+    ///
+    /// * `skill` - The skill to add xp to
+    /// * `xp` - The amount of xp to add
+    pub fn add_xp(&mut self, skill: Skill, xp: u32) {
+        self.player_skills.add_xp(skill, xp);
+    }
+
+    /// Level-up a skill
+    ///
+    /// # Parameters
+    ///
+    /// * `skill` - The skill to level up
+    pub fn level_up(&mut self, skill: Skill) {
+        self.player_skills.level_up(skill);
+    }
+
+    /// Get all created talismans
+    #[must_use]
+    pub fn get_created_talismans(&self) -> Vec<SpellTalisman> {
+        self.created_talismans.clone()
+    }
+
+    /// Get all researched talismans
+    #[must_use]
+    pub fn get_researched_talismans(&self) -> Vec<SpellTalisman> {
+        self.researched_talismans.clone()
+    }
+}
diff --git a/game_library/src/save_file/events.rs b/game_library/src/save_file/events.rs
new file mode 100644
index 0000000..ed99be4
--- /dev/null
+++ b/game_library/src/save_file/events.rs
@@ -0,0 +1,23 @@
+//! Events for loading and saving save files.
+
+use bevy::prelude::*;
+
+/// Types of save file actions that can be taken
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum Action {
+    /// Load a save file
+    Load,
+    /// Save a save file
+    Save,
+    /// Update a save file
+    Update,
+}
+
+/// Event that triggers the loading of a save file.
+#[derive(Debug, Event)]
+pub struct SaveFileEvent {
+    /// Name of the save file to load.
+    pub name: String,
+    /// Action to take with the save file
+    pub action: Action,
+}
diff --git a/game_library/src/save_file/initialize.rs b/game_library/src/save_file/initialize.rs
new file mode 100644
index 0000000..ebb75e8
--- /dev/null
+++ b/game_library/src/save_file/initialize.rs
@@ -0,0 +1,24 @@
+//! System to initialize the save file system.
+
+use super::paths::{save_directory, settings_directory, SaveFileDirectories};
+use bevy::prelude::*;
+
+/// System to initialize the save file directories.
+///
+/// The directories are created if they don't exist.
+pub fn save_file_directories(mut commands: Commands) {
+    let save_directory = save_directory();
+    if !save_directory.exists() {
+        std::fs::create_dir_all(&save_directory).expect("Unable to create save directory.");
+    }
+    let settings_directory = settings_directory();
+    if !settings_directory.exists() {
+        std::fs::create_dir_all(&settings_directory).expect("Unable to create settings directory.");
+    }
+
+    // Add the save file directories resource
+    commands.insert_resource(SaveFileDirectories {
+        settings: settings_directory,
+        save: save_directory,
+    });
+}
diff --git a/game_library/src/save_file/mod.rs b/game_library/src/save_file/mod.rs
new file mode 100644
index 0000000..d57b099
--- /dev/null
+++ b/game_library/src/save_file/mod.rs
@@ -0,0 +1,33 @@
+//! Module for handing save files, saving and loading.
+//!
+//! Directory for save files is provided from the `platform_dirs` crate.
+//!
+//! Need to track the following:
+//!
+//! - created talismans
+//! - researched talismans
+//! - player skills
+//! - unlocked skill perks for each skill
+//! - inventory (essences, items, etc.)
+//! - name of the save
+//! - stat tracking
+//!   - time played
+//!   - enemies killed (and by what)
+//!   - damage dealt, with each spell
+//!   - damage taken
+//!   - etc...
+
+mod data;
+pub mod events;
+mod initialize;
+mod paths;
+mod plugin;
+mod save_load;
+
+#[allow(clippy::module_name_repetitions)]
+pub use data::SaveFile;
+pub use paths::settings_directory;
+#[allow(clippy::module_name_repetitions)]
+pub use paths::SaveFileDirectories;
+#[allow(clippy::module_name_repetitions)]
+pub use plugin::SaveFilePlugin;
diff --git a/game_library/src/save_file/paths.rs b/game_library/src/save_file/paths.rs
new file mode 100644
index 0000000..3cfa48b
--- /dev/null
+++ b/game_library/src/save_file/paths.rs
@@ -0,0 +1,39 @@
+//! Provides the directory for either save or settings files.
+use bevy::prelude::*;
+use platform_dirs::AppDirs;
+use std::path::PathBuf;
+
+const APP_PREFIX: &str = "Elementalist";
+
+/// Directory for settings files.
+///
+/// ## Panics
+/// Panics if the directory cannot be found.
+pub fn settings_directory() -> PathBuf {
+    let Some(app_dirs) = AppDirs::new(Some(APP_PREFIX), true) else {
+        tracing::error!("Unable to get settings directory for platform. Quitting.");
+        std::process::exit(1);
+    };
+    app_dirs.config_dir
+}
+
+/// Directory for save files.
+///
+/// ## Panics
+/// Panics if the directory cannot be found.
+pub fn save_directory() -> PathBuf {
+    let Some(app_dirs) = AppDirs::new(Some(APP_PREFIX), true) else {
+        tracing::error!("Unable to get save directory for platform. Quitting.");
+        std::process::exit(1);
+    };
+    app_dirs.data_dir
+}
+
+/// Resource to hold the directory paths for settings and save files.
+#[derive(Debug, Clone, Resource, Component, PartialEq, Eq, Hash)]
+pub struct SaveFileDirectories {
+    /// Directory for settings files and plugins.
+    pub settings: PathBuf,
+    /// Directory for save files.
+    pub save: PathBuf,
+}
diff --git a/game_library/src/save_file/plugin.rs b/game_library/src/save_file/plugin.rs
new file mode 100644
index 0000000..d2452e7
--- /dev/null
+++ b/game_library/src/save_file/plugin.rs
@@ -0,0 +1,22 @@
+//! Plugin for the save file system.
+
+use bevy::prelude::*;
+
+use super::{data::SaveFile, events::SaveFileEvent, initialize, save_load};
+
+/// Plugin for the save file system.
+#[allow(clippy::module_name_repetitions)]
+pub struct SaveFilePlugin;
+
+impl Plugin for SaveFilePlugin {
+    fn build(&self, app: &mut App) {
+        // Initialize the save file system
+        app.add_systems(PreStartup, initialize::save_file_directories);
+        // Add the save file resource
+        app.init_resource::<SaveFile>();
+        // Add the events for loading and saving save files
+        app.add_event::<SaveFileEvent>();
+        // Add the system to save and load save files
+        app.add_systems(Update, save_load::handle_save_file_event);
+    }
+}
diff --git a/game_library/src/save_file/save_load.rs b/game_library/src/save_file/save_load.rs
new file mode 100644
index 0000000..fecfb4f
--- /dev/null
+++ b/game_library/src/save_file/save_load.rs
@@ -0,0 +1,36 @@
+//! Module for loading save files.
+
+use super::{
+    data::SaveFile,
+    events::{Action, SaveFileEvent},
+    paths::SaveFileDirectories,
+};
+use bevy::prelude::*;
+
+/// System to load a save file.
+#[allow(clippy::needless_pass_by_value)]
+pub(super) fn handle_save_file_event(
+    mut commands: Commands,
+    save_file: Res<SaveFile>,
+    save_file_directories: Res<SaveFileDirectories>,
+    mut event_ro: EventReader<SaveFileEvent>,
+) {
+    for event in event_ro.read() {
+        match event.action {
+            Action::Load => {
+                let Some(save_file) = SaveFile::load(
+                    &save_file_directories
+                        .save
+                        .join(&format!("{}.sav", event.name)),
+                ) else {
+                    error!("Unable to load save file: {}", event.name);
+                    continue;
+                };
+                commands.insert_resource(save_file);
+            }
+            Action::Save | Action::Update => {
+                save_file.save(&save_file_directories.save);
+            }
+        }
+    }
+}
diff --git a/game_library/src/settings.rs b/game_library/src/settings.rs
index d997095..8865ec8 100644
--- a/game_library/src/settings.rs
+++ b/game_library/src/settings.rs
@@ -54,6 +54,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     font_resource::{FontChoice, FontFamily},
+    save_file::settings_directory,
     CameraScaleLevel, Volume,
 };
 
@@ -150,7 +151,7 @@ pub struct AccessibilitySettings {
 /// # Example
 ///
 /// ```
-/// use game_library::{font_resource::FontChoice, settings::next_font_choice};
+/// use elementalist_game_library::{font_resource::FontChoice, settings::next_font_choice};
 ///
 /// assert_eq!(next_font_choice(FontChoice::Display), FontChoice::Interface);
 /// assert_eq!(next_font_choice(FontChoice::Interface), FontChoice::Main);
@@ -174,7 +175,7 @@ pub const fn next_font_choice(font_choice: FontChoice) -> FontChoice {
 /// # Example
 ///
 /// ```
-/// use game_library::{font_resource::FontFamily, settings::next_font_family};
+/// use elementalist_game_library::{font_resource::FontFamily, settings::next_font_family};
 ///
 /// assert_eq!(next_font_family(FontFamily::Display), FontFamily::Dyslexic);
 /// assert_eq!(next_font_family(FontFamily::Fancy), FontFamily::Dyslexic);
@@ -221,10 +222,7 @@ impl Default for SettingsPlugin {
 impl Plugin for SettingsPlugin {
     fn build(&self, app: &mut App) {
         // Initialize the PKV store
-        app.insert_resource(PkvStore::new(
-            self.organization.as_str(),
-            self.application.as_str(),
-        ));
+        app.insert_resource(PkvStore::new_in_dir(settings_directory()));
 
         app
             // SettingChanged is a helper event for responding to button interaction
@@ -297,7 +295,7 @@ impl SettingCategory {
     /// # Example
     ///
     /// ```
-    /// use game_library::settings::SettingCategory;
+    /// use elementalist_game_library::settings::SettingCategory;
     ///
     /// assert_eq!(SettingCategory::Volume.name(), "Volume");
     /// ```
diff --git a/game_library/src/shared_traits.rs b/game_library/src/shared_traits.rs
index e2fa38c..fe6c477 100644
--- a/game_library/src/shared_traits.rs
+++ b/game_library/src/shared_traits.rs
@@ -18,3 +18,20 @@ pub trait KnownCastSlot {
     /// Get the cast slot of the spell.
     fn cast_slot(&self) -> CastSlot;
 }
+
+/// A trait to supply display various display information about an object.
+///
+/// This is useful for objects that need to be displayed in a user interface, and since
+/// all object in the game are dynamically loaded, being able to use the functions in this
+/// trait will allow simplifying the process of displaying the information about loaded
+/// data to the user.
+pub trait DisplayInformation {
+    /// A tooltip that summarizes the object. Can be multiline and describes the object in brief.
+    fn tooltip(&self) -> String;
+    /// A longer description of the object. Can be multiline and describes the object in detail. This
+    /// is used for a more detailed description of the object.
+    fn more_info(&self) -> String;
+    /// A one-line summary of the object. This puts it in a single line for lists and other places
+    /// where a single line is needed.
+    fn summarized_one_liner(&self) -> String;
+}
diff --git a/game_library/src/skill.rs b/game_library/src/skill.rs
index c496431..21c3c23 100644
--- a/game_library/src/skill.rs
+++ b/game_library/src/skill.rs
@@ -4,7 +4,7 @@
 //!
 //! Skills are able to be leveled up, and have no level cap but do have a
 //! soft cap that makes it harder to level up the higher the skill is (this is
-//! automatically handled by the [`game_library::Xp`] component).
+//! automatically handled by the [`elementalist_game_library::Xp`] component).
 
 use bevy::{
     ecs::{component::Component, system::Resource},
diff --git a/game_library/src/spell_choices.rs b/game_library/src/spell_choices.rs
deleted file mode 100644
index 9ed9f7c..0000000
--- a/game_library/src/spell_choices.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-//! A resource that stores the player's spell choices.
-
-use bevy::prelude::*;
-use bevy_inspector_egui::prelude::*;
-use serde::{Deserialize, Serialize};
-
-use crate::{enums::CastSlot, InternalId, SpellData};
-
-/// A resource that stores the player's spell choices.
-#[derive(
-    Resource,
-    Default,
-    Debug,
-    Reflect,
-    Clone,
-    PartialEq,
-    Eq,
-    Serialize,
-    Deserialize,
-    InspectorOptions,
-)]
-#[reflect(InspectorOptions)]
-pub struct SpellChoices {
-    /// The spell to cast when the player presses the primary cast button.
-    pub primary: Option<String>,
-    /// The spell to cast when the player presses the secondary cast button.
-    pub secondary: Option<String>,
-    /// The spell to cast when the player presses the defensive cast button.
-    pub defensive: Option<String>,
-    /// The spell to cast when the player presses the ultimate cast button.
-    pub ultimate: Option<String>,
-}
-
-impl SpellChoices {
-    /// Set the primary spell choice.
-    pub fn set_primary(&mut self, spell: &SpellData) {
-        if spell.cast_slot == CastSlot::Primary {
-            self.primary = Some(spell.get_internal_id());
-        }
-    }
-    /// Set the secondary spell choice.
-    pub fn set_secondary(&mut self, spell: &SpellData) {
-        if spell.cast_slot == CastSlot::Secondary {
-            self.secondary = Some(spell.get_internal_id());
-        }
-    }
-    /// Set the defensive spell choice.
-    pub fn set_defensive(&mut self, spell: &SpellData) {
-        if spell.cast_slot == CastSlot::Defensive {
-            self.defensive = Some(spell.get_internal_id());
-        }
-    }
-    /// Set the ultimate spell choice.
-    pub fn set_ultimate(&mut self, spell: &SpellData) {
-        if spell.cast_slot == CastSlot::Ultimate {
-            self.ultimate = Some(spell.get_internal_id());
-        }
-    }
-    /// Set the primary spell choice by spell id.
-    pub fn set_primary_by_id(&mut self, spell_id: String) {
-        self.primary = Some(spell_id);
-    }
-    /// Set the secondary spell choice by spell id.
-    pub fn set_secondary_by_id(&mut self, spell_id: String) {
-        self.secondary = Some(spell_id);
-    }
-    /// Set the defensive spell choice by spell id.
-    pub fn set_defensive_by_id(&mut self, spell_id: String) {
-        self.defensive = Some(spell_id);
-    }
-    /// Set the ultimate spell choice by spell id.
-    pub fn set_ultimate_by_id(&mut self, spell_id: String) {
-        self.ultimate = Some(spell_id);
-    }
-}
diff --git a/game_library/src/spell_data.rs b/game_library/src/spell_data.rs
deleted file mode 100644
index 5ca70ef..0000000
--- a/game_library/src/spell_data.rs
+++ /dev/null
@@ -1,277 +0,0 @@
-//! Spell data describes how a spell works and how it should be displayed.
-//!
-//! You can describe spell data using YAML or JSON using the schema:
-//!
-//! ```yaml
-//! # $schema: "https://schemas.nwest.one/games/elementalist/spell.json"
-//! ```
-use bevy::reflect::Reflect;
-use serde_default_utils::{default_i32, default_usize};
-use std::{any::Any, hash::Hash};
-
-use crate::{
-    data_loader::DataFile,
-    enums::{
-        CastCategory, CastSlot, CastType, GameSystem, MagicType, ParticleAttachment, Skill,
-        SpellCollision,
-    },
-    shared_traits::KnownCastSlot,
-    InternalId, StatEffect,
-};
-
-/// Details about a spell.
-///
-/// Describes in detail how a spell works and how it should be displayed.
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Reflect)]
-#[serde(rename_all = "camelCase")]
-pub struct SpellData {
-    /// The internal ID of the spell.
-    pub internal_id: Option<String>,
-    /// The name of the spell.
-    pub name: String,
-    /// A short description of the spell.
-    pub description: String,
-    /// A longer description of the spell.
-    #[serde(default = "String::new")]
-    pub long_description: String,
-    /// The tier of the spell (0-9 officially).
-    pub spell_tier: usize,
-    /// The type of magic the spell uses.
-    pub magic: MagicType,
-    /// The slot the spell can be cast from.
-    pub cast_slot: CastSlot,
-    /// The type of collision the spell has.
-    #[serde(default = "spell_defaults::collision")]
-    pub collision: SpellCollision,
-    /// The type of cast the spell has.
-    #[serde(default = "spell_defaults::cast_type")]
-    pub cast_type: CastType,
-    /// How the spell is targeted
-    #[serde(default = "spell_defaults::cast_category")]
-    pub cast_category: CastCategory,
-
-    // #### SPELL ICONS ####
-    /// The path to the icon for the spell (relative to the game's asset directory).
-    #[serde(default = "spell_defaults::placeholder_png_path")]
-    pub icon_tileset: String,
-    /// The index of the spell's icon in the tileset.
-    #[serde(default = "default_usize::<0>")]
-    pub icon_index: usize,
-    /// The path to the sprite tileset for the spell (relative to the game's asset directory).
-    #[serde(default = "spell_defaults::placeholder_png_path")]
-    pub sprite_tileset: String,
-    /// The index of the spell's sprite in the tileset.
-    #[serde(default = "default_usize::<0>")]
-    pub sprite_index: usize,
-
-    // #### SPELL BASE STATS ####
-    /// The cooldown of the spell in seconds
-    #[serde(default = "spell_defaults::spell_cooldown")]
-    pub cooldown: f32,
-    /// The cast time of the spell in seconds
-    #[serde(default = "spell_defaults::spell_cast_time")]
-    pub cast_time: f32,
-    /// The mana cost of the spell (mana is an integer value)
-    #[serde(default = "default_usize::<0>")]
-    pub mana_cost: usize,
-    /// The range of the spell in centimeters.
-    #[serde(default = "spell_defaults::spell_range")]
-    pub range: f32,
-    /// The speed of the spell in meters per second.
-    #[serde(default = "spell_defaults::spell_speed")]
-    pub speed: f32,
-    /// The duration of the spell in seconds.
-    #[serde(default = "spell_defaults::spell_duration")]
-    pub duration: f32,
-    /// The base damage of the spell, 0 if the spell does not deal damage.
-    #[serde(default = "default_i32::<0>")]
-    pub damage: i32,
-    /// The base healing of the spell, 0 if the spell does not heal.
-    #[serde(default = "default_i32::<0>")]
-    pub healing: i32,
-    /// Radius of the spell "detonation" in centimeters.
-    ///
-    /// Spells which target the ground use this value to determine the radius of the area of effect.
-    ///
-    /// Spells which are cone or line shaped use this value to determine the width of the cone or line.
-    #[serde(default = "default_i32::<0>")]
-    pub radius: i32,
-    /// The angle of the spell in degrees.
-    ///
-    /// Spells which are cone shaped use this value to determine the angle of the cone.
-    #[serde(default = "default_i32::<0>")]
-    pub angle: i32,
-
-    // #### SPELL EFFECTS ####
-    /// Buffs that the spell can apply to the caster or to the target.
-    #[serde(default = "Vec::new")]
-    pub buffs: Vec<StatEffect>,
-    /// Debuffs that the spell can apply to the caster or to the target.
-    #[serde(default = "Vec::new")]
-    pub debuffs: Vec<StatEffect>,
-
-    // #### SPELL PARTICLES ####
-    /// Particles that the spell can create.
-    #[serde(default = "Vec::new")]
-    pub particles: Vec<SpellParticles>,
-}
-
-impl Hash for SpellData {
-    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-        self.name.hash(state);
-        self.spell_tier.hash(state);
-        self.magic.hash(state);
-        self.cast_slot.hash(state);
-    }
-}
-
-impl InternalId for SpellData {
-    /// Update the spell's internal ID.
-    fn update_internal_id(&mut self) {
-        self.internal_id = Some(self.get_internal_id());
-    }
-    /// Get the spell's internal ID.
-    #[must_use]
-    fn get_internal_id(&self) -> String {
-        if self.internal_id.is_some() {
-            let id = self.internal_id.clone().unwrap_or_default();
-            if !id.is_empty() {
-                return id;
-            }
-        }
-
-        format!(
-            "{}{}{}{}",
-            self.name.replace(' ', ""),
-            self.spell_tier,
-            self.magic,
-            self.cast_slot
-        )
-    }
-}
-
-/// A particle that a spell can create.
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Reflect)]
-#[serde(rename_all = "camelCase")]
-pub struct SpellParticles {
-    /// The unique_id for the particle effect
-    pub particle_id: String,
-    /// The attachment point for the particle effect
-    pub attachment: ParticleAttachment,
-}
-
-impl KnownCastSlot for SpellData {
-    fn cast_slot(&self) -> CastSlot {
-        self.cast_slot
-    }
-}
-
-impl SpellData {
-    /// Returns the skill that the spell uses.
-    #[must_use]
-    pub fn skill(&self) -> Skill {
-        self.magic.into()
-    }
-    /// Get the spell's sprite as a texture atlas sprite.
-    #[must_use]
-    pub fn texture_atlas_index(&self) -> bevy::sprite::TextureAtlasSprite {
-        bevy::sprite::TextureAtlasSprite::new(self.sprite_index)
-    }
-}
-
-/// #### DEFAULTS FOR SERDE ####
-mod spell_defaults {
-    use crate::enums::{CastCategory, CastType, SpellCollision};
-
-    pub(super) const fn collision() -> SpellCollision {
-        SpellCollision::Point
-    }
-    pub(super) const fn cast_type() -> CastType {
-        CastType::Instant
-    }
-    pub(super) const fn cast_category() -> CastCategory {
-        CastCategory::Projectile
-    }
-    pub(super) fn placeholder_png_path() -> String {
-        "placeholder.png".to_string()
-    }
-    pub(super) const fn spell_cooldown() -> f32 {
-        1.0
-    }
-    pub(super) const fn spell_cast_time() -> f32 {
-        0.0
-    }
-    pub(super) const fn spell_range() -> f32 {
-        5.0
-    }
-    pub(super) const fn spell_speed() -> f32 {
-        1.0
-    }
-    pub(super) const fn spell_duration() -> f32 {
-        5.0
-    }
-}
-
-impl<D: Hash + InternalId + 'static> TryInto<SpellData> for DataFile<D> {
-    type Error = ();
-
-    fn try_into(self) -> Result<SpellData, Self::Error> {
-        if self.header.system != GameSystem::Spell {
-            return Err(());
-        }
-
-        (&self.data as &dyn Any)
-            .downcast_ref::<SpellData>()
-            .cloned()
-            .ok_or(())
-    }
-}
-
-impl<D: Hash + InternalId + 'static> TryFrom<&DataFile<D>> for SpellData {
-    type Error = ();
-
-    fn try_from(data_file: &DataFile<D>) -> Result<Self, Self::Error> {
-        if data_file.header.system != GameSystem::Tileset {
-            return Err(());
-        }
-
-        (&data_file.data as &dyn Any)
-            .downcast_ref::<Self>()
-            .cloned()
-            .ok_or(())
-    }
-}
-
-impl Default for SpellData {
-    fn default() -> Self {
-        Self {
-            internal_id: None,
-            name: "Unnamed Spell".to_string(),
-            description: "No description provided.".to_string(),
-            long_description: String::new(),
-            spell_tier: 0,
-            magic: MagicType::Arcane,
-            cast_slot: CastSlot::Primary,
-            collision: SpellCollision::Point,
-            cast_type: CastType::Instant,
-            cast_category: CastCategory::Projectile,
-            icon_tileset: spell_defaults::placeholder_png_path(),
-            icon_index: 0,
-            sprite_tileset: spell_defaults::placeholder_png_path(),
-            sprite_index: 0,
-            cooldown: spell_defaults::spell_cooldown(),
-            cast_time: spell_defaults::spell_cast_time(),
-            mana_cost: 0,
-            range: spell_defaults::spell_range(),
-            speed: spell_defaults::spell_speed(),
-            duration: spell_defaults::spell_duration(),
-            damage: 0,
-            healing: 0,
-            radius: 0,
-            angle: 0,
-            buffs: Vec::new(),
-            debuffs: Vec::new(),
-            particles: Vec::new(),
-        }
-    }
-}
diff --git a/game_library/src/spell_bundle.rs b/game_library/src/spells/bundle.rs
similarity index 83%
rename from game_library/src/spell_bundle.rs
rename to game_library/src/spells/bundle.rs
index f27f0b5..cf85c63 100644
--- a/game_library/src/spell_bundle.rs
+++ b/game_library/src/spells/bundle.rs
@@ -1,14 +1,15 @@
-//! This file contains the spell bundle, which is a bundle of components that are needed for a spell.
+//! The spell bundle used when spawning a spell in game.
 //!
 //! This bundle contains the movement bundle, the sprite sheet bundle, and the spell lifetime component.
-
-use crate::{MovementBundle, SpellLifetime};
+use super::SpellLifetime;
+use crate::MovementBundle;
 use bevy::prelude::*;
 
 /// Bundle that contains all components needed for a spell
 ///
 /// This has the information to move the spell, display it, and despawn it when it's lifetime expires.
 #[derive(Bundle)]
+#[allow(clippy::module_name_repetitions)]
 pub struct SpellBundle {
     /// The movement bundle (velocity and acceleration)
     ///
diff --git a/game_library/src/spells/definition.rs b/game_library/src/spells/definition.rs
new file mode 100644
index 0000000..64eead9
--- /dev/null
+++ b/game_library/src/spells/definition.rs
@@ -0,0 +1,591 @@
+//! Defines the `Spell` struct and its methods.
+
+use super::{talisman::SpellTalisman, SpellParticles};
+use crate::{
+    data_loader::DataFile,
+    enums::{CastSlot, CastType, GameSystem, Skill},
+    DisplayInformation, InternalId, StatEffect,
+};
+use bevy::prelude::*;
+use serde::{Deserialize, Serialize};
+use serde_default_utils::default_usize;
+use std::{any::Any, hash::Hash};
+
+/// A spell that can be cast by the player.
+#[derive(Debug, Clone, Serialize, Deserialize, Reflect, Component, Resource)]
+#[serde(rename_all = "camelCase")]
+pub struct Spell {
+    /// The unique ID of the spell. This is actually in the header of the spell definition file.
+    #[serde(default = "String::new")]
+    unique_id: String,
+    /// The name of the spell.
+    #[serde(default = "String::new")]
+    name: String,
+    /// A short description of the spell.
+    #[serde(default = "String::new")]
+    description: String,
+    /// A longer description, with more details and lore.
+    #[serde(default = "String::new")]
+    lore: String,
+    /// The spell talisman that creates this spell
+    #[serde(default = "spell_defaults::talisman")]
+    talisman: SpellTalisman,
+    /// The skill that the spell uses
+    #[serde(default = "spell_defaults::skill")]
+    skill: Skill,
+    /// The slot that the spell can be cast from
+    #[serde(default = "spell_defaults::cast_slot")]
+    cast_slot: CastSlot,
+    /// The type of casting that the spell uses
+    #[serde(default = "spell_defaults::cast_type")]
+    cast_type: CastType,
+
+    /// Cooldown time in seconds
+    #[serde(default = "spell_defaults::cooldown")]
+    cooldown: f32,
+    /// Cast time in seconds
+    #[serde(default = "spell_defaults::cast_time")]
+    cast_time: f32,
+    /// Mana cost
+    #[serde(default = "spell_defaults::mana_cost")]
+    mana_cost: f32,
+    /// Range in meters
+    #[serde(default = "spell_defaults::range")]
+    range: f32,
+    /// Speed in meters per second (this is the maximum speed)
+    #[serde(default = "spell_defaults::speed")]
+    speed: f32,
+    /// The acceleration of the spell
+    #[serde(default = "spell_defaults::acceleration")]
+    acceleration: f32,
+    /// The duration of the spell in seconds
+    #[serde(default = "spell_defaults::duration")]
+    duration: f32,
+
+    /// Base damage of the spell
+    #[serde(default = "spell_defaults::base_damage")]
+    base_damage: f32,
+    /// Base healing of the spell
+    #[serde(default = "spell_defaults::base_healing")]
+    base_healing: f32,
+    /// Buffs applied by the spell
+    #[serde(default = "Vec::new")]
+    buffs: Vec<StatEffect>,
+    /// Debuffs applied by the spell
+    #[serde(default = "Vec::new")]
+    debuffs: Vec<StatEffect>,
+
+    /// Radius of the spell's area of effect. This affects the collision for `Projectile`, `Cone`, and `Line` spells, while
+    /// `AreaOfEffect` spells use this for their area of effect.
+    #[serde(default = "spell_defaults::radius")]
+    radius: f32,
+    /// An angle in radians to affect the area covered by a `Cone` spell.
+    #[serde(default = "spell_defaults::angle")]
+    angle: f32,
+
+    /// The spell icon's tileset id
+    #[serde(default = "String::new")]
+    icon_tileset: String,
+    /// The spell icon's index in the tileset
+    #[serde(default = "default_usize::<0>")]
+    icon_index: usize,
+    /// The spell sprite's tileset id
+    #[serde(default = "String::new")]
+    sprite_tileset: String,
+    /// The spell sprite's index in the tileset
+    #[serde(default = "default_usize::<0>")]
+    sprite_index: usize,
+
+    /// The particle effects that the spell creates
+    #[serde(default = "Vec::new")]
+    particles: Vec<SpellParticles>,
+    // The sound effects that the spell creates
+    // not implemented yet
+}
+
+impl Default for Spell {
+    fn default() -> Self {
+        Self {
+            unique_id: String::new(),
+            name: String::from("Default Spell"),
+            description: String::from("This is the default spell, has no effects."),
+            lore: String::new(),
+            talisman: SpellTalisman::default(),
+            skill: Skill::Arcanomancy,
+            cast_slot: CastSlot::Cantrip,
+            cast_type: CastType::Instant,
+            cooldown: 0.0,
+            cast_time: 0.0,
+            mana_cost: 0.0,
+            range: 0.0,
+            speed: 0.0,
+            acceleration: 0.0,
+            duration: 0.0,
+            base_damage: 0.0,
+            base_healing: 0.0,
+            buffs: Vec::new(),
+            debuffs: Vec::new(),
+            radius: 0.0,
+            angle: 0.0,
+            icon_tileset: String::new(),
+            icon_index: 0,
+            sprite_tileset: String::new(),
+            sprite_index: 0,
+            particles: Vec::new(),
+        }
+    }
+}
+
+impl Hash for Spell {
+    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+        self.unique_id.hash(state);
+        self.skill.hash(state);
+        self.cast_slot.hash(state);
+    }
+}
+
+impl InternalId for Spell {
+    fn update_internal_id(&mut self) {
+        if self.unique_id.is_empty() {
+            warn!(
+                "Spell '{}' has no unique_id, using name as unique_id.",
+                self.name
+            );
+            // Replace spaces with underscores, and make it lowercase
+            self.unique_id = self.name.to_lowercase().replace(' ', "_");
+        }
+    }
+
+    #[must_use]
+    fn get_internal_id(&self) -> String {
+        self.unique_id.clone()
+    }
+}
+
+impl Spell {
+    /// Create a new spell with the given name and description.
+    #[must_use]
+    pub fn new(name: &str, description: &str) -> Self {
+        Self {
+            name: name.to_string(),
+            description: description.to_string(),
+            ..Default::default()
+        }
+    }
+
+    /// Set the `unique_id` of the spell.
+    #[must_use]
+    pub fn with_unique_id(mut self, unique_id: &str) -> Self {
+        self.unique_id = unique_id.to_string();
+        self
+    }
+
+    /// Set the `lore` of the spell.
+    #[must_use]
+    pub fn with_lore(mut self, lore: &str) -> Self {
+        self.lore = lore.to_string();
+        self
+    }
+
+    /// Set the `talisman` of the spell.
+    #[must_use]
+    pub const fn with_talisman(mut self, talisman: SpellTalisman) -> Self {
+        self.talisman = talisman;
+        self
+    }
+
+    /// Set the skill of the spell.
+    #[must_use]
+    pub const fn with_skill(mut self, skill: Skill) -> Self {
+        self.skill = skill;
+        self
+    }
+
+    /// Set the cast slot of the spell.
+    #[must_use]
+    pub const fn with_cast_slot(mut self, cast_slot: CastSlot) -> Self {
+        self.cast_slot = cast_slot;
+        self
+    }
+
+    /// Set the cooldown of the spell.
+    #[must_use]
+    pub const fn with_cooldown(mut self, cooldown: f32) -> Self {
+        self.cooldown = cooldown;
+        self
+    }
+
+    /// Set the cast time of the spell.
+    #[must_use]
+    pub const fn with_cast_time(mut self, cast_time: f32) -> Self {
+        self.cast_time = cast_time;
+        self
+    }
+
+    /// Set the mana cost of the spell.
+    #[must_use]
+    pub const fn with_mana_cost(mut self, mana_cost: f32) -> Self {
+        self.mana_cost = mana_cost;
+        self
+    }
+
+    /// Set the range of the spell.
+    #[must_use]
+    pub const fn with_range(mut self, range: f32) -> Self {
+        self.range = range;
+        self
+    }
+
+    /// Set the speed of the spell.
+    #[must_use]
+    pub const fn with_speed(mut self, speed: f32) -> Self {
+        self.speed = speed;
+        self
+    }
+
+    /// Set the acceleration of the spell.
+    #[must_use]
+    pub const fn with_acceleration(mut self, acceleration: f32) -> Self {
+        self.acceleration = acceleration;
+        self
+    }
+
+    /// Set the duration of the spell.
+    #[must_use]
+    pub const fn with_duration(mut self, duration: f32) -> Self {
+        self.duration = duration;
+        self
+    }
+
+    /// Set the base damage of the spell.
+    #[must_use]
+    pub const fn with_base_damage(mut self, base_damage: f32) -> Self {
+        self.base_damage = base_damage;
+        self
+    }
+
+    /// Set the base healing of the spell.
+    #[must_use]
+    pub const fn with_base_healing(mut self, base_healing: f32) -> Self {
+        self.base_healing = base_healing;
+        self
+    }
+
+    /// Set the buffs of the spell.
+    #[must_use]
+    pub fn with_buffs(mut self, buffs: Vec<StatEffect>) -> Self {
+        self.buffs = buffs;
+        self
+    }
+
+    /// Set the debuffs of the spell.
+    #[must_use]
+    pub fn with_debuffs(mut self, debuffs: Vec<StatEffect>) -> Self {
+        self.debuffs = debuffs;
+        self
+    }
+
+    /// Set the radius of the spell.
+    #[must_use]
+    pub const fn with_radius(mut self, radius: f32) -> Self {
+        self.radius = radius;
+        self
+    }
+
+    /// Set the angle of the spell.
+    #[must_use]
+    pub const fn with_angle(mut self, angle: f32) -> Self {
+        self.angle = angle;
+        self
+    }
+
+    /// Set the icon tileset and index of the spell.
+    #[must_use]
+    pub fn with_icon_tileset_index(mut self, tileset: &str, index: usize) -> Self {
+        self.icon_tileset = tileset.to_string();
+        self.icon_index = index;
+        self
+    }
+
+    /// Set the sprite tileset and index of the spell.
+    #[must_use]
+    pub fn with_sprite_tileset_index(mut self, tileset: &str, index: usize) -> Self {
+        self.sprite_tileset = tileset.to_string();
+        self.sprite_index = index;
+        self
+    }
+
+    /// Set the particles of the spell.
+    #[must_use]
+    pub fn with_particles(mut self, particles: Vec<SpellParticles>) -> Self {
+        self.particles = particles;
+        self
+    }
+
+    /// Get the `unique_id` of the spell.
+    #[must_use]
+    pub fn unique_id(&self) -> &str {
+        &self.unique_id
+    }
+
+    /// Get the `name` of the spell.
+    #[must_use]
+    pub fn name(&self) -> &str {
+        &self.name
+    }
+
+    /// Get the `description` of the spell.
+    #[must_use]
+    pub fn description(&self) -> &str {
+        &self.description
+    }
+
+    /// Get the `lore` of the spell.
+    #[must_use]
+    pub fn lore(&self) -> &str {
+        &self.lore
+    }
+
+    /// Get the `talisman` of the spell.
+    #[must_use]
+    pub const fn talisman(&self) -> &SpellTalisman {
+        &self.talisman
+    }
+
+    /// Get the `skill` of the spell.
+    #[must_use]
+    pub const fn skill(&self) -> Skill {
+        self.skill
+    }
+
+    /// Get the cast slot of the spell.
+    #[must_use]
+    pub const fn cast_slot(&self) -> CastSlot {
+        self.cast_slot
+    }
+
+    /// Get the cooldown of the spell.
+    #[must_use]
+    pub const fn cooldown(&self) -> f32 {
+        self.cooldown
+    }
+
+    /// Get the cast time of the spell.
+    #[must_use]
+    pub const fn cast_time(&self) -> f32 {
+        self.cast_time
+    }
+
+    /// Get the mana cost of the spell.
+    #[must_use]
+    pub const fn mana_cost(&self) -> f32 {
+        self.mana_cost
+    }
+
+    /// Get the range of the spell.
+    #[must_use]
+    pub const fn range(&self) -> f32 {
+        self.range
+    }
+
+    /// Get the speed of the spell.
+    #[must_use]
+    pub const fn speed(&self) -> f32 {
+        self.speed
+    }
+
+    /// Get the acceleration of the spell.
+    #[must_use]
+    pub const fn acceleration(&self) -> f32 {
+        self.acceleration
+    }
+
+    /// Get the duration of the spell.
+    #[must_use]
+    pub const fn duration(&self) -> f32 {
+        self.duration
+    }
+
+    /// Get the base damage of the spell.
+    #[must_use]
+    pub const fn base_damage(&self) -> f32 {
+        self.base_damage
+    }
+
+    /// Get the base healing of the spell.
+    #[must_use]
+    pub const fn base_healing(&self) -> f32 {
+        self.base_healing
+    }
+
+    /// Get the buffs of the spell.
+    #[must_use]
+    pub fn buffs(&self) -> &[StatEffect] {
+        &self.buffs
+    }
+
+    /// Get the debuffs of the spell.
+    #[must_use]
+    pub fn debuffs(&self) -> &[StatEffect] {
+        &self.debuffs
+    }
+
+    /// Get the radius of the spell.
+    #[must_use]
+    pub const fn radius(&self) -> f32 {
+        self.radius
+    }
+
+    /// Get the angle of the spell.
+    #[must_use]
+    pub const fn angle(&self) -> f32 {
+        self.angle
+    }
+
+    /// Get the icon tileset id
+    #[must_use]
+    pub fn icon_tileset(&self) -> &str {
+        &self.icon_tileset
+    }
+
+    /// Get the icon tileset and index of the spell.
+    #[must_use]
+    pub const fn icon_tileset_index(&self) -> usize {
+        self.icon_index
+    }
+
+    /// Get the sprite tileset id
+    #[must_use]
+    pub fn sprite_tileset(&self) -> &str {
+        &self.sprite_tileset
+    }
+
+    /// Get the sprite tileset and index of the spell.
+    #[must_use]
+    pub const fn sprite_tileset_index(&self) -> usize {
+        self.sprite_index
+    }
+
+    /// Get the particles of the spell.
+    #[must_use]
+    pub fn particles(&self) -> &[SpellParticles] {
+        &self.particles
+    }
+}
+
+impl DisplayInformation for Spell {
+    fn tooltip(&self) -> String {
+        format!(
+            "{}\n{} {} {}\n{}",
+            self.name,
+            self.talisman.tier(),
+            self.skill,
+            self.cast_slot,
+            self.description
+        )
+    }
+
+    fn more_info(&self) -> String {
+        format!("{}\n{}", self.description(), self.lore())
+    }
+
+    fn summarized_one_liner(&self) -> String {
+        format!("{self}")
+    }
+}
+
+impl std::fmt::Display for Spell {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        // Include name, tier, magic type, and cast slot
+        write!(
+            f,
+            "{}: {} {} {}",
+            self.name,
+            self.talisman.tier(),
+            self.skill,
+            self.cast_slot
+        )
+    }
+}
+
+/// #### DEFAULTS FOR SERDE ####
+mod spell_defaults {
+    use super::SpellTalisman;
+    use crate::enums::{CastSlot, CastType, Skill};
+
+    pub(super) const fn skill() -> Skill {
+        Skill::Arcanomancy
+    }
+    pub(super) const fn cast_slot() -> CastSlot {
+        CastSlot::Cantrip
+    }
+    pub(super) fn talisman() -> SpellTalisman {
+        SpellTalisman::default()
+    }
+    pub(super) const fn cast_type() -> CastType {
+        CastType::Instant
+    }
+    pub(super) const fn mana_cost() -> f32 {
+        0.0
+    }
+    pub(super) const fn cooldown() -> f32 {
+        1.0
+    }
+    pub(super) const fn cast_time() -> f32 {
+        0.0
+    }
+    pub(super) const fn range() -> f32 {
+        5.0
+    }
+    pub(super) const fn speed() -> f32 {
+        1.0
+    }
+    pub(super) const fn duration() -> f32 {
+        5.0
+    }
+    pub(super) const fn acceleration() -> f32 {
+        0.0
+    }
+    pub(super) const fn radius() -> f32 {
+        0.0
+    }
+    pub(super) const fn angle() -> f32 {
+        0.0
+    }
+    pub(super) const fn base_damage() -> f32 {
+        0.0
+    }
+    pub(super) const fn base_healing() -> f32 {
+        0.0
+    }
+}
+
+impl<D: Hash + InternalId + 'static> TryInto<Spell> for DataFile<D> {
+    type Error = ();
+
+    fn try_into(self) -> Result<Spell, Self::Error> {
+        if self.header.system != GameSystem::Spell {
+            return Err(());
+        }
+
+        (&self.data as &dyn Any)
+            .downcast_ref::<Spell>()
+            .cloned()
+            .ok_or(())
+    }
+}
+
+impl<D: Hash + InternalId + 'static> TryFrom<&DataFile<D>> for Spell {
+    type Error = ();
+
+    fn try_from(data_file: &DataFile<D>) -> Result<Self, Self::Error> {
+        if data_file.header.system != GameSystem::Tileset {
+            return Err(());
+        }
+
+        (&data_file.data as &dyn Any)
+            .downcast_ref::<Self>()
+            .cloned()
+            .ok_or(())
+    }
+}
diff --git a/game_library/src/spell_lifetime.rs b/game_library/src/spells/lifetime.rs
similarity index 73%
rename from game_library/src/spell_lifetime.rs
rename to game_library/src/spells/lifetime.rs
index a667c56..7cb7695 100644
--- a/game_library/src/spell_lifetime.rs
+++ b/game_library/src/spells/lifetime.rs
@@ -7,11 +7,12 @@ use bevy::prelude::*;
 /// When a spell is spawned, it is given a lifetime. When the lifetime expires,
 /// the spell is despawned.
 #[derive(Debug, Clone, Copy, PartialEq, Component, Default, Reflect)]
+#[allow(clippy::module_name_repetitions)]
 pub struct SpellLifetime {
     /// The remaining lifetime of the spell in seconds
-    pub remaining: f32,
+    remaining: f32,
     /// The maximum lifetime of the spell in seconds
-    pub max: f32,
+    max: f32,
 }
 
 impl SpellLifetime {
@@ -32,4 +33,15 @@ impl SpellLifetime {
     pub fn is_expired(&self) -> bool {
         self.remaining <= 0.0
     }
+
+    /// Returns the remaining lifetime of the spell
+    #[must_use]
+    pub const fn remaining(&self) -> f32 {
+        self.remaining
+    }
+    /// Returns the maximum lifetime of the spell
+    #[must_use]
+    pub const fn max(&self) -> f32 {
+        self.max
+    }
 }
diff --git a/game_library/src/spells/mod.rs b/game_library/src/spells/mod.rs
new file mode 100644
index 0000000..7296585
--- /dev/null
+++ b/game_library/src/spells/mod.rs
@@ -0,0 +1,43 @@
+//! Elementalist spell components, resources, and systems.
+//!
+//! This module contains the spell components, resources, and systems for the Elementalist game.
+//!
+//! ## Spell Casting Overview
+//!
+//! See the [design document](https://github.com/nwesterhausen/elementalist/blob/main/design_notes/game_design_document.md)
+//! for a more comprehensive overview of the spell casting system and how it fits into the game. Here is a brief overview:
+//!
+//! The player has spell slots which can be slotted with a "spell talisman" and assigned a skill to cast the spell. The spell talisman
+//! is a talisman to define how the spell behaves (e.g. projectile, area of effect, etc.). The skill is on of the 16 skills the player
+//! can have, and the skill determines the element of the spell (e.g. fire, water, etc.). Together, they create the "spell" which
+//! can be cast by the player.
+//!
+//! ## Spell Definitions
+//!
+//! Only talisman and skill combinations which result in a valid spell are allowed. The spell definitions are defined by the files
+//! in the `game_data` directory. Additional spell definitions are supported through loading mods (yet to be implemented). The spell
+//! definitions are loaded into the game and used to validate the player's spell slots.
+//!
+//! Spells are defined in a `YAML` file with this schema: `https://schemas.nwest.one/games/elementalist/spell.json`
+//!
+//! To have schema validation in your editor, you can add the following to the top of your `YAML` file:
+//!
+//! ```yaml
+//! # yaml-language-server: $schema=https://schemas.nwest.one/games/elementalist/spell.json
+//! ```
+//!
+
+mod bundle;
+mod definition;
+mod lifetime;
+mod particles;
+mod polymorph;
+mod selection;
+pub mod talisman;
+
+pub use bundle::SpellBundle;
+pub use definition::Spell;
+pub use lifetime::SpellLifetime;
+pub use particles::SpellParticles;
+pub use polymorph::*;
+pub use selection::SpellSelection;
diff --git a/game_library/src/spells/particles.rs b/game_library/src/spells/particles.rs
new file mode 100644
index 0000000..2d472cf
--- /dev/null
+++ b/game_library/src/spells/particles.rs
@@ -0,0 +1,18 @@
+//! Particle effects for spells.
+use bevy::prelude::*;
+use serde::{Deserialize, Serialize};
+
+use crate::enums::ParticleAttachment;
+
+/// A particle that a spell can create.
+#[derive(
+    Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, Reflect, Component, Resource,
+)]
+#[serde(rename_all = "camelCase")]
+#[allow(clippy::module_name_repetitions)]
+pub struct SpellParticles {
+    /// The unique_id for the particle effect
+    pub particle_id: String,
+    /// The attachment point for the particle effect
+    pub attachment: ParticleAttachment,
+}
diff --git a/game_library/src/spells/polymorph.rs b/game_library/src/spells/polymorph.rs
new file mode 100644
index 0000000..6b2db92
--- /dev/null
+++ b/game_library/src/spells/polymorph.rs
@@ -0,0 +1,53 @@
+//! Definitions and systems pertaining to the polymorph effect.
+//!
+//! The polymorph effect is a spell effect that transforms the target into a different entity. In the game system,
+//! this is handled by changing:
+//!
+//! - The entity's sprite
+//! - The entity's collision
+//! - The entity's stats
+//! - Tracking the time left for the polymorph effect
+//!
+//! After the time has expired, the entity is transformed back into its original form.
+use bevy::prelude::*;
+use serde::{Deserialize, Serialize};
+
+use crate::StatEffect;
+
+/// A polymorph entity. This is a shell for tagging entities that are polymorphed.
+#[derive(Debug, Clone, PartialEq, Eq, Hash, Reflect, Serialize, Deserialize, Component)]
+#[allow(clippy::module_name_repetitions)]
+pub struct Polymorphed(pub String);
+
+/// Stat changes for the polymorph effect.
+#[derive(Debug, Clone, PartialEq, Eq, Reflect, Serialize, Deserialize, Component)]
+#[allow(clippy::module_name_repetitions)]
+pub struct PolymorphStatChange {
+    /// Stats which replace the original entity's stats.
+    pub replace: Vec<StatEffect>,
+    /// Stats which are added to the original entity's stats.
+    pub add: Vec<StatEffect>,
+    /// Stats which are multiplied to the original entity's stats.
+    pub multiply: Vec<StatEffect>,
+    /// Stats which are subtracted from the original entity's stats.
+    pub subtract: Vec<StatEffect>,
+    /// Stats which the original entity's stats are divided by.
+    pub divide: Vec<StatEffect>,
+}
+
+/// Define the details of a polymorph effect.
+#[derive(Debug, Clone, PartialEq, Reflect, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+#[allow(clippy::module_name_repetitions)]
+pub struct PolymorphEffect {
+    /// The id of this polymorph effect.
+    pub unique_id: String,
+    /// The duration of the polymorph effect.
+    pub duration: f32,
+    /// The name of the polymorph effect. (This is used as the new entity's name.)
+    pub name: String,
+    /// The entity_sprite to use for the polymorphed entity (by unique_id).
+    pub polymorph_sprite: String,
+    /// The stat changes for the polymorph effect.
+    pub stat_changes: PolymorphStatChange,
+}
diff --git a/game_library/src/spells/selection.rs b/game_library/src/spells/selection.rs
new file mode 100644
index 0000000..1fdc516
--- /dev/null
+++ b/game_library/src/spells/selection.rs
@@ -0,0 +1,153 @@
+//! A resource that stores the player's spell choices.
+
+use bevy::prelude::*;
+use serde::{Deserialize, Serialize};
+
+use super::Spell;
+use crate::InternalId;
+
+/// A resource that stores the player's spell choices.
+#[derive(Resource, Default, Debug, Reflect, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[allow(clippy::module_name_repetitions)]
+pub struct SpellSelection {
+    /// The spell to cast when the player presses the primary cast button.
+    primary: Option<String>,
+    /// The spell to cast when the player presses the secondary cast button.
+    secondary: Option<String>,
+    /// The spell to cast when the player presses the tertiary cast button.
+    tertiary: Option<String>,
+    /// The spell to cast when the player presses the ultimate cast button.
+    ultimate: Option<String>,
+}
+
+impl SpellSelection {
+    /// Create a new spell selection with no spells chosen.
+    #[must_use]
+    pub const fn new() -> Self {
+        Self {
+            primary: None,
+            secondary: None,
+            tertiary: None,
+            ultimate: None,
+        }
+    }
+    /// Set the primary spell choice at creation.
+    #[must_use]
+    pub fn with_primary(&self, spell: &Spell) -> Self {
+        Self {
+            primary: Some(spell.get_internal_id()),
+            ..self.clone()
+        }
+    }
+    /// Set the primary spell choice at creation using the spell's unique id.
+    #[must_use]
+    pub fn with_primary_by_id(&self, unique_id: String) -> Self {
+        Self {
+            primary: Some(unique_id),
+            ..self.clone()
+        }
+    }
+    /// Set the secondary spell choice at creation.
+    #[must_use]
+    pub fn with_secondary(&self, spell: &Spell) -> Self {
+        Self {
+            secondary: Some(spell.get_internal_id()),
+            ..self.clone()
+        }
+    }
+    /// Set the secondary spell choice at creation using the spell's unique id.
+    #[must_use]
+    pub fn with_secondary_by_id(&self, unique_id: String) -> Self {
+        Self {
+            secondary: Some(unique_id),
+            ..self.clone()
+        }
+    }
+    /// Set the tertiary spell choice at creation.
+    #[must_use]
+    pub fn with_tertiary(&self, spell: &Spell) -> Self {
+        Self {
+            tertiary: Some(spell.get_internal_id()),
+            ..self.clone()
+        }
+    }
+    /// Set the tertiary spell choice at creation using the spell's unique id.
+    #[must_use]
+    pub fn with_tertiary_by_id(&self, unique_id: String) -> Self {
+        Self {
+            tertiary: Some(unique_id),
+            ..self.clone()
+        }
+    }
+
+    /// Set the primary spell choice.
+    pub fn set_primary(&mut self, spell: &Spell) {
+        self.primary = Some(spell.get_internal_id());
+    }
+    /// Set the primary spell choice by spell id.
+    pub fn set_primary_by_id(&mut self, unique_id: String) {
+        self.primary = Some(unique_id);
+    }
+    /// Set the secondary spell choice.
+    pub fn set_secondary(&mut self, spell: &Spell) {
+        self.secondary = Some(spell.get_internal_id());
+    }
+    /// Set the secondary spell choice by spell id.
+    pub fn set_secondary_by_id(&mut self, unique_id: String) {
+        self.secondary = Some(unique_id);
+    }
+    /// Set the tertiary spell choice.
+    pub fn set_tertiary(&mut self, spell: &Spell) {
+        self.tertiary = Some(spell.get_internal_id());
+    }
+    /// Set the tertiary spell choice by spell id.
+    pub fn set_tertiary_by_id(&mut self, unique_id: String) {
+        self.tertiary = Some(unique_id);
+    }
+    /// Set the ultimate spell choice.
+    pub fn set_ultimate(&mut self, spell: &Spell) {
+        self.ultimate = Some(spell.get_internal_id());
+    }
+    /// Set the ultimate spell choice by spell id.
+    pub fn set_ultimate_by_id(&mut self, unique_id: String) {
+        self.ultimate = Some(unique_id);
+    }
+
+    /// Clear the primary spell choice.
+    pub fn clear_primary(&mut self) {
+        self.primary = None;
+    }
+    /// Clear the secondary spell choice.
+    pub fn clear_secondary(&mut self) {
+        self.secondary = None;
+    }
+    /// Clear the defensive spell choice.
+    pub fn clear_tertiary(&mut self) {
+        self.tertiary = None;
+    }
+    /// Clear the ultimate spell choice.
+    pub fn clear_ultimate(&mut self) {
+        self.ultimate = None;
+    }
+
+    /// Get the primary spell choice.
+    #[must_use]
+    pub fn primary(&self) -> Option<String> {
+        self.primary.clone()
+    }
+    /// Get the secondary spell choice.
+    #[must_use]
+    pub fn secondary(&self) -> Option<String> {
+        self.secondary.clone()
+    }
+    /// Get the tertiary spell choice.
+    #[must_use]
+    pub fn tertiary(&self) -> Option<String> {
+        self.tertiary.clone()
+    }
+    /// Get the ultimate spell choice.
+    #[must_use]
+    pub fn ultimate(&self) -> Option<String> {
+        self.ultimate.clone()
+    }
+}
diff --git a/game_library/src/spells/talisman.rs b/game_library/src/spells/talisman.rs
new file mode 100644
index 0000000..6915c76
--- /dev/null
+++ b/game_library/src/spells/talisman.rs
@@ -0,0 +1,388 @@
+//! The spell talisman is a component that defines how the spell behaves.
+
+use bevy::prelude::*;
+use serde::{Deserialize, Serialize};
+
+use crate::data_loader::storage::GameData;
+
+/// The spell talisman defines how the spell behaves. It contains a shaping, a behavior, and a tier.
+#[derive(
+    Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, Reflect, Component, Resource,
+)]
+#[allow(clippy::module_name_repetitions)]
+pub struct SpellTalisman {
+    /// The shaping of the spell talisman. This defines the shape of the spell.
+    shaping: Shaping,
+    /// The behavior of the spell talisman. This defines the behavior of the spell.
+    behavior: Behavior,
+    /// The tier of the spell talisman. This defines the power level of the spell.
+    tier: Tier,
+}
+
+/// The shaping of the spell talisman. This defines the shape of the spell.
+#[derive(
+    Debug, Copy, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, Reflect, Component, Resource,
+)]
+pub enum Shaping {
+    /// A projectile spell is a spell that launches away from the caster.
+    Projectile,
+    /// Area of Effect spells affect a specified area.
+    AreaOfEffect,
+    /// A cone spell affects an area in front of the caster in a cone shape.
+    Cone,
+    /// A line spell affects an area in front of the caster in a line.
+    Line,
+    /// A touch spell affects a target that the caster touches.
+    Touch,
+    /// A spell with the `OnSelf` shaping affects the caster.
+    OnSelf,
+    /// A spell with the `Melee` shaping acts as a melee attack.
+    Melee,
+}
+
+impl std::fmt::Display for Shaping {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Self::Projectile => write!(f, "Projectile"),
+            Self::AreaOfEffect => write!(f, "Area of Effect"),
+            Self::Cone => write!(f, "Cone"),
+            Self::Line => write!(f, "Line"),
+            Self::Touch => write!(f, "Touch"),
+            Self::OnSelf => write!(f, "Self"),
+            Self::Melee => write!(f, "Melee"),
+        }
+    }
+}
+
+impl Shaping {
+    /// Get the index of the shaping in the engraving tileset.
+    #[must_use]
+    pub const fn engraving_index(&self) -> usize {
+        match self {
+            Self::Projectile => 0,
+            Self::AreaOfEffect => 1,
+            Self::Cone => 2,
+            Self::Line => 3,
+            Self::Touch => 4,
+            Self::OnSelf => 6,
+            Self::Melee => 5,
+        }
+    }
+}
+
+/// The behavior of the spell talisman. This defines the behavior of the spell.
+#[derive(
+    Debug, Copy, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, Reflect, Component, Resource,
+)]
+pub enum Behavior {
+    /// A spell with the `Damage` behavior deals damage to the target.
+    Damage,
+    /// A spell with the `Heal` behavior heals the target.
+    Heal,
+    /// A spell with the `Buff` behavior applies a buff to the target.
+    Buff,
+    /// A spell with the `Debuff` behavior applies a debuff to the target.
+    Debuff,
+    /// A spell with the `Utility` behavior has a utility effect.
+    Utility,
+    /// A spell with the `Summon` behavior summons a creature.
+    Summon,
+    /// A spell with the `Polymorph` behavior transforms the target.
+    Polymorph,
+    /// A spell with the `Teleport` behavior teleports the target.
+    Teleport,
+}
+
+impl std::fmt::Display for Behavior {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Self::Damage => write!(f, "Damage"),
+            Self::Heal => write!(f, "Heal"),
+            Self::Buff => write!(f, "Buff"),
+            Self::Debuff => write!(f, "Debuff"),
+            Self::Utility => write!(f, "Utility"),
+            Self::Summon => write!(f, "Summon"),
+            Self::Polymorph => write!(f, "Polymorph"),
+            Self::Teleport => write!(f, "Teleport"),
+        }
+    }
+}
+
+impl Behavior {
+    /// Get the index of the behavior in the engraving tileset.
+    #[must_use]
+    pub const fn engraving_index(&self) -> usize {
+        match self {
+            Self::Damage => 7,
+            Self::Heal => 8,
+            Self::Buff => 9,
+            Self::Debuff => 10,
+            Self::Utility => 11,
+            Self::Summon => 12,
+            Self::Polymorph => 13,
+            Self::Teleport => 14,
+        }
+    }
+}
+
+/// The tier of the spell talisman. This defines the power level of the spell.
+#[derive(
+    Debug, Copy, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, Reflect, Component, Resource,
+)]
+pub enum Tier {
+    /// A spell with the `Mundane` tier is the lowest tier.
+    Mundane,
+    /// A spell with the `Common` tier is the second lowest tier.
+    Common,
+    /// A spell with the `Uncommon` tier is the third lowest tier.
+    Uncommon,
+    /// A spell with the `Rare` tier is the fourth lowest tier.
+    Rare,
+    /// A spell with the `Epic` tier is the fifth lowest tier.
+    Epic,
+    /// A spell with the `Legendary` tier is the third highest tier.
+    Legendary,
+    /// A spell with the `Mythic` tier is the second highest tier.
+    Mythic,
+    /// A spell with the `Divine` tier is the highest tier.
+    Divine,
+    /// `Astral` is a special tier that is above Divine. It cannot be inscribed on a spell talisman normally.
+    Astral,
+    /// `Unique` should only be used for restricted spells that are unique to a specific character or have other requirements.
+    /// It cannot be inscribed on a spell talisman normally.
+    Unique,
+}
+
+impl std::fmt::Display for Tier {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Self::Mundane => write!(f, "Mundane"),
+            Self::Common => write!(f, "Common"),
+            Self::Uncommon => write!(f, "Uncommon"),
+            Self::Rare => write!(f, "Rare"),
+            Self::Epic => write!(f, "Epic"),
+            Self::Legendary => write!(f, "Legendary"),
+            Self::Mythic => write!(f, "Mythic"),
+            Self::Divine => write!(f, "Divine"),
+            Self::Astral => write!(f, "Astral"),
+            Self::Unique => write!(f, "Unique"),
+        }
+    }
+}
+
+impl Tier {
+    /// Get the index of the talisman for this tier.
+    #[must_use]
+    pub const fn talisman_index(&self) -> usize {
+        match self {
+            Self::Mundane => 9,
+            Self::Common => 8,
+            Self::Uncommon => 7,
+            Self::Rare => 6,
+            Self::Epic => 5,
+            Self::Legendary => 4,
+            Self::Mythic => 3,
+            Self::Divine => 2,
+            Self::Astral => 1,
+            Self::Unique => 0,
+        }
+    }
+}
+
+impl Default for SpellTalisman {
+    fn default() -> Self {
+        Self {
+            shaping: Shaping::Projectile,
+            behavior: Behavior::Damage,
+            tier: Tier::Mundane,
+        }
+    }
+}
+
+/// Spell talisman ui nodes
+#[derive(Debug)]
+pub struct SpellTalismanUi {
+    /// Base node bundle
+    base: NodeBundle,
+    /// The background talisman image
+    background: AtlasImageBundle,
+    /// The shaping engraving
+    shaping: AtlasImageBundle,
+    /// The behavior engraving
+    behavior: AtlasImageBundle,
+}
+
+impl SpellTalismanUi {
+    /// Get the base node bundle
+    #[must_use]
+    pub fn base(&self) -> NodeBundle {
+        self.base.clone()
+    }
+
+    /// Get the background talisman image
+    #[must_use]
+    pub fn background(&self) -> AtlasImageBundle {
+        AtlasImageBundle {
+            texture_atlas: self.background.texture_atlas.clone(),
+            image: self.background.image.clone(),
+            ..default()
+        }
+    }
+
+    /// Get the shaping engraving
+    #[must_use]
+    pub fn shaping(&self) -> AtlasImageBundle {
+        AtlasImageBundle {
+            texture_atlas: self.shaping.texture_atlas.clone(),
+            image: self.shaping.image.clone(),
+            ..default()
+        }
+    }
+
+    /// Get the behavior engraving
+    #[must_use]
+    pub fn behavior(&self) -> AtlasImageBundle {
+        AtlasImageBundle {
+            texture_atlas: self.behavior.texture_atlas.clone(),
+            image: self.behavior.image.clone(),
+            ..default()
+        }
+    }
+}
+
+impl SpellTalisman {
+    /// Talisman sprite sheet identifier.
+    pub const SPRITE_SHEET: &'static str = "talismans";
+    /// Engraving sprite sheet identifier.
+    pub const ENGRAVING_SHEET: &'static str = "talisman_engraving";
+
+    /// Set the shaping of the spell talisman.
+    #[must_use]
+    pub const fn with_shaping(mut self, shaping: Shaping) -> Self {
+        self.shaping = shaping;
+        self
+    }
+
+    /// Set the behavior of the spell talisman.
+    #[must_use]
+    pub const fn with_behavior(mut self, behavior: Behavior) -> Self {
+        self.behavior = behavior;
+        self
+    }
+
+    /// Set the tier of the spell talisman.
+    #[must_use]
+    pub const fn with_tier(mut self, tier: Tier) -> Self {
+        self.tier = tier;
+        self
+    }
+
+    /// Create a new spell talisman with the given shaping, behavior, and tier.
+    #[must_use]
+    pub const fn new(tier: Tier, shaping: Shaping, behavior: Behavior) -> Self {
+        Self {
+            shaping,
+            behavior,
+            tier,
+        }
+    }
+
+    /// Get the shaping of the spell talisman.
+    #[must_use]
+    pub const fn shaping(&self) -> Shaping {
+        self.shaping
+    }
+
+    /// Get the behavior of the spell talisman.
+    #[must_use]
+    pub const fn behavior(&self) -> Behavior {
+        self.behavior
+    }
+
+    /// Get the tier of the spell talisman.
+    #[must_use]
+    pub const fn tier(&self) -> Tier {
+        self.tier
+    }
+
+    /// Get a UI Node drawing this talisman.
+    ///
+    /// The node will draw the talisman sprite and engravings.
+    #[must_use]
+    pub fn ui_nodes(&self, game_data: GameData) -> Option<SpellTalismanUi> {
+        let node = NodeBundle {
+            background_color: BackgroundColor(Color::NONE),
+            style: Style {
+                width: Val::Px(32.0),
+                height: Val::Px(32.0),
+                ..default()
+            },
+            ..default()
+        };
+
+        // need to get the `AtlasImageBundle` for the talisman sprite
+        let Some(talisman_tileset) = game_data.tile_atlas.get(Self::SPRITE_SHEET) else {
+            error!("Failed to get talisman tileset");
+            return None;
+        };
+        let talisman_index = self.tier.talisman_index();
+        let talisman_atlas_sprite = AtlasImageBundle {
+            texture_atlas: TextureAtlas {
+                index: talisman_index,
+                layout: talisman_tileset.atlas_handle.clone(),
+            },
+            image: UiImage {
+                texture: talisman_tileset.texture_handle.clone(),
+                ..default()
+            },
+            ..default()
+        };
+
+        // get the engraving sprite
+        let Some(engraving_tileset) = game_data.tile_atlas.get(Self::ENGRAVING_SHEET) else {
+            error!("Failed to get engraving tileset");
+            return None;
+        };
+        let shaping_index = self.shaping as usize;
+        let behavior_index = self.behavior as usize;
+        let shaping_atlas_sprite = AtlasImageBundle {
+            texture_atlas: TextureAtlas {
+                index: shaping_index,
+                layout: engraving_tileset.atlas_handle.clone(),
+            },
+            image: UiImage {
+                texture: engraving_tileset.texture_handle.clone(),
+                ..default()
+            },
+            ..default()
+        };
+        let behavior_atlas_sprite = AtlasImageBundle {
+            texture_atlas: TextureAtlas {
+                index: behavior_index,
+                layout: engraving_tileset.atlas_handle.clone(),
+            },
+            image: UiImage {
+                texture: engraving_tileset.texture_handle.clone(),
+                ..default()
+            },
+            ..default()
+        };
+
+        Some(SpellTalismanUi {
+            base: node,
+            background: talisman_atlas_sprite,
+            shaping: shaping_atlas_sprite,
+            behavior: behavior_atlas_sprite,
+        })
+    }
+}
+
+impl std::fmt::Display for SpellTalisman {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "{} Talisman of {} {}",
+            self.tier, self.shaping, self.behavior
+        )
+    }
+}
diff --git a/game_library/src/stat.rs b/game_library/src/stat.rs
index 08498aa..b0905cb 100644
--- a/game_library/src/stat.rs
+++ b/game_library/src/stat.rs
@@ -14,7 +14,7 @@ use serde::{Deserialize, Serialize};
 use crate::StatBonus;
 
 /// A stat is a value that should be used to represent a character's speed,
-/// strength or other statistic. This is not an [`game_library::Attribute`] which has a
+/// strength or other statistic. This is not an [`elementalist_game_library::Attribute`] which has a
 /// maximum and exists between 0 and that maximum. A stat is a value that
 /// really is a value which can be used directly in the game.
 ///
@@ -25,7 +25,7 @@ use crate::StatBonus;
 /// - base damage
 /// - damage reduction
 /// - attack speed
-/// - other items in [`game_library::enums::StatEnum`]
+/// - other items in [`elementalist_game_library::enums::StatEnum`]
 #[derive(
     Resource, Component, Reflect, Clone, Copy, PartialEq, Serialize, Deserialize, InspectorOptions,
 )]
@@ -69,7 +69,7 @@ impl Stat {
     /// # Examples
     ///
     /// ```no_run
-    /// use game_library::Stat;
+    /// use elementalist_game_library::Stat;
     ///
     /// let stat = Stat::new(10.0);
     /// assert_eq!(stat.value(), 10.0);
@@ -90,7 +90,7 @@ impl Stat {
     /// # Examples
     ///
     /// ```no_run
-    /// use game_library::Stat;
+    /// use elementalist_game_library::Stat;
     ///
     /// let mut stat = Stat::new(6.0);
     /// assert_eq!(stat.value(), 6.0);
@@ -107,7 +107,7 @@ impl Stat {
     /// # Examples
     ///
     /// ```no_run
-    /// use game_library::Stat;
+    /// use elementalist_game_library::Stat;
     ///
     /// let mut stat = Stat::new(10.0);
     /// assert_eq!(stat.bonus(), 1.0);
@@ -124,7 +124,7 @@ impl Stat {
     /// # Examples
     ///
     /// ```no_run
-    /// use game_library::Stat;
+    /// use elementalist_game_library::Stat;
     ///
     /// let mut stat = Stat::new(6.0);
     /// assert_eq!(stat.base_value(), 6.0);
@@ -160,7 +160,7 @@ impl Stat {
     /// # Examples
     ///
     /// ```no_run
-    /// use game_library::Stat;
+    /// use elementalist_game_library::Stat;
     ///
     /// let mut stat = Stat::new(6.0);
     /// assert_eq!(stat.base_value(), 6.0);
@@ -304,7 +304,7 @@ impl Stat {
     /// # Examples
     ///
     /// ```no_run
-    /// use game_library::Stat;
+    /// use elementalist_game_library::Stat;
     ///
     /// let mut stat = Stat::new(10.0);
     /// assert_eq!(stat.base_value(), 10.0);
@@ -329,7 +329,7 @@ impl Stat {
     /// # Examples
     ///
     /// ```no_run
-    /// use game_library::Stat;
+    /// use elementalist_game_library::Stat;
     ///
     /// let mut stat = Stat::new(10.0);
     /// assert_eq!(stat.bonus(), 1.0);
diff --git a/game_library/tests/acceleration.rs b/game_library/tests/acceleration.rs
index 38c1e57..be5ee9b 100644
--- a/game_library/tests/acceleration.rs
+++ b/game_library/tests/acceleration.rs
@@ -1,5 +1,5 @@
 use bevy::math::Vec2;
-use game_library::Acceleration;
+use elementalist_game_library::Acceleration;
 
 #[test]
 fn acceleration() {
diff --git a/game_library/tests/attribute.rs b/game_library/tests/attribute.rs
index cf85400..bf153db 100644
--- a/game_library/tests/attribute.rs
+++ b/game_library/tests/attribute.rs
@@ -1,4 +1,4 @@
-use game_library::Attribute;
+use elementalist_game_library::Attribute;
 
 #[test]
 fn new() {
diff --git a/game_library/tests/camera_scale.rs b/game_library/tests/camera_scale.rs
index ed3db0a..f2f1e7e 100644
--- a/game_library/tests/camera_scale.rs
+++ b/game_library/tests/camera_scale.rs
@@ -1,4 +1,4 @@
-use game_library::CameraScaleLevel;
+use elementalist_game_library::CameraScaleLevel;
 
 #[test]
 fn value() {
diff --git a/game_library/tests/data_file.rs b/game_library/tests/data_file.rs
index 0ca6bdd..c9baa83 100644
--- a/game_library/tests/data_file.rs
+++ b/game_library/tests/data_file.rs
@@ -1,6 +1,6 @@
-use game_library::data_loader::*;
-use game_library::enums::GameSystem;
-use game_library::{SpellData, Tileset};
+use elementalist_game_library::data_loader::*;
+use elementalist_game_library::enums::GameSystem;
+use elementalist_game_library::{spells::Spell, Tileset};
 
 #[test]
 fn try_into() {
@@ -9,10 +9,10 @@ fn try_into() {
             system: GameSystem::Spell,
             ..DataFileHeader::default()
         },
-        data: SpellData::default(),
+        data: Spell::default(),
     };
 
-    let spell: Result<SpellData, ()> = data_file.try_into();
+    let spell: Result<Spell, ()> = data_file.try_into();
     assert!(spell.is_ok());
 
     let data_file = DataFile {
@@ -34,7 +34,7 @@ fn try_into_wrong() {
             system: GameSystem::Spell,
             ..DataFileHeader::default()
         },
-        data: SpellData::default(),
+        data: Spell::default(),
     };
 
     let tileset: Result<Tileset, ()> = data_file.try_into();
diff --git a/game_library/tests/experience.rs b/game_library/tests/experience.rs
index a4b95fa..7083fb1 100644
--- a/game_library/tests/experience.rs
+++ b/game_library/tests/experience.rs
@@ -1,4 +1,4 @@
-use game_library::Xp;
+use elementalist_game_library::Xp;
 
 #[test]
 fn test_xp_required() {
diff --git a/game_library/tests/health.rs b/game_library/tests/health.rs
index f112723..74ad40c 100644
--- a/game_library/tests/health.rs
+++ b/game_library/tests/health.rs
@@ -1,4 +1,4 @@
-use game_library::Health;
+use elementalist_game_library::Health;
 
 #[test]
 fn health() {
diff --git a/game_library/tests/mana.rs b/game_library/tests/mana.rs
index 41505aa..0e1e957 100644
--- a/game_library/tests/mana.rs
+++ b/game_library/tests/mana.rs
@@ -1,4 +1,4 @@
-use game_library::Mana;
+use elementalist_game_library::Mana;
 
 #[test]
 fn mana() {
diff --git a/game_library/tests/spell_lifetime.rs b/game_library/tests/spell_lifetime.rs
index b19c1cd..b472b4c 100644
--- a/game_library/tests/spell_lifetime.rs
+++ b/game_library/tests/spell_lifetime.rs
@@ -1,27 +1,27 @@
-use game_library::SpellLifetime;
+use elementalist_game_library::spells::SpellLifetime;
 
 #[test]
 fn spell_lifetime() {
     let mut spell_lifetime = SpellLifetime::new(10.0);
-    let almost_eq = (spell_lifetime.max - 10.0).abs() < f32::EPSILON;
+    let almost_eq = (spell_lifetime.max() - 10.0).abs() < f32::EPSILON;
     assert!(almost_eq);
-    let almost_eq = (spell_lifetime.remaining - 10.0).abs() < f32::EPSILON;
+    let almost_eq = (spell_lifetime.remaining() - 10.0).abs() < f32::EPSILON;
     assert!(almost_eq);
     assert!(!spell_lifetime.is_expired());
 
     spell_lifetime.update(2.);
 
-    let almost_eq = (spell_lifetime.max - 10.0).abs() < f32::EPSILON;
+    let almost_eq = (spell_lifetime.max() - 10.0).abs() < f32::EPSILON;
     assert!(almost_eq);
-    let almost_eq = (spell_lifetime.remaining - 8.0).abs() < f32::EPSILON;
+    let almost_eq = (spell_lifetime.remaining() - 8.0).abs() < f32::EPSILON;
     assert!(almost_eq);
     assert!(!spell_lifetime.is_expired());
 
     spell_lifetime.update(8.);
 
-    let almost_eq = (spell_lifetime.max - 10.0).abs() < f32::EPSILON;
+    let almost_eq = (spell_lifetime.max() - 10.0).abs() < f32::EPSILON;
     assert!(almost_eq);
-    let almost_eq = (spell_lifetime.remaining - 0.0).abs() < f32::EPSILON;
+    let almost_eq = (spell_lifetime.remaining() - 0.0).abs() < f32::EPSILON;
     assert!(almost_eq);
     assert!(spell_lifetime.is_expired());
 }
diff --git a/game_library/tests/spells.rs b/game_library/tests/spells.rs
new file mode 100644
index 0000000..71b262a
--- /dev/null
+++ b/game_library/tests/spells.rs
@@ -0,0 +1,48 @@
+use elementalist_game_library::spells;
+
+#[test]
+fn spell_talisman_default() {
+    let talisman = spells::talisman::SpellTalisman::default();
+    assert_eq!(talisman.shaping(), spells::talisman::Shaping::Projectile);
+    assert_eq!(talisman.behavior(), spells::talisman::Behavior::Damage);
+    assert_eq!(talisman.tier(), spells::talisman::Tier::Mundane);
+}
+
+#[test]
+fn spell_talisman_with_shaping() {
+    let talisman =
+        spells::talisman::SpellTalisman::default().with_shaping(spells::talisman::Shaping::Touch);
+    assert_eq!(talisman.shaping(), spells::talisman::Shaping::Touch);
+    assert_eq!(talisman.behavior(), spells::talisman::Behavior::Damage);
+    assert_eq!(talisman.tier(), spells::talisman::Tier::Mundane);
+}
+
+#[test]
+fn spell_talisman_with_behavior() {
+    let talisman =
+        spells::talisman::SpellTalisman::default().with_behavior(spells::talisman::Behavior::Heal);
+    assert_eq!(talisman.shaping(), spells::talisman::Shaping::Projectile);
+    assert_eq!(talisman.behavior(), spells::talisman::Behavior::Heal);
+    assert_eq!(talisman.tier(), spells::talisman::Tier::Mundane);
+}
+
+#[test]
+fn spell_talisman_with_tier() {
+    let talisman =
+        spells::talisman::SpellTalisman::default().with_tier(spells::talisman::Tier::Rare);
+    assert_eq!(talisman.shaping(), spells::talisman::Shaping::Projectile);
+    assert_eq!(talisman.behavior(), spells::talisman::Behavior::Damage);
+    assert_eq!(talisman.tier(), spells::talisman::Tier::Rare);
+}
+
+#[test]
+fn spell_talisman_new() {
+    let talisman = spells::talisman::SpellTalisman::new(
+        spells::talisman::Tier::Epic,
+        spells::talisman::Shaping::AreaOfEffect,
+        spells::talisman::Behavior::Debuff,
+    );
+    assert_eq!(talisman.shaping(), spells::talisman::Shaping::AreaOfEffect);
+    assert_eq!(talisman.behavior(), spells::talisman::Behavior::Debuff);
+    assert_eq!(talisman.tier(), spells::talisman::Tier::Epic);
+}
diff --git a/game_library/tests/stat.rs b/game_library/tests/stat.rs
index 33aa433..21107d4 100644
--- a/game_library/tests/stat.rs
+++ b/game_library/tests/stat.rs
@@ -1,4 +1,4 @@
-use game_library::Stat;
+use elementalist_game_library::Stat;
 
 #[test]
 fn new() {
diff --git a/game_library/tests/stat_bonus.rs b/game_library/tests/stat_bonus.rs
index 146312d..4905b46 100644
--- a/game_library/tests/stat_bonus.rs
+++ b/game_library/tests/stat_bonus.rs
@@ -1,4 +1,4 @@
-use game_library::StatBonus;
+use elementalist_game_library::StatBonus;
 
 #[test]
 fn new() {
diff --git a/game_library/tests/volume.rs b/game_library/tests/volume.rs
index 359fb5b..14be148 100644
--- a/game_library/tests/volume.rs
+++ b/game_library/tests/volume.rs
@@ -1,4 +1,4 @@
-use game_library::Volume;
+use elementalist_game_library::Volume;
 
 #[test]
 fn mute() {
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 09591f8..292fe49 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2024-01-17"
+channel = "stable"