From 6998d6425c7eb624eae8d2d4fffbb468da27c02f Mon Sep 17 00:00:00 2001
From: Lily Madeline Lyons <lily@nowaffles.com>
Date: Tue, 21 Nov 2023 23:48:55 -0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A7=20Split=20luminol=20into=20separat?=
 =?UTF-8?q?e=20crates=20(#45)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* refactor: :construction: Split luminol into separate crates

* refactor: :construction: Start working out dependencies

* Sorta figure out dependencies

* Sorta start getting somewhere

* Move Luminol into crates folder

* Move the filesystem trait out of luminol-core

* refactor: :construction: refactor luminol-graphics and it's a mess

* refactor:

* refactor: add UpdateState to luminol-core and move various traits

* refactor(filesystem): :recycle: require FileSystem::File to be 'static

* refactor: :recycle: don't take an &'static reference to graphics state

* refactor: :recycle: refactor modals

* refactor: :recycle: unify tabs and windows

* refactor: :recycle: start to fix up windows

* refactor: :recycle: hack together things so that they compile

* refactor: :recycle: partially resolve async code issues

* refactor: :recycle: it compiles (with a LOT of unfinished things)

* refactor: :recycle: NOW it compiles

* fix(graphics): :bug: fix sprite shader compilation

* fix(data cache): :recycle: get data cache semi-working

* refactor(data cache): :recycle: actually load data cache

* refactor(config): :recycle: store code theme in global state again

* fix(ui): :bug: fix windows and tabs not being added

* refactor: :recycle: use workspace metadata for package metadata

* refactor: :recycle: remove generic parameters on update state by using dynamic dispatch

I couldn't get generics to allow adding tabs or windows inside tabs or windows

* refactor(tabs): :recycle: pass update state when requesting tab name

* fix(tabs): :bug: fix tabs not adding properly

* Update window.rs

* fix: :bug: get top bar loading projects

* fix: :bug: fix new project creation

because reqwest requires tokio we need to spawn a tokio runtime. i do not think this scales well to web

* refactor: :construction: try splitting up the map tab

* Enable -Zthreads compiler flag

* Update nightly in workflows

* revert: :rewind: Undo making cursor state an enum (will tackle this later)

* Sorta resolve dependencies on wasm

Still a mess (and is especially complicated by the fact that you can't specify workspace target specific dependencies)

* Fix backing web filesystem implementation

Still need to work on the project filesystem though!
I'll be honest, I'm not sure how this will work, especially with the way I have the native filesystem set up

* Fix native build

* Remove jobs flag

* Fix audio on wasm

* Temporarily impl Send + Sync for wgpu callbacks

In wgpu 0.17 wgpu types are not Send + Sync, because they reference things in the JS heap (meaning they cannot leave the thread they were created on)

egui_wgpu's CallbackTrait requires Send + Sync even on wasm and we need to store wgpu types in callbacks. The callback_resources typemap passed to callbacks doesn't need to be Send + Sync.. but I can't find a simple way to add anything to the typemap.

https://github.com/emilk/egui/issues/1399 feels relevant

* Fix winit not compiling in CI

https://github.com/emilk/egui/pull/3228

* Get wasm filesystem compiling

* Get luminol compiling on wasm!

* Fix missed rename

* Dumb typo

* Move luminol crate to be root package

Trunk doesn't like virtual workspaces unfortunately
:(

* Run workspace tests

* fix(audio): :bug: Completely read audio file on wasm

* perf(wasm): :zap: Use oneshot crate for oneshot channels

* fix(filesystem): :bug: Pass idb key instead of path to Filesystem::from_idb_key

* refactor(tilemap): :recycle: Use naga oil instead of const_format

* fix(ui): :bug: Fix top bar opening & closing projects

* Bump nightly in trunk build

* Remove luminol- in folder prefixes
---
 .cargo/config.toml                            |   20 +-
 .github/workflows/build-steam.yml             |   12 +-
 .github/workflows/build.yml                   |   14 +-
 .github/workflows/checks.yml                  |   18 +-
 .vscode/settings.json                         |    5 +-
 .wakatime-project                             |    1 +
 Cargo.lock                                    | 2279 +++++++++--------
 Cargo.toml                                    |  275 +-
 command-lib/Cargo.toml                        |   12 -
 crates/app/Cargo.toml                         |   17 +
 crates/app/src/lib.rs                         |   42 +
 crates/audio/Cargo.toml                       |   41 +
 {src/audio => crates/audio/src}/GMGSx.sf2     |  Bin
 crates/audio/src/error.rs                     |   39 +
 src/audio/mod.rs => crates/audio/src/lib.rs   |   56 +-
 {src/audio => crates/audio/src}/midi.rs       |    9 +-
 {src/audio => crates/audio/src}/wrapper.rs    |   85 +-
 crates/components/Cargo.toml                  |   45 +
 .../components/src/command_view/command_ui.rs |   45 +
 .../components/src}/command_view/macros.rs    |    0
 .../components/src}/command_view/mod.rs       |    1 -
 .../src/command_view/parameter_ui.rs          |   37 +
 .../components/src/command_view/ui.rs         |   24 +-
 .../mod.rs => crates/components/src/lib.rs    |   17 +-
 .../components/src}/map_view.rs               |  125 +-
 .../components/src/sound_tab.rs               |  120 +-
 .../components/src}/syntax_highlighting.rs    |  184 +-
 .../components/src}/tilepicker.rs             |  138 +-
 crates/config/Cargo.toml                      |   26 +
 .../config/src}/command_db.rs                 |    4 +-
 .../config/src}/commands/ace.ron              |    0
 .../config/src}/commands/vx.ron               |    0
 .../config/src}/commands/xp.ron               |    0
 {src/config => crates/config/src}/global.rs   |    7 +-
 crates/config/src/lib.rs                      |  133 +
 {src/config => crates/config/src}/project.rs  |   38 +-
 crates/core/Cargo.toml                        |   39 +
 crates/core/src/data_cache.rs                 |  412 +++
 crates/core/src/lib.rs                        |  119 +
 {src/modals => crates/core/src}/modal.rs      |   19 +-
 crates/core/src/tab.rs                        |  227 ++
 {src/components => crates/core/src}/toasts.rs |   29 +-
 crates/core/src/window.rs                     |  179 ++
 crates/data/Cargo.toml                        |   31 +
 .../src/lib.rs => crates/data/src/commands.rs |    0
 {rmxp-types => crates/data}/src/helpers/id.rs |    0
 .../data}/src/helpers/id_vec.rs               |    0
 .../data}/src/helpers/mod.rs                  |    0
 .../data}/src/helpers/nil_padded.rs           |    0
 .../data}/src/helpers/optional_id.rs          |    0
 .../data}/src/helpers/optional_path.rs        |    0
 .../data}/src/helpers/parameter_type.rs       |    0
 {rmxp-types => crates/data}/src/lib.rs        |    4 +-
 {rmxp-types => crates/data}/src/option_vec.rs |    0
 .../data}/src/rgss_structs.rs                 |   29 +
 {rmxp-types => crates/data}/src/rmxp/actor.rs |    0
 .../data}/src/rmxp/animation.rs               |    0
 {rmxp-types => crates/data}/src/rmxp/armor.rs |    0
 {rmxp-types => crates/data}/src/rmxp/class.rs |    0
 {rmxp-types => crates/data}/src/rmxp/enemy.rs |    0
 {rmxp-types => crates/data}/src/rmxp/item.rs  |    0
 {rmxp-types => crates/data}/src/rmxp/map.rs   |    0
 {rmxp-types => crates/data}/src/rmxp/mod.rs   |    0
 {rmxp-types => crates/data}/src/rmxp/skill.rs |    0
 {rmxp-types => crates/data}/src/rmxp/state.rs |    0
 .../data}/src/rmxp/system.rs                  |    0
 .../data}/src/rmxp/tileset.rs                 |    0
 {rmxp-types => crates/data}/src/rmxp/troop.rs |    0
 .../data}/src/rmxp/weapon.rs                  |    0
 .../data}/src/shared/audio_file.rs            |    0
 .../data}/src/shared/event.rs                 |    0
 .../data}/src/shared/mapinfo.rs               |    0
 {rmxp-types => crates/data}/src/shared/mod.rs |    0
 .../data}/src/shared/move_route.rs            |    0
 .../data}/src/shared/script.rs                |    0
 crates/filesystem/Cargo.toml                  |   69 +
 .../filesystem/src}/archiver.rs               |   28 +-
 .../filesystem/src}/erased.rs                 |  102 +-
 .../mod.rs => crates/filesystem/src/lib.rs    |   89 +-
 .../filesystem/src}/list.rs                   |   13 +-
 .../filesystem/src/native.rs                  |   59 +-
 .../filesystem/src}/overlay.rs                |    0
 .../filesystem/src}/path_cache.rs             |   40 +-
 crates/filesystem/src/project.rs              |  638 +++++
 .../filesystem/src}/web.rs                    |  160 +-
 crates/graphics/Cargo.toml                    |   43 +
 .../graphics/src/atlas_cache.rs               |   23 +-
 .../graphics => crates/graphics/src}/event.rs |  104 +-
 .../graphics/src}/image_cache.rs              |   69 +-
 crates/graphics/src/lib.rs                    |   94 +
 crates/graphics/src/map.rs                    |  220 ++
 .../graphics => crates/graphics/src}/plane.rs |   27 +-
 .../graphics/src}/quad.rs                     |    9 +-
 .../graphics/src}/sprite/graphic.rs           |   78 +-
 .../graphics/src}/sprite/mod.rs               |   40 +-
 crates/graphics/src/sprite/shader.rs          |  158 ++
 .../graphics/src}/sprite/sprite.wgsl          |   30 +-
 .../graphics/src}/sprite/vertices.rs          |   10 +-
 .../graphics/src}/tiles/atlas.rs              |  109 +-
 .../graphics/src}/tiles/autotile_ids.rs       |    0
 .../graphics/src}/tiles/autotiles.rs          |   65 +-
 .../graphics/src}/tiles/instance.rs           |   28 +-
 .../graphics/src}/tiles/mod.rs                |   42 +-
 .../graphics/src}/tiles/opacity.rs            |   61 +-
 crates/graphics/src/tiles/shader.rs           |  115 +
 .../graphics/src}/tiles/tilemap.wgsl          |   46 +-
 .../graphics/src}/vertex.rs                   |    2 -
 .../graphics/src}/viewport.rs                 |   65 +-
 crates/macros/Cargo.toml                      |   16 +
 crates/macros/src/lib.rs                      |   14 +
 crates/modals/Cargo.toml                      |   23 +
 crates/modals/src/graphic_picker.rs           |   47 +
 src/modals/mod.rs => crates/modals/src/lib.rs |    6 +-
 .../modals/src}/move_route.rs                 |    0
 crates/modals/src/sound_picker.rs             |   49 +
 {src/modals => crates/modals/src}/switch.rs   |  103 +-
 {src/modals => crates/modals/src}/variable.rs |  106 +-
 {luminol-term => crates/term}/Cargo.toml      |   18 +-
 .../src => crates/term/src/_impl}/into.rs     |    0
 .../lib.rs => crates/term/src/_impl/mod.rs    |    2 +-
 src/cache/mod.rs => crates/term/src/lib.rs    |    7 +-
 crates/ui/Cargo.toml                          |   46 +
 crates/ui/src/lib.rs                          |  209 ++
 crates/ui/src/tabs/map/brush.rs               |  329 +++
 .../ui/src/tabs/map/history.rs                |    0
 crates/ui/src/tabs/map/mod.rs                 |  548 ++++
 crates/ui/src/tabs/map/util.rs                |  225 ++
 {src => crates/ui/src}/tabs/mod.rs            |    2 -
 crates/ui/src/tabs/started.rs                 |  196 ++
 {src => crates/ui/src}/windows/about.rs       |   13 +-
 {src => crates/ui/src}/windows/appearance.rs  |   29 +-
 .../ui/src/windows}/command_gen/mod.rs        |   15 +-
 .../src/windows}/command_gen/parameter_ui.rs  |    0
 .../ui/src/windows}/command_gen/ui_example.rs |    0
 .../ui/src}/windows/common_event_edit.rs      |   56 +-
 .../ui/src}/windows/config_window.rs          |   33 +-
 {src => crates/ui/src}/windows/console.rs     |   15 +-
 crates/ui/src/windows/event_edit.rs           |   81 +
 .../ui/src}/windows/global_config_window.rs   |    9 +-
 {src => crates/ui/src}/windows/items.rs       |   45 +-
 {src => crates/ui/src}/windows/map_picker.rs  |   47 +-
 {src => crates/ui/src}/windows/misc.rs        |   31 +-
 {src => crates/ui/src}/windows/mod.rs         |    6 -
 crates/ui/src/windows/new_project.rs          |  363 +++
 {src => crates/ui/src}/windows/script_edit.rs |   39 +-
 crates/ui/src/windows/sound_test.rs           |   91 +
 crates/web/Cargo.toml                         |   78 +
 {assets => crates/web/js}/bindings.js         |    0
 {src/web => crates/web/src}/bindings.rs       |    2 +-
 src/web/mod.rs => crates/web/src/lib.rs       |    6 +
 .../web/src}/web_worker_runner.rs             |   85 +-
 luminol-term/examples/eframe.rs               |   78 -
 rmxp-types/Cargo.toml                         |   21 -
 rust-toolchain.toml                           |    2 +-
 src/app/mod.rs                                |  289 +++
 src/app/top_bar.rs                            |  381 +++
 src/cache/Scripts.rxdata                      |  Bin 109299 -> 0 bytes
 src/cache/data.rs                             |  502 ----
 src/components/command_view/command_ui.rs     |  278 --
 src/components/command_view/parameter_ui.rs   |  146 --
 src/components/command_view/ui.rs             |  241 --
 src/components/top_bar.rs                     |  256 --
 src/config/mod.rs                             |  248 --
 src/filesystem/project.rs                     |  638 -----
 src/graphics/map.rs                           |  193 --
 src/graphics/mod.rs                           |   26 -
 src/graphics/primitives/sprite/shader.rs      |  216 --
 .../sprite/sprite_header_push_constants.wgsl  |    6 -
 .../sprite/sprite_header_uniforms.wgsl        |    4 -
 src/graphics/primitives/tiles/shader.rs       |  150 --
 .../tiles/tilemap_header_push_constants.wgsl  |    7 -
 .../tiles/tilemap_header_uniforms.wgsl        |    6 -
 src/lib.rs                                    |  190 --
 src/lumi/mod.rs                               |    4 +-
 src/luminol.rs                                |  233 --
 src/main.rs                                   |  192 +-
 src/prelude.rs                                |   81 -
 src/steam.rs                                  |   26 +-
 src/tabs/map.rs                               | 1023 --------
 src/tabs/started.rs                           |  150 --
 src/tabs/tab.rs                               |  157 --
 src/windows/event_edit.rs                     |  337 ---
 src/windows/graphic_picker.rs                 |  105 -
 src/windows/new_project.rs                    |  308 ---
 src/windows/window.rs                         |   90 -
 185 files changed, 8821 insertions(+), 8346 deletions(-)
 create mode 100644 .wakatime-project
 delete mode 100644 command-lib/Cargo.toml
 create mode 100644 crates/app/Cargo.toml
 create mode 100644 crates/app/src/lib.rs
 create mode 100644 crates/audio/Cargo.toml
 rename {src/audio => crates/audio/src}/GMGSx.sf2 (100%)
 create mode 100644 crates/audio/src/error.rs
 rename src/audio/mod.rs => crates/audio/src/lib.rs (89%)
 rename {src/audio => crates/audio/src}/midi.rs (93%)
 rename {src/audio => crates/audio/src}/wrapper.rs (72%)
 create mode 100644 crates/components/Cargo.toml
 create mode 100644 crates/components/src/command_view/command_ui.rs
 rename {src/components => crates/components/src}/command_view/macros.rs (100%)
 rename {src/components => crates/components/src}/command_view/mod.rs (98%)
 create mode 100644 crates/components/src/command_view/parameter_ui.rs
 rename src/graphics/primitives/mod.rs => crates/components/src/command_view/ui.rs (80%)
 rename src/components/mod.rs => crates/components/src/lib.rs (95%)
 rename {src/components => crates/components/src}/map_view.rs (85%)
 rename src/windows/sound_test.rs => crates/components/src/sound_tab.rs (61%)
 rename {src/components => crates/components/src}/syntax_highlighting.rs (52%)
 rename {src/components => crates/components/src}/tilepicker.rs (64%)
 create mode 100644 crates/config/Cargo.toml
 rename {src/config => crates/config/src}/command_db.rs (97%)
 rename {src/config => crates/config/src}/commands/ace.ron (100%)
 rename {src/config => crates/config/src}/commands/vx.ron (100%)
 rename {src/config => crates/config/src}/commands/xp.ron (100%)
 rename {src/config => crates/config/src}/global.rs (93%)
 create mode 100644 crates/config/src/lib.rs
 rename {src/config => crates/config/src}/project.rs (67%)
 create mode 100644 crates/core/Cargo.toml
 create mode 100644 crates/core/src/data_cache.rs
 create mode 100644 crates/core/src/lib.rs
 rename {src/modals => crates/core/src}/modal.rs (82%)
 create mode 100644 crates/core/src/tab.rs
 rename {src/components => crates/core/src}/toasts.rs (69%)
 create mode 100644 crates/core/src/window.rs
 create mode 100644 crates/data/Cargo.toml
 rename command-lib/src/lib.rs => crates/data/src/commands.rs (100%)
 rename {rmxp-types => crates/data}/src/helpers/id.rs (100%)
 rename {rmxp-types => crates/data}/src/helpers/id_vec.rs (100%)
 rename {rmxp-types => crates/data}/src/helpers/mod.rs (100%)
 rename {rmxp-types => crates/data}/src/helpers/nil_padded.rs (100%)
 rename {rmxp-types => crates/data}/src/helpers/optional_id.rs (100%)
 rename {rmxp-types => crates/data}/src/helpers/optional_path.rs (100%)
 rename {rmxp-types => crates/data}/src/helpers/parameter_type.rs (100%)
 rename {rmxp-types => crates/data}/src/lib.rs (96%)
 rename {rmxp-types => crates/data}/src/option_vec.rs (100%)
 rename {rmxp-types => crates/data}/src/rgss_structs.rs (94%)
 rename {rmxp-types => crates/data}/src/rmxp/actor.rs (100%)
 rename {rmxp-types => crates/data}/src/rmxp/animation.rs (100%)
 rename {rmxp-types => crates/data}/src/rmxp/armor.rs (100%)
 rename {rmxp-types => crates/data}/src/rmxp/class.rs (100%)
 rename {rmxp-types => crates/data}/src/rmxp/enemy.rs (100%)
 rename {rmxp-types => crates/data}/src/rmxp/item.rs (100%)
 rename {rmxp-types => crates/data}/src/rmxp/map.rs (100%)
 rename {rmxp-types => crates/data}/src/rmxp/mod.rs (100%)
 rename {rmxp-types => crates/data}/src/rmxp/skill.rs (100%)
 rename {rmxp-types => crates/data}/src/rmxp/state.rs (100%)
 rename {rmxp-types => crates/data}/src/rmxp/system.rs (100%)
 rename {rmxp-types => crates/data}/src/rmxp/tileset.rs (100%)
 rename {rmxp-types => crates/data}/src/rmxp/troop.rs (100%)
 rename {rmxp-types => crates/data}/src/rmxp/weapon.rs (100%)
 rename {rmxp-types => crates/data}/src/shared/audio_file.rs (100%)
 rename {rmxp-types => crates/data}/src/shared/event.rs (100%)
 rename {rmxp-types => crates/data}/src/shared/mapinfo.rs (100%)
 rename {rmxp-types => crates/data}/src/shared/mod.rs (100%)
 rename {rmxp-types => crates/data}/src/shared/move_route.rs (100%)
 rename {rmxp-types => crates/data}/src/shared/script.rs (100%)
 create mode 100644 crates/filesystem/Cargo.toml
 rename {src/filesystem => crates/filesystem/src}/archiver.rs (94%)
 rename {src/filesystem => crates/filesystem/src}/erased.rs (61%)
 rename src/filesystem/mod.rs => crates/filesystem/src/lib.rs (69%)
 rename {src/filesystem => crates/filesystem/src}/list.rs (92%)
 rename src/filesystem/host.rs => crates/filesystem/src/native.rs (71%)
 rename {src/filesystem => crates/filesystem/src}/overlay.rs (100%)
 rename {src/filesystem => crates/filesystem/src}/path_cache.rs (88%)
 create mode 100644 crates/filesystem/src/project.rs
 rename {src/filesystem => crates/filesystem/src}/web.rs (91%)
 create mode 100644 crates/graphics/Cargo.toml
 rename src/cache/atlas.rs => crates/graphics/src/atlas_cache.rs (60%)
 rename {src/graphics => crates/graphics/src}/event.rs (58%)
 rename {src/cache => crates/graphics/src}/image_cache.rs (82%)
 create mode 100644 crates/graphics/src/lib.rs
 create mode 100644 crates/graphics/src/map.rs
 rename {src/graphics => crates/graphics/src}/plane.rs (70%)
 rename {src/graphics/primitives => crates/graphics/src}/quad.rs (96%)
 rename {src/graphics/primitives => crates/graphics/src}/sprite/graphic.rs (69%)
 rename {src/graphics/primitives => crates/graphics/src}/sprite/mod.rs (65%)
 create mode 100644 crates/graphics/src/sprite/shader.rs
 rename {src/graphics/primitives => crates/graphics/src}/sprite/sprite.wgsl (74%)
 rename {src/graphics/primitives => crates/graphics/src}/sprite/vertices.rs (80%)
 rename {src/graphics/primitives => crates/graphics/src}/tiles/atlas.rs (82%)
 rename {src/graphics/primitives => crates/graphics/src}/tiles/autotile_ids.rs (100%)
 rename {src/graphics/primitives => crates/graphics/src}/tiles/autotiles.rs (70%)
 rename {src/graphics/primitives => crates/graphics/src}/tiles/instance.rs (88%)
 rename {src/graphics/primitives => crates/graphics/src}/tiles/mod.rs (72%)
 rename {src/graphics/primitives => crates/graphics/src}/tiles/opacity.rs (67%)
 create mode 100644 crates/graphics/src/tiles/shader.rs
 rename {src/graphics/primitives => crates/graphics/src}/tiles/tilemap.wgsl (66%)
 rename {src/graphics/primitives => crates/graphics/src}/vertex.rs (98%)
 rename {src/graphics/primitives => crates/graphics/src}/viewport.rs (66%)
 create mode 100644 crates/macros/Cargo.toml
 create mode 100644 crates/macros/src/lib.rs
 create mode 100644 crates/modals/Cargo.toml
 create mode 100644 crates/modals/src/graphic_picker.rs
 rename src/modals/mod.rs => crates/modals/src/lib.rs (94%)
 rename {src/modals => crates/modals/src}/move_route.rs (100%)
 create mode 100644 crates/modals/src/sound_picker.rs
 rename {src/modals => crates/modals/src}/switch.rs (59%)
 rename {src/modals => crates/modals/src}/variable.rs (57%)
 rename {luminol-term => crates/term}/Cargo.toml (64%)
 rename {luminol-term/src => crates/term/src/_impl}/into.rs (100%)
 rename luminol-term/src/lib.rs => crates/term/src/_impl/mod.rs (99%)
 rename src/cache/mod.rs => crates/term/src/lib.rs (91%)
 create mode 100644 crates/ui/Cargo.toml
 create mode 100644 crates/ui/src/lib.rs
 create mode 100644 crates/ui/src/tabs/map/brush.rs
 rename src/modals/graphic.rs => crates/ui/src/tabs/map/history.rs (100%)
 create mode 100644 crates/ui/src/tabs/map/mod.rs
 create mode 100644 crates/ui/src/tabs/map/util.rs
 rename {src => crates/ui/src}/tabs/mod.rs (95%)
 create mode 100644 crates/ui/src/tabs/started.rs
 rename {src => crates/ui/src}/windows/about.rs (91%)
 rename {src => crates/ui/src}/windows/appearance.rs (79%)
 rename {src => crates/ui/src/windows}/command_gen/mod.rs (96%)
 rename {src => crates/ui/src/windows}/command_gen/parameter_ui.rs (100%)
 rename {src => crates/ui/src/windows}/command_gen/ui_example.rs (100%)
 rename {src => crates/ui/src}/windows/common_event_edit.rs (75%)
 rename {src => crates/ui/src}/windows/config_window.rs (64%)
 rename {src => crates/ui/src}/windows/console.rs (87%)
 create mode 100644 crates/ui/src/windows/event_edit.rs
 rename {src => crates/ui/src}/windows/global_config_window.rs (87%)
 rename {src => crates/ui/src}/windows/items.rs (78%)
 rename {src => crates/ui/src}/windows/map_picker.rs (78%)
 rename {src => crates/ui/src}/windows/misc.rs (75%)
 rename {src => crates/ui/src}/windows/mod.rs (92%)
 create mode 100644 crates/ui/src/windows/new_project.rs
 rename {src => crates/ui/src}/windows/script_edit.rs (84%)
 create mode 100644 crates/ui/src/windows/sound_test.rs
 create mode 100644 crates/web/Cargo.toml
 rename {assets => crates/web/js}/bindings.js (100%)
 rename {src/web => crates/web/src}/bindings.rs (97%)
 rename src/web/mod.rs => crates/web/src/lib.rs (85%)
 rename {src/web => crates/web/src}/web_worker_runner.rs (94%)
 delete mode 100644 luminol-term/examples/eframe.rs
 delete mode 100644 rmxp-types/Cargo.toml
 create mode 100644 src/app/mod.rs
 create mode 100644 src/app/top_bar.rs
 delete mode 100644 src/cache/Scripts.rxdata
 delete mode 100644 src/cache/data.rs
 delete mode 100644 src/components/command_view/command_ui.rs
 delete mode 100644 src/components/command_view/parameter_ui.rs
 delete mode 100644 src/components/command_view/ui.rs
 delete mode 100644 src/components/top_bar.rs
 delete mode 100644 src/config/mod.rs
 delete mode 100644 src/filesystem/project.rs
 delete mode 100644 src/graphics/map.rs
 delete mode 100644 src/graphics/mod.rs
 delete mode 100644 src/graphics/primitives/sprite/shader.rs
 delete mode 100644 src/graphics/primitives/sprite/sprite_header_push_constants.wgsl
 delete mode 100644 src/graphics/primitives/sprite/sprite_header_uniforms.wgsl
 delete mode 100644 src/graphics/primitives/tiles/shader.rs
 delete mode 100644 src/graphics/primitives/tiles/tilemap_header_push_constants.wgsl
 delete mode 100644 src/graphics/primitives/tiles/tilemap_header_uniforms.wgsl
 delete mode 100644 src/lib.rs
 delete mode 100644 src/luminol.rs
 delete mode 100644 src/prelude.rs
 delete mode 100644 src/tabs/map.rs
 delete mode 100644 src/tabs/started.rs
 delete mode 100644 src/tabs/tab.rs
 delete mode 100644 src/windows/event_edit.rs
 delete mode 100644 src/windows/graphic_picker.rs
 delete mode 100644 src/windows/new_project.rs
 delete mode 100644 src/windows/window.rs

diff --git a/.cargo/config.toml b/.cargo/config.toml
index 3de5aa1b..77777bb8 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,8 +1,24 @@
+# Possibly enable -Zshare-generics=y?
+
 [target.x86_64-pc-windows-msvc]
 linker = "rust-lld"
+rustflags = ["-Z", "threads=8"]
 
 [target.x86_64-unknown-linux-gnu]
-rustflags = ["-C", "linker=clang", "-C", "link-arg=-fuse-ld=mold"]
+rustflags = [
+	"-C",
+	"linker=clang",
+	"-C",
+	"link-arg=-fuse-ld=mold",
+	"-Z",
+	"threads=8",
+]
 
 [target.'cfg(target_arch = "wasm32")']
-rustflags = ["--cfg=web_sys_unstable_apis", "-C", "target-feature=+atomics,+bulk-memory,+mutable-globals"]
+rustflags = [
+	"--cfg=web_sys_unstable_apis",
+	"-C",
+	"target-feature=+atomics,+bulk-memory,+mutable-globals",
+	"-Z",
+	"threads=8",
+]
diff --git a/.github/workflows/build-steam.yml b/.github/workflows/build-steam.yml
index 0415265d..2ddb80bf 100644
--- a/.github/workflows/build-steam.yml
+++ b/.github/workflows/build-steam.yml
@@ -23,11 +23,11 @@ jobs:
           sudo apt install libgtk-3-dev libatk1.0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libasound2-dev clang mold -y
       - uses: dtolnay/rust-toolchain@nightly
         with:
-          toolchain: nightly-2023-09-12
+          toolchain: nightly-2023-11-14
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2
       - name: Build luminol (Release)
-        run: cargo build --features steamworks --release --jobs 1
+        run: cargo build --features steamworks --release 
       - name: Setup artifact
         run: |
           mkdir -p ${{ github.workspace }}/artifact
@@ -48,11 +48,11 @@ jobs:
           submodules: true
       - uses: dtolnay/rust-toolchain@nightly
         with:
-          toolchain: nightly-2023-09-12
+          toolchain: nightly-2023-11-14
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2
       - name: Build luminol (Release)
-        run: cargo build --features steamworks --release --jobs 1
+        run: cargo build --features steamworks --release 
       - name: Setup artifact
         run: |
           mkdir -p ${{ github.workspace }}/artifact
@@ -73,11 +73,11 @@ jobs:
           submodules: true
       - uses: dtolnay/rust-toolchain@nightly
         with:
-          toolchain: nightly-2023-09-12
+          toolchain: nightly-2023-11-14
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2
       - name: Build luminol (Release)
-        run: cargo build --features steamworks --release --jobs 1
+        run: cargo build --features steamworks --release 
       - name: Setup artifact
         run: |
           mkdir -p ${{ github.workspace }}/artifact
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 10b55367..1cb78618 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,11 +22,11 @@ jobs:
           sudo apt install libgtk-3-dev libatk1.0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libasound2-dev clang mold -y
       - uses: dtolnay/rust-toolchain@nightly
         with:
-          toolchain: nightly-2023-09-12
+          toolchain: nightly-2023-11-14
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2
       - name: Build luminol (Release)
-        run: cargo build --release --jobs 1
+        run: cargo build --release 
       - name: Setup artifact
         run: |
           mkdir -p ${{ github.workspace }}/artifact
@@ -46,11 +46,11 @@ jobs:
           submodules: true
       - uses: dtolnay/rust-toolchain@nightly
         with:
-          toolchain: nightly-2023-09-12
+          toolchain: nightly-2023-11-14
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2
       - name: Build luminol (Release)
-        run: cargo build --release --jobs 1
+        run: cargo build --release 
       - name: Setup artifact
         run: |
           mkdir -p ${{ github.workspace }}/artifact
@@ -70,11 +70,11 @@ jobs:
           submodules: true
       - uses: dtolnay/rust-toolchain@nightly
         with:
-          toolchain: nightly-2023-09-12
+          toolchain: nightly-2023-11-14
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2
       - name: Build luminol (Release)
-        run: cargo build --release --jobs 1
+        run: cargo build --release 
       - name: Setup artifact
         run: |
           mkdir -p ${{ github.workspace }}/artifact
@@ -98,7 +98,7 @@ jobs:
           sudo apt install libgtk-3-dev libatk1.0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libasound2-dev clang mold -y
       - uses: dtolnay/rust-toolchain@nightly
         with:
-          toolchain: nightly-2023-09-12
+          toolchain: nightly-2023-11-14
           targets: wasm32-unknown-unknown
           components: rust-src
       - name: Download and install Trunk binary
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index cf5c8da8..7fdeeea7 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -23,10 +23,10 @@ jobs:
           sudo apt install libgtk-3-dev libatk1.0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libasound2-dev clang mold -y
       - uses: dtolnay/rust-toolchain@nightly
         with:
-          toolchain: nightly-2023-09-12
+          toolchain: nightly-2023-11-14
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2
-      - run: cargo check --all-features --jobs 1
+      - run: cargo check --all-features 
 
   check-wasm32:
     name: Check wasm32
@@ -41,12 +41,12 @@ jobs:
           sudo apt install libgtk-3-dev libatk1.0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libasound2-dev clang mold -y
       - uses: dtolnay/rust-toolchain@nightly
         with:
-          toolchain: nightly-2023-09-12
+          toolchain: nightly-2023-11-14
           targets: wasm32-unknown-unknown
           components: rust-src
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2
-      - run: cargo check --jobs 1 --target wasm32-unknown-unknown -Z build-std=std,panic_abort
+      - run: cargo check  --target wasm32-unknown-unknown -Z build-std=std,panic_abort
 
   test:
     name: Test Suite
@@ -60,10 +60,10 @@ jobs:
           sudo apt install libgtk-3-dev libatk1.0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libasound2-dev clang mold -y
       - uses: dtolnay/rust-toolchain@nightly
         with:
-          toolchain: nightly-2023-09-12
+          toolchain: nightly-2023-11-14
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2
-      - run: cargo test --lib --jobs 1
+      - run: cargo test --workspace 
 
   fmt:
     name: Rustfmt
@@ -78,7 +78,7 @@ jobs:
           sudo apt install libgtk-3-dev libatk1.0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libasound2-dev clang mold -y
       - uses: dtolnay/rust-toolchain@nightly
         with:
-          toolchain: nightly-2023-09-12
+          toolchain: nightly-2023-11-14
           components: rustfmt
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2
@@ -97,8 +97,8 @@ jobs:
           sudo apt install libgtk-3-dev libatk1.0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libasound2-dev clang mold -y
       - uses: dtolnay/rust-toolchain@nightly
         with:
-          toolchain: nightly-2023-09-12
+          toolchain: nightly-2023-11-14
           components: clippy
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2
-      - run: cargo clippy --jobs 1 -- # -D warnings
+      - run: cargo clippy  -- # -D warnings
diff --git a/.vscode/settings.json b/.vscode/settings.json
index f2468ad8..f408fb01 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -5,7 +5,7 @@
 	"licenser.customHeaderFile": "${workspaceFolder}/.vscode/header.txt",
 	"licenser.disableAutoHeaderInsertion": false,
 	"rust-analyzer.cargo.features": [
-		"steamworks"
+		// "steamworks"
 	],
 	"editor.formatOnSave": true,
 	"rust-analyzer.check.command": "clippy",
@@ -22,7 +22,8 @@
 		"image cache",
 		"tilemap",
 		"config",
-		"audio"
+		"audio",
+		"graphics"
 	],
 	"rust-analyzer.showUnlinkedFileNotification": false,
 	"rust-analyzer.cargo.extraEnv": {
diff --git a/.wakatime-project b/.wakatime-project
new file mode 100644
index 00000000..2b41a6e9
--- /dev/null
+++ b/.wakatime-project
@@ -0,0 +1 @@
+Luminol
diff --git a/Cargo.lock b/Cargo.lock
index 9dc6a183..dde3dd39 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "ab_glyph"
-version = "0.2.21"
+version = "0.2.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5110f1c78cf582855d895ecd0746b653db010cec6d9f5575293f27934d980a39"
+checksum = "80179d7dd5d7e8c285d67c4a1e652972a92de7475beddfb92028c76463b13225"
 dependencies = [
  "ab_glyph_rasterizer",
  "owned_ttf_parser",
@@ -57,9 +57,9 @@ checksum = "e084cb5168790c0c112626175412dc5ad127083441a8248ae49ddf6725519e83"
 dependencies = [
  "accesskit",
  "accesskit_consumer",
- "async-channel",
+ "async-channel 1.9.0",
  "atspi",
- "futures-lite",
+ "futures-lite 1.13.0",
  "serde",
  "zbus",
 ]
@@ -91,6 +91,18 @@ dependencies = [
  "winit",
 ]
 
+[[package]]
+name = "accessory"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "850bb534b9dc04744fbbb71d30ad6d25a7e4cf6dc33e223c81ef3a92ebab4e0b"
+dependencies = [
+ "macroific",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.39",
+]
+
 [[package]]
 name = "addr2line"
 version = "0.21.0"
@@ -108,9 +120,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "ahash"
-version = "0.7.6"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
+checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd"
 dependencies = [
  "getrandom",
  "once_cell",
@@ -119,30 +131,31 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.8.3"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
+checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a"
 dependencies = [
  "cfg-if",
  "once_cell",
  "serde",
  "version_check",
+ "zerocopy",
 ]
 
 [[package]]
 name = "aho-corasick"
-version = "1.0.4"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
-name = "aliasable"
-version = "0.1.3"
+name = "allocator-api2"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd"
+checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
 
 [[package]]
 name = "alox-48"
@@ -151,7 +164,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8054396c448cd2fb78b7b719b9fe616eac0b6b0e824f1cbcc0804617124a3d3f"
 dependencies = [
  "enum-as-inner",
- "indexmap 2.0.0",
+ "indexmap 2.1.0",
  "miette",
  "paste",
  "serde",
@@ -221,16 +234,15 @@ checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
 
 [[package]]
 name = "arboard"
-version = "3.2.0"
+version = "3.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6041616acea41d67c4a984709ddab1587fd0b10efe5cc563fee954d2f011854"
+checksum = "ac57f2b058a76363e357c056e4f74f1945bf734d37b8b3ef49066c4787dde0fc"
 dependencies = [
  "clipboard-win",
  "log",
  "objc",
  "objc-foundation",
  "objc_id",
- "once_cell",
  "parking_lot",
  "thiserror",
  "winapi",
@@ -264,7 +276,7 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b"
 dependencies = [
- "event-listener",
+ "event-listener 2.5.3",
  "futures-core",
 ]
 
@@ -275,21 +287,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
 dependencies = [
  "concurrent-queue",
- "event-listener",
+ "event-listener 2.5.3",
+ "futures-core",
+]
+
+[[package]]
+name = "async-channel"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d37875bd9915b7d67c2f117ea2c30a0989874d0b2cb694fe25403c85763c0c9e"
+dependencies = [
+ "concurrent-queue",
+ "event-listener 3.1.0",
+ "event-listener-strategy",
  "futures-core",
+ "pin-project-lite",
 ]
 
 [[package]]
 name = "async-executor"
-version = "1.5.1"
+version = "1.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb"
+checksum = "fc5ea910c42e5ab19012bab31f53cb4d63d54c3a27730f9a833a88efcf4bb52d"
 dependencies = [
- "async-lock",
+ "async-lock 3.1.1",
  "async-task",
  "concurrent-queue",
- "fastrand 1.9.0",
- "futures-lite",
+ "fastrand 2.0.1",
+ "futures-lite 2.0.1",
  "slab",
 ]
 
@@ -299,10 +324,10 @@ version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06"
 dependencies = [
- "async-lock",
+ "async-lock 2.8.0",
  "autocfg",
  "blocking",
- "futures-lite",
+ "futures-lite 1.13.0",
 ]
 
 [[package]]
@@ -311,18 +336,38 @@ version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af"
 dependencies = [
- "async-lock",
+ "async-lock 2.8.0",
  "autocfg",
  "cfg-if",
  "concurrent-queue",
- "futures-lite",
+ "futures-lite 1.13.0",
  "log",
  "parking",
- "polling",
- "rustix 0.37.23",
+ "polling 2.8.0",
+ "rustix 0.37.27",
+ "slab",
+ "socket2 0.4.10",
+ "waker-fn",
+]
+
+[[package]]
+name = "async-io"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41ed9d5715c2d329bf1b4da8d60455b99b187f27ba726df2883799af9af60997"
+dependencies = [
+ "async-lock 3.1.1",
+ "cfg-if",
+ "concurrent-queue",
+ "futures-io",
+ "futures-lite 2.0.1",
+ "parking",
+ "polling 3.3.0",
+ "rustix 0.38.25",
  "slab",
- "socket2 0.4.9",
+ "tracing",
  "waker-fn",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -331,65 +376,81 @@ version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b"
 dependencies = [
- "event-listener",
+ "event-listener 2.5.3",
 ]
 
 [[package]]
-name = "async-net"
-version = "1.7.0"
+name = "async-lock"
+version = "3.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4051e67316bc7eff608fe723df5d32ed639946adcd69e07df41fd42a7b411f1f"
+checksum = "655b9c7fe787d3b25cc0f804a1a8401790f0c5bc395beb5a64dc77d8de079105"
 dependencies = [
- "async-io",
- "autocfg",
- "blocking",
- "futures-lite",
+ "event-listener 3.1.0",
+ "event-listener-strategy",
+ "pin-project-lite",
 ]
 
 [[package]]
 name = "async-process"
-version = "1.7.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9"
+checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88"
 dependencies = [
- "async-io",
- "async-lock",
- "autocfg",
+ "async-io 1.13.0",
+ "async-lock 2.8.0",
+ "async-signal",
  "blocking",
  "cfg-if",
- "event-listener",
- "futures-lite",
- "rustix 0.37.23",
- "signal-hook 0.3.17",
+ "event-listener 3.1.0",
+ "futures-lite 1.13.0",
+ "rustix 0.38.25",
  "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "async-recursion"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba"
+checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.39",
+]
+
+[[package]]
+name = "async-signal"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5"
+dependencies = [
+ "async-io 2.2.0",
+ "async-lock 2.8.0",
+ "atomic-waker",
+ "cfg-if",
+ "futures-core",
+ "futures-io",
+ "rustix 0.38.25",
+ "signal-hook-registry",
+ "slab",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "async-task"
-version = "4.4.0"
+version = "4.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae"
+checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1"
 
 [[package]]
 name = "async-trait"
-version = "0.1.73"
+version = "0.1.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"
+checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -412,15 +473,9 @@ checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba"
 
 [[package]]
 name = "atomic-waker"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3"
-
-[[package]]
-name = "atomic_refcell"
-version = "0.1.11"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "112ef6b3f6cb3cb6fc5b6b494ef7a848492cff1ab0ef4de10b0f7d572861c905"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "atspi"
@@ -432,7 +487,7 @@ dependencies = [
  "async-trait",
  "atspi-macros",
  "enumflags2",
- "futures-lite",
+ "futures-lite 1.13.0",
  "serde",
  "tracing",
  "zbus",
@@ -478,9 +533,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
 [[package]]
 name = "base64"
-version = "0.21.2"
+version = "0.21.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"
+checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"
 
 [[package]]
 name = "bincode"
@@ -493,11 +548,11 @@ dependencies = [
 
 [[package]]
 name = "bindgen"
-version = "0.64.0"
+version = "0.69.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4"
+checksum = "9ffcebc3849946a7170a05992aac39da343a90676ab392c51a4280981d6379c2"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.1",
  "cexpr",
  "clang-sys",
  "lazy_static",
@@ -508,7 +563,7 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "syn 1.0.109",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -540,9 +595,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.4.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 dependencies = [
  "serde",
 ]
@@ -592,24 +647,25 @@ dependencies = [
 
 [[package]]
 name = "blocking"
-version = "1.3.1"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65"
+checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118"
 dependencies = [
- "async-channel",
- "async-lock",
+ "async-channel 2.1.0",
+ "async-lock 3.1.1",
  "async-task",
- "atomic-waker",
- "fastrand 1.9.0",
- "futures-lite",
- "log",
+ "fastrand 2.0.1",
+ "futures-io",
+ "futures-lite 2.0.1",
+ "piper",
+ "tracing",
 ]
 
 [[package]]
 name = "bumpalo"
-version = "3.13.0"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
+checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
 
 [[package]]
 name = "bytemuck"
@@ -622,32 +678,32 @@ dependencies = [
 
 [[package]]
 name = "bytemuck_derive"
-version = "1.4.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192"
+checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "byteorder"
-version = "1.4.3"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
+checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
 
 [[package]]
 name = "cairo-sys-rs"
-version = "0.18.0"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd4d115132e01c0165e3bf5f56aedee8980b0b96ede4eb000b693c05a8adb8ff"
+checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51"
 dependencies = [
  "libc",
  "system-deps",
@@ -676,8 +732,7 @@ checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c"
 [[package]]
 name = "catppuccin-egui"
 version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d3754c4417c19dc020529b0a3fb5e649afa59b16d49c9231210800ce00891b5"
+source = "git+https://github.com/catppuccin/egui?rev=f2bcf74#f2bcf74a122d82e880a7e61c8833e043a825409e"
 dependencies = [
  "egui",
 ]
@@ -709,9 +764,9 @@ dependencies = [
 
 [[package]]
 name = "cfg-expr"
-version = "0.15.4"
+version = "0.15.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9"
+checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3"
 dependencies = [
  "smallvec",
  "target-lexicon",
@@ -729,15 +784,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
 
-[[package]]
-name = "cgl"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ced0551234e87afee12411d535648dd89d2e7f34c78b753395567aff3d447ff"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "clang-sys"
 version = "1.6.1"
@@ -777,22 +823,21 @@ dependencies = [
  "cocoa-foundation",
  "core-foundation",
  "core-graphics",
- "foreign-types",
+ "foreign-types 0.3.2",
  "libc",
  "objc",
 ]
 
 [[package]]
 name = "cocoa-foundation"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "931d3837c286f56e3c58423ce4eba12d08db2374461a785c86f672b08b5650d6"
+checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7"
 dependencies = [
  "bitflags 1.3.2",
  "block",
  "core-foundation",
  "core-graphics-types",
- "foreign-types",
  "libc",
  "objc",
 ]
@@ -808,30 +853,13 @@ dependencies = [
 ]
 
 [[package]]
-name = "color-eyre"
-version = "0.6.2"
+name = "color-backtrace"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204"
+checksum = "150fd80a270c0671379f388c8204deb6a746bb4eac8a6c03fe2460b2c0127ea0"
 dependencies = [
  "backtrace",
- "color-spantrace",
- "eyre",
- "indenter",
- "once_cell",
- "owo-colors",
- "tracing-error",
-]
-
-[[package]]
-name = "color-spantrace"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ba75b3d9449ecdccb27ecbc479fdc0b87fa2dd43d2f8298f9bf0e59aacc8dce"
-dependencies = [
- "once_cell",
- "owo-colors",
- "tracing-core",
- "tracing-error",
+ "termcolor",
 ]
 
 [[package]]
@@ -856,92 +884,45 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "command-lib"
-version = "0.1.0"
-dependencies = [
- "rand",
- "serde",
- "strum",
-]
-
 [[package]]
 name = "concurrent-queue"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c"
+checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400"
 dependencies = [
  "crossbeam-utils",
 ]
 
-[[package]]
-name = "console_error_panic_hook"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc"
-dependencies = [
- "cfg-if",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "const-random"
-version = "0.1.15"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368a7a772ead6ce7e1de82bfb04c485f3db8ec744f72925af5735e29a22cc18e"
+checksum = "5aaf16c9c2c612020bcfd042e170f6e32de9b9d75adb5277cdbbd2e2c8c8299a"
 dependencies = [
  "const-random-macro",
- "proc-macro-hack",
 ]
 
 [[package]]
 name = "const-random-macro"
-version = "0.1.15"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d7d6ab3c3a2282db210df5f02c4dab6e0a7057af0fb7ebd4070f30fe05c0ddb"
+checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"
 dependencies = [
  "getrandom",
  "once_cell",
- "proc-macro-hack",
  "tiny-keccak",
 ]
 
-[[package]]
-name = "const_format"
-version = "0.2.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c990efc7a285731f9a4378d81aff2f0e85a2c8781a05ef0f8baa8dac54d0ff48"
-dependencies = [
- "const_format_proc_macros",
-]
-
-[[package]]
-name = "const_format_proc_macros"
-version = "0.2.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e026b6ce194a874cb9cf32cd5772d1ef9767cc8fcb5765948d74f37a9d8b2bf6"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-xid",
-]
-
 [[package]]
 name = "core-foundation"
 version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
 dependencies = [
- "core-foundation-sys 0.8.4",
+ "core-foundation-sys",
  "libc",
 ]
 
-[[package]]
-name = "core-foundation-sys"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"
-
 [[package]]
 name = "core-foundation-sys"
 version = "0.8.4"
@@ -957,7 +938,7 @@ dependencies = [
  "bitflags 1.3.2",
  "core-foundation",
  "core-graphics-types",
- "foreign-types",
+ "foreign-types 0.3.2",
  "libc",
 ]
 
@@ -974,20 +955,20 @@ dependencies = [
 
 [[package]]
 name = "coreaudio-rs"
-version = "0.11.2"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb17e2d1795b1996419648915df94bc7103c28f7b48062d7acf4652fc371b2ff"
+checksum = "321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace"
 dependencies = [
  "bitflags 1.3.2",
- "core-foundation-sys 0.6.2",
+ "core-foundation-sys",
  "coreaudio-sys",
 ]
 
 [[package]]
 name = "coreaudio-sys"
-version = "0.2.12"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f034b2258e6c4ade2f73bf87b21047567fb913ee9550837c2316d139b0262b24"
+checksum = "f3120ebb80a9de008e638ad833d4127d50ea3d3a960ea23ea69bc66d9358a028"
 dependencies = [
  "bindgen",
 ]
@@ -998,7 +979,7 @@ version = "0.15.2"
 source = "git+https://github.com/DouglasDwyer/cpal.git?rev=91aeb4d6b02c25791f636fdf92a73637597c077a#91aeb4d6b02c25791f636fdf92a73637597c077a"
 dependencies = [
  "alsa",
- "core-foundation-sys 0.8.4",
+ "core-foundation-sys",
  "coreaudio-rs",
  "dasp_sample",
  "jni 0.19.0",
@@ -1018,9 +999,9 @@ dependencies = [
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.9"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
+checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0"
 dependencies = [
  "libc",
 ]
@@ -1036,9 +1017,9 @@ dependencies = [
 
 [[package]]
 name = "crc-catalog"
-version = "2.2.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484"
+checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
 
 [[package]]
 name = "crc32fast"
@@ -1144,23 +1125,23 @@ dependencies = [
 
 [[package]]
 name = "d3d12"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da"
+checksum = "e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20"
 dependencies = [
- "bitflags 1.3.2",
- "libloading 0.7.4",
+ "bitflags 2.4.1",
+ "libloading 0.8.1",
  "winapi",
 ]
 
 [[package]]
 name = "dashmap"
-version = "5.5.1"
+version = "5.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edd72493923899c6f10c641bdbdeddc7183d6396641d99c1a0d1597f37f92e28"
+checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
 dependencies = [
  "cfg-if",
- "hashbrown 0.14.0",
+ "hashbrown 0.14.2",
  "lock_api",
  "once_cell",
  "parking_lot_core",
@@ -1172,12 +1153,30 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f"
 
+[[package]]
+name = "data-encoding"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"
+
 [[package]]
 name = "data-url"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5"
 
+[[package]]
+name = "delegate-display"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "98a85201f233142ac819bbf6226e36d0b5e129a47bd325084674261c82d4cd66"
+dependencies = [
+ "macroific",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.39",
+]
+
 [[package]]
 name = "deltae"
 version = "0.3.2"
@@ -1186,9 +1185,12 @@ checksum = "5729f5117e208430e437df2f4843f5e5952997175992d1414f94c57d61e270b4"
 
 [[package]]
 name = "deranged"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946"
+checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3"
+dependencies = [
+ "powerfmt",
+]
 
 [[package]]
 name = "derivative"
@@ -1273,14 +1275,14 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
 dependencies = [
- "libloading 0.8.0",
+ "libloading 0.8.1",
 ]
 
 [[package]]
 name = "dlv-list"
-version = "0.5.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d529fd73d344663edfd598ccb3f344e46034db51ebd103518eae34338248ad73"
+checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f"
 dependencies = [
  "const-random",
 ]
@@ -1312,9 +1314,9 @@ dependencies = [
 
 [[package]]
 name = "ecolor"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e479a7fa3f23d4e794f8b2f8b3568dd4e47886ad1b12c9c095e141cb591eb63"
+checksum = "cfdf4e52dbbb615cfd30cf5a5265335c217b5fd8d669593cea74a517d9c605af"
 dependencies = [
  "bytemuck",
  "serde",
@@ -1322,9 +1324,9 @@ dependencies = [
 
 [[package]]
 name = "eframe"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4596583a2c680c55b6feaa748f74890c4f9cb9c7cb69d6117110444cb65b2f"
+checksum = "26d9efede6c8905d3fc51a5ec9a506d4da4011bbcae0253d0304580fe40af3f5"
 dependencies = [
  "bytemuck",
  "cocoa",
@@ -1332,19 +1334,17 @@ dependencies = [
  "egui",
  "egui-wgpu",
  "egui-winit",
- "egui_glow",
- "glow",
- "glutin",
- "glutin-winit",
  "image 0.24.7",
  "js-sys",
  "log",
  "objc",
+ "parking_lot",
  "percent-encoding",
  "pollster",
  "raw-window-handle",
  "ron",
  "serde",
+ "static_assertions",
  "thiserror",
  "wasm-bindgen",
  "wasm-bindgen-futures",
@@ -1356,12 +1356,12 @@ dependencies = [
 
 [[package]]
 name = "egui"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3aef8ec3ae1b772f340170c65bf27d5b8c28f543a0116c844d2ac08d01123e7"
+checksum = "8bd69fed5fcf4fbb8225b24e80ea6193b61e17a625db105ef0c4d71dde6eb8b7"
 dependencies = [
  "accesskit",
- "ahash 0.8.3",
+ "ahash 0.8.6",
  "epaint",
  "log",
  "nohash-hasher",
@@ -1371,18 +1371,18 @@ dependencies = [
 
 [[package]]
 name = "egui-notify"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d57ed9c398e24c1b9faf2c52cdc305dd29cb1d9dfa12a0166d254582bc47727a"
+checksum = "dc3b10f21c7bb2afaecb8d98677cdb233a8b1f336b9b95abd610a33aeced04fc"
 dependencies = [
  "egui",
 ]
 
 [[package]]
 name = "egui-wgpu"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33caaedd8283779c787298af23d8754a7e88421ff32e89ad0040c855fc0b0224"
+checksum = "62d4c9ab93d9528c184ef1d695c8c99b2e6d50833696ec3f513063efeee0fe77"
 dependencies = [
  "bytemuck",
  "epaint",
@@ -1395,27 +1395,27 @@ dependencies = [
 
 [[package]]
 name = "egui-winit"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a49155fd4a0a4fb21224407a91de0030847972ef90fc64edb63621caea61cb2"
+checksum = "c15479a96d9fadccf5dac690bdc6373b97b8e1c0dd28367058f25a5298da0195"
 dependencies = [
  "accesskit_winit",
  "arboard",
  "egui",
- "instant",
  "log",
  "raw-window-handle",
  "serde",
  "smithay-clipboard",
+ "web-time",
  "webbrowser",
  "winit",
 ]
 
 [[package]]
 name = "egui_dock"
-version = "0.6.3"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ec07302c1a474f37fe6ef2c6672427880025edc37ac33955e6ea4a11bc6972a"
+checksum = "a52f67bcab0eb6050cf8051c614966c1c57129fab23dbeae9c157214779053c7"
 dependencies = [
  "duplicate",
  "egui",
@@ -1424,33 +1424,21 @@ dependencies = [
 
 [[package]]
 name = "egui_extras"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9278f4337b526f0d57e5375e5a7340a311fa6ee8f9fcc75721ac50af13face02"
+checksum = "68ffe3fe5c00295f91c2a61a74ee271c32f74049c94ba0b1cea8f26eb478bc07"
 dependencies = [
  "egui",
+ "enum-map",
  "image 0.24.7",
+ "log",
+ "mime_guess",
  "resvg",
  "serde",
  "tiny-skia",
  "usvg",
 ]
 
-[[package]]
-name = "egui_glow"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f8c2752cdf1b0ef5fcda59a898cacabad974d4f5880e92a420b2c917022da64"
-dependencies = [
- "bytemuck",
- "egui",
- "glow",
- "log",
- "memoffset 0.6.5",
- "wasm-bindgen",
- "web-sys",
-]
-
 [[package]]
 name = "either"
 version = "1.9.0"
@@ -1459,9 +1447,9 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
 
 [[package]]
 name = "emath"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3857d743a6e0741cdd60b622a74c7a36ea75f5f8f11b793b41d905d2c9721a4b"
+checksum = "1ef2b29de53074e575c18b694167ccbe6e5191f7b25fe65175a0d905a32eeec0"
 dependencies = [
  "bytemuck",
  "serde",
@@ -1485,14 +1473,35 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.39",
+]
+
+[[package]]
+name = "enum-map"
+version = "2.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09e6b4f374c071b18172e23134e01026653dc980636ee139e0dfe59c538c61e5"
+dependencies = [
+ "enum-map-derive",
+ "serde",
+]
+
+[[package]]
+name = "enum-map-derive"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfdb3d73d1beaf47c8593a1364e577fde072677cbfd103600345c0f547408cc0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "enumflags2"
-version = "0.7.7"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c041f5090df68b32bcd905365fd51769c8b9d553fe87fde0b683534f10c01bd2"
+checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939"
 dependencies = [
  "enumflags2_derive",
  "serde",
@@ -1500,35 +1509,34 @@ dependencies = [
 
 [[package]]
 name = "enumflags2_derive"
-version = "0.7.7"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745"
+checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "enumn"
-version = "0.1.11"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b893c4eb2dc092c811165f84dc7447fae16fb66521717968c34c509b39b1a5c5"
+checksum = "c2ad8cef1d801a4686bfd8919f0b30eac4c8e48968c437a6405ded4fb5272d2b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "epaint"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09333964d4d57f40a85338ba3ca5ed4716070ab184dcfed966b35491c5c64f3b"
+checksum = "58067b840d009143934d91d8dcb8ded054d8301d7c11a517ace0a99bb1e1595e"
 dependencies = [
  "ab_glyph",
- "ahash 0.8.3",
- "atomic_refcell",
+ "ahash 0.8.6",
  "bytemuck",
  "ecolor",
  "emath",
@@ -1546,25 +1554,14 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.2"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f"
+checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8"
 dependencies = [
- "errno-dragonfly",
  "libc",
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
-dependencies = [
- "cc",
- "libc",
-]
-
 [[package]]
 name = "error-code"
 version = "2.3.1"
@@ -1581,11 +1578,32 @@ version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
+[[package]]
+name = "event-listener"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener-strategy"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d96b852f1345da36d551b9473fa1e2b1eb5c5195585c6c018118bc92a8d91160"
+dependencies = [
+ "event-listener 3.1.0",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "exr"
-version = "1.7.0"
+version = "1.71.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1e481eb11a482815d3e9d618db8c42a93207134662873809335a92327440c18"
+checksum = "832a761f35ab3e6664babfbdc6cef35a4860e816ec3916dcfd0882954e98a8a8"
 dependencies = [
  "bit_field",
  "flume",
@@ -1597,16 +1615,6 @@ dependencies = [
  "zune-inflate",
 ]
 
-[[package]]
-name = "eyre"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb"
-dependencies = [
- "indenter",
- "once_cell",
-]
-
 [[package]]
 name = "fancy-regex"
 version = "0.11.0"
@@ -1618,25 +1626,37 @@ dependencies = [
 ]
 
 [[package]]
-name = "fastrand"
-version = "1.9.0"
+name = "fancy_constructor"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
+checksum = "f71f317e4af73b2f8f608fac190c52eac4b1879d2145df1db2fe48881ca69435"
 dependencies = [
- "instant",
+ "macroific",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "fastrand"
-version = "2.0.0"
+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"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764"
+checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
 
 [[package]]
 name = "fdeflate"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10"
+checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868"
 dependencies = [
  "simd-adler32",
 ]
@@ -1651,18 +1671,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "filetime"
-version = "0.2.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall 0.3.5",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "finl_unicode"
 version = "1.2.0"
@@ -1677,9 +1685,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flate2"
-version = "1.0.27"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
+checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
 dependencies = [
  "crc32fast",
  "miniz_oxide 0.7.1",
@@ -1693,14 +1701,13 @@ checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4"
 
 [[package]]
 name = "flume"
-version = "0.10.14"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577"
+checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181"
 dependencies = [
  "futures-core",
  "futures-sink",
  "nanorand",
- "pin-project",
  "spin",
 ]
 
@@ -1716,7 +1723,28 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
 dependencies = [
- "foreign-types-shared",
+ "foreign-types-shared 0.1.1",
+]
+
+[[package]]
+name = "foreign-types"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
+dependencies = [
+ "foreign-types-macros",
+ "foreign-types-shared 0.3.1",
+]
+
+[[package]]
+name = "foreign-types-macros"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -1725,6 +1753,12 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
+[[package]]
+name = "foreign-types-shared"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
+
 [[package]]
 name = "form_urlencoded"
 version = "1.2.0"
@@ -1734,20 +1768,11 @@ dependencies = [
  "percent-encoding",
 ]
 
-[[package]]
-name = "fsevent-sys"
-version = "4.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "futures"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
+checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1760,9 +1785,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
+checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -1770,15 +1795,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
+checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
+checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -1787,9 +1812,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
+checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa"
 
 [[package]]
 name = "futures-lite"
@@ -1806,34 +1831,48 @@ dependencies = [
  "waker-fn",
 ]
 
+[[package]]
+name = "futures-lite"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3831c2651acb5177cbd83943f3d9c8912c5ad03c76afcc0e9511ba568ec5ebb"
+dependencies = [
+ "fastrand 2.0.1",
+ "futures-core",
+ "futures-io",
+ "memchr",
+ "parking",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "futures-macro"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
+checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
+checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817"
 
 [[package]]
 name = "futures-task"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
+checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2"
 
 [[package]]
 name = "futures-util"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
+checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1877,6 +1916,19 @@ dependencies = [
  "system-deps",
 ]
 
+[[package]]
+name = "generator"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e"
+dependencies = [
+ "cc",
+ "libc",
+ "log",
+ "rustversion",
+ "windows 0.48.0",
+]
+
 [[package]]
 name = "generic-array"
 version = "0.14.7"
@@ -1899,9 +1951,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.10"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
+checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -1941,42 +1993,29 @@ dependencies = [
 
 [[package]]
 name = "git-version"
-version = "0.3.5"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6b0decc02f4636b9ccad390dcbe77b722a77efedfa393caf8379a51d5c61899"
+checksum = "13ad01ffa8221f7fe8b936d6ffb2a3e7ad428885a04fad51866a5f33eafda57c"
 dependencies = [
  "git-version-macro",
- "proc-macro-hack",
 ]
 
 [[package]]
 name = "git-version-macro"
-version = "0.3.5"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe69f1cbdb6e28af2bac214e943b99ce8a0a06b447d15d3e61161b0423139f3f"
+checksum = "84488ccbdb24ad6f56dc1863b4a8154a7856cd3c6c7610401634fab3cb588dae"
 dependencies = [
- "proc-macro-hack",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
-]
-
-[[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",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "glam"
-version = "0.24.1"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42218cb640844e3872cc3c153dc975229e080a6c4733b34709ef445610550226"
+checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945"
 dependencies = [
  "bytemuck",
 ]
@@ -2009,70 +2048,6 @@ dependencies = [
  "web-sys",
 ]
 
-[[package]]
-name = "glutin"
-version = "0.30.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc93b03242719b8ad39fb26ed2b01737144ce7bd4bfc7adadcef806596760fe"
-dependencies = [
- "bitflags 1.3.2",
- "cfg_aliases",
- "cgl",
- "core-foundation",
- "dispatch",
- "glutin_egl_sys",
- "glutin_glx_sys",
- "glutin_wgl_sys",
- "libloading 0.7.4",
- "objc2",
- "once_cell",
- "raw-window-handle",
- "wayland-sys 0.30.1",
- "windows-sys 0.45.0",
- "x11-dl",
-]
-
-[[package]]
-name = "glutin-winit"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "629a873fc04062830bfe8f97c03773bcd7b371e23bcc465d0a61448cd1588fa4"
-dependencies = [
- "cfg_aliases",
- "glutin",
- "raw-window-handle",
- "winit",
-]
-
-[[package]]
-name = "glutin_egl_sys"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af784eb26c5a68ec85391268e074f0aa618c096eadb5d6330b0911cf34fe57c5"
-dependencies = [
- "gl_generator",
- "windows-sys 0.45.0",
-]
-
-[[package]]
-name = "glutin_glx_sys"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b53cb5fe568964aa066a3ba91eac5ecbac869fb0842cd0dc9e412434f1a1494"
-dependencies = [
- "gl_generator",
- "x11-dl",
-]
-
-[[package]]
-name = "glutin_wgl_sys"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef89398e90033fc6bc65e9bd42fd29bbbfd483bda5b56dc5562f455550618165"
-dependencies = [
- "gl_generator",
-]
-
 [[package]]
 name = "gobject-sys"
 version = "0.18.0"
@@ -2086,21 +2061,21 @@ dependencies = [
 
 [[package]]
 name = "gpu-alloc"
-version = "0.5.4"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22beaafc29b38204457ea030f6fb7a84c9e4dd1b86e311ba0542533453d87f62"
+checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.1",
  "gpu-alloc-types",
 ]
 
 [[package]]
 name = "gpu-alloc-types"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5"
+checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.1",
 ]
 
 [[package]]
@@ -2118,22 +2093,22 @@ dependencies = [
 
 [[package]]
 name = "gpu-descriptor"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b0c02e1ba0bdb14e965058ca34e09c020f8e507a760df1121728e0aef68d57a"
+checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.1",
  "gpu-descriptor-types",
- "hashbrown 0.12.3",
+ "hashbrown 0.14.2",
 ]
 
 [[package]]
 name = "gpu-descriptor-types"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "363e3677e55ad168fef68cf9de3a4a310b53124c5e784c53a1d70e92d23f2126"
+checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.1",
 ]
 
 [[package]]
@@ -2156,9 +2131,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.21"
+version = "0.3.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833"
+checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178"
 dependencies = [
  "bytes",
  "fnv",
@@ -2166,7 +2141,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http",
- "indexmap 1.9.3",
+ "indexmap 2.1.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -2188,20 +2163,18 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 dependencies = [
- "ahash 0.7.6",
+ "ahash 0.7.7",
 ]
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
-
-[[package]]
-name = "hashbrown"
-version = "0.14.0"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+dependencies = [
+ "ahash 0.8.6",
+ "allocator-api2",
+]
 
 [[package]]
 name = "hassle-rs"
@@ -2226,9 +2199,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
+checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
 
 [[package]]
 name = "hex"
@@ -2253,15 +2226,15 @@ dependencies = [
 
 [[package]]
 name = "hound"
-version = "3.5.0"
+version = "3.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d13cdbd5dbb29f9c88095bbdc2590c9cba0d0a1269b983fef6b2cdd7e9f4db1"
+checksum = "62adaabb884c94955b19907d60019f4e145d091c75345379e70d1ee696f7854f"
 
 [[package]]
 name = "http"
-version = "0.2.9"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
+checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb"
 dependencies = [
  "bytes",
  "fnv",
@@ -2317,7 +2290,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.4.9",
+ "socket2 0.4.10",
  "tokio",
  "tower-service",
  "tracing",
@@ -2390,19 +2363,16 @@ version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df19da1e92fbfec043ca97d622955381b1f3ee72a180ec999912df31b1ccd951"
 
-[[package]]
-name = "indenter"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
-
 [[package]]
 name = "indexed_db_futures"
-version = "0.3.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfbcff6ae46750b15cc594bfd277b188cbddcfdc1817848f97f03f26f8625b9e"
+checksum = "6cc2083760572ee02385ab8b7c02c20925d2dd1f97a1a25a8737a238608f1152"
 dependencies = [
+ "accessory",
  "cfg-if",
+ "delegate-display",
+ "fancy_constructor",
  "js-sys",
  "uuid",
  "wasm-bindgen",
@@ -2422,35 +2392,15 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
+checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.0",
+ "hashbrown 0.14.2",
  "serde",
 ]
 
-[[package]]
-name = "inotify"
-version = "0.9.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff"
-dependencies = [
- "bitflags 1.3.2",
- "inotify-sys",
- "libc",
-]
-
-[[package]]
-name = "inotify-sys"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "instant"
 version = "0.1.12"
@@ -2485,9 +2435,9 @@ dependencies = [
 
 [[package]]
 name = "ipnet"
-version = "2.8.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6"
+checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
 
 [[package]]
 name = "itertools"
@@ -2556,9 +2506,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
 
 [[package]]
 name = "jobserver"
-version = "0.1.26"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2"
+checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d"
 dependencies = [
  "libc",
 ]
@@ -2574,9 +2524,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.64"
+version = "0.3.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
+checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -2592,32 +2542,6 @@ dependencies = [
  "pkg-config",
 ]
 
-[[package]]
-name = "khronos_api"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
-
-[[package]]
-name = "kqueue"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c"
-dependencies = [
- "kqueue-sys",
- "libc",
-]
-
-[[package]]
-name = "kqueue-sys"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b"
-dependencies = [
- "bitflags 1.3.2",
- "libc",
-]
-
 [[package]]
 name = "kurbo"
 version = "0.8.3"
@@ -2664,9 +2588,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.147"
+version = "0.2.150"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
+checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
 
 [[package]]
 name = "libloading"
@@ -2680,9 +2604,9 @@ dependencies = [
 
 [[package]]
 name = "libloading"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb"
+checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161"
 dependencies = [
  "cfg-if",
  "windows-sys 0.48.0",
@@ -2690,9 +2614,31 @@ dependencies = [
 
 [[package]]
 name = "libm"
-version = "0.2.7"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
+
+[[package]]
+name = "libredox"
+version = "0.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8"
+dependencies = [
+ "bitflags 2.4.1",
+ "libc",
+ "redox_syscall 0.4.1",
+]
+
+[[package]]
+name = "libredox"
+version = "0.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4"
+checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607"
+dependencies = [
+ "bitflags 2.4.1",
+ "libc",
+ "redox_syscall 0.4.1",
+]
 
 [[package]]
 name = "line-wrap"
@@ -2717,9 +2663,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.5"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503"
+checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829"
 
 [[package]]
 name = "litrs"
@@ -2729,9 +2675,9 @@ checksum = "f9275e0933cf8bb20f008924c0cb07a0692fe54d8064996520bf998de9eb79aa"
 
 [[package]]
 name = "lock_api"
-version = "0.4.10"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
+checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -2743,6 +2689,20 @@ version = "0.4.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
 
+[[package]]
+name = "loom"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5"
+dependencies = [
+ "cfg-if",
+ "generator",
+ "pin-utils",
+ "scoped-tls",
+ "tracing",
+ "tracing-subscriber",
+]
+
 [[package]]
 name = "lru"
 version = "0.7.8"
@@ -2756,81 +2716,273 @@ dependencies = [
 name = "luminol"
 version = "0.4.0"
 dependencies = [
- "alox-48",
- "atomic_refcell",
- "bitflags 2.4.0",
- "bytemuck",
  "camino",
- "catppuccin-egui",
- "cfg-if",
- "color-eyre",
- "command-lib",
- "console_error_panic_hook",
- "const_format",
+ "color-backtrace",
  "crc",
- "crossbeam",
- "dashmap",
  "eframe",
  "egui",
- "egui-notify",
- "egui_dock",
  "egui_extras",
- "enum-as-inner",
- "eyre",
- "futures",
- "git-version",
- "glam",
+ "epaint",
+ "flume",
  "image 0.24.7",
- "indexed_db_futures",
- "itertools",
  "js-sys",
+ "luminol-app",
+ "luminol-audio",
+ "luminol-config",
+ "luminol-core",
+ "luminol-data",
+ "luminol-filesystem",
+ "luminol-graphics",
  "luminol-term",
- "notify",
- "num_enum 0.7.0",
+ "luminol-ui",
+ "luminol-web",
  "once_cell",
- "ouroboros",
  "parking_lot",
- "paste",
  "poll-promise",
- "rand",
- "reqwest",
  "rfd",
- "rmxp-types",
- "rodio",
- "ron",
- "rust-ini",
- "rustysynth",
- "serde",
- "slab",
- "static_assertions",
  "steamworks",
  "strum",
- "syntect",
- "thiserror",
  "tokio",
  "tracing",
- "tracing-log",
+ "tracing-log 0.1.4",
  "tracing-subscriber",
  "tracing-wasm",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "windows 0.51.1",
- "winreg 0.51.0",
  "winres",
- "zip",
 ]
 
 [[package]]
-name = "luminol-term"
-version = "0.1.0"
+name = "luminol-app"
+version = "0.4.0"
 dependencies = [
- "crossbeam-channel",
  "eframe",
  "egui",
- "portable-pty",
- "termwiz",
- "wezterm-term",
+]
+
+[[package]]
+name = "luminol-audio"
+version = "0.4.0"
+dependencies = [
+ "camino",
+ "flume",
+ "luminol-filesystem",
+ "once_cell",
+ "oneshot",
+ "parking_lot",
+ "poll-promise",
+ "rodio",
+ "rustysynth",
+ "slab",
+ "strum",
+ "thiserror",
+ "web-sys",
+]
+
+[[package]]
+name = "luminol-components"
+version = "0.4.0"
+dependencies = [
+ "anyhow",
+ "egui",
+ "egui-wgpu",
+ "glam",
+ "itertools",
+ "luminol-audio",
+ "luminol-config",
+ "luminol-core",
+ "luminol-data",
+ "luminol-filesystem",
+ "luminol-graphics",
+ "once_cell",
+ "parking_lot",
+ "serde",
+ "slab",
+ "strum",
+ "syntect",
+ "wgpu",
+]
+
+[[package]]
+name = "luminol-config"
+version = "0.4.0"
+dependencies = [
+ "luminol-data",
+ "once_cell",
+ "ron",
+ "rust-ini",
+ "serde",
+ "strum",
+]
+
+[[package]]
+name = "luminol-core"
+version = "0.4.0"
+dependencies = [
+ "alox-48",
+ "anyhow",
+ "bitflags 2.4.1",
+ "camino",
+ "egui",
+ "egui-notify",
+ "egui_dock",
+ "getrandom",
+ "luminol-audio",
+ "luminol-config",
+ "luminol-data",
+ "luminol-filesystem",
+ "luminol-graphics",
+ "parking_lot",
+ "rand",
+ "serde",
+ "strum",
+]
+
+[[package]]
+name = "luminol-data"
+version = "0.4.0"
+dependencies = [
+ "alox-48",
+ "bytemuck",
+ "camino",
+ "flate2",
+ "getrandom",
+ "num-derive 0.4.1",
+ "num_enum 0.7.1",
+ "paste",
+ "rand",
+ "serde",
+ "slab",
+ "strum",
+]
+
+[[package]]
+name = "luminol-filesystem"
+version = "0.4.0"
+dependencies = [
+ "bitflags 2.4.1",
+ "camino",
+ "dashmap",
+ "egui",
+ "flume",
+ "indexed_db_futures",
+ "itertools",
+ "js-sys",
+ "luminol-config",
+ "luminol-web",
+ "once_cell",
+ "oneshot",
+ "parking_lot",
+ "rand",
+ "rfd",
+ "ron",
+ "rust-ini",
+ "serde",
+ "slab",
+ "thiserror",
+ "tracing",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "winreg 0.51.0",
+]
+
+[[package]]
+name = "luminol-graphics"
+version = "0.4.0"
+dependencies = [
+ "anyhow",
+ "bytemuck",
+ "camino",
+ "crossbeam",
+ "dashmap",
+ "egui",
+ "egui-wgpu",
+ "egui_extras",
+ "glam",
+ "image 0.24.7",
+ "itertools",
+ "luminol-data",
+ "luminol-filesystem",
+ "naga",
+ "naga_oil",
+ "once_cell",
+ "slab",
+ "wgpu",
+]
+
+[[package]]
+name = "luminol-macros"
+version = "0.4.0"
+
+[[package]]
+name = "luminol-modals"
+version = "0.4.0"
+dependencies = [
+ "camino",
+ "egui",
+ "luminol-components",
+ "luminol-core",
+ "luminol-data",
+]
+
+[[package]]
+name = "luminol-term"
+version = "0.4.0"
+dependencies = [
+ "crossbeam-channel",
+ "egui",
+ "portable-pty",
+ "termwiz",
+ "wezterm-term",
+]
+
+[[package]]
+name = "luminol-ui"
+version = "0.4.0"
+dependencies = [
+ "anyhow",
+ "catppuccin-egui",
+ "egui",
+ "egui_extras",
+ "futures",
+ "git-version",
+ "itertools",
+ "luminol-audio",
+ "luminol-components",
+ "luminol-config",
+ "luminol-core",
+ "luminol-data",
+ "luminol-filesystem",
+ "luminol-graphics",
+ "luminol-modals",
+ "luminol-term",
+ "poll-promise",
+ "reqwest",
+ "strum",
+ "zip",
+]
+
+[[package]]
+name = "luminol-web"
+version = "0.4.0"
+dependencies = [
+ "eframe",
+ "egui",
+ "egui-wgpu",
+ "flume",
+ "js-sys",
+ "luminol-app",
+ "once_cell",
+ "oneshot",
+ "portable-atomic",
+ "ron",
+ "tracing",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "wgpu",
 ]
 
 [[package]]
@@ -2852,6 +3004,53 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "macroific"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f05c00ac596022625d01047c421a0d97d7f09a18e429187b341c201cb631b9dd"
+dependencies = [
+ "macroific_attr_parse",
+ "macroific_core",
+ "macroific_macro",
+]
+
+[[package]]
+name = "macroific_attr_parse"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd94d5da95b30ae6e10621ad02340909346ad91661f3f8c0f2b62345e46a2f67"
+dependencies = [
+ "cfg-if",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.39",
+]
+
+[[package]]
+name = "macroific_core"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13198c120864097a565ccb3ff947672d969932b7975ebd4085732c9f09435e55"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.39",
+]
+
+[[package]]
+name = "macroific_macro"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0c9853143cbed7f1e41dc39fee95f9b361bec65c8dc2a01bf609be01b61f5ae"
+dependencies = [
+ "macroific_attr_parse",
+ "macroific_core",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.39",
+]
+
 [[package]]
 name = "malloc_buf"
 version = "0.0.6"
@@ -2861,11 +3060,20 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "matchers"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+dependencies = [
+ "regex-automata 0.1.10",
+]
+
 [[package]]
 name = "memchr"
-version = "2.5.0"
+version = "2.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
 
 [[package]]
 name = "memmap2"
@@ -2911,16 +3119,17 @@ dependencies = [
 
 [[package]]
 name = "metal"
-version = "0.24.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060"
+checksum = "623b5e6cefd76e58f774bd3cc0c6f5c7615c58c03a97815245a25c3c9bdee318"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.1",
  "block",
  "core-graphics-types",
- "foreign-types",
+ "foreign-types 0.5.0",
  "log",
  "objc",
+ "paste",
 ]
 
 [[package]]
@@ -2943,7 +3152,7 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -2952,6 +3161,16 @@ version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
+[[package]]
+name = "mime_guess"
+version = "2.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"
+dependencies = [
+ "mime",
+ "unicase",
+]
+
 [[package]]
 name = "minimal-lexical"
 version = "0.2.1"
@@ -2980,9 +3199,9 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.8"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
+checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"
 dependencies = [
  "libc",
  "log",
@@ -2992,17 +3211,18 @@ dependencies = [
 
 [[package]]
 name = "naga"
-version = "0.12.3"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbcc2e0513220fd2b598e6068608d4462db20322c0e77e47f6f488dfcfc279cb"
+checksum = "c1ceaaa4eedaece7e4ec08c55c640ba03dbb73fb812a6570a59bcf1930d0f70e"
 dependencies = [
  "bit-set",
- "bitflags 1.3.2",
+ "bitflags 2.4.1",
  "codespan-reporting",
  "hexf-parse",
  "indexmap 1.9.3",
  "log",
  "num-traits",
+ "pp-rs",
  "rustc-hash",
  "spirv",
  "termcolor",
@@ -3010,6 +3230,26 @@ dependencies = [
  "unicode-xid",
 ]
 
+[[package]]
+name = "naga_oil"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ac54c77b3529887f9668d3dd81e955e58f252b31a333f836e3548c06460b958"
+dependencies = [
+ "bit-set",
+ "codespan-reporting",
+ "data-encoding",
+ "indexmap 1.9.3",
+ "naga",
+ "once_cell",
+ "regex",
+ "regex-syntax 0.7.5",
+ "rustc-hash",
+ "thiserror",
+ "tracing",
+ "unicode-ident",
+]
+
 [[package]]
 name = "nanorand"
 version = "0.7.0"
@@ -3107,15 +3347,14 @@ dependencies = [
 
 [[package]]
 name = "nix"
-version = "0.26.2"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"
+checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
 dependencies = [
  "bitflags 1.3.2",
  "cfg-if",
  "libc",
  "memoffset 0.7.1",
- "static_assertions",
 ]
 
 [[package]]
@@ -3134,25 +3373,6 @@ dependencies = [
  "minimal-lexical",
 ]
 
-[[package]]
-name = "notify"
-version = "6.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d"
-dependencies = [
- "bitflags 2.4.0",
- "crossbeam-channel",
- "filetime",
- "fsevent-sys",
- "inotify",
- "kqueue",
- "libc",
- "log",
- "mio",
- "walkdir",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "nu-ansi-term"
 version = "0.46.0"
@@ -3174,6 +3394,17 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "num-derive"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfb77679af88f8b125209d354a202862602672222e7f2313fdd6dc349bad4712"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.39",
+]
+
 [[package]]
 name = "num-integer"
 version = "0.1.45"
@@ -3197,9 +3428,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
+checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
 dependencies = [
  "autocfg",
 ]
@@ -3234,11 +3465,11 @@ dependencies = [
 
 [[package]]
 name = "num_enum"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70bf6736f74634d299d00086f02986875b3c2d924781a6a2cb6c201e73da0ceb"
+checksum = "683751d591e6d81200c39fb0d1032608b77724f34114db54f571ff1317b337c0"
 dependencies = [
- "num_enum_derive 0.7.0",
+ "num_enum_derive 0.7.1",
 ]
 
 [[package]]
@@ -3247,7 +3478,7 @@ version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
 dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 1.3.1",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
@@ -3259,22 +3490,22 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6"
 dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 1.3.1",
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "num_enum_derive"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56ea360eafe1022f7cc56cd7b869ed57330fb2453d0c7831d99b74c65d2f5597"
+checksum = "6c11e44798ad209ccdd91fc192f0526a369a01234f7373e1b141c96d7cee4f0e"
 dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 2.0.0",
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -3344,9 +3575,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.32.0"
+version = "0.32.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe"
+checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
 dependencies = [
  "memchr",
 ]
@@ -3360,7 +3591,7 @@ dependencies = [
  "jni 0.20.0",
  "ndk",
  "ndk-context",
- "num-derive",
+ "num-derive 0.3.3",
  "num-traits",
  "oboe-sys",
 ]
@@ -3389,6 +3620,15 @@ version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
 
+[[package]]
+name = "oneshot"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f6640c6bda7731b1fdbab747981a0f896dd1fedaf9f4a53fa237a04a84431f4"
+dependencies = [
+ "loom",
+]
+
 [[package]]
 name = "opaque-debug"
 version = "0.3.0"
@@ -3397,13 +3637,13 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
 name = "openssl"
-version = "0.10.57"
+version = "0.10.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c"
+checksum = "7a257ad03cd8fb16ad4172fedf8094451e1af1c4b70097636ef2eac9a5f0cc33"
 dependencies = [
- "bitflags 2.4.0",
+ "bitflags 2.4.1",
  "cfg-if",
- "foreign-types",
+ "foreign-types 0.3.2",
  "libc",
  "once_cell",
  "openssl-macros",
@@ -3418,7 +3658,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -3429,9 +3669,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.93"
+version = "0.9.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d"
+checksum = "40a4130519a360279579c2053038317e40eff64d13fd3f004f9e1b72b8a6aaf9"
 dependencies = [
  "cc",
  "libc",
@@ -3441,30 +3681,30 @@ dependencies = [
 
 [[package]]
 name = "orbclient"
-version = "0.3.46"
+version = "0.3.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8378ac0dfbd4e7895f2d2c1f1345cab3836910baf3a300b000d04250f0c8428f"
+checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166"
 dependencies = [
- "redox_syscall 0.3.5",
+ "libredox 0.0.2",
 ]
 
 [[package]]
 name = "ordered-float"
-version = "3.9.1"
+version = "3.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a54938017eacd63036332b4ae5c8a49fc8c0c1d6d629893057e4f13609edd06"
+checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc"
 dependencies = [
  "num-traits",
 ]
 
 [[package]]
 name = "ordered-multimap"
-version = "0.6.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ed8acf08e98e744e5384c8bc63ceb0364e68a6854187221c18df61c4797690e"
+checksum = "a4d6a8c22fc714f0c2373e6091bf6f5e9b37b1bc0b1184874b7e0a4e303d318f"
 dependencies = [
  "dlv-list",
- "hashbrown 0.13.2",
+ "hashbrown 0.14.2",
 ]
 
 [[package]]
@@ -3477,31 +3717,6 @@ dependencies = [
  "pin-project-lite",
 ]
 
-[[package]]
-name = "ouroboros"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c86de06555b970aec45229b27291b53154f21a5743a163419f4e4c0b065dcde"
-dependencies = [
- "aliasable",
- "ouroboros_macro",
- "static_assertions",
-]
-
-[[package]]
-name = "ouroboros_macro"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cad0c4b129e9696e37cb712b243777b90ef489a0bfaa0ac34e7d9b860e4f134"
-dependencies = [
- "heck",
- "itertools",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn 2.0.29",
-]
-
 [[package]]
 name = "overload"
 version = "0.1.1"
@@ -3510,19 +3725,13 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
 [[package]]
 name = "owned_ttf_parser"
-version = "0.19.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "706de7e2214113d63a8238d1910463cfce781129a6f263d13fdb09ff64355ba4"
+checksum = "d4586edfe4c648c71797a74c84bacb32b52b212eff5dfe2bb9f2c599844023e7"
 dependencies = [
  "ttf-parser",
 ]
 
-[[package]]
-name = "owo-colors"
-version = "3.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
-
 [[package]]
 name = "pango-sys"
 version = "0.18.0"
@@ -3537,9 +3746,9 @@ dependencies = [
 
 [[package]]
 name = "parking"
-version = "2.1.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e"
+checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
 
 [[package]]
 name = "parking_lot"
@@ -3553,15 +3762,15 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.8"
+version = "0.9.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
+checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
 dependencies = [
  "backtrace",
  "cfg-if",
  "libc",
  "petgraph",
- "redox_syscall 0.3.5",
+ "redox_syscall 0.4.1",
  "smallvec",
  "thread-id",
  "windows-targets 0.48.5",
@@ -3587,19 +3796,20 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
 
 [[package]]
 name = "pest"
-version = "2.7.2"
+version = "2.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1acb4a4365a13f749a93f1a094a7805e5cfa0955373a9de860d962eaa3a5fe5a"
+checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5"
 dependencies = [
+ "memchr",
  "thiserror",
  "ucd-trie",
 ]
 
 [[package]]
 name = "pest_derive"
-version = "2.7.2"
+version = "2.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "666d00490d4ac815001da55838c500eafb0320019bbaa44444137c48b443a853"
+checksum = "81d78524685f5ef2a3b3bd1cafbc9fcabb036253d9b1463e726a91cd16e2dfc2"
 dependencies = [
  "pest",
  "pest_generator",
@@ -3607,26 +3817,26 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.7.2"
+version = "2.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68ca01446f50dbda87c1786af8770d535423fa8a53aec03b8f4e3d7eb10e0929"
+checksum = "68bd1206e71118b5356dae5ddc61c8b11e28b09ef6a31acbd15ea48a28e0c227"
 dependencies = [
  "pest",
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "pest_meta"
-version = "2.7.2"
+version = "2.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56af0a30af74d0445c0bf6d9d051c979b516a1a5af790d251daee76005420a48"
+checksum = "7c747191d4ad9e4a4ab9c8798f1e82a39affe7ef9648390b7e5548d18e099de6"
 dependencies = [
  "once_cell",
  "pest",
- "sha2 0.10.7",
+ "sha2 0.10.8",
 ]
 
 [[package]]
@@ -3636,7 +3846,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
 dependencies = [
  "fixedbitset",
- "indexmap 2.0.0",
+ "indexmap 2.1.0",
 ]
 
 [[package]]
@@ -3688,7 +3898,7 @@ dependencies = [
  "phf_shared 0.11.2",
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -3715,26 +3925,6 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
 
-[[package]]
-name = "pin-project"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.29",
-]
-
 [[package]]
 name = "pin-project-lite"
 version = "0.2.13"
@@ -3747,6 +3937,17 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
+[[package]]
+name = "piper"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4"
+dependencies = [
+ "atomic-waker",
+ "fastrand 2.0.1",
+ "futures-io",
+]
+
 [[package]]
 name = "pkg-config"
 version = "0.3.27"
@@ -3755,12 +3956,12 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
 
 [[package]]
 name = "plist"
-version = "1.5.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdc0001cfea3db57a2e24bc0d818e9e20e554b5f97fabb9bc231dc240269ae06"
+checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef"
 dependencies = [
- "base64 0.21.2",
- "indexmap 1.9.3",
+ "base64 0.21.5",
+ "indexmap 2.1.0",
  "line-wrap",
  "quick-xml",
  "serde",
@@ -3787,8 +3988,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f6a58fecbf9da8965bcdb20ce4fd29788d1acee68ddbb64f0ba1b81bccdb7df"
 dependencies = [
  "document-features",
- "smol",
  "static_assertions",
+ "tokio",
  "wasm-bindgen",
  "wasm-bindgen-futures",
 ]
@@ -3809,12 +4010,32 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "polling"
+version = "3.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e53b6af1f60f36f8c2ac2aad5459d75a5a9b4be1e8cdd40264f315d78193e531"
+dependencies = [
+ "cfg-if",
+ "concurrent-queue",
+ "pin-project-lite",
+ "rustix 0.38.25",
+ "tracing",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "pollster"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2"
 
+[[package]]
+name = "portable-atomic"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3bccab0e7fd7cc19f820a1c8c91720af652d0c88dc9664dd72aef2614f04af3b"
+
 [[package]]
 name = "portable-pty"
 version = "0.8.1"
@@ -3835,6 +4056,21 @@ dependencies = [
  "winreg 0.10.1",
 ]
 
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
+[[package]]
+name = "pp-rs"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb458bb7f6e250e6eb79d5026badc10a3ebb8f9a15d1fff0f13d17c71f4d6dee"
+dependencies = [
+ "unicode-xid",
+]
+
 [[package]]
 name = "ppv-lite86"
 version = "0.2.17"
@@ -3848,7 +4084,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
 dependencies = [
  "once_cell",
- "toml_edit",
+ "toml_edit 0.19.15",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8"
+dependencies = [
+ "toml_edit 0.20.7",
 ]
 
 [[package]]
@@ -3875,26 +4120,20 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "proc-macro-hack"
-version = "0.5.20+deprecated"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
-
 [[package]]
 name = "proc-macro2"
-version = "1.0.66"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
+checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "profiling"
-version = "1.0.9"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46b2164ebdb1dfeec5e337be164292351e11daf63a05174c6776b2f47460f0c9"
+checksum = "f89dff0959d98c9758c88826cc002e2c3d0b9dfac4139711d1f30de442f1139b"
 
 [[package]]
 name = "qoi"
@@ -3907,9 +4146,9 @@ dependencies = [
 
 [[package]]
 name = "quick-xml"
-version = "0.29.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81b9228215d82c7b61490fec1de287136b5de6f5700f6e58ea9ad61a7964ca51"
+checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33"
 dependencies = [
  "memchr",
 ]
@@ -3967,9 +4206,9 @@ checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9"
 
 [[package]]
 name = "rayon"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
+checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1"
 dependencies = [
  "either",
  "rayon-core",
@@ -3977,14 +4216,12 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
+checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed"
 dependencies = [
- "crossbeam-channel",
  "crossbeam-deque",
  "crossbeam-utils",
- "num_cpus",
 ]
 
 [[package]]
@@ -3995,61 +4232,82 @@ checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f"
 
 [[package]]
 name = "redox_syscall"
-version = "0.2.16"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
 dependencies = [
  "bitflags 1.3.2",
 ]
 
 [[package]]
 name = "redox_syscall"
-version = "0.3.5"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
 dependencies = [
  "bitflags 1.3.2",
 ]
 
 [[package]]
 name = "redox_users"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
+checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4"
 dependencies = [
  "getrandom",
- "redox_syscall 0.2.16",
+ "libredox 0.0.1",
  "thiserror",
 ]
 
 [[package]]
 name = "regex"
-version = "1.9.3"
+version = "1.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a"
+checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata",
- "regex-syntax",
+ "regex-automata 0.4.3",
+ "regex-syntax 0.8.2",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+dependencies = [
+ "regex-syntax 0.6.29",
 ]
 
 [[package]]
 name = "regex-automata"
-version = "0.3.6"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69"
+checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax",
+ "regex-syntax 0.8.2",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.7.4"
+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"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
 
 [[package]]
 name = "renderdoc-sys"
@@ -4063,7 +4321,7 @@ version = "0.11.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b"
 dependencies = [
- "base64 0.21.2",
+ "base64 0.21.5",
  "bytes",
  "encoding_rs",
  "futures-core",
@@ -4111,9 +4369,9 @@ dependencies = [
 
 [[package]]
 name = "rfd"
-version = "0.12.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "241a0deb168c88050d872294f7b3106c1dfa8740942bcc97bc91b98e97b5c501"
+checksum = "3c9e7b57df6e8472152674607f6cc68aa14a748a3157a857a94f516e11aeacc2"
 dependencies = [
  "block",
  "dispatch",
@@ -4134,36 +4392,18 @@ dependencies = [
 
 [[package]]
 name = "rgb"
-version = "0.8.36"
+version = "0.8.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59"
-dependencies = [
- "bytemuck",
-]
-
-[[package]]
-name = "rmxp-types"
-version = "0.1.0"
+checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8"
 dependencies = [
- "alox-48",
  "bytemuck",
- "camino",
- "flate2",
- "num-derive",
- "num-traits",
- "num_enum 0.6.1",
- "paste",
- "rand",
- "serde",
- "slab",
- "strum",
 ]
 
 [[package]]
 name = "rodio"
-version = "0.17.1"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdf1d4dea18dff2e9eb6dca123724f8b60ef44ad74a9ad283cdfe025df7e73fa"
+checksum = "3b1bb7b48ee48471f55da122c0044fcc7600cfcc85db88240b89cb832935e611"
 dependencies = [
  "claxon",
  "cpal",
@@ -4178,8 +4418,8 @@ version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94"
 dependencies = [
- "base64 0.21.2",
- "bitflags 2.4.0",
+ "base64 0.21.5",
+ "bitflags 2.4.1",
  "serde",
  "serde_derive",
 ]
@@ -4195,9 +4435,9 @@ dependencies = [
 
 [[package]]
 name = "rust-ini"
-version = "0.19.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e2a3bcec1f113553ef1c88aae6c020a369d03d55b58de9869a0908930385091"
+checksum = "3e0698206bcb8882bf2a9ecb4c1e7785db57ff052297085a6efd4fe42302068a"
 dependencies = [
  "cfg-if",
  "ordered-multimap",
@@ -4217,9 +4457,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
 name = "rustix"
-version = "0.37.23"
+version = "0.37.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06"
+checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2"
 dependencies = [
  "bitflags 1.3.2",
  "errno",
@@ -4231,14 +4471,14 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.8"
+version = "0.38.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f"
+checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e"
 dependencies = [
- "bitflags 2.4.0",
+ "bitflags 2.4.1",
  "errno",
  "libc",
- "linux-raw-sys 0.4.5",
+ "linux-raw-sys 0.4.11",
  "windows-sys 0.48.0",
 ]
 
@@ -4250,9 +4490,9 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
 
 [[package]]
 name = "rustysynth"
-version = "1.2.1"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b916492c4bdd1dba14c92761cc855f9ef12f3c7e4ef18cab07ee49e784c1c66b"
+checksum = "a2316fb90175e4f747331f29c9275aaddf2868b355472e94a3b82ad235a719b5"
 
 [[package]]
 name = "ryu"
@@ -4296,19 +4536,6 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
-[[package]]
-name = "sctk-adwaita"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cda4e97be1fd174ccc2aae81c8b694e803fa99b34e8fd0f057a9d70698e3ed09"
-dependencies = [
- "ab_glyph",
- "log",
- "memmap2",
- "smithay-client-toolkit",
- "tiny-skia",
-]
-
 [[package]]
 name = "security-framework"
 version = "2.9.2"
@@ -4317,7 +4544,7 @@ checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
 dependencies = [
  "bitflags 1.3.2",
  "core-foundation",
- "core-foundation-sys 0.8.4",
+ "core-foundation-sys",
  "libc",
  "security-framework-sys",
 ]
@@ -4328,7 +4555,7 @@ version = "2.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
 dependencies = [
- "core-foundation-sys 0.8.4",
+ "core-foundation-sys",
  "libc",
 ]
 
@@ -4352,29 +4579,29 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.187"
+version = "1.0.192"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30a7fe14252655bd1e578af19f5fa00fe02fd0013b100ca6b49fde31c41bae4c"
+checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.187"
+version = "1.0.192"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e46b2a6ca578b3f1d4501b12f78ed4692006d79d82a1a7c561c12dbc3d625eb8"
+checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.105"
+version = "1.0.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360"
+checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
 dependencies = [
  "itoa",
  "ryu",
@@ -4383,20 +4610,20 @@ dependencies = [
 
 [[package]]
 name = "serde_repr"
-version = "0.1.16"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00"
+checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.3"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186"
+checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80"
 dependencies = [
  "serde",
 ]
@@ -4457,9 +4684,9 @@ dependencies = [
 
 [[package]]
 name = "sha1"
-version = "0.10.5"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -4481,9 +4708,9 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.10.7"
+version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -4492,9 +4719,9 @@ dependencies = [
 
 [[package]]
 name = "sharded-slab"
-version = "0.1.4"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
 dependencies = [
  "lazy_static",
 ]
@@ -4531,16 +4758,6 @@ dependencies = [
  "signal-hook-registry",
 ]
 
-[[package]]
-name = "signal-hook"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
-dependencies = [
- "libc",
- "signal-hook-registry",
-]
-
 [[package]]
 name = "signal-hook-registry"
 version = "1.4.1"
@@ -4592,15 +4809,15 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.0"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "smithay-client-toolkit"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f307c47d32d2715eb2e0ece5589057820e0e5e70d07c247d1063e844e107f454"
+checksum = "870427e30b8f2cbe64bf43ec4b86e88fe39b0a84b3f15efd9c9c2d020bc86eb9"
 dependencies = [
  "bitflags 1.3.2",
  "calloop",
@@ -4625,28 +4842,11 @@ dependencies = [
  "wayland-client",
 ]
 
-[[package]]
-name = "smol"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13f2b548cd8447f8de0fdf1c592929f70f4fc7039a05e47404b0d096ec6987a1"
-dependencies = [
- "async-channel",
- "async-executor",
- "async-fs",
- "async-io",
- "async-lock",
- "async-net",
- "async-process",
- "blocking",
- "futures-lite",
-]
-
 [[package]]
 name = "socket2"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
+checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
 dependencies = [
  "libc",
  "winapi",
@@ -4654,9 +4854,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.4"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e"
+checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
 dependencies = [
  "libc",
  "windows-sys 0.48.0",
@@ -4737,15 +4937,15 @@ dependencies = [
 
 [[package]]
 name = "strum_macros"
-version = "0.25.2"
+version = "0.25.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad8d03b598d3d0fff69bf533ee3ef19b8eeb342729596df84bcc7e1f96ec4059"
+checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0"
 dependencies = [
  "heck",
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.29",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -4820,9 +5020,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.29"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4842,7 +5042,7 @@ dependencies = [
  "fnv",
  "once_cell",
  "plist",
- "regex-syntax",
+ "regex-syntax 0.7.5",
  "serde",
  "serde_json",
  "thiserror",
@@ -4867,47 +5067,47 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
 dependencies = [
- "core-foundation-sys 0.8.4",
+ "core-foundation-sys",
  "libc",
 ]
 
 [[package]]
 name = "system-deps"
-version = "6.1.1"
+version = "6.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3"
+checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331"
 dependencies = [
  "cfg-expr",
  "heck",
  "pkg-config",
- "toml 0.7.6",
+ "toml 0.8.8",
  "version-compare",
 ]
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.11"
+version = "0.12.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a"
+checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a"
 
 [[package]]
 name = "tempfile"
-version = "3.8.0"
+version = "3.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef"
+checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5"
 dependencies = [
  "cfg-if",
- "fastrand 2.0.0",
- "redox_syscall 0.3.5",
- "rustix 0.38.8",
+ "fastrand 2.0.1",
+ "redox_syscall 0.4.1",
+ "rustix 0.38.25",
  "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "termcolor"
-version = "1.2.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
+checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449"
 dependencies = [
  "winapi-util",
 ]
@@ -4949,7 +5149,7 @@ version = "0.22.0"
 source = "git+https://github.com/wez/wezterm?rev=3666303c7b26c6c966b3f136dbb954686d334cc3#3666303c7b26c6c966b3f136dbb954686d334cc3"
 dependencies = [
  "anyhow",
- "base64 0.21.2",
+ "base64 0.21.5",
  "bitflags 1.3.2",
  "filedescriptor",
  "finl_unicode",
@@ -4961,7 +5161,7 @@ dependencies = [
  "log",
  "memmem",
  "nix 0.24.3",
- "num-derive",
+ "num-derive 0.3.3",
  "num-traits",
  "ordered-float",
  "pest",
@@ -4970,7 +5170,7 @@ dependencies = [
  "regex",
  "semver",
  "sha2 0.9.9",
- "signal-hook 0.1.17",
+ "signal-hook",
  "siphasher",
  "tempfile",
  "terminfo",
@@ -4988,32 +5188,31 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.47"
+version = "1.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f"
+checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.47"
+version = "1.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b"
+checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "thread-id"
-version = "4.2.0"
+version = "4.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79474f573561cdc4871a0de34a51c92f7f5a56039113fbb5b9c9f96bdb756669"
+checksum = "f0ec81c46e9eb50deaa257be2f148adf052d1fb7701cfd55ccfab2525280b70b"
 dependencies = [
  "libc",
- "redox_syscall 0.2.16",
  "winapi",
 ]
 
@@ -5051,12 +5250,13 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.27"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bb39ee79a6d8de55f48f2293a830e040392f1c5f16e336bdd1788cd0aadce07"
+checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
 dependencies = [
  "deranged",
  "itoa",
+ "powerfmt",
  "serde",
  "time-core",
  "time-macros",
@@ -5064,15 +5264,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.13"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "733d258752e9303d392b94b75230d07b0b9c489350c69b851fc6c065fde3e8f9"
+checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
 dependencies = [
  "time-core",
 ]
@@ -5128,19 +5328,32 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.32.0"
+version = "1.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9"
+checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9"
 dependencies = [
  "backtrace",
  "bytes",
  "libc",
  "mio",
+ "num_cpus",
  "pin-project-lite",
- "socket2 0.5.4",
+ "socket2 0.5.5",
+ "tokio-macros",
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "tokio-macros"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.39",
+]
+
 [[package]]
 name = "tokio-native-tls"
 version = "0.3.1"
@@ -5153,9 +5366,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.9"
+version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d"
+checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
 dependencies = [
  "bytes",
  "futures-core",
@@ -5176,32 +5389,54 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.7.6"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542"
+checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit",
+ "toml_edit 0.21.0",
 ]
 
 [[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",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.19.14"
+version = "0.19.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+dependencies = [
+ "indexmap 2.1.0",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.20.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81"
+dependencies = [
+ "indexmap 2.1.0",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a"
+checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03"
 dependencies = [
- "indexmap 2.0.0",
+ "indexmap 2.1.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -5216,11 +5451,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
 
 [[package]]
 name = "tracing"
-version = "0.1.37"
+version = "0.1.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
 dependencies = [
- "cfg-if",
  "pin-project-lite",
  "tracing-attributes",
  "tracing-core",
@@ -5228,58 +5462,63 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.26"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.31"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
 dependencies = [
  "once_cell",
  "valuable",
 ]
 
 [[package]]
-name = "tracing-error"
-version = "0.2.0"
+name = "tracing-log"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e"
+checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2"
 dependencies = [
- "tracing",
- "tracing-subscriber",
+ "log",
+ "once_cell",
+ "tracing-core",
 ]
 
 [[package]]
 name = "tracing-log"
-version = "0.1.3"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
 dependencies = [
- "lazy_static",
  "log",
+ "once_cell",
  "tracing-core",
 ]
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.17"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
+checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
 dependencies = [
+ "matchers",
  "nu-ansi-term",
+ "once_cell",
+ "regex",
  "sharded-slab",
  "smallvec",
  "thread_local",
+ "tracing",
  "tracing-core",
- "tracing-log",
+ "tracing-log 0.2.0",
 ]
 
 [[package]]
@@ -5301,9 +5540,9 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
 
 [[package]]
 name = "ttf-parser"
-version = "0.19.1"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a464a4b34948a5f67fddd2b823c62d9d92e44be75058b99939eae6c5b6960b33"
+checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4"
 
 [[package]]
 name = "type-map"
@@ -5316,9 +5555,9 @@ dependencies = [
 
 [[package]]
 name = "typenum"
-version = "1.16.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
 name = "ucd-trie"
@@ -5336,6 +5575,15 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "unicase"
+version = "2.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
+dependencies = [
+ "version_check",
+]
+
 [[package]]
 name = "unicode-bidi"
 version = "0.3.13"
@@ -5344,9 +5592,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.11"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "unicode-normalization"
@@ -5365,9 +5613,9 @@ checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
+checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
 
 [[package]]
 name = "unicode-xid"
@@ -5377,9 +5625,9 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
 
 [[package]]
 name = "url"
-version = "2.4.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb"
+checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -5414,9 +5662,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
 [[package]]
 name = "uuid"
-version = "1.4.1"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"
+checksum = "c58fe91d841bc04822c9801002db4ea904b9e4b8e6bbad25127b46eff8dc516b"
 dependencies = [
  "atomic",
  "getrandom",
@@ -5463,15 +5711,15 @@ dependencies = [
 
 [[package]]
 name = "waker-fn"
-version = "1.1.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
+checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690"
 
 [[package]]
 name = "walkdir"
-version = "2.3.3"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
+checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
 dependencies = [
  "same-file",
  "winapi-util",
@@ -5494,9 +5742,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.87"
+version = "0.2.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
+checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -5504,24 +5752,24 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.87"
+version = "0.2.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
+checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.39",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.37"
+version = "0.4.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03"
+checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -5531,9 +5779,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.87"
+version = "0.2.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
+checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -5541,22 +5789,22 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.87"
+version = "0.2.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
+checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.39",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.87"
+version = "0.2.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
+checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b"
 
 [[package]]
 name = "wayland-client"
@@ -5571,7 +5819,7 @@ dependencies = [
  "scoped-tls",
  "wayland-commons",
  "wayland-scanner",
- "wayland-sys 0.29.5",
+ "wayland-sys",
 ]
 
 [[package]]
@@ -5583,7 +5831,7 @@ dependencies = [
  "nix 0.24.3",
  "once_cell",
  "smallvec",
- "wayland-sys 0.29.5",
+ "wayland-sys",
 ]
 
 [[package]]
@@ -5632,22 +5880,20 @@ dependencies = [
 ]
 
 [[package]]
-name = "wayland-sys"
-version = "0.30.1"
+name = "web-sys"
+version = "0.3.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96b2a02ac608e07132978689a6f9bf4214949c85998c247abadd4f4129b1aa06"
+checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85"
 dependencies = [
- "dlib",
- "lazy_static",
- "log",
- "pkg-config",
+ "js-sys",
+ "wasm-bindgen",
 ]
 
 [[package]]
-name = "web-sys"
-version = "0.3.64"
+name = "web-time"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
+checksum = "57099a701fb3a8043f993e8228dc24229c7b942e2b009a1b962e54489ba1d3bf"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -5655,9 +5901,9 @@ dependencies = [
 
 [[package]]
 name = "webbrowser"
-version = "0.8.11"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2c79b77f525a2d670cb40619d7d9c673d09e0666f72c591ebd7861f84a87e57"
+checksum = "82b2391658b02c27719fc5a0a73d6e696285138e8b12fba9d4baa70451023c71"
 dependencies = [
  "core-foundation",
  "home",
@@ -5760,9 +6006,9 @@ dependencies = [
 
 [[package]]
 name = "wgpu"
-version = "0.16.3"
+version = "0.17.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "480c965c9306872eb6255fa55e4b4953be55a8b64d57e61d7ff840d3dcc051cd"
+checksum = "752e44d3998ef35f71830dd1ad3da513e628e2e4d4aedb0ab580f850827a0b41"
 dependencies = [
  "arrayvec",
  "cfg-if",
@@ -5784,13 +6030,13 @@ dependencies = [
 
 [[package]]
 name = "wgpu-core"
-version = "0.16.1"
+version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f478237b4bf0d5b70a39898a66fa67ca3a007d79f2520485b8b0c3dfc46f8c2"
+checksum = "0f8a44dd301a30ceeed3c27d8c0090433d3da04d7b2a4042738095a424d12ae7"
 dependencies = [
  "arrayvec",
  "bit-vec",
- "bitflags 2.4.0",
+ "bitflags 2.4.1",
  "codespan-reporting",
  "log",
  "naga",
@@ -5807,19 +6053,18 @@ dependencies = [
 
 [[package]]
 name = "wgpu-hal"
-version = "0.16.2"
+version = "0.17.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ecb3258078e936deee14fd4e0febe1cfe9bbb5ffef165cb60218d2ee5eb4448"
+checksum = "9a80bf0e3c77399bb52850cb0830af9bad073d5cfcb9dd8253bef8125c42db17"
 dependencies = [
  "android_system_properties",
  "arrayvec",
  "ash",
  "bit-set",
- "bitflags 2.4.0",
+ "bitflags 2.4.1",
  "block",
  "core-graphics-types",
  "d3d12",
- "foreign-types",
  "glow",
  "gpu-alloc",
  "gpu-allocator",
@@ -5828,7 +6073,7 @@ dependencies = [
  "js-sys",
  "khronos-egl",
  "libc",
- "libloading 0.8.0",
+ "libloading 0.8.1",
  "log",
  "metal",
  "naga",
@@ -5849,11 +6094,11 @@ dependencies = [
 
 [[package]]
 name = "wgpu-types"
-version = "0.16.1"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0c153280bb108c2979eb5c7391cb18c56642dd3c072e55f52065e13e2a1252a"
+checksum = "ee64d7398d0c2f9ca48922c902ef69c42d000c759f3db41e355f4a570b052b67"
 dependencies = [
- "bitflags 2.4.0",
+ "bitflags 2.4.1",
  "js-sys",
  "web-sys",
 ]
@@ -5882,9 +6127,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
 dependencies = [
  "winapi",
 ]
@@ -5933,25 +6178,6 @@ dependencies = [
  "windows-targets 0.48.5",
 ]
 
-[[package]]
-name = "windows"
-version = "0.51.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9"
-dependencies = [
- "windows-core",
- "windows-targets 0.48.5",
-]
-
-[[package]]
-name = "windows-core"
-version = "0.51.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
-dependencies = [
- "windows-targets 0.48.5",
-]
-
 [[package]]
 name = "windows-implement"
 version = "0.48.0"
@@ -6108,9 +6334,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "winit"
-version = "0.28.6"
+version = "0.28.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "866db3f712fffba75d31bf0cdecf357c8aeafd158c5b7ab51dba2a2b2d47f196"
+checksum = "9596d90b45384f5281384ab204224876e8e8bf7d58366d9b795ad99aa9894b94"
 dependencies = [
  "android-activity",
  "bitflags 1.3.2",
@@ -6129,7 +6355,6 @@ dependencies = [
  "percent-encoding",
  "raw-window-handle",
  "redox_syscall 0.3.5",
- "sctk-adwaita",
  "smithay-client-toolkit",
  "wasm-bindgen",
  "wayland-client",
@@ -6143,9 +6368,9 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.5.15"
+version = "0.5.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc"
+checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b"
 dependencies = [
  "memchr",
 ]
@@ -6236,21 +6461,21 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd"
 dependencies = [
- "nix 0.26.2",
+ "nix 0.26.4",
  "winapi",
 ]
 
 [[package]]
 name = "xml-rs"
-version = "0.8.16"
+version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47430998a7b5d499ccee752b41567bc3afc57e1327dc855b1a2aa44ce29b5fa1"
+checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a"
 
 [[package]]
 name = "xmlparser"
-version = "0.13.5"
+version = "0.13.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd"
+checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4"
 
 [[package]]
 name = "yaml-rust"
@@ -6270,8 +6495,8 @@ dependencies = [
  "async-broadcast",
  "async-executor",
  "async-fs",
- "async-io",
- "async-lock",
+ "async-io 1.13.0",
+ "async-lock 2.8.0",
  "async-process",
  "async-recursion",
  "async-task",
@@ -6280,12 +6505,12 @@ dependencies = [
  "byteorder",
  "derivative",
  "enumflags2",
- "event-listener",
+ "event-listener 2.5.3",
  "futures-core",
  "futures-sink",
  "futures-util",
  "hex",
- "nix 0.26.2",
+ "nix 0.26.4",
  "once_cell",
  "ordered-stream",
  "rand",
@@ -6308,7 +6533,7 @@ version = "3.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d"
 dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 1.3.1",
  "proc-macro2",
  "quote",
  "regex",
@@ -6327,6 +6552,26 @@ dependencies = [
  "zvariant",
 ]
 
+[[package]]
+name = "zerocopy"
+version = "0.7.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.39",
+]
+
 [[package]]
 name = "zip"
 version = "0.6.6"
@@ -6368,7 +6613,7 @@ version = "3.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd"
 dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 1.3.1",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
diff --git a/Cargo.toml b/Cargo.toml
index 8baa5914..fcf8392a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,181 +1,193 @@
+# As much as I would like to move the luminol package into the crates folder, trunk won't let me :(
+# It wants a root package, and it has to be this
 [package]
 name = "luminol"
+description = "Luminol is a FOSS recreation of RPG Maker XP in Rust with love ❤️"
+build = "build.rs"
+
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+rust-version.workspace = true
+readme.workspace = true
+repository.workspace = true
+keywords.workspace = true
+categories.workspace = true
+
+# Setup various shared workspace values
+[workspace]
+members = ["crates/*"]
+resolver = "2"
+
+[workspace.package]
 version = "0.4.0"
 authors = [
     "Lily Lyons <lily@nowaffles.com>",
     "Egor Poleshko <somedevfox@gmail.com>",
 ]
 edition = "2021"
-rust-version = "1.62"
-description = "Luminol is a FOSS recreation of RPG Maker XP in Rust with love ❤️"
+rust-version = "1.74"
 license = "GPL-3.0"
 readme = "README.md"
 repository = "https://github.com/Speak2Erase/Luminol"
 keywords = ["gamedev", "rpg", "rpg-maker"]
 categories = ["games"]
-build = "build.rs"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+# Shared dependencies
+[workspace.dependencies]
+egui = "0.23.0"
+egui_extras = { version = "0.23.0", features = ["svg", "image"] }
+epaint = "0.23.0"
 
-[dependencies]
-egui = "0.22"
-eframe = { version = "0.22", features = [
-    "persistence",
+eframe = { version = "0.23.0", features = [
     "wgpu",
+    "accesskit",
+    "persistence",
+    "default_fonts",
+    "x11",
+    "wayland",
 ], default-features = false }
-egui_extras = { version = "0.22", features = ["svg", "image"] }
-egui-notify = { version = "0.9" } # temporary patch
-egui_dock = { version = "0.6" }
-catppuccin-egui = "3.0.0"
+egui-wgpu = "0.23.0"
 
-glam = { version = "0.24", features = ["bytemuck"] }
+wgpu = { version = "0.17.2", features = ["naga"] }
+glam = { version = "0.24.2", features = ["bytemuck"] }
+image = "0.24.7"
 
-image = { version = "0.24", features = ["jpeg", "png"] }
+serde = { version = "1.0", features = ["derive"] }
+alox-48 = { version = "0.4.1", default-features = false }
+ron = "0.8.1"
+serde_json = "1.0"
+rust-ini = "0.20.0"
+
+bytemuck = { version = "1.14.0", features = [
+    "extern_crate_alloc",
+    "derive",
+    "min_const_generics",
+] }
 
-strum = { version = "0.25", features = ["derive"] }
-enum-as-inner = "0.6"
-num_enum = "0.7"
+tracing = "0.1.37"
 
-bitflags = "2.3"
-ouroboros = "0.18"
+strum = { version = "0.25.0", features = ["derive"] }
+paste = "1.0.14"
+thiserror = "1.0"
+bitflags = "2.4.0"
+anyhow = "1.0"
 
-git-version = "0.3"
+parking_lot = { version = "0.12.1", features = ["deadlock_detection"] }
+once_cell = "1.18.0"
+crossbeam = "0.8.2"
+dashmap = "5.5.3"
+flume = "0.11.0"
+oneshot = "0.1.6"
 
-once_cell = "1.17"
-parking_lot = { version = "0.12", features = [
-    "nightly", # This is required for parking_lot to work properly in WebAssembly builds with atomics support
-    "deadlock_detection",
-    "hardware-lock-elision",
-] }
-atomic_refcell = "0.1.9"
-dashmap = "5.5"
-crossbeam = "0.8"
+poll-promise = { version = "0.3.0" }
 
-futures = "0.3"
-reqwest = "0.11.22"
+camino = "1.1.6"
 
-slab = { version = "0.4", features = ["serde"] }
+slab = { version = "0.4.9", features = ["serde"] }
 
-syntect = { version = "5.0", features = [
-    "default-fancy",
-], default-features = false }
+itertools = "0.11.0"
+
+rfd = "0.12.0"
 
 rand = "0.8.5"
+getrandom = { version = "0.2", features = ["js"] }
+
+luminol-audio = { version = "0.4.0", path = "crates/audio/" }
+luminol-app = { version = "0.4.0", path = "crates/app/" }
+luminol-components = { version = "0.4.0", path = "crates/components/" }
+luminol-config = { version = "0.4.0", path = "crates/config/" }
+luminol-core = { version = "0.4.0", path = "crates/core/" }
+luminol-data = { version = "0.4.0", path = "crates/data/" }
+luminol-filesystem = { version = "0.4.0", path = "crates/filesystem/" }
+luminol-graphics = { version = "0.4.0", path = "crates/graphics/" }
+luminol-macros = { version = "0.4.0", path = "crates/macros/" }
+luminol-modals = { version = "0.4.0", path = "crates/modals/" }
+luminol-term = { version = "0.4.0", path = "crates/term/" }
+luminol-ui = { version = "0.4.0", path = "crates/ui/" }
 
-zip = { version = "0.6", default-features = false, features = ["deflate"] }
-notify = "6.0"
-rfd = "0.12"
-camino = "1.1"
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
-bytemuck = { version = "1.14", features = ["derive", "min_const_generics"] }
+[dependencies]
+eframe.workspace = true
+egui.workspace = true
+egui_extras.workspace = true
+epaint.workspace = true
 
-color-eyre = "0.6"
-eyre = "0.6"
-thiserror = "1.0"
+rfd.workspace = true
 
-paste = "1.0"
-cfg-if = "1.0.0"
+parking_lot.workspace = true
+once_cell.workspace = true
 
-serde = { version = "1.0", features = ["derive"] }
-alox-48 = { version = "0.4.1", default-features = false }
-ron = "0.8.0"
-rust-ini = "0.19.0"
+image.workspace = true
 
-tracing = "0.1.37"
-tracing-subscriber = "0.3"
+crc = { version = "3.0.1", optional = true }
 
-itertools = "0.11"
-static_assertions = "1.1.0"
+tracing-subscriber = "0.3.17"
+color-backtrace = "0.6.0"
 
-rustysynth = "1.2"
+luminol-app.workspace = true
+luminol-audio.workspace = true
+luminol-core.workspace = true
+luminol-config.workspace = true
+luminol-data.workspace = true
+luminol-filesystem.workspace = true
+luminol-graphics.workspace = true
+luminol-ui.workspace = true
+# luminol-windows = { version = "0.1.0", path = "../windows/" }
+# luminol-tabs = { version = "0.1.0", path = "../tabs/" }
 
-const_format = { version = "0.2.31", features = ["rust_1_51"] }
+poll-promise.workspace = true
 
-command-lib = { version = "*", path = "command-lib" }
-rmxp-types = { version = "*", path = "rmxp-types" }
+camino.workspace = true
 
-steamworks = { version = "0.10.0", optional = true }
-crc = { version = "3.0", optional = true }
+strum.workspace = true
 
+# Native
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-poll-promise = { version = "0.3.0", features = ["smol"] }
-rodio = { version = "0.17.1" }
-
-luminol-term = { version = "*", path = "luminol-term" }
-
+steamworks = { version = "0.10.0", optional = true }
+tokio = { version = "1.33", features = [
+    "sync",
+    "macros",
+    "io-util",
+    "rt-multi-thread",
+    "time",
+] } # *sigh*
+luminol-term.workspace = true
+
+# Set poll promise features here based on the target
+# I'd much rather do it in the workspace, but cargo doesn't support that yet
+#
+# Doing this also relies on a quirk of features, that any crate specifying features applies to ALL crates
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies.poll-promise]
+workspace = true
+features = ["tokio"]
+
+[target.'cfg(target_arch = "wasm32")'.dependencies.poll-promise]
+workspace = true
+features = ["web"]
+
+# Web
+# Look into somehow pinning these as workspace dependencies
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-console_error_panic_hook = "0.1"
-tracing-wasm = "0.2"
-tracing-log = "0.1.3"
 wasm-bindgen = "0.2.87"
-poll-promise = { version = "0.3.0", features = ["web"] }
-tokio = { version = "1.32", features = ["sync"] }
 wasm-bindgen-futures = "0.4"
-indexed_db_futures = "0.3.0"
-rodio = { version = "0.17.1", features = ["wasm-bindgen"] }
 js-sys = "0.3"
-web-sys = { version = "0.3", features = [
-    "console",
-    "Window",
-    "Document",
-    "Element",
-    "DomException",
-
-    "EventTarget",
-    "EventListener",
-    "AddEventListenerOptions",
-
-    "Event",
-    "MouseEvent",
-
-    "DedicatedWorkerGlobalScope",
-    "WorkerGlobalScope",
-
-    "Worker",
-    "WorkerOptions",
-    "WorkerType",
-
-    "Performance",
-
-    "HtmlCanvasElement",
-    "OffscreenCanvas",
-    "OffscreenCanvasRenderingContext2d",
-
-    "MutationObserver",
-    "MutationObserverInit",
-    "MutationRecord",
-    "Node",
-
-    "Clipboard",
-
-    "Storage",
-
-    "WorkerLocation",
-    "Location",
-    "WorkerNavigator",
-    "Navigator",
-
-    "Blob",
-    "File",
-    "FileSystemCreateWritableOptions",
-    "FileSystemDirectoryHandle",
-    "FileSystemFileHandle",
-    "FileSystemGetDirectoryOptions",
-    "FileSystemGetFileOptions",
-    "FileSystemHandle",
-    "FileSystemHandleKind",
-    "FileSystemRemoveOptions",
-    "FileSystemWritableFileStream",
-    "WritableStream",
-] }
 
-[features]
-steamworks = ["dep:steamworks", "crc"]
+flume.workspace = true
+
+luminol-web = { version = "0.4.0", path = "crates/web/" }
+
+tracing-wasm = "0.2"
+tracing-log = "0.1.3"
+tracing.workspace = true
 
+web-sys = { version = "0.3", features = ["Window"] }
 
-[target.'cfg(windows)'.dependencies]
-windows = { version = "0.51.1", features = ["Win32_System_Registry"] }
-winreg = "0.51.0"
+
+[features]
+steamworks = ["dep:steamworks", "crc"]
 
 [target.'cfg(windows)'.build-dependencies]
 winres = "0.1"
@@ -224,9 +236,6 @@ opt-level = 3
 # See why config is set up this way.
 # https://bevy-cheatbook.github.io/pitfalls/performance.html#why-not-use---release
 
-[workspace]
-members = ["command-lib", "rmxp-types", "luminol-term"]
-
 [patch.crates-io]
 # We need this for rodio to work in WebAssembly until
 # https://github.com/RustAudio/cpal/pull/774
diff --git a/command-lib/Cargo.toml b/command-lib/Cargo.toml
deleted file mode 100644
index 453ad195..00000000
--- a/command-lib/Cargo.toml
+++ /dev/null
@@ -1,12 +0,0 @@
-[package]
-name = "command-lib"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-serde = { version = "1.0", features = ["derive"] }
-strum = { version = "0.25", features = ["derive"] }
-
-rand = "0.8.5"
diff --git a/crates/app/Cargo.toml b/crates/app/Cargo.toml
new file mode 100644
index 00000000..10b66244
--- /dev/null
+++ b/crates/app/Cargo.toml
@@ -0,0 +1,17 @@
+[package]
+name = "luminol-app"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+license.workspace = true
+readme.workspace = true
+repository.workspace = true
+keywords.workspace = true
+categories.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+egui.workspace = true
+eframe.workspace = true
diff --git a/crates/app/src/lib.rs b/crates/app/src/lib.rs
new file mode 100644
index 00000000..99b4a2ab
--- /dev/null
+++ b/crates/app/src/lib.rs
@@ -0,0 +1,42 @@
+/// Custom implementation of `eframe::Frame` for Luminol.
+/// We need this because the normal `eframe::App` uses a struct with private fields in its
+/// definition of `update()`, and that prevents us from implementing custom app runners.
+pub struct CustomFrame<'a>(
+    #[cfg(not(target_arch = "wasm32"))] pub &'a mut eframe::Frame,
+    #[cfg(target_arch = "wasm32")] pub std::marker::PhantomData<&'a ()>,
+);
+
+#[cfg(not(target_arch = "wasm32"))]
+impl std::ops::Deref for CustomFrame<'_> {
+    type Target = eframe::Frame;
+    fn deref(&self) -> &Self::Target {
+        self.0
+    }
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+impl std::ops::DerefMut for CustomFrame<'_> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        self.0
+    }
+}
+
+/// Custom implementation of `eframe::App` for Luminol.
+/// We need this because the normal `eframe::App` uses a struct with private fields in its
+/// definition of `update()`, and that prevents us from implementing custom app runners.
+pub trait CustomApp
+where
+    Self: eframe::App,
+{
+    fn custom_update(&mut self, ctx: &egui::Context, frame: &mut CustomFrame<'_>);
+}
+
+#[macro_export]
+macro_rules! app_use_custom_update {
+    () => {
+        fn update(&mut self, ctx: &egui::Context, frame: &mut eframe::Frame) {
+            #[cfg(not(target_arch = "wasm32"))]
+            $crate::CustomApp::custom_update(self, ctx, &mut $crate::CustomFrame(frame))
+        }
+    };
+}
diff --git a/crates/audio/Cargo.toml b/crates/audio/Cargo.toml
new file mode 100644
index 00000000..ba8da11f
--- /dev/null
+++ b/crates/audio/Cargo.toml
@@ -0,0 +1,41 @@
+[package]
+name = "luminol-audio"
+
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+rust-version.workspace = true
+readme.workspace = true
+repository.workspace = true
+keywords.workspace = true
+categories.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+
+rustysynth = "1.3.1"
+
+strum.workspace = true
+parking_lot.workspace = true
+camino.workspace = true
+once_cell.workspace = true
+
+thiserror.workspace = true
+
+luminol-filesystem.workspace = true
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+rodio = "0.17.1"
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+rodio = { version = "0.17.1", features = ["wasm-bindgen"] }
+web-sys = { version = "0.3", features = ["Window"] }
+
+flume.workspace = true
+oneshot.workspace = true
+
+once_cell.workspace = true
+poll-promise.workspace = true
+slab.workspace = true
diff --git a/src/audio/GMGSx.sf2 b/crates/audio/src/GMGSx.sf2
similarity index 100%
rename from src/audio/GMGSx.sf2
rename to crates/audio/src/GMGSx.sf2
diff --git a/crates/audio/src/error.rs b/crates/audio/src/error.rs
new file mode 100644
index 00000000..5cb99738
--- /dev/null
+++ b/crates/audio/src/error.rs
@@ -0,0 +1,39 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
+//
+//     Additional permission under GNU GPL version 3 section 7
+//
+// If you modify this Program, or any covered work, by linking or combining
+// it with Steamworks API by Valve Corporation, containing parts covered by
+// terms of the Steamworks API by Valve Corporation, the licensors of this
+// Program grant you additional permission to convey the resulting work.
+
+#[derive(Debug, thiserror::Error)]
+pub enum Error {
+    #[error("An error occured while decoding an audio file: {0}")]
+    DecoderError(#[from] rodio::decoder::DecoderError),
+    #[error("An error occured while creating a synthesizer: {0}")]
+    SynthesizerError(#[from] rustysynth::SynthesizerError),
+    #[error("An error occured while playing a midi track: {0}")]
+    MidiError(#[from] rustysynth::MidiFileError),
+    #[error("An error occured while playing a track: {0}")]
+    PlayError(#[from] rodio::PlayError),
+    #[error("An error occured while reading a file from the filesystem: {0}")]
+    FileSystem(#[from] luminol_filesystem::Error),
+}
+
+pub type Result<T> = std::result::Result<T, Error>;
diff --git a/src/audio/mod.rs b/crates/audio/src/lib.rs
similarity index 89%
rename from src/audio/mod.rs
rename to crates/audio/src/lib.rs
index 25826cad..0c3639ac 100644
--- a/src/audio/mod.rs
+++ b/crates/audio/src/lib.rs
@@ -22,33 +22,22 @@
 // terms of the Steamworks API by Valve Corporation, the licensors of this
 // Program grant you additional permission to convey the resulting work.
 
-use crate::prelude::*;
-
 mod midi;
 
+mod error;
+pub use error::{Error, Result};
+
 #[cfg(target_arch = "wasm32")]
 mod wrapper;
 #[cfg(target_arch = "wasm32")]
 pub use wrapper::*;
 
-use std::io::{Read, Seek};
 use strum::Display;
 use strum::EnumIter;
 
-/// Different sound sources.
-#[derive(EnumIter, Display, PartialEq, Eq, Clone, Copy, Hash)]
-#[allow(clippy::upper_case_acronyms)]
-#[allow(missing_docs)]
-pub enum Source {
-    BGM,
-    BGS,
-    ME,
-    SE,
-}
-
 /// A struct for playing Audio.
 pub struct Audio {
-    inner: Mutex<Inner>,
+    inner: parking_lot::Mutex<Inner>,
 }
 
 struct Inner {
@@ -56,7 +45,18 @@ struct Inner {
     // To actually play tracks the user will have needed to interact with the ui.
     _output_stream: rodio::OutputStream,
     output_stream_handle: rodio::OutputStreamHandle,
-    sinks: HashMap<Source, rodio::Sink>,
+    sinks: std::collections::HashMap<Source, rodio::Sink>,
+}
+
+/// Different sound sources.
+#[derive(EnumIter, Display, PartialEq, Eq, Clone, Copy, Hash)]
+#[allow(clippy::upper_case_acronyms)]
+#[allow(missing_docs)]
+pub enum Source {
+    BGM,
+    BGS,
+    ME,
+    SE,
 }
 
 #[cfg(not(target_arch = "wasm32"))] // Audio can't be shared between threads in wasm either
@@ -75,10 +75,10 @@ impl Default for Audio {
 
         let (output_stream, output_stream_handle) = rodio::OutputStream::try_default().unwrap();
         Self {
-            inner: Mutex::new(Inner {
+            inner: parking_lot::Mutex::new(Inner {
                 _output_stream: output_stream,
                 output_stream_handle,
-                sinks: HashMap::default(),
+                sinks: std::collections::HashMap::default(),
             }),
         }
     }
@@ -89,15 +89,13 @@ impl Audio {
     pub fn play(
         &self,
         path: impl AsRef<camino::Utf8Path>,
+        filesystem: &impl luminol_filesystem::FileSystem, // FIXME
         volume: u8,
         pitch: u8,
         source: Source,
-    ) -> Result<(), String> {
+    ) -> Result<()> {
         let path = path.as_ref();
-        let file = state!()
-            .filesystem
-            .open_file(path, filesystem::OpenFlags::Read)
-            .map_err(|e| e.to_string())?;
+        let file = filesystem.open_file(path, luminol_filesystem::OpenFlags::Read)?;
 
         let is_midi = path
             .extension()
@@ -106,17 +104,17 @@ impl Audio {
         self.play_from_file(file, is_midi, volume, pitch, source)
     }
 
-    fn play_from_file(
+    pub fn play_from_file(
         &self,
-        file: impl Read + Seek + Send + Sync + 'static,
+        file: impl std::io::Read + std::io::Seek + Send + Sync + 'static,
         is_midi: bool,
         volume: u8,
         pitch: u8,
         source: Source,
-    ) -> Result<(), String> {
+    ) -> Result<()> {
         let mut inner = self.inner.lock();
         // Create a sink
-        let sink = rodio::Sink::try_new(&inner.output_stream_handle).map_err(|e| e.to_string())?;
+        let sink = rodio::Sink::try_new(&inner.output_stream_handle)?;
 
         // Select decoder type based on sound source
         match source {
@@ -125,7 +123,7 @@ impl Audio {
                 if is_midi {
                     sink.append(midi::MidiSource::new(file, false)?);
                 } else {
-                    sink.append(rodio::Decoder::new(file).map_err(|e| e.to_string())?);
+                    sink.append(rodio::Decoder::new(file)?);
                 }
             }
             _ => {
@@ -133,7 +131,7 @@ impl Audio {
                 if is_midi {
                     sink.append(midi::MidiSource::new(file, true)?);
                 } else {
-                    sink.append(rodio::Decoder::new_looped(file).map_err(|e| e.to_string())?);
+                    sink.append(rodio::Decoder::new_looped(file)?);
                 }
             }
         }
diff --git a/src/audio/midi.rs b/crates/audio/src/midi.rs
similarity index 93%
rename from src/audio/midi.rs
rename to crates/audio/src/midi.rs
index 0ebd8000..94dd349b 100644
--- a/src/audio/midi.rs
+++ b/crates/audio/src/midi.rs
@@ -17,6 +17,8 @@
 use once_cell::sync::Lazy;
 use std::{io::Cursor, sync::Arc};
 
+use crate::Result;
+
 pub struct MidiSource {
     // These are each 4410 long
     left: Vec<f32>,
@@ -26,12 +28,11 @@ pub struct MidiSource {
 }
 
 impl MidiSource {
-    pub fn new(mut file: impl std::io::Read, looping: bool) -> Result<Self, String> {
-        let midi_file = Arc::new(rustysynth::MidiFile::new(&mut file).map_err(|e| e.to_string())?);
+    pub fn new(mut file: impl std::io::Read, looping: bool) -> Result<Self> {
+        let midi_file = Arc::new(rustysynth::MidiFile::new(&mut file)?);
 
         let settings = rustysynth::SynthesizerSettings::new(44100);
-        let synthesizer =
-            rustysynth::Synthesizer::new(&SOUND_FONT, &settings).map_err(|e| e.to_string())?;
+        let synthesizer = rustysynth::Synthesizer::new(&SOUND_FONT, &settings)?;
         let mut sequencer = rustysynth::MidiFileSequencer::new(synthesizer);
 
         sequencer.play(&midi_file, looping);
diff --git a/src/audio/wrapper.rs b/crates/audio/src/wrapper.rs
similarity index 72%
rename from src/audio/wrapper.rs
rename to crates/audio/src/wrapper.rs
index 079eb09c..cb5bd827 100644
--- a/src/audio/wrapper.rs
+++ b/crates/audio/src/wrapper.rs
@@ -22,34 +22,31 @@
 // terms of the Steamworks API by Valve Corporation, the licensors of this
 // Program grant you additional permission to convey the resulting work.
 
-use crate::prelude::*;
-
 use poll_promise::Promise;
-use slab::Slab;
-use std::io::{Cursor, Read};
-
-use super::{Audio, Source};
 
-static_assertions::assert_impl_all!(AudioWrapper: Send, Sync);
+use super::{Audio, Result, Source};
 
-thread_local!(static SLAB: Lazy<Mutex<Slab<Promise<()>>>> = Lazy::new(|| Mutex::new(Slab::new())));
+thread_local! {
+    static SLAB: once_cell::sync::Lazy<std::cell::RefCell<slab::Slab<Promise<()>>>> =
+        once_cell::sync::Lazy::new(|| std::cell::RefCell::new(slab::Slab::new()));
+}
 
 #[derive(Debug)]
 pub struct AudioWrapper {
     key: usize,
-    tx: mpsc::UnboundedSender<AudioWrapperCommand>,
+    tx: flume::Sender<AudioWrapperCommand>,
 }
 
 pub struct AudioWrapperCommand(AudioWrapperCommandInner);
 
 enum AudioWrapperCommandInner {
     Play {
-        vec: Vec<u8>,
+        cursor: std::io::Cursor<Vec<u8>>,
         is_midi: bool,
         volume: u8,
         pitch: u8,
         source: Source,
-        oneshot_tx: oneshot::Sender<Result<(), String>>,
+        oneshot_tx: oneshot::Sender<Result<()>>,
     },
     SetPitch {
         pitch: u8,
@@ -82,25 +79,17 @@ impl AudioWrapper {
     pub fn play(
         &self,
         path: impl AsRef<camino::Utf8Path>,
+        filesystem: &impl luminol_filesystem::FileSystem,
         volume: u8,
         pitch: u8,
         source: Source,
-    ) -> Result<(), String> {
+    ) -> Result<()> {
         // We have to load the file on the current thread,
         // otherwise if we read the file in the main thread of a web browser
         // we will block the main thread
         let path = path.as_ref();
-        let mut file = state!()
-            .filesystem
-            .open_file(path, filesystem::OpenFlags::Read)
-            .map_err(|e| e.to_string())?;
-        let length = state!()
-            .filesystem
-            .metadata(path)
-            .map_err(|e| e.to_string())?
-            .size as usize;
-        let mut vec = vec![0; length];
-        file.read(&mut vec[..]).map_err(|e| e.to_string())?;
+        let file = filesystem.read(path)?;
+        let cursor = std::io::Cursor::new(file);
 
         let is_midi = path
             .extension()
@@ -109,7 +98,7 @@ impl AudioWrapper {
         let (oneshot_tx, oneshot_rx) = oneshot::channel();
         self.tx
             .send(AudioWrapperCommand(AudioWrapperCommandInner::Play {
-                vec,
+                cursor,
                 is_midi,
                 volume,
                 pitch,
@@ -117,7 +106,7 @@ impl AudioWrapper {
                 oneshot_tx,
             }))
             .unwrap();
-        oneshot_rx.blocking_recv().unwrap()
+        oneshot_rx.recv().unwrap()
     }
 
     pub fn set_pitch(&self, pitch: u8, source: &Source) {
@@ -125,11 +114,11 @@ impl AudioWrapper {
         self.tx
             .send(AudioWrapperCommand(AudioWrapperCommandInner::SetPitch {
                 pitch,
-                source: source.clone(),
+                source: *source,
                 oneshot_tx,
             }))
             .unwrap();
-        oneshot_rx.blocking_recv().unwrap()
+        oneshot_rx.recv().unwrap()
     }
 
     pub fn set_volume(&self, volume: u8, source: &Source) {
@@ -137,11 +126,11 @@ impl AudioWrapper {
         self.tx
             .send(AudioWrapperCommand(AudioWrapperCommandInner::SetVolume {
                 volume,
-                source: source.clone(),
+                source: *source,
                 oneshot_tx,
             }))
             .unwrap();
-        oneshot_rx.blocking_recv().unwrap()
+        oneshot_rx.recv().unwrap()
     }
 
     pub fn clear_sinks(&self) {
@@ -151,34 +140,34 @@ impl AudioWrapper {
                 oneshot_tx,
             }))
             .unwrap();
-        oneshot_rx.blocking_recv().unwrap()
+        oneshot_rx.recv().unwrap()
     }
 
     pub fn stop(&self, source: &Source) {
         let (oneshot_tx, oneshot_rx) = oneshot::channel();
         self.tx
             .send(AudioWrapperCommand(AudioWrapperCommandInner::Stop {
-                source: source.clone(),
+                source: *source,
                 oneshot_tx,
             }))
             .unwrap();
-        oneshot_rx.blocking_recv().unwrap()
+        oneshot_rx.recv().unwrap()
     }
 }
 
 impl From<Audio> for AudioWrapper {
     fn from(audio: Audio) -> Self {
-        let (tx, mut rx) = mpsc::unbounded_channel();
+        let (tx, rx) = flume::unbounded::<AudioWrapperCommand>();
 
         let promise = poll_promise::Promise::spawn_local(async move {
             loop {
-                let Some(command): Option<AudioWrapperCommand> = rx.recv().await else {
+                let Ok(command) = rx.recv_async().await else {
                     return;
                 };
 
                 match command.0 {
                     AudioWrapperCommandInner::Play {
-                        vec,
+                        cursor,
                         is_midi,
                         volume,
                         pitch,
@@ -186,13 +175,7 @@ impl From<Audio> for AudioWrapper {
                         oneshot_tx,
                     } => {
                         oneshot_tx
-                            .send(audio.play_from_file(
-                                Cursor::new(vec),
-                                is_midi,
-                                volume,
-                                pitch,
-                                source,
-                            ))
+                            .send(audio.play_from_file(cursor, is_midi, volume, pitch, source))
                             .unwrap();
                     }
 
@@ -201,7 +184,8 @@ impl From<Audio> for AudioWrapper {
                         source,
                         oneshot_tx,
                     } => {
-                        oneshot_tx.send(audio.set_pitch(pitch, &source)).unwrap();
+                        audio.set_pitch(pitch, &source);
+                        oneshot_tx.send(()).unwrap();
                     }
 
                     AudioWrapperCommandInner::SetVolume {
@@ -209,19 +193,22 @@ impl From<Audio> for AudioWrapper {
                         source,
                         oneshot_tx,
                     } => {
-                        oneshot_tx.send(audio.set_volume(volume, &source)).unwrap();
+                        audio.set_volume(volume, &source);
+                        oneshot_tx.send(()).unwrap();
                     }
 
                     AudioWrapperCommandInner::ClearSinks { oneshot_tx } => {
-                        oneshot_tx.send(audio.clear_sinks()).unwrap();
+                        audio.clear_sinks();
+                        oneshot_tx.send(()).unwrap();
                     }
 
                     AudioWrapperCommandInner::Stop { source, oneshot_tx } => {
-                        oneshot_tx.send(audio.stop(&source)).unwrap();
+                        audio.stop(&source);
+                        oneshot_tx.send(()).unwrap();
                     }
 
                     AudioWrapperCommandInner::Drop { key, oneshot_tx } => {
-                        let promise = SLAB.with(|slab| slab.lock().try_remove(key));
+                        let promise = SLAB.with(|slab| slab.borrow_mut().try_remove(key));
                         oneshot_tx.send(promise.is_some()).unwrap();
                         return;
                     }
@@ -230,7 +217,7 @@ impl From<Audio> for AudioWrapper {
         });
 
         Self {
-            key: SLAB.with(|slab| slab.lock().insert(promise)),
+            key: SLAB.with(|slab| slab.borrow_mut().insert(promise)),
             tx,
         }
     }
@@ -245,6 +232,6 @@ impl Drop for AudioWrapper {
                 oneshot_tx,
             }))
             .unwrap();
-        oneshot_rx.blocking_recv().unwrap();
+        oneshot_rx.recv().unwrap();
     }
 }
diff --git a/crates/components/Cargo.toml b/crates/components/Cargo.toml
new file mode 100644
index 00000000..1611ca7f
--- /dev/null
+++ b/crates/components/Cargo.toml
@@ -0,0 +1,45 @@
+[package]
+name = "luminol-components"
+
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+rust-version.workspace = true
+readme.workspace = true
+repository.workspace = true
+keywords.workspace = true
+categories.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+luminol-audio.workspace = true
+luminol-core.workspace = true
+luminol-config.workspace = true
+luminol-data.workspace = true
+luminol-graphics.workspace = true
+luminol-filesystem.workspace = true
+
+egui.workspace = true
+strum.workspace = true
+
+egui-wgpu.workspace = true
+
+wgpu.workspace = true
+glam.workspace = true
+
+syntect = { version = "5.1.0", default-features = false, features = [
+    "default-fancy",
+] }
+
+parking_lot.workspace = true
+
+itertools.workspace = true
+
+serde.workspace = true
+
+once_cell.workspace = true
+slab.workspace = true
+
+anyhow.workspace = true
diff --git a/crates/components/src/command_view/command_ui.rs b/crates/components/src/command_view/command_ui.rs
new file mode 100644
index 00000000..abecdc8d
--- /dev/null
+++ b/crates/components/src/command_view/command_ui.rs
@@ -0,0 +1,45 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
+//
+//     Additional permission under GNU GPL version 3 section 7
+//
+// If you modify this Program, or any covered work, by linking or combining
+// it with Steamworks API by Valve Corporation, containing parts covered by
+// terms of the Steamworks API by Valve Corporation, the licensors of this
+// Program grant you additional permission to convey the resulting work.
+
+impl super::CommandView {
+    pub fn command_ui<'i, I>(
+        &mut self,
+        ui: &mut egui::Ui,
+        db: &luminol_config::command_db::CommandDB,
+        (index, command): (usize, &'i mut luminol_data::rpg::EventCommand),
+        iter: &mut std::iter::Peekable<I>,
+    ) where
+        I: Iterator<Item = (usize, &'i mut luminol_data::rpg::EventCommand)>,
+    {
+        todo!()
+    }
+}
+
+fn parameter_label(
+    string: &mut String,
+    parameter: &luminol_data::commands::Parameter,
+    command: &mut luminol_data::rpg::EventCommand,
+) -> std::fmt::Result {
+    todo!()
+}
diff --git a/src/components/command_view/macros.rs b/crates/components/src/command_view/macros.rs
similarity index 100%
rename from src/components/command_view/macros.rs
rename to crates/components/src/command_view/macros.rs
diff --git a/src/components/command_view/mod.rs b/crates/components/src/command_view/mod.rs
similarity index 98%
rename from src/components/command_view/mod.rs
rename to crates/components/src/command_view/mod.rs
index 1f61b61b..26daea82 100644
--- a/src/components/command_view/mod.rs
+++ b/crates/components/src/command_view/mod.rs
@@ -28,7 +28,6 @@ mod command_ui;
 mod parameter_ui;
 mod ui;
 
-pub use crate::prelude::*;
 use std::collections::HashMap;
 
 pub struct CommandView {
diff --git a/crates/components/src/command_view/parameter_ui.rs b/crates/components/src/command_view/parameter_ui.rs
new file mode 100644
index 00000000..6803749c
--- /dev/null
+++ b/crates/components/src/command_view/parameter_ui.rs
@@ -0,0 +1,37 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
+//
+//     Additional permission under GNU GPL version 3 section 7
+//
+// If you modify this Program, or any covered work, by linking or combining
+// it with Steamworks API by Valve Corporation, containing parts covered by
+// terms of the Steamworks API by Valve Corporation, the licensors of this
+// Program grant you additional permission to convey the resulting work.
+
+use super::CommandView;
+
+impl CommandView {
+    #[allow(clippy::only_used_in_recursion)]
+    pub fn parameter_ui(
+        &mut self,
+        ui: &mut egui::Ui,
+        parameter: &luminol_data::commands::Parameter,
+        command: &mut luminol_data::rpg::EventCommand,
+    ) {
+        todo!()
+    }
+}
diff --git a/src/graphics/primitives/mod.rs b/crates/components/src/command_view/ui.rs
similarity index 80%
rename from src/graphics/primitives/mod.rs
rename to crates/components/src/command_view/ui.rs
index 5b4fff52..b390c4f6 100644
--- a/src/graphics/primitives/mod.rs
+++ b/crates/components/src/command_view/ui.rs
@@ -22,16 +22,14 @@
 // terms of the Steamworks API by Valve Corporation, the licensors of this
 // Program grant you additional permission to convey the resulting work.
 
-mod quad;
-mod sprite;
-mod tiles;
-mod vertex;
-mod viewport;
-
-pub use quad::Quad;
-pub use vertex::Vertex;
-pub use viewport::Viewport;
-
-pub use sprite::Sprite;
-pub use tiles::Atlas;
-pub use tiles::Tiles;
+impl super::CommandView {
+    #[allow(clippy::ptr_arg)]
+    pub fn ui(
+        &mut self,
+        ui: &mut egui::Ui,
+        db: &luminol_config::command_db::CommandDB,
+        commands: &mut Vec<luminol_data::rpg::EventCommand>,
+    ) {
+        todo!()
+    }
+}
diff --git a/src/components/mod.rs b/crates/components/src/lib.rs
similarity index 95%
rename from src/components/mod.rs
rename to crates/components/src/lib.rs
index 5439f2eb..813c5feb 100644
--- a/src/components/mod.rs
+++ b/crates/components/src/lib.rs
@@ -24,17 +24,6 @@
 
 /// Syntax highlighter
 pub mod syntax_highlighting;
-/// Toasts to be displayed for errors, information, etc.
-mod toasts;
-/// The toolbar for managing the project.
-mod top_bar;
-
-mod command_view;
-
-pub use command_view::CommandView;
-
-pub use toasts::Toasts;
-pub use top_bar::TopBar;
 
 /// The tilemap.
 mod map_view;
@@ -42,6 +31,12 @@ pub use map_view::{MapView, SelectedLayer};
 mod tilepicker;
 pub use tilepicker::{SelectedTile, Tilepicker};
 
+mod sound_tab;
+pub use sound_tab::SoundTab;
+
+mod command_view;
+pub use command_view::CommandView;
+
 pub struct EnumMenuButton<'e, T> {
     current_value: &'e mut T,
     id: egui::Id,
diff --git a/src/components/map_view.rs b/crates/components/src/map_view.rs
similarity index 85%
rename from src/components/map_view.rs
rename to crates/components/src/map_view.rs
index 5d1a1272..b810133a 100644
--- a/src/components/map_view.rs
+++ b/crates/components/src/map_view.rs
@@ -14,9 +14,8 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
-pub use crate::prelude::*;
 
-use super::tilepicker;
+use itertools::Itertools;
 
 #[derive(Debug)]
 pub struct MapView {
@@ -30,8 +29,8 @@ pub struct MapView {
 
     /// The first sprite is for drawing on the tilemap,
     /// and the second sprite is for the hover preview.
-    pub events: rmxp_types::OptionVec<(Event, Event)>,
-    pub map: Map,
+    pub events: luminol_data::OptionVec<(luminol_graphics::Event, luminol_graphics::Event)>,
+    pub map: luminol_graphics::Map,
 
     pub selected_layer: SelectedLayer,
     pub selected_event_id: Option<usize>,
@@ -60,21 +59,39 @@ pub enum SelectedLayer {
 }
 
 impl MapView {
-    pub fn new(map: &rpg::Map, tileset: &rpg::Tileset) -> Result<MapView, String> {
-        // Get tilesets.
-
-        let use_push_constants = state!()
-            .render_state
-            .device
-            .features()
-            .contains(wgpu::Features::PUSH_CONSTANTS);
-        let atlas = state!().atlas_cache.load_atlas(tileset)?;
+    pub fn new(
+        update_state: &luminol_core::UpdateState<'_>,
+        map_id: usize,
+    ) -> anyhow::Result<MapView> {
+        let map = update_state
+            .data
+            .get_or_load_map(map_id, update_state.filesystem);
+        let tilesets = update_state.data.tilesets();
+        let tileset = &tilesets[map.tileset_id];
+
+        let atlas = update_state.graphics.atlas_cache.load_atlas(
+            &update_state.graphics,
+            update_state.filesystem,
+            tileset,
+        )?;
         let events = map
             .events
             .iter()
             .map(|(id, e)| {
-                let sprite = Event::new(e, &atlas, use_push_constants);
-                let preview_sprite = Event::new(e, &atlas, use_push_constants);
+                let sprite = luminol_graphics::Event::new(
+                    &update_state.graphics,
+                    update_state.filesystem,
+                    e,
+                    &atlas,
+                    update_state.graphics.push_constants_supported(),
+                );
+                let preview_sprite = luminol_graphics::Event::new(
+                    &update_state.graphics,
+                    update_state.filesystem,
+                    e,
+                    &atlas,
+                    update_state.graphics.push_constants_supported(),
+                );
                 let Ok(sprite) = sprite else {
                     return Err(sprite.unwrap_err());
                 };
@@ -89,7 +106,13 @@ impl MapView {
             })
             .flatten_ok()
             .try_collect()?;
-        let map = Map::new(map, tileset, use_push_constants)?;
+        let map = luminol_graphics::Map::new(
+            &update_state.graphics,
+            update_state.filesystem,
+            &map,
+            tileset,
+            update_state.graphics.push_constants_supported(),
+        )?;
 
         Ok(Self {
             visible_display: false,
@@ -117,11 +140,13 @@ impl MapView {
         })
     }
 
+    // FIXME
     pub fn ui(
         &mut self,
         ui: &mut egui::Ui,
-        map: &rpg::Map,
-        tilepicker: &Tilepicker,
+        graphics_state: &std::sync::Arc<luminol_graphics::GraphicsState>,
+        map: &luminol_data::rpg::Map,
+        tilepicker: &crate::Tilepicker,
         dragging_event: bool,
         drawing_shape: bool,
         drawing_shape_pos: Option<egui::Pos2>,
@@ -232,15 +257,22 @@ impl MapView {
         let proj_center_y = height2 * 32. - self.pan.y / scale;
         let proj_width2 = canvas_rect.width() / scale / 2.;
         let proj_height2 = canvas_rect.height() / scale / 2.;
-        self.map.set_proj(glam::Mat4::orthographic_rh(
-            proj_center_x - proj_width2,
-            proj_center_x + proj_width2,
-            proj_center_y + proj_height2,
-            proj_center_y - proj_height2,
-            -1.,
-            1.,
-        ));
+
+        let graphics_state = graphics_state.clone();
+
+        self.map.set_proj(
+            &graphics_state.render_state,
+            glam::Mat4::orthographic_rh(
+                proj_center_x - proj_width2,
+                proj_center_x + proj_width2,
+                proj_center_y + proj_height2,
+                proj_center_y - proj_height2,
+                -1.,
+                1.,
+            ),
+        );
         self.map.paint(
+            graphics_state.clone(),
             ui.painter(),
             match self.selected_layer {
                 SelectedLayer::Events => None,
@@ -298,6 +330,7 @@ impl MapView {
                 // Darken the graphic if required
                 if let Some((sprite, _)) = sprites {
                     sprite.sprite().graphic.set_opacity_multiplier(
+                        &graphics_state.render_state,
                         if self.darken_unselected_layers
                             && !matches!(self.selected_layer, SelectedLayer::Events)
                         {
@@ -308,11 +341,6 @@ impl MapView {
                     );
                 }
 
-                let tile_rect = egui::Rect::from_min_size(
-                    map_rect.min
-                        + egui::vec2(event.x as f32 * tile_size, event.y as f32 * tile_size),
-                    egui::vec2(32., 32.) * scale,
-                );
                 let box_rect = egui::Rect::from_min_size(
                     map_rect.min
                         + egui::vec2(
@@ -325,15 +353,18 @@ impl MapView {
                 if let Some((sprite, _)) = sprites {
                     let x = event.x as f32 * 32. + (32. - event_size.x) / 2.;
                     let y = event.y as f32 * 32. + (32. - event_size.y);
-                    sprite.set_proj(glam::Mat4::orthographic_rh(
-                        proj_center_x - proj_width2 - x,
-                        proj_center_x + proj_width2 - x,
-                        proj_center_y + proj_height2 - y,
-                        proj_center_y - proj_height2 - y,
-                        -1.,
-                        1.,
-                    ));
-                    sprite.paint(ui.painter(), canvas_rect);
+                    sprite.set_proj(
+                        &graphics_state.render_state,
+                        glam::Mat4::orthographic_rh(
+                            proj_center_x - proj_width2 - x,
+                            proj_center_x + proj_width2 - x,
+                            proj_center_y + proj_height2 - y,
+                            proj_center_y - proj_height2 - y,
+                            -1.,
+                            1.,
+                        ),
+                    );
+                    sprite.paint(graphics_state.clone(), ui.painter(), canvas_rect);
                 }
 
                 if matches!(self.selected_layer, SelectedLayer::Events)
@@ -371,7 +402,7 @@ impl MapView {
                         };
                         if let Some(e) = selected_event {
                             if e.id == event.id {
-                                selected_event_rects = Some((tile_rect, box_rect));
+                                selected_event_rects = Some(box_rect);
                             }
                         }
                     }
@@ -386,7 +417,11 @@ impl MapView {
                             );
                             if let Some((_, preview_sprite)) = sprites {
                                 if ui.ctx().screen_rect().contains_rect(response.rect) {
-                                    preview_sprite.paint(&painter, response.rect);
+                                    preview_sprite.paint(
+                                        graphics_state.clone(),
+                                        &painter,
+                                        response.rect,
+                                    );
                                 }
                             }
                             match self.selected_event_id {
@@ -429,7 +464,7 @@ impl MapView {
                                 if let Some(e) = selected_event {
                                     if e.id == event.id {
                                         self.selected_event_is_hovered = true;
-                                        selected_event_rects = Some((tile_rect, box_rect));
+                                        selected_event_rects = Some(box_rect);
                                     }
                                 }
                             }
@@ -440,7 +475,7 @@ impl MapView {
                     if let Some(id) = self.selected_event_id {
                         if dragging_event && id == event.id {
                             selected_event = Some(event);
-                            selected_event_rects = Some((tile_rect, box_rect));
+                            selected_event_rects = Some(box_rect);
                         }
                     }
                 } else {
@@ -468,7 +503,7 @@ impl MapView {
                 // Make sure the event editor isn't open so we don't draw over the
                 // magenta rectangle
                 if !selected_event.extra_data.is_editor_open {
-                    if let Some((tile_rect, box_rect)) = selected_event_rects {
+                    if let Some(box_rect) = selected_event_rects {
                         ui.painter().rect_stroke(
                             box_rect,
                             5.,
diff --git a/src/windows/sound_test.rs b/crates/components/src/sound_tab.rs
similarity index 61%
rename from src/windows/sound_test.rs
rename to crates/components/src/sound_tab.rs
index bc0edd3a..b561733e 100644
--- a/src/windows/sound_test.rs
+++ b/crates/components/src/sound_tab.rs
@@ -22,29 +22,23 @@
 // terms of the Steamworks API by Valve Corporation, the licensors of this
 // Program grant you additional permission to convey the resulting work.
 
-use crate::prelude::*;
-
-/// A tab for a sound (be it BGM, ME, SE, etc)
-/// Optionally can be in 'picker' mode to pick a sound effect.
 pub struct SoundTab {
-    picker: bool,
     /// The source for this tab.
-    pub source: audio::Source,
-    volume: u8,
-    pitch: u8,
-    selected_track: String,
-    folder_children: Vec<filesystem::DirEntry>,
+    pub source: luminol_audio::Source,
+    pub volume: u8,
+    pub pitch: u8,
+    pub selected_track: String,
+    folder_children: Vec<luminol_filesystem::DirEntry>,
 }
 
 impl SoundTab {
     /// Create a new SoundTab
-    pub fn new(source: audio::Source, picker: bool) -> Self {
-        let folder_children = state!()
-            .filesystem
-            .read_dir(format!("Audio/{source}"))
-            .unwrap();
+    pub fn new(
+        filesystem: &impl luminol_filesystem::FileSystem,
+        source: luminol_audio::Source,
+    ) -> Self {
+        let folder_children = filesystem.read_dir(format!("Audio/{source}")).unwrap();
         Self {
-            picker,
             source,
             volume: 100,
             pitch: 100,
@@ -54,7 +48,7 @@ impl SoundTab {
     }
 
     /// Display this SoundTab.
-    pub fn ui(&mut self, ui: &mut egui::Ui) {
+    pub fn ui(&mut self, ui: &mut egui::Ui, update_state: &mut luminol_core::UpdateState<'_>) {
         egui::SidePanel::right("sound_tab_controls")
             .resizable(false)
             .show_inside(ui, |ui| {
@@ -67,14 +61,20 @@ impl SoundTab {
                             let source = self.source;
                             // Play it.
 
-                            if let Err(e) = state!().audio.play(path, volume, pitch, source) {
-                                state!().toasts.error(e);
+                            if let Err(e) = update_state.audio.play(
+                                path,
+                                update_state.filesystem,
+                                volume,
+                                pitch,
+                                source,
+                            ) {
+                                update_state.toasts.error(e.to_string());
                             }
                         }
 
                         if ui.button("Stop").clicked() {
                             // Stop sound.
-                            state!().audio.stop(&self.source);
+                            update_state.audio.stop(&self.source);
                         }
                     });
 
@@ -89,7 +89,7 @@ impl SoundTab {
                             )
                             .changed()
                         {
-                            state!().audio.set_volume(self.volume, &self.source);
+                            update_state.audio.set_volume(self.volume, &self.source);
                         };
                         // Add a pitch slider.
                         // If it's changed, update the pitch.
@@ -101,16 +101,9 @@ impl SoundTab {
                             )
                             .changed()
                         {
-                            state!().audio.set_pitch(self.pitch, &self.source);
+                            update_state.audio.set_pitch(self.pitch, &self.source);
                         };
                     });
-
-                    if self.picker {
-                        ui.horizontal(|ui| {
-                            if ui.button("Cancel").clicked() {}
-                            if ui.button("Ok").clicked() {}
-                        });
-                    }
                 });
             });
 
@@ -146,9 +139,14 @@ impl SoundTab {
                                     let volume = self.volume;
                                     let source = self.source;
 
-                                    if let Err(e) = state!().audio.play(path, volume, pitch, source)
-                                    {
-                                        state!().toasts.error(e);
+                                    if let Err(e) = update_state.audio.play(
+                                        path,
+                                        update_state.filesystem,
+                                        volume,
+                                        pitch,
+                                        source,
+                                    ) {
+                                        update_state.toasts.error(e.to_string());
                                     }
                                 };
                             }
@@ -158,61 +156,3 @@ impl SoundTab {
         });
     }
 }
-
-/// A simple sound test window.
-pub struct Window {
-    sources: Vec<SoundTab>,
-    selected_source: audio::Source,
-}
-
-impl Default for Window {
-    fn default() -> Self {
-        Self {
-            // Create all sources.
-            sources: audio::Source::iter()
-                .map(|s| SoundTab::new(s, false))
-                .collect(),
-            // By default, bgm is selected.
-            selected_source: audio::Source::BGM,
-        }
-    }
-}
-
-impl super::window::Window for Window {
-    fn id(&self) -> egui::Id {
-        egui::Id::new("Sound Test")
-    }
-
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
-        egui::Window::new("Sound Test").open(open).show(ctx, |ui| {
-            egui::TopBottomPanel::top("sound_test_selector").show_inside(ui, |ui| {
-                // Display the tab selector.
-                ui.horizontal_wrapped(|ui| {
-                    for source in &self.sources {
-                        if ui
-                            .selectable_label(
-                                source.source == self.selected_source,
-                                source.source.to_string(),
-                            )
-                            .clicked()
-                        {
-                            self.selected_source = source.source;
-                        }
-                    }
-                })
-            });
-
-            // We should be finding something. The unwrap is safe here.
-            self.sources
-                .iter_mut()
-                .find(|t| t.source == self.selected_source)
-                .unwrap()
-                .ui(ui);
-        });
-    }
-
-    // Technically we don't need the cache, but we do rely on the project being open.
-    fn requires_filesystem(&self) -> bool {
-        true
-    }
-}
diff --git a/src/components/syntax_highlighting.rs b/crates/components/src/syntax_highlighting.rs
similarity index 52%
rename from src/components/syntax_highlighting.rs
rename to crates/components/src/syntax_highlighting.rs
index 2f02111b..6db23be8 100644
--- a/src/components/syntax_highlighting.rs
+++ b/crates/components/src/syntax_highlighting.rs
@@ -27,7 +27,7 @@
 use egui::text::LayoutJob;
 
 /// View some code with syntax highlighting and selection.
-pub fn code_view_ui(ui: &mut egui::Ui, mut code: &str, theme: CodeTheme) {
+pub fn code_view_ui(ui: &mut egui::Ui, mut code: &str, theme: luminol_config::CodeTheme) {
     let language = "rb";
 
     let mut layouter = |ui: &egui::Ui, string: &str, _wrap_width: f32| {
@@ -48,9 +48,19 @@ pub fn code_view_ui(ui: &mut egui::Ui, mut code: &str, theme: CodeTheme) {
 
 /// Memoized Code highlighting
 #[must_use]
-pub fn highlight(ctx: &egui::Context, theme: CodeTheme, code: &str, language: &str) -> LayoutJob {
-    impl egui::util::cache::ComputerMut<(CodeTheme, &str, &str), LayoutJob> for Highlighter {
-        fn compute(&mut self, (theme, code, lang): (CodeTheme, &str, &str)) -> LayoutJob {
+pub fn highlight(
+    ctx: &egui::Context,
+    theme: luminol_config::CodeTheme,
+    code: &str,
+    language: &str,
+) -> LayoutJob {
+    impl egui::util::cache::ComputerMut<(luminol_config::CodeTheme, &str, &str), LayoutJob>
+        for Highlighter
+    {
+        fn compute(
+            &mut self,
+            (theme, code, lang): (luminol_config::CodeTheme, &str, &str),
+        ) -> LayoutJob {
             self.highlight(theme, code, lang)
         }
     }
@@ -63,163 +73,6 @@ pub fn highlight(ctx: &egui::Context, theme: CodeTheme, code: &str, language: &s
     })
 }
 
-#[derive(
-    Clone,
-    Copy,
-    Hash,
-    PartialEq,
-    serde::Deserialize,
-    serde::Serialize,
-    Debug
-)]
-enum SyntectTheme {
-    Base16EightiesDark,
-    Base16MochaDark,
-    Base16OceanDark,
-    Base16OceanLight,
-    InspiredGitHub,
-    SolarizedDark,
-    SolarizedLight,
-}
-
-impl SyntectTheme {
-    fn all() -> impl ExactSizeIterator<Item = Self> {
-        [
-            Self::Base16EightiesDark,
-            Self::Base16MochaDark,
-            Self::Base16OceanDark,
-            Self::Base16OceanLight,
-            Self::InspiredGitHub,
-            Self::SolarizedDark,
-            Self::SolarizedLight,
-        ]
-        .iter()
-        .copied()
-    }
-
-    fn name(self) -> &'static str {
-        match self {
-            Self::Base16EightiesDark => "Base16 Eighties (dark)",
-            Self::Base16MochaDark => "Base16 Mocha (dark)",
-            Self::Base16OceanDark => "Base16 Ocean (dark)",
-            Self::Base16OceanLight => "Base16 Ocean (light)",
-            Self::InspiredGitHub => "InspiredGitHub (light)",
-            Self::SolarizedDark => "Solarized (dark)",
-            Self::SolarizedLight => "Solarized (light)",
-        }
-    }
-
-    fn syntect_key_name(self) -> &'static str {
-        match self {
-            Self::Base16EightiesDark => "base16-eighties.dark",
-            Self::Base16MochaDark => "base16-mocha.dark",
-            Self::Base16OceanDark => "base16-ocean.dark",
-            Self::Base16OceanLight => "base16-ocean.light",
-            Self::InspiredGitHub => "InspiredGitHub",
-            Self::SolarizedDark => "Solarized (dark)",
-            Self::SolarizedLight => "Solarized (light)",
-        }
-    }
-
-    pub fn is_dark(self) -> bool {
-        match self {
-            Self::Base16EightiesDark
-            | Self::Base16MochaDark
-            | Self::Base16OceanDark
-            | Self::SolarizedDark => true,
-
-            Self::Base16OceanLight | Self::InspiredGitHub | Self::SolarizedLight => false,
-        }
-    }
-}
-
-#[derive(
-    Clone,
-    Copy,
-    Hash,
-    PartialEq,
-    serde::Serialize,
-    serde::Deserialize,
-    Debug
-)]
-pub struct CodeTheme {
-    dark_mode: bool,
-
-    syntect_theme: SyntectTheme,
-}
-
-impl Default for CodeTheme {
-    fn default() -> Self {
-        Self::dark()
-    }
-}
-
-impl CodeTheme {
-    #[must_use]
-    pub fn from_style(style: &egui::Style) -> Self {
-        if style.visuals.dark_mode {
-            Self::dark()
-        } else {
-            Self::light()
-        }
-    }
-
-    #[must_use]
-    #[deprecated = "saved state stores code theme now"]
-    pub fn from_memory(ctx: &egui::Context) -> Self {
-        if ctx.style().visuals.dark_mode {
-            ctx.data_mut(|m| {
-                m.get_persisted(egui::Id::new("dark"))
-                    .unwrap_or_else(CodeTheme::dark)
-            })
-        } else {
-            ctx.data_mut(|m| {
-                m.get_persisted(egui::Id::new("light"))
-                    .unwrap_or_else(CodeTheme::light)
-            })
-        }
-    }
-
-    #[deprecated = "saved state stores code theme now"]
-    pub fn store_in_memory(self, ctx: &egui::Context) {
-        if self.dark_mode {
-            ctx.data_mut(|m| {
-                m.insert_persisted(egui::Id::new("dark"), self);
-            });
-        } else {
-            ctx.data_mut(|m| {
-                m.insert_persisted(egui::Id::new("light"), self);
-            });
-        }
-    }
-}
-
-impl CodeTheme {
-    #[must_use]
-    pub const fn dark() -> Self {
-        Self {
-            dark_mode: true,
-            syntect_theme: SyntectTheme::Base16MochaDark,
-        }
-    }
-
-    #[must_use]
-    pub const fn light() -> Self {
-        Self {
-            dark_mode: false,
-            syntect_theme: SyntectTheme::SolarizedLight,
-        }
-    }
-
-    pub fn ui(&mut self, ui: &mut egui::Ui) {
-        for theme in SyntectTheme::all() {
-            if theme.is_dark() == self.dark_mode {
-                ui.radio_value(&mut self.syntect_theme, theme, theme.name());
-            }
-        }
-    }
-}
-
 struct Highlighter {
     ps: syntect::parsing::SyntaxSet,
     ts: syntect::highlighting::ThemeSet,
@@ -236,7 +89,7 @@ impl Default for Highlighter {
 
 impl Highlighter {
     #[allow(clippy::unused_self, clippy::unnecessary_wraps)]
-    fn highlight(&self, theme: CodeTheme, code: &str, lang: &str) -> LayoutJob {
+    fn highlight(&self, theme: luminol_config::CodeTheme, code: &str, lang: &str) -> LayoutJob {
         self.highlight_impl(theme, code, lang).unwrap_or_else(|| {
             // Fallback:
             LayoutJob::simple(
@@ -252,7 +105,12 @@ impl Highlighter {
         })
     }
 
-    fn highlight_impl(&self, theme: CodeTheme, text: &str, language: &str) -> Option<LayoutJob> {
+    fn highlight_impl(
+        &self,
+        theme: luminol_config::CodeTheme,
+        text: &str,
+        language: &str,
+    ) -> Option<LayoutJob> {
         use egui::text::{LayoutSection, TextFormat};
         use syntect::easy::HighlightLines;
         use syntect::highlighting::FontStyle;
diff --git a/src/components/tilepicker.rs b/crates/components/src/tilepicker.rs
similarity index 64%
rename from src/components/tilepicker.rs
rename to crates/components/src/tilepicker.rs
index 3fb1cefe..273abd66 100644
--- a/src/components/tilepicker.rs
+++ b/crates/components/src/tilepicker.rs
@@ -14,8 +14,8 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
-pub use crate::prelude::*;
 
+use itertools::Itertools;
 use slab::Slab;
 use std::sync::Arc;
 use std::time::Duration;
@@ -35,8 +35,35 @@ pub struct Tilepicker {
 
 #[derive(Debug)]
 struct Resources {
-    tiles: primitives::Tiles,
-    viewport: primitives::Viewport,
+    tiles: luminol_graphics::tiles::Tiles,
+    viewport: luminol_graphics::viewport::Viewport,
+}
+
+struct Callback {
+    resources: Arc<Resources>,
+    graphics_state: Arc<luminol_graphics::GraphicsState>,
+}
+
+// FIXME
+unsafe impl Send for Callback {}
+unsafe impl Sync for Callback {}
+
+impl egui_wgpu::CallbackTrait for Callback {
+    fn paint<'a>(
+        &'a self,
+        info: egui::PaintCallbackInfo,
+        render_pass: &mut wgpu::RenderPass<'a>,
+        callback_resources: &'a egui_wgpu::CallbackResources,
+    ) {
+        self.resources.viewport.bind(render_pass);
+        self.resources.tiles.draw(
+            &self.graphics_state,
+            &self.resources.viewport,
+            &[true],
+            None,
+            render_pass,
+        );
+    }
 }
 
 #[derive(Clone, Copy, Debug, Hash, PartialEq, Eq)]
@@ -71,26 +98,35 @@ impl Default for SelectedTile {
 type ResourcesSlab = Slab<Arc<Resources>>;
 
 impl Tilepicker {
-    pub fn new(tileset: &rpg::Tileset) -> Result<Tilepicker, String> {
-        let use_push_constants = state!()
-            .render_state
-            .device
-            .features()
-            .contains(wgpu::Features::PUSH_CONSTANTS);
-        let atlas = state!().atlas_cache.load_atlas(tileset)?;
+    pub fn new(
+        update_state: &luminol_core::UpdateState<'_>,
+        map_id: usize, // FIXME
+    ) -> anyhow::Result<Tilepicker> {
+        let map = update_state
+            .data
+            .get_or_load_map(map_id, update_state.filesystem);
+        let tilesets = update_state.data.tilesets();
+        let tileset = &tilesets[map.tileset_id];
+
+        let atlas = update_state.graphics.atlas_cache.load_atlas(
+            &update_state.graphics,
+            update_state.filesystem,
+            tileset,
+        )?;
 
         let tilepicker_data = (47..(384 + 47))
             .step_by(48)
             .chain(384..(atlas.tileset_height as i16 / 32 * 8 + 384))
             .collect_vec();
-        let tilepicker_data = Table3::new_data(
+        let tilepicker_data = luminol_data::Table3::new_data(
             8,
             1 + (atlas.tileset_height / 32) as usize,
             1,
             tilepicker_data,
         );
 
-        let viewport = primitives::Viewport::new(
+        let viewport = luminol_graphics::viewport::Viewport::new(
+            &update_state.graphics,
             glam::Mat4::orthographic_rh(
                 0.0,
                 256.,
@@ -99,10 +135,15 @@ impl Tilepicker {
                 -1.0,
                 1.0,
             ),
-            use_push_constants,
+            update_state.graphics.push_constants_supported(),
         );
 
-        let tiles = primitives::Tiles::new(atlas, &tilepicker_data, use_push_constants);
+        let tiles = luminol_graphics::tiles::Tiles::new(
+            &update_state.graphics,
+            atlas,
+            &tilepicker_data,
+            update_state.graphics.push_constants_supported(),
+        );
 
         Ok(Self {
             resources: Arc::new(Resources { tiles, viewport }),
@@ -126,12 +167,22 @@ impl Tilepicker {
         }
     }
 
-    pub fn ui(&mut self, ui: &mut egui::Ui, scroll_rect: egui::Rect) -> egui::Response {
+    pub fn ui(
+        &mut self,
+        update_state: &luminol_core::UpdateState<'_>,
+        ui: &mut egui::Ui,
+        scroll_rect: egui::Rect,
+    ) -> egui::Response {
         let time = ui.ctx().input(|i| i.time);
+        let graphics_state = update_state.graphics.clone();
+
         if let Some(ani_time) = self.ani_time {
             if time - ani_time >= 16. / 60. {
                 self.ani_time = Some(time);
-                self.resources.tiles.autotiles.inc_ani_index();
+                self.resources
+                    .tiles
+                    .autotiles
+                    .inc_ani_index(&graphics_state.render_state);
             }
         } else {
             self.ani_time = Some(time);
@@ -145,44 +196,25 @@ impl Tilepicker {
             egui::Sense::click_and_drag(),
         );
 
-        let resources = self.resources.clone();
-        let prepare_id = Arc::new(OnceCell::new());
-        let paint_id = prepare_id.clone();
-
-        resources.viewport.set_proj(glam::Mat4::orthographic_rh(
-            scroll_rect.left(),
-            scroll_rect.right(),
-            scroll_rect.bottom(),
-            scroll_rect.top(),
-            -1.,
-            1.,
-        ));
-        ui.painter().add(egui::PaintCallback {
-            rect: scroll_rect.translate(canvas_rect.min.to_vec2()),
-            callback: Arc::new(
-                egui_wgpu::CallbackFn::new()
-                    .prepare(move |_, _, _encoder, paint_callback_resources| {
-                        let res_hash: &mut ResourcesSlab = paint_callback_resources
-                            .entry()
-                            .or_insert_with(Default::default);
-                        let id = res_hash.insert(resources.clone());
-                        prepare_id.set(id).expect("resources id already set?");
-
-                        vec![]
-                    })
-                    .paint(move |_info, render_pass, paint_callback_resources| {
-                        let res_hash: &ResourcesSlab = paint_callback_resources.get().unwrap();
-                        let id = paint_id.get().copied().expect("resources id is unset");
-                        let resources = &res_hash[id];
-                        let Resources {
-                            tiles, viewport, ..
-                        } = resources.as_ref();
-
-                        viewport.bind(render_pass);
-                        tiles.draw(viewport, &[true], None, render_pass);
-                    }),
+        self.resources.viewport.set_proj(
+            &graphics_state.render_state,
+            glam::Mat4::orthographic_rh(
+                scroll_rect.left(),
+                scroll_rect.right(),
+                scroll_rect.bottom(),
+                scroll_rect.top(),
+                -1.,
+                1.,
             ),
-        });
+        );
+        // FIXME: move this into graphics
+        ui.painter().add(egui_wgpu::Callback::new_paint_callback(
+            scroll_rect.translate(canvas_rect.min.to_vec2()),
+            Callback {
+                resources: self.resources.clone(),
+                graphics_state: graphics_state.clone(),
+            },
+        ));
 
         let rect = egui::Rect::from_x_y_ranges(
             (self.selected_tiles_left * 32) as f32..=((self.selected_tiles_right + 1) * 32) as f32,
diff --git a/crates/config/Cargo.toml b/crates/config/Cargo.toml
new file mode 100644
index 00000000..a6b6f299
--- /dev/null
+++ b/crates/config/Cargo.toml
@@ -0,0 +1,26 @@
+[package]
+name = "luminol-config"
+
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+rust-version.workspace = true
+readme.workspace = true
+repository.workspace = true
+keywords.workspace = true
+categories.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+rust-ini.workspace = true
+
+serde.workspace = true
+
+strum.workspace = true
+ron.workspace = true
+
+once_cell.workspace = true
+
+luminol-data.workspace = true
diff --git a/src/config/command_db.rs b/crates/config/src/command_db.rs
similarity index 97%
rename from src/config/command_db.rs
rename to crates/config/src/command_db.rs
index d0d47172..f3f6dc91 100644
--- a/src/config/command_db.rs
+++ b/crates/config/src/command_db.rs
@@ -22,8 +22,9 @@
 // terms of the Steamworks API by Valve Corporation, the licensors of this
 // Program grant you additional permission to convey the resulting work.
 
-use command_lib::CommandDescription;
+use luminol_data::commands::CommandDescription;
 use once_cell::sync::Lazy;
+
 use serde::{Deserialize, Serialize};
 
 use super::RMVer;
@@ -51,6 +52,7 @@ pub struct CommandDB {
     /// Default commands
     default: Vec<CommandDescription>,
     /// User defined commands
+    // FIXME: visible to user?
     pub user: Vec<CommandDescription>,
 }
 
diff --git a/src/config/commands/ace.ron b/crates/config/src/commands/ace.ron
similarity index 100%
rename from src/config/commands/ace.ron
rename to crates/config/src/commands/ace.ron
diff --git a/src/config/commands/vx.ron b/crates/config/src/commands/vx.ron
similarity index 100%
rename from src/config/commands/vx.ron
rename to crates/config/src/commands/vx.ron
diff --git a/src/config/commands/xp.ron b/crates/config/src/commands/xp.ron
similarity index 100%
rename from src/config/commands/xp.ron
rename to crates/config/src/commands/xp.ron
diff --git a/src/config/global.rs b/crates/config/src/global.rs
similarity index 93%
rename from src/config/global.rs
rename to crates/config/src/global.rs
index 128f4c65..c171db2f 100644
--- a/src/config/global.rs
+++ b/crates/config/src/global.rs
@@ -22,7 +22,8 @@
 // terms of the Steamworks API by Valve Corporation, the licensors of this
 // Program grant you additional permission to convey the resulting work.
 
-use crate::prelude::*;
+use crate::CodeTheme;
+
 use std::collections::HashMap;
 use std::collections::VecDeque;
 
@@ -38,7 +39,7 @@ pub struct Config {
     pub recent_projects: VecDeque<(String, String)>,
 
     /// The current code theme
-    pub theme: syntax_highlighting::CodeTheme,
+    pub theme: CodeTheme,
     pub rtp_paths: HashMap<String, String>,
 }
 
@@ -52,7 +53,7 @@ impl Config {
     pub fn new() -> Self {
         Self {
             recent_projects: VecDeque::new(),
-            theme: syntax_highlighting::CodeTheme::dark(),
+            theme: CodeTheme::dark(),
             rtp_paths: HashMap::new(),
         }
     }
diff --git a/crates/config/src/lib.rs b/crates/config/src/lib.rs
new file mode 100644
index 00000000..79b72d02
--- /dev/null
+++ b/crates/config/src/lib.rs
@@ -0,0 +1,133 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
+
+pub mod command_db;
+pub mod global;
+pub mod project;
+
+#[derive(Default, Clone, Copy, PartialEq, Eq, Hash, Debug)]
+#[derive(serde::Serialize, serde::Deserialize)]
+#[derive(strum::EnumIter, strum::Display)]
+#[allow(missing_docs)]
+pub enum RGSSVer {
+    #[strum(to_string = "ModShot")]
+    ModShot,
+    #[strum(to_string = "mkxp-oneshot")]
+    MKXPOneShot,
+    #[strum(to_string = "rsgss")]
+    RSGSS,
+    #[strum(to_string = "mkxp")]
+    MKXP,
+    #[strum(to_string = "mkxp-freebird")]
+    MKXPFreebird,
+    #[strum(to_string = "mkxp-z")]
+    MKXPZ,
+    #[default]
+    #[strum(to_string = "Stock RGSS1")]
+    RGSS1,
+}
+
+#[derive(Default, Clone, Copy, PartialEq, Eq, Hash, Debug)]
+#[derive(serde::Serialize, serde::Deserialize)]
+#[derive(strum::EnumIter, strum::Display)]
+#[allow(missing_docs)]
+pub enum RMVer {
+    #[default]
+    #[strum(to_string = "RPG Maker XP")]
+    XP = 1,
+    #[strum(to_string = "RPG Maker VX")]
+    VX = 2,
+    #[strum(to_string = "RPG Maker VX Ace")]
+    Ace = 3,
+}
+
+#[derive(Clone, Copy, Hash, PartialEq, Debug)]
+#[derive(serde::Serialize, serde::Deserialize)]
+pub struct CodeTheme {
+    pub dark_mode: bool,
+
+    pub syntect_theme: SyntectTheme,
+}
+
+impl Default for CodeTheme {
+    fn default() -> Self {
+        Self::dark()
+    }
+}
+
+impl CodeTheme {
+    #[must_use]
+    pub const fn dark() -> Self {
+        Self {
+            dark_mode: true,
+            syntect_theme: SyntectTheme::Base16MochaDark,
+        }
+    }
+
+    #[must_use]
+    pub const fn light() -> Self {
+        Self {
+            dark_mode: false,
+            syntect_theme: SyntectTheme::SolarizedLight,
+        }
+    }
+}
+
+#[derive(Clone, Copy, Hash, PartialEq, Debug)]
+#[derive(serde::Deserialize, serde::Serialize)]
+#[derive(strum::EnumIter, strum::Display)]
+pub enum SyntectTheme {
+    #[strum(to_string = "Base16 Eighties (dark)")]
+    Base16EightiesDark,
+    #[strum(to_string = "Base16 Mocha (dark)")]
+    Base16MochaDark,
+    #[strum(to_string = "Base16 Ocean (dark)")]
+    Base16OceanDark,
+    #[strum(to_string = "Base16 Ocean (light)")]
+    Base16OceanLight,
+    #[strum(to_string = "InspiredGitHub (light)")]
+    InspiredGitHub,
+    #[strum(to_string = "Solarized (dark)")]
+    SolarizedDark,
+    #[strum(to_string = "Solarized (light)")]
+    SolarizedLight,
+}
+
+impl SyntectTheme {
+    pub fn syntect_key_name(self) -> &'static str {
+        match self {
+            Self::Base16EightiesDark => "base16-eighties.dark",
+            Self::Base16MochaDark => "base16-mocha.dark",
+            Self::Base16OceanDark => "base16-ocean.dark",
+            Self::Base16OceanLight => "base16-ocean.light",
+            Self::InspiredGitHub => "InspiredGitHub",
+            Self::SolarizedDark => "Solarized (dark)",
+            Self::SolarizedLight => "Solarized (light)",
+        }
+    }
+
+    pub fn is_dark(self) -> bool {
+        match self {
+            Self::Base16EightiesDark
+            | Self::Base16MochaDark
+            | Self::Base16OceanDark
+            | Self::SolarizedDark => true,
+
+            Self::Base16OceanLight | Self::InspiredGitHub | Self::SolarizedLight => false,
+        }
+    }
+}
diff --git a/src/config/project.rs b/crates/config/src/project.rs
similarity index 67%
rename from src/config/project.rs
rename to crates/config/src/project.rs
index cd0bf1a4..58318129 100644
--- a/src/config/project.rs
+++ b/crates/config/src/project.rs
@@ -21,15 +21,23 @@
 // it with Steamworks API by Valve Corporation, containing parts covered by
 // terms of the Steamworks API by Valve Corporation, the licensors of this
 // Program grant you additional permission to convey the resulting work.
-
-use super::{RGSSVer, RMVer};
 use serde::{Deserialize, Serialize};
 
+use super::{command_db, RGSSVer, RMVer};
+
+#[derive(Debug, Clone)]
+#[allow(clippy::large_enum_variant)]
+pub struct Config {
+    pub project: Project,
+    pub command_db: command_db::CommandDB,
+    pub game_ini: ini::Ini,
+}
+
 #[derive(Serialize, Deserialize, Debug, Clone)]
 #[serde(default)]
 /// Local luminol project config
 #[allow(missing_docs)]
-pub struct Config {
+pub struct Project {
     pub project_name: String,
     pub scripts_path: String,
     pub use_ron: bool,
@@ -39,7 +47,7 @@ pub struct Config {
     pub prefer_rgssad: bool,
 }
 
-impl Default for Config {
+impl Default for Project {
     fn default() -> Self {
         Self {
             project_name: String::new(),
@@ -52,3 +60,25 @@ impl Default for Config {
         }
     }
 }
+
+impl Config {
+    pub fn from_project(project: Project) -> Self {
+        let mut game_ini = ini::Ini::new();
+        game_ini
+            .with_section(Some("Game"))
+            .set("Library", "RGSS104E.dll")
+            .set("Scripts", format!("Data/{}", project.scripts_path))
+            .set("Title", &project.project_name)
+            .set("RTP1", "")
+            .set("RTP2", "")
+            .set("RTP3", "");
+
+        let command_db = command_db::CommandDB::new(project.editor_ver);
+
+        Self {
+            project,
+            command_db,
+            game_ini,
+        }
+    }
+}
diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml
new file mode 100644
index 00000000..a3a6471c
--- /dev/null
+++ b/crates/core/Cargo.toml
@@ -0,0 +1,39 @@
+[package]
+name = "luminol-core"
+
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+rust-version.workspace = true
+readme.workspace = true
+repository.workspace = true
+keywords.workspace = true
+categories.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+egui.workspace = true
+
+egui_dock = "0.8.2"
+egui-notify = "0.10.0"
+
+parking_lot.workspace = true
+
+anyhow.workspace = true
+camino.workspace = true
+bitflags.workspace = true
+
+strum.workspace = true
+serde.workspace = true
+alox-48.workspace = true
+
+rand.workspace = true
+getrandom.workspace = true
+
+luminol-audio.workspace = true
+luminol-config.workspace = true
+luminol-data.workspace = true
+luminol-filesystem.workspace = true
+luminol-graphics.workspace = true
diff --git a/crates/core/src/data_cache.rs b/crates/core/src/data_cache.rs
new file mode 100644
index 00000000..6caba68e
--- /dev/null
+++ b/crates/core/src/data_cache.rs
@@ -0,0 +1,412 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
+//
+//     Additional permission under GNU GPL version 3 section 7
+//
+// If you modify this Program, or any covered work, by linking or combining
+// it with Steamworks API by Valve Corporation, containing parts covered by
+// terms of the Steamworks API by Valve Corporation, the licensors of this
+// Program grant you additional permission to convey the resulting work.
+
+use anyhow::Context;
+use luminol_data::rpg;
+use std::{
+    cell::{RefCell, RefMut},
+    collections::HashMap,
+};
+
+// TODO convert this to an option like project config?
+#[allow(clippy::large_enum_variant)]
+#[derive(Default, Debug)]
+pub enum Data {
+    #[default]
+    Unloaded,
+    Loaded {
+        actors: RefCell<rpg::Actors>,
+        animations: RefCell<rpg::Animations>,
+        armors: RefCell<rpg::Armors>,
+        classes: RefCell<rpg::Classes>,
+        common_events: RefCell<rpg::CommonEvents>,
+        enemies: RefCell<rpg::Enemies>,
+        items: RefCell<rpg::Items>,
+        map_infos: RefCell<rpg::MapInfos>,
+        scripts: RefCell<Vec<rpg::Script>>,
+        skills: RefCell<rpg::Skills>,
+        states: RefCell<rpg::States>,
+        system: RefCell<rpg::System>,
+        tilesets: RefCell<rpg::Tilesets>,
+        troops: RefCell<rpg::Troops>,
+        weapons: RefCell<rpg::Weapons>,
+
+        maps: RefCell<HashMap<usize, rpg::Map>>,
+    },
+}
+
+fn read_data<T>(
+    filesystem: &impl luminol_filesystem::FileSystem,
+    filename: impl AsRef<camino::Utf8Path>,
+) -> anyhow::Result<T>
+where
+    T: serde::de::DeserializeOwned,
+{
+    let path = camino::Utf8PathBuf::from("Data").join(filename);
+    let data = filesystem.read(path)?;
+
+    alox_48::from_bytes(&data).map_err(anyhow::Error::from)
+}
+
+fn write_data(
+    data: &impl serde::Serialize,
+    filesystem: &impl luminol_filesystem::FileSystem,
+    filename: impl AsRef<camino::Utf8Path>,
+) -> anyhow::Result<()> {
+    let path = camino::Utf8PathBuf::from("Data").join(filename);
+
+    let bytes = alox_48::to_bytes(data)?;
+    filesystem.write(path, bytes).map_err(anyhow::Error::from)
+}
+
+fn read_nil_padded<T>(
+    filesystem: &impl luminol_filesystem::FileSystem,
+    filename: impl AsRef<camino::Utf8Path>,
+) -> anyhow::Result<Vec<T>>
+where
+    T: serde::de::DeserializeOwned,
+{
+    let path = camino::Utf8PathBuf::from("Data").join(filename);
+    let data = filesystem.read(path)?;
+
+    let mut de = alox_48::Deserializer::new(&data)?;
+
+    luminol_data::helpers::nil_padded::deserialize(&mut de).map_err(anyhow::Error::from)
+}
+
+fn write_nil_padded(
+    data: &[impl serde::Serialize],
+    filesystem: &impl luminol_filesystem::FileSystem,
+    filename: impl AsRef<camino::Utf8Path>,
+) -> anyhow::Result<()> {
+    let path = camino::Utf8PathBuf::from("Data").join(filename);
+
+    let mut ser = alox_48::Serializer::new();
+
+    luminol_data::helpers::nil_padded::serialize(data, &mut ser)?;
+    filesystem
+        .write(path, ser.output)
+        .map_err(anyhow::Error::from)
+}
+
+impl Data {
+    /// Load all data required when opening a project.
+    /// Does not load config. That is expected to have been loaded beforehand.
+    pub fn load(
+        &mut self,
+        filesystem: &impl luminol_filesystem::FileSystem,
+        config: &mut luminol_config::project::Config,
+    ) -> anyhow::Result<()> {
+        let actors = RefCell::new(
+            read_nil_padded(filesystem, "Actors.rxdata").context("while reading actor data")?,
+        );
+        let animations = RefCell::new(
+            read_nil_padded(filesystem, "Animations.rxdata")
+                .context("while reading animation data")?,
+        );
+        let armors = RefCell::new(
+            read_nil_padded(filesystem, "Armors.rxdata").context("while reading armor data")?,
+        );
+        let classes = RefCell::new(
+            read_nil_padded(filesystem, "Classes.rxdata").context("while reading class data")?,
+        );
+        let common_events = RefCell::new(
+            read_nil_padded(filesystem, "CommonEvents.rxdata")
+                .context("while reading common events")?,
+        );
+        let enemies = RefCell::new(
+            read_nil_padded(filesystem, "Enemies.rxdata").context("while reading enemy data")?,
+        );
+        let items = RefCell::new(
+            read_nil_padded(filesystem, "Items.rxdata").context("while reading item data")?,
+        );
+        let skills = RefCell::new(
+            read_nil_padded(filesystem, "Skills.rxdata").context("while reading skill data")?,
+        );
+        let states = RefCell::new(
+            read_nil_padded(filesystem, "States.rxdata").context("while reading state data")?,
+        );
+        let tilesets = RefCell::new(
+            read_nil_padded(filesystem, "Tilesets.rxdata").context("while reading tileset data")?,
+        );
+        let troops = RefCell::new(
+            read_nil_padded(filesystem, "Troops.rxdata").context("while reading troop data")?,
+        );
+        let weapons = RefCell::new(
+            read_nil_padded(filesystem, "Weapons.rxdata").context("while reading weapon data")?,
+        );
+
+        let map_infos = RefCell::new(
+            read_data(filesystem, "MapInfos.rxdata").context("while reading map infos")?,
+        );
+
+        let mut system = read_data::<rpg::System>(filesystem, "System.rxdata")
+            .context("while reading system")?;
+        system.magic_number = rand::random();
+
+        let system = RefCell::new(system);
+
+        let mut scripts = None;
+        let scripts_paths = [
+            std::mem::take(&mut config.project.scripts_path),
+            "xScripts".to_string(),
+            "Scripts".to_string(),
+        ];
+
+        for script_path in scripts_paths {
+            match read_data(filesystem, format!("{script_path}.rxdata")) {
+                Ok(s) => {
+                    config.project.scripts_path = script_path;
+                    scripts = Some(s);
+                    break;
+                }
+                Err(e) => eprintln!("error loading scripts from {script_path}: {e}"),
+            }
+        }
+        let Some(scripts) = scripts else {
+            anyhow::bail!(
+                "Unable to load scripts (tried {}, xScripts, and Scripts first)",
+                config.project.scripts_path
+            );
+        };
+        let scripts = RefCell::new(scripts);
+
+        let maps = RefCell::new(std::collections::HashMap::with_capacity(32));
+
+        *self = Self::Loaded {
+            actors,
+            animations,
+            armors,
+            classes,
+            common_events,
+            enemies,
+            items,
+            map_infos,
+            scripts,
+            skills,
+            states,
+            system,
+            tilesets,
+            troops,
+            weapons,
+            maps,
+        };
+
+        Ok(())
+    }
+
+    pub fn unload(&mut self) {
+        *self = Self::Unloaded;
+    }
+
+    pub fn from_defaults() -> Self {
+        let actors = RefCell::new(vec![rpg::Actor::default()]);
+        let animations = RefCell::new(vec![rpg::Animation::default()]);
+        let armors = RefCell::new(vec![rpg::Armor::default()]);
+        let classes = RefCell::new(vec![rpg::Class::default()]);
+        let common_events = RefCell::new(vec![rpg::CommonEvent::default()]);
+        let enemies = RefCell::new(vec![rpg::Enemy::default()]);
+        let items = RefCell::new(vec![rpg::Item::default()]);
+        let skills = RefCell::new(vec![rpg::Skill::default()]);
+        let states = RefCell::new(vec![rpg::State::default()]);
+        let tilesets = RefCell::new(vec![rpg::Tileset::default()]);
+        let troops = RefCell::new(vec![rpg::Troop::default()]);
+        let weapons = RefCell::new(vec![rpg::Weapon::default()]);
+
+        let mut map_infos = std::collections::HashMap::with_capacity(16);
+        map_infos.insert(1, rpg::MapInfo::default());
+        let map_infos = RefCell::new(map_infos);
+
+        let system = rpg::System {
+            magic_number: rand::random(),
+            ..Default::default()
+        };
+        let system = RefCell::new(system);
+
+        let scripts = vec![]; // FIXME legality of providing defualt scripts is unclear
+        let scripts = RefCell::new(scripts);
+
+        let mut maps = std::collections::HashMap::with_capacity(32);
+        maps.insert(1, rpg::Map::default());
+        let maps = RefCell::new(maps);
+
+        Self::Loaded {
+            actors,
+            animations,
+            armors,
+            classes,
+            common_events,
+            enemies,
+            items,
+            map_infos,
+            scripts,
+            skills,
+            states,
+            system,
+            tilesets,
+            troops,
+            weapons,
+            maps,
+        }
+    }
+
+    pub fn rxdata_ext(&self) -> &'static str {
+        todo!()
+    }
+
+    /// Save all cached data to disk.
+    // we take an &mut self to ensure no outsanding borrows of the cache exist.
+    pub fn save(
+        &mut self,
+        filesystem: &impl luminol_filesystem::FileSystem,
+        config: &luminol_config::project::Config,
+    ) -> anyhow::Result<()> {
+        let Self::Loaded {
+            actors,
+            animations,
+            armors,
+            classes,
+            common_events,
+            enemies,
+            items,
+            map_infos,
+            scripts,
+            skills,
+            states,
+            system,
+            tilesets,
+            troops,
+            weapons,
+            maps,
+        } = self
+        else {
+            panic!("project not loaded")
+        };
+
+        write_nil_padded(actors.get_mut(), filesystem, "Actors.rxdata")
+            .context("while saving actor data")?;
+        write_nil_padded(animations.get_mut(), filesystem, "Animations.rxdata")
+            .context("while saving animation data")?;
+        write_nil_padded(armors.get_mut(), filesystem, "Armors.rxdata")
+            .context("while saving armor data")?;
+        write_nil_padded(classes.get_mut(), filesystem, "Classes.rxdata")
+            .context("while saving class data")?;
+        write_nil_padded(common_events.get_mut(), filesystem, "CommonEvents.rxdata")
+            .context("while saving common event data")?;
+        write_nil_padded(enemies.get_mut(), filesystem, "Enemies.rxdata")
+            .context("while saving enemy data")?;
+        write_nil_padded(items.get_mut(), filesystem, "Items.rxdata")
+            .context("while saving item data")?;
+        write_nil_padded(skills.get_mut(), filesystem, "Skills.rxdata")
+            .context("while saving skill data")?;
+        write_nil_padded(states.get_mut(), filesystem, "States.rxdata")
+            .context("while saving state data")?;
+        write_nil_padded(tilesets.get_mut(), filesystem, "Tilesets.rxdata")
+            .context("while saving tileset data")?;
+        write_nil_padded(troops.get_mut(), filesystem, "Troops.rxdata")
+            .context("while saving troop data")?;
+        write_nil_padded(weapons.get_mut(), filesystem, "Weapons.rxdata")
+            .context("while saving weapons data")?;
+
+        write_data(map_infos.get_mut(), filesystem, "MapInfos.rxdata")
+            .context("while saving map infos")?;
+
+        let system = system.get_mut();
+        system.magic_number = rand::random();
+        write_data(system, filesystem, "System.rxdata").context("while saving system")?;
+
+        write_data(
+            scripts.get_mut(),
+            filesystem,
+            format!("{}.rxdata", config.project.scripts_path),
+        )?;
+
+        maps.get_mut().iter().try_for_each(|(id, map)| {
+            write_data(map, filesystem, format!("Map{id:0>3}.rxdata"))
+                .with_context(|| format!("while saving map {id:0>3}"))
+        })
+    }
+}
+
+macro_rules! nested_ref_getter {
+    ($($typ:ty, $name:ident),* $(,)?) => {
+        $(
+            #[allow(unsafe_code, dead_code)]
+            pub fn $name(&self) -> RefMut<$typ> {
+                match self {
+                    Self::Unloaded => panic!("data cache unloaded"),
+                    Self::Loaded { $name, ..} => $name.borrow_mut(),
+                }
+            }
+        )+
+    };
+
+}
+
+impl Data {
+    nested_ref_getter! {
+        rpg::Actors, actors,
+        rpg::Animations, animations,
+        rpg::Armors, armors,
+        rpg::Classes, classes,
+        rpg::CommonEvents, common_events,
+        rpg::Enemies, enemies,
+        rpg::Items, items,
+        rpg::MapInfos, map_infos,
+        Vec<rpg::Script>, scripts,
+        rpg::Skills, skills,
+        rpg::States, states,
+        rpg::System, system,
+        rpg::Tilesets, tilesets,
+        rpg::Troops, troops,
+        rpg::Weapons, weapons,
+    }
+
+    /// Load a map.
+    #[allow(clippy::panic)]
+    pub fn get_or_load_map(
+        &self,
+        id: usize,
+        filesystem: &impl luminol_filesystem::FileSystem,
+    ) -> RefMut<rpg::Map> {
+        let maps_ref = match self {
+            Self::Loaded { maps, .. } => maps.borrow_mut(),
+            Self::Unloaded => panic!("project not loaded"),
+        };
+        RefMut::map(maps_ref, |maps| {
+            // FIXME
+            maps.entry(id).or_insert_with(|| {
+                read_data(filesystem, format!("Map{id:0>3}.rxdata")).expect("failed to load map")
+            })
+        })
+    }
+
+    pub fn get_map(&self, id: usize) -> RefMut<rpg::Map> {
+        let maps_ref = match self {
+            Self::Loaded { maps, .. } => maps.borrow_mut(),
+            Self::Unloaded => panic!("project not loaded"),
+        };
+        RefMut::map(maps_ref, |maps| maps.get_mut(&id).expect("map not loaded"))
+    }
+}
diff --git a/crates/core/src/lib.rs b/crates/core/src/lib.rs
new file mode 100644
index 00000000..7723b7c9
--- /dev/null
+++ b/crates/core/src/lib.rs
@@ -0,0 +1,119 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
+//
+//     Additional permission under GNU GPL version 3 section 7
+//
+// If you modify this Program, or any covered work, by linking or combining
+// it with Steamworks API by Valve Corporation, containing parts covered by
+// terms of the Steamworks API by Valve Corporation, the licensors of this
+// Program grant you additional permission to convey the resulting work.
+
+use std::sync::Arc;
+
+mod tab;
+pub use tab::{EditTabs, Tab, Tabs};
+
+mod window;
+pub use window::{EditWindows, Window, Windows};
+
+pub mod modal;
+pub use modal::Modal;
+
+mod data_cache;
+pub use data_cache::Data;
+
+/// Toasts to be displayed for errors, information, etc.
+mod toasts;
+pub use toasts::Toasts;
+
+pub struct UpdateState<'res> {
+    #[cfg(not(target_arch = "wasm32"))]
+    pub audio: &'res mut luminol_audio::Audio,
+    #[cfg(target_arch = "wasm32")]
+    pub audio: &'res mut luminol_audio::AudioWrapper,
+
+    pub graphics: Arc<luminol_graphics::GraphicsState>,
+    pub filesystem: &'res mut luminol_filesystem::project::FileSystem, // FIXME: this is probably wrong
+    pub data: &'res mut Data, // FIXME: this is also probably wrong
+
+    // TODO: look into std::any?
+    // we're using generics here to allow specialization on the type of window
+    // this is fucntionality not really used atm but maybe in the future..?
+    pub edit_windows: &'res mut EditWindows,
+    pub edit_tabs: &'res mut EditTabs,
+    pub toasts: &'res mut Toasts,
+
+    pub project_config: &'res mut Option<luminol_config::project::Config>,
+    pub global_config: &'res mut luminol_config::global::Config,
+
+    pub toolbar: &'res mut ToolbarState,
+}
+
+#[allow(missing_docs)]
+#[derive(Default)]
+pub struct ToolbarState {
+    /// The currently selected pencil.
+    pub pencil: Pencil,
+}
+
+#[derive(Default, strum::EnumIter, strum::Display, PartialEq, Eq, Clone, Copy)]
+#[allow(missing_docs)]
+pub enum Pencil {
+    #[default]
+    Pen,
+    Circle,
+    Rectangle,
+    Fill,
+}
+
+impl<'res> UpdateState<'res> {
+    pub(crate) fn reborrow_with_edit_window<'this>(
+        &'this mut self,
+        edit_windows: &'this mut window::EditWindows,
+    ) -> UpdateState<'this> {
+        UpdateState {
+            audio: self.audio,
+            graphics: self.graphics.clone(),
+            filesystem: self.filesystem,
+            data: self.data,
+            edit_tabs: self.edit_tabs,
+            edit_windows,
+            toasts: self.toasts,
+            project_config: self.project_config,
+            global_config: self.global_config,
+            toolbar: self.toolbar,
+        }
+    }
+
+    pub(crate) fn reborrow_with_edit_tabs<'this>(
+        &'this mut self,
+        edit_tabs: &'this mut tab::EditTabs,
+    ) -> UpdateState<'this> {
+        UpdateState {
+            audio: self.audio,
+            graphics: self.graphics.clone(),
+            filesystem: self.filesystem,
+            data: self.data,
+            edit_tabs,
+            edit_windows: self.edit_windows,
+            toasts: self.toasts,
+            project_config: self.project_config,
+            global_config: self.global_config,
+            toolbar: self.toolbar,
+        }
+    }
+}
diff --git a/src/modals/modal.rs b/crates/core/src/modal.rs
similarity index 82%
rename from src/modals/modal.rs
rename to crates/core/src/modal.rs
index 17fa5a6c..64fe6fe0 100644
--- a/src/modals/modal.rs
+++ b/crates/core/src/modal.rs
@@ -29,17 +29,24 @@
 /// Modals are not persistent (unlike windows) and are not stored on the heap.
 /// They are stored on the stack and the stack *only*.
 // TODO: Make more featureful and general
-pub trait Modal {
+pub trait Modal: Sized {
     /// The output type for this modal.
     type Data;
 
-    /// Set the modal Id
-    fn id(self, id: egui::Id) -> Self;
-
     /// Display a button to show this modal.
     /// It should call show.
-    fn button(self, ui: &mut egui::Ui, state: &mut bool, data: &mut Self::Data) -> Self;
+    fn button(
+        this: &mut Option<Self>,
+        ui: &mut egui::Ui,
+        data: &mut Self::Data,
+        update_state: &mut crate::UpdateState<'_>,
+    );
 
     /// Show this modal.
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool, data: &mut Self::Data);
+    fn show(
+        this: &mut Option<Self>,
+        ctx: &egui::Context,
+        data: &mut Self::Data,
+        update_state: &mut crate::UpdateState<'_>,
+    );
 }
diff --git a/crates/core/src/tab.rs b/crates/core/src/tab.rs
new file mode 100644
index 00000000..31bf036a
--- /dev/null
+++ b/crates/core/src/tab.rs
@@ -0,0 +1,227 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
+//
+//     Additional permission under GNU GPL version 3 section 7
+//
+// If you modify this Program, or any covered work, by linking or combining
+// it with Steamworks API by Valve Corporation, containing parts covered by
+// terms of the Steamworks API by Valve Corporation, the licensors of this
+// Program grant you additional permission to convey the resulting work.
+
+/// Helper struct for tabs.
+pub struct Tabs {
+    dock_state: egui_dock::DockState<Box<dyn Tab>>,
+
+    id: egui::Id,
+}
+
+#[derive(Default)]
+pub struct EditTabs {
+    clean_fn: Option<CleanFn>,
+    added: Vec<Box<dyn Tab>>,
+    removed: std::collections::HashSet<egui::Id>,
+}
+
+type CleanFn = Box<dyn Fn(&Box<dyn Tab>) -> bool>;
+
+struct TabViewer<'a, 'res> {
+    // FIXME: variance
+    update_state: &'a mut crate::UpdateState<'res>,
+}
+
+impl Tabs {
+    pub fn new(id: impl std::hash::Hash) -> Self {
+        Self {
+            id: egui::Id::new(id),
+            dock_state: egui_dock::DockState::new(Vec::with_capacity(4)),
+        }
+    }
+
+    /// Create a new Tab viewer without any tabs.
+    pub fn new_with_tabs(id: impl std::hash::Hash, tabs: Vec<impl Tab + 'static>) -> Self {
+        Self {
+            id: egui::Id::new(id),
+            dock_state: egui_dock::DockState::new(
+                tabs.into_iter().map(|t| Box::new(t) as Box<_>).collect(),
+            ),
+        }
+    }
+
+    pub fn process_edit_tabs(&mut self, mut edit_tabs: EditTabs) {
+        for tab in edit_tabs.added.drain(..) {
+            self.add_boxed_tab(tab)
+        }
+        if let Some(f) = edit_tabs.clean_fn.take() {
+            self.clean_tabs(f);
+        }
+    }
+
+    pub fn ui_without_edit(
+        &mut self,
+        ui: &mut egui::Ui,
+        update_state: &mut crate::UpdateState<'_>,
+    ) {
+        egui_dock::DockArea::new(&mut self.dock_state)
+            .id(self.id)
+            .show_inside(ui, &mut TabViewer { update_state });
+    }
+
+    /// Display all tabs.
+    pub fn ui(&mut self, ui: &mut egui::Ui, update_state: &mut crate::UpdateState) {
+        let mut edit_tabs = EditTabs::default();
+        let mut update_state = update_state.reborrow_with_edit_tabs(&mut edit_tabs);
+
+        egui_dock::DockArea::new(&mut self.dock_state)
+            .id(self.id)
+            .show_inside(
+                ui,
+                &mut TabViewer {
+                    update_state: &mut update_state,
+                },
+            );
+
+        self.process_edit_tabs(edit_tabs);
+    }
+
+    /// Add a tab.
+    pub fn add_tab(&mut self, tab: impl Tab + 'static) {
+        self.add_boxed_tab(Box::new(tab))
+    }
+
+    fn add_boxed_tab(&mut self, tab: Box<dyn Tab>) {
+        // FIXME O(n)
+        for node in self.dock_state.iter_nodes() {
+            if let egui_dock::Node::Leaf { tabs, .. } = node {
+                if tabs.iter().any(|t| t.id() == tab.id()) {
+                    return;
+                }
+            }
+        }
+        self.dock_state.push_to_focused_leaf(tab);
+    }
+
+    /// Removes tabs that the provided closure returns `false` when called.
+    pub fn clean_tabs(&mut self, mut f: impl Fn(&Box<dyn Tab>) -> bool) {
+        // i hate egui dock
+        for i in 0.. {
+            let Some(surface) = self.dock_state.get_surface_mut(egui_dock::SurfaceIndex(i)) else {
+                break;
+            };
+            if let Some(tree) = surface.node_tree_mut() {
+                for node in tree.iter_mut() {
+                    if let egui_dock::Node::Leaf { tabs, .. } = node {
+                        tabs.retain(&mut f);
+                    }
+                }
+            }
+        }
+    }
+
+    /// Returns the name of the focused tab.
+    pub fn focused_name(&self) -> Option<String> {
+        None
+    }
+}
+
+impl EditTabs {
+    pub fn clean(&mut self, f: impl Fn(&Box<dyn Tab>) -> bool + 'static) {
+        self.clean_fn = Some(Box::new(f));
+    }
+
+    pub fn add_tab(&mut self, tab: impl Tab + 'static) {
+        self.added.push(Box::new(tab))
+    }
+
+    pub fn remove_tab<T>(&mut self, tab: &impl Tab) -> bool {
+        self.remove_tab_by_id(tab.id())
+    }
+
+    pub fn remove_tab_by_id(&mut self, id: egui::Id) -> bool {
+        self.removed.insert(id)
+    }
+}
+
+impl<'a, 'res> egui_dock::TabViewer for TabViewer<'a, 'res> {
+    type Tab = Box<dyn Tab>;
+
+    fn title(&mut self, tab: &mut Self::Tab) -> egui::WidgetText {
+        tab.name(self.update_state).into()
+    }
+
+    fn ui(&mut self, ui: &mut egui::Ui, tab: &mut Self::Tab) {
+        ui.push_id(tab.id(), |ui| tab.show(ui, self.update_state));
+    }
+
+    fn force_close(&mut self, tab: &mut Self::Tab) -> bool {
+        tab.force_close()
+    }
+}
+
+/// A tab trait.
+pub trait Tab {
+    /// Optionally used as the title of the tab.
+    fn name(&self, _: &crate::UpdateState<'_>) -> String {
+        "Untitled Window".to_string()
+    }
+
+    /// Required to prevent duplication.
+    fn id(&self) -> egui::Id;
+
+    /// Show this tab.
+    fn show(&mut self, ui: &mut egui::Ui, update_state: &mut crate::UpdateState<'_>);
+
+    /// Does this tab need the filesystem?
+    fn requires_filesystem(&self) -> bool {
+        false
+    }
+
+    /// Does this tab need to be closed?
+    fn force_close(&mut self) -> bool {
+        false
+    }
+}
+
+/*
+impl Tab for Box<dyn Tab + Send> {
+    fn force_close(&mut self) -> bool {
+        self.as_mut().force_close()
+    }
+
+    fn name(&self) -> String {
+        self.as_ref().name()
+    }
+
+    fn id(&self) -> egui::Id {
+        self.as_ref().id()
+    }
+
+    fn requires_filesystem(&self) -> bool {
+        self.as_ref().requires_filesystem()
+    }
+
+    fn show<'res, W, T>(
+        &mut self,
+        ui: &mut egui::Ui,
+        update_state: &mut crate::UpdateState<'res, W, T>,
+    ) where
+        W: crate::Window,
+        T: Tab,
+    {
+        self.as_mut().show(ui, update_state)
+    }
+}
+*/
diff --git a/src/components/toasts.rs b/crates/core/src/toasts.rs
similarity index 69%
rename from src/components/toasts.rs
rename to crates/core/src/toasts.rs
index 182587a6..8af6d31c 100644
--- a/src/components/toasts.rs
+++ b/crates/core/src/toasts.rs
@@ -22,45 +22,42 @@
 // terms of the Steamworks API by Valve Corporation, the licensors of this
 // Program grant you additional permission to convey the resulting work.
 
-use egui_notify::{Toast, Toasts as ToastsInner};
-use parking_lot::RwLock;
-
 /// A toasts management struct.
 #[derive(Default)]
 pub struct Toasts {
-    inner: RwLock<ToastsInner>,
+    inner: egui_notify::Toasts,
 }
 
 // We wrap the toasts structs in a RefCell to maintain interior mutability.
 #[allow(dead_code)]
 impl Toasts {
     /// Add a custom toast.
-    pub fn add(&self, toast: Toast) {
-        self.inner.write().add(toast);
+    pub fn add(&mut self, toast: egui_notify::Toast) {
+        self.inner.add(toast);
     }
 
     /// Display an info toast.
-    pub fn info(&self, caption: impl Into<String>) {
-        self.inner.write().info(caption);
+    pub fn info(&mut self, caption: impl Into<String>) {
+        self.inner.info(caption);
     }
 
     /// Display a warning toast.
-    pub fn warning(&self, caption: impl Into<String>) {
-        self.inner.write().warning(caption);
+    pub fn warning(&mut self, caption: impl Into<String>) {
+        self.inner.warning(caption);
     }
 
     /// Display an error toast.
-    pub fn error(&self, caption: impl Into<String>) {
-        self.inner.write().error(caption);
+    pub fn error(&mut self, caption: impl Into<String>) {
+        self.inner.error(caption);
     }
 
     /// Display a generic toast.
-    pub fn basic(&self, caption: impl Into<String>) {
-        self.inner.write().basic(caption);
+    pub fn basic(&mut self, caption: impl Into<String>) {
+        self.inner.basic(caption);
     }
 
     /// Display all toasts.
-    pub fn show(&self, ctx: &egui::Context) {
-        self.inner.write().show(ctx);
+    pub fn show(&mut self, ctx: &egui::Context) {
+        self.inner.show(ctx);
     }
 }
diff --git a/crates/core/src/window.rs b/crates/core/src/window.rs
new file mode 100644
index 00000000..584a18cd
--- /dev/null
+++ b/crates/core/src/window.rs
@@ -0,0 +1,179 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
+//
+//     Additional permission under GNU GPL version 3 section 7
+//
+// If you modify this Program, or any covered work, by linking or combining
+// it with Steamworks API by Valve Corporation, containing parts covered by
+// terms of the Steamworks API by Valve Corporation, the licensors of this
+// Program grant you additional permission to convey the resulting work.
+
+/// A window management system to handle heap allocated windows
+///
+/// Will deny any duplicated window titles and is not specialized like modals
+#[derive(Default)]
+pub struct Windows {
+    // A dynamic array of Windows. Iterated over and cleaned up in fn update().
+    windows: Vec<Box<dyn Window>>,
+}
+
+#[derive(Default)]
+pub struct EditWindows {
+    clean_fn: Option<CleanFn>,
+    added: Vec<Box<dyn Window>>,
+    removed: std::collections::HashSet<egui::Id>,
+}
+
+type CleanFn = Box<dyn Fn(&Box<dyn Window>) -> bool>;
+
+impl Windows {
+    /// A function to add a window.
+    pub fn add_window(&mut self, window: impl Window + 'static) {
+        self.add_boxed_window(Box::new(window))
+    }
+
+    fn add_boxed_window(&mut self, window: Box<dyn Window>) {
+        // FIXME use a hashmap, or something with less than O(n) search time
+        if self.windows.iter().any(|w| w.id() == window.id()) {
+            return;
+        }
+        self.windows.push(window)
+    }
+
+    /// Clean all windows that need the data cache.
+    /// This is usually when a project is closed.
+    pub fn clean_windows(&mut self, f: impl Fn(&Box<dyn Window>) -> bool) {
+        self.windows.retain(f);
+    }
+
+    pub fn process_edit_windows(&mut self, mut edit_windows: EditWindows) {
+        for window in edit_windows.added.drain(..) {
+            self.add_boxed_window(window)
+        }
+        if let Some(f) = edit_windows.clean_fn.take() {
+            self.clean_windows(f);
+        }
+    }
+
+    pub fn display_without_edit(
+        &mut self,
+        ctx: &egui::Context,
+        update_state: &mut crate::UpdateState<'_>,
+    ) {
+        // Iterate through all the windows and clean them up if necessary.
+        self.windows.retain_mut(|window| {
+            // Pass in a bool requesting to see if the window open.
+            let mut open = true;
+            window.show(ctx, &mut open, update_state);
+            open
+        })
+    }
+
+    /// Update and draw all windows.
+    pub fn display(&mut self, ctx: &egui::Context, update_state: &mut crate::UpdateState<'_>) {
+        let mut edit_windows = EditWindows {
+            clean_fn: None,
+            added: Vec::new(),
+            removed: std::collections::HashSet::new(),
+        };
+        let mut reborrowed_update_state = update_state.reborrow_with_edit_window(&mut edit_windows);
+
+        // Iterate through all the windows and clean them up if necessary.
+        self.windows.retain_mut(|window| {
+            // Pass in a bool requesting to see if the window open.
+            let mut open = true;
+            window.show(ctx, &mut open, &mut reborrowed_update_state);
+            open
+        });
+
+        for window in edit_windows.added {
+            if self.windows.iter().any(|w| w.id() == window.id()) {
+                return;
+            }
+            self.windows.push(window);
+        }
+        if let Some(f) = edit_windows.clean_fn {
+            self.clean_windows(f)
+        }
+    }
+}
+
+impl EditWindows {
+    pub fn clean(&mut self, f: impl Fn(&Box<dyn Window>) -> bool + 'static) {
+        self.clean_fn = Some(Box::new(f));
+    }
+
+    pub fn add_window(&mut self, window: impl Window + 'static) {
+        self.added.push(Box::new(window))
+    }
+
+    pub fn remove_window(&mut self, window: &impl Window) -> bool {
+        self.remove_window_by_id(window.id())
+    }
+
+    pub fn remove_window_by_id(&mut self, id: egui::Id) -> bool {
+        self.removed.insert(id)
+    }
+}
+
+/// A heap allocated window, unlike modals which are stored on the stack.
+/// This makes them very unspecialized and they rely heavily on `UpdateInfo`.
+///
+/// However, they can store internal state and allow for multiple windows to be open at one time.
+/// This makes up for most of their losses. Modals are still useful in certain cases, though.
+pub trait Window {
+    /// Show this window.
+    fn show(
+        &mut self,
+        ctx: &egui::Context,
+        open: &mut bool,
+        update_state: &mut crate::UpdateState<'_>,
+    );
+
+    /// Optionally used as the title of the window.
+    fn name(&self) -> String {
+        "Untitled Window".to_string()
+    }
+
+    /// Required to prevent duplication.
+    fn id(&self) -> egui::Id;
+
+    ///  A function to determine if this window needs the data cache.
+    fn requires_filesystem(&self) -> bool {
+        false
+    }
+}
+
+/*
+impl Window for Box<dyn Window + Send + Sync> {
+    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
+        self.show(ctx, open)
+    }
+
+    fn name(&self) -> String {
+        self.name()
+    }
+
+    fn id(&self) -> egui::Id {
+        self.id()
+    }
+
+    fn requires_filesystem(&self) -> bool {
+        self.requires_filesystem()
+    }
+}
+*/
diff --git a/crates/data/Cargo.toml b/crates/data/Cargo.toml
new file mode 100644
index 00000000..6a212e0b
--- /dev/null
+++ b/crates/data/Cargo.toml
@@ -0,0 +1,31 @@
+[package]
+name = "luminol-data"
+
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+rust-version.workspace = true
+readme.workspace = true
+repository.workspace = true
+keywords.workspace = true
+categories.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+num-derive = "0.4.0"
+num_enum = "0.7.0"
+
+rand.workspace = true
+getrandom.workspace = true
+
+flate2 = "1.0"
+
+serde.workspace = true
+alox-48.workspace = true
+bytemuck.workspace = true
+slab.workspace = true
+strum.workspace = true
+paste.workspace = true
+camino.workspace = true
diff --git a/command-lib/src/lib.rs b/crates/data/src/commands.rs
similarity index 100%
rename from command-lib/src/lib.rs
rename to crates/data/src/commands.rs
diff --git a/rmxp-types/src/helpers/id.rs b/crates/data/src/helpers/id.rs
similarity index 100%
rename from rmxp-types/src/helpers/id.rs
rename to crates/data/src/helpers/id.rs
diff --git a/rmxp-types/src/helpers/id_vec.rs b/crates/data/src/helpers/id_vec.rs
similarity index 100%
rename from rmxp-types/src/helpers/id_vec.rs
rename to crates/data/src/helpers/id_vec.rs
diff --git a/rmxp-types/src/helpers/mod.rs b/crates/data/src/helpers/mod.rs
similarity index 100%
rename from rmxp-types/src/helpers/mod.rs
rename to crates/data/src/helpers/mod.rs
diff --git a/rmxp-types/src/helpers/nil_padded.rs b/crates/data/src/helpers/nil_padded.rs
similarity index 100%
rename from rmxp-types/src/helpers/nil_padded.rs
rename to crates/data/src/helpers/nil_padded.rs
diff --git a/rmxp-types/src/helpers/optional_id.rs b/crates/data/src/helpers/optional_id.rs
similarity index 100%
rename from rmxp-types/src/helpers/optional_id.rs
rename to crates/data/src/helpers/optional_id.rs
diff --git a/rmxp-types/src/helpers/optional_path.rs b/crates/data/src/helpers/optional_path.rs
similarity index 100%
rename from rmxp-types/src/helpers/optional_path.rs
rename to crates/data/src/helpers/optional_path.rs
diff --git a/rmxp-types/src/helpers/parameter_type.rs b/crates/data/src/helpers/parameter_type.rs
similarity index 100%
rename from rmxp-types/src/helpers/parameter_type.rs
rename to crates/data/src/helpers/parameter_type.rs
diff --git a/rmxp-types/src/lib.rs b/crates/data/src/lib.rs
similarity index 96%
rename from rmxp-types/src/lib.rs
rename to crates/data/src/lib.rs
index c694fe45..871393e3 100644
--- a/rmxp-types/src/lib.rs
+++ b/crates/data/src/lib.rs
@@ -11,7 +11,9 @@ mod option_vec;
 
 mod rgss_structs;
 
-mod helpers;
+pub mod helpers;
+
+pub mod commands;
 
 pub use helpers::*;
 pub use option_vec::OptionVec;
diff --git a/rmxp-types/src/option_vec.rs b/crates/data/src/option_vec.rs
similarity index 100%
rename from rmxp-types/src/option_vec.rs
rename to crates/data/src/option_vec.rs
diff --git a/rmxp-types/src/rgss_structs.rs b/crates/data/src/rgss_structs.rs
similarity index 94%
rename from rmxp-types/src/rgss_structs.rs
rename to crates/data/src/rgss_structs.rs
index e9e187d4..3af04692 100644
--- a/rmxp-types/src/rgss_structs.rs
+++ b/crates/data/src/rgss_structs.rs
@@ -166,6 +166,14 @@ impl Table1 {
     pub fn iter(&self) -> impl Iterator<Item = &i16> {
         self.data.iter()
     }
+
+    pub fn as_slice(&self) -> &[i16] {
+        self.data.as_slice()
+    }
+
+    pub fn as_mut_slice(&mut self) -> &mut [i16] {
+        self.data.as_mut_slice()
+    }
 }
 
 impl Index<usize> for Table1 {
@@ -283,6 +291,14 @@ impl Table2 {
     pub fn iter(&self) -> impl Iterator<Item = &i16> {
         self.data.iter()
     }
+
+    pub fn as_slice(&self) -> &[i16] {
+        self.data.as_slice()
+    }
+
+    pub fn as_mut_slice(&mut self) -> &mut [i16] {
+        self.data.as_mut_slice()
+    }
 }
 
 impl Index<(usize, usize)> for Table2 {
@@ -428,6 +444,19 @@ impl Table3 {
     pub fn iter(&self) -> impl Iterator<Item = &i16> {
         self.data.iter()
     }
+
+    pub fn as_slice(&self) -> &[i16] {
+        self.data.as_slice()
+    }
+
+    pub fn as_mut_slice(&mut self) -> &mut [i16] {
+        self.data.as_mut_slice()
+    }
+
+    pub fn layer_as_slice(&self, layer: usize) -> &[i16] {
+        let layer_size = self.xsize * self.ysize;
+        &self.data[(layer_size * layer)..(layer_size * (layer + 1))]
+    }
 }
 
 impl Index<(usize, usize, usize)> for Table3 {
diff --git a/rmxp-types/src/rmxp/actor.rs b/crates/data/src/rmxp/actor.rs
similarity index 100%
rename from rmxp-types/src/rmxp/actor.rs
rename to crates/data/src/rmxp/actor.rs
diff --git a/rmxp-types/src/rmxp/animation.rs b/crates/data/src/rmxp/animation.rs
similarity index 100%
rename from rmxp-types/src/rmxp/animation.rs
rename to crates/data/src/rmxp/animation.rs
diff --git a/rmxp-types/src/rmxp/armor.rs b/crates/data/src/rmxp/armor.rs
similarity index 100%
rename from rmxp-types/src/rmxp/armor.rs
rename to crates/data/src/rmxp/armor.rs
diff --git a/rmxp-types/src/rmxp/class.rs b/crates/data/src/rmxp/class.rs
similarity index 100%
rename from rmxp-types/src/rmxp/class.rs
rename to crates/data/src/rmxp/class.rs
diff --git a/rmxp-types/src/rmxp/enemy.rs b/crates/data/src/rmxp/enemy.rs
similarity index 100%
rename from rmxp-types/src/rmxp/enemy.rs
rename to crates/data/src/rmxp/enemy.rs
diff --git a/rmxp-types/src/rmxp/item.rs b/crates/data/src/rmxp/item.rs
similarity index 100%
rename from rmxp-types/src/rmxp/item.rs
rename to crates/data/src/rmxp/item.rs
diff --git a/rmxp-types/src/rmxp/map.rs b/crates/data/src/rmxp/map.rs
similarity index 100%
rename from rmxp-types/src/rmxp/map.rs
rename to crates/data/src/rmxp/map.rs
diff --git a/rmxp-types/src/rmxp/mod.rs b/crates/data/src/rmxp/mod.rs
similarity index 100%
rename from rmxp-types/src/rmxp/mod.rs
rename to crates/data/src/rmxp/mod.rs
diff --git a/rmxp-types/src/rmxp/skill.rs b/crates/data/src/rmxp/skill.rs
similarity index 100%
rename from rmxp-types/src/rmxp/skill.rs
rename to crates/data/src/rmxp/skill.rs
diff --git a/rmxp-types/src/rmxp/state.rs b/crates/data/src/rmxp/state.rs
similarity index 100%
rename from rmxp-types/src/rmxp/state.rs
rename to crates/data/src/rmxp/state.rs
diff --git a/rmxp-types/src/rmxp/system.rs b/crates/data/src/rmxp/system.rs
similarity index 100%
rename from rmxp-types/src/rmxp/system.rs
rename to crates/data/src/rmxp/system.rs
diff --git a/rmxp-types/src/rmxp/tileset.rs b/crates/data/src/rmxp/tileset.rs
similarity index 100%
rename from rmxp-types/src/rmxp/tileset.rs
rename to crates/data/src/rmxp/tileset.rs
diff --git a/rmxp-types/src/rmxp/troop.rs b/crates/data/src/rmxp/troop.rs
similarity index 100%
rename from rmxp-types/src/rmxp/troop.rs
rename to crates/data/src/rmxp/troop.rs
diff --git a/rmxp-types/src/rmxp/weapon.rs b/crates/data/src/rmxp/weapon.rs
similarity index 100%
rename from rmxp-types/src/rmxp/weapon.rs
rename to crates/data/src/rmxp/weapon.rs
diff --git a/rmxp-types/src/shared/audio_file.rs b/crates/data/src/shared/audio_file.rs
similarity index 100%
rename from rmxp-types/src/shared/audio_file.rs
rename to crates/data/src/shared/audio_file.rs
diff --git a/rmxp-types/src/shared/event.rs b/crates/data/src/shared/event.rs
similarity index 100%
rename from rmxp-types/src/shared/event.rs
rename to crates/data/src/shared/event.rs
diff --git a/rmxp-types/src/shared/mapinfo.rs b/crates/data/src/shared/mapinfo.rs
similarity index 100%
rename from rmxp-types/src/shared/mapinfo.rs
rename to crates/data/src/shared/mapinfo.rs
diff --git a/rmxp-types/src/shared/mod.rs b/crates/data/src/shared/mod.rs
similarity index 100%
rename from rmxp-types/src/shared/mod.rs
rename to crates/data/src/shared/mod.rs
diff --git a/rmxp-types/src/shared/move_route.rs b/crates/data/src/shared/move_route.rs
similarity index 100%
rename from rmxp-types/src/shared/move_route.rs
rename to crates/data/src/shared/move_route.rs
diff --git a/rmxp-types/src/shared/script.rs b/crates/data/src/shared/script.rs
similarity index 100%
rename from rmxp-types/src/shared/script.rs
rename to crates/data/src/shared/script.rs
diff --git a/crates/filesystem/Cargo.toml b/crates/filesystem/Cargo.toml
new file mode 100644
index 00000000..87b43794
--- /dev/null
+++ b/crates/filesystem/Cargo.toml
@@ -0,0 +1,69 @@
+[package]
+name = "luminol-filesystem"
+
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+rust-version.workspace = true
+readme.workspace = true
+repository.workspace = true
+keywords.workspace = true
+categories.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+rfd.workspace = true
+
+thiserror.workspace = true
+bitflags.workspace = true
+
+camino.workspace = true
+
+itertools.workspace = true
+
+dashmap.workspace = true
+parking_lot.workspace = true
+
+egui.workspace = true
+
+serde.workspace = true
+ron.workspace = true
+rust-ini.workspace = true
+
+tracing.workspace = true
+
+luminol-config.workspace = true
+
+[target.'cfg(windows)'.dependencies]
+winreg = "0.51.0"
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+once_cell.workspace = true
+rand.workspace = true
+slab.workspace = true
+
+luminol-web = { version = "0.4.0", path = "../web/" }
+
+flume.workspace = true
+oneshot.workspace = true
+
+wasm-bindgen = "0.2.87"
+wasm-bindgen-futures = "0.4"
+indexed_db_futures = "0.4.1"
+js-sys = "0.3"
+web-sys = { version = "0.3", features = [
+    "Blob",
+    "File",
+    "FileSystemCreateWritableOptions",
+    "FileSystemDirectoryHandle",
+    "FileSystemFileHandle",
+    "FileSystemGetDirectoryOptions",
+    "FileSystemGetFileOptions",
+    "FileSystemHandle",
+    "FileSystemHandleKind",
+    "FileSystemRemoveOptions",
+    "FileSystemWritableFileStream",
+    "WritableStream",
+] }
diff --git a/src/filesystem/archiver.rs b/crates/filesystem/src/archiver.rs
similarity index 94%
rename from src/filesystem/archiver.rs
rename to crates/filesystem/src/archiver.rs
index 96e976bd..ece985fd 100644
--- a/src/filesystem/archiver.rs
+++ b/crates/filesystem/src/archiver.rs
@@ -14,13 +14,12 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
-use super::FileSystem as FileSystemTrait;
-use super::{DirEntry, Error, Metadata, OpenFlags};
-use crate::prelude::*;
 
 use itertools::Itertools;
 use std::io::{prelude::*, Cursor, SeekFrom};
 
+use crate::{DirEntry, Error, Metadata, OpenFlags};
+
 #[derive(Debug, Default)]
 pub struct FileSystem<T>
 where
@@ -28,7 +27,7 @@ where
 {
     files: dashmap::DashMap<camino::Utf8PathBuf, Entry>,
     directories: dashmap::DashMap<camino::Utf8PathBuf, dashmap::DashSet<camino::Utf8PathBuf>>,
-    archive: Mutex<T>,
+    archive: parking_lot::Mutex<T>,
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
@@ -155,7 +154,7 @@ where
         Ok(FileSystem {
             files,
             directories,
-            archive: Mutex::new(file),
+            archive: parking_lot::Mutex::new(file),
         })
     }
 
@@ -235,17 +234,26 @@ impl std::io::Seek for File {
     }
 }
 
-impl<T> FileSystemTrait for FileSystem<T>
+impl crate::File for File {
+    fn metadata(&self) -> crate::Result<Metadata> {
+        Ok(Metadata {
+            is_file: true,
+            size: self.cursor.get_ref().len() as u64,
+        })
+    }
+}
+
+impl<T> crate::FileSystem for FileSystem<T>
 where
-    T: Read + Write + Seek + Send + Sync,
+    T: Read + Write + Seek + Send + Sync + 'static,
 {
-    type File<'fs> = File where Self: 'fs;
+    type File = File;
 
     fn open_file(
         &self,
         path: impl AsRef<camino::Utf8Path>,
         flags: OpenFlags,
-    ) -> Result<Self::File<'_>, Error> {
+    ) -> Result<Self::File, Error> {
         if flags.contains(OpenFlags::Write) {
             return Err(Error::NotSupported);
         }
@@ -267,7 +275,7 @@ where
                 magic = magic.wrapping_mul(7).wrapping_add(3);
             }
 
-            *byte ^= bytemuck::cast::<_, [u8; 4]>(magic)[j];
+            *byte ^= magic.to_le_bytes()[j];
 
             j += 1;
         }
diff --git a/src/filesystem/erased.rs b/crates/filesystem/src/erased.rs
similarity index 61%
rename from src/filesystem/erased.rs
rename to crates/filesystem/src/erased.rs
index db437934..e92b79a4 100644
--- a/src/filesystem/erased.rs
+++ b/crates/filesystem/src/erased.rs
@@ -14,111 +14,107 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
-use super::{DirEntry, Error, FileSystem, Metadata, OpenFlags};
-
-pub trait File: std::io::Read + std::io::Write + std::io::Seek + Send + Sync {}
-impl<T> File for T where T: std::io::Read + std::io::Write + std::io::Seek + Send + Sync {}
+use crate::File;
+use crate::{DirEntry, Metadata, OpenFlags, Result};
 
 pub trait ErasedFilesystem: Send + Sync {
-    fn open_file(
-        &self,
-        path: &camino::Utf8Path,
-        flags: OpenFlags,
-    ) -> Result<Box<dyn File + '_>, Error>;
+    fn open_file(&self, path: &camino::Utf8Path, flags: OpenFlags) -> Result<Box<dyn File>>;
 
-    fn metadata(&self, path: &camino::Utf8Path) -> Result<Metadata, Error>;
+    fn metadata(&self, path: &camino::Utf8Path) -> Result<Metadata>;
 
-    fn rename(&self, from: &camino::Utf8Path, to: &camino::Utf8Path) -> Result<(), Error>;
+    fn rename(&self, from: &camino::Utf8Path, to: &camino::Utf8Path) -> Result<()>;
 
-    fn exists(&self, path: &camino::Utf8Path) -> Result<bool, Error>;
+    fn exists(&self, path: &camino::Utf8Path) -> Result<bool>;
 
-    fn create_dir(&self, path: &camino::Utf8Path) -> Result<(), Error>;
+    fn create_dir(&self, path: &camino::Utf8Path) -> Result<()>;
 
-    fn remove_dir(&self, path: &camino::Utf8Path) -> Result<(), Error>;
+    fn remove_dir(&self, path: &camino::Utf8Path) -> Result<()>;
 
-    fn remove_file(&self, path: &camino::Utf8Path) -> Result<(), Error>;
+    fn remove_file(&self, path: &camino::Utf8Path) -> Result<()>;
 
-    fn remove(&self, path: &camino::Utf8Path) -> Result<(), Error>;
+    fn remove(&self, path: &camino::Utf8Path) -> Result<()>;
 
-    fn read_dir(&self, path: &camino::Utf8Path) -> Result<Vec<DirEntry>, Error>;
+    fn read_dir(&self, path: &camino::Utf8Path) -> Result<Vec<DirEntry>>;
 
-    fn read(&self, path: &camino::Utf8Path) -> Result<Vec<u8>, Error>;
+    fn read(&self, path: &camino::Utf8Path) -> Result<Vec<u8>>;
 
-    fn read_to_string(&self, path: &camino::Utf8Path) -> Result<String, Error>;
+    fn read_to_string(&self, path: &camino::Utf8Path) -> Result<String>;
 
-    fn write(&self, path: &camino::Utf8Path, data: &[u8]) -> Result<(), Error>;
+    fn write(&self, path: &camino::Utf8Path, data: &[u8]) -> Result<()>;
 }
 
 impl<T> ErasedFilesystem for T
 where
-    T: FileSystem,
+    T: crate::FileSystem,
 {
-    fn open_file(
-        &self,
-        path: &camino::Utf8Path,
-        flags: OpenFlags,
-    ) -> Result<Box<dyn File + '_>, Error> {
+    fn open_file(&self, path: &camino::Utf8Path, flags: OpenFlags) -> Result<Box<dyn File>> {
         let file = self.open_file(path, flags)?;
         Ok(Box::new(file))
     }
 
-    fn metadata(&self, path: &camino::Utf8Path) -> Result<Metadata, Error> {
+    fn metadata(&self, path: &camino::Utf8Path) -> Result<Metadata> {
         self.metadata(path)
     }
 
-    fn rename(&self, from: &camino::Utf8Path, to: &camino::Utf8Path) -> Result<(), Error> {
+    fn rename(&self, from: &camino::Utf8Path, to: &camino::Utf8Path) -> Result<()> {
         self.rename(from, to)
     }
 
-    fn exists(&self, path: &camino::Utf8Path) -> Result<bool, Error> {
+    fn exists(&self, path: &camino::Utf8Path) -> Result<bool> {
         self.exists(path)
     }
 
-    fn create_dir(&self, path: &camino::Utf8Path) -> Result<(), Error> {
+    fn create_dir(&self, path: &camino::Utf8Path) -> Result<()> {
         self.create_dir(path)
     }
 
-    fn remove_dir(&self, path: &camino::Utf8Path) -> Result<(), Error> {
+    fn remove_dir(&self, path: &camino::Utf8Path) -> Result<()> {
         self.remove_dir(path)
     }
 
-    fn remove_file(&self, path: &camino::Utf8Path) -> Result<(), Error> {
+    fn remove_file(&self, path: &camino::Utf8Path) -> Result<()> {
         self.remove_file(path)
     }
 
-    fn remove(&self, path: &camino::Utf8Path) -> Result<(), Error> {
+    fn remove(&self, path: &camino::Utf8Path) -> Result<()> {
         self.remove(path)
     }
 
-    fn read_dir(&self, path: &camino::Utf8Path) -> Result<Vec<DirEntry>, Error> {
+    fn read_dir(&self, path: &camino::Utf8Path) -> Result<Vec<DirEntry>> {
         self.read_dir(path)
     }
 
-    fn read(&self, path: &camino::Utf8Path) -> Result<Vec<u8>, Error> {
+    fn read(&self, path: &camino::Utf8Path) -> Result<Vec<u8>> {
         self.read(path)
     }
 
-    fn read_to_string(&self, path: &camino::Utf8Path) -> Result<String, Error> {
+    fn read_to_string(&self, path: &camino::Utf8Path) -> Result<String> {
         self.read_to_string(path)
     }
 
-    fn write(&self, path: &camino::Utf8Path, data: &[u8]) -> Result<(), Error> {
+    fn write(&self, path: &camino::Utf8Path, data: &[u8]) -> Result<()> {
         self.write(path, data)
     }
 }
 
-impl FileSystem for dyn ErasedFilesystem {
-    type File<'fs> = Box<dyn File + 'fs> where Self: 'fs;
+impl File for Box<dyn File> {
+    fn metadata(&self) -> Result<Metadata> {
+        self.as_ref().metadata()
+    }
+}
+
+impl crate::FileSystem for dyn ErasedFilesystem {
+    type File = Box<dyn File>;
 
     fn open_file(
         &self,
         path: impl AsRef<camino::Utf8Path>,
         flags: OpenFlags,
-    ) -> Result<Self::File<'_>, Error> {
+    ) -> Result<Self::File> {
         self.open_file(path.as_ref(), flags)
     }
 
-    fn metadata(&self, path: impl AsRef<camino::Utf8Path>) -> Result<Metadata, Error> {
+    fn metadata(&self, path: impl AsRef<camino::Utf8Path>) -> Result<Metadata> {
         self.metadata(path.as_ref())
     }
 
@@ -126,47 +122,43 @@ impl FileSystem for dyn ErasedFilesystem {
         &self,
         from: impl AsRef<camino::Utf8Path>,
         to: impl AsRef<camino::Utf8Path>,
-    ) -> Result<(), Error> {
+    ) -> Result<()> {
         self.rename(from.as_ref(), to.as_ref())
     }
 
-    fn exists(&self, path: impl AsRef<camino::Utf8Path>) -> Result<bool, Error> {
+    fn exists(&self, path: impl AsRef<camino::Utf8Path>) -> Result<bool> {
         self.exists(path.as_ref())
     }
 
-    fn create_dir(&self, path: impl AsRef<camino::Utf8Path>) -> Result<(), Error> {
+    fn create_dir(&self, path: impl AsRef<camino::Utf8Path>) -> Result<()> {
         self.create_dir(path.as_ref())
     }
 
-    fn remove_dir(&self, path: impl AsRef<camino::Utf8Path>) -> Result<(), Error> {
+    fn remove_dir(&self, path: impl AsRef<camino::Utf8Path>) -> Result<()> {
         self.remove_dir(path.as_ref())
     }
 
-    fn remove_file(&self, path: impl AsRef<camino::Utf8Path>) -> Result<(), Error> {
+    fn remove_file(&self, path: impl AsRef<camino::Utf8Path>) -> Result<()> {
         self.remove_file(path.as_ref())
     }
 
-    fn read_dir(&self, path: impl AsRef<camino::Utf8Path>) -> Result<Vec<DirEntry>, Error> {
+    fn read_dir(&self, path: impl AsRef<camino::Utf8Path>) -> Result<Vec<DirEntry>> {
         self.read_dir(path.as_ref())
     }
 
-    fn remove(&self, path: impl AsRef<camino::Utf8Path>) -> Result<(), Error> {
+    fn remove(&self, path: impl AsRef<camino::Utf8Path>) -> Result<()> {
         self.remove(path.as_ref())
     }
 
-    fn read(&self, path: impl AsRef<camino::Utf8Path>) -> Result<Vec<u8>, Error> {
+    fn read(&self, path: impl AsRef<camino::Utf8Path>) -> Result<Vec<u8>> {
         self.read(path.as_ref())
     }
 
-    fn read_to_string(&self, path: impl AsRef<camino::Utf8Path>) -> Result<String, Error> {
+    fn read_to_string(&self, path: impl AsRef<camino::Utf8Path>) -> Result<String> {
         self.read_to_string(path.as_ref())
     }
 
-    fn write(
-        &self,
-        path: impl AsRef<camino::Utf8Path>,
-        data: impl AsRef<[u8]>,
-    ) -> Result<(), Error> {
+    fn write(&self, path: impl AsRef<camino::Utf8Path>, data: impl AsRef<[u8]>) -> Result<()> {
         self.write(path.as_ref(), data.as_ref())
     }
 }
diff --git a/src/filesystem/mod.rs b/crates/filesystem/src/lib.rs
similarity index 69%
rename from src/filesystem/mod.rs
rename to crates/filesystem/src/lib.rs
index 7a716bba..de1c4520 100644
--- a/src/filesystem/mod.rs
+++ b/crates/filesystem/src/lib.rs
@@ -14,19 +14,25 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
-use std::io::prelude::*;
 
-mod erased;
-mod host;
-mod list;
-mod path_cache;
+pub mod archiver;
+pub mod erased;
+pub mod list;
+pub mod path_cache;
 pub mod project;
 
-mod archiver;
-
+#[cfg(not(target_arch = "wasm32"))]
+pub mod native;
 #[cfg(target_arch = "wasm32")]
 pub mod web;
 
+// Re-export platform specific filesystem as "host"
+// This means we need can use less #[cfg]s!
+#[cfg(not(target_arch = "wasm32"))]
+pub use native as host;
+#[cfg(target_arch = "wasm32")]
+pub use web as host;
+
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
     #[error("File or directory does not exist")]
@@ -43,8 +49,20 @@ pub enum Error {
     InvalidHeader,
     #[error("No filesystems are loaded to perform this operation")]
     NoFilesystems,
+    #[error("Unable to detect the project's RPG Maker version (perhaps you did not open an RPG Maker project?")]
+    UnableToDetectRMVer,
+    #[error("Cancelled loading project")]
+    CancelledLoading,
+    #[error("Your browser does not support File System Access API")]
+    Wasm32FilesystemNotSupported,
+    #[error("Invalid project folder")]
+    InvalidProjectFolder,
+    #[error("Could not restore project handle from IndexedDB")]
+    MissingIDB,
 }
 
+pub type Result<T> = std::result::Result<T, Error>;
+
 #[derive(Clone, Copy, PartialEq, Eq, Hash, Debug)]
 pub struct Metadata {
     pub is_file: bool,
@@ -53,12 +71,12 @@ pub struct Metadata {
 
 #[derive(Clone, PartialEq, Eq, Hash, Debug)]
 pub struct DirEntry {
-    path: camino::Utf8PathBuf,
-    metadata: Metadata,
+    pub path: camino::Utf8PathBuf,
+    pub metadata: Metadata,
 }
 
 impl DirEntry {
-    fn new(path: camino::Utf8PathBuf, metadata: Metadata) -> Self {
+    pub fn new(path: camino::Utf8PathBuf, metadata: Metadata) -> Self {
         Self { path, metadata }
     }
 
@@ -91,34 +109,37 @@ bitflags::bitflags! {
     }
 }
 
-pub trait FileSystem: Send + Sync {
-    type File<'fs>: Read + Write + Seek + Send + Sync + 'fs
-    where
-        Self: 'fs;
+pub trait File: std::io::Read + std::io::Write + std::io::Seek + Send + Sync + 'static {
+    fn metadata(&self) -> Result<Metadata>;
+}
 
-    fn open_file(
-        &self,
-        path: impl AsRef<camino::Utf8Path>,
-        flags: OpenFlags,
-    ) -> Result<Self::File<'_>, Error>;
+pub trait FileSystem: Send + Sync + 'static {
+    type File: File;
 
-    fn metadata(&self, path: impl AsRef<camino::Utf8Path>) -> Result<Metadata, Error>;
+    fn open_file(&self, path: impl AsRef<camino::Utf8Path>, flags: OpenFlags)
+        -> Result<Self::File>;
+
+    fn create_file(&self, path: impl AsRef<camino::Utf8Path>) -> Result<Self::File> {
+        self.open_file(path, OpenFlags::Create | OpenFlags::Write)
+    }
+
+    fn metadata(&self, path: impl AsRef<camino::Utf8Path>) -> Result<Metadata>;
 
     fn rename(
         &self,
         from: impl AsRef<camino::Utf8Path>,
         to: impl AsRef<camino::Utf8Path>,
-    ) -> Result<(), Error>;
+    ) -> Result<()>;
 
-    fn exists(&self, path: impl AsRef<camino::Utf8Path>) -> Result<bool, Error>;
+    fn exists(&self, path: impl AsRef<camino::Utf8Path>) -> Result<bool>;
 
-    fn create_dir(&self, path: impl AsRef<camino::Utf8Path>) -> Result<(), Error>;
+    fn create_dir(&self, path: impl AsRef<camino::Utf8Path>) -> Result<()>;
 
-    fn remove_dir(&self, path: impl AsRef<camino::Utf8Path>) -> Result<(), Error>;
+    fn remove_dir(&self, path: impl AsRef<camino::Utf8Path>) -> Result<()>;
 
-    fn remove_file(&self, path: impl AsRef<camino::Utf8Path>) -> Result<(), Error>;
+    fn remove_file(&self, path: impl AsRef<camino::Utf8Path>) -> Result<()>;
 
-    fn remove(&self, path: impl AsRef<camino::Utf8Path>) -> Result<(), Error> {
+    fn remove(&self, path: impl AsRef<camino::Utf8Path>) -> Result<()> {
         let path = path.as_ref();
         let metadata = self.metadata(path)?;
         if metadata.is_file {
@@ -128,11 +149,13 @@ pub trait FileSystem: Send + Sync {
         }
     }
 
-    fn read_dir(&self, path: impl AsRef<camino::Utf8Path>) -> Result<Vec<DirEntry>, Error>;
+    fn read_dir(&self, path: impl AsRef<camino::Utf8Path>) -> Result<Vec<DirEntry>>;
 
     /// Corresponds to [`std::fs::read()`].
     /// Will open a file at the path and read the entire file into a buffer.
-    fn read(&self, path: impl AsRef<camino::Utf8Path>) -> Result<Vec<u8>, Error> {
+    fn read(&self, path: impl AsRef<camino::Utf8Path>) -> Result<Vec<u8>> {
+        use std::io::Read;
+
         let path = path.as_ref();
 
         let mut buf = Vec::with_capacity(self.metadata(path)?.size as usize);
@@ -142,18 +165,16 @@ pub trait FileSystem: Send + Sync {
         Ok(buf)
     }
 
-    fn read_to_string(&self, path: impl AsRef<camino::Utf8Path>) -> Result<String, Error> {
+    fn read_to_string(&self, path: impl AsRef<camino::Utf8Path>) -> Result<String> {
         let buf = self.read(path)?;
         String::from_utf8(buf).map_err(Into::into)
     }
 
     /// Corresponds to [`std::fs::write()`].
     /// Will open a file at the path, create it if it exists (and truncate it) and then write the provided bytes.
-    fn write(
-        &self,
-        path: impl AsRef<camino::Utf8Path>,
-        data: impl AsRef<[u8]>,
-    ) -> Result<(), Error> {
+    fn write(&self, path: impl AsRef<camino::Utf8Path>, data: impl AsRef<[u8]>) -> Result<()> {
+        use std::io::Write;
+
         let mut file = self.open_file(
             path,
             OpenFlags::Write | OpenFlags::Truncate | OpenFlags::Create,
diff --git a/src/filesystem/list.rs b/crates/filesystem/src/list.rs
similarity index 92%
rename from src/filesystem/list.rs
rename to crates/filesystem/src/list.rs
index 20725c28..63608d2b 100644
--- a/src/filesystem/list.rs
+++ b/crates/filesystem/src/list.rs
@@ -14,9 +14,8 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
-use super::erased::{ErasedFilesystem, File};
-use super::FileSystem as FileSystemTrait;
-use super::{DirEntry, Error, Metadata, OpenFlags};
+
+use crate::{erased::ErasedFilesystem, DirEntry, Error, File, Metadata, OpenFlags};
 use itertools::Itertools;
 
 #[derive(Default)]
@@ -29,19 +28,19 @@ impl FileSystem {
         Self::default()
     }
 
-    pub fn push(&mut self, fs: impl FileSystemTrait + 'static) {
+    pub fn push(&mut self, fs: impl crate::FileSystem + 'static) {
         self.filesystems.push(Box::new(fs))
     }
 }
 
-impl FileSystemTrait for FileSystem {
-    type File<'fs> = Box<dyn File + 'fs> where Self: 'fs;
+impl crate::FileSystem for FileSystem {
+    type File = Box<dyn File>;
 
     fn open_file(
         &self,
         path: impl AsRef<camino::Utf8Path>,
         flags: OpenFlags,
-    ) -> Result<Self::File<'_>, Error> {
+    ) -> Result<Self::File, Error> {
         let path = path.as_ref();
         for fs in self.filesystems.iter() {
             if fs.exists(path)? || flags.contains(OpenFlags::Create) {
diff --git a/src/filesystem/host.rs b/crates/filesystem/src/native.rs
similarity index 71%
rename from src/filesystem/host.rs
rename to crates/filesystem/src/native.rs
index 52d06035..cbda94cf 100644
--- a/src/filesystem/host.rs
+++ b/crates/filesystem/src/native.rs
@@ -14,9 +14,9 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
-use super::{DirEntry, Error, Metadata, OpenFlags};
 use itertools::Itertools;
-use std::fs::File;
+
+use crate::{DirEntry, File, Metadata, OpenFlags, Result};
 
 #[derive(Debug, Clone)]
 pub struct FileSystem {
@@ -33,16 +33,41 @@ impl FileSystem {
     pub fn root_path(&self) -> &camino::Utf8Path {
         &self.root_path
     }
+
+    pub async fn from_folder_picker() -> Result<Self> {
+        if let Some(path) = rfd::AsyncFileDialog::default().pick_folder().await {
+            let path = camino::Utf8Path::from_path(path.path()).expect("path not utf-8");
+            Ok(Self::new(path))
+        } else {
+            Err(crate::Error::CancelledLoading)
+        }
+    }
+
+    pub async fn from_file_picker() -> Result<Self> {
+        if let Some(path) = rfd::AsyncFileDialog::default()
+            .add_filter("project file", &["rxproj", "rvproj", "rvproj2", "lumproj"])
+            .pick_file()
+            .await
+        {
+            let path = camino::Utf8Path::from_path(path.path())
+                .expect("path not utf-8")
+                .parent()
+                .expect("path does not have parent");
+            Ok(Self::new(path))
+        } else {
+            Err(crate::Error::CancelledLoading)
+        }
+    }
 }
 
-impl super::FileSystem for FileSystem {
-    type File<'fs> = File where Self: 'fs;
+impl crate::FileSystem for FileSystem {
+    type File = std::fs::File;
 
     fn open_file(
         &self,
         path: impl AsRef<camino::Utf8Path>,
         flags: OpenFlags,
-    ) -> Result<Self::File<'_>, Error> {
+    ) -> Result<Self::File> {
         let path = self.root_path.join(path);
         std::fs::OpenOptions::new()
             .create(flags.contains(OpenFlags::Create))
@@ -53,7 +78,7 @@ impl super::FileSystem for FileSystem {
             .map_err(Into::into)
     }
 
-    fn metadata(&self, path: impl AsRef<camino::Utf8Path>) -> Result<Metadata, Error> {
+    fn metadata(&self, path: impl AsRef<camino::Utf8Path>) -> Result<Metadata> {
         let path = self.root_path.join(path);
         let metadata = std::fs::metadata(path)?;
         Ok(Metadata {
@@ -66,33 +91,33 @@ impl super::FileSystem for FileSystem {
         &self,
         from: impl AsRef<camino::Utf8Path>,
         to: impl AsRef<camino::Utf8Path>,
-    ) -> std::result::Result<(), Error> {
+    ) -> Result<()> {
         let from = self.root_path.join(from);
         let to = self.root_path.join(to);
         std::fs::rename(from, to).map_err(Into::into)
     }
 
-    fn exists(&self, path: impl AsRef<camino::Utf8Path>) -> Result<bool, Error> {
+    fn exists(&self, path: impl AsRef<camino::Utf8Path>) -> Result<bool> {
         let path = self.root_path.join(path);
         path.try_exists().map_err(Into::into)
     }
 
-    fn create_dir(&self, path: impl AsRef<camino::Utf8Path>) -> Result<(), Error> {
+    fn create_dir(&self, path: impl AsRef<camino::Utf8Path>) -> Result<()> {
         let path = self.root_path.join(path);
         std::fs::create_dir(path).map_err(Into::into)
     }
 
-    fn remove_dir(&self, path: impl AsRef<camino::Utf8Path>) -> Result<(), Error> {
+    fn remove_dir(&self, path: impl AsRef<camino::Utf8Path>) -> Result<()> {
         let path = self.root_path.join(path);
         std::fs::remove_dir_all(path).map_err(Into::into)
     }
 
-    fn remove_file(&self, path: impl AsRef<camino::Utf8Path>) -> Result<(), Error> {
+    fn remove_file(&self, path: impl AsRef<camino::Utf8Path>) -> Result<()> {
         let path = self.root_path.join(path);
         std::fs::remove_file(path).map_err(Into::into)
     }
 
-    fn read_dir(&self, path: impl AsRef<camino::Utf8Path>) -> Result<Vec<DirEntry>, Error> {
+    fn read_dir(&self, path: impl AsRef<camino::Utf8Path>) -> Result<Vec<DirEntry>> {
         let path = self.root_path.join(path);
         path.read_dir_utf8()?
             .map_ok(|entry| {
@@ -113,3 +138,13 @@ impl super::FileSystem for FileSystem {
             .try_collect()
     }
 }
+
+impl File for std::fs::File {
+    fn metadata(&self) -> Result<Metadata> {
+        let metdata = self.metadata()?;
+        Ok(Metadata {
+            is_file: metdata.is_file(),
+            size: metdata.len(),
+        })
+    }
+}
diff --git a/src/filesystem/overlay.rs b/crates/filesystem/src/overlay.rs
similarity index 100%
rename from src/filesystem/overlay.rs
rename to crates/filesystem/src/overlay.rs
diff --git a/src/filesystem/path_cache.rs b/crates/filesystem/src/path_cache.rs
similarity index 88%
rename from src/filesystem/path_cache.rs
rename to crates/filesystem/src/path_cache.rs
index a7ac0f7d..4550981e 100644
--- a/src/filesystem/path_cache.rs
+++ b/crates/filesystem/src/path_cache.rs
@@ -14,8 +14,8 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
-use super::FileSystem as FileSystemTrait;
-use super::{DirEntry, Error, Metadata, OpenFlags};
+
+use crate::{DirEntry, Error, Metadata, OpenFlags, Result};
 
 #[derive(Debug, Clone)]
 pub struct FileSystem<F> {
@@ -25,9 +25,9 @@ pub struct FileSystem<F> {
 
 impl<F> FileSystem<F>
 where
-    F: FileSystemTrait,
+    F: crate::FileSystem,
 {
-    pub fn new(fs: F) -> Result<Self, Error> {
+    pub fn new(fs: F) -> Result<Self> {
         let this = FileSystem {
             fs,
             cache: dashmap::DashMap::new(),
@@ -40,17 +40,17 @@ where
         &self.fs
     }
 
-    pub fn regen_cache(&self) -> Result<(), Error> {
+    pub fn regen_cache(&self) -> Result<()> {
         fn read_dir_recursive(
-            fs: &(impl FileSystemTrait + ?Sized),
+            fs: &(impl crate::FileSystem + ?Sized),
             path: impl AsRef<camino::Utf8Path>,
             mut f: impl FnMut(&camino::Utf8Path),
-        ) -> Result<(), Error> {
+        ) -> Result<()> {
             fn internal(
-                fs: &(impl FileSystemTrait + ?Sized),
+                fs: &(impl crate::FileSystem + ?Sized),
                 path: impl AsRef<camino::Utf8Path>,
                 f: &mut impl FnMut(&camino::Utf8Path),
-            ) -> Result<(), Error> {
+            ) -> Result<()> {
                 // In web builds, RTPs are currently to be placed in the "RTP" subdirectory of
                 // the project root directory, so this is to avoid loading the contents of
                 // those directories twice
@@ -112,17 +112,17 @@ pub fn to_lowercase(p: impl AsRef<camino::Utf8Path>) -> camino::Utf8PathBuf {
     p.as_ref().as_str().to_lowercase().into()
 }
 
-impl<F> FileSystemTrait for FileSystem<F>
+impl<F> crate::FileSystem for FileSystem<F>
 where
-    F: FileSystemTrait,
+    F: crate::FileSystem,
 {
-    type File<'fs> = F::File<'fs> where Self: 'fs;
+    type File = F::File;
 
     fn open_file(
         &self,
         path: impl AsRef<camino::Utf8Path>,
         flags: OpenFlags,
-    ) -> Result<Self::File<'_>, Error> {
+    ) -> Result<Self::File> {
         let path = path.as_ref();
         if flags.contains(OpenFlags::Create) {
             let mut lower_path = to_lowercase(path);
@@ -133,7 +133,7 @@ where
         self.fs.open_file(path, flags)
     }
 
-    fn metadata(&self, path: impl AsRef<camino::Utf8Path>) -> Result<Metadata, Error> {
+    fn metadata(&self, path: impl AsRef<camino::Utf8Path>) -> Result<Metadata> {
         let path = self.desensitize(path).ok_or(Error::NotExist)?;
         self.fs.metadata(path)
     }
@@ -142,7 +142,7 @@ where
         &self,
         from: impl AsRef<camino::Utf8Path>,
         to: impl AsRef<camino::Utf8Path>,
-    ) -> Result<(), Error> {
+    ) -> Result<()> {
         let from = self.desensitize(from).ok_or(Error::NotExist)?;
         let to = to.as_ref().to_path_buf();
 
@@ -154,11 +154,11 @@ where
         Ok(())
     }
 
-    fn exists(&self, path: impl AsRef<camino::Utf8Path>) -> Result<bool, Error> {
+    fn exists(&self, path: impl AsRef<camino::Utf8Path>) -> Result<bool> {
         Ok(self.desensitize(path).is_some())
     }
 
-    fn create_dir(&self, path: impl AsRef<camino::Utf8Path>) -> Result<(), Error> {
+    fn create_dir(&self, path: impl AsRef<camino::Utf8Path>) -> Result<()> {
         let path = path.as_ref().to_path_buf();
 
         self.fs.create_dir(&path)?;
@@ -168,7 +168,7 @@ where
         Ok(())
     }
 
-    fn remove_dir(&self, path: impl AsRef<camino::Utf8Path>) -> Result<(), Error> {
+    fn remove_dir(&self, path: impl AsRef<camino::Utf8Path>) -> Result<()> {
         let path = self.desensitize(path).ok_or(Error::NotExist)?;
 
         self.fs.remove_dir(&path)?;
@@ -178,7 +178,7 @@ where
         Ok(())
     }
 
-    fn remove_file(&self, path: impl AsRef<camino::Utf8Path>) -> Result<(), Error> {
+    fn remove_file(&self, path: impl AsRef<camino::Utf8Path>) -> Result<()> {
         let path = self.desensitize(path).ok_or(Error::NotExist)?;
 
         self.fs.remove_file(&path)?;
@@ -188,7 +188,7 @@ where
         Ok(())
     }
 
-    fn read_dir(&self, path: impl AsRef<camino::Utf8Path>) -> Result<Vec<DirEntry>, Error> {
+    fn read_dir(&self, path: impl AsRef<camino::Utf8Path>) -> Result<Vec<DirEntry>> {
         let path = self.desensitize(path).ok_or(Error::NotExist)?;
         self.fs.read_dir(path)
     }
diff --git a/crates/filesystem/src/project.rs b/crates/filesystem/src/project.rs
new file mode 100644
index 00000000..35fb76b4
--- /dev/null
+++ b/crates/filesystem/src/project.rs
@@ -0,0 +1,638 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
+
+use crate::FileSystem as _;
+use crate::{archiver, host, list, path_cache};
+use crate::{DirEntry, Error, Metadata, OpenFlags, Result};
+
+use itertools::Itertools;
+
+#[derive(Default)]
+pub enum FileSystem {
+    #[default]
+    Unloaded,
+    HostLoaded(host::FileSystem),
+    Loaded {
+        filesystem: path_cache::FileSystem<list::FileSystem>,
+        project_path: camino::Utf8PathBuf,
+    },
+}
+
+pub enum File {
+    Host(<host::FileSystem as crate::FileSystem>::File),
+    Loaded(<path_cache::FileSystem<list::FileSystem> as crate::FileSystem>::File),
+}
+
+#[must_use = "contains potential warnings generated while loading a project"]
+pub struct LoadResult {
+    pub missing_rtps: Vec<String>,
+}
+
+impl FileSystem {
+    pub fn new() -> Self {
+        Self::default()
+    }
+
+    pub fn project_path(&self) -> Option<camino::Utf8PathBuf> {
+        match self {
+            FileSystem::Unloaded => None,
+            FileSystem::HostLoaded(h) => Some(h.root_path().to_path_buf()),
+            FileSystem::Loaded { project_path, .. } => Some(project_path.clone()),
+        }
+    }
+
+    pub fn project_loaded(&self) -> bool {
+        !matches!(self, FileSystem::Unloaded)
+    }
+
+    pub fn unload_project(&mut self) {
+        *self = FileSystem::Unloaded;
+    }
+}
+
+// Not platform specific
+impl FileSystem {
+    fn detect_rm_ver(&self) -> Option<luminol_config::RMVer> {
+        if self.exists("Data/Actors.rxdata").ok()? {
+            return Some(luminol_config::RMVer::XP);
+        }
+
+        if self.exists("Data/Actors.rvdata").ok()? {
+            return Some(luminol_config::RMVer::VX);
+        }
+
+        if self.exists("Data/Actors.rvdata2").ok()? {
+            return Some(luminol_config::RMVer::Ace);
+        }
+
+        for path in self.read_dir("").ok()? {
+            let path = path.path();
+            if path.extension() == Some("rgssad") {
+                return Some(luminol_config::RMVer::XP);
+            }
+
+            if path.extension() == Some("rgss2a") {
+                return Some(luminol_config::RMVer::VX);
+            }
+
+            if path.extension() == Some("rgss3a") {
+                return Some(luminol_config::RMVer::Ace);
+            }
+        }
+
+        None
+    }
+
+    fn load_project_config(&self) -> Result<luminol_config::project::Config> {
+        if !self.exists(".luminol")? {
+            self.create_dir(".luminol")?;
+        }
+
+        let project = match self
+            .read_to_string(".luminol/config")
+            .ok()
+            .and_then(|s| ron::from_str(&s).ok())
+        {
+            Some(c) => c,
+            None => {
+                let Some(editor_ver) = self.detect_rm_ver() else {
+                    return Err(Error::UnableToDetectRMVer);
+                };
+                let config = luminol_config::project::Project {
+                    editor_ver,
+                    ..Default::default()
+                };
+                self.write(".luminol/config", ron::to_string(&config).unwrap())?;
+                config
+            }
+        };
+
+        let command_db = match self
+            .read_to_string(".luminol/commands")
+            .ok()
+            .and_then(|s| ron::from_str(&s).ok())
+        {
+            Some(c) => c,
+            None => {
+                let command_db = luminol_config::command_db::CommandDB::new(project.editor_ver);
+                self.write(".luminol/commands", ron::to_string(&command_db).unwrap())?;
+                command_db
+            }
+        };
+
+        let game_ini = match self
+            .read_to_string("Game.ini")
+            .ok()
+            .and_then(|i| ini::Ini::load_from_str_noescape(&i).ok())
+        {
+            Some(i) => i,
+            None => {
+                let mut ini = ini::Ini::new();
+                ini.with_section(Some("Game"))
+                    .set("Library", "RGSS104E.dll")
+                    .set("Scripts", &project.scripts_path)
+                    .set("Title", &project.project_name)
+                    .set("RTP1", "")
+                    .set("RTP2", "")
+                    .set("RTP3", "");
+
+                ini
+            }
+        };
+
+        Ok(luminol_config::project::Config {
+            project,
+            command_db,
+            game_ini,
+        })
+    }
+
+    pub fn debug_ui(&self, ui: &mut egui::Ui) {
+        match self {
+            FileSystem::Unloaded => {
+                ui.label("Unloaded");
+            }
+            FileSystem::HostLoaded(fs) => {
+                ui.label("Host Filesystem Loaded");
+                ui.horizontal(|ui| {
+                    ui.label("Project path: ");
+                    ui.label(fs.root_path().as_str());
+                });
+            }
+            FileSystem::Loaded { filesystem, .. } => {
+                ui.label("Loaded");
+                filesystem.debug_ui(ui);
+            }
+        }
+    }
+
+    pub fn load_project(
+        &mut self,
+        host: host::FileSystem,
+        project_config: &mut Option<luminol_config::project::Config>,
+        global_config: &mut luminol_config::global::Config,
+    ) -> Result<LoadResult> {
+        *self = FileSystem::HostLoaded(host);
+        let config = self.load_project_config()?;
+
+        let Self::HostLoaded(host) = std::mem::take(self) else {
+            panic!("unable to fetch host filesystem")
+        };
+
+        let result = self.load_partially_loaded_project(host, &config, global_config)?;
+
+        *project_config = Some(config);
+
+        Ok(result)
+    }
+}
+
+// Specific to windows
+#[cfg(windows)]
+impl FileSystem {
+    fn find_rtp_paths(
+        config: &luminol_config::project::Config,
+        global_config: &luminol_config::global::Config,
+    ) -> (Vec<camino::Utf8PathBuf>, Vec<String>) {
+        let Some(section) = config.game_ini.section(Some("Game")) else {
+            return (vec![], vec![]);
+        };
+        let mut paths = vec![];
+        let mut seen_rtps = vec![];
+        let mut missing_rtps = vec![];
+        // FIXME: handle vx ace?
+        for rtp in ["RTP1", "RTP2", "RTP3"] {
+            if let Some(rtp) = section.get(rtp) {
+                if seen_rtps.contains(&rtp) || rtp.is_empty() {
+                    continue;
+                }
+                seen_rtps.push(rtp);
+
+                let hklm = winreg::RegKey::predef(winreg::enums::HKEY_LOCAL_MACHINE);
+                if let Ok(value) = hklm
+                    .open_subkey("SOFTWARE\\WOW6432Node\\Enterbrain\\RGSS\\RTP")
+                    .and_then(|key| key.get_value::<String, _>(rtp))
+                {
+                    let path = camino::Utf8PathBuf::from(value);
+                    if path.exists() {
+                        paths.push(path);
+                        continue;
+                    }
+                }
+
+                if let Ok(value) = hklm
+                    .open_subkey("SOFTWARE\\WOW6432Node\\Enterbrain\\RPGXP")
+                    .and_then(|key| key.get_value::<String, _>("ApplicationPath"))
+                {
+                    let path = camino::Utf8PathBuf::from(value).join("rtp");
+                    if path.exists() {
+                        paths.push(path);
+                        continue;
+                    }
+                }
+
+                if let Ok(value) = hklm
+                    .open_subkey(
+                        "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App 235900",
+                    )
+                    .and_then(|key| key.get_value::<String, _>("InstallLocation"))
+                {
+                    let path = camino::Utf8PathBuf::from(value).join("rtp");
+                    if path.exists() {
+                        paths.push(path);
+                        continue;
+                    }
+                }
+
+                if let Some(path) = global_config.rtp_paths.get(rtp) {
+                    let path = camino::Utf8PathBuf::from(path);
+                    if path.exists() {
+                        paths.push(path);
+                        continue;
+                    }
+                }
+
+                missing_rtps.push(rtp.to_string());
+            }
+        }
+        (paths, missing_rtps)
+    }
+}
+
+// Specific to anything BUT windows
+#[cfg(not(any(windows, target_arch = "wasm32")))]
+impl FileSystem {
+    fn find_rtp_paths(
+        config: &luminol_config::project::Config,
+        global_config: &luminol_config::global::Config,
+    ) -> (Vec<camino::Utf8PathBuf>, Vec<String>) {
+        let Some(section) = config.game_ini.section(Some("Game")) else {
+            return (vec![], vec![]);
+        };
+        let mut paths = vec![];
+        let mut seen_rtps = vec![];
+        let mut missing_rtps = vec![];
+        // FIXME: handle vx ace?
+        for rtp in ["RTP1", "RTP2", "RTP3"] {
+            if let Some(rtp) = section.get(rtp) {
+                if seen_rtps.contains(&rtp) || rtp.is_empty() {
+                    continue;
+                }
+                seen_rtps.push(rtp);
+
+                if let Some(path) = global_config.rtp_paths.get(rtp) {
+                    let path = camino::Utf8PathBuf::from(path);
+                    if path.exists() {
+                        paths.push(path);
+                        continue;
+                    }
+                }
+
+                missing_rtps.push(rtp.to_string());
+            }
+        }
+        (paths, missing_rtps)
+    }
+}
+
+// Specific to native
+#[cfg(not(target_arch = "wasm32"))]
+impl FileSystem {
+    pub fn load_project_from_path(
+        &mut self,
+        project_config: &mut Option<luminol_config::project::Config>,
+        global_config: &mut luminol_config::global::Config,
+        project_path: impl AsRef<camino::Utf8Path>,
+    ) -> Result<LoadResult> {
+        let host = host::FileSystem::new(project_path);
+        self.load_project(host, project_config, global_config)
+    }
+
+    pub fn load_partially_loaded_project(
+        &mut self,
+        host: host::FileSystem,
+        project_config: &luminol_config::project::Config,
+        global_config: &mut luminol_config::global::Config,
+    ) -> Result<LoadResult> {
+        let project_path = host.root_path().to_path_buf();
+
+        let mut list = list::FileSystem::new();
+
+        let archive = host
+            .read_dir("")?
+            .into_iter()
+            .find(|entry| {
+                entry.metadata.is_file
+                    && matches!(entry.path.extension(), Some("rgssad" | "rgss2a" | "rgss3a"))
+            })
+            .map(|entry| host.open_file(entry.path, OpenFlags::Read | OpenFlags::Write))
+            .transpose()?
+            .map(archiver::FileSystem::new)
+            .transpose()?;
+
+        list.push(host);
+        // FIXME: handle missing rtps
+        let (found_rtps, missing_rtps) = Self::find_rtp_paths(project_config, global_config);
+        for path in found_rtps {
+            list.push(host::FileSystem::new(path))
+        }
+        if let Some(archive) = archive {
+            list.push(archive);
+        }
+
+        let path_cache = path_cache::FileSystem::new(list)?;
+
+        *self = FileSystem::Loaded {
+            filesystem: path_cache,
+            project_path: project_path.to_path_buf(),
+        };
+
+        // FIXME: handle
+        // if let Err(e) = state!().data_cache.load() {
+        //     *self = FileSystem::Unloaded;
+        //     return Err(e);
+        // }
+
+        let mut projects: std::collections::VecDeque<_> = global_config
+            .recent_projects
+            .iter()
+            .filter(|p| p.as_str() != project_path)
+            .cloned()
+            .collect();
+        projects.push_front(project_path.into_string());
+        global_config.recent_projects = projects;
+
+        Ok(LoadResult { missing_rtps })
+    }
+}
+
+// Specific to web
+#[cfg(target_arch = "wasm32")]
+impl FileSystem {
+    fn find_rtp_paths(
+        filesystem: &host::FileSystem,
+        config: &luminol_config::project::Config,
+    ) -> (Vec<camino::Utf8PathBuf>, Vec<String>) {
+        let Some(section) = config.game_ini.section(Some("Game")) else {
+            return (vec![], vec![]);
+        };
+        let mut paths = vec![];
+        let mut seen_rtps = vec![];
+        let mut missing_rtps = vec![];
+        // FIXME: handle vx ace?
+        for rtp in ["RTP1", "RTP2", "RTP3"] {
+            if let Some(rtp) = section.get(rtp) {
+                if seen_rtps.contains(&rtp) || rtp.is_empty() {
+                    continue;
+                }
+                seen_rtps.push(rtp);
+
+                let path = camino::Utf8PathBuf::from("RTP").join(rtp);
+                if let Ok(exists) = filesystem.exists(&path) {
+                    if exists {
+                        paths.push(path);
+                        continue;
+                    }
+                }
+
+                missing_rtps.push(rtp.to_string());
+            }
+        }
+        (paths, missing_rtps)
+    }
+
+    #[cfg(target_arch = "wasm32")]
+    pub fn load_partially_loaded_project(
+        &mut self,
+        host: host::FileSystem,
+        project_config: &luminol_config::project::Config,
+        global_config: &mut luminol_config::global::Config,
+    ) -> Result<LoadResult> {
+        let entries = host.read_dir("")?;
+        let Some(entry) = entries.iter().find(|e| {
+            if let Some(extension) = e.path.extension() {
+                e.metadata.is_file
+                    && (extension == "rxproj"
+                        || extension == "rvproj"
+                        || extension == "rvproj2"
+                        || extension == "lumproj")
+            } else {
+                false
+            }
+        }) else {
+            return Err(Error::InvalidProjectFolder);
+        };
+
+        let root_path = host.root_path().to_path_buf();
+        let idb_key = host.idb_key().map(|k| k.to_string());
+
+        let mut list = list::FileSystem::new();
+
+        let (found_rtps, missing_rtps) = Self::find_rtp_paths(&host, project_config);
+        let rtp_filesystems: Vec<_> = found_rtps
+            .into_iter()
+            .map(|rtp| host.subdir(rtp))
+            .try_collect()?;
+
+        let archive = host
+            .read_dir("")?
+            .into_iter()
+            .find(|entry| {
+                entry.metadata.is_file
+                    && matches!(entry.path.extension(), Some("rgssad" | "rgss2a" | "rgss3a"))
+            })
+            .map(|entry| host.open_file(entry.path, OpenFlags::Read | OpenFlags::Write))
+            .transpose()?
+            .map(archiver::FileSystem::new)
+            .transpose()?;
+
+        list.push(host);
+        for filesystem in rtp_filesystems {
+            list.push(filesystem)
+        }
+        if let Some(archive) = archive {
+            list.push(archive);
+        }
+
+        let path_cache = path_cache::FileSystem::new(list)?;
+
+        *self = Self::Loaded {
+            filesystem: path_cache,
+            project_path: root_path.clone(),
+        };
+
+        if let Some(idb_key) = idb_key {
+            let mut projects: std::collections::VecDeque<_> = global_config
+                .recent_projects
+                .iter()
+                .filter(|(_, k)| k.as_str() != idb_key.as_str())
+                .cloned()
+                .collect();
+            projects.push_front((root_path.join(&entry.path).to_string(), idb_key));
+            global_config.recent_projects = projects;
+        }
+
+        Ok(LoadResult { missing_rtps })
+    }
+}
+
+impl std::io::Write for File {
+    fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
+        match self {
+            File::Host(f) => f.write(buf),
+            File::Loaded(f) => f.write(buf),
+        }
+    }
+
+    fn write_vectored(&mut self, bufs: &[std::io::IoSlice<'_>]) -> std::io::Result<usize> {
+        match self {
+            File::Host(f) => f.write_vectored(bufs),
+            File::Loaded(f) => f.write_vectored(bufs),
+        }
+    }
+
+    fn flush(&mut self) -> std::io::Result<()> {
+        match self {
+            File::Host(f) => f.flush(),
+            File::Loaded(f) => f.flush(),
+        }
+    }
+}
+
+impl std::io::Read for File {
+    fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
+        match self {
+            File::Host(f) => f.read(buf),
+            File::Loaded(f) => f.read(buf),
+        }
+    }
+
+    fn read_vectored(&mut self, bufs: &mut [std::io::IoSliceMut<'_>]) -> std::io::Result<usize> {
+        match self {
+            File::Host(f) => f.read_vectored(bufs),
+            File::Loaded(f) => f.read_vectored(bufs),
+        }
+    }
+
+    fn read_exact(&mut self, buf: &mut [u8]) -> std::io::Result<()> {
+        match self {
+            File::Host(f) => f.read_exact(buf),
+            File::Loaded(f) => f.read_exact(buf),
+        }
+    }
+}
+
+impl std::io::Seek for File {
+    fn seek(&mut self, pos: std::io::SeekFrom) -> std::io::Result<u64> {
+        match self {
+            File::Host(f) => f.seek(pos),
+            File::Loaded(f) => f.seek(pos),
+        }
+    }
+
+    fn stream_position(&mut self) -> std::io::Result<u64> {
+        match self {
+            File::Host(f) => f.stream_position(),
+            File::Loaded(f) => f.stream_position(),
+        }
+    }
+}
+
+impl crate::File for File {
+    fn metadata(&self) -> Result<Metadata> {
+        match self {
+            File::Host(h) => crate::File::metadata(h),
+            File::Loaded(l) => l.metadata(),
+        }
+    }
+}
+
+impl crate::FileSystem for FileSystem {
+    type File = File;
+
+    fn open_file(
+        &self,
+        path: impl AsRef<camino::Utf8Path>,
+        flags: OpenFlags,
+    ) -> Result<Self::File> {
+        match self {
+            FileSystem::Unloaded => Err(Error::NotLoaded),
+            FileSystem::HostLoaded(f) => f.open_file(path, flags).map(File::Host),
+            FileSystem::Loaded { filesystem: f, .. } => f.open_file(path, flags).map(File::Loaded),
+        }
+    }
+
+    fn metadata(&self, path: impl AsRef<camino::Utf8Path>) -> Result<Metadata> {
+        match self {
+            FileSystem::Unloaded => Err(Error::NotLoaded),
+            FileSystem::HostLoaded(f) => f.metadata(path),
+            FileSystem::Loaded { filesystem: f, .. } => f.metadata(path),
+        }
+    }
+
+    fn rename(
+        &self,
+        from: impl AsRef<camino::Utf8Path>,
+        to: impl AsRef<camino::Utf8Path>,
+    ) -> Result<()> {
+        match self {
+            FileSystem::Unloaded => Err(Error::NotLoaded),
+            FileSystem::HostLoaded(f) => f.rename(from, to),
+            FileSystem::Loaded { filesystem, .. } => filesystem.rename(from, to),
+        }
+    }
+
+    fn exists(&self, path: impl AsRef<camino::Utf8Path>) -> Result<bool> {
+        match self {
+            FileSystem::Unloaded => Err(Error::NotLoaded),
+            FileSystem::HostLoaded(f) => f.exists(path),
+            FileSystem::Loaded { filesystem, .. } => filesystem.exists(path),
+        }
+    }
+
+    fn create_dir(&self, path: impl AsRef<camino::Utf8Path>) -> Result<()> {
+        match self {
+            FileSystem::Unloaded => Err(Error::NotLoaded),
+            FileSystem::HostLoaded(f) => f.create_dir(path),
+            FileSystem::Loaded { filesystem, .. } => filesystem.create_dir(path),
+        }
+    }
+
+    fn remove_dir(&self, path: impl AsRef<camino::Utf8Path>) -> Result<()> {
+        match self {
+            FileSystem::Unloaded => Err(Error::NotLoaded),
+            FileSystem::HostLoaded(f) => f.remove_dir(path),
+            FileSystem::Loaded { filesystem, .. } => filesystem.remove_dir(path),
+        }
+    }
+
+    fn remove_file(&self, path: impl AsRef<camino::Utf8Path>) -> Result<()> {
+        match self {
+            FileSystem::Unloaded => Err(Error::NotLoaded),
+            FileSystem::HostLoaded(f) => f.remove_file(path),
+            FileSystem::Loaded { filesystem, .. } => filesystem.remove_file(path),
+        }
+    }
+
+    fn read_dir(&self, path: impl AsRef<camino::Utf8Path>) -> Result<Vec<DirEntry>> {
+        match self {
+            FileSystem::Unloaded => Err(Error::NotLoaded),
+            FileSystem::HostLoaded(f) => f.read_dir(path),
+            FileSystem::Loaded { filesystem, .. } => filesystem.read_dir(path),
+        }
+    }
+}
diff --git a/src/filesystem/web.rs b/crates/filesystem/src/web.rs
similarity index 91%
rename from src/filesystem/web.rs
rename to crates/filesystem/src/web.rs
index 2b86cbf8..a7073322 100644
--- a/src/filesystem/web.rs
+++ b/crates/filesystem/src/web.rs
@@ -14,17 +14,16 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
-use crate::prelude::*;
 use indexed_db_futures::prelude::*;
 use rand::Rng;
+use std::future::IntoFuture;
 use wasm_bindgen::prelude::*;
 
-use crate::web::bindings;
-
 use super::FileSystem as FileSystemTrait;
-use super::{DirEntry, Error, Metadata, OpenFlags};
+use super::{DirEntry, Error, Metadata, OpenFlags, Result};
 
-static FILESYSTEM_TX: OnceCell<mpsc::UnboundedSender<FileSystemCommand>> = OnceCell::new();
+static FILESYSTEM_TX: once_cell::sync::OnceCell<flume::Sender<FileSystemCommand>> =
+    once_cell::sync::OnceCell::new();
 
 #[derive(Debug)]
 pub struct FileSystem {
@@ -47,42 +46,30 @@ enum FileSystemCommandInner {
     DirEntryMetadata(
         usize,
         camino::Utf8PathBuf,
-        oneshot::Sender<Result<Metadata, Error>>,
+        oneshot::Sender<Result<Metadata>>,
     ),
     DirPicker(oneshot::Sender<Option<(usize, String, Option<String>)>>),
     DirFromIdb(String, oneshot::Sender<Option<(usize, String)>>),
     DirSubdir(
         usize,
         camino::Utf8PathBuf,
-        oneshot::Sender<Result<(usize, String, Option<String>), Error>>,
+        oneshot::Sender<Result<(usize, String, Option<String>)>>,
     ),
     DirIdbDrop(String, oneshot::Sender<bool>),
     DirOpenFile(
         usize,
         camino::Utf8PathBuf,
         OpenFlags,
-        oneshot::Sender<Result<usize, Error>>,
+        oneshot::Sender<Result<usize>>,
     ),
     DirEntryExists(usize, camino::Utf8PathBuf, oneshot::Sender<bool>),
-    DirCreateDir(
-        usize,
-        camino::Utf8PathBuf,
-        oneshot::Sender<Result<(), Error>>,
-    ),
-    DirRemoveDir(
-        usize,
-        camino::Utf8PathBuf,
-        oneshot::Sender<Result<(), Error>>,
-    ),
-    DirRemoveFile(
-        usize,
-        camino::Utf8PathBuf,
-        oneshot::Sender<Result<(), Error>>,
-    ),
+    DirCreateDir(usize, camino::Utf8PathBuf, oneshot::Sender<Result<()>>),
+    DirRemoveDir(usize, camino::Utf8PathBuf, oneshot::Sender<Result<()>>),
+    DirRemoveFile(usize, camino::Utf8PathBuf, oneshot::Sender<Result<()>>),
     DirReadDir(
         usize,
         camino::Utf8PathBuf,
-        oneshot::Sender<Result<Vec<DirEntry>, Error>>,
+        oneshot::Sender<Result<Vec<DirEntry>>>,
     ),
     DirDrop(usize, oneshot::Sender<bool>),
     DirClone(usize, oneshot::Sender<usize>),
@@ -95,16 +82,17 @@ enum FileSystemCommandInner {
         oneshot::Sender<std::io::Result<u64>>,
     ),
     FileDrop(usize, oneshot::Sender<bool>),
+    FileSize(usize, oneshot::Sender<u64>),
 }
 
-fn filesystem_tx_or_die() -> &'static mpsc::UnboundedSender<FileSystemCommand> {
+fn filesystem_tx_or_die() -> &'static flume::Sender<FileSystemCommand> {
     FILESYSTEM_TX.get().expect("FileSystem sender has not been initialized! Please call `FileSystem::initialize_sender` before calling this function.")
 }
 
 impl FileSystem {
     /// Initializes the sender that we use to send filesystem commands to the main thread.
     /// This must be called before performing any filesystem operations.
-    pub fn setup_filesystem_sender(filesystem_tx: mpsc::UnboundedSender<FileSystemCommand>) {
+    pub fn setup_filesystem_sender(filesystem_tx: flume::Sender<FileSystemCommand>) {
         FILESYSTEM_TX
             .set(filesystem_tx)
             .expect("FileSystem sender cannot be initialized twice");
@@ -118,7 +106,7 @@ impl FileSystem {
                 oneshot_tx,
             )))
             .unwrap();
-        oneshot_rx.blocking_recv().unwrap()
+        oneshot_rx.recv().unwrap()
     }
 
     /// Attempts to prompt the user to choose a directory from their local machine using the
@@ -126,9 +114,9 @@ impl FileSystem {
     /// Then creates a `FileSystem` allowing read-write access to that directory if they chose one
     /// successfully.
     /// If the File System API is not supported, this always returns `None` without doing anything.
-    pub async fn from_directory_picker() -> Option<Self> {
+    pub async fn from_folder_picker() -> Result<Self> {
         if !Self::filesystem_supported() {
-            return None;
+            return Err(Error::Wasm32FilesystemNotSupported);
         }
         let (oneshot_tx, oneshot_rx) = oneshot::channel();
         filesystem_tx_or_die()
@@ -140,12 +128,13 @@ impl FileSystem {
             .await
             .unwrap()
             .map(|(key, name, idb_key)| FileSystem { key, name, idb_key })
+            .ok_or(Error::CancelledLoading)
     }
 
     /// Attempts to restore a previously created `FileSystem` using its `.idb_key()`.
-    pub async fn from_idb_key(idb_key: String) -> Option<Self> {
+    pub async fn from_idb_key(idb_key: String) -> Result<Self> {
         if !Self::filesystem_supported() {
-            return None;
+            return Err(Error::Wasm32FilesystemNotSupported);
         }
         let (oneshot_tx, oneshot_rx) = oneshot::channel();
         filesystem_tx_or_die()
@@ -154,15 +143,19 @@ impl FileSystem {
                 oneshot_tx,
             )))
             .unwrap();
-        oneshot_rx.await.unwrap().map(|(key, name)| FileSystem {
-            key,
-            name,
-            idb_key: Some(idb_key),
-        })
+        oneshot_rx
+            .await
+            .unwrap()
+            .map(|(key, name)| FileSystem {
+                key,
+                name,
+                idb_key: Some(idb_key),
+            })
+            .ok_or(Error::MissingIDB)
     }
 
     /// Creates a new `FileSystem` from a subdirectory of this one.
-    pub fn subdir(&self, path: impl AsRef<camino::Utf8Path>) -> Result<Self, Error> {
+    pub fn subdir(&self, path: impl AsRef<camino::Utf8Path>) -> Result<Self> {
         let (oneshot_tx, oneshot_rx) = oneshot::channel();
         filesystem_tx_or_die()
             .send(FileSystemCommand(FileSystemCommandInner::DirSubdir(
@@ -172,7 +165,7 @@ impl FileSystem {
             )))
             .unwrap();
         oneshot_rx
-            .blocking_recv()
+            .recv()
             .unwrap()
             .map(|(key, name, idb_key)| FileSystem { key, name, idb_key })
     }
@@ -185,7 +178,7 @@ impl FileSystem {
                 idb_key, oneshot_tx,
             )))
             .unwrap();
-        oneshot_rx.blocking_recv().unwrap()
+        oneshot_rx.recv().unwrap()
     }
 
     /// Returns a path consisting of a single element: the name of the root directory of this
@@ -208,7 +201,7 @@ impl Drop for FileSystem {
                 self.key, oneshot_tx,
             )))
             .unwrap();
-        oneshot_rx.blocking_recv().unwrap();
+        oneshot_rx.recv().unwrap();
     }
 }
 
@@ -221,7 +214,7 @@ impl Clone for FileSystem {
             )))
             .unwrap();
         Self {
-            key: oneshot_rx.blocking_recv().unwrap(),
+            key: oneshot_rx.recv().unwrap(),
             name: self.name.clone(),
             idb_key: self.idb_key.clone(),
         }
@@ -229,13 +222,13 @@ impl Clone for FileSystem {
 }
 
 impl FileSystemTrait for FileSystem {
-    type File<'fs> = File where Self: 'fs;
+    type File = File;
 
     fn open_file(
         &self,
         path: impl AsRef<camino::Utf8Path>,
         mut flags: OpenFlags,
-    ) -> Result<Self::File<'_>, Error> {
+    ) -> Result<Self::File> {
         if flags.contains(OpenFlags::Truncate) || flags.contains(OpenFlags::Create) {
             flags |= OpenFlags::Write;
         }
@@ -248,10 +241,10 @@ impl FileSystemTrait for FileSystem {
                 oneshot_tx,
             )))
             .unwrap();
-        oneshot_rx.blocking_recv().unwrap().map(|key| File { key })
+        oneshot_rx.recv().unwrap().map(|key| File { key })
     }
 
-    fn metadata(&self, path: impl AsRef<camino::Utf8Path>) -> Result<Metadata, Error> {
+    fn metadata(&self, path: impl AsRef<camino::Utf8Path>) -> Result<Metadata> {
         let (oneshot_tx, oneshot_rx) = oneshot::channel();
         filesystem_tx_or_die()
             .send(FileSystemCommand(FileSystemCommandInner::DirEntryMetadata(
@@ -260,18 +253,18 @@ impl FileSystemTrait for FileSystem {
                 oneshot_tx,
             )))
             .unwrap();
-        oneshot_rx.blocking_recv().unwrap()
+        oneshot_rx.recv().unwrap()
     }
 
     fn rename(
         &self,
         from: impl AsRef<camino::Utf8Path>,
         to: impl AsRef<camino::Utf8Path>,
-    ) -> Result<(), Error> {
+    ) -> Result<()> {
         Err(Error::NotSupported)
     }
 
-    fn exists(&self, path: impl AsRef<camino::Utf8Path>) -> Result<bool, Error> {
+    fn exists(&self, path: impl AsRef<camino::Utf8Path>) -> Result<bool> {
         let (oneshot_tx, oneshot_rx) = oneshot::channel();
         filesystem_tx_or_die()
             .send(FileSystemCommand(FileSystemCommandInner::DirEntryExists(
@@ -280,10 +273,10 @@ impl FileSystemTrait for FileSystem {
                 oneshot_tx,
             )))
             .unwrap();
-        Ok(oneshot_rx.blocking_recv().unwrap())
+        Ok(oneshot_rx.recv().unwrap())
     }
 
-    fn create_dir(&self, path: impl AsRef<camino::Utf8Path>) -> Result<(), Error> {
+    fn create_dir(&self, path: impl AsRef<camino::Utf8Path>) -> Result<()> {
         let (oneshot_tx, oneshot_rx) = oneshot::channel();
         filesystem_tx_or_die()
             .send(FileSystemCommand(FileSystemCommandInner::DirCreateDir(
@@ -292,10 +285,10 @@ impl FileSystemTrait for FileSystem {
                 oneshot_tx,
             )))
             .unwrap();
-        oneshot_rx.blocking_recv().unwrap()
+        oneshot_rx.recv().unwrap()
     }
 
-    fn remove_dir(&self, path: impl AsRef<camino::Utf8Path>) -> Result<(), Error> {
+    fn remove_dir(&self, path: impl AsRef<camino::Utf8Path>) -> Result<()> {
         let (oneshot_tx, oneshot_rx) = oneshot::channel();
         filesystem_tx_or_die()
             .send(FileSystemCommand(FileSystemCommandInner::DirRemoveDir(
@@ -304,10 +297,10 @@ impl FileSystemTrait for FileSystem {
                 oneshot_tx,
             )))
             .unwrap();
-        oneshot_rx.blocking_recv().unwrap()
+        oneshot_rx.recv().unwrap()
     }
 
-    fn remove_file(&self, path: impl AsRef<camino::Utf8Path>) -> Result<(), Error> {
+    fn remove_file(&self, path: impl AsRef<camino::Utf8Path>) -> Result<()> {
         let (oneshot_tx, oneshot_rx) = oneshot::channel();
         filesystem_tx_or_die()
             .send(FileSystemCommand(FileSystemCommandInner::DirRemoveFile(
@@ -316,10 +309,10 @@ impl FileSystemTrait for FileSystem {
                 oneshot_tx,
             )))
             .unwrap();
-        oneshot_rx.blocking_recv().unwrap()
+        oneshot_rx.recv().unwrap()
     }
 
-    fn read_dir(&self, path: impl AsRef<camino::Utf8Path>) -> Result<Vec<DirEntry>, Error> {
+    fn read_dir(&self, path: impl AsRef<camino::Utf8Path>) -> Result<Vec<DirEntry>> {
         let (oneshot_tx, oneshot_rx) = oneshot::channel();
         filesystem_tx_or_die()
             .send(FileSystemCommand(FileSystemCommandInner::DirReadDir(
@@ -328,7 +321,7 @@ impl FileSystemTrait for FileSystem {
                 oneshot_tx,
             )))
             .unwrap();
-        oneshot_rx.blocking_recv().unwrap()
+        oneshot_rx.recv().unwrap()
     }
 }
 
@@ -340,7 +333,23 @@ impl Drop for File {
                 self.key, oneshot_tx,
             )))
             .unwrap();
-        oneshot_rx.blocking_recv().unwrap();
+        oneshot_rx.recv().unwrap();
+    }
+}
+
+impl crate::File for File {
+    fn metadata(&self) -> crate::Result<Metadata> {
+        let (oneshot_tx, oneshot_rx) = oneshot::channel();
+        filesystem_tx_or_die()
+            .send(FileSystemCommand(FileSystemCommandInner::FileSize(
+                self.key, oneshot_tx,
+            )))
+            .unwrap();
+        let size = oneshot_rx.recv().unwrap();
+        Ok(Metadata {
+            is_file: true,
+            size,
+        })
     }
 }
 
@@ -354,7 +363,7 @@ impl std::io::Read for File {
                 oneshot_tx,
             )))
             .unwrap();
-        let vec = oneshot_rx.blocking_recv().unwrap()?;
+        let vec = oneshot_rx.recv().unwrap()?;
         let length = vec.len();
         buf[..length].copy_from_slice(&vec[..]);
         Ok(length)
@@ -371,7 +380,7 @@ impl std::io::Write for File {
                 oneshot_tx,
             )))
             .unwrap();
-        oneshot_rx.blocking_recv().unwrap()?;
+        oneshot_rx.recv().unwrap()?;
         Ok(buf.len())
     }
 
@@ -382,7 +391,7 @@ impl std::io::Write for File {
                 self.key, oneshot_tx,
             )))
             .unwrap();
-        oneshot_rx.blocking_recv().unwrap()
+        oneshot_rx.recv().unwrap()
     }
 }
 
@@ -394,11 +403,11 @@ impl std::io::Seek for File {
                 self.key, pos, oneshot_tx,
             )))
             .unwrap();
-        oneshot_rx.blocking_recv().unwrap()
+        oneshot_rx.recv().unwrap()
     }
 }
 
-pub fn setup_main_thread_hooks(mut filesystem_rx: mpsc::UnboundedReceiver<FileSystemCommand>) {
+pub fn setup_main_thread_hooks(mut filesystem_rx: flume::Receiver<FileSystemCommand>) {
     wasm_bindgen_futures::spawn_local(async move {
         web_sys::window().expect("cannot run `setup_main_thread_hooks()` outside of main thread");
 
@@ -412,7 +421,7 @@ pub fn setup_main_thread_hooks(mut filesystem_rx: mpsc::UnboundedReceiver<FileSy
         let mut dirs: slab::Slab<web_sys::FileSystemDirectoryHandle> = slab::Slab::new();
         let mut files: slab::Slab<FileHandle> = slab::Slab::new();
 
-        async fn to_future<T>(promise: js_sys::Promise) -> Result<T, js_sys::Error>
+        async fn to_future<T>(promise: js_sys::Promise) -> std::result::Result<T, js_sys::Error>
         where
             T: JsCast,
         {
@@ -441,8 +450,8 @@ pub fn setup_main_thread_hooks(mut filesystem_rx: mpsc::UnboundedReceiver<FileSy
 
         async fn idb<R>(
             mode: IdbTransactionMode,
-            f: impl Fn(IdbObjectStore<'_>) -> Result<R, web_sys::DomException>,
-        ) -> Result<R, web_sys::DomException> {
+            f: impl Fn(IdbObjectStore<'_>) -> std::result::Result<R, web_sys::DomException>,
+        ) -> std::result::Result<R, web_sys::DomException> {
             let mut db_req = IdbDatabase::open_u32("astrabit.luminol", 1)?;
 
             // Create store for our directory handles if it doesn't exist
@@ -466,7 +475,7 @@ pub fn setup_main_thread_hooks(mut filesystem_rx: mpsc::UnboundedReceiver<FileSy
         }
 
         loop {
-            let Some(command) = filesystem_rx.recv().await else {
+            let Ok(command) = filesystem_rx.recv_async().await else {
                 tracing::warn!(
                     "FileSystem main thread loop is stopping! This is not supposed to happen."
                 );
@@ -476,7 +485,9 @@ pub fn setup_main_thread_hooks(mut filesystem_rx: mpsc::UnboundedReceiver<FileSy
 
             match command.0 {
                 FileSystemCommandInner::Supported(oneshot_tx) => {
-                    oneshot_tx.send(bindings::filesystem_supported()).unwrap();
+                    oneshot_tx
+                        .send(luminol_web::bindings::filesystem_supported())
+                        .unwrap();
                 }
 
                 FileSystemCommandInner::DirEntryMetadata(key, path, oneshot_tx) => {
@@ -530,7 +541,7 @@ pub fn setup_main_thread_hooks(mut filesystem_rx: mpsc::UnboundedReceiver<FileSy
                 }
 
                 FileSystemCommandInner::DirPicker(oneshot_tx) => {
-                    if let Ok(dir) = bindings::show_directory_picker().await {
+                    if let Ok(dir) = luminol_web::bindings::show_directory_picker().await {
                         // Try to insert the handle into IndexedDB
                         let idb_key = rand::thread_rng()
                             .sample_iter(rand::distributions::Alphanumeric)
@@ -568,7 +579,7 @@ pub fn setup_main_thread_hooks(mut filesystem_rx: mpsc::UnboundedReceiver<FileSy
                     {
                         if let Some(dir) = future.await.ok().flatten() {
                             let dir = dir.unchecked_into::<web_sys::FileSystemDirectoryHandle>();
-                            if bindings::request_permission(&dir).await {
+                            if luminol_web::bindings::request_permission(&dir).await {
                                 let name = dir.name();
                                 oneshot_tx.send(Some((dirs.insert(dir), name))).unwrap();
                             } else {
@@ -886,7 +897,7 @@ pub fn setup_main_thread_hooks(mut filesystem_rx: mpsc::UnboundedReceiver<FileSy
                         oneshot_tx.send(Err(Error::NotExist)).unwrap();
                         continue;
                     };
-                    let entry_iter = bindings::dir_values(&subdir);
+                    let entry_iter = luminol_web::bindings::dir_values(&subdir);
                     let mut vec = Vec::new();
                     loop {
                         let Ok(entry) =
@@ -1083,6 +1094,13 @@ pub fn setup_main_thread_hooks(mut filesystem_rx: mpsc::UnboundedReceiver<FileSy
                         oneshot_tx.send(false).unwrap();
                     }
                 }
+                FileSystemCommandInner::FileSize(key, oneshot_tx) => {
+                    let file = files.get_mut(key).unwrap();
+                    if let Ok(file) = to_future::<web_sys::File>(file.file_handle.get_file()).await
+                    {
+                        oneshot_tx.send(file.size() as u64).unwrap();
+                    }
+                }
             }
         }
     });
diff --git a/crates/graphics/Cargo.toml b/crates/graphics/Cargo.toml
new file mode 100644
index 00000000..f441e1af
--- /dev/null
+++ b/crates/graphics/Cargo.toml
@@ -0,0 +1,43 @@
+[package]
+name = "luminol-graphics"
+
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+rust-version.workspace = true
+readme.workspace = true
+repository.workspace = true
+keywords.workspace = true
+categories.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+image = "0.24.7"
+
+egui.workspace = true
+egui_extras.workspace = true
+egui-wgpu.workspace = true
+wgpu.workspace = true
+glam.workspace = true
+
+naga_oil = "0.10.1"
+naga = "0.13.0"
+
+once_cell.workspace = true
+crossbeam.workspace = true
+dashmap.workspace = true
+
+anyhow.workspace = true
+
+slab.workspace = true
+
+bytemuck.workspace = true
+
+itertools.workspace = true
+
+camino.workspace = true
+
+luminol-data.workspace = true
+luminol-filesystem.workspace = true
diff --git a/src/cache/atlas.rs b/crates/graphics/src/atlas_cache.rs
similarity index 60%
rename from src/cache/atlas.rs
rename to crates/graphics/src/atlas_cache.rs
index fcd721fd..4c174937 100644
--- a/src/cache/atlas.rs
+++ b/crates/graphics/src/atlas_cache.rs
@@ -14,27 +14,38 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
-use crate::prelude::*;
+
+use crate::tiles::Atlas;
 
 #[derive(Default, Debug)]
 pub struct Cache {
-    atlases: dashmap::DashMap<usize, primitives::Atlas>,
+    atlases: dashmap::DashMap<usize, Atlas>,
 }
 
 impl Cache {
-    pub fn load_atlas(&self, tileset: &rpg::Tileset) -> Result<primitives::Atlas, String> {
+    pub fn load_atlas(
+        &self,
+        graphics_state: &crate::GraphicsState,
+        filesystem: &impl luminol_filesystem::FileSystem,
+        tileset: &luminol_data::rpg::Tileset,
+    ) -> anyhow::Result<Atlas> {
         Ok(self
             .atlases
             .entry(tileset.id)
-            .or_try_insert_with(|| primitives::Atlas::new(tileset))?
+            .or_try_insert_with(|| Atlas::new(graphics_state, filesystem, tileset))?
             .clone())
     }
 
-    pub fn reload_atlas(&self, tileset: &rpg::Tileset) -> Result<primitives::Atlas, String> {
+    pub fn reload_atlas(
+        &self,
+        graphics_state: &crate::GraphicsState,
+        filesystem: &impl luminol_filesystem::FileSystem,
+        tileset: &luminol_data::rpg::Tileset,
+    ) -> anyhow::Result<Atlas> {
         Ok(self
             .atlases
             .entry(tileset.id)
-            .insert(primitives::Atlas::new(tileset)?)
+            .insert(Atlas::new(graphics_state, filesystem, tileset)?)
             .clone())
     }
 
diff --git a/src/graphics/event.rs b/crates/graphics/src/event.rs
similarity index 58%
rename from src/graphics/event.rs
rename to crates/graphics/src/event.rs
index 87d6614c..c087eb1d 100644
--- a/src/graphics/event.rs
+++ b/crates/graphics/src/event.rs
@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
 
-use crate::prelude::*;
+use std::sync::Arc;
 
 #[derive(Debug)]
 pub struct Event {
@@ -25,27 +25,53 @@ pub struct Event {
 
 #[derive(Debug)]
 struct Resources {
-    sprite: primitives::Sprite,
-    viewport: primitives::Viewport,
+    sprite: crate::sprite::Sprite,
+    viewport: crate::viewport::Viewport,
 }
 
-type ResourcesSlab = slab::Slab<Arc<Resources>>;
+struct Callback {
+    resources: Arc<Resources>,
+    graphics_state: Arc<crate::GraphicsState>,
+}
+
+// FIXME
+unsafe impl Send for Callback {}
+unsafe impl Sync for Callback {}
+
+impl egui_wgpu::CallbackTrait for Callback {
+    fn paint<'a>(
+        &'a self,
+        info: egui::PaintCallbackInfo,
+        render_pass: &mut wgpu::RenderPass<'a>,
+        callback_resources: &'a egui_wgpu::CallbackResources,
+    ) {
+        self.resources.viewport.bind(render_pass);
+        self.resources
+            .sprite
+            .draw(&self.graphics_state, &self.resources.viewport, render_pass);
+    }
+}
 
 impl Event {
     // code smell, fix
     pub fn new(
-        event: &rpg::Event,
-        atlas: &primitives::Atlas,
+        graphics_state: &crate::GraphicsState,
+        filesystem: &impl luminol_filesystem::FileSystem,
+        event: &luminol_data::rpg::Event,
+        atlas: &crate::tiles::Atlas,
         use_push_constants: bool,
-    ) -> Result<Option<Self>, String> {
+    ) -> anyhow::Result<Option<Self>> {
         let Some(page) = event.pages.first() else {
-            return Err("event does not have first page".to_string());
+            anyhow::bail!("event does not have first page");
         };
 
         let texture = if let Some(ref filename) = page.graphic.character_name {
-            state!()
-                .image_cache
-                .load_wgpu_image("Graphics/Characters", filename)?
+            graphics_state.image_cache.load_wgpu_image(
+                graphics_state,
+                filesystem,
+                "Graphics/Characters",
+                filename,
+            )?
         } else if page.graphic.tile_id.is_some() {
             atlas.atlas_texture.clone()
         } else {
@@ -56,7 +82,8 @@ impl Event {
             // Why does this have to be + 1?
             let quad = atlas.calc_quad((id + 1) as i16);
 
-            let viewport = primitives::Viewport::new(
+            let viewport = crate::viewport::Viewport::new(
+                graphics_state,
                 glam::Mat4::orthographic_rh(0.0, 32., 32., 0., -1., 1.),
                 use_push_constants,
             );
@@ -81,9 +108,10 @@ impl Event {
                 ),
                 egui::vec2(cw - 0.02, ch - 0.02),
             );
-            let quad = primitives::Quad::new(pos, tex_coords, 0.0);
+            let quad = crate::quad::Quad::new(pos, tex_coords, 0.0);
 
-            let viewport = primitives::Viewport::new(
+            let viewport = crate::viewport::Viewport::new(
+                graphics_state,
                 glam::Mat4::orthographic_rh(0.0, cw, ch, 0., -1., 1.),
                 use_push_constants,
             );
@@ -91,7 +119,8 @@ impl Event {
             (quad, viewport, egui::vec2(cw, ch))
         };
 
-        let sprite = primitives::Sprite::new(
+        let sprite = crate::sprite::Sprite::new(
+            graphics_state,
             quads,
             texture,
             page.graphic.blend_type,
@@ -106,41 +135,26 @@ impl Event {
         }))
     }
 
-    pub fn sprite(&self) -> &primitives::Sprite {
+    pub fn sprite(&self) -> &crate::sprite::Sprite {
         &self.resources.sprite
     }
 
-    pub fn set_proj(&self, proj: glam::Mat4) {
-        self.resources.viewport.set_proj(proj);
+    pub fn set_proj(&self, render_state: &egui_wgpu::RenderState, proj: glam::Mat4) {
+        self.resources.viewport.set_proj(render_state, proj);
     }
 
-    pub fn paint(&self, painter: &egui::Painter, rect: egui::Rect) {
-        let resources = self.resources.clone();
-        let resource_id = Arc::new(OnceCell::new());
-
-        let prepare_id = resource_id;
-        let paint_id = prepare_id.clone();
-        let callback = egui_wgpu::CallbackFn::new()
-            .prepare(move |_device, _queue, _encoder, paint_callback_resources| {
-                let res_hash: &mut ResourcesSlab = paint_callback_resources
-                    .entry()
-                    .or_insert_with(Default::default);
-                let id = res_hash.insert(resources.clone());
-                prepare_id.set(id).expect("resources id already set?");
-                vec![]
-            })
-            .paint(move |_info, render_pass, paint_callback_resources| {
-                let res_hash: &ResourcesSlab = paint_callback_resources.get().unwrap();
-                let id = paint_id.get().copied().expect("resources id is unset");
-                let resources = &res_hash[id];
-                let Resources { viewport, sprite } = resources.as_ref();
-
-                viewport.bind(render_pass);
-                sprite.draw(viewport, render_pass);
-            });
-        painter.add(egui::PaintCallback {
-            callback: Arc::new(callback),
+    pub fn paint(
+        &self,
+        graphics_state: Arc<crate::GraphicsState>,
+        painter: &egui::Painter,
+        rect: egui::Rect,
+    ) {
+        painter.add(egui_wgpu::Callback::new_paint_callback(
             rect,
-        });
+            Callback {
+                resources: self.resources.clone(),
+                graphics_state,
+            },
+        ));
     }
 }
diff --git a/src/cache/image_cache.rs b/crates/graphics/src/image_cache.rs
similarity index 82%
rename from src/cache/image_cache.rs
rename to crates/graphics/src/image_cache.rs
index ad30612b..a7821362 100644
--- a/src/cache/image_cache.rs
+++ b/crates/graphics/src/image_cache.rs
@@ -22,10 +22,11 @@
 // terms of the Steamworks API by Valve Corporation, the licensors of this
 // Program grant you additional permission to convey the resulting work.
 
-use eframe::wgpu::util::DeviceExt;
-use once_cell::sync::Lazy;
+use std::sync::Arc;
 
-use crate::prelude::*;
+use anyhow::Context;
+use egui_extras::RetainedImage;
+use wgpu::util::DeviceExt;
 
 #[derive(Default)]
 pub struct Cache {
@@ -72,17 +73,20 @@ impl WgpuTexture {
 impl Cache {
     pub fn load_egui_image(
         &self,
+        filesystem: &impl luminol_filesystem::FileSystem,
         directory: impl AsRef<str>,
         filename: impl AsRef<str>,
-    ) -> Result<Arc<RetainedImage>, String> {
+    ) -> anyhow::Result<Arc<RetainedImage>> {
         let directory = directory.as_ref();
         let filename = filename.as_ref();
 
         let entry = self
             .retained_images
             .entry(format!("{directory}/{filename}"))
-            .or_try_insert_with(|| -> Result<_, String> {
-                let image = self.load_image(directory, filename)?.into_rgba8();
+            .or_try_insert_with(|| -> anyhow::Result<_> {
+                let image = self
+                    .load_image(filesystem, directory, filename)?
+                    .into_rgba8();
                 let image = egui_extras::RetainedImage::from_color_image(
                     format!("{directory}/{filename}"),
                     egui::ColorImage::from_rgba_unmultiplied(
@@ -98,23 +102,27 @@ impl Cache {
 
     pub fn load_image(
         &self,
+        filesystem: &impl luminol_filesystem::FileSystem,
         directory: impl AsRef<camino::Utf8Path>,
         filename: impl AsRef<camino::Utf8Path>,
-    ) -> Result<image::DynamicImage, String> {
+    ) -> anyhow::Result<image::DynamicImage> {
         let path = directory.as_ref().join(filename);
-        let image =
-            image::load_from_memory(&state!().filesystem.read(path).map_err(|e| e.to_string())?)
-                .map_err(|e| e.to_string())?;
-        Ok(image)
+        let data = filesystem
+            .read(&path)
+            .with_context(|| format!("while loading an image at {path}"))?;
+        image::load_from_memory(&data).map_err(anyhow::Error::from)
     }
 
-    pub fn create_texture_bind_group(texture: &wgpu::Texture) -> wgpu::BindGroup {
-        let render_state = &state!().render_state;
+    pub fn create_texture_bind_group(
+        graphics_state: &crate::GraphicsState,
+        texture: &wgpu::Texture,
+    ) -> wgpu::BindGroup {
         // We *really* don't care about the fields here.
         let texture_view = texture.create_view(&wgpu::TextureViewDescriptor::default());
         // We want our texture to use Nearest filtering and repeat.
         // The only time our texture should be repeating is for fogs and panoramas.
-        let sampler = render_state
+        let sampler = graphics_state
+            .render_state
             .device
             .create_sampler(&wgpu::SamplerDescriptor {
                 address_mode_u: wgpu::AddressMode::Repeat,
@@ -128,11 +136,12 @@ impl Cache {
 
         // Create the bind group
         // Again, I have no idea why its setup this way
-        render_state
+        graphics_state
+            .render_state
             .device
             .create_bind_group(&wgpu::BindGroupDescriptor {
                 label: None,
-                layout: Self::bind_group_layout(),
+                layout: &graphics_state.bind_group_layouts.image_cache_texture,
                 entries: &[
                     wgpu::BindGroupEntry {
                         binding: 0,
@@ -148,27 +157,31 @@ impl Cache {
 
     pub fn load_wgpu_image(
         &self,
+        graphics_state: &crate::GraphicsState,
+        filesystem: &impl luminol_filesystem::FileSystem,
         directory: impl AsRef<str>,
         filename: impl AsRef<str>,
-    ) -> Result<Arc<WgpuTexture>, String> {
+    ) -> anyhow::Result<Arc<WgpuTexture>> {
         let directory = directory.as_ref();
         let filename = filename.as_ref();
 
         let entry = self
             .wgpu_textures
             .entry(format!("{directory}/{filename}"))
-            .or_try_insert_with(|| -> Result<_, String> {
+            .or_try_insert_with(|| -> anyhow::Result<_> {
                 // We force the image to be rgba8 to avoid any weird texture errors.
                 // If the image was not rgba8 (say it was rgb8) we would get weird texture errors
-                let image = self.load_image(directory, filename)?.into_rgba8();
+                let image = self
+                    .load_image(filesystem, directory, filename)?
+                    .into_rgba8();
                 // Check that the image will fit into the texture
                 // If we dont perform this check, we may get a segfault (dont ask me how i know this)
                 assert_eq!(image.len() as u32, image.width() * image.height() * 4);
-                let render_state = &state!().render_state;
+
                 // Create the texture and upload the data at the same time.
                 // This is just a utility function to avoid boilerplate
-                let texture = render_state.device.create_texture_with_data(
-                    &render_state.queue,
+                let texture = graphics_state.render_state.device.create_texture_with_data(
+                    &graphics_state.render_state.queue,
                     &wgpu::TextureDescriptor {
                         label: Some(&format!("{directory}/{filename}")),
                         size: wgpu::Extent3d {
@@ -187,7 +200,7 @@ impl Cache {
                     },
                     &image,
                 );
-                let bind_group = Self::create_texture_bind_group(&texture);
+                let bind_group = Self::create_texture_bind_group(graphics_state, &texture);
 
                 let texture = WgpuTexture {
                     texture,
@@ -203,15 +216,9 @@ impl Cache {
         self.retained_images.clear();
         self.wgpu_textures.clear();
     }
-
-    pub fn bind_group_layout() -> &'static wgpu::BindGroupLayout {
-        &LAYOUT
-    }
 }
 
-static LAYOUT: Lazy<wgpu::BindGroupLayout> = Lazy::new(|| {
-    let render_state = &state!().render_state;
-
+pub fn create_bind_group_layout(render_state: &egui_wgpu::RenderState) -> wgpu::BindGroupLayout {
     render_state
         .device
         .create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
@@ -239,4 +246,4 @@ static LAYOUT: Lazy<wgpu::BindGroupLayout> = Lazy::new(|| {
                 },
             ],
         })
-});
+}
diff --git a/crates/graphics/src/lib.rs b/crates/graphics/src/lib.rs
new file mode 100644
index 00000000..4c7156c2
--- /dev/null
+++ b/crates/graphics/src/lib.rs
@@ -0,0 +1,94 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
+
+pub mod quad;
+pub mod sprite;
+pub mod tiles;
+pub mod vertex;
+pub mod viewport;
+
+pub mod event;
+pub mod map;
+pub mod plane;
+
+pub mod atlas_cache;
+pub mod image_cache;
+
+pub use event::Event;
+pub use map::Map;
+pub use plane::Plane;
+
+pub struct GraphicsState {
+    pub image_cache: image_cache::Cache,
+    pub atlas_cache: atlas_cache::Cache,
+    pub render_state: egui_wgpu::RenderState,
+
+    pipelines: Pipelines,
+    bind_group_layouts: BindGroupLayouts,
+}
+
+pub struct BindGroupLayouts {
+    image_cache_texture: wgpu::BindGroupLayout,
+    viewport: wgpu::BindGroupLayout,
+    sprite_graphic: wgpu::BindGroupLayout,
+    atlas_autotiles: wgpu::BindGroupLayout,
+    tile_layer_opacity: wgpu::BindGroupLayout,
+}
+
+pub struct Pipelines {
+    sprites: std::collections::HashMap<luminol_data::BlendMode, wgpu::RenderPipeline>,
+    tiles: wgpu::RenderPipeline,
+}
+
+impl GraphicsState {
+    pub fn new(render_state: egui_wgpu::RenderState) -> Self {
+        let bind_group_layouts = BindGroupLayouts {
+            image_cache_texture: image_cache::create_bind_group_layout(&render_state),
+            viewport: viewport::create_bind_group_layout(&render_state),
+            sprite_graphic: sprite::graphic::create_bind_group_layout(&render_state),
+            atlas_autotiles: tiles::autotiles::create_bind_group_layout(&render_state),
+            tile_layer_opacity: tiles::opacity::create_bind_group_layout(&render_state),
+        };
+
+        let pipelines = Pipelines {
+            sprites: sprite::shader::create_sprite_shaders(&render_state, &bind_group_layouts),
+            tiles: tiles::shader::create_render_pipeline(&render_state, &bind_group_layouts),
+        };
+
+        let image_cache = image_cache::Cache::default();
+        let atlas_cache = atlas_cache::Cache::default();
+
+        Self {
+            image_cache,
+            atlas_cache,
+            render_state,
+            pipelines,
+            bind_group_layouts,
+        }
+    }
+
+    pub fn push_constants_supported(&self) -> bool {
+        push_constants_supported(&self.render_state)
+    }
+}
+
+pub fn push_constants_supported(render_state: &egui_wgpu::RenderState) -> bool {
+    render_state
+        .device
+        .features()
+        .contains(wgpu::Features::PUSH_CONSTANTS)
+}
diff --git a/crates/graphics/src/map.rs b/crates/graphics/src/map.rs
new file mode 100644
index 00000000..67721a5c
--- /dev/null
+++ b/crates/graphics/src/map.rs
@@ -0,0 +1,220 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
+
+use crate::Plane;
+use std::sync::Arc;
+
+use std::time::Duration;
+
+#[derive(Debug)]
+pub struct Map {
+    resources: std::sync::Arc<Resources>,
+    ani_time: Option<f64>,
+
+    pub fog_enabled: bool,
+    pub pano_enabled: bool,
+    pub enabled_layers: Vec<bool>,
+}
+
+#[derive(Debug)]
+struct Resources {
+    tiles: crate::tiles::Tiles,
+    viewport: crate::viewport::Viewport,
+    panorama: Option<Plane>,
+    fog: Option<Plane>,
+}
+
+struct Callback {
+    resources: Arc<Resources>,
+    graphics_state: Arc<crate::GraphicsState>,
+
+    fog_enabled: bool,
+    pano_enabled: bool,
+    enabled_layers: Vec<bool>,
+    selected_layer: Option<usize>,
+}
+
+// FIXME
+unsafe impl Send for Callback {}
+unsafe impl Sync for Callback {}
+
+impl egui_wgpu::CallbackTrait for Callback {
+    fn paint<'a>(
+        &'a self,
+        info: egui::PaintCallbackInfo,
+        render_pass: &mut wgpu::RenderPass<'a>,
+        callback_resources: &'a egui_wgpu::CallbackResources,
+    ) {
+        self.resources.viewport.bind(render_pass);
+
+        if self.pano_enabled {
+            if let Some(panorama) = &self.resources.panorama {
+                panorama.draw(&self.graphics_state, &self.resources.viewport, render_pass);
+            }
+        }
+
+        self.resources.tiles.draw(
+            &self.graphics_state,
+            &self.resources.viewport,
+            &self.enabled_layers,
+            self.selected_layer,
+            render_pass,
+        );
+        if self.fog_enabled {
+            if let Some(fog) = &self.resources.fog {
+                fog.draw(&self.graphics_state, &self.resources.viewport, render_pass);
+            }
+        }
+    }
+}
+
+impl Map {
+    pub fn new(
+        graphics_state: &crate::GraphicsState,
+        filesystem: &impl luminol_filesystem::FileSystem,
+        map: &luminol_data::rpg::Map,
+        tileset: &luminol_data::rpg::Tileset,
+        use_push_constants: bool,
+    ) -> anyhow::Result<Self> {
+        let atlas = graphics_state
+            .atlas_cache
+            .load_atlas(graphics_state, filesystem, tileset)?;
+
+        let tiles = crate::tiles::Tiles::new(graphics_state, atlas, &map.data, use_push_constants);
+
+        let panorama = if let Some(ref panorama_name) = tileset.panorama_name {
+            Some(Plane::new(
+                graphics_state,
+                graphics_state.image_cache.load_wgpu_image(
+                    graphics_state,
+                    filesystem,
+                    "Graphics/Panoramas",
+                    panorama_name,
+                )?,
+                tileset.panorama_hue,
+                100,
+                luminol_data::BlendMode::Normal,
+                255,
+                map.width,
+                map.height,
+                use_push_constants,
+            ))
+        } else {
+            None
+        };
+        let fog = if let Some(ref fog_name) = tileset.fog_name {
+            Some(Plane::new(
+                graphics_state,
+                graphics_state.image_cache.load_wgpu_image(
+                    graphics_state,
+                    filesystem,
+                    "Graphics/Fogs",
+                    fog_name,
+                )?,
+                tileset.fog_hue,
+                tileset.fog_zoom,
+                tileset.fog_blend_type,
+                tileset.fog_opacity,
+                map.width,
+                map.height,
+                use_push_constants,
+            ))
+        } else {
+            None
+        };
+        let viewport = crate::viewport::Viewport::new(
+            graphics_state,
+            glam::Mat4::orthographic_rh(
+                0.0,
+                map.width as f32 * 32.,
+                map.height as f32 * 32.,
+                0.0,
+                -1.0,
+                1.0,
+            ),
+            use_push_constants,
+        );
+
+        Ok(Self {
+            resources: std::sync::Arc::new(Resources {
+                tiles,
+                viewport,
+                panorama,
+                fog,
+            }),
+
+            ani_time: None,
+
+            fog_enabled: true,
+            pano_enabled: true,
+            enabled_layers: vec![true; map.data.zsize()],
+        })
+    }
+
+    pub fn set_tile(
+        &self,
+        render_state: &egui_wgpu::RenderState,
+        tile_id: i16,
+        position: (usize, usize, usize),
+    ) {
+        self.resources
+            .tiles
+            .set_tile(render_state, tile_id, position);
+    }
+
+    pub fn set_proj(&self, render_state: &egui_wgpu::RenderState, proj: glam::Mat4) {
+        self.resources.viewport.set_proj(render_state, proj);
+    }
+
+    pub fn paint(
+        &mut self,
+        graphics_state: Arc<crate::GraphicsState>,
+        painter: &egui::Painter,
+        selected_layer: Option<usize>,
+        rect: egui::Rect,
+    ) {
+        let time = painter.ctx().input(|i| i.time);
+        if let Some(ani_time) = self.ani_time {
+            if time - ani_time >= 16. / 60. {
+                self.ani_time = Some(time);
+                self.resources
+                    .tiles
+                    .autotiles
+                    .inc_ani_index(&graphics_state.render_state);
+            }
+        } else {
+            self.ani_time = Some(time);
+        }
+
+        painter
+            .ctx()
+            .request_repaint_after(Duration::from_secs_f64(16. / 60.));
+
+        painter.add(egui_wgpu::Callback::new_paint_callback(
+            rect,
+            Callback {
+                resources: self.resources.clone(),
+                graphics_state,
+
+                fog_enabled: self.fog_enabled,
+                pano_enabled: self.pano_enabled,
+                enabled_layers: self.enabled_layers.clone(),
+                selected_layer,
+            },
+        ));
+    }
+}
diff --git a/src/graphics/plane.rs b/crates/graphics/src/plane.rs
similarity index 70%
rename from src/graphics/plane.rs
rename to crates/graphics/src/plane.rs
index 8cf84188..75514f9f 100644
--- a/src/graphics/plane.rs
+++ b/crates/graphics/src/plane.rs
@@ -14,19 +14,20 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
-use crate::prelude::*;
 
 #[derive(Debug)]
 pub struct Plane {
-    sprite: primitives::Sprite,
+    sprite: crate::sprite::Sprite,
 }
 
 impl Plane {
+    // FIXME: holy SHIT
     pub fn new(
-        texture: Arc<image_cache::WgpuTexture>,
+        graphics_state: &crate::GraphicsState,
+        texture: std::sync::Arc<crate::image_cache::WgpuTexture>,
         hue: i32,
         zoom: i32,
-        blend_mode: BlendMode,
+        blend_mode: luminol_data::BlendMode,
         opacity: i32,
         map_width: usize,
         map_height: usize,
@@ -41,23 +42,31 @@ impl Plane {
             egui::vec2(map_width / zoom, map_height / zoom),
         );
 
-        let quad = primitives::Quad::new(
+        let quad = crate::quad::Quad::new(
             egui::Rect::from_min_size(egui::pos2(0.0, 0.0), egui::vec2(map_width, map_height)),
             tex_coords,
             0.0,
         );
 
-        let sprite =
-            primitives::Sprite::new(quad, texture, blend_mode, hue, opacity, use_push_constants);
+        let sprite = crate::sprite::Sprite::new(
+            graphics_state,
+            quad,
+            texture,
+            blend_mode,
+            hue,
+            opacity,
+            use_push_constants,
+        );
 
         Self { sprite }
     }
 
     pub fn draw<'rpass>(
         &'rpass self,
-        viewport: &primitives::Viewport,
+        graphics_state: &'rpass crate::GraphicsState,
+        viewport: &crate::viewport::Viewport,
         render_pass: &mut wgpu::RenderPass<'rpass>,
     ) {
-        self.sprite.draw(viewport, render_pass);
+        self.sprite.draw(graphics_state, viewport, render_pass);
     }
 }
diff --git a/src/graphics/primitives/quad.rs b/crates/graphics/src/quad.rs
similarity index 96%
rename from src/graphics/primitives/quad.rs
rename to crates/graphics/src/quad.rs
index 7d0e0e3d..00a23f9b 100644
--- a/src/graphics/primitives/quad.rs
+++ b/crates/graphics/src/quad.rs
@@ -15,7 +15,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
 use super::vertex::Vertex;
-use crate::prelude::*;
 use wgpu::util::DeviceExt;
 
 #[derive(Clone, Copy, Debug, PartialEq)]
@@ -107,9 +106,11 @@ impl Quad {
         vertices
     }
 
-    pub fn into_buffer(this: &[Self], extents: wgpu::Extent3d) -> (wgpu::Buffer, usize) {
-        let render_state = &state!().render_state;
-
+    pub fn into_buffer(
+        render_state: &egui_wgpu::RenderState,
+        this: &[Self],
+        extents: wgpu::Extent3d,
+    ) -> (wgpu::Buffer, usize) {
         let vertices = Self::into_vertices(this, extents);
 
         let buffer = render_state
diff --git a/src/graphics/primitives/sprite/graphic.rs b/crates/graphics/src/sprite/graphic.rs
similarity index 69%
rename from src/graphics/primitives/sprite/graphic.rs
rename to crates/graphics/src/sprite/graphic.rs
index 1277ea61..0d5fabfb 100644
--- a/src/graphics/primitives/sprite/graphic.rs
+++ b/crates/graphics/src/sprite/graphic.rs
@@ -14,7 +14,6 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
-use crate::prelude::*;
 
 use crossbeam::atomic::AtomicCell;
 use wgpu::util::DeviceExt;
@@ -40,7 +39,12 @@ struct Data {
 }
 
 impl Graphic {
-    pub fn new(hue: i32, opacity: i32, use_push_constants: bool) -> Self {
+    pub fn new(
+        graphics_state: &crate::GraphicsState,
+        hue: i32,
+        opacity: i32,
+        use_push_constants: bool,
+    ) -> Self {
         let hue = (hue % 360) as f32 / 360.0;
         let opacity = opacity as f32 / 255.;
         let data = Data {
@@ -49,30 +53,29 @@ impl Graphic {
             opacity_multiplier: 1.,
         };
 
-        let uniform = if !use_push_constants {
-            let render_state = &state!().render_state;
-            let buffer =
-                render_state
-                    .device
-                    .create_buffer_init(&wgpu::util::BufferInitDescriptor {
+        let uniform =
+            if !use_push_constants {
+                let buffer = graphics_state.render_state.device.create_buffer_init(
+                    &wgpu::util::BufferInitDescriptor {
                         label: Some("tilemap sprite graphic buffer"),
                         contents: bytemuck::cast_slice(&[data]),
                         usage: wgpu::BufferUsages::UNIFORM | wgpu::BufferUsages::COPY_DST,
-                    });
-            let bind_group = render_state
-                .device
-                .create_bind_group(&wgpu::BindGroupDescriptor {
-                    label: Some("tilemap sprite graphic bind group"),
-                    layout: &LAYOUT,
-                    entries: &[wgpu::BindGroupEntry {
-                        binding: 0,
-                        resource: buffer.as_entire_binding(),
-                    }],
-                });
-            Some(GraphicUniform { buffer, bind_group })
-        } else {
-            None
-        };
+                    },
+                );
+                let bind_group = graphics_state.render_state.device.create_bind_group(
+                    &wgpu::BindGroupDescriptor {
+                        label: Some("tilemap sprite graphic bind group"),
+                        layout: &graphics_state.bind_group_layouts.sprite_graphic,
+                        entries: &[wgpu::BindGroupEntry {
+                            binding: 0,
+                            resource: buffer.as_entire_binding(),
+                        }],
+                    },
+                );
+                Some(GraphicUniform { buffer, bind_group })
+            } else {
+                None
+            };
 
         Self {
             data: AtomicCell::new(data),
@@ -84,13 +87,13 @@ impl Graphic {
         (self.data.load().hue * 360.) as i32
     }
 
-    pub fn set_hue(&self, hue: i32) {
+    pub fn set_hue(&self, render_state: &egui_wgpu::RenderState, hue: i32) {
         let hue = (hue % 360) as f32 / 360.0;
         let data = self.data.load();
 
         if data.hue != hue {
             self.data.store(Data { hue, ..data });
-            self.regen_buffer();
+            self.regen_buffer(render_state);
         }
     }
 
@@ -98,13 +101,13 @@ impl Graphic {
         (self.data.load().opacity * 255.) as i32
     }
 
-    pub fn set_opacity(&self, opacity: i32) {
+    pub fn set_opacity(&self, render_state: &egui_wgpu::RenderState, opacity: i32) {
         let opacity = opacity as f32 / 255.0;
         let data = self.data.load();
 
         if data.opacity != opacity {
             self.data.store(Data { opacity, ..data });
-            self.regen_buffer();
+            self.regen_buffer(render_state);
         }
     }
 
@@ -112,7 +115,11 @@ impl Graphic {
         self.data.load().opacity_multiplier
     }
 
-    pub fn set_opacity_multiplier(&self, opacity_multiplier: f32) {
+    pub fn set_opacity_multiplier(
+        &self,
+        render_state: &egui_wgpu::RenderState,
+        opacity_multiplier: f32,
+    ) {
         let data = self.data.load();
 
         if data.opacity_multiplier != opacity_multiplier {
@@ -120,7 +127,7 @@ impl Graphic {
                 opacity_multiplier,
                 ..data
             });
-            self.regen_buffer();
+            self.regen_buffer(render_state);
         }
     }
 
@@ -128,9 +135,8 @@ impl Graphic {
         bytemuck::cast(self.data.load())
     }
 
-    fn regen_buffer(&self) {
+    fn regen_buffer(&self, render_state: &egui_wgpu::RenderState) {
         if let Some(uniform) = &self.uniform {
-            let render_state = &state!().render_state;
             render_state.queue.write_buffer(
                 &uniform.buffer,
                 0,
@@ -144,15 +150,9 @@ impl Graphic {
             render_pass.set_bind_group(2, &uniform.bind_group, &[]);
         }
     }
-
-    pub fn layout() -> &'static wgpu::BindGroupLayout {
-        &LAYOUT
-    }
 }
 
-static LAYOUT: Lazy<wgpu::BindGroupLayout> = Lazy::new(|| {
-    let render_state = &state!().render_state;
-
+pub fn create_bind_group_layout(render_state: &egui_wgpu::RenderState) -> wgpu::BindGroupLayout {
     render_state
         .device
         .create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
@@ -168,4 +168,4 @@ static LAYOUT: Lazy<wgpu::BindGroupLayout> = Lazy::new(|| {
             }],
             label: Some("tilemap sprite graphic bind group layout"),
         })
-});
+}
diff --git a/src/graphics/primitives/sprite/mod.rs b/crates/graphics/src/sprite/mod.rs
similarity index 65%
rename from src/graphics/primitives/sprite/mod.rs
rename to crates/graphics/src/sprite/mod.rs
index 0bde45c2..4f932190 100644
--- a/src/graphics/primitives/sprite/mod.rs
+++ b/crates/graphics/src/sprite/mod.rs
@@ -14,35 +14,34 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
+use std::sync::Arc;
 
-mod graphic;
-mod shader;
+pub(crate) mod graphic;
+pub(crate) mod shader;
 mod vertices;
 
-use crate::prelude::*;
-use primitives::Quad;
-use primitives::Vertex;
-
 #[derive(Debug)]
 pub struct Sprite {
-    pub texture: Arc<image_cache::WgpuTexture>,
+    pub texture: Arc<crate::image_cache::WgpuTexture>,
     pub graphic: graphic::Graphic,
     pub vertices: vertices::Vertices,
-    pub blend_mode: BlendMode,
+    pub blend_mode: luminol_data::BlendMode,
     pub use_push_constants: bool,
 }
 
 impl Sprite {
     pub fn new(
-        quad: Quad,
-        texture: Arc<image_cache::WgpuTexture>,
-        blend_mode: BlendMode,
+        graphics_state: &crate::GraphicsState,
+        quad: crate::quad::Quad,
+        texture: Arc<crate::image_cache::WgpuTexture>,
+        blend_mode: luminol_data::BlendMode,
         hue: i32,
         opacity: i32,
         use_push_constants: bool,
     ) -> Self {
-        let vertices = vertices::Vertices::from_quads(&[quad], texture.size());
-        let graphic = graphic::Graphic::new(hue, opacity, use_push_constants);
+        let vertices =
+            vertices::Vertices::from_quads(&graphics_state.render_state, &[quad], texture.size());
+        let graphic = graphic::Graphic::new(graphics_state, hue, opacity, use_push_constants);
 
         Self {
             texture,
@@ -53,10 +52,12 @@ impl Sprite {
         }
     }
 
-    pub fn reupload_verts(&self, quads: &[Quad]) {
-        let render_state = &state!().render_state;
-
-        let vertices = Quad::into_vertices(quads, self.texture.size());
+    pub fn reupload_verts(
+        &self,
+        render_state: &egui_wgpu::RenderState,
+        quads: &[crate::quad::Quad],
+    ) {
+        let vertices = crate::quad::Quad::into_vertices(quads, self.texture.size());
         render_state.queue.write_buffer(
             &self.vertices.vertex_buffer,
             0,
@@ -66,10 +67,11 @@ impl Sprite {
 
     pub fn draw<'rpass>(
         &'rpass self,
-        viewport: &primitives::Viewport,
+        graphics_state: &'rpass crate::GraphicsState,
+        viewport: &crate::viewport::Viewport,
         render_pass: &mut wgpu::RenderPass<'rpass>,
     ) {
-        shader::Shader::bind(self.blend_mode, self.use_push_constants, render_pass);
+        render_pass.set_pipeline(&graphics_state.pipelines.sprites[&self.blend_mode]);
 
         if self.use_push_constants {
             render_pass.set_push_constants(wgpu::ShaderStages::VERTEX, 0, &viewport.as_bytes());
diff --git a/crates/graphics/src/sprite/shader.rs b/crates/graphics/src/sprite/shader.rs
new file mode 100644
index 00000000..1414674b
--- /dev/null
+++ b/crates/graphics/src/sprite/shader.rs
@@ -0,0 +1,158 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
+
+fn create_shader(
+    render_state: &egui_wgpu::RenderState,
+    bind_group_layouts: &crate::BindGroupLayouts,
+    target: wgpu::BlendState,
+) -> wgpu::RenderPipeline {
+    let push_constants_supported = crate::push_constants_supported(render_state);
+
+    let mut composer = naga_oil::compose::Composer::default().with_capabilities(
+        push_constants_supported
+            .then_some(naga::valid::Capabilities::PUSH_CONSTANT)
+            .unwrap_or_default(),
+    );
+
+    let module = composer
+        .make_naga_module(naga_oil::compose::NagaModuleDescriptor {
+            source: include_str!("sprite.wgsl"),
+            file_path: "sprite.wgsl",
+            shader_type: naga_oil::compose::ShaderType::Wgsl,
+            shader_defs: std::collections::HashMap::from([(
+                "USE_PUSH_CONSTANTS".to_string(),
+                naga_oil::compose::ShaderDefValue::Bool(push_constants_supported),
+            )]),
+            additional_imports: &[],
+        })
+        .expect("failed to create sprite shader module");
+
+    let shader_module = render_state
+        .device
+        .create_shader_module(wgpu::ShaderModuleDescriptor {
+            label: Some("Sprite Shader Module"),
+            source: wgpu::ShaderSource::Naga(std::borrow::Cow::Owned(module)),
+        });
+
+    let pipeline_layout = if push_constants_supported {
+        render_state
+            .device
+            .create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
+                label: Some("Tilemap Sprite Pipeline Layout (push constants)"),
+                bind_group_layouts: &[&bind_group_layouts.image_cache_texture],
+                push_constant_ranges: &[
+                    // Viewport
+                    wgpu::PushConstantRange {
+                        stages: wgpu::ShaderStages::VERTEX,
+                        range: 0..64,
+                    },
+                    wgpu::PushConstantRange {
+                        stages: wgpu::ShaderStages::FRAGMENT,
+                        range: 64..(64 + 4 + 4 + 4),
+                    },
+                ],
+            })
+    } else {
+        render_state
+            .device
+            .create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
+                label: Some("Tilemap Sprite Pipeline Layout (uniforms)"),
+                bind_group_layouts: &[
+                    &bind_group_layouts.image_cache_texture,
+                    &bind_group_layouts.viewport,
+                    &bind_group_layouts.sprite_graphic,
+                ],
+                push_constant_ranges: &[],
+            })
+    };
+    render_state
+        .device
+        .create_render_pipeline(&wgpu::RenderPipelineDescriptor {
+            label: Some("Tilemap Sprite Render Pipeline"),
+            layout: Some(&pipeline_layout),
+            vertex: wgpu::VertexState {
+                module: &shader_module,
+                entry_point: "vs_main",
+                buffers: &[crate::vertex::Vertex::desc()],
+            },
+            fragment: Some(wgpu::FragmentState {
+                module: &shader_module,
+                entry_point: "fs_main",
+                targets: &[Some(wgpu::ColorTargetState {
+                    blend: Some(target),
+                    ..render_state.target_format.into()
+                })],
+            }),
+            primitive: wgpu::PrimitiveState {
+                // polygon_mode: wgpu::PolygonMode::Line,
+                ..Default::default()
+            },
+            depth_stencil: None,
+            multisample: wgpu::MultisampleState::default(),
+            multiview: None,
+        })
+}
+
+pub fn create_sprite_shaders(
+    render_state: &egui_wgpu::RenderState,
+    bind_group_layouts: &crate::BindGroupLayouts,
+) -> std::collections::HashMap<luminol_data::BlendMode, wgpu::RenderPipeline> {
+    [
+        (
+            luminol_data::BlendMode::Normal,
+            wgpu::BlendState::ALPHA_BLENDING,
+        ),
+        (
+            luminol_data::BlendMode::Add,
+            wgpu::BlendState {
+                color: wgpu::BlendComponent {
+                    src_factor: wgpu::BlendFactor::SrcAlpha,
+                    dst_factor: wgpu::BlendFactor::One,
+                    operation: wgpu::BlendOperation::Add,
+                },
+                alpha: wgpu::BlendComponent {
+                    src_factor: wgpu::BlendFactor::One,
+                    dst_factor: wgpu::BlendFactor::One,
+                    operation: wgpu::BlendOperation::Add,
+                },
+            },
+        ),
+        (
+            luminol_data::BlendMode::Subtract,
+            wgpu::BlendState {
+                color: wgpu::BlendComponent {
+                    src_factor: wgpu::BlendFactor::SrcAlpha,
+                    dst_factor: wgpu::BlendFactor::One,
+                    operation: wgpu::BlendOperation::ReverseSubtract,
+                },
+                alpha: wgpu::BlendComponent {
+                    src_factor: wgpu::BlendFactor::Zero,
+                    dst_factor: wgpu::BlendFactor::One,
+                    operation: wgpu::BlendOperation::ReverseSubtract,
+                },
+            },
+        ),
+    ]
+    .into_iter()
+    .map(|(mode, target)| {
+        (
+            mode,
+            create_shader(render_state, bind_group_layouts, target),
+        )
+    })
+    .collect()
+}
diff --git a/src/graphics/primitives/sprite/sprite.wgsl b/crates/graphics/src/sprite/sprite.wgsl
similarity index 74%
rename from src/graphics/primitives/sprite/sprite.wgsl
rename to crates/graphics/src/sprite/sprite.wgsl
index b07d99fa..c4f222c0 100644
--- a/src/graphics/primitives/sprite/sprite.wgsl
+++ b/crates/graphics/src/sprite/sprite.wgsl
@@ -19,6 +19,19 @@ struct Graphic {
     opacity_multiplier: f32,
 }
 
+#if USE_PUSH_CONSTANTS == true
+struct PushConstants {
+    viewport: Viewport,
+    graphic: Graphic,
+}
+var<push_constant> push_constants: PushConstants;
+#else
+@group(1) @binding(0)
+var<uniform> viewport: Viewport;
+@group(2) @binding(0)
+var<uniform> graphic: Graphic;
+#endif
+
 @group(0) @binding(0)
 var t_diffuse: texture_2d<f32>;
 @group(0) @binding(1)
@@ -53,7 +66,11 @@ fn vs_main(
     var out: VertexOutput;
     out.tex_coords = model.tex_coords;
 
-    var position = HOST.viewport.proj * vec4<f32>(model.position.xy, 0.0, 1.0);
+#if USE_PUSH_CONSTANTS == true
+    let viewport = push_constants.viewport;
+#endif
+
+    var position = viewport.proj * vec4<f32>(model.position.xy, 0.0, 1.0);
 
     out.clip_position = vec4<f32>(position.xy, model.position.z, 1.0);
     return out;
@@ -62,15 +79,20 @@ fn vs_main(
 @fragment
 fn fs_main(in: VertexOutput) -> @location(0) vec4<f32> {
     var tex_sample = textureSample(t_diffuse, s_diffuse, in.tex_coords);
-    tex_sample.a *= HOST.graphic.opacity * HOST.graphic.opacity_multiplier;
+
+#if USE_PUSH_CONSTANTS == true
+    let graphic = push_constants.graphic;
+#endif
+
+    tex_sample.a *= graphic.opacity * graphic.opacity_multiplier;
     if tex_sample.a <= 0. {
         discard;
     }
 
-    if HOST.graphic.hue > 0.0 {
+    if graphic.hue > 0.0 {
         var hsv = rgb_to_hsv(tex_sample.rgb);
 
-        hsv.x += HOST.graphic.hue;
+        hsv.x += graphic.hue;
         tex_sample = vec4<f32>(hsv_to_rgb(hsv), tex_sample.a);
     }
 
diff --git a/src/graphics/primitives/sprite/vertices.rs b/crates/graphics/src/sprite/vertices.rs
similarity index 80%
rename from src/graphics/primitives/sprite/vertices.rs
rename to crates/graphics/src/sprite/vertices.rs
index ad9a609e..43cb1e7c 100644
--- a/src/graphics/primitives/sprite/vertices.rs
+++ b/crates/graphics/src/sprite/vertices.rs
@@ -14,8 +14,6 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
-use super::Quad;
-use crate::prelude::*;
 
 #[derive(Debug)]
 pub struct Vertices {
@@ -23,8 +21,12 @@ pub struct Vertices {
 }
 
 impl Vertices {
-    pub fn from_quads(quads: &[Quad], extents: wgpu::Extent3d) -> Self {
-        let (vertex_buffer, _) = Quad::into_buffer(quads, extents);
+    pub fn from_quads(
+        render_state: &egui_wgpu::RenderState,
+        quads: &[crate::quad::Quad],
+        extents: wgpu::Extent3d,
+    ) -> Self {
+        let (vertex_buffer, _) = crate::quad::Quad::into_buffer(render_state, quads, extents);
         Self { vertex_buffer }
     }
 
diff --git a/src/graphics/primitives/tiles/atlas.rs b/crates/graphics/src/tiles/atlas.rs
similarity index 82%
rename from src/graphics/primitives/tiles/atlas.rs
rename to crates/graphics/src/tiles/atlas.rs
index 33df3061..c604da6d 100644
--- a/src/graphics/primitives/tiles/atlas.rs
+++ b/crates/graphics/src/tiles/atlas.rs
@@ -1,3 +1,4 @@
+use anyhow::Context;
 // Copyright (C) 2023 Lily Lyons
 //
 // This file is part of Luminol.
@@ -14,9 +15,10 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
+use itertools::Itertools;
 
 use super::autotile_ids::AUTOTILES;
-use super::primitives::Quad;
+use crate::quad::Quad;
 
 pub const MAX_SIZE: u32 = 8192; // Max texture size in one dimension
 pub const TILE_SIZE: u32 = 32; // Tiles are 32x32
@@ -38,28 +40,33 @@ pub const ROWS_UNDER_AUTOTILES_TIMES_COLUMNS: u32 = ROWS_UNDER_AUTOTILES * TILES
 
 pub const AUTOTILE_FRAME_WIDTH: u32 = AUTOTILE_FRAME_COLS * TILE_SIZE; // This is per frame!
 
-use crate::prelude::*;
-
 use image::GenericImageView;
 use std::sync::Arc;
 
 #[derive(Debug, Clone)]
 pub struct Atlas {
-    pub atlas_texture: Arc<image_cache::WgpuTexture>,
+    pub atlas_texture: Arc<crate::image_cache::WgpuTexture>,
     pub autotile_width: u32,
     pub tileset_height: u32,
     pub autotile_frames: [u32; AUTOTILE_AMOUNT as usize],
 }
 
 impl Atlas {
-    pub fn new(tileset: &rpg::Tileset) -> Result<Atlas, String> {
-        let tileset_img = tileset.tileset_name.as_ref().and_then(|tileset_name| {
-            let tileset_img = state!()
-                .image_cache
-                .load_image("Graphics/Tilesets", tileset_name)
-                .ok()?;
-            Some(tileset_img.to_rgba8())
-        });
+    pub fn new(
+        graphics_state: &crate::GraphicsState,
+        filesystem: &impl luminol_filesystem::FileSystem,
+        tileset: &luminol_data::rpg::Tileset,
+    ) -> anyhow::Result<Atlas> {
+        let tileset_img = match &tileset.tileset_name {
+            Some(tileset_name) => {
+                let tileset_img = graphics_state
+                    .image_cache
+                    .load_image(filesystem, "Graphics/Tilesets", tileset_name)
+                    .context("while loading atlas tileset")?;
+                Some(tileset_img.to_rgba8())
+            }
+            None => None,
+        };
 
         let tileset_height = tileset_img
             .as_ref()
@@ -73,18 +80,19 @@ impl Atlas {
                 if s.is_empty() {
                     Ok(None)
                 } else {
-                    state!()
+                    graphics_state
                         .image_cache
-                        .load_wgpu_image("Graphics/Autotiles", s)
+                        .load_wgpu_image(graphics_state, filesystem, "Graphics/Autotiles", s)
                         .map(Some)
                 }
             })
-            .try_collect()?;
+            .try_collect()
+            .context("while loading atlas autotiles")?;
 
         let autotile_frames = std::array::from_fn(|i| {
             autotiles[i]
                 .as_deref()
-                .map(image_cache::WgpuTexture::width)
+                .map(crate::image_cache::WgpuTexture::width)
                 // Why unwrap with a width of 96? Even though the autotile doesn't exist, it still has an effective width on the atlas of one frame.
                 // Further rendering code breaks down with an autotile width of 0, anyway.
                 .unwrap_or(96)
@@ -97,13 +105,11 @@ impl Atlas {
             .max()
             .unwrap_or(AUTOTILE_FRAME_WIDTH);
 
-        let render_state = &state!().render_state;
-        let mut encoder =
-            render_state
-                .device
-                .create_command_encoder(&wgpu::CommandEncoderDescriptor {
-                    label: Some("atlas creation"),
-                });
+        let mut encoder = graphics_state.render_state.device.create_command_encoder(
+            &wgpu::CommandEncoderDescriptor {
+                label: Some("atlas creation"),
+            },
+        );
 
         let width;
         let height;
@@ -134,24 +140,26 @@ impl Atlas {
             height = MAX_SIZE;
         }
 
-        let atlas_texture = render_state
-            .device
-            .create_texture(&wgpu::TextureDescriptor {
-                label: Some("tileset_atlas"),
-                size: wgpu::Extent3d {
-                    width,
-                    height,
-                    depth_or_array_layers: 1,
-                },
-                dimension: wgpu::TextureDimension::D2,
-                mip_level_count: 1,
-                sample_count: 1,
-                format: wgpu::TextureFormat::Rgba8Unorm,
-                usage: wgpu::TextureUsages::COPY_SRC
-                    | wgpu::TextureUsages::COPY_DST
-                    | wgpu::TextureUsages::TEXTURE_BINDING,
-                view_formats: &[],
-            });
+        let atlas_texture =
+            graphics_state
+                .render_state
+                .device
+                .create_texture(&wgpu::TextureDescriptor {
+                    label: Some("tileset_atlas"),
+                    size: wgpu::Extent3d {
+                        width,
+                        height,
+                        depth_or_array_layers: 1,
+                    },
+                    dimension: wgpu::TextureDimension::D2,
+                    mip_level_count: 1,
+                    sample_count: 1,
+                    format: wgpu::TextureFormat::Rgba8Unorm,
+                    usage: wgpu::TextureUsages::COPY_SRC
+                        | wgpu::TextureUsages::COPY_DST
+                        | wgpu::TextureUsages::TEXTURE_BINDING,
+                    view_formats: &[],
+                });
         let mut atlas_copy = atlas_texture.as_image_copy();
 
         for (index, autotile_texture) in
@@ -200,12 +208,16 @@ impl Atlas {
             }
         }
 
-        render_state.queue.submit(std::iter::once(encoder.finish()));
+        graphics_state
+            .render_state
+            .queue
+            .submit(std::iter::once(encoder.finish()));
 
         atlas_copy.origin.x = 0;
         if let Some(tileset_img) = tileset_img {
             if TOTAL_AUTOTILE_HEIGHT + tileset_height < MAX_SIZE {
                 write_texture_region(
+                    &graphics_state.render_state,
                     &atlas_texture,
                     tileset_img.view(0, 0, TILESET_WIDTH, tileset_height),
                     (0, TOTAL_AUTOTILE_HEIGHT),
@@ -219,6 +231,7 @@ impl Atlas {
                         HEIGHT_UNDER_AUTOTILES
                     };
                     write_texture_region(
+                        &graphics_state.render_state,
                         &atlas_texture,
                         tileset_img.view(0, y, TILESET_WIDTH, height),
                         (TILESET_WIDTH * i, TOTAL_AUTOTILE_HEIGHT),
@@ -232,6 +245,7 @@ impl Atlas {
                         MAX_SIZE
                     };
                     write_texture_region(
+                        &graphics_state.render_state,
                         &atlas_texture,
                         tileset_img.view(0, y, TILESET_WIDTH, height),
                         (TILESET_WIDTH * (rows_under + i), 0),
@@ -240,8 +254,12 @@ impl Atlas {
             }
         }
 
-        let bind_group = image_cache::Cache::create_texture_bind_group(&atlas_texture);
-        let atlas_texture = Arc::new(image_cache::WgpuTexture::new(atlas_texture, bind_group));
+        let bind_group =
+            crate::image_cache::Cache::create_texture_bind_group(graphics_state, &atlas_texture);
+        let atlas_texture = Arc::new(crate::image_cache::WgpuTexture::new(
+            atlas_texture,
+            bind_group,
+        ));
 
         Ok(Atlas {
             atlas_texture,
@@ -313,6 +331,7 @@ impl Atlas {
 }
 
 fn write_texture_region<P>(
+    render_state: &egui_wgpu::RenderState,
     texture: &wgpu::Texture,
     image: image::SubImage<&image::ImageBuffer<P, Vec<P::Subpixel>>>,
     (dest_x, dest_y): (u32, u32),
@@ -328,7 +347,7 @@ fn write_texture_region<P>(
     let stride = inner_width * std::mem::size_of::<P>() as u32;
     let offset = (y * inner_width + x) * std::mem::size_of::<P>() as u32;
 
-    state!().render_state.queue.write_texture(
+    render_state.queue.write_texture(
         wgpu::ImageCopyTexture {
             texture,
             mip_level: 0,
diff --git a/src/graphics/primitives/tiles/autotile_ids.rs b/crates/graphics/src/tiles/autotile_ids.rs
similarity index 100%
rename from src/graphics/primitives/tiles/autotile_ids.rs
rename to crates/graphics/src/tiles/autotile_ids.rs
diff --git a/src/graphics/primitives/tiles/autotiles.rs b/crates/graphics/src/tiles/autotiles.rs
similarity index 70%
rename from src/graphics/primitives/tiles/autotiles.rs
rename to crates/graphics/src/tiles/autotiles.rs
index 4b7d44bf..e3fc6535 100644
--- a/src/graphics/primitives/tiles/autotiles.rs
+++ b/crates/graphics/src/tiles/autotiles.rs
@@ -15,7 +15,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
 
-use crate::prelude::*;
 use crossbeam::atomic::AtomicCell;
 use wgpu::util::DeviceExt;
 
@@ -40,39 +39,42 @@ struct Data {
 }
 
 impl Autotiles {
-    pub fn new(atlas: &super::Atlas, use_push_constants: bool) -> Self {
+    pub fn new(
+        graphics_state: &crate::GraphicsState,
+        atlas: &super::Atlas,
+        use_push_constants: bool,
+    ) -> Self {
         let autotiles = Data {
             autotile_frames: atlas.autotile_frames,
             autotile_region_width: atlas.autotile_width,
             ani_index: 0,
         };
 
-        let uniform = if !use_push_constants {
-            let render_state = &state!().render_state;
-            let buffer =
-                render_state
-                    .device
-                    .create_buffer_init(&wgpu::util::BufferInitDescriptor {
+        let uniform =
+            if !use_push_constants {
+                let buffer = graphics_state.render_state.device.create_buffer_init(
+                    &wgpu::util::BufferInitDescriptor {
                         label: Some("tilemap autotile buffer"),
                         contents: bytemuck::cast_slice(&[autotiles]),
                         usage: wgpu::BufferUsages::STORAGE
                             | wgpu::BufferUsages::COPY_DST
                             | wgpu::BufferUsages::UNIFORM,
-                    });
-            let bind_group = render_state
-                .device
-                .create_bind_group(&wgpu::BindGroupDescriptor {
-                    label: Some("tilemap autotiles bind group"),
-                    layout: &LAYOUT,
-                    entries: &[wgpu::BindGroupEntry {
-                        binding: 0,
-                        resource: buffer.as_entire_binding(),
-                    }],
-                });
-            Some(AutotilesUniform { buffer, bind_group })
-        } else {
-            None
-        };
+                    },
+                );
+                let bind_group = graphics_state.render_state.device.create_bind_group(
+                    &wgpu::BindGroupDescriptor {
+                        label: Some("tilemap autotiles bind group"),
+                        layout: &graphics_state.bind_group_layouts.atlas_autotiles,
+                        entries: &[wgpu::BindGroupEntry {
+                            binding: 0,
+                            resource: buffer.as_entire_binding(),
+                        }],
+                    },
+                );
+                Some(AutotilesUniform { buffer, bind_group })
+            } else {
+                None
+            };
 
         Autotiles {
             data: AtomicCell::new(autotiles),
@@ -80,22 +82,21 @@ impl Autotiles {
         }
     }
 
-    pub fn inc_ani_index(&self) {
+    pub fn inc_ani_index(&self, render_state: &egui_wgpu::RenderState) {
         let data = self.data.load();
         self.data.store(Data {
             ani_index: data.ani_index.wrapping_add(1),
             ..data
         });
-        self.regen_buffer();
+        self.regen_buffer(render_state);
     }
 
     pub fn as_bytes(&self) -> [u8; std::mem::size_of::<Data>()] {
         bytemuck::cast(self.data.load())
     }
 
-    fn regen_buffer(&self) {
+    fn regen_buffer(&self, render_state: &egui_wgpu::RenderState) {
         if let Some(uniform) = &self.uniform {
-            let render_state = &state!().render_state;
             render_state.queue.write_buffer(
                 &uniform.buffer,
                 0,
@@ -109,15 +110,9 @@ impl Autotiles {
             render_pass.set_bind_group(2, &uniform.bind_group, &[]);
         }
     }
-
-    pub fn layout() -> &'static wgpu::BindGroupLayout {
-        &LAYOUT
-    }
 }
 
-static LAYOUT: Lazy<wgpu::BindGroupLayout> = Lazy::new(|| {
-    let render_state = &state!().render_state;
-
+pub fn create_bind_group_layout(render_state: &egui_wgpu::RenderState) -> wgpu::BindGroupLayout {
     render_state
         .device
         .create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
@@ -133,4 +128,4 @@ static LAYOUT: Lazy<wgpu::BindGroupLayout> = Lazy::new(|| {
             }],
             label: Some("tilemap autotiles bind group layout"),
         })
-});
+}
diff --git a/src/graphics/primitives/tiles/instance.rs b/crates/graphics/src/tiles/instance.rs
similarity index 88%
rename from src/graphics/primitives/tiles/instance.rs
rename to crates/graphics/src/tiles/instance.rs
index 54284e41..24277178 100644
--- a/src/graphics/primitives/tiles/instance.rs
+++ b/crates/graphics/src/tiles/instance.rs
@@ -14,9 +14,8 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
-use crate::prelude::*;
-use primitives::Quad;
 
+use itertools::Itertools;
 use wgpu::util::DeviceExt;
 
 #[derive(Debug)]
@@ -36,7 +35,7 @@ struct Instance {
     layer: u32,
 }
 
-const TILE_QUAD: Quad = Quad::new(
+const TILE_QUAD: crate::quad::Quad = crate::quad::Quad::new(
     egui::Rect::from_min_max(egui::pos2(0., 0.), egui::pos2(32., 32.0)),
     // slightly smaller than 32x32 to reduce bleeding from adjacent pixels in the atlas
     egui::Rect::from_min_max(egui::pos2(0.01, 0.01), egui::pos2(31.99, 31.99)),
@@ -44,11 +43,14 @@ const TILE_QUAD: Quad = Quad::new(
 );
 
 impl Instances {
-    pub fn new(map_data: &Table3, atlas_size: wgpu::Extent3d) -> Self {
+    pub fn new(
+        render_state: &egui_wgpu::RenderState,
+        map_data: &luminol_data::Table3,
+        atlas_size: wgpu::Extent3d,
+    ) -> Self {
         let instances = Self::calculate_instances(map_data);
         let instance_buffer =
-            state!()
-                .render_state
+            render_state
                 .device
                 .create_buffer_init(&wgpu::util::BufferInitDescriptor {
                     label: Some("tilemap tiles instance buffer"),
@@ -56,7 +58,8 @@ impl Instances {
                     usage: wgpu::BufferUsages::VERTEX | wgpu::BufferUsages::COPY_DST,
                 });
 
-        let (vertex_buffer, _) = Quad::into_buffer(&[TILE_QUAD], atlas_size);
+        let (vertex_buffer, _) =
+            crate::quad::Quad::into_buffer(render_state, &[TILE_QUAD], atlas_size);
 
         Self {
             instance_buffer,
@@ -68,12 +71,17 @@ impl Instances {
     }
 
     // I thought we didn't need the z? Well.. we do! To calculate the offset into the instance buffer.
-    pub fn set_tile(&self, tile_id: i16, position: (usize, usize, usize)) {
+    pub fn set_tile(
+        &self,
+        render_state: &egui_wgpu::RenderState,
+        tile_id: i16,
+        position: (usize, usize, usize),
+    ) {
         let offset = position.0
             + (position.1 * self.map_width)
             + (position.2 * self.map_width * self.map_height);
         let offset = offset * std::mem::size_of::<Instance>();
-        state!().render_state.queue.write_buffer(
+        render_state.queue.write_buffer(
             &self.instance_buffer,
             offset as wgpu::BufferAddress,
             bytemuck::bytes_of(&Instance {
@@ -84,7 +92,7 @@ impl Instances {
         )
     }
 
-    fn calculate_instances(map_data: &Table3) -> Vec<Instance> {
+    fn calculate_instances(map_data: &luminol_data::Table3) -> Vec<Instance> {
         map_data
             .iter()
             .copied()
diff --git a/src/graphics/primitives/tiles/mod.rs b/crates/graphics/src/tiles/mod.rs
similarity index 72%
rename from src/graphics/primitives/tiles/mod.rs
rename to crates/graphics/src/tiles/mod.rs
index bb0ccbae..57f86825 100644
--- a/src/graphics/primitives/tiles/mod.rs
+++ b/crates/graphics/src/tiles/mod.rs
@@ -14,21 +14,19 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
-use crate::prelude::*;
 
 pub use atlas::Atlas;
 
 use autotiles::Autotiles;
 use instance::Instances;
 use opacity::Opacity;
-use shader::Shader;
 
 mod atlas;
 mod autotile_ids;
-mod autotiles;
+pub(crate) mod autotiles;
 mod instance;
-mod opacity;
-mod shader;
+pub(crate) mod opacity;
+pub(crate) mod shader;
 
 #[derive(Debug)]
 pub struct Tiles {
@@ -40,10 +38,19 @@ pub struct Tiles {
 }
 
 impl Tiles {
-    pub fn new(atlas: Atlas, tiles: &Table3, use_push_constants: bool) -> Self {
-        let autotiles = Autotiles::new(&atlas, use_push_constants);
-        let instances = Instances::new(tiles, atlas.atlas_texture.size());
-        let opacity = Opacity::new(use_push_constants);
+    pub fn new(
+        graphics_state: &crate::GraphicsState,
+        atlas: Atlas,
+        tiles: &luminol_data::Table3,
+        use_push_constants: bool,
+    ) -> Self {
+        let autotiles = Autotiles::new(graphics_state, &atlas, use_push_constants);
+        let instances = Instances::new(
+            &graphics_state.render_state,
+            tiles,
+            atlas.atlas_texture.size(),
+        );
+        let opacity = Opacity::new(graphics_state, use_push_constants);
 
         Self {
             autotiles,
@@ -54,13 +61,19 @@ impl Tiles {
         }
     }
 
-    pub fn set_tile(&self, tile_id: i16, position: (usize, usize, usize)) {
-        self.instances.set_tile(tile_id, position)
+    pub fn set_tile(
+        &self,
+        render_state: &egui_wgpu::RenderState,
+        tile_id: i16,
+        position: (usize, usize, usize),
+    ) {
+        self.instances.set_tile(render_state, tile_id, position)
     }
 
     pub fn draw<'rpass>(
         &'rpass self,
-        viewport: &primitives::Viewport,
+        graphics_state: &'rpass crate::GraphicsState,
+        viewport: &crate::viewport::Viewport,
         enabled_layers: &[bool],
         selected_layer: Option<usize>,
         render_pass: &mut wgpu::RenderPass<'rpass>,
@@ -73,7 +86,7 @@ impl Tiles {
         }
 
         render_pass.push_debug_group("tilemap tiles renderer");
-        Shader::bind(self.use_push_constants, render_pass);
+        render_pass.set_pipeline(&graphics_state.pipelines.tiles);
         self.autotiles.bind(render_pass);
         if self.use_push_constants {
             render_pass.set_push_constants(
@@ -95,7 +108,8 @@ impl Tiles {
                 Some(_) => 0.5,
                 None => 1.0,
             };
-            self.opacity.set_opacity(layer, opacity);
+            self.opacity
+                .set_opacity(&graphics_state.render_state, layer, opacity);
             if self.use_push_constants {
                 render_pass.set_push_constants(
                     wgpu::ShaderStages::FRAGMENT,
diff --git a/src/graphics/primitives/tiles/opacity.rs b/crates/graphics/src/tiles/opacity.rs
similarity index 67%
rename from src/graphics/primitives/tiles/opacity.rs
rename to crates/graphics/src/tiles/opacity.rs
index 1252db1f..8ebdccb8 100644
--- a/src/graphics/primitives/tiles/opacity.rs
+++ b/crates/graphics/src/tiles/opacity.rs
@@ -14,7 +14,6 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
-use crate::prelude::*;
 
 use crossbeam::atomic::AtomicCell;
 use wgpu::util::DeviceExt;
@@ -32,33 +31,32 @@ struct OpacityUniform {
 }
 
 impl Opacity {
-    pub fn new(use_push_constants: bool) -> Self {
+    pub fn new(graphics_state: &crate::GraphicsState, use_push_constants: bool) -> Self {
         let opacity = [1.; 4];
 
-        let uniform = if !use_push_constants {
-            let render_state = &state!().render_state;
-            let buffer =
-                render_state
-                    .device
-                    .create_buffer_init(&wgpu::util::BufferInitDescriptor {
+        let uniform =
+            if !use_push_constants {
+                let buffer = graphics_state.render_state.device.create_buffer_init(
+                    &wgpu::util::BufferInitDescriptor {
                         label: Some("tilemap opacity buffer"),
                         contents: bytemuck::cast_slice(&[opacity]),
                         usage: wgpu::BufferUsages::COPY_DST | wgpu::BufferUsages::UNIFORM,
-                    });
-            let bind_group = render_state
-                .device
-                .create_bind_group(&wgpu::BindGroupDescriptor {
-                    label: Some("tilemap opacity bind group"),
-                    layout: &LAYOUT,
-                    entries: &[wgpu::BindGroupEntry {
-                        binding: 0,
-                        resource: buffer.as_entire_binding(),
-                    }],
-                });
-            Some(OpacityUniform { buffer, bind_group })
-        } else {
-            None
-        };
+                    },
+                );
+                let bind_group = graphics_state.render_state.device.create_bind_group(
+                    &wgpu::BindGroupDescriptor {
+                        label: Some("tilemap opacity bind group"),
+                        layout: &graphics_state.bind_group_layouts.tile_layer_opacity,
+                        entries: &[wgpu::BindGroupEntry {
+                            binding: 0,
+                            resource: buffer.as_entire_binding(),
+                        }],
+                    },
+                );
+                Some(OpacityUniform { buffer, bind_group })
+            } else {
+                None
+            };
 
         Self {
             data: AtomicCell::new(opacity),
@@ -70,18 +68,17 @@ impl Opacity {
         self.data.load()[layer]
     }
 
-    pub fn set_opacity(&self, layer: usize, opacity: f32) {
+    pub fn set_opacity(&self, render_state: &egui_wgpu::RenderState, layer: usize, opacity: f32) {
         let mut data = self.data.load();
         if data[layer] != opacity {
             data[layer] = opacity;
             self.data.store(data);
-            self.regen_buffer();
+            self.regen_buffer(render_state);
         }
     }
 
-    fn regen_buffer(&self) {
+    fn regen_buffer(&self, render_state: &egui_wgpu::RenderState) {
         if let Some(uniform) = &self.uniform {
-            let render_state = &state!().render_state;
             render_state.queue.write_buffer(
                 &uniform.buffer,
                 0,
@@ -95,15 +92,9 @@ impl Opacity {
             render_pass.set_bind_group(3, &uniform.bind_group, &[]);
         }
     }
-
-    pub fn layout() -> &'static wgpu::BindGroupLayout {
-        &LAYOUT
-    }
 }
 
-static LAYOUT: Lazy<wgpu::BindGroupLayout> = Lazy::new(|| {
-    let render_state = &state!().render_state;
-
+pub fn create_bind_group_layout(render_state: &egui_wgpu::RenderState) -> wgpu::BindGroupLayout {
     render_state
         .device
         .create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
@@ -119,4 +110,4 @@ static LAYOUT: Lazy<wgpu::BindGroupLayout> = Lazy::new(|| {
             }],
             label: Some("tilemap opacity bind group layout"),
         })
-});
+}
diff --git a/crates/graphics/src/tiles/shader.rs b/crates/graphics/src/tiles/shader.rs
new file mode 100644
index 00000000..653b4220
--- /dev/null
+++ b/crates/graphics/src/tiles/shader.rs
@@ -0,0 +1,115 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
+
+use super::instance::Instances;
+use crate::vertex::Vertex;
+
+pub fn create_render_pipeline(
+    render_state: &egui_wgpu::RenderState,
+    bind_group_layouts: &crate::BindGroupLayouts,
+) -> wgpu::RenderPipeline {
+    let push_constants_supported = crate::push_constants_supported(render_state);
+
+    let mut composer = naga_oil::compose::Composer::default().with_capabilities(
+        push_constants_supported
+            .then_some(naga::valid::Capabilities::PUSH_CONSTANT)
+            .unwrap_or_default(),
+    );
+
+    let result = composer.make_naga_module(naga_oil::compose::NagaModuleDescriptor {
+        source: include_str!("tilemap.wgsl"),
+        file_path: "tilemap.wgsl",
+        shader_type: naga_oil::compose::ShaderType::Wgsl,
+        shader_defs: std::collections::HashMap::from([(
+            "USE_PUSH_CONSTANTS".to_string(),
+            naga_oil::compose::ShaderDefValue::Bool(push_constants_supported),
+        )]),
+        additional_imports: &[],
+    });
+    let module = match result {
+        Ok(module) => module,
+        Err(e) => {
+            let error = e.emit_to_string(&composer);
+            panic!("{error}");
+        }
+    };
+
+    let shader_module = render_state
+        .device
+        .create_shader_module(wgpu::ShaderModuleDescriptor {
+            label: Some("Tilemap Shader Module"),
+            source: wgpu::ShaderSource::Naga(std::borrow::Cow::Owned(module)),
+        });
+
+    let pipeline_layout = if crate::push_constants_supported(render_state) {
+        render_state
+            .device
+            .create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
+                label: Some("Tilemap Render Pipeline Layout (push constants)"),
+                bind_group_layouts: &[&bind_group_layouts.image_cache_texture],
+                push_constant_ranges: &[
+                    // Viewport + Autotiles
+                    wgpu::PushConstantRange {
+                        stages: wgpu::ShaderStages::VERTEX,
+                        range: 0..(64 + 36),
+                    },
+                    // Fragment
+                    wgpu::PushConstantRange {
+                        stages: wgpu::ShaderStages::FRAGMENT,
+                        range: (64 + 36)..(64 + 36 + 4),
+                    },
+                ],
+            })
+    } else {
+        render_state
+            .device
+            .create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
+                label: Some("Tilemap Render Pipeline Layout (uniforms)"),
+                bind_group_layouts: &[
+                    &bind_group_layouts.image_cache_texture,
+                    &bind_group_layouts.viewport,
+                    &bind_group_layouts.atlas_autotiles,
+                    &bind_group_layouts.tile_layer_opacity,
+                ],
+                push_constant_ranges: &[],
+            })
+    };
+
+    render_state
+        .device
+        .create_render_pipeline(&wgpu::RenderPipelineDescriptor {
+            label: Some("Tilemap Render Pipeline"),
+            layout: Some(&pipeline_layout),
+            vertex: wgpu::VertexState {
+                module: &shader_module,
+                entry_point: "vs_main",
+                buffers: &[Vertex::desc(), Instances::desc()],
+            },
+            fragment: Some(wgpu::FragmentState {
+                module: &shader_module,
+                entry_point: "fs_main",
+                targets: &[Some(wgpu::ColorTargetState {
+                    blend: Some(wgpu::BlendState::ALPHA_BLENDING),
+                    ..render_state.target_format.into()
+                })],
+            }),
+            primitive: wgpu::PrimitiveState::default(),
+            depth_stencil: None,
+            multisample: wgpu::MultisampleState::default(),
+            multiview: None,
+        })
+}
diff --git a/src/graphics/primitives/tiles/tilemap.wgsl b/crates/graphics/src/tiles/tilemap.wgsl
similarity index 66%
rename from src/graphics/primitives/tiles/tilemap.wgsl
rename to crates/graphics/src/tiles/tilemap.wgsl
index 68a20801..07cbf26a 100644
--- a/src/graphics/primitives/tiles/tilemap.wgsl
+++ b/crates/graphics/src/tiles/tilemap.wgsl
@@ -26,22 +26,43 @@ struct Autotiles {
     frame_counts: array<u32, 7>
 }
 
+#if USE_PUSH_CONSTANTS == true
+struct PushConstants {
+    viewport: Viewport,
+    autotiles: Autotiles,
+    opacity: f32,
+}
+var<push_constant> push_constants: PushConstants;
+#else
+@group(1) @binding(0)
+var<uniform> viewport: Viewport;
+@group(2) @binding(0)
+var<storage, read> autotiles: Autotiles;
+@group(3) @binding(0)
+var<uniform> opacity: array<vec4<f32>, 1>;
+#endif
+
 @vertex
 fn vs_main(vertex: VertexInput, instance: InstanceInput) -> VertexOutput {
     var out: VertexOutput;
     out.layer = instance.layer;
 
+#if USE_PUSH_CONSTANTS == true
+    let viewport = push_constants.viewport;
+    let autotiles = push_constants.autotiles;
+#endif
+
     if instance.tile_id < 48 {
         return out;
     }
 
-    let position = HOST.viewport.proj * vec4<f32>(vertex.position.xy + (instance.tile_position.xy * 32.), 0.0, 1.0);
+    let position = viewport.proj * vec4<f32>(vertex.position.xy + (instance.tile_position.xy * 32.), 0.0, 1.0);
     out.clip_position = vec4<f32>(position.xy, instance.tile_position.z, 1.0);
 
     let is_autotile = instance.tile_id < 384;
 
     // 1712 is the number of non-autotile tiles that can fit under the autotiles without wrapping around
-    let max_tiles_under_autotiles = i32(HOST.autotiles.max_frame_count) * 1712;
+    let max_tiles_under_autotiles = i32(autotiles.max_frame_count) * 1712;
     let is_under_autotiles = !is_autotile && instance.tile_id - 384 < max_tiles_under_autotiles;
 
     var atlas_tile_position: vec2<f32>;
@@ -61,15 +82,22 @@ fn vs_main(vertex: VertexInput, instance: InstanceInput) -> VertexOutput {
         } else {
             atlas_tile_position = vec2<f32>(
             // If the tile is not an autotile and is not located underneath the autotiles in the atlas
-                f32((instance.tile_id % 8 + ((instance.tile_id - 384 - max_tiles_under_autotiles) / 2048 + i32(HOST.autotiles.max_frame_count)) * 8) * 32),
+                f32((instance.tile_id % 8 + ((instance.tile_id - 384 - max_tiles_under_autotiles) / 2048 + i32(autotiles.max_frame_count)) * 8) * 32),
                 f32((instance.tile_id - 384 - max_tiles_under_autotiles) / 8 % 256 * 32)
             );
         }
     }
 
     if is_autotile {
-        let frame_count = HOST.autotiles.frame_counts[instance.tile_id / 48 - 1];
-        let frame = HOST.autotiles.animation_index % frame_count;
+// we get an error about non constant indexing without this.
+// not sure why
+#if USE_PUSH_CONSTANTS == true
+        let frame_count = push_constants.autotiles.frame_counts[instance.tile_id / 48 - 1];
+#else
+        let frame_count = autotiles.frame_counts[instance.tile_id / 48 - 1];
+#endif
+
+        let frame = autotiles.animation_index % frame_count;
         atlas_tile_position.x += f32(frame * 256u);
     }
     let tex_size = vec2<f32>(textureDimensions(atlas));
@@ -86,7 +114,13 @@ var atlas_sampler: sampler;
 @fragment
 fn fs_main(input: VertexOutput) -> @location(0) vec4<f32> {
     var color = textureSample(atlas, atlas_sampler, input.tex_coords);
-    color.a *= FRAGMENT_OPACITY;
+
+#if USE_PUSH_CONSTANTS == true
+    let layer_opacity = push_constants.opacity;
+#else
+    let layer_opacity = opacity[input.layer / 4u][input.layer % 4u];
+#endif
+    color.a *= layer_opacity;
 
     if color.a <= 0.0 {
         discard;
diff --git a/src/graphics/primitives/vertex.rs b/crates/graphics/src/vertex.rs
similarity index 98%
rename from src/graphics/primitives/vertex.rs
rename to crates/graphics/src/vertex.rs
index c911ddff..efaf09c9 100644
--- a/src/graphics/primitives/vertex.rs
+++ b/crates/graphics/src/vertex.rs
@@ -15,8 +15,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
 
-use crate::prelude::*;
-
 #[repr(C)]
 #[derive(Copy, Clone, Debug, bytemuck::Pod, bytemuck::Zeroable, PartialEq)]
 pub struct Vertex {
diff --git a/src/graphics/primitives/viewport.rs b/crates/graphics/src/viewport.rs
similarity index 66%
rename from src/graphics/primitives/viewport.rs
rename to crates/graphics/src/viewport.rs
index c2eab5d1..b7667b25 100644
--- a/src/graphics/primitives/viewport.rs
+++ b/crates/graphics/src/viewport.rs
@@ -14,7 +14,6 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
-use crate::prelude::*;
 
 use crossbeam::atomic::AtomicCell;
 use wgpu::util::DeviceExt;
@@ -32,33 +31,36 @@ struct ViewportUniform {
 }
 
 impl Viewport {
-    pub fn new(proj: glam::Mat4, use_push_constants: bool) -> Self {
-        let uniform = if !use_push_constants {
-            let render_state = &state!().render_state;
-            let buffer =
-                render_state
-                    .device
-                    .create_buffer_init(&wgpu::util::BufferInitDescriptor {
+    pub fn new(
+        graphics_state: &crate::GraphicsState,
+        proj: glam::Mat4,
+        use_push_constants: bool,
+    ) -> Self {
+        let uniform =
+            if !use_push_constants {
+                let buffer = graphics_state.render_state.device.create_buffer_init(
+                    &wgpu::util::BufferInitDescriptor {
                         label: Some("tilemap viewport buffer"),
                         contents: bytemuck::cast_slice(&[proj]),
                         usage: wgpu::BufferUsages::STORAGE
                             | wgpu::BufferUsages::COPY_DST
                             | wgpu::BufferUsages::UNIFORM,
-                    });
-            let bind_group = render_state
-                .device
-                .create_bind_group(&wgpu::BindGroupDescriptor {
-                    label: Some("tilemap viewport uniform bind group"),
-                    layout: &LAYOUT,
-                    entries: &[wgpu::BindGroupEntry {
-                        binding: 0,
-                        resource: buffer.as_entire_binding(),
-                    }],
-                });
-            Some(ViewportUniform { buffer, bind_group })
-        } else {
-            None
-        };
+                    },
+                );
+                let bind_group = graphics_state.render_state.device.create_bind_group(
+                    &wgpu::BindGroupDescriptor {
+                        label: Some("tilemap viewport uniform bind group"),
+                        layout: &graphics_state.bind_group_layouts.viewport,
+                        entries: &[wgpu::BindGroupEntry {
+                            binding: 0,
+                            resource: buffer.as_entire_binding(),
+                        }],
+                    },
+                );
+                Some(ViewportUniform { buffer, bind_group })
+            } else {
+                None
+            };
 
         Self {
             data: AtomicCell::new(proj),
@@ -66,11 +68,11 @@ impl Viewport {
         }
     }
 
-    pub fn set_proj(&self, proj: glam::Mat4) {
+    pub fn set_proj(&self, render_state: &egui_wgpu::RenderState, proj: glam::Mat4) {
         let data = self.data.load();
         if data != proj {
             self.data.store(proj);
-            self.regen_buffer();
+            self.regen_buffer(render_state);
         }
     }
 
@@ -78,9 +80,8 @@ impl Viewport {
         bytemuck::cast(self.data.load())
     }
 
-    fn regen_buffer(&self) {
+    fn regen_buffer(&self, render_state: &egui_wgpu::RenderState) {
         if let Some(uniform) = &self.uniform {
-            let render_state = &state!().render_state;
             render_state.queue.write_buffer(
                 &uniform.buffer,
                 0,
@@ -89,10 +90,6 @@ impl Viewport {
         }
     }
 
-    pub fn layout() -> &'static wgpu::BindGroupLayout {
-        &LAYOUT
-    }
-
     pub fn bind<'rpass>(&'rpass self, render_pass: &mut wgpu::RenderPass<'rpass>) {
         if let Some(uniform) = &self.uniform {
             render_pass.set_bind_group(1, &uniform.bind_group, &[]);
@@ -100,9 +97,7 @@ impl Viewport {
     }
 }
 
-static LAYOUT: Lazy<wgpu::BindGroupLayout> = Lazy::new(|| {
-    let render_state = &state!().render_state;
-
+pub fn create_bind_group_layout(render_state: &egui_wgpu::RenderState) -> wgpu::BindGroupLayout {
     render_state
         .device
         .create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
@@ -118,4 +113,4 @@ static LAYOUT: Lazy<wgpu::BindGroupLayout> = Lazy::new(|| {
             }],
             label: Some("tilemap viewport bind group layout"),
         })
-});
+}
diff --git a/crates/macros/Cargo.toml b/crates/macros/Cargo.toml
new file mode 100644
index 00000000..a76c6c70
--- /dev/null
+++ b/crates/macros/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name = "luminol-macros"
+
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+rust-version.workspace = true
+readme.workspace = true
+repository.workspace = true
+keywords.workspace = true
+categories.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
diff --git a/crates/macros/src/lib.rs b/crates/macros/src/lib.rs
new file mode 100644
index 00000000..7d12d9af
--- /dev/null
+++ b/crates/macros/src/lib.rs
@@ -0,0 +1,14 @@
+pub fn add(left: usize, right: usize) -> usize {
+    left + right
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn it_works() {
+        let result = add(2, 2);
+        assert_eq!(result, 4);
+    }
+}
diff --git a/crates/modals/Cargo.toml b/crates/modals/Cargo.toml
new file mode 100644
index 00000000..6598c273
--- /dev/null
+++ b/crates/modals/Cargo.toml
@@ -0,0 +1,23 @@
+[package]
+name = "luminol-modals"
+
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+rust-version.workspace = true
+readme.workspace = true
+repository.workspace = true
+keywords.workspace = true
+categories.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+egui.workspace = true
+
+camino.workspace = true
+
+luminol-core.workspace = true
+luminol-data.workspace = true
+luminol-components.workspace = true
diff --git a/crates/modals/src/graphic_picker.rs b/crates/modals/src/graphic_picker.rs
new file mode 100644
index 00000000..81428044
--- /dev/null
+++ b/crates/modals/src/graphic_picker.rs
@@ -0,0 +1,47 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
+//
+//     Additional permission under GNU GPL version 3 section 7
+//
+// If you modify this Program, or any covered work, by linking or combining
+// it with Steamworks API by Valve Corporation, containing parts covered by
+// terms of the Steamworks API by Valve Corporation, the licensors of this
+// Program grant you additional permission to convey the resulting work.
+
+pub struct Modal {}
+
+impl luminol_core::Modal for Modal {
+    type Data = camino::Utf8PathBuf;
+
+    fn button(
+        this: &mut Option<Self>,
+        ui: &mut egui::Ui,
+        data: &mut Self::Data,
+        update_state: &mut luminol_core::UpdateState<'_>,
+    ) {
+        todo!()
+    }
+
+    fn show(
+        this: &mut Option<Self>,
+        ctx: &egui::Context,
+        data: &mut Self::Data,
+        update_state: &mut luminol_core::UpdateState<'_>,
+    ) {
+        todo!()
+    }
+}
diff --git a/src/modals/mod.rs b/crates/modals/src/lib.rs
similarity index 94%
rename from src/modals/mod.rs
rename to crates/modals/src/lib.rs
index 3120ca7f..a6bd6c85 100644
--- a/src/modals/mod.rs
+++ b/crates/modals/src/lib.rs
@@ -22,11 +22,11 @@
 // terms of the Steamworks API by Valve Corporation, the licensors of this
 // Program grant you additional permission to convey the resulting work.
 
-/// Traits related to modals.
-pub mod modal;
 /// The switch picker.
 pub mod switch;
 /// The variable picker.
 pub mod variable;
 
-pub use modal::Modal;
+pub mod sound_picker;
+
+pub mod graphic_picker;
diff --git a/src/modals/move_route.rs b/crates/modals/src/move_route.rs
similarity index 100%
rename from src/modals/move_route.rs
rename to crates/modals/src/move_route.rs
diff --git a/crates/modals/src/sound_picker.rs b/crates/modals/src/sound_picker.rs
new file mode 100644
index 00000000..cb914409
--- /dev/null
+++ b/crates/modals/src/sound_picker.rs
@@ -0,0 +1,49 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
+//
+//     Additional permission under GNU GPL version 3 section 7
+//
+// If you modify this Program, or any covered work, by linking or combining
+// it with Steamworks API by Valve Corporation, containing parts covered by
+// terms of the Steamworks API by Valve Corporation, the licensors of this
+// Program grant you additional permission to convey the resulting work.
+
+pub struct Modal {
+    tab: luminol_components::SoundTab,
+}
+
+impl luminol_core::Modal for Modal {
+    type Data = luminol_data::rpg::AudioFile;
+
+    fn button(
+        this: &mut Option<Self>,
+        ui: &mut egui::Ui,
+        data: &mut Self::Data,
+        update_state: &mut luminol_core::UpdateState<'_>,
+    ) {
+        todo!()
+    }
+
+    fn show(
+        this: &mut Option<Self>,
+        ctx: &egui::Context,
+        data: &mut Self::Data,
+        update_state: &mut luminol_core::UpdateState<'_>,
+    ) {
+        todo!()
+    }
+}
diff --git a/src/modals/switch.rs b/crates/modals/src/switch.rs
similarity index 59%
rename from src/modals/switch.rs
rename to crates/modals/src/switch.rs
index 4888e6d7..a6be48a2 100644
--- a/src/modals/switch.rs
+++ b/crates/modals/src/switch.rs
@@ -22,62 +22,54 @@
 // terms of the Steamworks API by Valve Corporation, the licensors of this
 // Program grant you additional permission to convey the resulting work.
 
-use crate::prelude::*;
-
 /// The switch picker modal.
 pub struct Modal {
-    id: egui::Id,
-}
-
-impl Modal {
-    /// Create a new modal.
-    pub fn new(id: egui::Id) -> Self {
-        Self { id }
-    }
+    switch_id_range: std::ops::Range<usize>,
+    search_text: String,
 }
 
-impl modal::Modal for Modal {
+impl luminol_core::Modal for Modal {
     type Data = usize;
 
-    fn id(mut self, id: egui::Id) -> Self {
-        self.id = id;
-        self
-    }
-
-    fn button(mut self, ui: &mut egui::Ui, state: &mut bool, data: &mut Self::Data) -> Self {
+    fn button(
+        this: &mut Option<Self>,
+        ui: &mut egui::Ui,
+        data: &mut Self::Data,
+        update_state: &mut luminol_core::UpdateState<'_>,
+    ) {
+        let system = update_state.data.system();
+
+        if ui
+            .button(format!("{data}: {}", system.switches[*data - 1]))
+            .clicked()
         {
-            let system = state!().data_cache.system();
-
-            if ui
-                .button(format!("{data}: {}", system.switches[*data - 1]))
-                .clicked()
-            {
-                *state = true;
-                ui.ctx().memory_mut(|m| {
-                    m.data
-                        .get_temp_mut_or(self.id, (*data, *data, String::new()));
-                });
-            }
+            this.get_or_insert(Self {
+                switch_id_range: *data..*data,
+                search_text: String::new(),
+            });
         }
 
-        if *state {
-            self.show(ui.ctx(), state, data);
-        }
+        drop(system);
 
-        self
+        Modal::show(this, ui.ctx(), data, update_state);
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool, data: &mut Self::Data) {
-        let mut win_open = true;
+    fn show(
+        this_opt: &mut Option<Self>,
+        ctx: &egui::Context,
+        data: &mut Self::Data,
+        update_state: &mut luminol_core::UpdateState<'_>,
+    ) {
+        let mut win_open = this_opt.is_some();
+        let mut needs_close = this_opt.is_some();
+
         egui::Window::new("Switch Picker")
-            .id(self.id)
             .resizable(false)
             .open(&mut win_open)
             .show(ctx, |ui| {
-                let system = state!().data_cache.system();
+                let this = this_opt.as_mut().unwrap();
 
-                let mut memory: (usize, usize, String) =
-                    ctx.data_mut(|m| m.get_temp(self.id).unwrap());
+                let system = update_state.data.system();
 
                 ui.group(|ui| {
                     egui::ScrollArea::vertical()
@@ -86,55 +78,54 @@ impl modal::Modal for Modal {
                         .show(ui, |ui| {
                             for (id, name) in
                                 system.switches.iter().enumerate().filter(|(id, s)| {
-                                    (id + 1).to_string().contains(&memory.2)
-                                        || s.contains(&memory.2)
+                                    (id + 1).to_string().contains(&this.search_text)
+                                        || s.contains(&this.search_text)
                                 })
                             {
                                 let id = id + 1;
                                 let mut text = egui::RichText::new(format!("{id}: {name}"));
 
-                                if memory.0 == id {
+                                if this.switch_id_range.start == id {
                                     text = text.color(egui::Color32::YELLOW);
                                 }
 
                                 let response = ui.selectable_value(data, id, text);
 
-                                if memory.1 == id {
-                                    memory.1 = usize::MAX;
-                                    memory.0 = id;
+                                if this.switch_id_range.end == id {
+                                    this.switch_id_range.end = usize::MAX;
+                                    this.switch_id_range.start = id;
 
                                     response.scroll_to_me(None);
                                 }
 
                                 if response.double_clicked() {
-                                    *open = false;
+                                    needs_close = true;
                                 }
                             }
                         })
                 });
 
                 ui.horizontal(|ui| {
-                    *open = !ui.button("Ok").clicked();
-                    *open = !ui.button("Cancel").clicked();
+                    needs_close |= ui.button("Ok").clicked();
+                    needs_close |= ui.button("Cancel").clicked();
 
                     if ui
                         .add(
-                            egui::DragValue::new(&mut memory.0)
+                            egui::DragValue::new(&mut this.switch_id_range.start)
                                 .clamp_range(0..=system.switches.len()),
                         )
                         .changed()
                     {
-                        memory.1 = memory.0;
+                        this.switch_id_range.end = this.switch_id_range.start;
                     };
-                    egui::TextEdit::singleline(&mut memory.2)
+                    egui::TextEdit::singleline(&mut this.search_text)
                         .hint_text("Search 🔎")
                         .show(ui);
                 });
-
-                ctx.data_mut(|m| {
-                    m.insert_temp(self.id, memory);
-                });
             });
-        *open = *open && win_open;
+
+        if !win_open || needs_close {
+            *this_opt = None;
+        }
     }
 }
diff --git a/src/modals/variable.rs b/crates/modals/src/variable.rs
similarity index 57%
rename from src/modals/variable.rs
rename to crates/modals/src/variable.rs
index 09cdb7d2..07ab2588 100644
--- a/src/modals/variable.rs
+++ b/crates/modals/src/variable.rs
@@ -22,65 +22,54 @@
 // terms of the Steamworks API by Valve Corporation, the licensors of this
 // Program grant you additional permission to convey the resulting work.
 
-use crate::prelude::*;
-
 /// The variable picker modal.
 pub struct Modal {
-    id: egui::Id,
-}
-
-impl Modal {
-    /// Create a new modal.
-    pub fn new(id: egui::Id) -> Self {
-        Self { id }
-    }
+    variable_id_range: std::ops::Range<usize>,
+    search_text: String,
 }
 
-impl modal::Modal for Modal {
+impl luminol_core::Modal for Modal {
     type Data = usize;
 
-    fn id(mut self, id: egui::Id) -> Self {
-        self.id = id;
-        self
-    }
-
-    fn button(mut self, ui: &mut egui::Ui, state: &mut bool, data: &mut Self::Data) -> Self {
+    fn button(
+        this: &mut Option<Self>,
+        ui: &mut egui::Ui,
+        data: &mut Self::Data,
+        update_state: &mut luminol_core::UpdateState<'_>,
+    ) {
+        let system = update_state.data.system();
+
+        if ui
+            .button(format!("{data}: {}", system.variables[*data - 1]))
+            .clicked()
         {
-            let system = state!().data_cache.system();
-
-            if ui
-                .button(format!("{data}: {}", system.variables[*data]))
-                .clicked()
-            {
-                *state = true;
-
-                // (selected value, value to scroll to, filter text)
-                ui.ctx().memory_mut(|m| {
-                    m.data
-                        .get_temp_mut_or(self.id, (*data, *data, String::new()));
-                });
-            }
+            this.get_or_insert(Self {
+                variable_id_range: *data..*data,
+                search_text: String::new(),
+            });
         }
 
-        if *state {
-            self.show(ui.ctx(), state, data);
-        }
+        drop(system);
 
-        self
+        Modal::show(this, ui.ctx(), data, update_state);
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool, data: &mut Self::Data) {
-        let mut win_open = true;
+    fn show(
+        this_opt: &mut Option<Self>,
+        ctx: &egui::Context,
+        data: &mut Self::Data,
+        update_state: &mut luminol_core::UpdateState<'_>,
+    ) {
+        let mut win_open = this_opt.is_some();
+        let mut needs_close = false;
+
         egui::Window::new("Variable Picker")
-            .id(self.id)
             .resizable(false)
             .open(&mut win_open)
             .show(ctx, |ui| {
-                let system = state!().data_cache.system();
+                let this = this_opt.as_mut().unwrap();
 
-                // (selected value, value to scroll to, filter text)
-                let mut memory: (usize, usize, String) =
-                    ctx.data_mut(|m| m.get_temp(self.id).unwrap());
+                let system = update_state.data.system();
 
                 ui.group(|ui| {
                     egui::ScrollArea::vertical()
@@ -89,55 +78,54 @@ impl modal::Modal for Modal {
                         .show(ui, |ui| {
                             for (id, name) in
                                 system.variables.iter().enumerate().filter(|(id, s)| {
-                                    (id + 1).to_string().contains(&memory.2)
-                                        || s.contains(&memory.2)
+                                    (id + 1).to_string().contains(&this.search_text)
+                                        || s.contains(&this.search_text)
                                 })
                             {
                                 let id = id + 1;
                                 let mut text = egui::RichText::new(format!("{id}: {name}"));
 
-                                if memory.0 == id {
+                                if this.variable_id_range.start == id {
                                     text = text.color(egui::Color32::YELLOW);
                                 }
 
                                 let response = ui.selectable_value(data, id, text);
 
-                                if memory.1 == id {
-                                    memory.1 = usize::MAX;
-                                    memory.0 = id;
+                                if this.variable_id_range.end == id {
+                                    this.variable_id_range.end = usize::MAX;
+                                    this.variable_id_range.start = id;
 
                                     response.scroll_to_me(None);
                                 }
 
                                 if response.double_clicked() {
-                                    *open = false;
+                                    needs_close = true;
                                 }
                             }
                         })
                 });
 
                 ui.horizontal(|ui| {
-                    *open = !ui.button("Ok").clicked();
-                    *open = !ui.button("Cancel").clicked();
+                    needs_close |= ui.button("Ok").clicked();
+                    needs_close |= ui.button("Cancel").clicked();
 
                     if ui
                         .add(
-                            egui::DragValue::new(&mut memory.0)
+                            egui::DragValue::new(&mut this.variable_id_range.start)
                                 .clamp_range(0..=system.variables.len()),
                         )
                         .changed()
                     {
-                        memory.1 = memory.0;
+                        this.variable_id_range.end = this.variable_id_range.start;
                     };
-                    egui::TextEdit::singleline(&mut memory.2)
+                    egui::TextEdit::singleline(&mut this.search_text)
                         .hint_text("Search 🔎")
                         .show(ui);
                 });
-
-                ctx.data_mut(|m| {
-                    m.insert_temp(self.id, memory);
-                });
             });
-        *open = *open && win_open;
+
+        if !win_open || needs_close {
+            *this_opt = None;
+        }
     }
 }
diff --git a/luminol-term/Cargo.toml b/crates/term/Cargo.toml
similarity index 64%
rename from luminol-term/Cargo.toml
rename to crates/term/Cargo.toml
index b5d2f627..7f07dcff 100644
--- a/luminol-term/Cargo.toml
+++ b/crates/term/Cargo.toml
@@ -1,19 +1,25 @@
 [package]
 name = "luminol-term"
-version = "0.1.0"
-edition = "2021"
+
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+rust-version.workspace = true
+readme.workspace = true
+repository.workspace = true
+keywords.workspace = true
+categories.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-egui = "0.22.0"
+egui.workspace = true
 # termwiz = "0.20.0"
 
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 crossbeam-channel = "0.5"
 
 wezterm-term = { version = "0.1.0", git = "https://github.com/wez/wezterm", rev = "3666303c7b26c6c966b3f136dbb954686d334cc3" }
 portable-pty = { version = "0.8.1", git = "https://github.com/wez/wezterm", rev = "3666303c7b26c6c966b3f136dbb954686d334cc3" }
 termwiz = { version = "0.22.0", git = "https://github.com/wez/wezterm", rev = "3666303c7b26c6c966b3f136dbb954686d334cc3" }
-
-[dev-dependencies]
-eframe = "0.22.0"
diff --git a/luminol-term/src/into.rs b/crates/term/src/_impl/into.rs
similarity index 100%
rename from luminol-term/src/into.rs
rename to crates/term/src/_impl/into.rs
diff --git a/luminol-term/src/lib.rs b/crates/term/src/_impl/mod.rs
similarity index 99%
rename from luminol-term/src/lib.rs
rename to crates/term/src/_impl/mod.rs
index 39f00e47..6a277bde 100644
--- a/luminol-term/src/lib.rs
+++ b/crates/term/src/_impl/mod.rs
@@ -209,7 +209,7 @@ impl Terminal {
                             cursor_pos.min,
                             egui::vec2(text_width, text_height),
                         ),
-                        egui::Rounding::none(),
+                        egui::Rounding::ZERO,
                         egui::Stroke::new(1.0, egui::Color32::WHITE),
                     );
 
diff --git a/src/cache/mod.rs b/crates/term/src/lib.rs
similarity index 91%
rename from src/cache/mod.rs
rename to crates/term/src/lib.rs
index 358ae9ff..a226ed0c 100644
--- a/src/cache/mod.rs
+++ b/crates/term/src/lib.rs
@@ -22,6 +22,7 @@
 // terms of the Steamworks API by Valve Corporation, the licensors of this
 // Program grant you additional permission to convey the resulting work.
 
-pub mod atlas;
-pub mod data;
-pub mod image_cache;
+#[cfg(not(target_arch = "wasm32"))]
+mod _impl;
+#[cfg(not(target_arch = "wasm32"))]
+pub use _impl::*;
diff --git a/crates/ui/Cargo.toml b/crates/ui/Cargo.toml
new file mode 100644
index 00000000..dadb901a
--- /dev/null
+++ b/crates/ui/Cargo.toml
@@ -0,0 +1,46 @@
+[package]
+name = "luminol-ui"
+
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+rust-version.workspace = true
+readme.workspace = true
+repository.workspace = true
+keywords.workspace = true
+categories.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+luminol-audio.workspace = true
+luminol-core.workspace = true
+luminol-config.workspace = true
+luminol-data.workspace = true
+luminol-graphics.workspace = true
+luminol-filesystem.workspace = true
+luminol-components.workspace = true
+luminol-modals.workspace = true
+
+egui.workspace = true
+egui_extras.workspace = true
+
+catppuccin-egui = { version = "3.1.0", git = "https://github.com/catppuccin/egui", rev = "f2bcf74" }
+
+strum.workspace = true
+
+git-version = "0.3.5"
+
+poll-promise.workspace = true
+futures = "0.3.28"
+reqwest = "0.11.22"
+
+zip = { version = "0.6.6", default-features = false, features = ["deflate"] }
+
+itertools.workspace = true
+
+anyhow.workspace = true
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+luminol-term = { version = "0.4.0", path = "../term/" }
diff --git a/crates/ui/src/lib.rs b/crates/ui/src/lib.rs
new file mode 100644
index 00000000..c27a3393
--- /dev/null
+++ b/crates/ui/src/lib.rs
@@ -0,0 +1,209 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
+//
+//     Additional permission under GNU GPL version 3 section 7
+//
+// If you modify this Program, or any covered work, by linking or combining
+// it with Steamworks API by Valve Corporation, containing parts covered by
+// terms of the Steamworks API by Valve Corporation, the licensors of this
+// Program grant you additional permission to convey the resulting work.
+
+pub type UpdateState<'res> = luminol_core::UpdateState<'res>;
+
+pub mod tabs;
+
+pub mod windows;
+
+macro_rules! tab_enum {
+    (
+        $(#[$attr:meta])*
+        $visibility:vis enum $name:ident {
+            $( $variant:ident($variant_type:ty) ),* $(,)?
+        }
+    ) => {
+        $( #[$attr] )*
+        $visibility enum $name {
+            $(
+                $variant($variant_type),
+            )*
+        }
+
+        impl luminol_core::Tab for $name {
+            fn name(&self, update_state: &luminol_core::UpdateState<'_>) -> String {
+                match self {
+                    $(
+                        Self::$variant(v) => v.name(update_state),
+                    )*
+                }
+            }
+
+            fn id(&self) -> egui::Id {
+                match self {
+                    $(
+                        Self::$variant(v) => v.id(),
+                    )*
+                }
+            }
+
+            fn show(&mut self, ui: &mut egui::Ui, update_state: &mut luminol_core::UpdateState<'_>) {
+                match self {
+                    $(
+                        Self::$variant(v) => v.show(ui, update_state),
+                    )*
+                }
+            }
+
+            fn requires_filesystem(&self) -> bool {
+                match self {
+                    $(
+                        Self::$variant(v) => v.requires_filesystem(),
+                    )*
+                }
+            }
+
+            fn force_close(&mut self) -> bool {
+                match self {
+                    $(
+                        Self::$variant(v) => v.force_close(),
+                    )*
+                }
+            }
+        }
+
+        $(
+            impl From<$variant_type> for $name {
+                fn from(value: $variant_type) -> Self {
+                    Self::$variant(value)
+                }
+            }
+        )*
+    };
+}
+
+macro_rules! window_enum {
+    (
+        $(#[$attr:meta])*
+        $visibility:vis enum $name:ident {
+            $( $(#[$variant_attr:meta])* $variant:ident($variant_type:path) ),* $(,)?
+        }
+    ) => {
+        $( #[$attr] )*
+        $visibility enum $name {
+            $(
+                $(
+                    #[$variant_attr]
+                )*
+                $variant($variant_type),
+            )*
+        }
+
+        impl luminol_core::Window for $name {
+            fn show(
+                &mut self,
+                ctx: &egui::Context,
+                open: &mut bool,
+                update_state: &mut luminol_core::UpdateState<'_>,
+            ) {
+                match self {
+                    $(
+                        Self::$variant(v) => v.show(ctx, open, update_state),
+                    )*
+                }
+            }
+
+            fn name(&self) -> String {
+                match self {
+                    $(
+                        Self::$variant(v) => v.name(),
+                    )*
+                }
+            }
+
+            fn id(&self) -> egui::Id {
+                match self {
+                    $(
+                        Self::$variant(v) => v.id(),
+                    )*
+                }
+            }
+
+            fn requires_filesystem(&self) -> bool {
+                match self {
+                    $(
+                        Self::$variant(v) => v.requires_filesystem(),
+                    )*
+                }
+            }
+        }
+
+        $(
+            impl From<$variant_type> for $name {
+                fn from(value: $variant_type) -> Self {
+                    Self::$variant(value)
+                }
+            }
+        )*
+    };
+}
+
+tab_enum! {
+    pub enum Tab {
+        Map(tabs::map::Tab),
+        Started(tabs::started::Tab)
+    }
+}
+
+// I tried adding #[cfg] support in the macro and it would compile but rust-analyzer wasn't happy with it
+#[cfg(not(target_arch = "wasm32"))]
+window_enum! {
+    pub enum Window {
+        About(windows::about::Window),
+        Appearance(windows::appearance::Window),
+        CommonEvent(windows::common_event_edit::Window),
+        ProjectConfig(windows::config_window::Window),
+        Console(windows::console::Window),
+        EventEdit(windows::event_edit::Window),
+        GlobalConfig(windows::global_config_window::Window),
+        Items(windows::items::Window),
+        MapPicker(windows::map_picker::Window),
+        EguiInspection(windows::misc::EguiInspection),
+        EguiMemory(windows::misc::EguiMemory),
+        FilesystemDebug(windows::misc::FilesystemDebug),
+        NewProject(windows::new_project::Window),
+        ScriptEdit(windows::script_edit::Window),
+        SoundTest(windows::sound_test::Window)
+    }
+}
+#[cfg(target_arch = "wasm32")]
+window_enum! {
+    pub enum Window {
+        About(windows::about::Window),
+        Appearance(windows::appearance::Window),
+        CommonEvent(windows::common_event_edit::Window),
+        ProjectConfig(windows::config_window::Window),
+        EventEdit(windows::event_edit::Window),
+        GlobalConfig(windows::global_config_window::Window),
+        Items(windows::items::Window),
+        MapPicker(windows::map_picker::Window),
+        EguiInspection(windows::misc::EguiInspection),
+        EguiMemory(windows::misc::EguiMemory),
+        FilesystemDebug(windows::misc::FilesystemDebug),
+        NewProject(windows::new_project::Window),
+        ScriptEdit(windows::script_edit::Window),
+        SoundTest(windows::sound_test::Window)
+    }
+}
diff --git a/crates/ui/src/tabs/map/brush.rs b/crates/ui/src/tabs/map/brush.rs
new file mode 100644
index 00000000..c0614caa
--- /dev/null
+++ b/crates/ui/src/tabs/map/brush.rs
@@ -0,0 +1,329 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
+//
+//     Additional permission under GNU GPL version 3 section 7
+//
+// If you modify this Program, or any covered work, by linking or combining
+// it with Steamworks API by Valve Corporation, containing parts covered by
+// terms of the Steamworks API by Valve Corporation, the licensors of this
+// Program grant you additional permission to convey the resulting work.
+
+use std::usize;
+
+impl super::Tab {
+    pub(super) fn handle_brush(
+        &mut self,
+        map_x: usize,
+        map_y: usize,
+        tile_layer: usize,
+        pencil: luminol_core::Pencil,
+        map: &mut luminol_data::rpg::Map,
+    ) {
+        let initial_tile =
+            luminol_components::SelectedTile::from_id(map.data[(map_x, map_y, tile_layer)]);
+        let left = self.tilepicker.selected_tiles_left;
+        let right = self.tilepicker.selected_tiles_right;
+        let top = self.tilepicker.selected_tiles_top;
+        let bottom = self.tilepicker.selected_tiles_bottom;
+        let width = right - left + 1;
+        let height = bottom - top + 1;
+
+        match pencil {
+            luminol_core::Pencil::Pen => {
+                let drawing_shape_pos = if let Some(drawing_shape_pos) = self.drawing_shape_pos {
+                    drawing_shape_pos
+                } else {
+                    self.drawing_shape_pos = Some(self.view.cursor_pos);
+                    self.view.cursor_pos
+                };
+                for y in 0..height {
+                    for x in 0..width {
+                        // Skip out-of-bounds tiles
+                        if ((x == -1 && map_x == 0) || (x == 1 && map_x + 1 == map.data.xsize()))
+                            || ((y == -1 && map_y == 0)
+                                || (y == 1 && map_y + 1 == map.data.ysize()))
+                        {
+                            continue;
+                        }
+
+                        self.set_tile(
+                            map,
+                            self.tilepicker.get_tile_from_offset(
+                                x + (self.view.cursor_pos.x - drawing_shape_pos.x) as i16,
+                                y + (self.view.cursor_pos.y - drawing_shape_pos.y) as i16,
+                            ),
+                            (map_x + x as usize, map_y + y as usize, tile_layer),
+                        );
+                    }
+                }
+            }
+
+            luminol_core::Pencil::Fill
+                if initial_tile == self.tilepicker.get_tile_from_offset(0, 0) => {}
+            luminol_core::Pencil::Fill => {
+                // Use depth-first search to find all of the orthogonally
+                // contiguous matching tiles
+                let mut stack = vec![(map_x, map_y, tile_layer); 1];
+                let initial_x = map_x;
+                let initial_y = map_y;
+                while let Some(position) = stack.pop() {
+                    self.set_tile(
+                        map,
+                        self.tilepicker.get_tile_from_offset(
+                            map_x as i16 - initial_x as i16,
+                            map_y as i16 - initial_y as i16,
+                        ),
+                        position,
+                    );
+                    self.dfs_cache[map_x + map_y * map.data.xsize()] = true;
+
+                    let x_array: [i8; 4] = [-1, 1, 0, 0];
+                    let y_array: [i8; 4] = [0, 0, -1, 1];
+                    for (x, y) in x_array.into_iter().zip(y_array.into_iter()) {
+                        // Don't search tiles that are out of bounds
+                        if ((x == -1 && map_x == 0) || (x == 1 && map_x + 1 == map.data.xsize()))
+                            || ((y == -1 && map_y == 0)
+                                || (y == 1 && map_y + 1 == map.data.ysize()))
+                        {
+                            continue;
+                        }
+
+                        let position = (
+                            if x == -1 {
+                                map_x - 1
+                            } else {
+                                map_x + x as usize
+                            },
+                            if y == -1 {
+                                map_y - 1
+                            } else {
+                                map_y + y as usize
+                            },
+                            position.2,
+                        );
+
+                        // Don't search tiles that we've already searched before
+                        // because that would cause an infinite loop
+                        if self.dfs_cache[map_x + map_y * map.data.xsize()] {
+                            continue;
+                        }
+
+                        if luminol_components::SelectedTile::from_id(map.data[position])
+                            == initial_tile
+                        {
+                            stack.push(position);
+                        }
+                    }
+                }
+
+                for x in self.dfs_cache.iter_mut() {
+                    *x = false;
+                }
+            }
+
+            luminol_core::Pencil::Rectangle => {
+                if !self.drawing_shape {
+                    // Save the current layer
+                    for x in 0..map.data.xsize() {
+                        for y in 0..map.data.ysize() {
+                            self.brush_layer_cache[x + y * map.data.xsize()] =
+                                map.data[(x, y, tile_layer)];
+                        }
+                    }
+                    self.drawing_shape = true;
+                } else {
+                    // Restore the previously stored state of the current layer
+                    for y in 0..map.data.ysize() {
+                        for x in 0..map.data.xsize() {
+                            map.data[(x, y, tile_layer)] =
+                                self.brush_layer_cache[x + y * map.data.xsize()];
+                        }
+                    }
+                }
+
+                if let Some(drawing_shape_pos) = self.drawing_shape_pos {
+                    let bounding_rect =
+                        egui::Rect::from_two_pos(drawing_shape_pos, self.view.cursor_pos);
+                    for y in (bounding_rect.min.y as usize)..=(bounding_rect.max.y as usize) {
+                        for x in (bounding_rect.min.x as usize)..=(bounding_rect.max.x) as usize {
+                            let position = (x, y, tile_layer);
+                            self.set_tile(
+                                map,
+                                self.tilepicker.get_tile_from_offset(
+                                    x as i16 - drawing_shape_pos.x as i16,
+                                    y as i16 - drawing_shape_pos.y as i16,
+                                ),
+                                position,
+                            );
+                        }
+                    }
+                } else {
+                    self.drawing_shape_pos = Some(self.view.cursor_pos);
+                }
+            }
+
+            luminol_core::Pencil::Circle => {
+                if !self.drawing_shape {
+                    // Save the current layer
+                    for x in 0..map.data.xsize() {
+                        for y in 0..map.data.ysize() {
+                            self.brush_layer_cache[x + y * map.data.xsize()] =
+                                map.data[(x, y, tile_layer)];
+                        }
+                    }
+                    self.drawing_shape = true;
+                } else {
+                    // Restore the previously stored state of the current layer
+                    for y in 0..map.data.ysize() {
+                        for x in 0..map.data.xsize() {
+                            map.data[(x, y, tile_layer)] =
+                                self.brush_layer_cache[x + y * map.data.xsize()];
+                        }
+                    }
+                }
+
+                // Use Bresenham's algorithm to draw the ellipse.
+                // We consider (x, y) to be the top-left corner of the tile at
+                // (x, y).
+                if let Some(drawing_shape_pos) = self.drawing_shape_pos {
+                    let bounding_rect =
+                        egui::Rect::from_two_pos(drawing_shape_pos, self.view.cursor_pos);
+                    // Edge case: Bresenham's algorithm breaks down when drawing a
+                    // 1x1 ellipse.
+                    if drawing_shape_pos == self.view.cursor_pos {
+                        self.set_tile(
+                            map,
+                            self.tilepicker.get_tile_from_offset(
+                                map_x as i16 - drawing_shape_pos.x as i16,
+                                map_y as i16 - drawing_shape_pos.y as i16,
+                            ),
+                            (map_x as usize, map_y as usize, tile_layer),
+                        );
+                    } else {
+                        let bounding_rect = bounding_rect.translate(egui::vec2(0.5, 0.5));
+
+                        // Calculate where the center of the ellipse should be.
+                        let x0 = bounding_rect.center().x;
+                        let y0 = bounding_rect.center().y;
+
+                        // Calculate the radii of the ellipse along the
+                        // x and y directions.
+                        let rx = bounding_rect.width() / 2.;
+                        let ry = bounding_rect.height() / 2.;
+                        let rx2 = rx * rx;
+                        let ry2 = ry * ry;
+
+                        // Let the "ellipse function" be defined as
+                        // f(x, y) = b^2 x^2 + a^2 y^2 - a^2 b^2
+                        // where a is the x-radius of an ellipse centered at (0, 0)
+                        // and b is the y-radius.
+                        // This function is positive when (x, y) is outside the
+                        // ellipse, negative when it's inside the ellipse and zero when
+                        // it's exactly on the edge.
+
+                        // We'll start by drawing the part of the outer edge of the
+                        // bottom-right quadrant of the ellipse where dy/dx >= -1,
+                        // starting from the bottom of the ellipse and going to the
+                        // right.
+                        let mut x = if rx.floor() == rx { 0. } else { 0.5 };
+                        let mut y = ry;
+
+                        // Keep looping until dy/dx < -1.
+                        while rx2 * y >= ry2 * x {
+                            for i in ((-y).floor() as i32)..=(y.floor() as i32) {
+                                let i = if y.floor() == y {
+                                    i as f32
+                                } else {
+                                    i as f32 + 0.5
+                                };
+                                for j in [x, -x] {
+                                    let x = (x0 + j).floor();
+                                    let y = (y0 + i).floor();
+                                    self.set_tile(
+                                        map,
+                                        self.tilepicker.get_tile_from_offset(
+                                            x as i16 - drawing_shape_pos.x as i16,
+                                            y as i16 - drawing_shape_pos.y as i16,
+                                        ),
+                                        (x as usize, y as usize, tile_layer),
+                                    );
+                                }
+                            }
+
+                            // The next tile will either be at (x + 1, y) or
+                            // (x + 1, y - 1), whichever is closest to the actual edge
+                            // of the ellipse.
+                            // To determine which is closer, we evaluate the ellipse
+                            // function at (x + 1, y - 0.5).
+                            // If it's positive, then (x + 1, y - 1) is closer.
+                            // If it's negative, then (x + 1, y) is closer.
+                            let f = ry2 * (x + 1.).powi(2) + rx2 * (y - 0.5).powi(2) - rx2 * ry2;
+                            if f > 0. {
+                                y -= 1.;
+                            }
+                            x += 1.;
+                        }
+
+                        // Now we draw the part of the outer edge of the
+                        // bottom-right quadrant of the ellipse where dy/dx <= -1,
+                        // starting from the right of the ellipse and going down.
+                        let mut x = rx;
+                        let mut y = if ry.floor() == ry { 0. } else { 0.5 };
+
+                        // Keep looping until dy/dx > -1.
+                        while rx2 * y <= ry2 * x {
+                            for i in ((-x).floor() as i32)..=(x.floor() as i32) {
+                                let i = if x.floor() == x {
+                                    i as f32
+                                } else {
+                                    i as f32 + 0.5
+                                };
+                                for j in [y, -y] {
+                                    let x = (x0 + i).floor();
+                                    let y = (y0 + j).floor();
+                                    self.set_tile(
+                                        map,
+                                        self.tilepicker.get_tile_from_offset(
+                                            x as i16 - drawing_shape_pos.x as i16,
+                                            y as i16 - drawing_shape_pos.y as i16,
+                                        ),
+                                        (x as usize, y as usize, tile_layer),
+                                    );
+                                }
+                            }
+
+                            // The next tile will either be at (x, y + 1) or
+                            // (x - 1, y + 1), whichever is closest to the actual edge
+                            // of the ellipse.
+                            // To determine which is closer, we evaluate the ellipse
+                            // function at (x - 0.5, y + 1).
+                            // If it's positive, then (x - 1, y + 1) is closer.
+                            // If it's negative, then (x, y + 1) is closer.
+                            let f = ry2 * (x - 0.5).powi(2) + rx2 * (y + 1.).powi(2) - rx2 * ry2;
+                            if f > 0. {
+                                x -= 1.;
+                            }
+                            y += 1.;
+                        }
+                    }
+                } else {
+                    self.drawing_shape_pos = Some(self.view.cursor_pos);
+                }
+            }
+        };
+    }
+}
diff --git a/src/modals/graphic.rs b/crates/ui/src/tabs/map/history.rs
similarity index 100%
rename from src/modals/graphic.rs
rename to crates/ui/src/tabs/map/history.rs
diff --git a/crates/ui/src/tabs/map/mod.rs b/crates/ui/src/tabs/map/mod.rs
new file mode 100644
index 00000000..0b536b79
--- /dev/null
+++ b/crates/ui/src/tabs/map/mod.rs
@@ -0,0 +1,548 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
+//
+//     Additional permission under GNU GPL version 3 section 7
+//
+// If you modify this Program, or any covered work, by linking or combining
+// it with Steamworks API by Valve Corporation, containing parts covered by
+// terms of the Steamworks API by Valve Corporation, the licensors of this
+// Program grant you additional permission to convey the resulting work.
+
+#![allow(unused_imports)]
+use egui::Pos2;
+use std::{cell::RefMut, collections::HashMap, collections::VecDeque};
+
+const HISTORY_SIZE: usize = 50;
+
+use crate::windows::event_edit;
+
+use itertools::Itertools;
+
+mod brush;
+mod history;
+mod util;
+
+pub struct Tab {
+    /// ID of the map that is being edited.
+    pub id: usize,
+    /// The tilemap.
+    pub view: luminol_components::MapView,
+    pub tilepicker: luminol_components::Tilepicker,
+
+    dragging_event: bool,
+    drawing_shape: bool,
+    event_windows: luminol_core::Windows,
+    force_close: bool,
+
+    /// When event dragging starts, this is set to the difference between
+    /// the dragged event's tile and the cursor position
+    event_drag_offset: Option<egui::Vec2>,
+
+    layer_cache: Vec<i16>,
+
+    /// This cache is used by the depth-first search when using the fill brush
+    dfs_cache: Vec<bool>,
+    /// This is used to save a copy of the current layer when using the
+    /// rectangle or circle brush
+    brush_layer_cache: Vec<i16>,
+    /// When drawing with any brush,
+    /// this is set to the position of the original tile we began drawing on
+    drawing_shape_pos: Option<egui::Pos2>,
+
+    /// Undo history
+    history: VecDeque<HistoryEntry>,
+    /// When operations are undone, they are put here so that they can be redone
+    redo_history: Vec<HistoryEntry>,
+    /// When starting to draw tiles, this is set to the state of the layer before
+    /// any tiles are drawn in order to compute the deltas for the history
+    tilemap_undo_cache: Vec<i16>,
+    /// The layer tilemap_undo_cache refers to
+    tilemap_undo_cache_layer: usize,
+}
+
+// TODO: If we add support for changing event IDs, these need to be added as history entries
+// in order to not corrupt the EventMoved and EventCreated entries.
+enum HistoryEntry {
+    /// Contains the (x, y, tile_id) delta for a changed map layer.
+    Tiles {
+        layer: usize,
+        delta: Vec<(usize, usize, i16)>,
+    },
+    /// Contains the original map coordinates of a moved event and the ID of the event.
+    EventMoved { id: usize, x: i32, y: i32 },
+    /// Contains the ID of a created event.
+    EventCreated(usize),
+    /// Contains a deleted event and its corresponding graphic.
+    EventDeleted {
+        event: luminol_data::rpg::Event,
+        sprites: Option<(luminol_graphics::Event, luminol_graphics::Event)>,
+    },
+}
+
+impl Tab {
+    /// Create a new map editor.
+    pub fn new(
+        id: usize,
+        update_state: &mut luminol_core::UpdateState<'_>,
+    ) -> anyhow::Result<Self> {
+        // *sigh*
+        // borrow checker.
+        let view = luminol_components::MapView::new(update_state, id)?;
+        let tilepicker = luminol_components::Tilepicker::new(update_state, id)?;
+
+        let map = update_state
+            .data
+            .get_or_load_map(id, update_state.filesystem);
+
+        Ok(Self {
+            id,
+
+            view,
+            tilepicker,
+
+            dragging_event: false,
+            drawing_shape: false,
+            event_windows: luminol_core::Windows::default(),
+            force_close: false,
+
+            event_drag_offset: None,
+
+            layer_cache: vec![0; map.data.xsize() * map.data.ysize()],
+
+            dfs_cache: vec![false; map.data.xsize() * map.data.ysize()],
+            brush_layer_cache: vec![0; map.data.xsize() * map.data.ysize()],
+            drawing_shape_pos: None,
+
+            history: VecDeque::with_capacity(HISTORY_SIZE),
+            redo_history: Vec::with_capacity(HISTORY_SIZE),
+            tilemap_undo_cache: vec![0; map.data.xsize() * map.data.ysize()],
+            tilemap_undo_cache_layer: 0,
+        })
+    }
+}
+
+impl luminol_core::Tab for Tab {
+    fn name(&self, update_state: &luminol_core::UpdateState<'_>) -> String {
+        let map_infos = update_state.data.map_infos();
+        format!("Map {}: {}", self.id, map_infos[&self.id].name)
+    }
+
+    fn id(&self) -> egui::Id {
+        egui::Id::new("luminol_map").with(self.id)
+    }
+
+    fn force_close(&mut self) -> bool {
+        self.force_close
+    }
+
+    fn show(&mut self, ui: &mut egui::Ui, update_state: &mut luminol_core::UpdateState<'_>) {
+        // Display the toolbar.
+        egui::TopBottomPanel::top(format!("map_{}_toolbar", self.id)).show_inside(ui, |ui| {
+            ui.horizontal_wrapped(|ui| {
+                ui.add(
+                    egui::Slider::new(&mut self.view.scale, 15.0..=300.)
+                        .text("Scale")
+                        .fixed_decimals(0),
+                );
+
+                ui.separator();
+
+                ui.menu_button(
+                    // Format the text based on what layer is selected.
+                    match self.view.selected_layer {
+                        luminol_components::SelectedLayer::Events => "Events ⏷".to_string(),
+                        luminol_components::SelectedLayer::Tiles(layer) => {
+                            format!("Layer {} ⏷", layer + 1)
+                        }
+                    },
+                    |ui| {
+                        // TODO: Add layer enable button
+                        // Display all layers.
+                        ui.columns(2, |columns| {
+                            columns[1].visuals_mut().button_frame = true;
+                            columns[0].label(egui::RichText::new("Panorama").underline());
+                            columns[1].checkbox(&mut self.view.map.pano_enabled, "👁");
+
+                            for (index, layer) in
+                                self.view.map.enabled_layers.iter_mut().enumerate()
+                            {
+                                columns[0].selectable_value(
+                                    &mut self.view.selected_layer,
+                                    luminol_components::SelectedLayer::Tiles(index),
+                                    format!("Layer {}", index + 1),
+                                );
+                                columns[1].checkbox(layer, "👁");
+                            }
+
+                            // Display event layer.
+                            columns[0].selectable_value(
+                                &mut self.view.selected_layer,
+                                luminol_components::SelectedLayer::Events,
+                                egui::RichText::new("Events").italics(),
+                            );
+                            columns[1].checkbox(&mut self.view.event_enabled, "👁");
+
+                            columns[0].label(egui::RichText::new("Fog").underline());
+                            columns[1].checkbox(&mut self.view.map.fog_enabled, "👁");
+                        });
+                    },
+                );
+
+                ui.separator();
+
+                ui.checkbox(&mut self.view.visible_display, "Display Visible Area")
+                    .on_hover_text("Display the visible area in-game (640x480)");
+                ui.checkbox(&mut self.view.move_preview, "Preview event move routes")
+                    .on_hover_text("Preview event page move routes");
+                ui.checkbox(&mut self.view.snap_to_grid, "Snap to grid")
+                    .on_hover_text("Snap's the viewport to the tile grid");
+                ui.checkbox(
+                    &mut self.view.darken_unselected_layers,
+                    "Darken unselected layers",
+                )
+                .on_disabled_hover_text("Toggles darkening unselected layers");
+
+                /*
+                if ui.button("Save map preview").clicked() {
+                    self.tilemap.save_to_disk();
+                }
+
+                if map.preview_move_route.is_some()
+                && ui.button("Clear move route preview").clicked()
+                {
+                    map.preview_move_route = None;
+                }
+                */
+            });
+        });
+
+        // Display the tilepicker.
+        let spacing = ui.spacing();
+        let tilepicker_default_width = 256.
+            + 3. * spacing.window_margin.left
+            + spacing.scroll_bar_inner_margin
+            + spacing.scroll_bar_width
+            + spacing.scroll_bar_outer_margin;
+        egui::SidePanel::left(format!("map_{}_tilepicker", self.id))
+            .default_width(tilepicker_default_width)
+            .max_width(tilepicker_default_width)
+            .show_inside(ui, |ui| {
+                egui::ScrollArea::both().show_viewport(ui, |ui, rect| {
+                    self.tilepicker.ui(update_state, ui, rect);
+                    ui.separator();
+                });
+            });
+
+        egui::CentralPanel::default().show_inside(ui, |ui| {
+            egui::Frame::canvas(ui.style()).show(ui, |ui| {
+                // Get the map.
+                let mut map = update_state.data.get_map(self.id);
+
+                // Save the state of the selected layer into the cache
+                if let luminol_components::SelectedLayer::Tiles(tile_layer) =
+                    self.view.selected_layer
+                {
+                    self.layer_cache
+                        .copy_from_slice(&map.data.layer_as_slice(tile_layer));
+                }
+
+                let response = self.view.ui(
+                    ui,
+                    &update_state.graphics,
+                    &map,
+                    &self.tilepicker,
+                    self.dragging_event,
+                    self.drawing_shape,
+                    self.drawing_shape_pos,
+                    matches!(update_state.toolbar.pencil, luminol_core::Pencil::Pen),
+                );
+
+                let layers_max = map.data.zsize();
+                let map_x = self.view.cursor_pos.x as i32;
+                let map_y = self.view.cursor_pos.y as i32;
+
+                if self.dragging_event && self.view.selected_event_id.is_none() {
+                    self.dragging_event = false;
+                    self.event_drag_offset = None;
+                }
+
+                if !response.dragged_by(egui::PointerButton::Primary) {
+                    if self.drawing_shape {
+                        self.drawing_shape = false;
+                    }
+
+                    if self.drawing_shape_pos.is_some() {
+                        self.drawing_shape_pos = None;
+                        self.redo_history.clear();
+                        if self.history.len() == HISTORY_SIZE {
+                            self.history.pop_front();
+                        }
+                        self.history.push_back(HistoryEntry::Tiles {
+                            layer: self.tilemap_undo_cache_layer,
+                            delta: (0..map.data.ysize())
+                                .cartesian_product(0..map.data.xsize())
+                                .filter_map(|(y, x)| {
+                                    let old_id = self.tilemap_undo_cache[x + y * map.data.xsize()];
+                                    if map.data[(x, y, self.tilemap_undo_cache_layer)] != old_id {
+                                        Some((x, y, old_id))
+                                    } else {
+                                        None
+                                    }
+                                })
+                                .collect(),
+                        });
+                    }
+                }
+
+                if let luminol_components::SelectedLayer::Tiles(tile_layer) =
+                    self.view.selected_layer
+                {
+                    // Before drawing tiles, save the state of the current layer so we can undo it
+                    // later if we need to
+                    if response.drag_started_by(egui::PointerButton::Primary)
+                        && !ui.input(|i| i.modifiers.command)
+                    {
+                        self.tilemap_undo_cache_layer = tile_layer;
+                        for i in 0..self.layer_cache.len() {
+                            self.tilemap_undo_cache[i] = self.layer_cache[i];
+                        }
+                    }
+
+                    // Tile drawing
+                    if response.dragged_by(egui::PointerButton::Primary)
+                        && !ui.input(|i| i.modifiers.command)
+                    {
+                        self.handle_brush(
+                            map_x as usize,
+                            map_y as usize,
+                            tile_layer,
+                            update_state.toolbar.pencil,
+                            &mut map,
+                        );
+                    }
+                } else if let Some(selected_event_id) = self.view.selected_event_id {
+                    if response.double_clicked()
+                        || (response.hovered()
+                            && ui.memory(|m| m.focus().is_none())
+                            && ui.input(|i| i.key_pressed(egui::Key::Enter)))
+                    {
+                        // Double-click/press enter on events to edit them
+                        if ui.input(|i| !i.modifiers.command) {
+                            self.dragging_event = false;
+                            self.event_drag_offset = None;
+                            self.event_windows
+                                .add_window(event_edit::Window::new(selected_event_id, self.id));
+                        }
+                    }
+                    // Allow drag and drop to move events
+                    else if !self.dragging_event
+                        && self.view.selected_event_is_hovered
+                        && response.drag_started_by(egui::PointerButton::Primary)
+                    {
+                        self.dragging_event = true;
+                    } else if self.dragging_event
+                        && !response.dragged_by(egui::PointerButton::Primary)
+                    {
+                        self.dragging_event = false;
+                        self.event_drag_offset = None;
+                    }
+
+                    // Press delete or backspace to delete the selected event
+                    if response.hovered()
+                        && ui.memory(|m| m.focus().is_none())
+                        && ui.input(|i| {
+                            i.key_pressed(egui::Key::Delete) || i.key_pressed(egui::Key::Backspace)
+                        })
+                    {
+                        let event = map.events.remove(selected_event_id);
+                        let sprites = self.view.events.try_remove(selected_event_id).ok();
+                        self.redo_history.clear();
+                        if self.history.len() == HISTORY_SIZE {
+                            self.history.pop_front();
+                        }
+                        self.history
+                            .push_back(HistoryEntry::EventDeleted { event, sprites });
+                    }
+
+                    if let Some(hover_tile) = self.view.hover_tile {
+                        if self.dragging_event {
+                            if let Some(selected_event) = map.events.get(selected_event_id) {
+                                // If we just started dragging an event, save the offset between the
+                                // cursor and the event's tile so that the event will be dragged
+                                // with that offset from the cursor
+                                if self.event_drag_offset.is_none() {
+                                    self.event_drag_offset = Some(
+                                        egui::Pos2::new(
+                                            selected_event.x as f32,
+                                            selected_event.y as f32,
+                                        ) - hover_tile,
+                                    );
+
+                                    // Also save the original position of the event to the history
+                                    self.redo_history.clear();
+                                    if self.history.len() == HISTORY_SIZE {
+                                        self.history.pop_front();
+                                    }
+                                    self.history.push_back(HistoryEntry::EventMoved {
+                                        id: selected_event_id,
+                                        x: selected_event.x,
+                                        y: selected_event.y,
+                                    });
+                                };
+                            }
+
+                            if let Some(offset) = self.event_drag_offset {
+                                // If moving an event, move the dragged event's tile to the cursor
+                                // after adjusting for drag offset, unless that would put the event
+                                // on the same tile as an existing event
+                                let adjusted_hover_tile = hover_tile + offset;
+                                if !map.events.iter().any(|(_, e)| {
+                                    adjusted_hover_tile.x == e.x as f32
+                                        && adjusted_hover_tile.y == e.y as f32
+                                }) {
+                                    if let Some(selected_event) =
+                                        map.events.get_mut(selected_event_id)
+                                    {
+                                        selected_event.x = adjusted_hover_tile.x as i32;
+                                        selected_event.y = adjusted_hover_tile.y as i32;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                } else {
+                    // Double-click/press enter on an empty space to add an event
+                    // (hold shift to prevent events from being selected)
+                    if response.double_clicked()
+                        || (response.hovered()
+                            && ui.memory(|m| m.focus().is_none())
+                            && ui.input(|i| i.key_pressed(egui::Key::Enter)))
+                    {
+                        self.dragging_event = false;
+                        self.event_drag_offset = None;
+                        if let Some(id) = self.add_event(&mut map) {
+                            self.redo_history.clear();
+                            if self.history.len() == HISTORY_SIZE {
+                                self.history.pop_front();
+                            }
+                            self.history.push_back(HistoryEntry::EventCreated(id));
+                        }
+                    }
+                }
+
+                // Handle undo/redo keypresses
+                let is_dragged_by_primary = response.dragged_by(egui::PointerButton::Primary);
+                let is_undo_pressed = ui.input(|i| {
+                    i.modifiers.command && !i.modifiers.shift && i.key_pressed(egui::Key::Z)
+                });
+                let is_redo_pressed = ui.input(|i| {
+                    i.modifiers.command
+                        && (i.modifiers.shift || i.key_pressed(egui::Key::Y))
+                        && (!i.modifiers.shift || i.key_pressed(egui::Key::Z))
+                });
+                if !is_dragged_by_primary && (is_undo_pressed || is_redo_pressed) {
+                    let new_entry = match if is_undo_pressed {
+                        self.history.pop_back()
+                    } else {
+                        self.redo_history.pop()
+                    } {
+                        None => None,
+
+                        Some(HistoryEntry::Tiles { layer, mut delta }) => {
+                            for d in delta.iter_mut() {
+                                let position = (d.0, d.1, layer);
+                                let new_id = d.2;
+                                *d = (d.0, d.1, map.data[position]);
+                                map.data[position] = new_id;
+                                self.view.map.set_tile(
+                                    &update_state.graphics.render_state,
+                                    new_id,
+                                    position,
+                                );
+                            }
+                            Some(HistoryEntry::Tiles { layer, delta })
+                        }
+
+                        Some(HistoryEntry::EventMoved { id, x, y }) => {
+                            let event = map.events.get_mut(id).unwrap();
+                            let new_entry = Some(HistoryEntry::EventMoved {
+                                id,
+                                x: event.x,
+                                y: event.y,
+                            });
+                            event.x = x;
+                            event.y = y;
+                            new_entry
+                        }
+
+                        Some(HistoryEntry::EventCreated(id)) => {
+                            let event = map.events.remove(id);
+                            let sprites = self.view.events.try_remove(id).ok();
+                            Some(HistoryEntry::EventDeleted { event, sprites })
+                        }
+
+                        Some(HistoryEntry::EventDeleted { event, sprites }) => {
+                            let id = event.id;
+                            map.events.insert(id, event);
+                            if let Some(sprites) = sprites {
+                                self.view.events.insert(id, sprites);
+                            }
+                            Some(HistoryEntry::EventCreated(id))
+                        }
+                    };
+
+                    if let Some(new_entry) = new_entry {
+                        if is_undo_pressed {
+                            self.redo_history.push(new_entry);
+                        } else {
+                            self.history.push_back(new_entry);
+                        }
+                    }
+                }
+
+                for (_, event) in map.events.iter_mut() {
+                    event.extra_data.is_editor_open = false;
+                }
+
+                if let luminol_components::SelectedLayer::Tiles(tile_layer) =
+                    self.view.selected_layer
+                {
+                    // Write the buffered tile changes to the tilemap
+                    for y in 0..map.data.ysize() {
+                        for x in 0..map.data.xsize() {
+                            let position = (x, y, tile_layer);
+                            let new_tile_id = map.data[position];
+                            if new_tile_id != self.layer_cache[x + y * map.data.xsize()] {
+                                self.view.map.set_tile(
+                                    &update_state.graphics.render_state,
+                                    new_tile_id,
+                                    position,
+                                );
+                            }
+                        }
+                    }
+                }
+            })
+        });
+
+        self.event_windows.display(ui.ctx(), update_state);
+    }
+
+    fn requires_filesystem(&self) -> bool {
+        true
+    }
+}
diff --git a/crates/ui/src/tabs/map/util.rs b/crates/ui/src/tabs/map/util.rs
new file mode 100644
index 00000000..b414e8aa
--- /dev/null
+++ b/crates/ui/src/tabs/map/util.rs
@@ -0,0 +1,225 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
+//
+//     Additional permission under GNU GPL version 3 section 7
+//
+// If you modify this Program, or any covered work, by linking or combining
+// it with Steamworks API by Valve Corporation, containing parts covered by
+// terms of the Steamworks API by Valve Corporation, the licensors of this
+// Program grant you additional permission to convey the resulting work.
+
+impl super::Tab {
+    pub(super) fn recompute_autotile(
+        &self,
+        map: &luminol_data::rpg::Map,
+        position: (usize, usize, usize),
+    ) -> i16 {
+        if map.data[position] >= 384 {
+            return map.data[position];
+        }
+
+        let autotile = map.data[position] / 48;
+        if autotile == 0 {
+            return 0;
+        }
+
+        let x_array: [i8; 8] = [-1, 0, 1, 1, 1, 0, -1, -1];
+        let y_array: [i8; 8] = [-1, -1, -1, 0, 1, 1, 1, 0];
+
+        /*
+         * 765
+         * 0 4
+         * 123
+         */
+        let mut bitfield = 0u8;
+
+        // Loop through the 8 neighbors of this position
+        for (x, y) in x_array.into_iter().zip(y_array.into_iter()) {
+            bitfield <<= 1;
+            // Out-of-bounds tiles always count as valid neighbors
+            let is_out_of_bounds = ((x == -1 && position.0 == 0)
+                || (x == 1 && position.0 + 1 == map.data.xsize()))
+                || ((y == -1 && position.1 == 0) || (y == 1 && position.1 + 1 == map.data.ysize()));
+            // Otherwise, we only consider neighbors that are autotiles of the same type
+            let is_same_autotile = !is_out_of_bounds
+                && map.data[(
+                    if x == -1 {
+                        position.0 - 1
+                    } else {
+                        position.0 + x as usize
+                    },
+                    if y == -1 {
+                        position.1 - 1
+                    } else {
+                        position.1 + y as usize
+                    },
+                    position.2,
+                )] / 48
+                    == autotile;
+
+            if is_out_of_bounds || is_same_autotile {
+                bitfield |= 1
+            }
+        }
+
+        // Check how many edges have valid neighbors
+        autotile * 48
+            + match (bitfield & 0b01010101).count_ones() {
+                4 => {
+                    // If the autotile is surrounded on all 4 edges,
+                    // then the autotile variant is one of the first 16,
+                    // depending on which corners are surrounded
+                    let tl = (bitfield & 0b10000000 == 0) as u8;
+                    let tr = (bitfield & 0b00100000 == 0) as u8;
+                    let br = (bitfield & 0b00001000 == 0) as u8;
+                    let bl = (bitfield & 0b00000010 == 0) as u8;
+                    tl | (tr << 1) | (br << 2) | (bl << 3)
+                }
+
+                3 => {
+                    // Rotate the bitfield 90 degrees counterclockwise until
+                    // the one edge that is not surrounded is at the left
+                    let mut bitfield = bitfield;
+                    let mut i = 16u8;
+                    while bitfield & 0b00000001 != 0 {
+                        bitfield = bitfield.rotate_left(2);
+                        i += 4;
+                    }
+                    // Now, the variant is one of the next 16
+                    let tr = (bitfield & 0b00100000 == 0) as u8;
+                    let br = (bitfield & 0b00001000 == 0) as u8;
+                    i + (tr | (br << 1))
+                }
+
+                // Top and bottom edges
+                2 if bitfield & 0b01000100 == 0b01000100 => 32,
+
+                // Left and right edges
+                2 if bitfield & 0b00010001 == 0b00010001 => 33,
+
+                2 => {
+                    // Rotate the bitfield 90 degrees counterclockwise until
+                    // the two edges that are surrounded are at the right and bottom
+                    let mut bitfield = bitfield;
+                    let mut i = 34u8;
+                    while bitfield & 0b00010100 != 0b00010100 {
+                        bitfield = bitfield.rotate_left(2);
+                        i += 2;
+                    }
+                    let br = (bitfield & 0b00001000 == 0) as u8;
+                    i + br
+                }
+
+                1 => {
+                    // Rotate the bitfield 90 degrees clockwise until
+                    // the edge is at the bottom
+                    let mut bitfield = bitfield;
+                    let mut i = 42u8;
+                    while bitfield & 0b00000100 == 0 {
+                        bitfield = bitfield.rotate_right(2);
+                        i += 1;
+                    }
+                    i
+                }
+
+                0 => 46,
+
+                _ => unreachable!(),
+            } as i16
+    }
+
+    pub(super) fn set_tile(
+        &self,
+        map: &mut luminol_data::rpg::Map,
+        tile: luminol_components::SelectedTile,
+        position: (usize, usize, usize),
+    ) {
+        map.data[position] = tile.to_id();
+
+        for y in -1i8..=1i8 {
+            for x in -1i8..=1i8 {
+                // Don't check tiles that are out of bounds
+                if ((x == -1 && position.0 == 0) || (x == 1 && position.0 + 1 == map.data.xsize()))
+                    || ((y == -1 && position.1 == 0)
+                        || (y == 1 && position.1 + 1 == map.data.ysize()))
+                {
+                    continue;
+                }
+                let position = (
+                    if x == -1 {
+                        position.0 - 1
+                    } else {
+                        position.0 + x as usize
+                    },
+                    if y == -1 {
+                        position.1 - 1
+                    } else {
+                        position.1 + y as usize
+                    },
+                    position.2,
+                );
+                let tile_id = self.recompute_autotile(map, position);
+                map.data[position] = tile_id;
+            }
+        }
+    }
+
+    pub(super) fn add_event(&mut self, map: &mut luminol_data::rpg::Map) -> Option<usize> {
+        let mut first_vacant_id = 1;
+        let mut max_event_id = 0;
+
+        for (_, event) in map.events.iter() {
+            if event.id == first_vacant_id {
+                first_vacant_id += 1;
+            }
+            max_event_id = event.id;
+
+            if event.x == self.view.cursor_pos.x as i32 && event.y == self.view.cursor_pos.y as i32
+            {
+                return None;
+            }
+        }
+
+        // Try first to allocate the event number directly after the current highest one.
+        // However, valid event number range in RPG Maker XP and VX is 1-999.
+        let new_event_id = if max_event_id < 999 {
+            max_event_id + 1
+        }
+        // Otherwise, we'll try to use a non-allocated event ID that isn't zero.
+        else if first_vacant_id <= 999 {
+            first_vacant_id
+        } else {
+            return None;
+        };
+
+        map.events.insert(
+            new_event_id,
+            luminol_data::rpg::Event::new(
+                self.view.cursor_pos.x as i32,
+                self.view.cursor_pos.y as i32,
+                new_event_id,
+            ),
+        );
+
+        self.event_windows
+            .add_window(crate::windows::event_edit::Window::new(
+                new_event_id,
+                self.id,
+            ));
+        Some(new_event_id)
+    }
+}
diff --git a/src/tabs/mod.rs b/crates/ui/src/tabs/mod.rs
similarity index 95%
rename from src/tabs/mod.rs
rename to crates/ui/src/tabs/mod.rs
index 572401da..2f1392bf 100644
--- a/src/tabs/mod.rs
+++ b/crates/ui/src/tabs/mod.rs
@@ -25,5 +25,3 @@
 pub mod map;
 /// The getting started screen.
 pub mod started;
-/// Traits and structs related to tabs.
-pub mod tab;
diff --git a/crates/ui/src/tabs/started.rs b/crates/ui/src/tabs/started.rs
new file mode 100644
index 00000000..264bd2ae
--- /dev/null
+++ b/crates/ui/src/tabs/started.rs
@@ -0,0 +1,196 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
+//
+//     Additional permission under GNU GPL version 3 section 7
+//
+// If you modify this Program, or any covered work, by linking or combining
+// it with Steamworks API by Valve Corporation, containing parts covered by
+// terms of the Steamworks API by Valve Corporation, the licensors of this
+// Program grant you additional permission to convey the resulting work.
+
+/// The Luminol "get started screen" similar to vscode's.
+#[derive(Default)]
+pub struct Tab {
+    // now this is a type
+    load_filesystem_promise: Option<poll_promise::Promise<PromiseResult>>,
+}
+
+type PromiseResult = luminol_filesystem::Result<luminol_filesystem::host::FileSystem>;
+
+// FIXME
+#[allow(unsafe_code)]
+unsafe impl Send for Tab {}
+
+impl Tab {
+    /// Create a new starting screen.
+    #[must_use]
+    pub fn new() -> Self {
+        Self::default()
+    }
+}
+
+impl luminol_core::Tab for Tab {
+    fn name(&self, update_state: &luminol_core::UpdateState<'_>) -> String {
+        "Get Started".to_string()
+    }
+
+    fn id(&self) -> egui::Id {
+        egui::Id::new("luminol_started_tab")
+    }
+
+    fn show(&mut self, ui: &mut egui::Ui, update_state: &mut luminol_core::UpdateState<'_>) {
+        ui.label(
+            egui::RichText::new("Luminol")
+                .size(40.)
+                .color(egui::Color32::LIGHT_GRAY),
+        );
+
+        ui.add_space(100.);
+
+        ui.heading("Start");
+
+        let mut filesystem_open_result = None;
+        #[cfg(target_arch = "wasm32")]
+        let mut idb_key = None;
+
+        if let Some(p) = self.load_filesystem_promise.take() {
+            match p.try_take() {
+                Ok(Ok(host)) => {
+                    #[cfg(target_arch = "wasm32")]
+                    {
+                        idb_key = host.idb_key().map(str::to_string);
+                    }
+
+                    filesystem_open_result = Some(update_state.filesystem.load_project(
+                        host,
+                        update_state.project_config,
+                        update_state.global_config,
+                    ));
+                }
+                Ok(Err(error)) => update_state.toasts.error(error.to_string()),
+                Err(p) => self.load_filesystem_promise = Some(p),
+            }
+
+            ui.spinner();
+        }
+
+        ui.add_enabled_ui(self.load_filesystem_promise.is_none(), |ui| {
+            if ui
+                .button(egui::RichText::new("New Project").size(20.))
+                .clicked()
+            {
+                update_state
+                    .edit_windows
+                    .add_window(crate::windows::new_project::Window::default());
+            }
+            if ui
+                .button(egui::RichText::new("Open Project").size(20.))
+                .clicked()
+            {
+                // maybe worthwhile to make an extension trait to select spawn_async or spawn_local based on the target?
+                #[cfg(not(target_arch = "wasm32"))]
+                {
+                    self.load_filesystem_promise = Some(poll_promise::Promise::spawn_async(
+                        luminol_filesystem::host::FileSystem::from_file_picker(),
+                    ));
+                }
+                #[cfg(target_arch = "wasm32")]
+                {
+                    self.load_filesystem_promise = Some(poll_promise::Promise::spawn_local(
+                        luminol_filesystem::host::FileSystem::from_folder_picker(),
+                    ));
+                }
+            }
+        });
+
+        ui.add_space(100.);
+
+        ui.heading("Recent");
+
+        // FIXME this logic is shared with the top bar
+        // We should probably join the two
+        for path in update_state.global_config.recent_projects.clone() {
+            #[cfg(target_arch = "wasm32")]
+            let (path, idb_key) = path;
+
+            if ui.button(&path).clicked() {
+                #[cfg(not(target_arch = "wasm32"))]
+                {
+                    filesystem_open_result = Some(update_state.filesystem.load_project_from_path(
+                        update_state.project_config,
+                        update_state.global_config,
+                        path,
+                    ));
+                }
+
+                #[cfg(target_arch = "wasm32")]
+                {
+                    self.load_filesystem_promise = Some(poll_promise::Promise::spawn_local(
+                        luminol_filesystem::host::FileSystem::from_idb_key(idb_key),
+                    ));
+                }
+            }
+        }
+
+        match filesystem_open_result {
+            Some(Ok(load_result)) => {
+                for missing_rtp in load_result.missing_rtps {
+                    update_state.toasts.warning(format!(
+                        "Failed to find suitable path for the RTP {missing_rtp}"
+                    ));
+                    #[cfg(not(target_arch = "wasm32"))]
+                    update_state
+                        .toasts
+                        .info(format!("You may want to set an RTP path for {missing_rtp}"));
+                    #[cfg(target_arch = "wasm32")]
+                    update_state
+                        .toasts
+                        .info(format!("Please place the {missing_rtp} RTP in the 'RTP/{missing_rtp}' subdirectory in your project directory"));
+                }
+
+                if let Err(why) = update_state.data.load(
+                    update_state.filesystem,
+                    update_state.project_config.as_mut().unwrap(),
+                ) {
+                    update_state
+                        .toasts
+                        .error(format!("Error loading the project data: {why}"));
+
+                    #[cfg(target_arch = "wasm32")]
+                    idb_key.map(luminol_filesystem::host::FileSystem::idb_drop);
+                } else {
+                    update_state.toasts.info(format!(
+                        "Successfully opened {:?}",
+                        update_state
+                            .filesystem
+                            .project_path()
+                            .expect("project not open")
+                    ));
+                }
+            }
+            Some(Err(why)) => {
+                update_state
+                    .toasts
+                    .error(format!("Error opening the project: {why}"));
+
+                #[cfg(target_arch = "wasm32")]
+                idb_key.map(luminol_filesystem::host::FileSystem::idb_drop);
+            }
+            None => {}
+        }
+    }
+}
diff --git a/src/windows/about.rs b/crates/ui/src/windows/about.rs
similarity index 91%
rename from src/windows/about.rs
rename to crates/ui/src/windows/about.rs
index 081e0678..34464ac1 100644
--- a/src/windows/about.rs
+++ b/crates/ui/src/windows/about.rs
@@ -28,19 +28,21 @@ pub struct Window {
     icon: egui_extras::RetainedImage,
 }
 
+const ICON: &[u8] = include_bytes!("../../../../assets/icon-256.png");
+
 impl Default for Window {
     fn default() -> Self {
         Self {
             // We load the icon here so it isn't loaded every frame. That would be bad if we did.
             // It would be better to load the image at compile time and only use one image instance
             // (as we load the image once at start for the icon) but this is the best I can do.
-            icon: egui_extras::RetainedImage::from_image_bytes("icon", crate::ICON)
+            icon: egui_extras::RetainedImage::from_image_bytes("icon", ICON)
                 .expect("Failed to load Icon data."),
         }
     }
 }
 
-impl super::window::Window for Window {
+impl luminol_core::Window for Window {
     fn name(&self) -> String {
         "About".to_string()
     }
@@ -49,7 +51,12 @@ impl super::window::Window for Window {
         egui::Id::new("About Luminol")
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
+    fn show(
+        &mut self,
+        ctx: &egui::Context,
+        open: &mut bool,
+        update_state: &mut luminol_core::UpdateState<'_>,
+    ) {
         // Show the window. Name it "About Luminol"
         egui::Window::new("About Luminol")
             // Open is passed in. egui sets it to false if the window is closed.
diff --git a/src/windows/appearance.rs b/crates/ui/src/windows/appearance.rs
similarity index 79%
rename from src/windows/appearance.rs
rename to crates/ui/src/windows/appearance.rs
index 73f2e645..4b78e927 100644
--- a/src/windows/appearance.rs
+++ b/crates/ui/src/windows/appearance.rs
@@ -21,14 +21,15 @@
 // it with Steamworks API by Valve Corporation, containing parts covered by
 // terms of the Steamworks API by Valve Corporation, the licensors of this
 // Program grant you additional permission to convey the resulting work.
-use crate::prelude::*;
+
+use strum::IntoEnumIterator;
 
 #[derive(Default)]
 pub struct Window {
     egui_settings_open: bool,
 }
 
-impl super::Window for Window {
+impl luminol_core::Window for Window {
     fn id(&self) -> egui::Id {
         egui::Id::new("luminol_appearance_window")
     }
@@ -37,7 +38,12 @@ impl super::Window for Window {
         "Luminol Appearance".to_string()
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
+    fn show(
+        &mut self,
+        ctx: &egui::Context,
+        open: &mut bool,
+        update_state: &mut luminol_core::UpdateState<'_>,
+    ) {
         egui::Window::new(self.name()).open(open).show(ctx, |ui| {
             // Or these together so if one OR the other is true the window shows.
             self.egui_settings_open =
@@ -58,14 +64,19 @@ impl super::Window for Window {
                 }
             });
 
-            let theme = &mut global_config!().theme;
             ui.menu_button("Code Theme", |ui| {
-                theme.ui(ui);
+                for t in luminol_config::SyntectTheme::iter() {
+                    ui.radio_value(
+                        &mut update_state.global_config.theme.syntect_theme,
+                        t,
+                        t.to_string(),
+                    );
+                }
 
                 ui.label("Code sample");
-                ui.label(syntax_highlighting::highlight(
+                ui.label(luminol_components::syntax_highlighting::highlight(
                     ui.ctx(),
-                    *theme,
+                    update_state.global_config.theme,
                     r#"
                         class Foo < Array 
                         end
@@ -85,8 +96,8 @@ impl super::Window for Window {
                 )
                 .clicked()
             {
-                state!().image_cache.clear();
-                state!().atlas_cache.clear();
+                update_state.graphics.image_cache.clear();
+                update_state.graphics.atlas_cache.clear();
             }
         });
     }
diff --git a/src/command_gen/mod.rs b/crates/ui/src/windows/command_gen/mod.rs
similarity index 96%
rename from src/command_gen/mod.rs
rename to crates/ui/src/windows/command_gen/mod.rs
index 1e30f480..7cb6fef8 100644
--- a/src/command_gen/mod.rs
+++ b/crates/ui/src/windows/command_gen/mod.rs
@@ -14,12 +14,10 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
-use command_lib::{CommandDescription, CommandKind, Index, Parameter};
+use super::{CommandDescription, CommandKind, Index, Parameter};
 
 use ui_example::UiExample;
 
-use crate::prelude::*;
-
 pub mod parameter_ui;
 pub mod ui_example;
 
@@ -28,15 +26,6 @@ pub struct CommandGeneratorWindow {
     ui_examples: Vec<UiExample>,
 }
 
-impl Default for CommandGeneratorWindow {
-    fn default() -> Self {
-        Self {
-            commands: command_db!().user.clone(),
-            ui_examples: vec![],
-        }
-    }
-}
-
 impl CommandGeneratorWindow {
     /// Updates all of the parameter indexes, if they are assumed
     fn recalculate_parameter_index(parameter: &mut Parameter, passed_index: &mut u8) {
@@ -80,7 +69,7 @@ impl CommandGeneratorWindow {
     }
 }
 
-impl window::Window for CommandGeneratorWindow {
+impl luminol_core::window::Window for CommandGeneratorWindow {
     fn name(&self) -> String {
         String::from("Luminol Command Maker")
     }
diff --git a/src/command_gen/parameter_ui.rs b/crates/ui/src/windows/command_gen/parameter_ui.rs
similarity index 100%
rename from src/command_gen/parameter_ui.rs
rename to crates/ui/src/windows/command_gen/parameter_ui.rs
diff --git a/src/command_gen/ui_example.rs b/crates/ui/src/windows/command_gen/ui_example.rs
similarity index 100%
rename from src/command_gen/ui_example.rs
rename to crates/ui/src/windows/command_gen/ui_example.rs
diff --git a/src/windows/common_event_edit.rs b/crates/ui/src/windows/common_event_edit.rs
similarity index 75%
rename from src/windows/common_event_edit.rs
rename to crates/ui/src/windows/common_event_edit.rs
index 7b4a972b..889547e6 100644
--- a/src/windows/common_event_edit.rs
+++ b/crates/ui/src/windows/common_event_edit.rs
@@ -22,24 +22,24 @@
 // terms of the Steamworks API by Valve Corporation, the licensors of this
 // Program grant you additional permission to convey the resulting work.
 
-use crate::prelude::*;
+use luminol_core::Modal;
 
 /// The common event editor.
 pub struct Window {
-    tabs: tab::Tabs<CommonEventTab>,
+    tabs: luminol_core::Tabs,
     selected_id: usize,
 }
 
 impl Default for Window {
     fn default() -> Self {
         Self {
-            tabs: tab::Tabs::new("common_event_tabs", vec![]),
+            tabs: luminol_core::Tabs::new("common_event_tabs"),
             selected_id: 0,
         }
     }
 }
 
-impl window::Window for Window {
+impl luminol_core::Window for Window {
     fn name(&self) -> String {
         self.tabs
             .focused_name()
@@ -52,14 +52,19 @@ impl window::Window for Window {
         egui::Id::new("Common Events")
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
+    fn show(
+        &mut self,
+        ctx: &egui::Context,
+        open: &mut bool,
+        update_state: &mut luminol_core::UpdateState<'_>,
+    ) {
         egui::Window::new(self.name())
             .default_width(500.)
             .id(egui::Id::new("common_events_edit"))
             .open(open)
             .show(ctx, |ui| {
                 egui::SidePanel::left("common_events_side_panel").show_inside(ui, |ui| {
-                    let common_events = state!().data_cache.common_events();
+                    let common_events = update_state.data.common_events();
 
                     egui::ScrollArea::both().auto_shrink([false; 2]).show_rows(
                         ui,
@@ -82,10 +87,10 @@ impl window::Window for Window {
                                     self.tabs.add_tab(CommonEventTab {
                                         event: event.clone(),
                                         force_close: false,
-                                        switch_open: false,
-                                        command_view: CommandView::new(format!(
-                                            "common_event_{ele}"
-                                        )),
+                                        switch_modal: None,
+                                        command_view: luminol_components::CommandView::new(
+                                            format!("common_event_{ele}"),
+                                        ),
                                     });
                                 }
                             }
@@ -93,7 +98,7 @@ impl window::Window for Window {
                     );
                 });
 
-                self.tabs.ui(ui);
+                self.tabs.ui(ui, update_state);
             });
     }
 
@@ -103,14 +108,14 @@ impl window::Window for Window {
 }
 
 struct CommonEventTab {
-    event: rpg::CommonEvent,
+    event: luminol_data::rpg::CommonEvent,
     force_close: bool,
-    switch_open: bool,
-    command_view: CommandView,
+    switch_modal: Option<luminol_modals::switch::Modal>,
+    command_view: luminol_components::CommandView,
 }
 
-impl tab::Tab for CommonEventTab {
-    fn name(&self) -> String {
+impl luminol_core::Tab for CommonEventTab {
+    fn name(&self, update_state: &luminol_core::UpdateState<'_>) -> String {
         format!("{}: {}", self.event.name, self.event.id)
     }
 
@@ -118,7 +123,7 @@ impl tab::Tab for CommonEventTab {
         egui::Id::new("luminol_common_event").with(self.event.id)
     }
 
-    fn show(&mut self, ui: &mut egui::Ui) {
+    fn show(&mut self, ui: &mut egui::Ui, update_state: &mut luminol_core::UpdateState<'_>) {
         ui.horizontal(|ui| {
             let trigger_types = ["None", "Autorun", "Parallel"];
             egui::ComboBox::new(format!("common_event_{}_trigger", self.event.id), "Trigger")
@@ -130,8 +135,12 @@ impl tab::Tab for CommonEventTab {
                 });
 
             ui.add_enabled_ui(self.event.trigger > 0, |ui| {
-                switch::Modal::new(format!("common_event_{}_trigger_switch", self.event.id).into())
-                    .button(ui, &mut self.switch_open, &mut self.event.switch_id)
+                luminol_modals::switch::Modal::button(
+                    &mut self.switch_modal,
+                    ui,
+                    &mut self.event.switch_id,
+                    update_state,
+                );
             });
 
             let mut save_event = false;
@@ -150,7 +159,7 @@ impl tab::Tab for CommonEventTab {
             }
 
             if save_event {
-                let mut common_events = state!().data_cache.common_events();
+                let mut common_events = update_state.data.common_events();
 
                 common_events[self.event.id - 1] = self.event.clone();
             }
@@ -164,8 +173,11 @@ impl tab::Tab for CommonEventTab {
         egui::ScrollArea::both()
             .auto_shrink([false; 2])
             .show(ui, |ui| {
-                self.command_view
-                    .ui(ui, &command_db!(), &mut self.event.list);
+                self.command_view.ui(
+                    ui,
+                    &update_state.project_config.as_ref().unwrap().command_db,
+                    &mut self.event.list,
+                );
             });
     }
 
diff --git a/src/windows/config_window.rs b/crates/ui/src/windows/config_window.rs
similarity index 64%
rename from src/windows/config_window.rs
rename to crates/ui/src/windows/config_window.rs
index 58e5ae81..0839d76a 100644
--- a/src/windows/config_window.rs
+++ b/crates/ui/src/windows/config_window.rs
@@ -22,14 +22,14 @@
 // terms of the Steamworks API by Valve Corporation, the licensors of this
 // Program grant you additional permission to convey the resulting work.
 
-use crate::prelude::*;
+use strum::IntoEnumIterator;
 
 /// The confg window
 pub struct Window {}
 
 impl Window {}
 
-impl window::Window for Window {
+impl luminol_core::Window for Window {
     fn name(&self) -> String {
         "Local Luminol Config".to_string()
     }
@@ -38,25 +38,36 @@ impl window::Window for Window {
         egui::Id::new("Local Luminol Config")
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
+    fn show(
+        &mut self,
+        ctx: &egui::Context,
+        open: &mut bool,
+        update_state: &mut luminol_core::UpdateState<'_>,
+    ) {
         egui::Window::new(self.name()).open(open).show(ctx, |ui| {
-            let mut config = project_config!();
+            let config = update_state
+                .project_config
+                .as_mut()
+                .expect("project not open");
 
             ui.label("Project name");
-            ui.text_edit_singleline(&mut config.project_name);
+            ui.text_edit_singleline(&mut config.project.project_name);
             ui.label("Scripts path");
-            ui.text_edit_singleline(&mut config.scripts_path);
-            ui.checkbox(&mut config.use_ron, "Use RON (Rusty Object Notation)");
+            ui.text_edit_singleline(&mut config.project.scripts_path);
+            ui.checkbox(
+                &mut config.project.use_ron,
+                "Use RON (Rusty Object Notation)",
+            );
             egui::ComboBox::from_label("RGSS Version")
-                .selected_text(config.rgss_ver.to_string())
+                .selected_text(config.project.rgss_ver.to_string())
                 .show_ui(ui, |ui| {
-                    for ver in config::RGSSVer::iter() {
-                        ui.selectable_value(&mut config.rgss_ver, ver, ver.to_string());
+                    for ver in luminol_config::RGSSVer::iter() {
+                        ui.selectable_value(&mut config.project.rgss_ver, ver, ver.to_string());
                     }
                 });
 
             ui.label("Playtest Executable");
-            ui.text_edit_singleline(&mut config.playtest_exe);
+            ui.text_edit_singleline(&mut config.project.playtest_exe);
         });
     }
 
diff --git a/src/windows/console.rs b/crates/ui/src/windows/console.rs
similarity index 87%
rename from src/windows/console.rs
rename to crates/ui/src/windows/console.rs
index 831a86db..bc88491b 100644
--- a/src/windows/console.rs
+++ b/crates/ui/src/windows/console.rs
@@ -22,11 +22,11 @@
 // terms of the Steamworks API by Valve Corporation, the licensors of this
 // Program grant you additional permission to convey the resulting work.
 
-pub struct Console {
+pub struct Window {
     term: luminol_term::Terminal,
 }
 
-impl Console {
+impl Window {
     pub fn new(command: luminol_term::CommandBuilder) -> Result<Self, luminol_term::Error> {
         Ok(Self {
             term: luminol_term::Terminal::new(command)?,
@@ -34,7 +34,7 @@ impl Console {
     }
 }
 
-impl super::window::Window for Console {
+impl luminol_core::Window for Window {
     fn name(&self) -> String {
         self.term.title()
     }
@@ -47,14 +47,19 @@ impl super::window::Window for Console {
         true
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
+    fn show(
+        &mut self,
+        ctx: &egui::Context,
+        open: &mut bool,
+        update_state: &mut luminol_core::UpdateState<'_>,
+    ) {
         egui::Window::new(self.name())
             .id(self.term.id())
             .open(open)
             .resizable(false)
             .show(ctx, |ui| {
                 if let Err(e) = self.term.ui(ui) {
-                    crate::state!()
+                    update_state
                         .toasts
                         .error(format!("error displaying terminal: {e:?}"));
                 }
diff --git a/crates/ui/src/windows/event_edit.rs b/crates/ui/src/windows/event_edit.rs
new file mode 100644
index 00000000..30930157
--- /dev/null
+++ b/crates/ui/src/windows/event_edit.rs
@@ -0,0 +1,81 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
+//
+//     Additional permission under GNU GPL version 3 section 7
+//
+// If you modify this Program, or any covered work, by linking or combining
+// it with Steamworks API by Valve Corporation, containing parts covered by
+// terms of the Steamworks API by Valve Corporation, the licensors of this
+// Program grant you additional permission to convey the resulting work.
+
+use luminol_core::Modal;
+
+/// The event editor window.
+pub struct Window {
+    id: usize,
+    map_id: usize,
+    selected_page: usize,
+    name: String,
+    viewed_tab: u8,
+
+    switch_modal_1: Option<luminol_modals::switch::Modal>,
+    switch_modal_2: Option<luminol_modals::switch::Modal>,
+    variable_modal: Option<luminol_modals::variable::Modal>,
+}
+
+impl Window {
+    /// Create a new event editor.
+    pub fn new(id: usize, map_id: usize) -> Self {
+        Self {
+            id,
+            map_id,
+            selected_page: 0,
+            name: String::from("(unknown)"),
+            viewed_tab: 2,
+
+            switch_modal_1: None,
+            switch_modal_2: None,
+            variable_modal: None,
+        }
+    }
+}
+
+impl luminol_core::Window for Window {
+    fn name(&self) -> String {
+        format!("Event: {}, {} in Map {}", self.name, self.id, self.map_id)
+    }
+
+    fn id(&self) -> egui::Id {
+        egui::Id::new("luminol_event_edit")
+            .with(self.map_id)
+            .with(self.id)
+    }
+
+    // This needs an overhaul
+    fn show(
+        &mut self,
+        ctx: &egui::Context,
+        open: &mut bool,
+        update_state: &mut luminol_core::UpdateState<'_>,
+    ) {
+        todo!()
+    }
+
+    fn requires_filesystem(&self) -> bool {
+        true
+    }
+}
diff --git a/src/windows/global_config_window.rs b/crates/ui/src/windows/global_config_window.rs
similarity index 87%
rename from src/windows/global_config_window.rs
rename to crates/ui/src/windows/global_config_window.rs
index 4a62973e..e8fa7ddd 100644
--- a/src/windows/global_config_window.rs
+++ b/crates/ui/src/windows/global_config_window.rs
@@ -25,7 +25,7 @@
 #[derive(Default)]
 pub struct Window {}
 
-impl super::Window for Window {
+impl luminol_core::Window for Window {
     fn name(&self) -> String {
         "Luminol Preferences".to_string()
     }
@@ -34,7 +34,12 @@ impl super::Window for Window {
         egui::Id::new("luminol_preferences_window")
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
+    fn show(
+        &mut self,
+        ctx: &egui::Context,
+        open: &mut bool,
+        update_state: &mut luminol_core::UpdateState<'_>,
+    ) {
         egui::Window::new(self.name()).open(open).show(ctx, |ui| {});
     }
 }
diff --git a/src/windows/items.rs b/crates/ui/src/windows/items.rs
similarity index 78%
rename from src/windows/items.rs
rename to crates/ui/src/windows/items.rs
index 1f1dd1df..db1b4cec 100644
--- a/src/windows/items.rs
+++ b/crates/ui/src/windows/items.rs
@@ -22,39 +22,37 @@
 // terms of the Steamworks API by Valve Corporation, the licensors of this
 // Program grant you additional permission to convey the resulting work.
 
-use crate::prelude::*;
+use luminol_core::Modal;
 
 /// Database - Items management window.
 pub struct Window {
     // ? Items ?
-    items: rpg::Items,
+    items: luminol_data::rpg::Items,
     selected_item: usize,
 
     // ? Icon Graphic Picker ?
-    icon_picker_open: bool,
+    icon_picker: Option<luminol_modals::graphic_picker::Modal>,
 
     // ? Menu Sound Effect Picker ?
-    menu_se_picker: sound_test::SoundTab,
-    menu_se_picker_open: bool,
+    menu_se_picker: Option<luminol_modals::sound_picker::Modal>,
 }
 
-impl Default for Window {
-    fn default() -> Self {
-        let items = state!().data_cache.items().clone();
+impl Window {
+    pub fn new(data_cache: &luminol_core::Data) -> Self {
+        let items = data_cache.items().clone();
 
         Self {
             items,
             selected_item: 0,
 
-            icon_picker_open: false,
+            icon_picker: None,
 
-            menu_se_picker: sound_test::SoundTab::new(crate::audio::Source::SE, true),
-            menu_se_picker_open: false,
+            menu_se_picker: None,
         }
     }
 }
 
-impl window::Window for Window {
+impl luminol_core::Window for Window {
     fn name(&self) -> String {
         format!("Editing item {}", self.items[self.selected_item].name)
     }
@@ -67,11 +65,16 @@ impl window::Window for Window {
         true
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
+    fn show(
+        &mut self,
+        ctx: &egui::Context,
+        open: &mut bool,
+        update_state: &mut luminol_core::UpdateState<'_>,
+    ) {
         let _selected_item = &self.items[self.selected_item];
-        let animations = state!().data_cache.animations();
+        let animations = update_state.data.animations();
 
-        let common_events = state!().data_cache.common_events();
+        let common_events = update_state.data.common_events();
 
         /*#[allow(clippy::cast_sign_loss)]
         if animations
@@ -113,14 +116,14 @@ impl window::Window for Window {
                 });
                 let selected_item = &mut self.items[self.selected_item];
                 egui::Grid::new("item_edit_central_grid").show(ui, |ui| {
-                    ui.add(Field::new(
+                    ui.add(luminol_components::Field::new(
                         "Name",
                         egui::TextEdit::singleline(&mut selected_item.name),
                     ));
 
                     ui.end_row();
 
-                    ui.add(Field::new(
+                    ui.add(luminol_components::Field::new(
                         "Description",
                         egui::TextEdit::singleline(&mut selected_item.description),
                     ));
@@ -128,14 +131,6 @@ impl window::Window for Window {
 
                     egui::Grid::new("item_edit_central_left_grid").show(ui, |_ui| {});
                 });
-
-                if self.menu_se_picker_open {
-                    egui::Window::new("Menu Sound Effect Picker")
-                        .id(egui::Id::new("menu_se_picker"))
-                        .show(ctx, |ui| {
-                            self.menu_se_picker.ui(ui);
-                        });
-                }
             });
     }
 }
diff --git a/src/windows/map_picker.rs b/crates/ui/src/windows/map_picker.rs
similarity index 78%
rename from src/windows/map_picker.rs
rename to crates/ui/src/windows/map_picker.rs
index 80d01c41..f4c63adb 100644
--- a/src/windows/map_picker.rs
+++ b/crates/ui/src/windows/map_picker.rs
@@ -22,7 +22,6 @@
 // terms of the Steamworks API by Valve Corporation, the licensors of this
 // Program grant you additional permission to convey the resulting work.
 
-use crate::prelude::*;
 use std::collections::{BTreeMap, BTreeSet};
 
 /// The map picker window.
@@ -35,7 +34,8 @@ impl Window {
     fn render_submap(
         id: usize,
         children_data: &BTreeMap<usize, BTreeSet<usize>>,
-        mapinfos: &mut rpg::MapInfos,
+        mapinfos: &mut luminol_data::rpg::MapInfos,
+        open_map_id: &mut Option<usize>,
         ui: &mut egui::Ui,
     ) {
         // We get the map name. It's assumed that there is in fact a map with this ID in mapinfos.
@@ -57,13 +57,13 @@ impl Window {
                 .show_header(ui, |ui| {
                     // Has the user
                     if ui.text_edit_singleline(&mut map_info.name).double_clicked() {
-                        Self::create_map_tab(id);
+                        *open_map_id = Some(id)
                     }
                 })
                 .body(|ui| {
                     for id in children_data.get(&id).unwrap() {
                         // Render children.
-                        Self::render_submap(*id, children_data, mapinfos, ui);
+                        Self::render_submap(*id, children_data, mapinfos, open_map_id, ui);
                     }
                 });
         } else {
@@ -71,26 +71,24 @@ impl Window {
             ui.horizontal(|ui| {
                 ui.add_space(ui.spacing().indent);
                 if ui.text_edit_singleline(&mut map_info.name).double_clicked() {
-                    Self::create_map_tab(id);
+                    *open_map_id = Some(id)
                 }
             });
         }
     }
-
-    fn create_map_tab(id: usize) {
-        match map::Tab::new(id) {
-            Ok(m) => state!().tabs.add_tab(Box::new(m)),
-            Err(e) => state!().toasts.error(e),
-        }
-    }
 }
 
-impl window::Window for Window {
+impl luminol_core::Window for Window {
     fn id(&self) -> egui::Id {
         egui::Id::new("Map Picker")
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
+    fn show(
+        &mut self,
+        ctx: &egui::Context,
+        open: &mut bool,
+        update_state: &mut luminol_core::UpdateState<'_>,
+    ) {
         let mut window_open = true;
         egui::Window::new("Map Picker")
             .open(&mut window_open)
@@ -99,7 +97,7 @@ impl window::Window for Window {
                     .auto_shrink([false; 2])
                     .show(ui, |ui| {
                         // Aquire the data cache.
-                        let mut mapinfos = state!().data_cache.mapinfos();
+                        let mut mapinfos = update_state.data.map_infos();
 
                         // We preprocess maps to figure out what has nodes and what doesn't.
                         // This should result in an ordered hashmap of all the maps and their children.
@@ -112,6 +110,8 @@ impl window::Window for Window {
                         }
                         children_data.entry(0).or_default(); // If there is no `0` entry (i.e. there are no maps) then add one.
 
+                        let mut open_map_id = None;
+
                         // Now we can actually render all maps.
                         egui::CollapsingHeader::new("root")
                             .default_open(true)
@@ -119,9 +119,24 @@ impl window::Window for Window {
                                 // There will always be a map `0`.
                                 // `0` is assumed to be the root map.
                                 for &id in children_data.get(&0).unwrap() {
-                                    Self::render_submap(id, &children_data, &mut mapinfos, ui);
+                                    Self::render_submap(
+                                        id,
+                                        &children_data,
+                                        &mut mapinfos,
+                                        &mut open_map_id,
+                                        ui,
+                                    );
                                 }
                             });
+
+                        drop(mapinfos);
+
+                        if let Some(id) = open_map_id {
+                            match crate::tabs::map::Tab::new(id, update_state) {
+                                Ok(tab) => update_state.edit_tabs.add_tab(tab),
+                                Err(e) => update_state.toasts.error(e.to_string()),
+                            }
+                        }
                     })
             });
         *open = window_open;
diff --git a/src/windows/misc.rs b/crates/ui/src/windows/misc.rs
similarity index 75%
rename from src/windows/misc.rs
rename to crates/ui/src/windows/misc.rs
index 3b4780cd..9479a8c6 100644
--- a/src/windows/misc.rs
+++ b/crates/ui/src/windows/misc.rs
@@ -22,13 +22,11 @@
 // terms of the Steamworks API by Valve Corporation, the licensors of this
 // Program grant you additional permission to convey the resulting work.
 
-use super::window::Window;
-use crate::prelude::*;
 /// Egui inspection window.
 #[derive(Default)]
 pub struct EguiInspection {}
 
-impl Window for EguiInspection {
+impl luminol_core::Window for EguiInspection {
     fn name(&self) -> String {
         "Egui Inspection".to_string()
     }
@@ -37,7 +35,12 @@ impl Window for EguiInspection {
         egui::Id::new("Egui Inspection")
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
+    fn show(
+        &mut self,
+        ctx: &egui::Context,
+        open: &mut bool,
+        update_state: &mut luminol_core::UpdateState<'_>,
+    ) {
         egui::Window::new(self.name())
             .open(open)
             .show(ctx, |ui| ctx.inspection_ui(ui));
@@ -48,7 +51,7 @@ impl Window for EguiInspection {
 #[derive(Default)]
 pub struct EguiMemory {}
 
-impl Window for EguiMemory {
+impl luminol_core::Window for EguiMemory {
     fn name(&self) -> String {
         "Egui Memory".to_string()
     }
@@ -57,7 +60,12 @@ impl Window for EguiMemory {
         egui::Id::new("Egui Memory")
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
+    fn show(
+        &mut self,
+        ctx: &egui::Context,
+        open: &mut bool,
+        update_state: &mut luminol_core::UpdateState<'_>,
+    ) {
         egui::Window::new(self.name())
             .open(open)
             .show(ctx, |ui| ctx.memory_ui(ui));
@@ -67,7 +75,7 @@ impl Window for EguiMemory {
 #[derive(Default)]
 pub struct FilesystemDebug {}
 
-impl Window for FilesystemDebug {
+impl luminol_core::Window for FilesystemDebug {
     fn name(&self) -> String {
         "Filesystem Debug".to_string()
     }
@@ -76,9 +84,14 @@ impl Window for FilesystemDebug {
         egui::Id::new("Filesystem Debug Window")
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
+    fn show(
+        &mut self,
+        ctx: &egui::Context,
+        open: &mut bool,
+        update_state: &mut luminol_core::UpdateState<'_>,
+    ) {
         egui::Window::new(self.name())
             .open(open)
-            .show(ctx, |ui| state!().filesystem.debug_ui(ui));
+            .show(ctx, |ui| update_state.filesystem.debug_ui(ui));
     }
 }
diff --git a/src/windows/mod.rs b/crates/ui/src/windows/mod.rs
similarity index 92%
rename from src/windows/mod.rs
rename to crates/ui/src/windows/mod.rs
index ac0e72e4..d6991ad1 100644
--- a/src/windows/mod.rs
+++ b/crates/ui/src/windows/mod.rs
@@ -35,8 +35,6 @@ pub mod console;
 /// The event editor.
 pub mod event_edit;
 pub mod global_config_window;
-/// The Graphic picker.
-pub mod graphic_picker;
 /// The item editor.
 pub mod items;
 /// The map picker.
@@ -49,7 +47,3 @@ pub mod new_project;
 pub mod script_edit;
 /// The sound test.
 pub mod sound_test;
-/// Traits and structs related to windows.
-pub mod window;
-
-pub use window::Window;
diff --git a/crates/ui/src/windows/new_project.rs b/crates/ui/src/windows/new_project.rs
new file mode 100644
index 00000000..b08d39e7
--- /dev/null
+++ b/crates/ui/src/windows/new_project.rs
@@ -0,0 +1,363 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
+//
+//     Additional permission under GNU GPL version 3 section 7
+//
+// If you modify this Program, or any covered work, by linking or combining
+// it with Steamworks API by Valve Corporation, containing parts covered by
+// terms of the Steamworks API by Valve Corporation, the licensors of this
+// Program grant you additional permission to convey the resulting work.
+
+use std::sync::atomic::{AtomicUsize, Ordering};
+use std::sync::Arc;
+
+use anyhow::Context;
+use luminol_filesystem::FileSystem;
+use strum::IntoEnumIterator;
+
+use std::io::Read;
+
+/// The new project window
+pub struct Window {
+    name: String,
+    rgss_ver: luminol_config::RGSSVer,
+    editor_ver: luminol_config::RMVer,
+    project_promise: Option<poll_promise::Promise<PromiseResult>>,
+    download_executable: bool,
+    progress: Arc<Progress>,
+    init_git: bool,
+    git_branch_name: String,
+}
+
+struct CreateProjectResult {
+    data_cache: luminol_core::Data,
+    config: luminol_config::project::Config,
+    host_fs: luminol_filesystem::host::FileSystem,
+}
+
+type PromiseResult = anyhow::Result<CreateProjectResult>;
+
+#[derive(Default)]
+struct Progress {
+    total_progress: AtomicUsize,
+    current_progress: AtomicUsize,
+    zip_total: AtomicUsize,
+    zip_current: AtomicUsize,
+}
+
+impl Default for Window {
+    fn default() -> Self {
+        Self {
+            name: "My Project".to_string(),
+            rgss_ver: luminol_config::RGSSVer::RGSS1,
+            editor_ver: luminol_config::RMVer::XP,
+            project_promise: None,
+            download_executable: false,
+            progress: Arc::default(),
+            init_git: false,
+            git_branch_name: "master".to_string(),
+        }
+    }
+}
+
+impl luminol_core::Window for Window {
+    fn name(&self) -> String {
+        "New Project".to_string()
+    }
+
+    fn id(&self) -> egui::Id {
+        egui::Id::new("New Project")
+    }
+
+    fn show(
+        &mut self,
+        ctx: &egui::Context,
+        open: &mut bool,
+        update_state: &mut luminol_core::UpdateState<'_>,
+    ) {
+        let mut win_open = true;
+        egui::Window::new(self.name())
+            .open(&mut win_open)
+            .show(ctx, |ui| {
+                ui.add_enabled_ui(self.project_promise.is_none(), |ui| {
+                    ui.label("Project Name");
+                    ui.text_edit_singleline(&mut self.name);
+
+                    ui.checkbox(&mut self.init_git, "Initialize with git repository");
+                    ui.add_enabled_ui(self.init_git, |ui| {
+                        ui.label("Git Branch");
+                        ui.text_edit_singleline(&mut self.git_branch_name);
+                    });
+
+                    egui::ComboBox::from_label("RGSS runtime")
+                        .selected_text(self.rgss_ver.to_string())
+                        .show_ui(ui, |ui| {
+                            for ver in luminol_config::RGSSVer::iter() {
+                                ui.selectable_value(&mut self.rgss_ver, ver, ver.to_string());
+                            }
+                        });
+
+                    if matches!(
+                        self.rgss_ver,
+                        luminol_config::RGSSVer::ModShot
+                            | luminol_config::RGSSVer::MKXPFreebird
+                            | luminol_config::RGSSVer::MKXPZ
+                    ) {
+                        ui.checkbox(
+                            &mut self.download_executable,
+                            format!("Download latest version of {}", self.rgss_ver),
+                        );
+                    }
+                });
+
+                ui.separator();
+
+                if self.project_promise.is_some() {
+                    let zip_current = self.progress.zip_current.load(Ordering::Relaxed) + 1;
+                    let zip_total = self.progress.zip_total.load(Ordering::Relaxed);
+
+                    if zip_total != 0 {
+                        ui.label(format!(
+                            "Downloading & Unzipping {zip_current} / {zip_total}"
+                        ));
+                    }
+
+                    let total = self.progress.total_progress.load(Ordering::Relaxed);
+                    let current = self.progress.current_progress.load(Ordering::Relaxed) + 1;
+
+                    match total {
+                        0 => ui.spinner(),
+                        _ => ui.add(
+                            egui::ProgressBar::new(current as f32 / total as f32)
+                                .show_percentage()
+                                .animate(true),
+                        ),
+                    };
+
+                    ui.separator();
+                }
+
+                ui.horizontal(|ui| {
+                    ui.add_enabled_ui(self.project_promise.is_none(), |ui| {
+                        if ui.button("Ok").clicked() {
+                            let rgss_ver = self.rgss_ver;
+                            let config = luminol_config::project::Config::from_project(
+                                luminol_config::project::Project {
+                                    project_name: self.name.clone(),
+                                    rgss_ver,
+                                    editor_ver: self.editor_ver,
+                                    ..Default::default()
+                                },
+                            );
+                            let download_executable = self.download_executable
+                                && matches!(
+                                    rgss_ver,
+                                    luminol_config::RGSSVer::ModShot
+                                        | luminol_config::RGSSVer::MKXPFreebird
+                                        | luminol_config::RGSSVer::MKXPZ
+                                );
+                            let progress = self.progress.clone();
+
+                            let init_git = self.init_git;
+
+                            let branch_name = self.git_branch_name.clone();
+
+                            #[cfg(not(target_arch = "wasm32"))]
+                            {
+                                self.project_promise =
+                                    Some(poll_promise::Promise::spawn_async(Self::setup_project(
+                                        config,
+                                        download_executable,
+                                        init_git.then_some(branch_name),
+                                        progress,
+                                    )));
+                            }
+                            #[cfg(target_arch = "wasm32")]
+                            {
+                                self.project_promise =
+                                    Some(poll_promise::Promise::spawn_local(Self::setup_project(
+                                        config,
+                                        download_executable,
+                                        init_git.then_some(branch_name),
+                                        progress,
+                                    )));
+                            }
+                        }
+                        if ui.button("Cancel").clicked() {
+                            *open = false;
+                        }
+                    });
+                })
+            });
+
+        if let Some(p) = self.project_promise.take() {
+            match p.try_take() {
+                Ok(Ok(CreateProjectResult {
+                    data_cache,
+                    config,
+                    host_fs,
+                })) => {
+                    let result = update_state.filesystem.load_partially_loaded_project(
+                        host_fs,
+                        &config,
+                        update_state.global_config,
+                    );
+
+                    match result {
+                        Ok(_) => {
+                            *update_state.data = data_cache;
+                            update_state.project_config.replace(config);
+                        }
+                        Err(error) => update_state.toasts.error(format!("{error:#}")),
+                    }
+                }
+                Ok(Err(error)) => update_state.toasts.error(format!("{error:#}")),
+                Err(p) => self.project_promise = Some(p),
+            }
+        }
+
+        *open &= win_open;
+    }
+
+    fn requires_filesystem(&self) -> bool {
+        false
+    }
+}
+
+impl Window {
+    async fn setup_project(
+        config: luminol_config::project::Config,
+        download_executable: bool,
+        git_branch_name: Option<String>,
+        progress: Arc<Progress>,
+    ) -> PromiseResult {
+        // because we re-export host based on the platform specific filesystem, we don't actually need to change any of this code!
+        let host_fs = luminol_filesystem::host::FileSystem::from_folder_picker().await?;
+
+        host_fs.create_dir("Audio")?;
+        host_fs.create_dir("Data")?;
+        host_fs.create_dir("Graphics")?;
+
+        host_fs.create_file(format!("{}.lumproj", config.project.project_name))?;
+
+        let mut data_cache = luminol_core::Data::from_defaults();
+        data_cache.save(&host_fs, &config)?;
+
+        if download_executable {
+            Self::download_executable(&config, &host_fs, progress)
+                .await
+                .with_context(|| format!("while downloading {}", config.project.rgss_ver))?;
+        }
+
+        if let Some(branch_name) = git_branch_name {
+            if let Err(e) = std::process::Command::new("git")
+                .arg("init")
+                .arg("-b")
+                .arg(branch_name)
+                .current_dir(host_fs.root_path())
+                .spawn()
+                .and_then(|mut c| c.wait())
+            {
+                anyhow::bail!("Failed to initialize git repository: {e}");
+            }
+        }
+
+        Ok(CreateProjectResult {
+            data_cache,
+            config,
+            host_fs,
+        })
+    }
+
+    async fn download_executable(
+        config: &luminol_config::project::Config,
+        filesystem: &impl luminol_filesystem::FileSystem,
+        progress: Arc<Progress>,
+    ) -> anyhow::Result<()> {
+        let zip_url: &[_] = match config.project.rgss_ver {
+            luminol_config:: RGSSVer::ModShot => &[
+                "https://github.com/thehatkid/ModShot/releases/download/latest/ModShot_Windows_bb6bcbc_Ruby-3.1-ucrt64_Steam-false.zip", 
+                "https://github.com/thehatkid/ModShot/releases/download/latest/ModShot_Linux_bb6bcbc_Ruby-3.1_Steam-false.zip"
+            ],
+            luminol_config::RGSSVer::MKXPZ => &[
+                "https://github.com/mkxp-z/mkxp-z/releases/download/v2.4.0-github/mkxp-z_2.4.0-linux.zip",
+                "https://github.com/mkxp-z/mkxp-z/releases/download/v2.4.0-github/mkxp-z_2.4.0-windows.zip"
+            ],
+            luminol_config::RGSSVer::MKXPFreebird => &[
+                "https://mapleshrine.eu/releases/mkxp-freebird/win64/mkxp-win64-231004-8bdbef1.zip",
+            ],
+            _ => unreachable!(),
+        };
+
+        progress.zip_total.store(zip_url.len(), Ordering::Relaxed);
+
+        let zips = futures::future::join_all(zip_url.iter().map(|url| reqwest::get(*url))).await;
+
+        for (index, zip_response) in zips.into_iter().enumerate() {
+            progress.zip_current.store(index, Ordering::Relaxed);
+
+            progress.total_progress.store(0, Ordering::Relaxed);
+            let response = zip_response
+                .map_err(anyhow::Error::from)
+                .context("while downloading the zip")?;
+
+            let bytes = response.bytes().await?;
+
+            let mut archive = zip::ZipArchive::new(std::io::Cursor::new(bytes))
+                .context("while reading the zip archive")?;
+            progress
+                .total_progress
+                .store(archive.len(), Ordering::Relaxed);
+
+            for index in 0..archive.len() {
+                let mut file = archive.by_index(index).unwrap();
+                progress.current_progress.store(index, Ordering::Relaxed);
+
+                let file_path = match file.enclosed_name() {
+                    Some(p) => p.to_owned(),
+                    None => continue,
+                };
+
+                let file_path = file_path
+                    .strip_prefix("mkxp-z_2.4.0/")
+                    .unwrap_or(&file_path);
+                let file_path = file_path
+                    .to_str()
+                    .ok_or(anyhow::anyhow!("invalid file path {file_path:#?}"))?;
+
+                if file_path.is_empty() || filesystem.exists(file_path)? {
+                    continue;
+                }
+
+                if file.is_dir() {
+                    filesystem
+                        .create_dir(file_path)
+                        .with_context(|| format!("creating the directory {file_path}"))?;
+                } else {
+                    let mut bytes = Vec::new();
+                    file.read_to_end(&mut bytes)
+                        .with_context(|| format!("reading the file {file_path}"))?;
+                    filesystem
+                        .write(file_path, bytes)
+                        .with_context(|| format!("writing the file {file_path}"))?;
+                }
+            }
+        }
+
+        Ok(())
+    }
+}
diff --git a/src/windows/script_edit.rs b/crates/ui/src/windows/script_edit.rs
similarity index 84%
rename from src/windows/script_edit.rs
rename to crates/ui/src/windows/script_edit.rs
index 3d637794..535f13ba 100644
--- a/src/windows/script_edit.rs
+++ b/crates/ui/src/windows/script_edit.rs
@@ -22,22 +22,20 @@
 // terms of the Steamworks API by Valve Corporation, the licensors of this
 // Program grant you additional permission to convey the resulting work.
 
-pub use crate::prelude::*;
-
 /// The script editor.
 pub struct Window {
-    tabs: tab::Tabs<ScriptTab>,
+    tabs: luminol_core::Tabs,
 }
 
 impl Default for Window {
     fn default() -> Self {
         Self {
-            tabs: tab::Tabs::new("script_editor", vec![]),
+            tabs: luminol_core::Tabs::new("script_editor"),
         }
     }
 }
 
-impl window::Window for Window {
+impl luminol_core::Window for Window {
     fn name(&self) -> String {
         self.tabs
             .focused_name()
@@ -50,7 +48,12 @@ impl window::Window for Window {
         egui::Id::new("Script Edit")
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
+    fn show(
+        &mut self,
+        ctx: &egui::Context,
+        open: &mut bool,
+        update_state: &mut luminol_core::UpdateState<'_>,
+    ) {
         egui::Window::new(self.name())
             .open(open)
             .id(egui::Id::new("script_editor_window"))
@@ -59,7 +62,7 @@ impl window::Window for Window {
                     egui::ScrollArea::both()
                         .auto_shrink([false; 2])
                         .show(ui, |ui| {
-                            let mut scripts = state!().data_cache.scripts();
+                            let mut scripts = update_state.data.scripts();
 
                             let mut insert_index = None;
                             let mut del_index = None;
@@ -89,7 +92,7 @@ impl window::Window for Window {
                             if let Some(index) = insert_index {
                                 scripts.insert(
                                     index,
-                                    rpg::Script {
+                                    luminol_data::rpg::Script {
                                         name: "New Script".to_string(),
                                         script_text: String::new(),
                                     },
@@ -102,7 +105,7 @@ impl window::Window for Window {
                         });
                 });
 
-                self.tabs.ui(ui);
+                self.tabs.ui(ui, update_state);
             });
     }
 
@@ -128,8 +131,8 @@ impl ScriptTab {
     }
 }
 
-impl tab::Tab for ScriptTab {
-    fn name(&self) -> String {
+impl luminol_core::Tab for ScriptTab {
+    fn name(&self, update_state: &luminol_core::UpdateState<'_>) -> String {
         self.index.to_string()
     }
 
@@ -137,8 +140,9 @@ impl tab::Tab for ScriptTab {
         egui::Id::new("luminol_script_edit").with(self.index)
     }
 
-    fn show(&mut self, ui: &mut egui::Ui) {
-        let theme = global_config!().theme;
+    fn show(&mut self, ui: &mut egui::Ui, update_state: &mut luminol_core::UpdateState<'_>) {
+        // FIXME
+
         ui.horizontal(|ui| {
             let mut save_script = false;
 
@@ -156,14 +160,19 @@ impl tab::Tab for ScriptTab {
             }
 
             if save_script {
-                let mut scripts = state!().data_cache.scripts();
+                let mut scripts = update_state.data.scripts();
 
                 scripts[self.index].script_text = self.script_text.clone();
             }
         });
 
         let mut layouter = |ui: &egui::Ui, string: &str, wrap_width: f32| {
-            let mut layout_job = syntax_highlighting::highlight(ui.ctx(), theme, string, "rb");
+            let mut layout_job = luminol_components::syntax_highlighting::highlight(
+                ui.ctx(),
+                update_state.global_config.theme,
+                string,
+                "rb",
+            );
             layout_job.wrap.max_width = wrap_width;
             ui.fonts(|f| f.layout_job(layout_job))
         };
diff --git a/crates/ui/src/windows/sound_test.rs b/crates/ui/src/windows/sound_test.rs
new file mode 100644
index 00000000..341f4af1
--- /dev/null
+++ b/crates/ui/src/windows/sound_test.rs
@@ -0,0 +1,91 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
+//
+//     Additional permission under GNU GPL version 3 section 7
+//
+// If you modify this Program, or any covered work, by linking or combining
+// it with Steamworks API by Valve Corporation, containing parts covered by
+// terms of the Steamworks API by Valve Corporation, the licensors of this
+// Program grant you additional permission to convey the resulting work.
+
+use strum::IntoEnumIterator;
+
+/// A tab for a sound (be it BGM, ME, SE, etc)
+/// Optionally can be in 'picker' mode to pick a sound effect.
+
+/// A simple sound test window.
+pub struct Window {
+    sources: Vec<luminol_components::SoundTab>,
+    selected_source: luminol_audio::Source,
+}
+
+impl Window {
+    pub fn new(filesystem: &impl luminol_filesystem::FileSystem) -> Self {
+        Self {
+            // Create all sources.
+            sources: luminol_audio::Source::iter()
+                .map(|s| luminol_components::SoundTab::new(filesystem, s))
+                .collect(),
+            // By default, bgm is selected.
+            selected_source: luminol_audio::Source::BGM,
+        }
+    }
+}
+
+impl luminol_core::Window for Window {
+    fn id(&self) -> egui::Id {
+        egui::Id::new("Sound Test")
+    }
+
+    fn show(
+        &mut self,
+        ctx: &egui::Context,
+        open: &mut bool,
+        update_state: &mut luminol_core::UpdateState<'_>,
+    ) {
+        egui::Window::new("Sound Test").open(open).show(ctx, |ui| {
+            egui::TopBottomPanel::top("sound_test_selector").show_inside(ui, |ui| {
+                // Display the tab selector.
+                ui.horizontal_wrapped(|ui| {
+                    for source in &self.sources {
+                        if ui
+                            .selectable_label(
+                                source.source == self.selected_source,
+                                source.source.to_string(),
+                            )
+                            .clicked()
+                        {
+                            self.selected_source = source.source;
+                        }
+                    }
+                })
+            });
+
+            // We should be finding something. The unwrap is safe here.
+            self.sources
+                .iter_mut()
+                .find(|t| t.source == self.selected_source)
+                .unwrap()
+                .ui(ui, update_state);
+        });
+    }
+
+    // Technically we don't need the cache, but we do rely on the project being open.
+    fn requires_filesystem(&self) -> bool {
+        true
+    }
+}
diff --git a/crates/web/Cargo.toml b/crates/web/Cargo.toml
new file mode 100644
index 00000000..7011460e
--- /dev/null
+++ b/crates/web/Cargo.toml
@@ -0,0 +1,78 @@
+[package]
+name = "luminol-web"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+license.workspace = true
+readme.workspace = true
+repository.workspace = true
+keywords.workspace = true
+categories.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+egui.workspace = true
+eframe.workspace = true
+egui-wgpu.workspace = true
+wgpu.workspace = true
+
+ron.workspace = true
+
+once_cell.workspace = true
+
+tracing.workspace = true
+
+luminol-app.workspace = true
+
+flume.workspace = true
+oneshot.workspace = true
+
+wasm-bindgen = "0.2.87"
+wasm-bindgen-futures = "0.4"
+
+portable-atomic = { version = "1.5.1", features = ["float"] }
+
+js-sys = "0.3"
+web-sys = { version = "0.3", features = [
+    "console",
+    "Window",
+    "Document",
+    "Element",
+    "DomException",
+
+    "EventTarget",
+    "EventListener",
+    "AddEventListenerOptions",
+
+    "Event",
+    "MouseEvent",
+
+    "DedicatedWorkerGlobalScope",
+    "WorkerGlobalScope",
+
+    "Worker",
+    "WorkerOptions",
+    "WorkerType",
+
+    "Performance",
+
+    "HtmlCanvasElement",
+    "OffscreenCanvas",
+    "OffscreenCanvasRenderingContext2d",
+
+    "MutationObserver",
+    "MutationObserverInit",
+    "MutationRecord",
+    "Node",
+
+    "Clipboard",
+
+    "Storage",
+
+    "WorkerLocation",
+    "Location",
+    "WorkerNavigator",
+    "Navigator",
+] }
diff --git a/assets/bindings.js b/crates/web/js/bindings.js
similarity index 100%
rename from assets/bindings.js
rename to crates/web/js/bindings.js
diff --git a/src/web/bindings.rs b/crates/web/src/bindings.rs
similarity index 97%
rename from src/web/bindings.rs
rename to crates/web/src/bindings.rs
index 43f5afa3..e6d7b311 100644
--- a/src/web/bindings.rs
+++ b/crates/web/src/bindings.rs
@@ -16,7 +16,7 @@
 // along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
 use wasm_bindgen::prelude::*;
 
-#[wasm_bindgen(module = "/assets/bindings.js")]
+#[wasm_bindgen(module = "/js/bindings.js")]
 extern "C" {
     pub fn worker() -> Option<web_sys::DedicatedWorkerGlobalScope>;
     pub fn performance(worker: &web_sys::DedicatedWorkerGlobalScope) -> web_sys::Performance;
diff --git a/src/web/mod.rs b/crates/web/src/lib.rs
similarity index 85%
rename from src/web/mod.rs
rename to crates/web/src/lib.rs
index 58229e62..a417d0fc 100644
--- a/src/web/mod.rs
+++ b/crates/web/src/lib.rs
@@ -14,8 +14,14 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
+
+#[cfg(target_arch = "wasm32")]
 pub mod bindings;
+#[cfg(target_arch = "wasm32")]
 pub mod web_worker_runner;
+#[cfg(target_arch = "wasm32")]
 pub use web_worker_runner::WebWorkerRunner;
+#[cfg(target_arch = "wasm32")]
 pub use web_worker_runner::WebWorkerRunnerEvent;
+#[cfg(target_arch = "wasm32")]
 pub use web_worker_runner::WebWorkerRunnerOutput;
diff --git a/src/web/web_worker_runner.rs b/crates/web/src/web_worker_runner.rs
similarity index 94%
rename from src/web/web_worker_runner.rs
rename to crates/web/src/web_worker_runner.rs
index 16947622..847f29f0 100644
--- a/src/web/web_worker_runner.rs
+++ b/crates/web/src/web_worker_runner.rs
@@ -15,15 +15,24 @@
 // You should have received a copy of the GNU General Public License
 // along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
 use super::bindings;
-use crate::prelude::*;
+
+use portable_atomic::{AtomicF64, Ordering};
+use std::sync::Arc;
+
+// ensure that AtomicF64 is using atomic ops (otherwise it would use global locks, and that would be bad)
+const _: [(); 0 - !{
+    const ASSERT: bool = AtomicF64::is_always_lock_free();
+    ASSERT
+} as usize] = [];
+
 use eframe::{egui_wgpu, wgpu};
 use wasm_bindgen::prelude::*;
 
-static PANIC_LOCK: OnceCell<()> = OnceCell::new();
+static PANIC_LOCK: once_cell::sync::OnceCell<()> = once_cell::sync::OnceCell::new();
 
-#[derive(Debug, Default)]
+#[derive(Default)]
 struct Storage {
-    output_tx: Option<mpsc::UnboundedSender<WebWorkerRunnerOutput>>,
+    output_tx: Option<flume::Sender<WebWorkerRunnerOutput>>,
 }
 
 impl eframe::Storage for Storage {
@@ -35,7 +44,7 @@ impl eframe::Storage for Storage {
                     WebWorkerRunnerOutputInner::StorageGet(key.to_string(), oneshot_tx),
                 ))
                 .unwrap();
-            oneshot_rx.blocking_recv().unwrap()
+            oneshot_rx.recv().unwrap()
         } else {
             None
         }
@@ -53,7 +62,7 @@ impl eframe::Storage for Storage {
                     ),
                 ))
                 .unwrap();
-            if !oneshot_rx.blocking_recv().unwrap() {
+            if !oneshot_rx.recv().unwrap() {
                 tracing::warn!("Failed to save to local storage key {key}");
             }
         }
@@ -82,7 +91,7 @@ enum WebWorkerRunnerOutputInner {
 }
 
 struct WebWorkerRunnerState {
-    app: Box<dyn CustomApp>,
+    app: Box<dyn luminol_app::CustomApp>,
     app_id: String,
     save_time: f64,
     render_state: egui_wgpu::RenderState,
@@ -98,9 +107,9 @@ struct WebWorkerRunnerState {
     /// Length of a pixel divided by length of a point.
     pixel_ratio: f32,
 
-    event_rx: Option<mpsc::UnboundedReceiver<egui::Event>>,
-    custom_event_rx: Option<mpsc::UnboundedReceiver<WebWorkerRunnerEvent>>,
-    output_tx: Option<mpsc::UnboundedSender<WebWorkerRunnerOutput>>,
+    event_rx: Option<flume::Receiver<egui::Event>>,
+    custom_event_rx: Option<flume::Receiver<WebWorkerRunnerEvent>>,
+    output_tx: Option<flume::Sender<WebWorkerRunnerOutput>>,
 }
 
 /// A runner for wgpu egui applications intended to be run in a web worker.
@@ -110,29 +119,32 @@ pub struct WebWorkerRunner {
     state: std::rc::Rc<std::cell::RefCell<WebWorkerRunnerState>>,
     storage: std::rc::Rc<std::cell::RefCell<Storage>>,
     context: egui::Context,
-    time_lock: Arc<RwLock<f64>>,
+    // FIXME: no idea what the orderings should be here
+    time_lock: Arc<AtomicF64>,
 }
 
+type AppCreateFn = dyn FnOnce(&eframe::CreationContext<'_>) -> Box<dyn luminol_app::CustomApp>;
+
 impl WebWorkerRunner {
     /// Creates a new `WebWorkerRunner` to render onto the given `OffscreenCanvas` with the
     /// given configuration options.
     ///
     /// This function MUST be run in a web worker.
     pub async fn new(
-        app_creator: Box<dyn FnOnce(&eframe::CreationContext<'_>) -> Box<dyn CustomApp>>,
+        app_creator: Box<AppCreateFn>,
         canvas: web_sys::OffscreenCanvas,
         web_options: eframe::WebOptions,
         app_id: &str,
         prefers_color_scheme_dark: Option<bool>,
-        event_rx: Option<mpsc::UnboundedReceiver<egui::Event>>,
-        custom_event_rx: Option<mpsc::UnboundedReceiver<WebWorkerRunnerEvent>>,
-        output_tx: Option<mpsc::UnboundedSender<WebWorkerRunnerOutput>>,
+        event_rx: Option<flume::Receiver<egui::Event>>,
+        custom_event_rx: Option<flume::Receiver<WebWorkerRunnerEvent>>,
+        output_tx: Option<flume::Sender<WebWorkerRunnerOutput>>,
     ) -> Self {
         let Some(worker) = bindings::worker() else {
             panic!("cannot use `WebWorkerRunner::new()` outside of a web worker");
         };
 
-        let time_lock = Arc::new(RwLock::new(0.));
+        let time_lock = Arc::new(AtomicF64::new(0.));
 
         let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
             backends: web_options.wgpu_options.supported_backends,
@@ -214,9 +226,11 @@ impl WebWorkerRunner {
         {
             let time_lock = time_lock.clone();
             context.set_request_repaint_callback(move |i| {
-                *time_lock.write() = bindings::performance(&bindings::worker().unwrap()).now()
-                    / 1000.
-                    + i.after.as_secs_f64();
+                time_lock.store(
+                    bindings::performance(&bindings::worker().unwrap()).now() / 1000.
+                        + i.after.as_secs_f64(),
+                    Ordering::Relaxed,
+                )
             });
         }
 
@@ -318,7 +332,7 @@ impl WebWorkerRunner {
                 state.save_time = now;
                 state.app.save(&mut *self.storage.borrow_mut());
                 if let Some(output_tx) = &state.output_tx {
-                    match self.context.memory(|memory| ron::to_string(memory)) {
+                    match self.context.memory(ron::to_string) {
                         Ok(ron) => {
                             let (oneshot_tx, oneshot_rx) = oneshot::channel();
                             output_tx
@@ -330,7 +344,7 @@ impl WebWorkerRunner {
                                     ),
                                 ))
                                 .unwrap();
-                            if !oneshot_rx.blocking_recv().unwrap() {
+                            if !oneshot_rx.recv().unwrap() {
                                 tracing::warn!("Failed to save memory for {}", state.app_id);
                             }
                         }
@@ -355,27 +369,27 @@ impl WebWorkerRunner {
                     .configure(&state.render_state.device, &state.surface_configuration);
 
                 // Also trigger a rerender immediately
-                *self.time_lock.write() = 0.;
+                self.time_lock.store(0., Ordering::Relaxed);
             }
 
             // If the modifiers have changed, trigger a rerender
             if modifiers != state.modifiers {
                 state.modifiers = modifiers;
-                *self.time_lock.write() = 0.;
+                self.time_lock.store(0., Ordering::Relaxed);
             }
 
             let events = if let Some(event_rx) = &mut state.event_rx {
-                std::iter::from_fn(|| event_rx.try_recv().ok()).collect_vec()
+                std::iter::from_fn(|| event_rx.try_recv().ok()).collect()
             } else {
-                Default::default()
+                vec![]
             };
             if !events.is_empty() {
                 // Render immediately if there are any pending events
-                *self.time_lock.write() = 0.;
+                self.time_lock.store(0., Ordering::Relaxed);
             }
 
             // Render only if sufficient time has passed since the last render
-            if now >= *self.time_lock.read() {
+            if now >= self.time_lock.load(Ordering::Relaxed) {
                 // Ask the app to paint the next frame
                 let input = egui::RawInput {
                     screen_rect: Some(egui::Rect::from_min_max(
@@ -394,7 +408,7 @@ impl WebWorkerRunner {
                 let output = self.context.run(input, |_| {
                     state.app.custom_update(
                         &self.context,
-                        &mut crate::luminol::CustomFrame(std::marker::PhantomData),
+                        &mut luminol_app::CustomFrame(std::marker::PhantomData),
                     )
                 });
                 if let Some(output_tx) = &state.output_tx {
@@ -483,8 +497,11 @@ impl WebWorkerRunner {
                 );
                 state.surface.get_current_texture().unwrap().present();
 
-                *self.time_lock.write() = bindings::performance(&worker).now() / 1000.
-                    + output.repaint_after.as_secs_f64();
+                self.time_lock.store(
+                    bindings::performance(&worker).now() / 1000.
+                        + output.repaint_after.as_secs_f64(),
+                    Ordering::Relaxed,
+                );
             }
 
             self.clone().setup_render_hooks();
@@ -501,9 +518,9 @@ impl WebWorkerRunner {
 /// mouse events and resize the canvas to fill the screen.
 pub fn setup_main_thread_hooks(
     canvas: web_sys::HtmlCanvasElement,
-    event_tx: mpsc::UnboundedSender<egui::Event>,
-    custom_event_tx: mpsc::UnboundedSender<WebWorkerRunnerEvent>,
-    mut output_rx: mpsc::UnboundedReceiver<WebWorkerRunnerOutput>,
+    event_tx: flume::Sender<egui::Event>,
+    custom_event_tx: flume::Sender<WebWorkerRunnerEvent>,
+    output_rx: flume::Receiver<WebWorkerRunnerOutput>,
 ) {
     let window =
         web_sys::window().expect("cannot run `setup_main_thread_hooks()` outside of main thread");
@@ -973,7 +990,7 @@ pub fn setup_main_thread_hooks(
         let body_style = window.document().unwrap().body().unwrap().style();
         let local_storage = window.local_storage().unwrap().unwrap();
         loop {
-            let Some(command) = output_rx.recv().await else {
+            let Ok(command) = output_rx.recv_async().await else {
                 tracing::warn!(
                     "WebWorkerRunner main thread loop is stopping! This is not supposed to happen."
                 );
diff --git a/luminol-term/examples/eframe.rs b/luminol-term/examples/eframe.rs
deleted file mode 100644
index 3211473c..00000000
--- a/luminol-term/examples/eframe.rs
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright (C) 2023 Lily Lyons
-//
-// This file is part of Luminol.
-//
-// Luminol is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Luminol is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
-//
-//     Additional permission under GNU GPL version 3 section 7
-//
-// If you modify this Program, or any covered work, by linking or combining
-// it with Steamworks API by Valve Corporation, containing parts covered by
-// terms of the Steamworks API by Valve Corporation, the licensors of this
-// Program grant you additional permission to convey the resulting work.
-
-use luminol_term::Terminal;
-
-struct App {
-    command_name: String,
-    terminals: Vec<Terminal>,
-}
-
-impl App {
-    fn new() -> Self {
-        Self {
-            command_name: String::new(),
-            terminals: vec![],
-        }
-    }
-}
-
-impl eframe::App for App {
-    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
-        egui::CentralPanel::default().show(ctx, |ui| {
-            ui.label("Command name");
-            ui.text_edit_singleline(&mut self.command_name);
-
-            if ui.button("Run").clicked() {
-                match Terminal::new(portable_pty::CommandBuilder::new(&self.command_name)) {
-                    Ok(t) => self.terminals.push(t),
-                    Err(e) => eprintln!("error creating terminal: {e:?}"),
-                }
-            }
-        });
-
-        self.terminals.retain_mut(|t| {
-            let mut open = true;
-            egui::Window::new(t.title())
-                .id(t.id())
-                .open(&mut open)
-                .resizable(false)
-                .show(ctx, |ui| {
-                    if let Err(e) = t.ui(ui) {
-                        eprintln!("terminal ui error: {e:?}")
-                    }
-                });
-            open
-        });
-    }
-}
-
-fn main() {
-    eframe::run_native(
-        "Luminol Terminal Example",
-        Default::default(),
-        Box::new(|_| Box::new(App::new())),
-    )
-    .expect("failed to start eframe");
-}
diff --git a/rmxp-types/Cargo.toml b/rmxp-types/Cargo.toml
deleted file mode 100644
index 32c2d97e..00000000
--- a/rmxp-types/Cargo.toml
+++ /dev/null
@@ -1,21 +0,0 @@
-[package]
-name = "rmxp-types"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-serde = { version = "1.0", features = ["derive"] }
-alox-48 = { version = "0.4.1", default-features = false }
-bytemuck = { version = "1.13.1", features = ["extern_crate_alloc"] }
-num-traits = "0.2"
-num-derive = "0.3"
-slab = { version = "0.4", features = ["serde"] }
-strum = { version = "0.25", features = ["derive"] }
-paste = "1.0"
-camino = "1.1"
-num_enum = "0.6"
-
-rand = "0.8.5"
-flate2 = "1.0"
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index e7d8dc01..12bc3219 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2023-09-12"
+channel = "nightly-2023-11-14"
diff --git a/src/app/mod.rs b/src/app/mod.rs
new file mode 100644
index 00000000..d0f1fec7
--- /dev/null
+++ b/src/app/mod.rs
@@ -0,0 +1,289 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
+//
+//     Additional permission under GNU GPL version 3 section 7
+//
+// If you modify this Program, or any covered work, by linking or combining
+// it with Steamworks API by Valve Corporation, containing parts covered by
+// terms of the Steamworks API by Valve Corporation, the licensors of this
+// Program grant you additional permission to convey the resulting work.
+
+use crate::lumi::Lumi;
+#[cfg(feature = "steamworks")]
+use crate::steam::Steamworks;
+
+mod top_bar;
+
+/// The main Luminol struct. Handles rendering, GUI state, that sort of thing.
+pub struct App {
+    top_bar: top_bar::TopBar,
+    lumi: Lumi,
+
+    #[cfg(not(target_arch = "wasm32"))]
+    audio: luminol_audio::Audio,
+    #[cfg(target_arch = "wasm32")]
+    audio: luminol_audio::AudioWrapper,
+
+    graphics: std::sync::Arc<luminol_graphics::GraphicsState>,
+    filesystem: luminol_filesystem::project::FileSystem,
+    data: luminol_core::Data,
+
+    toasts: luminol_core::Toasts,
+
+    windows: luminol_core::Windows,
+    tabs: luminol_core::Tabs,
+
+    global_config: luminol_config::global::Config,
+    project_config: Option<luminol_config::project::Config>,
+
+    toolbar: luminol_core::ToolbarState,
+
+    #[cfg(not(target_arch = "wasm32"))]
+    runtime: tokio::runtime::Runtime,
+
+    #[cfg(feature = "steamworks")]
+    steamworks: Steamworks,
+}
+
+impl App {
+    /// Called once before the first frame.
+    #[must_use]
+    pub fn new(
+        cc: &eframe::CreationContext<'_>,
+        #[cfg(not(target_arch = "wasm32"))] try_load_path: Option<std::ffi::OsString>,
+        #[cfg(target_arch = "wasm32")] audio: luminol_audio::AudioWrapper,
+        #[cfg(feature = "steamworks")] steamworks: Steamworks,
+    ) -> Self {
+        let render_state = cc
+            .wgpu_render_state
+            .clone()
+            .expect("wgpu backend not enabled");
+
+        #[cfg(not(debug_assertions))]
+        render_state.device.on_uncaptured_error(Box::new(|e| {
+            use std::fmt::Write;
+
+            let mut message_description = String::new();
+            match e {
+                eframe::wgpu::Error::OutOfMemory { source } => {
+                    message_description.push_str("wgpu error: Out of memory\n");
+                    writeln!(message_description, "{source:#?}").unwrap();
+                }
+                eframe::wgpu::Error::Validation {
+                    source,
+                    description,
+                } => {
+                    message_description.push_str("wgpu error: Validation error\n");
+                    writeln!(message_description, "{source}").unwrap();
+                    writeln!(message_description, "---------").unwrap();
+                    writeln!(message_description, "{}", source.source().unwrap()).unwrap();
+                    writeln!(message_description, "---------").unwrap();
+                    writeln!(message_description, "{source:#?}").unwrap();
+                    writeln!(message_description, "---------").unwrap();
+                    message_description.push_str(&description);
+                }
+            }
+            rfd::MessageDialog::new()
+                .set_title("Luminol has crashed!")
+                .set_level(rfd::MessageLevel::Error)
+                .set_description(&message_description)
+                .show();
+
+            let backtrace = std::backtrace::Backtrace::force_capture();
+            rfd::MessageDialog::new()
+                .set_title("Backtrace")
+                .set_level(rfd::MessageLevel::Error)
+                .set_description(&backtrace.to_string())
+                .show();
+
+            std::process::abort();
+        }));
+
+        let graphics = std::sync::Arc::new(luminol_graphics::GraphicsState::new(render_state));
+
+        let storage = cc.storage.unwrap();
+
+        let mut global_config = eframe::get_value(storage, "SavedState").unwrap_or_default();
+        let mut project_config = None;
+
+        let mut filesystem = luminol_filesystem::project::FileSystem::new();
+        let mut data = luminol_core::Data::default();
+
+        let mut toasts = luminol_core::Toasts::default();
+
+        #[cfg(not(target_arch = "wasm32"))]
+        if let Some(path) = try_load_path {
+            let path = camino::Utf8PathBuf::from_path_buf(std::path::PathBuf::from(path))
+                .expect("project path not utf-8");
+
+            match filesystem.load_project_from_path(&mut project_config, &mut global_config, path) {
+                Ok(_) => {
+                    if let Err(e) = data.load(&filesystem, project_config.as_mut().unwrap()) {
+                        toasts.error(e.to_string())
+                    }
+                }
+                Err(e) => toasts.error(e.to_string()),
+            }
+        }
+
+        let style =
+            eframe::get_value(storage, "EguiStyle").map_or_else(|| cc.egui_ctx.style(), |s| s);
+        cc.egui_ctx.set_style(style.clone());
+
+        let lumi = Lumi::new().expect("failed to load lumi images");
+
+        #[cfg(not(target_arch = "wasm32"))]
+        let runtime = tokio::runtime::Builder::new_multi_thread()
+            .worker_threads(2) // TODO use single threaded runtime
+            .enable_all()
+            .build()
+            .expect("failed to build tokio runtime");
+        //enter the runtime permanently
+        #[cfg(not(target_arch = "wasm32"))]
+        {
+            std::mem::forget(runtime.enter());
+        }
+
+        #[cfg(not(target_arch = "wasm32"))]
+        let audio = luminol_audio::Audio::default();
+
+        Self {
+            top_bar: top_bar::TopBar::default(),
+            lumi,
+
+            audio,
+            graphics,
+            filesystem,
+            data,
+            toasts,
+            windows: luminol_core::Windows::default(),
+            tabs: luminol_core::Tabs::new_with_tabs(
+                "luminol_main_tabs",
+                vec![luminol_ui::tabs::started::Tab::default()],
+            ),
+            global_config,
+            project_config,
+            toolbar: luminol_core::ToolbarState::default(),
+
+            #[cfg(not(target_arch = "wasm32"))]
+            runtime,
+
+            #[cfg(feature = "steamworks")]
+            steamworks,
+        }
+    }
+}
+
+impl luminol_app::CustomApp for App {
+    /// Called each time the UI needs repainting, which may be many times per second.
+    fn custom_update(
+        &mut self,
+        ctx: &eframe::egui::Context,
+        frame: &mut luminol_app::CustomFrame<'_>,
+    ) {
+        #[cfg(not(target_arch = "wasm32"))]
+        ctx.input(|i| {
+            if let Some(f) = i.raw.dropped_files.first() {
+                let path = f.path.clone().expect("dropped file has no path");
+                let path = camino::Utf8PathBuf::from_path_buf(path).expect("path was not utf8");
+
+                if let Err(e) = self.filesystem.load_project_from_path(
+                    &mut self.project_config,
+                    &mut self.global_config,
+                    path,
+                ) {
+                    self.toasts
+                        .error(format!("Error opening dropped project: {e}"))
+                } else {
+                    self.toasts.info(format!(
+                        "Successfully opened {:?}",
+                        self.filesystem.project_path().expect("project not open")
+                    ));
+                }
+            }
+        });
+
+        let mut update_state = luminol_core::UpdateState {
+            audio: &mut self.audio,
+            graphics: self.graphics.clone(),
+            filesystem: &mut self.filesystem,
+            data: &mut self.data,
+            edit_windows: &mut luminol_core::EditWindows::default(),
+            edit_tabs: &mut luminol_core::EditTabs::default(),
+            toasts: &mut self.toasts,
+            project_config: &mut self.project_config,
+            global_config: &mut self.global_config,
+            toolbar: &mut self.toolbar,
+        };
+
+        egui::TopBottomPanel::top("top_toolbar").show(ctx, |ui| {
+            // We want the top menubar to be horizontal. Without this it would fill up vertically.
+            ui.horizontal_wrapped(|ui| {
+                // Turn off button frame.
+                ui.visuals_mut().button_frame = false;
+                // Show the bar
+                self.top_bar.ui(ui, frame, &mut update_state);
+
+                // Process edit tabs for any changes made by top bar.
+                // If we don't do this before displaying windows and tabs, any changes made by the top bar will be delayed a frame.
+                // This means closing the project, for example, won't close tabs until the frame after.
+                self.tabs
+                    .process_edit_tabs(std::mem::take(update_state.edit_tabs));
+                self.windows
+                    .process_edit_windows(std::mem::take(update_state.edit_windows));
+            });
+        });
+
+        // Central panel with tabs.
+        egui::CentralPanel::default()
+            .frame(egui::Frame::central_panel(&ctx.style()).inner_margin(0.))
+            .show(ctx, |ui| {
+                ui.group(|ui| self.tabs.ui_without_edit(ui, &mut update_state));
+            });
+
+        // Update all windows.
+        self.windows.display_without_edit(ctx, &mut update_state);
+
+        // If we don't do this tabs added by windows won't be added.
+        // It also cleans up code nicely.
+        self.tabs
+            .process_edit_tabs(std::mem::take(update_state.edit_tabs));
+        self.windows
+            .process_edit_windows(std::mem::take(update_state.edit_windows));
+
+        // Show toasts.
+        self.toasts.show(ctx);
+
+        self.lumi.ui(ctx);
+
+        #[cfg(feature = "steamworks")]
+        self.steamworks.update()
+    }
+}
+
+impl eframe::App for App {
+    luminol_app::app_use_custom_update!();
+
+    /// Called by the frame work to save state before shutdown.
+    fn save(&mut self, storage: &mut dyn eframe::Storage) {
+        eframe::set_value(storage, "SavedState", &self.global_config);
+    }
+
+    fn persist_egui_memory(&self) -> bool {
+        true
+    }
+}
diff --git a/src/app/top_bar.rs b/src/app/top_bar.rs
new file mode 100644
index 00000000..978500c3
--- /dev/null
+++ b/src/app/top_bar.rs
@@ -0,0 +1,381 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
+//
+//     Additional permission under GNU GPL version 3 section 7
+//
+// If you modify this Program, or any covered work, by linking or combining
+// it with Steamworks API by Valve Corporation, containing parts covered by
+// terms of the Steamworks API by Valve Corporation, the licensors of this
+// Program grant you additional permission to convey the resulting work.
+
+use strum::IntoEnumIterator;
+
+/// The top bar for managing the project.
+#[derive(Default)]
+pub struct TopBar {
+    load_filesystem_promise: Option<poll_promise::Promise<PromiseResult>>,
+
+    fullscreen: bool,
+}
+
+type PromiseResult = luminol_filesystem::Result<luminol_filesystem::host::FileSystem>;
+
+impl TopBar {
+    /// Display the top bar.
+    #[allow(unused_variables)]
+    pub fn ui(
+        &mut self,
+        ui: &mut egui::Ui,
+        frame: &mut luminol_app::CustomFrame<'_>,
+        update_state: &mut luminol_core::UpdateState<'_>,
+    ) {
+        egui::widgets::global_dark_light_mode_switch(ui);
+
+        #[cfg(not(target_arch = "wasm32"))]
+        {
+            ui.checkbox(&mut self.fullscreen, "Fullscreen");
+            frame.set_fullscreen(self.fullscreen);
+        }
+
+        let mut open_project = ui.input(|i| i.modifiers.command && i.key_pressed(egui::Key::O))
+            && update_state.filesystem.project_loaded();
+        let mut save_project = ui.input(|i| i.modifiers.command && i.key_pressed(egui::Key::S))
+            && update_state.filesystem.project_loaded();
+        if ui.input(|i| i.modifiers.command && i.key_pressed(egui::Key::N)) {
+            update_state
+                .edit_windows
+                .add_window(luminol_ui::windows::new_project::Window::default());
+        }
+
+        ui.separator();
+
+        ui.menu_button("File", |ui| {
+            ui.label(if let Some(path) = update_state.filesystem.project_path() {
+                format!("Current project:\n{}", path)
+            } else {
+                "No project open".to_string()
+            });
+
+            ui.add_enabled_ui(self.load_filesystem_promise.is_none(), |ui| {
+                if ui.button("New Project").clicked() {
+                    update_state
+                        .edit_windows
+                        .add_window(luminol_ui::windows::new_project::Window::default());
+                }
+
+                open_project |= ui.button("Open Project").clicked();
+            });
+
+            ui.separator();
+
+            ui.add_enabled_ui(update_state.filesystem.project_loaded(), |ui| {
+                if ui.button("Project Config").clicked() {
+                    update_state
+                        .edit_windows
+                        .add_window(luminol_ui::windows::config_window::Window {});
+                }
+
+                if ui.button("Close Project").clicked() {
+                    update_state
+                        .edit_windows
+                        .clean(|w| !w.requires_filesystem());
+                    update_state.edit_tabs.clean(|t| !t.requires_filesystem());
+                    update_state.audio.clear_sinks(); // audio loads files borrows from the filesystem. unloading while they are playing is a crash
+                    update_state.filesystem.unload_project();
+                    *update_state.project_config = None;
+                    update_state.data.unload();
+                }
+
+                save_project |= ui.button("Save Project").clicked();
+            });
+
+            ui.separator();
+
+            ui.add_enabled_ui(update_state.filesystem.project_loaded(), |ui| {
+                if ui.button("Command Maker").clicked() {
+                    // update_state.windows.add_window(
+                    //     luminol_ui::windows::command_gen::CommandGeneratorWindow::default(),
+                    // );
+                }
+            });
+
+            #[cfg(not(target_arch = "wasm32"))]
+            {
+                ui.separator();
+
+                if ui.button("Quit").clicked() {
+                    frame.close();
+                }
+            }
+        });
+
+        ui.separator();
+
+        ui.menu_button("Edit", |ui| {
+            //
+            if ui.button("Preferences").clicked() {
+                update_state
+                    .edit_windows
+                    .add_window(luminol_ui::windows::global_config_window::Window::default())
+            }
+
+            if ui.button("Appearance").clicked() {
+                update_state
+                    .edit_windows
+                    .add_window(luminol_ui::windows::appearance::Window::default())
+            }
+        });
+
+        ui.separator();
+
+        ui.menu_button("Data", |ui| {
+            ui.add_enabled_ui(update_state.filesystem.project_loaded(), |ui| {
+                if ui.button("Maps").clicked() {
+                    update_state
+                        .edit_windows
+                        .add_window(luminol_ui::windows::map_picker::Window::default());
+                }
+
+                if ui.button("Items").clicked() {
+                    update_state
+                        .edit_windows
+                        .add_window(luminol_ui::windows::items::Window::new(update_state.data));
+                }
+
+                if ui.button("Common Events").clicked() {
+                    update_state
+                        .edit_windows
+                        .add_window(luminol_ui::windows::common_event_edit::Window::default());
+                }
+
+                if ui.button("Scripts").clicked() {
+                    update_state
+                        .edit_windows
+                        .add_window(luminol_ui::windows::script_edit::Window::default());
+                }
+
+                if ui.button("Sound Test").clicked() {
+                    update_state.edit_windows.add_window(
+                        luminol_ui::windows::sound_test::Window::new(update_state.filesystem),
+                    );
+                }
+            });
+        });
+
+        ui.separator();
+
+        ui.menu_button("Help", |ui| {
+            ui.button("Contents").clicked();
+
+            if ui.button("About...").clicked() {
+                update_state
+                    .edit_windows
+                    .add_window(luminol_ui::windows::about::Window::default());
+            };
+        });
+
+        ui.menu_button("Debug", |ui| {
+            if ui.button("Egui Inspection").clicked() {
+                update_state
+                    .edit_windows
+                    .add_window(luminol_ui::windows::misc::EguiInspection::default());
+            }
+
+            if ui.button("Egui Memory").clicked() {
+                update_state
+                    .edit_windows
+                    .add_window(luminol_ui::windows::misc::EguiMemory::default());
+            }
+
+            let mut debug_on_hover = ui.ctx().debug_on_hover();
+            ui.toggle_value(&mut debug_on_hover, "Debug on hover");
+            ui.ctx().set_debug_on_hover(debug_on_hover);
+
+            ui.separator();
+
+            if ui.button("Filesystem Debug").clicked() {
+                update_state
+                    .edit_windows
+                    .add_window(luminol_ui::windows::misc::FilesystemDebug::default());
+            }
+        });
+
+        #[cfg(not(target_arch = "wasm32"))]
+        {
+            ui.separator();
+
+            ui.add_enabled_ui(update_state.filesystem.project_loaded(), |ui| {
+                if ui.button("Playtest").clicked() {
+                    let mut cmd = luminol_term::CommandBuilder::new("steamshim");
+                    cmd.cwd(
+                        update_state
+                            .filesystem
+                            .project_path()
+                            .expect("project not loaded"),
+                    );
+
+                    let result = luminol_ui::windows::console::Window::new(cmd).or_else(|_| {
+                        let mut cmd = luminol_term::CommandBuilder::new("game");
+                        cmd.cwd(
+                            update_state
+                                .filesystem
+                                .project_path()
+                                .expect("project not loaded"),
+                        );
+
+                        luminol_ui::windows::console::Window::new(cmd)
+                    });
+
+                    match result {
+                        Ok(w) => update_state.edit_windows.add_window(w),
+                        Err(e) => update_state.toasts.error(format!(
+                            "error starting game (tried steamshim.exe and then game.exe): {e}"
+                        )),
+                    }
+                }
+
+                if ui.button("Terminal").clicked() {
+                    #[cfg(windows)]
+                    let shell = "powershell";
+                    #[cfg(unix)]
+                    let shell = std::env::var("SHELL").unwrap_or_else(|_| "bash".to_string());
+                    let mut cmd = luminol_term::CommandBuilder::new(shell);
+                    cmd.cwd(
+                        update_state
+                            .filesystem
+                            .project_path()
+                            .expect("project not loaded"),
+                    );
+
+                    match luminol_ui::windows::console::Window::new(cmd) {
+                        Ok(w) => update_state.edit_windows.add_window(w),
+                        Err(e) => update_state
+                            .toasts
+                            .error(format!("error starting shell: {e}")),
+                    }
+                }
+            });
+        }
+
+        ui.separator();
+
+        ui.label("Brush:");
+
+        for brush in luminol_core::Pencil::iter() {
+            ui.selectable_value(&mut update_state.toolbar.pencil, brush, brush.to_string());
+        }
+
+        if open_project {
+            #[cfg(not(target_arch = "wasm32"))]
+            {
+                self.load_filesystem_promise = Some(poll_promise::Promise::spawn_async(
+                    luminol_filesystem::host::FileSystem::from_file_picker(),
+                ));
+            }
+            #[cfg(target_arch = "wasm32")]
+            {
+                self.load_filesystem_promise = Some(poll_promise::Promise::spawn_local(
+                    luminol_filesystem::host::FileSystem::from_folder_picker(),
+                ));
+            }
+        }
+
+        if save_project {
+            if let Some(config) = update_state.project_config {
+                update_state.toasts.info("Saving project...");
+                match update_state.data.save(update_state.filesystem, config) {
+                    Ok(_) => update_state.toasts.info("Saved project sucessfully!"),
+                    Err(e) => update_state.toasts.error(e.to_string()),
+                }
+            }
+        }
+
+        let mut filesystem_open_result = None;
+        #[cfg(target_arch = "wasm32")]
+        let mut idb_key = None;
+
+        if let Some(p) = self.load_filesystem_promise.take() {
+            match p.try_take() {
+                Ok(Ok(host)) => {
+                    #[cfg(target_arch = "wasm32")]
+                    {
+                        idb_key = host.idb_key().map(str::to_string);
+                    }
+
+                    filesystem_open_result = Some(update_state.filesystem.load_project(
+                        host,
+                        update_state.project_config,
+                        update_state.global_config,
+                    ));
+                }
+                Ok(Err(error)) => update_state.toasts.error(error.to_string()),
+                Err(p) => self.load_filesystem_promise = Some(p),
+            }
+
+            ui.spinner();
+        }
+
+        match filesystem_open_result {
+            Some(Ok(load_result)) => {
+                for missing_rtp in load_result.missing_rtps {
+                    update_state.toasts.warning(format!(
+                        "Failed to find suitable path for the RTP {missing_rtp}"
+                    ));
+                    // FIXME we should probably load rtps from the RTP/<rtp> paths on non-wasm targets
+                    #[cfg(not(target_arch = "wasm32"))]
+                    update_state
+                        .toasts
+                        .info(format!("You may want to set an RTP path for {missing_rtp}"));
+                    #[cfg(target_arch = "wasm32")]
+                    update_state
+                        .toasts
+                        .info(format!("Please place the {missing_rtp} RTP in the 'RTP/{missing_rtp}' subdirectory in your project directory"));
+                }
+
+                if let Err(why) = update_state.data.load(
+                    update_state.filesystem,
+                    // TODO code jank
+                    update_state.project_config.as_mut().unwrap(),
+                ) {
+                    update_state
+                        .toasts
+                        .error(format!("Error loading the project data: {why}"));
+
+                    #[cfg(target_arch = "wasm32")]
+                    idb_key.map(luminol_filesystem::host::FileSystem::idb_drop);
+                } else {
+                    update_state.toasts.info(format!(
+                        "Successfully opened {:?}",
+                        update_state
+                            .filesystem
+                            .project_path()
+                            .expect("project not open")
+                    ));
+                }
+            }
+            Some(Err(why)) => {
+                update_state
+                    .toasts
+                    .error(format!("Error opening the project: {why}"));
+
+                #[cfg(target_arch = "wasm32")]
+                idb_key.map(luminol_filesystem::host::FileSystem::idb_drop);
+            }
+            None => {}
+        }
+    }
+}
diff --git a/src/cache/Scripts.rxdata b/src/cache/Scripts.rxdata
deleted file mode 100644
index 2f0ab960c5fe5352dc56522687ca3adf24d6abac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 109299
zcmZ5{W2`7$wB)gE+qUnqZQHhO+qP|+_t>^=d+zt%WPVK2>7=_W{iCvXty-(AK_ImB
zv>+@%)GvcUh~UHwY)tf&O>FFmfMP)0vs=^zst(x@dg-tHFm$21eC|?p*%8hP<aa8h
zG(1@wc_fxL5)+Qnic5Zbh}UCDH6&Z(rwIu^OnWh7M45}GZwm5WZ`tm?VEP*2s_NFB
zpMH-E@XY{v@j?K1n2h%R8ZQ<CN{uF)egMHX!CWP15D-?Ji9NWQ*9Roki!ofm_Dqq>
zJ#*hE1gYFT4GnN!yXWfHnO}z&Thb)q2wb24S}$4fa#`Q*#(Y8&f#3D7d2qRh(hF@v
z!PPyE{^)DgXA-^PUNKs^jBtn<QRHsMKCAeg=|8Un2+YBT;(VS7>Lr;*%^8$E9gpFl
zem4ej*EGpgh(h2v3pK4qqO)*XZD!v0?H!^cO=O&kk#eY_2<Bw6i@5|MvTMozktBql
zgNiW8jm=R*jPN*`TTU)b4hckBO0H<<UTSSj!-G~X63#F{O@|rkd5iB#iT~DLM6l_n
zm;3C%&I>uUkzABy;mpMhUDdN)U^yVD?f~N{xo4=Cg?&)H$qu$&s&G_rm<j7(7Gx0U
zps1=<Y8+%wcHNl5$wUN#KV~N~X4Q#N>4kV_68KC#hKVyjhO=|_oX<fqJ7Wu2mVAyl
zMGgpi$knS^T!A%Pz0yw3S*DfNuZu=>&TY%kG+{U#{VSZmIptHTJqV82k#p`O4@RpL
zdpt9<Pgt<EoWn7iY(JB=6vs%))9hlg&}QC1snnoZ1Eqw5Lr81+=c$7xkAq8eeFZ;*
z5;p}IfL@-&p`nVzrMZQex7tg<8g7<B9)Hi-Uup1?6}ScR>0B~!Y0E+i3ZqSM90ptG
zFK^PPlEdZgajzO5#WIG!a1ZKer_c+FE{R%zw%Tmg>;Aooxz{Z8te}=MSEnCkR2qe{
z;28gM-GNx?Bup(Y7o=e!!=oW*vXFriTxT10oi6c<ggE&#?GtU6Kj9(lo^RY1np~J@
z=fZxc#ceDx?8*>fSsx($_M)3_Vd>!C;sOIjJq<Pn!J9DA8rdELcD*B}xM8JZ(URlv
zIv!XoY7!^T-e+c|mw4b@C!|=M+4m6Y66{w#H+bOIN%nf3-i#VVtZ$c|0oRmq`FD3{
z@DC)}Dy2R4dVU1{ka}<)iwY=r+Z3u-`~0RDx~1Vgf;;u`&dTb)&dv+VXPZzdEeeD7
zF%(k5PoDWVgj?Yx*gRpva9DPO?a<E^?$9*LoHD@DCuq?pZ9g``#&m_+<D+5ZYLB9W
z!x_IKZ@9U9ean8Gf)7;VP*x+m*0QzWo0jpS&+Fl{nErXE;B#=r=BF)pq)EVE?nprM
zheqIed}EijuD5$-?u_1O)%__U&ff6RN8}G7Ox%|A_6C7F1Gz1xa7tW6^cRy~*j6M>
zHfY^5HPG9h6tr`)MW$#vBJ?<rYORBWcHqBX*hPn1sjSG+Mx5Rm&8~O*Lm(x@%4a4l
z2qV#Wk#ej!dWQS%WD?4?Nuue119J#Uw7>!fa%($A6t>%psaBI35&8RczM?WLUEbsL
z^fopDk2O@TWHv(F?w*<XR(=vJCo72bWik2=#B}%Po+L4ex#&NaeAB}i8UJY%ol*%f
z5yJmyl#+*&vxyB6(9=Jan%0nU+GIoMF(dmmpgtw&YCSkQ!*tP}<;ca`axQG;bR=-3
zEFcqrMQ^_N`8bF|fl!Eq2SUbWAwlbk^67F12xxkj@Uz>^9vA`TsYgm0ftH|AnOv6e
z+W`IQI03O32-lw$RwWP^B>}d)=(H3b9f3N+3Yfw$wI5p`C-!e7%+&>&a5kl(<R(S7
z4#BK$5Y-3KqKU-x9>B4RN0r{GapqWA0(q!pEA1c{7mk!a)~6Y_mEL%$aPavY4c!bv
z+Y8>qa<T{XW0?#ryVJtn-K{>ct{{lri<8hGXKj=gfVEd@lo<>e_Eaijk-2dzO>74A
z79||GWY9OP*n!5WcLY;)9)^-qB2j$rN$7ss{sd+$6rvh$t;}=2zpmn^o`7z}nj?RS
zmKc=~%6Wcn5ntU-G{cMp+(r^{;#Z4`y(ko49+qba2Aj!8_8H<#$mAO@C8F~n{p!Eh
zgIpGE+u^5H!@y}sT&?T}e)Fc*qHDB-F5M(VnJ#}tGLvU1Bz(0VSrleDX8PMz%R>r8
z9m#UcOaD8dTuE65U<mpfcdkzSHo>44a+{6u24FiR!LD|Awqpv^ws<KO?-Fz>YoH$q
zdvR2qFFQUHz^VOtyX~B@IU~E02j!#DxAfT<pa_=|q?j`_#&3LS$1Yo!?;6u%=`c;v
zs2;3ckKPnmbA|L$p2k4E)OTDNj4fiDvqj_Jd8|ofolG~1kxoZ?%sCHNdQmXl<g11$
z^HhG)8D?`@%KpUyJ^(E*)#{rA8Pj5!C2dXbua_0A)--cB+}+pb<?hWFkjI@P_4uTX
zD)ZUB&!p4EsGnxPi#Kk0c*Ldz0MEKv?IFpW<lGXDFwtJ2T`mAq_R!qBadj2A15Tuy
zoVR2MlZWk5Z2tVDrjk{atCn(Mu~ViEV4xWhJwqH=m?PUVw4bR0iY2&WQNG8kt*4ha
zHbNf^i`P(nkrp1Gyb;hw(!M$+a6pX0{zP9sp=2{8mQCE^Vj*;!UKS^C6dVTAH}}gs
zq?ETm{uMWPx5UJAJ&VQ!BZv3jt#gPWrT#nUvAZQk9uF9~U1RqTMhxHZ&p>BizMCSW
zEis`jvE77EG}n)@V_vRNpQTe?tej8R6emqLn=8QAd4Sh>j4iXYj!z!7Jb|tV!_tWD
z=|aR90gp&B7>I3@{m$vr79{uu&8jQ)>-(MfOr`cEc-oSRvBT)nxNKh#LFV@cCB`ZE
z^RKlQ^X{+sp!Du9d3ru)4!)(?*};>rjjuU6K9r-e1MK%nefX2b4~M%Dd{AAb?l(O7
zOvMGgPhy*!KpATOn8u2c@UC@WfidG}{T3`Jt_P;lpdU-w^D_w>OWu2+eK$8vbizHG
zQ!2!nsQutgegG#suf>4}Sv~CbrtkH9%DfCMnlNtBvT&pR%=-|+UH|@?Rj7^?#3E87
zURbORol{-g&;^V(;oB>les%oJm#HN__^$1io<cSuU?G!^RkP?wp3tIi&+QP4%lYl0
zVDi-YggiO7*#V7K?wYH8^scW!W;~y|v-)m!^mK=N`FT=at(Qzay|~^CV$$_XHd&Qk
zDBV7OowFV+5w8>;+lq|<=VeR1pg^0)=DeA3G3*n|qq-QXAoWYJMa)$?tEo(s?dS6c
zP~NMF7C)b2x9^+K^R$=5(k`dY%(h71<BYyvKuZiH<^RO+F6t7P2<d;t(9Ocx$lSz<
z2uKp}pJ_{!ks9Jh2)zyY30qaJr)+&WD8Z1APt~PSw<ArqVPd4dEWMJY`M8v6v`9t+
zAzT+)%c*la$$$w|mFr{gHxCYRFT4IA;FKIkYjvn9Lm7~wq9r1&7NK&k{yVr5h)nZ7
zA-JbM>?;Q*VcJh=kR~-^RB_33JAiS|d0*){n~ai>J<#P%+r@|Wm}y->3yq7|SnQ6!
zOfKTO3G?}9bq`WBUnE|IGrE4GM`2jqa$J$(omAbl6SyWlF;JgYumrR{4ip+>E%-Rg
zd22oz+K?l9MiH-Vw<emg>Q<fCmF1NTht07UTZgQVs~y^&J4aUGYb<uW^gg5=BEQ5@
z!=G>_hBwO5Rxwo;2zh?ZvUl4+_ZQmf_y>Wi?1F9R0#b;L^Syn*l6S2BV*A#bd|+0w
zR)^T{>LmQx`cHt=A2Ds8UO-S|5$^v;eyT47AwvEil2r{HEes5;|6^I`KbDi^{$qLM
zHpDl~j7m9*w!<9}7)tP5LjE2}GJ_4dsnK@gMs;59wlquTSDr__F)U==qsi`teVo9;
z<=G23S~PtDoL*M~T2qqk#(wLfQu|I3A}EE#NIrfd8=g1l5QLeVg}~cFvrdDUp4ECl
z-8Q({sNiDoOxNloS9lXTkHbw;i-^mw>ch@9D$}tbnzY3*xg#p*cQ~ajreXIH7cU7!
z)3~Dtj+lpT*TaNSX%H&$Agr1~1zZ>N6wbhAa2e7*ErFCo{8VL%>hdf`sTBg}Tcc$#
z8l7lJ2HD_cZvJxdeI)m|M2z4eh}RZbd&~jmRl$qvT-P<W2}Dv{57N99yGHh`+rMO=
z*h1Tk=lsT>?-$seHUayEmRsU^6Lfv<&Dd;6;-$>#c=`uNQQyl@cD!~~Xk+slT`ofQ
z;y-%%WMe^z(EfJ~n^>DF{l9h0_CM=bz-o{mA>=mjcOMa&Rq<K};#%UeMDSWhc+_~o
zx@%k9wYvFV=h3Bs3K}<#!**r;(&K@@DTP&ITNX9|p!9L{9O%-!MlAu|TFYnM+>NLU
zZIWQwhz6P=-4x<dS`WU8XzFMsu%_0$?HJNsO#o`tq@)=-5j@$V`Xt<nA>zKj^-V!q
zn8ltq2wfW&I4>c9No}ksn$h*`5S@@@iDlk~jHGJ-#UkF4It1`I&0Q9lp-?DZg^#3?
ziPp_DgF6xg`3ZNIo`8V#_4EEGtGXmw3C%qjf(G%Um-h|ZsIN8Iz2k!Wo@2O1-8BWW
zBCWPZFp<9!_mI$g^sj`LE&AvI(kLl(_I!DkUh(C?$?VxDrqPxWZ$`eJ99CN>?fuqG
zppW;9CfwHG0Hkuy7jRt*LBxNgVt$kSKbK_WXkubZ1oQ&zo;{+jAh*eY;45~(x1|qn
zVZqE5lNMPhAujE;!Ls(^FMmvCdr0e2G>mH0=WE98a<xWjWZ4CQc+mBE<L&lCx9{Az
zc=>jQ^5OHwpX%(Hm7MITjd}BwNVi94gi69$LG>3x&Ph|CWNRRifsTTlryw3l08G9n
z2?nCF=p+#6FuwXh1=4WjoWEcik;2HE5r8TYqj!!o#gN0JCmwtLFF8Y+Xohfk@SxuG
zy$7;*w0xKB$$i33QIecLuBq~X06uS>8K>0Vp{dob`1oI#$4+oR;c!Py#YDqYz|lrH
zgihHSLC`DZ<x<TOlQQ8AE`4>ABeS_fN^^yV%5;6|SXx8|dUc`|QrB#|UPRDpJj#I`
z%CduseA+5a5XI&ZM+x7S?{U&z-5GgAFNYu{R8nNGitMXoxh8xT#5KxvqQs_MVN*-^
zUPZ34Bvoz&4?y=iPZJ<F_b5)E=oxVN-zS=w3WDRn$Ub@L)sjejmDx*|t{O6X+FM)*
zO=f_CPIJv_Jd5)hRnU@(whhR{Mx>@1QerJbi_FmM{y%2#LAt5dBP5$K2ky?gmzo<6
z4YiHpjFV<P#jWF>&o2~mR^DYU*ln(Q2bNp9X%{l2K&q*8%(mpkv8M3f-cbq=?Wse6
zvt4xU7uYof^vf=XXxJ7B5l%3HwCA}q0;ERSm9fi8G>Su$?(pn=-jPY&vFvjXS$r+&
z(|=%<T2Ic_d9Cj{`9EtHW&TuVL7i1bW4H2o8=xQxQvvjm(dCtQDWSxPTvc9i=d_8F
z%CfOq#5fp{9z!RvBFShQ`TX*Es1Bo7Ab@kh@om$+R(i$zO|uE&c;_SSQGVCH&m3S$
zG#Wk9-D#`9CH-Wk5MwR_TmUsQ<DYy_i?Z|uJL|5~EM~G22CcYX1m*<m4=IJ6pl;Vz
zX2H$qFAWX$Fo*6$Z%x$pF7VlGXY~Z6!wXNallJoUuLAWozbt!M0pnpQsGYPxv`o7@
zD(S)3wJU@3S>k;llrSW-{&70Rg7UfpQ(W~e;AMaf^t~FEKLD7Z(OU!){^MdOZoz=?
zU_2Her!`0*$19xFUm%h1RH&&mF4aWMzP3^yC829vJl}$zWq#eS$;(Y-mCzCmW8b`D
zH^P=t%z`d_JdOwD<A(Iq!)}AQ^w(Z!?!3fV(!KM3WB0B9in{JkyY<1H-nz~N<3m$K
zE1M+GbD%%9xy`8!_Sm~QMr>=Ljv=OQa2qP!7Q;_4Zm4}=^v-sGO$?lEbhg=P`djt+
zOA&ey?n{&R50faosle~2#GDBtGj9$eq2nUU$>Yu7cW+bg-Oaj?byL~(h$Y{r(EULP
z$BMr~-w#02w3yd_a<IA5144xOKN>4<VdU)MXhH-8@~>;UR@bsyWI*xF8}{RnM>s$0
zgboY~FO+~lfDey=)um>4&?;i7#YtQK^7M`}BDZB1hN6$ET;YAqo<uJTlBioPDgwm8
z9};UGT%=CChaF0EUbrmr?w?Lnjz=x8)Q_0x?nk{N4Q;vS43+!x0L_9rwU>HJOwOzt
z>YTwCEty{~O)P^JsblfsNNw(QdN}(lj8zJnKQ?UcWDld3r6IudrmTvSf*E=nj>wX9
z&gsuL%$da$?KlNMK+9g0q1#d?po7Lh#Hf>z5nj5GlO#wb=_?$=)EM6qQ!)N&mYoc(
zuB7-7e#3SlcWEofB&i`QIc%gmVk^_2_lRCnWii$81j%W@aTuIh4nPWF9haaEv+&&$
zGsijs5vPvHKTUNfr!A~(!k+S;9Ocqw2s}rlZqQroA)K`6sFuR4DGw$|P#88Lf~bN6
zP=r&l2}<jfU+}^7Nti?x7HJ;{^&sWNBJHw1Do1Ry<HW$33tUmuA92sDjN>nbJv!`E
zS8mxzc6Su9y_t~FpFwK9?5TY#T;KG~74X=ErqCSjvM9ZGuuLuXtSJ(yW!P&_YAgfe
zsEVF$C6~4tUn;E|8Gka^2q@Y<=%CdplkYOcs>gZ?VtX{(KHN6G4sm66CLtY@;RPXT
zyZGeLv^q_l$74m4r<6*A?3z#4tGl3em&aS`fqf(+RL$xQZ@36ijztK+umI<Yg}5Kp
zY_JgSewKbSBqXP~1a_PFaz}Sfl$~(j$$HJd4oKFK2r8l6D#kWRycWwJZB2Alx3%dm
zrW-tD-+h_+4s46IlWaGZEql6?51qFcIzhulqtFCYW14+6VFq@%YmH~W*LTow_JQo?
z&>vC(7MuhQ@kWkNpV%UPvGfZH<1V90|2i1JZaz@#HAF`A^ao=euai#M8SHiz;m{uV
zUba_&j={SoE^*ZoE-RP8D1%LGdgA^wMuasuAW*mqV|0I@gKtkk0M;W1oh!`k!`atJ
z?v#x7h9R#N?v|G4ey(_z|Cv}BlxvwI>)af<1&{OA;je0!gX)?)F+c7MLWUa&jw?Gn
z%x;+7mg>3vi07<4Dv)O%uX1j~1EN<E$Cizc{={sXi*As6AKj9UO}2xQvD$9ijg1IY
z<whv1!K_lm7jGy@7%~U`U=)~2m_1YnGODJsu!so7#T{!!8YAgYq<N$$^UX}X;51kq
za$D@Vrf&Halj{MKDK`-tTTV0Bm45!Hw2{t&^<a9pM$!}mMNQ+}?*k{aY1d+?saW+?
zB&==p*|scpBsMGvBp=+8tQ`Uvk`D4>S0fG&0p91Dv1}$i8EuAAI|g^bW{KxzQ=uJ}
ziQf0Im6&TT?r+A}>%6SrHyGP~nfia~AofTG{C^Fupn<cqwTUAEBN31Sn0xkeriR_7
zD1!ek@Eae@0Z_@cdcu6~62)eF>;4&GjRB|#AR)oZk>o~ZSbf(+LjG@06ZrTsVVP@-
z^dPuo_CDU@G#)dF+fWT2H@&NYA3mM9XwhzXGUYKsHAI?yb6DrUCzXuuea1is$q;~$
zq!s?$WNG#`8)(Goe{VsnL1p|Q2nbfFC#J6-1B0{`7uS>2(X`dXABMwcoHGBUS5{yY
z*lw1)>ZZrGH@oTrSR*FY!oBP}`s6fXkafh9#8G}pa1gIjqT+1`3AqnbO3b|ijIE$5
z#Ht2*U8U*<a!OHBd=rnPU7A{yaa4Lj(W%Y(T@7wd=6;Txe3tdRN)c6@_3V~cGLghq
zAaHENrqM{4?`Vxyo=|E$p%`nZ+Dk0t2BugF%?BGB3lyo$x7wjcLm`o=QhK;|2kyvf
zEz?TiqA!se&5%TSdFfQJu}C_mB92G$7)n%`mjsTl7m=n(+fr31V{7&b;l{{Qre4ch
zp<*nDE^tggWZ|h=wp*%b%nXtI9)8$iNo5~}rxsrou`LT}LFNEcW6%47yDz4n5O#a7
zCsw^<53Wf%IIf@<IvA9yKs3R_N|3Dbh~1a@RdW!(PO3CZt`1Vh2+kuyJ;_TY&waLr
z)2M3=JFcUxTVM_1yk;)ESVFOl%uHP><ujO7psG9;c$gVsaroFo-<u-3eX+5c0<f9f
zXF5fiCaTXy&22}^Hd`kza=S23Bg-AW1WLM#-DtGVTrFG~^k3{7Mys06n63)XiA(MG
z<I2?Soee?I>kY_#^h2j+1yUL6b39ElS`=3fek1fsg_9&GOr_TXSsl4U*6o|~;Axy{
z#G0^^breHS1bN>kgmNwy@!`+FE5-RD^!Or_;0vFJH3S{{xeM^jLt|&+&VVaLC^-fw
zSTp$ewVaN_w^O)w`!gK}Irdn?{5|F3S9#fzxDz?coA;7%VD<IiyZWNndvgH3*b~bb
z)Vq<<8mOcCEWOL4QLo(3)0Xxg7^~?8#y5fT#RRnm?XA4Z3atA`EVUL;iN%oi^}C$}
z#?Wx#`S<<+rn8MmaAlL-Xz<c)4sk8hz+|I-e(7&~0$C{F@1|AQ7I?wU93cdjoVe`z
zO3Z{=)0p&&xtr2I*i{l>rf-iE6-}K67(0t(cJn9K?05^^A(L7x?$Bv%>MnNF9#Ox8
zS{OTn`?R44+sK>dCsa=i!(oxWg8*`*_f#UnJC)R_uBap(oFs|0#Kl8kCjkU6ArzT~
zkpwU!1BK}f{YnuHl2wRB7f~bXpxm}QF&LNPr&0P>p;%ajksvU`0fq_xVd_0$0w7f6
zXa=c_9rBb22Dx<Ki6GcPU^0s~W?{z&ha&%hAe%h>gBVoYXr`z>?DOsjrnsIka7rV4
zcbFj6Fsj`Hn~Y_rLgwd~2Pvx$8tf-RC0uw|`8x?nBkcAX+aDipglFYFl$@A51Svf<
z*$C`<ncUMR!3*%Ya_2dxL7yWXLdwv_G@nS~E7#OSA8>1j?g=oO=ti$RFq-P%58r7K
zFBqRJ1~_B>^!Dbr6@xY;TARAhnW(2&Dm`}VWYbCX=Eu-9NFw%>gi_I0CkZCCOe?Rb
zl3O1yDml&4#ghOYN!%Vf=g1dhC80)SRO`xccE^bpB}}@JRJKWBNKbKJ@hR#Gn><+D
zHtds0_|}Z%dm2oDnxvQLsP=#|f|qGHNPXJU_*{Oq_;q`&O-of3FKIDVGR<?rvU(gy
zW57q%hJ9=Ji5NYBh9$8)8&k2<3X{le177paBB;ufZC$4rpp=Q|!WQi8ANr)1t2{1s
z4+SCTQJX%B7#P)fEiS(^zeOABMjgg$IvI2pE{PeP>`%eAsEQO?mp!gH7pv$$v;gms
z$ORTL{wS^1?TgJ~pJK*f*48A=Y+R7;*QKgne(}#{A&h<uRdmNcU)~v9@%EXW6p`r_
z1XlK$G_fuELgi1bAovP^wF@qtz#IK;N<C`$r@{JtVGc>1!W&W9-j#`@R)l8s1NLc3
zJtJndg+aFd%rfjLi_c6MJ~@^1Ipc(e=l~#&m=J<IiUF~=mN{ZrE(^h+TMZ(oe!f*o
zV)oT9x25&0;Mor$2(-Ypwxk>C`(nUxa@Ee^{*>D*eY)m<$qUVw`2mK4>ZAWFHo)T+
z)c;?tVIl$ofcRHyG;QquP4Ito^MCgvVbZs`LX}{K<cDpVNG>CLP{(;;7+?ZY&%(=h
zL=`QxpT=(Ah$5Dv4xJq~K7`7|kGAhS4!4I6;Z9yZyuQu=a(P48NlFH0g(rd?F;Ii0
z+<8as!d^d=CiZUAAt8{7K!lS?fOr`&hbGR@l-#NN(B+}901^55lR=M7-?&Z*j4Y%7
zK$^_7@F$9#EPIG9#vsa!p!99CE63qu3TZdv@d34qr8jf9LzOYY?hciZBxb5zkT2x{
zM(u@o1h<)a$>YzrApTk^Q{q&;PDDaeN#zC{k%G3a>=1|~)W=sNS;h#yCQ=m6FG(Mm
zPFQ^_NNb>xnJlHsG?~ls=PF2eOfcEdTS#lCNdRHUYtWVH!R+&EFv2`ywT-D}&%484
zGD%U4mgSFoZrl!T;A^&em<{0H*{PONOGCY5DGoA8FeiqfEHM;FbMOQrQkvLCV`&N5
z*Sfgpi_%e1r!wRnCa2O$ZvROa{H2uuGKY$-DJFRbrz&P<Cg#8kbI3edwQSGa#;*L6
z>W7Xf0rc4M&J^=VvQYGjJwdL}Y$ZB}&!|Vl^X6rMr&4bt-QCYcsK&5hfd;4)v36uI
zmf{8Fy<~?_E#zcKo0FAa?KVK){zn3=-EGwhOVZVbxDT$u*NsBVgr>sq3Sg#z|4YCm
zTg-RMMeycY^R}E#eP?F@AA6k~?UiH}ngFtlWFvos-wwm~Z)QQIJLB_+sM_<+1!?>|
z{Pbw629qMP@=+GNfpjA^RMAjFq_JU3{nZ3&X_&0DN-|@DZ{wOkE%juJrLdj2CdpHX
zVsuMfX^3(|5Q0DgbAlN{3Qml|{8DjNZPA)z<a;~H$t}P9x)MtAcMQZA<t2FQZaxc}
ztH=|mAU8(0zdhbJK|<u9b5ea?5ctAvz|QEhsS3b`Kfoa8y7Ew^qee2(4RWCBQHU|b
zN8lp$An{O|uMc=riDbxfY=tSzP3pPW#3KQnc3WPiJHLVXPWAf(7oC054A<G2iUFrh
zYv5V%_q;Qg3vD{oOG2mQECYDO8KXrxYQ}8quu@Yp(K;zyCdg55nQiyB;q<=j$`wXx
zC&K(Snuj=f<dnM7(oayZz4wu@2~aUhLgAe`nrfROc=^tmxCZ$J<f|>Qq<HQjPAq9+
zlYCfGE}v~!!QT#VAO*O*zaXl4Sj5v05Y3jv8m(c~8$zm5@WRyQmTC8mnWlQ};jCYP
z2@=9?5BI6#v!UeN6dV^>ZQL7s;heoP(vw&hBa}F^dV?2q5#uW_oxaN{jVdj46)eFM
z<U;Ou7k8vXwG1<vsPOkip5krAFW9C^$Fj=zH=?_iH+0suJ?Tt~FgW+}T`O9ljbME}
zmNdLF6ar9(9^WqNj<U>{>8p$KG3Vw?V|*<e$y@c!($}`5Ee5KpE#D70m{yJtK)=k4
z-T36gAv3(L{tUpu%=|3CFJfx+&W2s!qn1oZX-Cz%vAr>^t`LDjaBFk(ouvV|r8oD{
zbX2kdyR9+KQ%gu&lB;5o-jYWu_$&*e^^w9YT#(GP+joc~M&?6&o@WtO4NyBBIepxG
z_cKrJ5*#BW{Pr$y=JywsEn(lHv8dYbb?*$)%PsRTxl>sTH|jH<(l5)bW7}}OxOfK&
z4a6lsb-PPN_q_*?#RP;x%TyWes4c2%8u}@$v7XDGH@roVf!lY>th0-u4F?<B`9bO7
z?RjIOnzHN{+vmVRTo&_k5ffUw(z4z`tkUGd9OLShIjy&7$Q3Arg}N%CA6o)il$EAF
z;`7fxPqWj@yW6HQkjMu#)5d2LMs&DMjom#)sPv|j$IUjczB!Kjk4-&G@o2!#x*!np
zPK{i1Xv^uG-io)pS-#&u21!fu7Z;pCUe0bit)n%dHq33}SSMvG+kY(a3SYZ8NY`H#
z4?TZoyGquB4CQj+AQ!r*senC|x;vZnw$`sBuTo+KqA#s~{r~3bC57{X)GAYcNGm^Y
z*#Rz22BX@GDmu2<NrPHK5!IaE<Z~tUX)0e+4sWe!&={a3k_;?qpsCCzQUP_fuExVV
zL?Z;uFT-=;K|fm8dxXtpjSJ+GVxxcTs48Ord<T4&{mIl@n?x0Ej^ZFSsFpi}2X5lR
zeF?G_KlSQ7AH2pbSwqtGw3%BO6AF{a(nSzs<KoJk9<|@P&u%2&`|BK$FEH@9taijF
zBtw7Y;nfl_$ssnl?SLmmiE=N>@C85y$d5<FhzNhER4}#SaBBS+lKSYveb{{CKNQgc
zSj$=2I(F+(H6!7*!z+hQB>y4Si|9f={M47J>u<TIes|%vv;PF(tM+P69JUs#W&5Jy
z;S+JwGNn@C1+ZK`^X#4v{)X$ZX#Nz#<`dfLyd35rJNFzd=cE?WabR|s>(t)5kvr&^
zJ!6niQPflK7Umn)joYn}%PO=z)T0sLW-?E3TUy`m9pmYVbdnj_j$V7R>gUDe?*~n|
zNWKe+h0E*VD&x_Th_x&IE`O5WO0CflJU%^~hjC(2Alp(Y7ubbAD_zREb#v5SVZfNR
zw|G>xel)gz6t;f!Zq1}chhyY$=N0m~fZB+>#@*iodPn#->{HYy4fvWak5qr>&pzJo
zEa;SWmZ~9BnmJiSOYOwPPQBlLYadDJbDXB?*Ds4HT7W`(p-NY4&Wt8kmUpWZl4B=Z
z(EFH-ttb^{>`IM;r@Vs&y|CBh(J4so&ncgo{3G^%eW*8-7SR9a4Va05N+AEusWi3h
zu)7d_;p2Z9TA*<xT20m^;35ekvyjWme8sVGp7Y^D3FoLK4SUcH##@N<`Ffd;5~Xfx
zZCitz`M(Kn6NmPv?CEypx$thDZ=b7-&Yt(wQt$5Rr7O};=QQfI2eRm9a;~4_*n<3~
zLV_tw6$gWx)CZH~o!Z&GCV98Y^GHw<<@_b|38Fw}Vc%IM1*SU?UzCa)wV932hhcmq
zJQ`W5JFX75dS#wJQV@sRRxZ^5yjYS<!T+?MM4m>7bAHjS`%D=;5ge#zT6`ou@uDHS
z+u`k>d;k<mzcp`B8lGdw9akE$-z@M*I5C$fjdS8@Wm4{0s7{?Qe7IJ^PeO!MS={7a
zCS7Nh7()4FGmMO8itcF6xcPKoh-E0>A(F(Ey;-6G9BHF^Kq)<8+m5<(H3WX;qK&Hl
zRWC-=su!myeH*q3gJbX5h(xC%6`4|UfzrUDH(=D0L~K|)BbFennkF+z_r#Dh;0O+I
zRjE;!DVY!{7EWE58c}8Xo<L2;qDn}9)IedZSg+pLRdlb6XohK*e8GHgJ{T{gUufW~
zptW*cPVoF}qmfhhE=%e7=EfWg9@LSEkR`=Bj~%##*M9pE>QzXJ;D)v)>{rW0>$34%
zhn>>;;pQjs)1)~l5jWE>4waK^I0NjJF5^+u<zfC4yZ+iU9Rdzz)-<1P1<2*9<%X4K
zG~*cVSkT-hXT-*=v|+dXHupMj^cMA(QTtSIA1%_Vk4=e#MbwPmFhq)r^Itb<$Z$3Y
zUS^Lk;jKqN=B_A0m*eyy9h(0z_!vD)6B~(9gfktA2!)(lpOH1THsoWst^4F_s;m*u
zIJ5tN0_OG|?9(RoRJ<Q3Wg!61l?KdFK{C2_y|5raI+~VFo=!_J@vybZceILKsAna}
zNk_R2`81i)aI}KAf8Yd@8PG<$QJL*w>=2+K7broMT+0*z{(N@jFZ!h612QJIIhSjx
z<k_>t*V<+dNB$7(C&q0)V@+1c3R^>u?UYOY4t_z}&2)}RlUI!-?UacKD!R5@`8^x-
z{pV-rkWm{tLR`pGD_Hch$qN%JmK55tmP-bnZl^$HPPfb+v0as7Wqb|;Z9QAtdA{$f
zjrm}Q>NH#oldLyYU1(4&6zLmMq~0tr5Twk-&@_IomQZwvzaBoFu1?%{O617{?D|L@
zcp0ON>}z8Fuvx5w=&33kp86)XfUocXuJ4}2OSsv+FL<6O3a^rh|IkQ6*pcR&Qd@J&
zsJdQ!9U=2X1IX_iZFt)o&@8~@LQBjkRkg@(MJr}{k7O$T@BH6}aA=JXo*qodp>p<S
zh+l8R?~Q!kP`?=usEBwZqx>4z*!D$56Z<Dr%D9ar9genAwCWnLoeW<AvG0jx9%`|P
z1?#x`ew9`I6VnQjxm4f}s)0osQUtN*4iMLz#t&C3`OSl?punp}iX{Is)3Xql_tGO6
zrU|r8VR_^cLzdW4MfBjPM4HpH&oV4|+9sfc1*J&fzt;AaoP^t&vO%rKu{}|zvFG?7
zq0pgE*kc`7UYj-XOkjljZFI&RQbn+2x0>l+I85*A0yAv0TL3*V&(rt%8qZUDG0W0&
z2IzDI-$gVM2mw3VNub-#Im>-vC2XNMNi=}K)-T%M8t@(cwQlF?$+7aT#Jae|j@5HV
zPQtcSYSRFl#Sbc2*mVLnQ7i`?hD0{=scb*;HeXBx?SFIIozT7yt_*f$qg%l?-%UAR
z5z%hU{stA=g<9*(5iC69qfZ|>);kIu(2K9o@aq@gU)-_u1EtJx`f|vX1{8qHJp&BF
z=BPvTa6#U!S8m&sk<IB>+<O4C62h4+WUTSiA~0xKdfUp|3BDRUGr3-7{CNqPiLvK{
z%ly@Ut7`Ex?$F2RCecb!auXe4HT@NVSm*p`nr~2o&%5+6?hE&L74G6)?u7_AgmPmv
zwWpfOpdn@~(h>mCpa~HeDuWrv-zrh}ve}4!SUvEzq7Lq{DdA?3Dc3ra$L<VCmtZB!
zH=G}JwGmdol~QDp7{4Li7X7<n^+)ou?G@LiN*Y;lrD_Fkm@AN1!MRT*OopM>mq|r0
zP<JpXMDs#8V`c*xsFgyD7do(QgKhLOhL$RjD5fKsRq5Tr(Z^}2(aWZnHp8-_92XkM
z0-si+U1T!HqT=?WYs>ytdH5Q;D`NUu8^8#DbJ3u5-tA-^#a4d6)Q;TzsprQnUp7X4
zQ#2-5Z>PW_<8?m2#)w6IAiqY0n70Lv7H4BCKji5)ljdh^leuOp^QQXaXJ+|zd0B^f
zb4g<Snu~JM%I_LQsu8GxITXiGo~Gr!kqi0TRuaFE<7<~0NSXN%DHeH+vqEkKb38G@
znj!HLLuD5}vVwjIyl>C_klf(4)Wc(XbAvUajcmOh%)tKH6pIr+`5nT@CFr2R>Qb&5
z$L2bsjqXa8M~g42pqg2Gp4(hBW~Bhh%H&j@_<Wh8<_vqVXrsqwjiO<TrolUP_#p%7
zvb>crBA0nygYTGG)rwwCWVoqoa;~k_obJz*0hXbW`VnD8y^3bK_F}B~Os2<SIvR4_
ze4D7FCgj9(urqRFz{)ubmR3shk8z8m6v-}05^4qy%pUu=jas+e!lq{XtfO#-`q34t
z7}jyN#Ev3I)t+P2sAWgFU^QFYUl3E0ZJdvp4`?tEmNK}x1l7faoz4z1k$YjiByEJE
zx~s0$Zi~%}gA!O#@GUC2n8lJ~7EAlYE(cE|S)S8#>1kkHXYMxWvNkXeZ!w^PR6y#^
z&drczZo_8_vI8#S&gIRJ`PmIU#gRkxDUQ-1f9&lKoAH{Lo;%(TPiG^(cXR*!67Q^7
zf5I=kC7%vBhb?$-%O>oP9W&ORqRyq$YbNY|y^u;+#k`!Z0^xegm=$;^0cr#*H8r}e
zV859;3uwR3uI!h)RT+`BYCH4SHuJYOi+6U`Z&tOhU)=t<E?|riL%>y0?O!VWKJ3d|
zGl#MUM(Oph&z?-bI`quBCzwuFB8;<*AuL1PU!|lRKl6udDd*d0v61hK%NZB9Oujp8
zzs<S@wfEMn4;%n3CxN3Dw!58P+`krB(<)7Mjt0`Nc_|DV#NG;w*gHEafL~dRR&y&M
z#5)eD!%t3O<TH5f!=^t!dKB=>P%P*&>Iw#-j90!?8$ra>Af(^K;!pF6KO*1t`e)GZ
z7q4s7zERgV<^KEu{0QU=oCYX|8WZ0{-PPQxlEYuJ_?^>8$yYp8>f6*Gn-BNRUqoZb
zy~Lfm(HxJ-uGFiX_{;defb&IUi2oTlPN*B;{~P7_-wz1_M$Q&?|FQ=W|FQ?y=~{Lh
z3@Br})X&`65t7iTCOzi#N%E^Ti;*l9%gWa!l|)I|{%VH=o6aVAzGJb-NLUn?5Z6Nw
z0E90c-`|g<&7Rmju5Oz3eeing7(;SX7y)Jp`xV8f;MhIZ1nqbZunGE_L*e7<`Cuo5
z7JEowbiU{xCpDoJqZqyp%!OdggN~t4+03V9Qf*nP#%|<N4WcOiuoDMc1H9TY;DKUu
zX&VffgkSoRO@I-L{5+MSAvBTlm&ya+e*_XcPAmhgDj7Qt8&?9QwUrq3Gb=s7KVqQ;
zcDMH0bq*;m)h;Qlp#J)cxE&dCm{674Eg@#<=P;ww9K|tPz4LsWvZ}JRa1l2)$~=pP
zRuE>!TaJW*7F9!PE5(>3R)$X+=x}Tb6DL5hS%)`H4#-8rD2&3I1^$}CBH|he0=*HK
z=dD#lO0R1rI|v>7%m}f_%O>#lk6DjC?alqVPR;t69=+_5+~zuQ-X;pM`zaDuf`g0w
zc+5z_BayMNQSWhLDI3vUe-OJ*O;;1L-qw6BRttxiR+4})u_CzBN}%UY7tAFNTer2T
zaLZjO2TOJSK`x|(q!3P*gh3vupr{jp{`hCYaoBLlfyp9r+PEailXG3q86{zX=!h9(
zXbHmX9hPUh<pD!t#bySkCBS!fU7L2?v93m@>gPn}*g^B#bkGO9C`CuhEAobPzb$i9
zkNspH-9<9l08GwLr#>V;Qfp?iKwSyi+XIJQR1u)Wl7>zVlO;d2W#*&~ny7jXP0o9K
zt$USD&M|76kcIRwON2}-GY?2d!^beF(Al22V?)B%%irg+AH9mv-0o_lB?`V3Z~F6g
zQDZK5=J0aJr86|zu;xXYRCV18@ZZ0@{6grpO)Zr(WznP+4%}72$tPzW-uheSaqC~D
zO~*Q6)O0UU%gT?ncDs^39n8R9PX;61z{&M<H?r`==^ld7X90TE+BhUtFR63Hy>GNg
zpQBQ2FN;&btcQx}Mh-KIc|$g#6!QYV_$r={)D`;}ZCZN^p`bdQ|CBIlZmnO{t~59<
zGOY7)nYU+0;MQh*cNv{MIq8rlmp5SRseHay31$=-R_8XfcS@Td(u{TJxOud6IBFaI
zIbG?g@K~`{V5(943h&FUf;8v3wi2Aly7c~_V%QvYY!BBkVbq3aHdBn#fZQ-;)Cx)_
zM;}v(?}ahFIfO@C$Qk%=pT4c8fD*y~PaNRi4z+Xqmu7=?&py`nvcqOa`t9TI16D#m
z+elRDQQQJm!5Q<w6jvg)_3S_fG3b$!h<59^;Qji$-}?!hH|etxE5d0GL()YQHnbl%
zv>(rXG-F)kx9isy^zt%i#XkHfL?2@)zP5XYUj_KxKm_>!#4a&6QR3^5oLtM`s1ftW
zIr}F$pJsr!ljJ;7J~u6jM9NWgCQd4K2AZr3!o2{4o?)(7LHBAnX3<I`kEX#?qU(=-
zqXj_UudH%1bhIxjUv8HLmcBnq0c_yJdchy(#2nCJp)nQ-oeP7fGHm2mnEV!bd=`@2
zv9;%aV+Bva0+;d|JMf0;Or)KOn1V%n9{QAR0WN4-aeq70`UwV0eE<y?5slZW2tDGO
zvyMY_))Kmgu2^%K23(THi>M9<jFF%X!|}+yemhFGYTDL8f$+st!=epCvjo2wcVDS_
z2OEXeNBczKdl#Q^0KL6@ATs*#Cd<gZDi<9<)uZFFq)ec3PRPLGR{y_^Eakp@pTU0s
zvJ#Wq0pG7mNeYRQz8$)T7`%vdN%^tShR2|VlR?%LQf?Y~f)lM{jKseCEn4Xm^)Ix5
zPLow$5cHRt6;<QN&ct?QbU2BnQKzNncovyto7<VfHVHE}ltjT7q*5gnP?D&drzlh;
zO8x*%Ff*c}cw|P9awX*@lwPQy$*55x8~fUJp#;b(w3{=RP&h|QFjmXMNTC!#jg$*B
z*2+gaK^aIX*D8N>uo3eEmKx#3lYkZuak$obq3Cf1{qS1~oaG*N6plv$w9s*)wos(R
zmzo5YQkjhW6?(O7Q6*s_oQJH)IuOK6V3KP}7ku#hB~Ri^d*}L#;lL*+O%(yT)}@#j
zS2rPXlbD<YAtNQheMajl0Jp=G(Cl9z&>x;JQ1?3JuXN;X$Z5D`KRqz6e7RJO&R`l$
zhpYlZ*vOyf*;q#weuN3(aKTx(@xF98>mA+5XAuWg_hAC=qaK8_2W7g~?;tNCI+}D!
z<1v$jD;ZdebtN6eZ(7sTwB418<*QIJkDh{csrX|3Xl0KGM=K}MIBPi7@{?g9f6aE4
zJ~&s;HZQr;X)qdCKwg@HNA8G(Lqp?sn1JoB(GM2<6h+hAK5D!&Q!+b|RKZprq+#p5
zGJl-iKWktY&9xBAEGUQ$_?kO6Yd&}T`awFxa`jB0p#jFg0P-hg1U(pyJizdJxE%L`
zNZejl<XL<0@9Y-HN{-iG2Z+CH8zxdZbhmU6$2>EBY^p|ITVbkh{HRLZAiq%;OeRI9
zZWP@x_Td(hJBQGT49>sK!29S|;vDY1_LE2OUStBxXv~jkYCToa+(~bNkPudH6tNCK
zvf=Pb&{{Rr`*((bbnG4dDCCY466;*4)2-h(^}Dxlctd>dgGIaBVQm>$brNU{WB!YB
z*yPRHlAgKJPK;*Eq^I{lCDu`b;~;gH9FhWbS4GSnu@{Z7V381;HQ^0;9z=G>U{Q&-
z*vv|+cg3BdvrDYqMHz~u4cb{KrwB~UU=jK5ECLLxciZr}b6TdhSF<XU{W@S#$DkQ;
z@RdD=1h336o2?!1Wa`1l&R*KZtH#Y@&B`P~QZ}qdqy*2{vT6zrP{<|M@EeQCT2GCI
zo9dJenZbqVr_H4e3RL>=VdxmD!h{9th4-1y&bDpAI9rzYYEl1UT*zw8z+x(0p9IA1
zd-_?#8sRGPzlp_?-yXN64yIE9HE?Y-4fe;)7HapqA`WL@XACkrx7yP>si#EzGAt^#
zixo2nd;;&!n(nIp!iiFwo&<icFs=DnhTm;6bHnDGnjOv&35)A3!FXB<Czfpz08!a}
zKrpX11`sRLXyK$QT7viNuaUtT;X7+uk!LdKVDrvUc-*;<%6Ba>+sSlTQ=WHCQ9qD=
z%%Ngkb^`M|#RobNzEc{sbdt?3D1t}4zD6yLZROv*?r>HZv%Ydi{i|=VDWC@Ms$=!y
zp_qRF@o_P+tv5jqm)J1Ia|ST1aibSmMx8TitpyW`9e8<d0|x8;2d{1N?>Z)Kk{YJX
z;$bhxLrEJI{;Zb^v(=I_dvix}C6QfLzdGiX`#{RlW))S8+^Sv}M0l=A{-IKc)2tXH
zy>NhSS$aB8Mw8BK_1>I2Lw|#64liD1Q_-~h*j6kN+fA3ev_ouDJZHP8lx$N_Q|XN9
ztXxpJs1qoGPa~<Xp1Vohk|-G4O&7eRw`fy5`v(*J2Sfc2HuoQ_AR`I~#5kfN%*K+n
z;5?`K<DR{A`NQb0rujd}vdxl8jcrk_rAx|()tqIAjy;l&X2iy%jf-dR_%xt?nf(@+
zBzcvUdpjV9CA2hh)uA7(onKzUl;)7I)dr=}^a^m`w;>Q)^fA>v1S{OXGX`ty5!JoX
z5=VU0u%es@H+Lf>E~So`Dot)&Tbow>Q54i=C)Q7mGpqILa{b(`L07G6gqCxQ<W^yo
z$^n`V?4>hnawnFg4s1znsG{1C&Betebei81pCSI_A6&1_b*h%Z1L)VwRUrh&xoVC0
ztXGOJ47N*^4Cke46_W*rCRtSR5=n;yZo%x>@<_hXm*ulpP-dqipdukjK}0{NufW?x
zbl!-ykDseb%}4PC*mn-H!)teLzxMk?k>x)$@j_bsaBW~mh<qmZvZ9<?08+usM+Qsm
zpnoVNCkr(3<<@R^3Z$f_O&csm7~&kKoXi-6<P`8d^Nyd?i>aL7;S*=!Ul`rP>J*<+
z!Qr&Rf&_IQy9^a4JOILZ=TJsZR{|m(9LbwOPz7aiM|kPmx=fyo&)x{3arsmV4vDfU
zpuG1L{8=zZ{7j5{Mwv9}$_n2Um6qqMRSiSESxvQ}H>OMG_mk=h*M_2KAZiP|1|dwJ
z9kqNVsS+NI4VrhtQI;Zlx;@!Id6)t%L}*RsBSAZPw!|mQhu1I%JA3`4Bp&e?NR}gL
z69rMJE_!o2Wv6U}+j@x9=8n>;uesJDq^9=M%T}#mHb(L11xYqwA`epN{w@b3t<nqJ
z>%;1cljgvnO{|+S{YHI4cbGQ&0;TanC>z&fGO(3>EgjOX|3wu`n2vAo2-@am#7s?(
z#z;C%@bf_@D?&<QG;%DL7263}<T!l-C~#+bIG;>TT#PU(luK5EJXDF+w2#O+1if%e
z30N?(0oAyNf-$)v!bSEV4>2W&^LEXwnAJ4OeUI;yZn}dRgR?h7&Zi26Dwax<KM&{b
zz~2!8eiRPyz>0f&jt+!aIZRYY2vAKcC0yP@*b#}jE}s#Rsrp?gDE)#^rp3vgU_3N~
zHa~mHnnUp3=r6|rtCEMg1s|ygjNBK^FHdK$l8?RtA1Mcnod0*pzMy)Ku?rvP0E~C|
zdC(xz27Y(EIGKq%!gvyc62@RtA2$8&zv{VHZ`u3^v$#-VaGwFh?;1zq^xE&?_wX@}
z%t&ay=8lMI2QO=dF<&yE!z86%U6D4z$PG_?OFECW(!Nhn<}b+K7hme0UV=2eYfmLs
zr(n71VopP3Yn_@t)>o`xxMy7`v-ui)v@c0GyNsobl8T5nt1XC&97dZU5_F9Ce2$V!
z)T-`taZ||q`&PrHWesU;WwN)1O4<Ficme6wiez?K7RuT^sE5~iD?LZBnlJ(R5R;AK
zr^+?#@q2gx1kcx5j4JGF!}U;?)m@imZ9mo5!mxjz62{0^SUw8u4Cd)H7+_LIbf&(I
z#SkKf-ViiE)V>9Qh~5Svy`O+ga!EVPERO3}mA{+N&kPcrd#T%yf1dq1ybo^^6{ot!
z4NiMP(KsUn2q{7JEUE*<nDfwPd#E_Ufk6X4na`jeS%eL_HrXa%P0XVeU8=;Id4$Mb
zadj1r?bYHoJdI;qLI_4xd#wNI>D@;vX+lKrE>BlPKYdoyWW1aW{iFI}E|oi074Dbq
z!4Qt#{o@&pipLAr&qsA)JC5!pLLs5bu-lhH_OTytxk%G;P6Idz&&>;9j6-nLfs$kJ
zL^$v>6aXqX)l?iEw8qfmP@S4nQJFVl7r!xqQ{4CNF#dKdW(ZdJ!VAW<f*kf;7h2Tq
zJpQA`w|+r<sLDC-=wpy%-s5qd-7;G+oX2rNyP8)>U#8Qs5McZmT5+(gSS@lpqKfbI
zvi>L57Agt?CNly^U2AVmU8kH06IP#7SG|hWcbLsbpm%i@Jg>d8)y6<`d!X_TXDjNo
zKK1lYmq)CHN9^^0v-bGkVc|2H8g%G#RjW2E6+NKP?H~h}@S#OGN&03Ie~d)^D40Ar
zZ563XwsOyAr(ZQkJ(DFOrt8422W6g3M6hk>)D?o}BIA+LQ>AU-RyBEP>tM4TgT9hd
zTiJxmG)5&<rW?&Dg8v#<ND-Qn^#RwtF6n`PpLychajz>~b`waMLvCkl*t@daTV`UQ
zR?yEaFAR-h*gE<5HU14x_a><+1**@a(l}x{Ip_4YV1V9dN#Ixh-eMF~Jh8K{giz-?
z#Lun<y%w5o`YnwXWEC~*Bd><_`7s9S)#DI~UGx)dT8Aa(_tkGw$f@VQ){01p67c`F
zRwA}0HXi?Sl;HpVPW_i{S>izWi5>P!N6uagaiz@v4Ajg|u6zQPS8yKFQ4!fOc0IH@
zI5I4|ez>&zN=@5-VGH-{NZBBHaW~DqpBm168`#PDx!Lssh{GR3oMhxeNvAJ2_>}e2
z1oD>X2<9+S6r2!FEC3;~z&QqqT_%QX83w6sm+SyYDO5R=Qb8%fHEoZ^n{jDcm_CGL
z-EN`1*=^!#J@ME1yi27_F>v|C>&M*~s}CBxv-n^ig^C4L%QpGKR_aD*Rr-b53nxF>
zFYyUJbfXoBeMhMZj{>Q~2HJ!uW%S>HoC$AJ!VuFPtI1_Dl7S?+M5;>ga$oFUw~Ft`
z#f$C1BbPErxE>e^rZmMB$Yq6@#l^nXjEeP-FcD7Hi9JP@GYiWo3vF|nZ3@jW<88@B
zfOLc|WZO=%J^WYM>k<{RiX>SxvvtZ!tm110K0=epAtPPnX;QEUAG^y@CRbn|oINoj
zN#dRG3xKetW=w8XgYSjd{|{O3*d$mNZ0mN}wr$&0UAAr8w$)|Zwr$(CZCkhAea?>i
z;l%m@Gh#(X%rSH1crqBJydAL$C<x32o4Fmc=cPB9h>*H9W;z2%&k|^ezk}wSG@Frn
zu|?`0owwF9dxfKu4+7Y8oLD5wP8Y13V2k*DVfOUM?$N>UR8~3Ipn5)bwWvIVz%?kN
z_Y1ZLMMaB708m%Ps0DCGOsApu<%AmwI%DdMel^+-sWv9KpZdTN*}nA9rq(epMBg<C
zE6t%u%?p5RNIAC1i|gjxV7F7VUs{h(9L*_Dc#kVHFP8tLyRbta^focWy=O|g8w!>W
z51MZW|8qdHz18|?Yuw!LfCMXK10f{%%e>e$U6=3@Dm#OR#hPDFMd`M#)BzGC0}fC<
z$USc+zvyf1>P*jFOby6ee<_oeZ-sNFXNPl!%^+(4+7TI&_kd)@AE>8c@_NI14#c{r
znyJ(3U!b*pS7SH@c2mB#^pXEus(-1Y#>5%5Z&^}sYbj--F##g&aW3QxXsiK|3NjX;
zv;EYf$}00hQFudE)d?4u=8R7PU;DhVsb$9X^cVFQr(%0!?%9kD+?|NNJ;97d)XYrR
z_y`kug+Lr`YOfQ30zxy5T)WEYQ{e_=0%tQa#e|l@lFhhzD75V)IT(Q7Oy<w(F_RB(
z+DfGaVU3@VFjX{r1(H{n#RzO~iRbMm8>i^SCbyqpTrZfC`P_>R7iXtywuP5nD|ZwC
z_l(-S%)#uGr0rjJu1>-AwnMGlhT*vEGuFRVxTM@u)~&mZ@sR~xxbAfazma$91guiS
zM}?Ld34cYzU?sTowYOsX^)o)Pv{a(V>_{L0+6ImF!TX+pP8>+4;1yY*t{>ScDvhq8
z_aZ#XuDaw8KN2xXY`42R79|AO8Zea|Y<;y%QDM}8E>KR_$`zugM1MXM@<|{cK!WQ)
z)p?x#+SH%FD(T+B_=~C`KYE)y_qC%h6`9GUeSS<+KCjbdf;euH>I4Z*GV8`+k;{Gz
z{o=|}Ys^M<${b|~S7gNlQuU0)P7or#Z@~+#0?4<{AGzd|>j`t3EQ|4rV&OKF9W`F8
zJy##MA`*An9iMFs9n?O9v=P!9M>SDvN18LV+J?acp5%rqA^pKHjx?8vQWvmFlZ>n_
zQ(Hu+&VnAX^4|fi)s)(ywNQK;WDFV7TB1f=q;<uxmc?|5(npccf3gr0`A+W@Qm(_(
zxCZheQwja;AJHv>m&DNBh0`4pH&XOYHbsB*WPUECnR>Hg{oRMg6Gv>+yS+}2mn*xU
zv8UJL%r5|P7);StGd#B7n_%`xKLV3GcfcX*>MjJ|08(6=IyF)O2|09iv^a^D2?Z&x
z>@1dmYrN&Hn}UuXrY)+j(zR$*qAaAJ>U%s5QzA_@LKNlCEsE(h8Ha|na(HuxaW;x0
z{v|7@B1XmY_zaT<r`}P5CBPYKi(Mg{R_@7=80c`)g=@eUBFno)yzPbH8)O@KP>n4n
z++sxji&O#=Q9-(eg251!cL#h&=%ZTUL#&0GDaCq(X<+M#$LEpSiR1#2^<Nq1V-dMA
z@bz^7a+n`gqox_t&bhjja@j4*F!MGGR#Nvrl<k5>Oy46hVVh_IrBg3L)lf4McU1*R
zkG_eesA&yfzzSN2&1h38WX{rFU<Ue3R4cOPD#{Mo)ta$T#L+4^^@(47Z*|m!WK~JV
zh><?6I`2Y6NT^Rf8|97Udgqj5l@L2&)zYZ)AXvnz&9@|Tfm1_WNvl>a6UY%?4E1^f
z5FMHJF4cq7=>@Nm*3YIEfvsQ~X~pVftjD$q+d-)e-0frSR0}x;;ZY9|Z!Gv8z4Ij~
z$vl1KIMoUl9jBTxm7Ldk!!=}C&yF2C1<62e`>rfl$?M)ox0-p3_K+H;0qa_v8!2mg
zOq|^Cft=St!ulSI|D$(5{K&VuxMOT3XjOL!%i0(*g0(G**2rm#qsUi<$HbyLoWXx=
z|3&WJ*HD=P?KSaU2Qkdepes6h9mlAvM^s;}o<RM6&|xchV$#Jt_ul_(Cws+lHa}30
zmJ#vxLPveSc>3Q(n`8?L@_#uH|I@?#jpV}q7Z_FOlNh9j@1ncp<92z;1@WwrlUGxF
zCjQr=kj#*^O3e~XO!)ppYTjN!wY|;(d{6qYJvmW1A#T{FMl?}dz{blBzJhfTmmy9h
zw%ewRnondo7jMJaY)2CqKs<{6K6y7752F>cbj<RIl;8q#mO~%Lib!FNW8QaKWQs2C
zn3J)ddSr0=lET&-bS=bb<mSauZ?|fBgzS7Ck$L_EtpOu>ql>ub_vZzMLm;di)^&MG
zis^clAf5dW!Tt}fQs71-*vFNWpz6~SxeHHZ)uH+~tgw9Vg>3+u`BgcCb^&#sGTS0R
z$X3UkDX}^#MM2t+%J<l}T9wwrh;a<rF|oV6?|Y4#7Z7R3r{I6TDY1;{fAxr*zJt@R
z9*O#G<^QKgHir?uaq)ljEx=B*98GSFK+F<L>nWR}|8$^GmVDuZ4~B0pFp#7`x0!0v
zyzg)^ee{#WkV*Qx-LJuq9$ijecXBg*+<)H6`|A2WVe54IvE|3!wUs{6uy%Sa;)(mc
zR8;yCqe%l%<;`oc=Bgt8Mm_t|LZnFEIERj<XeQd>IjK-~edQA^i}JMkrPE4!Cu0GO
zG*G31e_|!o18Mix*w~msOkSa5K^|t53W6nwpH_Up5ggpDXneks(zHv({6v*V8UoSm
zy1S<vfTuSnzbVe8v<d`7W62t;4>ZD&ouTdU5w(|LtiH1Y-<W4Zt5_dBx0$Z~?ublS
zh+#h~U+iOs)zTqF6<+k{{tzNXwNE>d-e2-vCJ~KF93g5iLB=f#+{?-#X<#k|lv>(b
zc6T<rum??0iC%<~e;^3<?K=l$wcWuV|GwB)ds-A=Ql$8mS);5l!$*?LRIoL%y_sIg
zg_SA2@Cov1$JZT>ZbqMaei~qs8LbT7n}y4rh^aKT{)m!jiFH+r)awg&8bVKMn4Xi;
z5_6b0Oj%Tl&EK+>%@W$!%%KVof-hg4bBQjst4l-ArzKBZT3Gz6{2o?3$YJ1ggt##-
za4jCUOvbQGbjP#Cy!Q|++1&AY<YcjT2FG#M$p5E%K;3mNC))Oj?|6AI`nnaj`A=$S
zc#bT(x0A2{gSr?;z{OW~#5Tfn{%R}XdWq-k+0)6S`hLY(Mf#X&HFW}iFQ4Qw0fTt+
z0^!=4$ZLtnt0~H^N3^v^Ty3K86aPZ(@J&zZ&XFx1RBuxBk}#a`K))E)oZAY>ND`b^
z-%kV*2inIKd?uR%(~nUc*zjCGXWiS}JkC%uS`LOivQ~dCzMY?l=<xIF<qD0jV%Oej
zviH6+Ih6@or_++i4S29LiaKQ^nxj*4dKZRSIon)q*?2C@wX`843AAqUAErBnLXdUt
z&0p5LO5Q|ui}R6k+PY=R-FMU@0uh91$0GAL@wm#rrpW+$aQl=Cqqhq8hMhcclXDfB
zs<0l3AZ07KA4Edr_tZ&8RYjTvKyUdQuI*DK0zuYqQ5V#<m7F_avg&oTyH!9d2$@Cj
zIs1P)>-;nfwAPRVi=b(6)=|O<1ek)B_vD=3D;Ttw#=AU8Tp$}drD`GH^e&!&zz;h*
z_bccZL89WG^mq+;MhyLBaEW&q!k|Y!+MD8WYR=vbQ@b?y>;=GhZQ28~a!W90V4@W%
zHKae&S>X=;UD)ZJc)D=LTmEBax#qQJEXh+2!dgj&%va^8HFX!whs1PVojpf8Y2ES2
ztp8&ewdP0p#N%}<ddTk`w(eakc~&5!V2DjL)jZHc1cKN!a7~HUGVfY9VPzA+8QT$P
zq@V}u%Q;f2{>{3>p48@4(F7YHLgAYR?HP8%S9onbj*AdjCltiiD3qC)h=9dmtz0EG
zf)(+Mz&sU9d6!da?z-mTZl2u@!V>tV9E8p>z!>WLnp|eT^ni-ef9?)g6wA;qK~U0{
zj~XgOp0^xa$&_Gl-(;lL+k%aDQ6(TfqS8YLQ^SC^BTfSXduLGSjoIL85Hz?a61uV0
z+9<ozZ;(<g(6(>ulX4!Zig;o|B@B8kxYW*1=Ya{=sTRG)lA)Hi9YHVn)s8A*nwqP%
zW}ygo^*X5+^*rGu6qIUa@~axV(}G1ayfcy6?=2A*9D)<FZWP{r>N8}4&R;AwuoK*I
zXMk0bSp<ApzRXN&HLa@%G{lV{Ki=kBu1B#)aEW5fqj-&eYjHzqn)zVKje1O@Kg`=o
zFcoGx7u(Tc6#Dp}$Z{hXfxHO|8*}t(fZd2G^9{$XDl+X^ymKHLqp|GzgtEx{EL&fr
zLa6(%i{hJN2loXKJPM-VzttKluk2NR_lakFITpRVE4ih*`RYp}HqJnp=^cX#7lphg
zQ2KD{W|+S@n--vRpjOQ=bM2@bQGJucHCS`DOes0CW>qlcM4B)}mx>zUmafA+bWl&N
z)jJ^`aFn-YzH+;+?$J7D4L&qJ-eILf9^Ft)xP_Jj1hdbiCtGHpt2iA#^8W_Lx1-tN
z6rAm9xxtMJF5Z+Z)QRN81O5uYQ-b^2n4!Idp*n=gF`(v&3QBUI-qc}>a^9$je8rP(
z4i9VPF8dffHVj=V97bLKY1)8eIrKW#PjAVxT3fGh?KTdnyadR`D_eW(r$t%*wOHp|
z`qn(#xW!Y++u0Ij&z!9M$JCBmk}r_SzCS=g$ynPyjH-Nz-Qd<dRa^*`JpSHy9bQLW
z&XKhtvtS#>rZI7>D@|eB@Kv+luLTXxEte$pp-Eq(4{U*99rqHduQVyG*GH)hM@xjk
z;%6ob_p!}mvMVlWc&fQ+wVC8h-1AxZCw7UiSmHt<&5E7Q%ZTtwcu?EtqU_UXmsrw6
zbuit|VB=!2ycmP>N-1a`EF%%cV0X}u=+akh&O6D2l>FugP$JeSWa7T$|3F?vHBK{V
zqxl6&hR>NsBZeZNfj}(bA_jvA-7+jt0g<F)kbF9Q|DmcWuPwyG9E=UiaeQr0D^}UV
z`ew*JqPwpQP?Z0N1wlrY_K8Kxyd|KtP?sB7I7p6fBj=J?e+fplu9bQa;wKHSpZ!Wg
zTRaIxn|AvJSDQLxTDwc4B#CzqmlftSe0Hf^I-E%+&G}L=X|AMj+*WFarY*Da-PeUM
zLs?d&gs|fnk-||8Pex`O-JkTyzV>n5v4;Ia^Zd=8)%V@Fljg|DGv|%%>t-RCkEP1h
zRTh9s0o5AYCN;TrK+=i!1aqb30*9@-gdNezO;wvOes*5hMXo<E6SRds62slE_K<r?
zK^%27D`c(-*vtld?vN!}rG2Eo!-*!klWhFt{?ZgoLd|4NYeQBf(SWbr048&aoF201
z(ejzd^8W84U;G8C8wX?>0lRv`b3Y|@Ky6T2@+jTQdaQ6hyF}!3Sh$!78sxKy7KN5#
zIbR0OPwn#O&rPiXoQBSq9|lTAe6D$oai8}t2{glt>BS*}&O*55AgLaLJy4-BdS0~8
zDgO6#hUPM(4lY@O%<x@h%MpgJGr69-{Mz8Y#|-?7gobtd;X<FgsIxdN=b2ch4v+O}
z|6z$^YD^L|r~so#&o!kfz7+*SwAP+3vT>N36C8JgDuNOv-y0Y5Cu{sXCa$_FK_7a1
ziZ$o;@%2V4mlc1_ZF3Y|EV>sa9%S*{X7Yw#sg4q`LSU=gA2nE5!qEloGC_wHBfjqk
z-|9MY_Wwkh5PaMJ`teE*wzj|E#VkO#%r4~}%l}{<bdSEREZ(((ruW?RTdN|P=#`D$
zOa!HKZOgSqdK86gx;+bU6D}#W4Esj}YGiNSvaUO>*+*nwSvgaByrEdjyXR%f7J~jS
zWMAsQZskEC&Qpz`(Ur@!NX3AL0M4LrY6egueM3hPB>Vela+HuN-~tu{hnW0Hv}s{u
zj2b!ZxF@FBC$+?X$f(05!5m+|KY><2uM6n|miEb*1jZn0*^`y}{{*la-0`)HLIX-z
zJ@>9BUwuuBVj+|ggc_I&lD`RowDJS#@~jK34D)jRjWF35ck461c^1>tVMkr3@+M*T
zx{a}WG0vy5gvxYsGheaUKj@GmJs$_`kdTMJ;_7v(JwU(+;+lPrXBy}fb)EwVW?HTf
zSOkrrp4ik`)_aJons!3Q1731215{$*)ct3C9Q`x~AcUdgof3%bjCOryl2KKSXsTUN
z=}l^n7GV!UDD4Tk$rloOR(RV>tP10tOWKhzWDSPSUH43K>brAMxK1rb*kl&OZ$oBa
zm6VkN)!LOK##%+x#u%M+G0IzK<Unq&Ww<DxsRCZLzHBCCX3>HPZUVZ~|M=K{TZLo@
z71GF@51rU=#&)+N;h=9>1ePUR$XNYXXz679R@uxk3y?&1n5(f}#?yOp7wM!Chh0ve
zX7UwuK+_GUZ9o(S$!#P;(;vt?4b?~SQB&q4_GC*XQ&@f=Ffj(Jd^UCqrIM<MS>(OI
zemRTM3M>J^fb;J2yP=k#tt(Xc{fD_DzdL5a@$X9UmIuEq`!`n6Xsz$j8~qXSi0ZwM
zDWZn-Q?T9UFbRg;Kb4l8le)w9x~;bs^v-5%HNyAFH$_oCXww&4S|7tG1nQp@e}`D%
znFE+hf?XnAh?f^A*t$c!|B4pfuojRI=6{Arr1gJGb{FzD!-r*QizRyP>HiJJdX00a
zv_0CbrH`)c(ZxOmA~uWfa?OkGPrr^M?x}uN&Q&3_G4S<5bi(r?cbTm!9*n>2AO;(H
z2+g5&Zst*wQ`5s45DK@)q4}^z)!a9d;Q0mb+p1FpxE~1tK$T2}fhJeQUb#jZfQC}&
zo@tE)9NtP@Pd%05r&i1F#X7@I+_`_mIc5L1UeoHKRU$%5=r)AT4MG_Ju3LK^G4=>Z
z4Y}wr=Q!WMeKJpNw*i4b0QaS8pr%Km!qEb_Ra98Q<rZGY_Cy_X0IH$dx1Ny%CJf-%
zP+56e4cn1GE(=XLeBst2`2e!-2iqSv0OT74^9J8^qa2@GoDR@|sWHW8;6C5Tayk76
zd~){cRCS~HH5oUQlN@cRzROHFOwf~zWd7I-*Zjw8C}hZ7*%cuzFVc5c9gf38D0{Np
zV?guJ;UDX2x@raCnf|S&e5GelvLH#tyAWE(vja=n>eJlf7qc_i6m||1uj$=Kh;ei;
z%vF<Ae7N-Rxw_;k(X3!CS6D>8koKO2{Y6%G*3I66hTnnWPKfNZJ0sOw{-MFru3;|8
zkMjh`b$uiaO=x@r@C+Y5*vNnbh84{KKODcXs4$v&8mh5I5sd+HQ6At{RSYWJaeUER
zrGeyJ?vkKb`z47e*>pwoq)>GTr`aLs*-L$|jhjp|O4~=V*h6`Yde6s_tBDGV`;I&U
z8U_fd5IQ;cC*u!W3>7q-nN)I74+CU8&}7mr$gm1em=<*J4*mV~Ja94n+@F?__1g8`
zTV_l#4Asu{a&~Iz+@X$Ky4!sR{3`Htr@~`S6-(a!QtdN!c}o>}%Wm57_A>6LA-Qg9
zH9~PTlI-^TzXgN;0%+pc4GJgWU6X6Wqkym1J2fJ4we}Z?CPluP-y{)}xG=rwSrc$H
z-~MGm_db$LF?ec7&JdVKz?3vj6e-|+CIVSq=JdA=`V{93!Av2h6%t5qo2v&h8(54I
z;Z-tVVFV7qfHAwI;;|q8*&Zxf-SjU%U^G}?y{UyB9ROc5`^RP@;PS5^4>udFSx|{>
zSAXI!_CCVs0DQ-AD`c-pBSkEIJ@Y_?pk?H*2{wChq2Lc45<!m}4T8CIYZ!Kdg}d5X
z$+O=Y*1!$msua<I%|Cc!KCHfmWf4aSKC7r!D`h7bNfxzP$Y=my4J2Jyuz~#jpbL^0
zA#MTdF9sue<6d>tM9g-^RT!TVW(xez;oH9O<!Y5oMCf-^o!{axEaC~%)lQNaB<D%e
z1yeX~eH_4o_)>i5a3A7BsXuGfT$6pqfqKG7>oFSJcjZ-NL7x+NRE{gy@{`CkBa;7z
z%SJEnCQ;H|VhfaGE&2S@a<Yc?vLxh6DIuDq0?KA2e5sdOToTvv*mO@$9QUkvQLc`E
zMCkTFKk&>^Yp#L-s08mt0y@74CUJo7QrBFe3RGi7bbw1u#i(zf`Vx;@ySm&zxw(FF
zpo!zPHo`M`WQcX-^begP!y;i@no;tZc>hrI2wc-?MYwH9=|@lnD*HsYa>m_WOtvJ>
zAgEe(M9eoKj8kjTS5O+Yus=GHK8&m?^@!&C4nv1Va_Kg(j<qo6L}ZR1q>JzmTp`$a
zB?X&8yBL}T94Kc7-3lp?+>nZV!P^Q#ziALY6S9Ye$QP_kerN(Xdsys(U9wvNV~78v
z2In;+p4#d~?w@Woxxt@aAmusZ+pw@Fp#qRZj)W<eDntrT#WLKZWKP46-g=rA@?7}*
zzo;`JQ{tb%jHx3tUx!Zm*{hjLcvo4Q6L7w+q`Z10{3O;XLnE6@NVk}Iw1a4*WlXVo
z5>T9iLKGq<lnL$cuIX4eXIxZ^=pq58P&k=;z%oA`mF00a`OfKhLjH7b`R|{QlXBrY
zAlHB(*K)El{z!|+8#qFWwpQ!U>dMOT=q=028*4_%5uDr^*qbZcHoQIW%^8}ui-I3(
zMLq=*HSkQ4EV2XhVe=WPhCSfp=deZ3^5>-EU*pp0Uw`Mn+1I1;cwrfv=U}sUkJLyd
zxnB9VIt~@DKrOK4z;^HQ79;LHn|z|YW5Shft_oWF`^*@5vG{O(`FQbi%GZYx8hPOW
zNZBKGQeX2K+t`@N04jw}Jr?3~SX*TN(C$Lw=>>5_O@jv+p6Tr2!5zYd^f-hu5F6^Y
zQXHC_Ol*?ps}cl}9BZ{{8Prt?rJvFQtR>}&HM<W7pWbrpqn-~v2-Ps3matH^-7q0J
z(<3`_1MEi*a95eVDiLPJNc)HPDxzog!}0Z!`-|F%=zqSVe?up18R?sNs3T*IPmCt}
zJfj}|%Nk2pimPlF@DI<$g-n+8mS7n=MRXHG2#ukzsa9!IHmRYUOL%f0*PmKeWb$Qt
zni|l$h9Kn`%4Hn-(ihK9|I-9~C~Ul1bIaJM#bH6=k^A>iu#YN~Kdh-tVh32DTMz_s
zh)prY?q#iYWBP-bzSwT#_iUy*UFv$Os-3kL*NEe!U7mw|-z4ViLYgEJvvC${3X2$O
z<+i8ZZRY~2x0G(GTR`|4IT?>HrTGfww`ZuD=tjY^MP1IAWR{DJ28K+9U8n5N&CUe{
z6v=n=oXqi$?<h`sg_vWFJ)j8Rt^9%oTJ2iqjpWS-+X-P@+V1!csd?jA**A*?s^|8z
zA3p1zz-xrU4Tc-?No(!;t5}}u)uVqnHmgVO1p0xe@L~N=lu<j5bZ0++4K;5nl>vWG
zm8ra1E_YIMHiJE1)OG+`R^;(y6AO5=o#@*K&K5J@;brcWl+}C8N@kOG`7(7gEqmC1
z23|pi8ZEb!oU6|Dbt_ff=&pKzN6bptd{q4%BgtluV75kGA7cDFvPRix+r(0g7Jzlo
z2$LWpz0hoRHhjva1J-mtb+jS9Od)Kjo4dHqJ3Cf0L}x(qli*AH8dvOqR7y*u<W|Z$
zH#)m8Jd`P6?(3W=DoT<`;*@0l>a#`SbNwsHHV92E^5c@+FO?e)FN=Yf=g#1%8<+0%
zR;)5iH?H7Zyur%Pw9@b>p^Fp;enxiTA($VGZeb<PO6wi?Y5e%mB&EbkgP+zLYs-Pw
zojP@xxwMid(p}P^xQkZ;leCJE)={(7k~Kvhy{$-2Zy@ta$fp}OdAj}{S40@$sOiW(
zcqXPhz9-<E_Cj2~M%ajZnfnOmS{eJg+Rc4u^_|oepOw#pF2!uIT085dvF!FCc;_cn
zY_wVr7JF;knudad)!)pJIGcBG5f2ETRvBOSkQJlNm6m5N%%H2Cy@P7iKJP4J4uQn@
zSmwH3b8tCfyF+THC>h(2!Z|8QHZcG(fyLJssF=$a+lln}K?#Is9IZu<Y=pCs0R2nb
zy)rWq;j4Cw_KNd&x31*%+}^jyAE}2g)=dHx(zc~#nR}V1uEv`vIQI%G8JiBfyebx6
z@Nrx^MQ&Z6u81E>TFB3LN{701VT74a>^&d1)m9V~y<XXx%VlKWVcO98q6Hm!m7#&=
z2NImIs!@~StBvDRgZvt7tk0IRmVG8-kHPe=a%p@PrO|bMjVrv$iF*{zCsSl^s>T({
zy)7MhwT_-JiM0T!FHIa<CI{v&Y(aP=1?*nv1ow)h5?{woCOL5*74+w99refMeUM_^
ziouM9r3Jo030aa>SKFe2tmsH%kIGStYT+Sj)T3&?4r9-9u`+lHDwMyyq^lrOYf4#(
zFKQBa6a9YS12-&``%m?bm9YX6qWq8Q6|}XswzUy<F}86c1SI)=ur;YjM*Ke5{v+k5
z#`6&8u@sF6m=Rc`3F6Ie@z6-hRoPeOkBY=>HTQHAjkz2W^H_yB(R)mK6}*YOAFiEO
zUfmmjPLOCd;Mgo**{qbu#FSD?_i$Q1*zYzYfKrY{`iD@^#)%M+=E7M(lGA`Ii;tK?
z`05{3<}NjdM4OY6NSr!p<}m=!xuH-{J7@C4%J#Dg_*>H#KL<N^4SiZ%khxT9A_F_v
zu+q^Pq#6nUOpBTO1(JAu+#yjx6(Oq7Q+(6UsA@gZ)OSE|TLXu-Aa&<`#_DTgTbAqh
z;AP@j>F-JZ*~YuJa&BGOmLZR5Ul7x+mlqgzk7^QGcm<%$4%@VByiGb!4I^F>{IIHA
zfUIV3uu8bsyM_z%AO~&fbl<V4+sdC#Y~L#2WBM3mq64^4u}4@u2^lQ3xYtHSx*Z|<
zq2?s*c87SQj(n29K7{UUj0?(;$`pfq#&d$Uc}somM$3jaC#ydmsA6G^=tVAMRBL%Z
z<pAdQ2<RSpyg8L&0yXB@L|3cYh2gjV2dBr)VRjuj=N66InYC1{TKtCzWltzrmfWcg
z4+Sy@w4)n;G0r6DJEiqy_$~ZZ90|y7WiD-;<k|-Kg<#?U5B;a&UQCu4uYx7-U?}L=
zFINL<oq}Z1CDm2Jqja(1RC@bLk~t8oy{9^&=KE|OCFEM24KB2ACqL!Z!(NFS4n<uO
z?y$@O)%@F>XW)bm%(^V{zY=mSKnD5W5;D_w&^L7YKfta0UkJ+3f5r?e;{O;k3Ojqt
z*XvDL%w`U&tHSfh9EB^nV_gUM^oXu0bt>~=iCyD0Js92p5(l@mv?p5d48k7z_ilfK
z&WV9TS>L$4?0yAAuW{CH_YPAQ$&@++l?F`#4T6QZJ7+P)fpC@t1XF2=vG&Q5tq2w{
zWf|Jpy;x6R5K)I1^bpWSig)Ya)DxJC>6Sd}r>-29a|S9#$6ukAI^+de6G(?0mcBe*
zdemnfmwP~dT#rdAV4}CxZ>bT;+sF!agh#ikDp1c1Ck_E`sS3^tj>&mk0ND}H`#nHz
z50w2qTYb@=SSo$b>@*XcNFa*XChl#B6ccbn9_wEo>p#kHyhq}brKvoFk=MLjKQ<-h
zsoD$)&lL)UC*qS$V1J37XeNd1ryLFuB-x|RPGuw%@IgH}IT5MFvF2VV)!49I$p0z`
zHCC!oDh;B6?TT^q9J>o4>uVZ?Sy1sJE)mOD>J2QlPZIX0mAaP;sYjk%i6PWM?zr<H
z5;91JgIkYVW-l5SxCQKyl5}LkcNr=X!p>sXPOecl&sY-IEYEqf7Rvl9qDVnJSa($U
z2UCy)jo|PHhl1NnM`5Wl7QK<;8KwkEY<d-faA^jQZ;w{55K#i(gO90&$dy}lI0b)`
z7&Grr%4s!7=6Z_t?I!39EB<ez3D%YUYjn4iX1Ah71esG%r#~wIB-8h!3I{6o27@O*
zZYi3h)uS356|Hu#@GSY-ZyE23fI>~rFSz@!dISn+Eq7Sj5`yb0n_3!f0?G;VQ-YnH
z`oj-%r`Q;etSHrBpTOZka0KDOUbpk{C4AJZD5s5@Pf~1(n9@?zL!eUU`LH0EvyXVP
z0oS98&wxf6zI2kZ5t&<ja+J%PIh(Y46eu4{22LP~sVdJwFebyXu}2XP?zGNQ=CEf+
zIS70#5=ek5HbFfCNXh4uqI*<q7CE$4<2_V^Ql&()-UPty8@i-aot6S`<pj*>CN}(u
zOmb{}o}zz}d0MfwcEK@{U{#w1`~wr(UtAjU;ZtZhbWd&cyggR2&zHkJJ_6oi$2+ou
zu7|r9kHQlYMgcg?zl0Q~PvMGb(~zMu7X$G7bj6_io{=sFO)8y!u0_a5$3$yW$a-_R
zOk$h=P&l9az~9eL_^=S14A2w6Re6yyQ0G6gsZ?A2D6?D*(+1v?f^?2Em--sle?IyX
zkm}|NboIY{^T#bIJIOQcUV{PKF-mk}fwKksYy<YK@~@VK^<uS5zVBu^Zh1P2wVA`r
z^y1g9%uu1`SEq&03WvQjwa2lF<{AFp7FNHGj{8{PPPdZ@Vr5=eC%G=M@WSn2`s*ad
z8^N8|Rl4ipC$UN-V=*l%GmEe9x^Hb7Qu~e+7H)Kby`VDSY%B2;2}@uV8HwHbq-9Od
zoX8&kq711pP~UO-DBkljbmIZ2XSzy(sge1uC@oPYOWzEb`uBuPC!}2%Hm38k1edc)
z@emZ8Is+fA#n?+H-f6sG8X~7>6<ht7?g6{F`%(-&xOg5vmHe7<e%wcYwqkWfA8PaQ
zTksu<MsIK8HU5OuQ8;u)_uZ&0V)V};c}Ml6nggAfYzyK|beV3YPQ~*BpkXU8_b<H%
zb|Pqz!(702eY-s^u?BDJOp>|T-7-@P(<E`Uw387)ZemiXG`?H8A&W-fUhQHN&!qI2
z?`;cI&eb-)UNr}MGKMxNvR~)AKq2iUC$8Mx+MV-iXw93?-53?N^wq+%VutE<NDOcb
zX@rx>>(TfTZ;>roj<8VepCy;a<)UO-Ib+U+2DIm!)H(-N9mMFJKUvB)b~DWb1v&RO
z))AMr36$3|Q-@EDQ*9N)sPEfsA6Y$IXk8<JMseqx8pOZ%%e}eKKh;8c=`2-hL?p7$
z*J@*}TBvZeUh>_yd~wyYyPe^F{B1ejfdy)fom~^ee>5}XzT_9Y!Bz($5;J>iwz43%
z4WB;iw~`#ZLvHInywm=U_WXdlzM{e$96V$E)T~q_l}K(=w$7SyIOl8D;{@R43%VJ6
z2MXw8)97Ln!Cer(tfA<m1(O21<>zYa)OQBeht7RNWZI5^DRye?ip<ryY{y!#RjVQP
z+<3Fe|LQo^js4P*Zt3koesfB-3J0K!P<Vnj4;;IaHy{7tfrsc1XznFKE<i|YK;Fn>
z>3Y_oBaXh6)gaD}oR;A<JXp9j+p9S#JV%3GG46WcJ|lUYo)<f+-etv6csv5Hs8;PB
zJa1BH<mkDNc4$#q=fzhoqGhv&a5cXM>VX@t#)_lJsG^mA!c$nud}mAE^d`5n?zYP`
z($2Y&Oqn}l4WSjhSxA2X{Py{*_a#ct?<*>iXx`JF{Jq(e%wm*Ra39l{k>Uw?lmG&T
zx0Vj{R4au9*g8f+Z(+8Nx<eXDUXIs&H*+jEAhaaqvN#rpKi5NiyuGfaUc<ESzD2Fu
z`X*qOi&g?ax^#5)gRHlNZ>Rc&sc~iiiw_Xs;3zp}s(L)JL-PZz^yUO7GC&ALz25-A
zAT>_jy7*6Wh)z$7(%1v_8D6KigR{?OpWIEzbRIh}Vc8Oe{W%BRDHx>vt<Fg#-)iS(
zKc<fo4jW8oj#I_%;^WO9>#76ITfi_x)IVYEzu%JCOFp7U1CuL1zCZd+uYq29C!{L!
z%7xVzO127QL|gi2O4-er&}I6LdNQYd!4!(~7JCqaUss$u^u011vc(g#7KF?HgdB78
zMo95FdVT_?!R-OI1&}Tu76D$JfOXz!@9n5|GPbz@3i(<ca*k~R_pwf&6@;N1YUuL4
z9B{6>ejSm7J6@dMouHg=9v)xh4U2~{t=H%_t6Q{OUw+2?J5;GE+mOb({+JEK4|jc7
z*qxS1&3D$Fq^%omdz2QkTv&TU7m{}*+xF2}kwU)JkN+_e$f%iw4s#Ih(JpdT>_y;|
zq|^F&&`s;E`~FYAc-DIUzxw4D;zsn_03O2JaM)md=3#mZT^PGox)-JzOJUC{l}}$z
zyR_QKa&~#{JDBSwHmWNYLnXE@({0+BrMuwx0|AInKB4(b+)@XfhGBmJ>Pf$RJUNO`
zwX^$!w-!IcOP#96-v{!@ND7JmV*lb+!Z!%ZOP7xwkb1-slsUw~EiwccknYLrCp)yl
zk;nn(f7FXl$3%<V&y6BS-C9T#{B1h9OwJ%F@bm%)$4!CkoDBzWv-0wE9~?i}U7tet
z$Hh%G9vi#2=r8T<4Yd)-4p2nwOy1&P*pX`hNuPlEVTwbV@Yogt^#a&i1}z8Oe54AB
z0CP>=b{R<N>6Do|%^kZaz3@PAzjAe6YlC=Y`4n*_$S1QXLp}*rKC?eQjr^JyiXHB8
ztx<)UI_;kSP!aDez^554P&zI{Ft;G~CJuk!wL73=9PM86k-Qv0H0>io$za?Ja*M4!
zShT)`k_k(aJxx1uEHK+Il7&xKr~d$OZFPmLjLaNhp>ualsy?oTn}mJJPE8Q$%l9rH
z83LK2kgz=h5mj&)lDV(YKV5~2-rpRC#WA;?_)8q3{81SwW1T?BI1UTr<?%%j{b{ep
zt~_jMomc|TU^=K`-eaTvRook{nT5N)l>W+I0_v)wAOdQ_Ptq+k!rz|TU%rd>Q2N77
z0t(SwUCgsT75TOn;jc!>X4YJ?eU#fKVvQF>)K=gpFV!+ewxSJh-#1@j*7+<Wwgbl9
zYdBa@C%;zs!tQn=IURjAl2_A9HNq)bBX5yqtG3|u!P~+}ii+U}ZlGU8fUx)xPZz$n
zi5pO!1GT%pW1laLJ7VQWu~A6Yi%jTx12et5DjuK5$yJw+V>G4R9tJU8`-}&Z9!CxR
zl(G3SkvYbx!&FxWCc<*`AUe|U2Q?A}6e@2fp|=rXrZFRfdMQ~H$Sb_{(*;#cw^Gk@
zrcth_e@D-Xmf<1jRZ^o;8ghB9Lmx#|Gd5C9><~XjLL-E)P^D53`W|Gqsu^HK_?pCU
z?)ink@CAHvBQvJ%<DM<Jk#*ENX_B*`@m6uYPr&%MlZv?|t?~*H)_TKq`oG|p98$Q`
zt5iFthi59)5n-YM5eO5?H&=9hbcuj)i7&M6n^a0Uq8!XPQkk3lKTMfp!4TZ86t$4Z
z@WnBykZ9BZ3i2Ds<bz5Q{jUmVbr6_*5^b>|G9VgfD^DweH0N=}&P-||+oP)_H;hAY
zo#4or2E26H@okK<ZkkvPL`-wF#yTvFHS}_rj5UpuR!=?Skt~A-mU%r_@EV9~_)mGd
z=O<fE))>akRob0bwGoUPdMG146}LOJ%)TY#j2B6-I!Qhv=E=aL<R?`cDFFw&lbU!q
zGU-*c%_%9;C^so$$`>L$?L~4~gkQSx=vlTi0Ci_FoK)rwlWSMbE-e_McA5s>nvnd;
z`q}{pI_Og;TD0Tz+ASc-%a*q_tS>OW^XxhDleqFj5-{=Vzk@->z~I+Y00Ej{h9DA3
z3;_&kwXNaY#)yuW+iXdL?_MHVmS=<H8a=te6S<EVP{OanrD`vFyWjUK)OAao#7FnZ
z5!fLkNhZcc(ivS3<>B$pH+J;w<|}LE(u~Q(mlOcee%K+<0TSj=eHsbqra^aUbPY=M
zbs@ua*3xZP2PyK2Yvh;8%GuQiC|-xb&z{sxwOooHS3#+Yq}d8bw<%nhRurxLNz)GF
z-V03~9jtG)8{AQ4L@F?PoNVk=>_MsGys!RQ9GwMpJH7VZjL%_6K1v^!Z8dLlvj-SR
zk(iQ=19!2Tswk8Q?<}Y}!nOD{!;d|^;Ln=r$kfp*jA!yw5-ft9%l;fC<$<gEC>GI>
ztXLMNwx1<Dg{)|`9im0Y%^_GZ2%4?SYmQnM5gy_TNH<HOlb{*>+{G;NCc->H7ueR6
zL=DF&IH0#N$V{Lj8RQ`xB(n9~1cV$q`oZO+^mH_1*oM^jmRGrV8jc0z5O3j>3ntco
zZv(mCr^pGm!FrP8@b^iLd0tA<r8SJIH9Ku0AK6w?`7y^KR^UAtCdx8<tKoPu%ud%N
z3-`bfeHiP&lErQ`ZX*xg)c>ZvfzD6T#8V0s=R%gOk!qyG{bdNk^;fVpfIT=RCl&dS
zq1lTRKU|2{(P6E1M!5@W-ImW|fV0YJ&qg2jBOx2WQZI#&psqk+31LQG_v0l+N@cRF
z*Hjcz?M*EQo79|b6q%ZGXn}6x^ipd`ChUU>JrzgJuuB%ncymx3Q(xYrg40lvQgsbk
z*-4=}3DjY_Rayu`eiW;kZ#km1tqb60sj3wxEXHDmXADjyPOma4TuZl_jp=0ftiv#G
zK8C~`(6J&-yDHWxV6TwQcHp#((xYV=lNd|nH5l4YiEQ?|&*ED3p+ISuU0w;PR7Z1d
zJ38>$)B9+na>9FI!^9(svkO_+_9#^Ok~1u~=qn>)Zgv&XMly%~$5Y>AfyQ+T-y8Xd
zQ!J`O5>~pPsaj4JdQlT~)6;$f3sQZ3edj4v{VNvh*<vJ*(qZhZ?ajl@5jgv3PP(Vh
z#uReDC-I6oVn06L*iYNF8o2e_DMb#L#ME?bh4R7GB;g%l7X0bWJJI-(^_UYu3FP1R
zhPP`G9+wh_LQCLH-rZ^w!*tt>)pj8tCzI_dq-MagV#e1h>)mf6Bt*xnb_xAT;*lPa
zTaL&dMDkk0Io=c13RL7I7qAAWbmW8!W|2|CyI5g3YS9T>w-C2$ncPM!o;+KRxqX(r
zik;Zr3&HGBglMf#!=N$X$*r_+2io`NhE$}1O%To9h{zRpGLUn*v;b<*I&ZH$!eJjl
z8P?y+DrvOrbl<l;Oux`22f-4vTa1TyAvG&b!@xFt@nG1GRoFtjgiGOuUaZjJ@w?G8
zO7~_yW_X^W8kgwut11Mr++LWr#m(mmhK&t96jJ`4bvxcTFzCUK^i}KDYYtH9l1}Q`
zL~AG8w*uNX`OmyMU+JnzXKos%a*RC=zzWTE2q=$-rEP+x&PfZg`69B1nN`KO8`vG*
zgVAMy{!WYZV4Je=uf3kc!|6)Q@QpD-H&zxCLKG%ENEHSRuyb+99HUZ=&*?a2wm>)0
z78*_zE;&pUHBJrX^u@IjQ7qhanX=p8@8rf-s#87hv@?R9=^#ddYC>yE%4SLt+&@Xz
zcQz|H6gNO}kZ|l|g#InsS1*jb8X9H*9g(+1z2E-5Go;>M*qw6=0c9-jq8CXGosM*h
z+Dc*GeV-pqqqG40S*dZ0D}xjm4wMBUV@r-&>ntdvX_GbN=5#OSvM;gx8M?+gOGAq!
zou|la3}rZg>NBkdk76n5U#79a_$NCX{jfVCE{6#;eS1DXQ_)6JL4@G_N4536FTrUU
z-9I@{OZwu=TXu(pLU3LgKYy}3nEoY^Vd>)2e@HgoLxlhC=zC0@?_677Yx<=(NMuTW
z$S8S5s$EnrdoO{z>+=-|G|tZKKLI&pzxe+O$Y0VQ^lt;~O7s7x0Ea-UA#U(zf`(vG
zOD{Xqa5nbFHm`~X#+hqYP`4o_34JMlz<d~Y5DlSqt=1t)N{1f{65buTxq7{B#woeT
zw7fq&j=^5u3}CUI6zrH%n`G}YT+*sh@2=r4KR3S%4)l$r<@ll168kfl@&m4Pr}~$O
z%EIney^{Dd?-}Yr(2LE3#3+Y~BL}A1Q;1T2srE81rUn~6eUG5P1;<Y(09mzI`|^0_
zGgGu*o+0_syi0@!db{Ci+q<D?hnD;K2w{d2;nq+5*>VinP6M`rJk4#Ro6Yl?<k=G?
zcw@?R=p|z?1dJCZ#*}lIB%>E45j9kDXvy86_{V<axft&B^Us-nS{mS%3`9~%-zLj?
zXrS);#|04Tk*kRn(W!6k`b`>bx`7t^%3M4NfvUf3s$?h?0#*lk$dGSvL}(?;be1Ey
z+xngL(O?=8Hf$GaVRA-NRHjU6IR|a&h`+z8R#j^@GFXd~P@)UNE=)@clkmAj5m&Rs
zjp^DOckEqWha=wGp@HkGE1=_^PkQeTC+8nn%*dalPMjEin{f;7brr0GyVgiistUqS
zRPOD+Hwe3RD`W$jLkGcpSv+2UhYOFc{zW!1R1lmoZ=fdxGLquxE8n%`-!s%2m3S)^
zM}WbNIoWgJCSg?cm2Ox?4(elsX())_R>i$D&=aL?T5>3euB2jRxOHvGTa^~cXR?!K
zVT!<3lYK{(OAPoKUVGV;ixh{ycbVX(U|?~$_H*-PQaS)iebAs=xdvTUf4D#bu?HGz
z84k@8B;%q;yimq|c@7I|r8~GGjQy1!V0;Q9sUMD*M~@4BSHA7iOo<-P5^n?KoGtlX
zjRZC;vgFKH?GlRn*mT*|q$0{-+bXKDL26<xwR25RGRtXyon5L-FN}OxOET+pbSX_;
zDt+al#w)T2+w5=L5Tf?I`X?Q%CEr~x@Ob*z?3$aD`4@7ip|_hTvW5#J+25d-6l-6b
zNt-F*%GJd|ho^sLM?<Y>BPTnd){PMvDyg@*0Z0LNBQfqerMDhre^6Ly_uD_&ff#)%
z?Bs~OV0Z73>n0<rfjgQu3}C#jpq)K6+dehfiS+XXWXy(idD5R{0oaRmipOjlZ7?lE
z3fX{f5!`XIi;29{S1lTdJCj?T<|;u*qMeaK%g8&e%HL?sDnp!Oi5SU^e$B|FWtlb8
z2PGugw)5{~O56RW6{^1#lzUndj@`tU9wonhNVEY_>Ilq?ijTBtaIik6&m=-noAmb;
zSJzwS3F8y)oK+yvf2}+rJ#Lh(riUq;rcEFhv!Bwb!#{$T#x_*qvSNrYCu0M9y+n>5
z7B_(^if<r)?h(n;^Itp+AL)O&HNGSZ$eZO{dV()$+r-rPCs3A|ddE>}jAUe&rVbe=
z38pA}7RW>s&mJ1Bkl3E=A8raCJ*^>~zl;xA;*npKOh+lfNiKE2cGFMzEMI=xa~y`q
zA;{3W=OgH-KxuBBOmS|7ma8ua=@39kkC=59_C1zn20<i>EE0|+iQ29__c{)pBu$6w
zv}r;OD;_@PEf`f~S*mJ!EWI}Q#BD-tO<|_h08MJoZ0jFsR*4Yx6d2=kD-VOGPQ9HI
zr&NK|v3fl%7LO+Lc)x>7RK@IyBvY<x=P09b-tf#`28Ty)9kL=XWwk|&A$<w&PHO4O
zZd2YS^6k+nGR~<+CXVB?Fv<M#C3);^v;LMcjn4cElJoFJ!sw&V1sz7GU_wT$7lw}F
zGBo(YvT=w52%jZgPPu84QU2iI+m1fpr9%kh!L&b!h^(?JxLug|!ckPFNS>E`Gme!>
zB8Dzjqr}Sgw2E2oeQ8n1>E%pdxW=dpBn^ADHb9<z0j_AT=}emra*}hl+2+#Ox0+2V
zrp(5JHOHSkhHs^5(r(<Gf8?@6lK2yNeoaZ!(FS|`9A^VR^@>dPuh<o?Bh-^r=J**w
zeSu%XL^rEd2cn&zVi-ph+ZaRaCC$CgUJuMi6|E5!X*$e^fRAPRM;R3Mp$M$K^>>Sz
zv(;t18(AF1@R+fOzSW?O&A0XOn!JR`c@kW~c%D>rA0QnJI2u7uHEEU_`}o7Oj7?|N
zsN%Ftb?-b!@`I!W5+gieST4b6?mAH2<_Ia))MZDa0bFyTi*}JD8f;cV6&#@nGsY-<
z1b9jd0d3?*@i?olJG@JIr=CQ8=b-prCE64B1t-%@$!&Jn8vi{B>UzI74A~Vw_1MY;
zKX#Evd?8P&rR0sfnhm~-jBo*nX^y<t5ByQ;o`)T68@;-nXI#~~Bm%Q@^GkQslbKYn
zdZbPGc!7M}nfI!KQL-+4Y79vWRnBU8ql60XUo@H67+gPH%+3Hx@8RZd-Do^N-So}{
za;C5MYz*!{Go?yp6fLJXtM9xRynk}I`95!UlJS{5d|IEYD;fbKHmU+TB04G&3s78D
zCA*od1_rESmxjNcwd4<W<I%t-y7;shEw5f%_=LdN&NQ+0n0in%9Xscb0!gYX?ktad
z!8Hs)CAc#{YYqO9(-LAR8ob!mpGz#vZ}BOq3UT3Dz7wjXbqxz&Ixs)0=G&8e@qQGW
zeWvOjFneec(0puH%dGGgs-_^{=G!p<ybGFa`bJ>1;JF{-QMIL5wuf?P>o|+qr5rqb
zMp$@5)>^$z;&flL=i-chFHfUnG+uFa8dxH>98slu9G-i|A!6A8wMn9o>#_ChmVKlE
z|GKU3c$;HHRsSgkb*tZn<o^d$^?!ZVjo+;_Q|eo`iz4v8qWiw+Vnw**JpAh=|17Hm
z{H_7~{hmRDmxpz7QeLfGyJQ@`F1Q+Yn&~)lO&2}?-d#@qezqru92(e<FSmUN+}@D3
zt0813E1e2ruSdCj>j1nc`N54w)=(Ix#!zemD81$bF0fP}AQkoTEwQf3<wDv`_~nh4
zjPg}5Sj<*a{8X0m>@;Ra8uVfplt{z@=_n~!@(fBI(53K3s>*{a^kd`kDYK)TM`l4=
z>J^%0Ihv;$+2#d8AmzKH__peXk)*?dBVT(!NHOppZu-1BsAe|d-P~S(?0Oew&vz+0
zZ)hds`pYd)DimOS87NjsM0^9jQWY5EGL5wWd&}Ytx|V%meMI$AT)=-*-i8n~g(>Ho
z0>o8pSlrJpp|DQMlmY!}p}OOe&DrFKH?%#sO8TP+WtGT3^njJ>g*zcEVWYc=-+oIK
zwR)fZAP*y#10QT9C79H*q_xZk96DT<ggF=$(No(Ve4U=!14olS)Kyzh7k)*UnrI@^
z^UNvgX<#B_r|UHMBZ<8<b9kaTm5}PL7l36FF3E1dwilML<*=r!i&b`YL#_Mu<)$t>
z8-}KR%bfV`wC<X-U^Vq&)8EEpX+bg5{VNN(k<+wAS%_#6p8FhG4K-G<$M_Czu2CsB
zimfY{3k?|oh9OCElBE_PG{xM$R({6)SeHy6N@}7`ql3p;Okico)l&{`f*qXRn$lwu
z+BTre{TlVf@MUpAz9~K|Wuq0MP;Q@UXoT~p_*SdtR54+t4)VYb$qpkVZRbWPx*(oz
z%PPW2OQAKaOA+(n@k7OZkb-4f;7-coLpLQX${2@f9Y+mo@w6k)=-E6Rx$dqMr#NjL
zVHz<V8w&tR8^9;DEYg0zGcl(@E-U2WKzRYSm`yO?gvag?YiK^9C$yt?IIwFo!)EPr
z-U1sIVN?8V!HyD3NFb41TlV7MKHss#Uj$Z+{-JSDn8@A30_r7|L6#f-Spq}0i04i)
z6(9X>O8M9(rKfIEs~#<07z<*T#(fJ^l{cwwWfTHJ$x`{(vpOx&93z{RFTysOj8E@c
z`=M4}S1Tl`+Gi7+kWPNwM+y!WRN`R+otAUburT`+9wO-{*(54o@@((7+zNiaM*=o#
zIViR=oNR`D4~LjU8Nn=F77E#WyH_W@)b&tmkDM?s6|Ys{6udQ2yq$SuI|ip?E$AK&
z_=4IMKh7bXYTJfoh6IW{Tx;(J_&Z-IxA%-KiaV+z=pa_`Bh9*ZH2K#L^Gz+?R6Mw1
z#Y02a3lQ9=Y~>xf5_pKqFKwmIzr>rllfdtO1X6kn7kSYw;Cm9-zpB>@H><Yz`Dd7t
zh|X~B+=iZk2NWh4b$i|1!C!T0F*NJ}j+YLstE)@fG>Y>h(f}Ui#^w=?1x9&<L{>O<
z>NRKqL>rPZq^zrJ@9R?LUK1URXvS-xf12{nIdi<?okJW#Vv&C17NQ3i^@x~PW~WTD
zSdV^-fY)kNoZAWc1Coo)XNs;cJVMQiPBVI2oX}$V{au*iTWHXoAH@&tbkOqfPS_{S
zRN0#CN0`AyGn=}&W2tsqBnnOd`4gCdfmtSLMgk6B$wDm+bmu8vg@6w}+c;d*gfQ7~
zKryQC<s;8l@H^Q<Fp8(su%1@}vsM@{cTvoAotM4Q##^;YrB`A_MVhqSPn3@AS4<%!
z6Ig=lwH^|abF7)B-l)>y{~uA`6j*7vWE<PIla6iMwr$&X(y{HNW81cE+fK(fedf%a
zr~R^@>aVX>aV?KpueXkY62py?hr={<yC^K{G6~`wVP(u7STiI#gPVky9Rgc*kK|fO
z;lHpXe6|m!y~yGzBfvysLse!M3R_$EkiEB$qNAi#cB{=Y@`6jzCua)Tc)1LfIrK?k
zlLjfL1M@fH_@>v5Saqh}c)T^bAlC2E=(k#nk%l_`LRdT#qS)K<1FCygF+&DPRbQvd
zHWd-HV0Wh$RG>|L5vC3ee*N;6`x@of^dT8$x_oFo=Nqg;zh~jhP}3O)Ja)PQMQi|a
zN_?1J#LT^NXbRk!R(O=0K~i3=<zO*)MYI6gD%ngopg%<eL)t_x<1sy@%_W;f0vd-s
zK#hvrJCId>Y5q<5VlKgId#x(56MMAr-=l=D68;cYxOkyZsfFrx&J0aCTN7HYR&t;W
zP9LORNcTHmyQ>xMIW^JWjFAcBX-8fp`|}O|(KhjH<X_hbjX41<Soj^<hEB8t9E&?w
zz(4P@m2K<il0npzD0J0SB>u5xEG_e-x#)59>_@!6Xs3^N^xgM*MF+?_eK5Z$$Sk2)
zdC>o8KC83wD?^tSmX7JgM1IB5O$J}=Q!?DC{5&JQdUFos-8dLe(JaPD&mnsxAUdGn
z`xU)_L9+87<Pj~*0R8u_S>D>f!{mpY(eYnh{7)T+9qFsP_baT;72du*X3u@0fIK6$
zgG3Ev^$Jx6y;VdWBT`taeLRUkvaabzzcsW-yo-IM(V@9Fhp&-=Ba4lf2?y@;@l=3s
z$L|FthbM@wPjYgnSbzo!XU%UGKEfZ~p@2XdxR?OWI0*{WgqpxC9=Vkom6{SWMS={K
zgi*Re+`kpI9z+F9Bz=_hAwrlUQiTXOf+`NNG7v{u-Pj_M1lgSqt-zl#=ocUL7#Ynj
zBz1itsHq}-t}u}n=6)~GNR=&emY4ar?{_xqh7&{Q^3L>r9z=hFH{7kiu9@pC4DFGP
zJV_s{rx!TVH0`!;t2^H}JWk)~pEZ={z1<-^Ngj{{-%zcvl>KE0LW2f;Qw_wu?&Lu6
z&ZnNax3#^ki;I9KF8fukO>#%{EHC<n#K*PXiWE}YlHqhud$Rs?ataV3Y|(`~Yj1X6
z2H&<5@zV#Gl2dRhv_fJH{<sobih?eLxJt*0{cwWM9m{0m>lfGESaIrJC@xH!Vfk1>
zLxG|fY=uA+D|<33o{*pi*o^uBd;^reImAwXWOf3&*;JvAdbynvub6JpxAy$p*GIaJ
zN4Y)6Jt>nGW0kUm@F2{G0J2Jwe%%0BV0O+n*m)98%(_4$nw4AQ>S(hob;9xTxLOEB
zli}bfZc-u#B^ra|eC<j6Z{LYCa_ZkGyb)N-0fC+Tu)!KZ*lz=`LwtTd1J0?8HRF)T
zSy6u{D%8yIx4$nf9)Ci4eQEo7Ddh^sVALf6W3_#cU!Ss94!LC6Ev*tHF_uylq>A$w
zs@O$LFGf9vXu;h)<tqKMsBPkkgz|8jq^Xi5DR@I_OuenrFp<VEsY&(;jiMN$g_g$P
zlQYZ;woI6n^)<E?F0U-T`CYDlL$sKU$D$5ij|HAf=E$|{ed?v^Y;`ttGBrhTfhkiD
z`vOm8O5+;UV*TXDlr8_YEI2Kcc^-W9pYUZlb%9a(3XJTJ9?*eb40fi+Q<K-;z7!1f
zf&7rIlp@`~2hzM#YEej!$Dz*LuN2==p(aza8jV#IO;A{4m?a*PMvtXg?WUN}iNUxT
z(C#@>ET4?U5j9_%HMdTM`;fERfyYen#B&-Nlc;$@Gd^zInRnyqn}i4NDP<hP1668K
z5Qd394#|ALxJ3Xt)LQkc(beb4Vl(($!+<$i=&;0dG<L55pn-2~W#bmahImKz4lufC
zYM)+Z5%MklvJF&F6;W=p`?9BH=E<^15I?2{G6p}cAhKWtON!6lP*YLdmtzm{mRYZB
zg2aHZbwg@9!`%)q`W@KHLWp5i1NYSh4mxDX4}5-6EeezN{8ptml9dzj_gLSK(2v(o
zrg9)fmv&ehys!{rIyobDzc<#0Q{$KF1=T?p!8B9oC^|=VLn$eh2C1yXJL1De_}i>4
z$G0A$O!_GY{C3WiE8*2DRxx#!z^Y9_cR(1!Ld(fI5k%iNCC<=PLXCSN9s&Mbf8?(u
z6(;iXaAF!oabl9qw!LAXBJs>te3;yJ`rcBbvy|YCXYXgAi#FycQH>IUkxpkhV=Apu
zj54}S<KI`Uh3p=TmYnoSU0^8<^FxM9PN<(B`z;G|C-J9fMbVS~1AP0tF^hTPl0&kE
zmstA^Ga?ja%Ykw)yEVF`3LAO9Z+*<nK73^Y1hsiB0d~(N5f=39EOg~GK11vrEj8k7
zH7kla8q<!JNfdQs?5>0TP)LM+lm@1;zpyf@ED_l#V0Xt6`?J(_ZhrDH;txp*UC7od
zatq8PGu1vk+xw-hTGiAkIwWvrO9%U_TD(L#&MK3iV_MRVc2*Xsg?jNKre<xfXSkgk
znQR-2!+8dyZfpThdy|HP=8MK8m<G%vU3YrzGTfPPGb@9A@5l^rNLvq=9@e()Uk1US
zI)sE&Yk^;5Cxh|~iz~$q`rDO5OGlB$-wK$X)bOT6Xv5~XnYnCTosXWI)UDgo+%5e3
z?i70N8ezxmF5SEb`0hpIbA|AmYSym@!o8RL@40v@G1hf>xGD&Y_oph{5WEKJu>GA(
zRzy+cj_;e_miXKvG@TBME`F35{<ovqSYgU<W%=(6v5t!wRahsaSKU)9zDlD$uK<1G
zo9cS4buMA;j1U2+suOX4X8EJdSscuLWIFZ7(N*gP$iTXt0p_W(I$tO>NrgnS>``(p
zE#4B~n#^bn%px_kP!$E|jvP@y#jl0}#QJ{lA^DZXJ3-OcL38#MtZ9|3Dy=G&>#2)h
zR*qOa>KzYFPq5h@O39>fM)aEyNK2kJKoDgj6}jp5OZm9NxC!)5o(<EbQPzk!t`LfK
z<XRwfoFJe)C5_~|uH@z3Ue@jq_sG-PtrWs>=bpOXOWEa_Wtws>T6@(BLT?lVzvyFT
z3!fP&i5B&35}~jBeJy{A$`#=LPDQr1&G3+e6wbl*=}UNCL|isIK{zC}j}5S|^q?Lo
z+qSPeV7tB1x)+ceSkxw+1B)Q=C_NJlma^XP`1fOq9Bu>5*J<<1?cR%JIF1gsAXnrr
zA35yC4RE~~+YFr7{pYIMnfgqJjwyQ{54wfe8;iHQt&*1hax<=(m@ELfM>9;lBjA*g
z(MKu3@3$O(KOeSTo$=Fj-6LYXq^(DT+KxhV@|~7)yhQJ_r)?Z*60jQ0isLLXudbkp
z8Z~E{^)hAKM1WS_L$?~=KNAe*<&jle64hDlqzSyZD-MA~t%`jzQH=RFWrjhZniUx9
zj%rJn)5t2}Ci23<9y9ptr?H=FLp;9cv#m9s>KA`HMBlfuC+fcOO8Iy)K8fE?4f$TW
zb}-a(*M!`9-IZmvEH6ffmzP6znh^NE?xfaAeSGF}uk6#_^jEhlJ91*QdNI9k5B<IX
zT*-jz|D_@Yxp5#ws7m&Z7S1MmLjSv}N(3bG!{+|8>ui_FkI*eP?w2;su^Y}_hOCmT
zqE@EJa$lw}|E#ED4jZ%vh1S^dH(qZ?gMLErk{KNPs4nM(ZD$e=Pa6I$D+gxx11AS+
zj0MaMGLd?bT*BL7cH}SsA5tx^T$%rmq5%kJSa=1I3HB_c;3@&e6!W1|h+{<g{ANQX
zGy;Kix?-;|Nado(Ff+VHhOIP09e*a}q{tx4ObAx|M*b@oPnp3ZMX=oMUwgjv#rp+h
ze_%z;kRT^_@)HVp1F|GjBH_P7BxVmNONjRjRVKat2+8B5($;_SUSQVA@XF3_9(ph=
z%QM=?6~88>oveyIQgGBnXjys(bF^%JYSgT*Yj@aKf9`$^cVNseu=Ja}w7^}9WNiLq
zP)VyM)a~|W+zh~RBEzS={P38;4>k$rKDo>@2$UuhYmU-b;IyGUk4XCWb0KTEz}mn3
z4QWXb(nLS)OwkBIA?gR1ennM$M}-}50K9>!2*g{6Z5dovv1sO<k_&s>G-;l&9LJVi
zz~-4~=jaIlJca>lS)DDFd=2}UrYe0kz~$1g8`MiKZJ6tpURy07sg#r@)jvYe1Ee1h
zDAj!1>KXh7Sh2_2W|euyOVyo527xLR+iU&W;`1u_sOL}>JMAsPf4$=2yw;LnfF&x7
zgzq}3@J~-Xt$p7^Uo!~0zGqWy#XWg^yL@RmVf4#yVOg|Rx3_s+tiJt*TJ|Cx7so`Y
z@XkPJ_lB2#Rq+aRi#xC6ne+#@2j9_hl1I|0SXVTM0dnV;;8wDCCGtDytgCcI&z+X+
zMrgZ%X)@+RncCjYY5+oyMF#773_9C=w>7Y4_p5A>0rxj%ccUgz6iS&2j+oa}YP$XD
z%2UIY6nKw;Y7s5bY~ey=V<^LE^}n0FRpL<R)RoQBd`B6Mx+u?B+mmg-Y)R1;)t;qQ
zhSTFIqD%@WQs+X;%tpf=+4uM})UZNS9&iW>-L}miDJAWb$2vzeF8|9znXcHQ3~7BW
zL^kU*TJ6_}>S>zF98ed9XJ$!q$8ZvPDbiC^RcGI)$n9i00~2x;hgH(Xr=8d!CHV(t
zm#?}$>G?|zfS)eA*Yn{*IER}9KFDu<F2JRp^BF!CO!5EF1+oj_{YYN@_lf;ieEH{r
zf&4r$wXJ`0n0`N!S9@SDebb6`qw+BH=PY_Uaeq*)I(T40_?7;IXG%knppLv=h$$k8
zoDZD(tHU?DkGy|v#b;FMJ#p})_pM=i(~>TvZ6Z`bCx!lfR>8Ld?LL$aa18D3RDn{O
z1yU>-54;pOfyi9{x)%sqB~Owo#re#!W@wv=AW`Oe0WcRx0_s;HNJi5tz$6u^1J6MI
z3g1RR<u=KHtWFWVY;tn*RO~?f1HV0hpL?xVk>TkHbQ^i*e7+0AtCAV0;Jzz~EQ|O>
zk`ONwa1QY-t<Ff8RG=u>UtWd;lcS;4OFZ=PevDtVK4?uT3H2;!ZD3X6lY?<BNyt+9
zVKwq7Tk~<T*;h`nz7N6sCk@ald&uKrvF$}4HVbu{(Z5_W$yZLO^V}7z?CNw3S!q&v
z>y}B89Gvy=EdJilOjD)Qh+y56@~RQI76t`v&2iu{CFwS3LU}4Mt|6)@V>Z(mj}5a&
zA_(uVX2~Hrk1dm;$B}^W@|(~xp)pz6Oq7Hscv@MMz#w@rIdcEn^3!~05V60oj>NW9
zWkWVY5WDRF+W|ohLb$L}H?>fNc4mYO`>bSp$nKMPWT#g1t&60zLk&@2Tot?!q!ld+
z{e|lT%(X%Xu|WDa=Xwe{wtB1=<EnLZ^d+qIaD<D|cgifzM%TmWtw+(i*_-8vV)h1J
z4Z~GRPCBvIq{~RvN<8rXTDykTD<rMa_V&GDKIUe-5t6V3`GObu&q&w{ORtw!%yw2x
zQB6CgWK^rJHqdnhykkgdzpLtLxEG67GiF2)h7w-Ty|tk<XLtcYmSPPFSti=!w?Cop
zB!h*lxgCi?S<qbE<pVEK9dD6cLGgAP9@&=WCr`oO4MS#P<;;(3M^PvFw$exx*46D)
zdfbwLvS9C0xh5;B4*RKDJ}ORxP4QuTFAVXa7~nefium3TRx=Fih*t`y0(yXfOff6T
zgJ$d9oK+i%#;UL&{FU1V{A-#!9_?<glRX7#s2*J8FH~AOUyk6a%)mQ8F;RIj))wFn
zabd12AapF*lxUUkJMurMY%g>!1bZtc5yD`YjcZpdaTOZEHCi;nEWO@9?*>B4Sw$#E
z1&Ji_(1mP}G##(3bCn9l0;*wze#%Kngyv)?BGF_`YGCqGCLgTicI|%%3l@^eVfOpP
zzxOf~P{LfUYc_p}jgR4SV?A0ME=df5*@^J6VBGMTJ-1lD(#F30+aV}Vzz?xPg-oRT
zS`hcz{J8KNEDhD82A4Af2Q+MfJDl9Hd8oOOxVBiTVh?&LEW2|q#kSJ;Xif(zU|>Yv
zT`<gRX>qBStH_}g%YlDLMPzGCxGIo^-iSx8cp+{&JbTAU8XYQDpcP7Y3a4-xl-BzL
zguFcd;zy%N$IKk-9`j9xNMo}7GH~K?7W(AiG%OQ79CPa3iM@RR{5A>x{yDSQobd}$
z8*=`K;en($fd4<h$XggWyEvK<0p<L=R#K6%%lctT6I=hLpVCbrC*8nP(<xId7v*4)
zTz?q13N@jujpwlz^!17E)9-(7o&ZdL^?vxUPRUH<{r#JCbF){<B;4U$IKe7t`tNIz
z+y<!ciE-bX=&owh5Q@5xWHY5Oa2Bz$&i7%wzzuZ<u%?|K0;%ndlR>aCb9V-Ha1((t
zRDr1u6d6Ti0bn|G(@1{&A|)wVmG%C-?9|qNK@dYReD_o65NI!C`s2|qnD5nBfw8-?
zExp2Qhxy4x)|C^1cU7Z-I{d`k8WYSkW{O(Q7T)_4CjC#K0IhXL<=+AW>Hg(kMa3M{
z!sZK4&PLeYu%bfA8K_Wfw*MNYRMLF1I+POcTnWdIsZL#QET$a^#cRW_FxN)#Op;jX
z`<T=IkZ`xap4^)o@XSQdcx}O~u<^-&J(!^okf%w04JAP_F`H*N8bvFxJnU!AQjhi6
z@Wc_bqA#u~r0)(nqi)zHgv?^^hD<RbC=nb)PvQ!?9>-AizEcnP3Q{)@qprFc9A|_;
zM;FvWbLY=3-NRNeE)jFB&W!Eu>#1II6Eewg##Bu<R3o%ckY&IShSir9usKMOdb>~X
z{8IJnia!NM1NrlrHH;BC1lJo(M}-BLsfxYqB_Asj>wuc|r-uw>&t;ajh({?CX%<AX
zKAWS=HEs!{+|xI?7)2J<8+&($=u@2J)EZRtfaRbb(>UW1#l_pTxL#DW*;YIE*RF1V
zn@9|qD`WJIcg}oElIQxldh3;;dV=OuQhXl_id)~|;=4A+;)OQeDSMbjXWkX4xMj01
zb%|2L2gb%Ue=2@<mM`*3Mj=kD@u(ytt7{Hx#+3P;uL#@ZhGYSb#3eskDJ7C+sjbj)
z8v(TOu8!~UJ^P`?FK!^I>7VB+Fd%{wA^sN{l`U-kb;7v+`K|KKkB$(6Z_VJheUJ)}
zFw?MPND1MU*iuB81^iVG@vm-wwUL-hDW$iS8P;Huz%BtioDH|H?vD3MZ0eb}r)n^I
zya6Kv5Q7gAM`qiL<I3C<|3A^S`oOTQ8W!=u7Q6ju2{r+&5Ql4pr~$In8R(4$FP|Al
z7#mfjlfa6U=}o;T;HnAJm=Q@5Z6VGBi&*d^Wvbe7v*V)It8Ep_9qS=;v^d^tbY5xz
zW|ap1K@1<VUxt#kinKIjL)Z^%I{v?nzzWD9#{gFAZ`p{Y6-*U~$jv~h_q@`Cp(^$a
z83HzjPDiQ68w<oaFth!>GaXt#zu7g!PP2HYG@sR49Nf4<GGn|**=;m+wN6-Us&+O#
zdADwoK+U)`<nN%%oNjFEn^R}EFZ!^Z0peYR-CICN52qKaEKU}ApHfm%sfL5@EWbID
zK7mjzn6Eac0lA5;G$U^4==vjt3w~HCryArhmT}9XCu9>N`uAE7c>PtH!BxUHJx@XU
z2-qqW!Bt`mc7Z>bD_6r8Mbqgdt+f|*>uZW4##RkAso4DSk<tSs$*ZY$dLdBPl=@4y
z>s(^S8k6wY{R1f<1|6*Y<h=2@^_h!)CGz6h3_SeiA*Qc2);1wnD7oJ8^)TOS@}os*
zd~iN>TOiA9wCc3Qgwz|;@cE^d1pB_SfcbqH_BB{2`*Eg#yxfJHFXgkSu1M1qK|OEJ
znk$!wC;Ce-I_S3##K3d4Lzf#8QD*Om!ihwP9>y2o(b>z}k5>U>Ul0=^{f|>QnK<kH
zhq*-eU%I8P^^<O)_|naO+b_eUWw&KGSs<c7$mb12a-%?JID3&p1;kVQuAqS;+FE^m
z;zFS#Dw9f>Vnx#8{+JFq88*V#xqf=OA40^zACOUDk^oIU`=v;D^`xsO3Au?T&EHHU
z*sC)&UJNjns*Khc%2LK}%u-AWVKWLtqNPxDfSjx`FW#Ea1F;Ix?(angtqR0AAR{VO
zUb$S4>bQgF`6`%+%K@n$Yil{!$ME6t0zXBfoh;2*ZwN2^Lv6&r5_sHOiBwK5`Tgtu
z=e}L^hDui|zwGAf?I#bXd&o+9^kvKi{OaNvX?ghl${d)>3-9|ZeKrQnm^FP;mlpbE
zYRfj6F3pNrt3i0H%Etn=5hN?5UBJt58UF44dAHR8PeN5nD(kD8z#_w=u1VAvKI#Dr
zgA4mW;!z<1U`*WB&&rRoE(zf}sP;Tn&#pu*XcPLpnk_*vxGFFq;!O4-hc2AJ-$NwK
zKIsu-F;fZ=N5gUJBqFJs$P!>FBAKXqgL{Wmjq1_6fwnAs`y_$WpG5~;X30Z~fEZob
zpsuVMmtl;=6>Gs3+Bf%eLwsDbQy|{Vo5yEPA#$I6Elea|2b*Fls=Gx$53g!%d{Rja
z9mMHEc%z=EjIAL3Sb)3&_=qgSKXPr(lMQCu{ztgUtgyGzdj7L2^|QKVt(UQ_%;L~Q
z2>0PmBB3*#OH3H1udn(^*L?VF@;;Cww_68^xa`j9QecH*nU+qQqB2`+qja0HeBNs9
zyHth4j*^;aV2u}>2E3Kt*Q{Va5brcny>UL7vk=C8dq=?rS{kT(n{0JsPO#f{0gKhF
z@h<B2$vGMEk^ev*ocS!^&t;0?Dh3!FCiyu{SKYyjil(uuvgi!kdHg&EgPna5gh%H_
zSFZ2z0=$}1dqPj^IS;?VtIa+{btlL$g-73g*0MVxzwQHzab~-QeP%JWos$+kA|I%m
zQ|*w|3XE2XA=6+Gm(2kz2yFT3e)8XuqW3WI>ojFx%napvm5oj#{xmcn2ndo^ZoJ#I
z3bn$7&a-h_SwX^v+t~%YA$%)ERBB|2>Uzp56~9a6wd8AIflCtsNp!DG8>86YIkjAr
zDL%kwAZrLZoj78-X#l9;%n8O(STIH%E64(|4%F^n`9ZCqAG)J)ybjt-ZZY3D#9Q!S
zw7lK0;1=AZG0JCXzCjNd?H3`}o_PkT^k7kXF2teQ&b0$6+QO3W*JI$*D`(A#=#f!K
z_Wp9m44yB_%r)Y}#^|=Ec=xs;43bCH=ceWzM^bnZC?8lA8*f>}0T+&MtdiDSxEDni
zC({$}>2x2JXU8?!2dSJVg^0wrh3OenIXB|adWlyESS>`i$d-cw_%(>oS2gk9Jn+$6
zcXbNn%;%w!@9(O^YUUz|@I~7G<QX>-+Vt;Sa`d>M9!4J<CDGuA+4Rf_UNEC-!YJ!e
z)Aq&Dzd=}F%0_mx=((3(M_vxacEU1R`~Z<C5efgHSx|k@&(7oj1)l$@^@xB#eqzs(
z`iAWRD}s-n{<i@d#Vm;o=uR^^5D3k>&2MfLSXM6&2%w-6QPvJd(zr*{2E83bx@O@8
z*Lh8N79b(K>2wa9>5%cUB?Ue@y{z6>j?HCBj79U39(p55lDikNPiEiUEkW~L(giG2
z$<a12rKve;`M$|^&?(dckgHSUpQEj%+WEABAbM!RDomhW8nK9+N~ZL=^*W=6`w*iJ
zTs(hbu+fYlr&f(A$-X^J%K;Lxzr9KN4L<|fFLQj$^0*@uZ~uuIApCR5bVA`=<UD>l
zd_wZezL@5^s7y(hTAtvmnzfx#*bo_vKFPaeOocH#?;~}82w7`5=C5z#T>CDet0F$T
zeh*Om4=1v_J!gBs$CrWN?%~2djUwLlLf%&gDW4DSr?H1cu{AXy81RABisV?Zpw-Ug
z9=u>sd@Qv!reVI<`sdnc@AE?tR~OSZ8$tJFhLid^HVC`%@lI43)9dRkL4mfD$B<yV
zW9tZ|!t(NIto*#Mf?FoaE6kzLde36?KQRe4UZ@Hk_Qx~aB1s-$6%${yYE)A8SF||K
zJW#UVV*L0i;KnjDFT)>nP(vG;e6)0Y?YUk~d1#xJD5CLC^SB-a8944dll2CpGdAL8
zRBX0YQpVnhwY$jUGL@5B^KSdTYOEM_!b??vRFMmQZ`JXvzQ7-DB02ghC)5ONGuu+|
zHc!#BF2(O@E;7VZY|GegD<T~VlfeO`6@WbuHjg6mp^;d%4hRY)n&P6pU@zxTMdT|Z
zol<lcapu`8nbAGJT571*6(&Ugm;okwlry1N2_%*&$i352w%0Z#T|Dw8h_r+`)ejTJ
zD7<p#E(Rp53fZ0XUKwf*P}AVw#L2DS<5|JLmKVpZ9zNKK2)tlOB0zaHEG6(5;>Tp(
z3te3NL0D@M2dC&OO*RoUQs|$h0@PVI6JK%B3bj)FW;9Y+N#r|)%XX=D-wI6j$ql-w
zy;;#|3JY)9c!_XZIs@*dvXEB<%DR`Fqb{RLw|d`4emqTI(3<7u2)_Y)NxzVsqIX#+
zGactPRjtyH>kkFjA7Hk224IyO7zWorcz+Zp2kAN;J5D0UbrN_jAXk+ywS@F8zKoSL
zbYxdwt=OI3t)DJfS}d(C{o|j*5SharrKwU2j!Y}l!`R)6*0tb{Z{{U!F?41UlNq&b
zw{Y{T>iFt`6=!dbOud7%c`Jl#U%Sqe(4Bd3(x{7r+z<c3YQdC7QLmn^qtSvwQC9WJ
zFE{$V#mk)9Rbs0E@|$f>MS>b;DWJ>bG^C40O*5Enf4ZpAQ-Nf%JybJtNwv4~2qd7u
z*mKX^8dh11meCk+0Zkt_cni6^>vP#(F7lU#vr4nxH$V}??|+#INYLUkAQ6I^g{`rj
zo1UP7(@&YE_ahx~gk|Nl&VK7<_J;3#$jc8M{G+YRSo|XHWplEwTXH62N0w+1jJS$!
z<VB5`*Yo8{x|RY1=u|f*9fR4MpxUt>=Bh@8|0wmz?c>Ow!$Z8&sgE)Z-lH&`_ebR%
zTq3TfdL-gNX&RC{Y9LL1=a=qm#w-P~lSEDnV59YO4zGeTEZi8?mgie=98!An=_u3v
z$u0gd#696{u$a#c7pg8sslW&IAsxqpcB04x<beAjsB$fgWqOcibx4L6@gA0ZeKu^z
zWM(T7w(1qsDqbA}xzfYL`EN1})+NJ?40GT<h`omJA(yScA{U>-&|rY;0=XaI&-A-e
zw5yHT*vlAce5|7S)2YAR%*;*}9n$CYW{B-D7SQRf3>s5sbu~{FDnF&O+Vv(H>>w0l
zy~CypWx>7F>B~oJx81p+I4Z>b3Sqbs76!xFWGhD?f%|~^#%7U?C5bo3vMeY7(olq<
z9))s2a%#XLc$S;REj%nXN>u}I(g^g{1mhlN;Sa0}L2AW7p1D@#0@s{J4Ha)1by+DB
zSQW9wEuZ)^OM<#7<Y$~xL5mW_=}ZmLz%A#l{HHFq(CIP;-z+d5Vy?5?7I|!tUK?z6
z-I#c+>N#%QnYyeUZFOsUJ6$fk74)+&j<ZqXPTF0%JH4{`Tnr@N5~qxO4Y&2R4Y-TD
z6`M`&m)2j+Bv|dPkLCrXbWLhX+f*m`*y%YR*GfGhqnL|zi~(Gm!7;VR`8B&hlzX>F
zd)5iIwsmcGxu4mE%f?^bNU{Up_|C3=fAR&+wn3UvG1O>VlKW%JSad+dy~_@De&ZRj
zzN#@xCLB3R5DYY+w8gg)Jkh~87EoIyaGYoL?~N4q1xL?YTPT(M9#i7=lPMVUlgzlu
zW>v$h+a7e5-5z3g<oPu*QA$jJ%cb=FO1y}Pxkn;SIy5Yl1li&kMVX3>3G2VgPwP&v
z@Udu8A#tl-bOcGkY&x5Q)+=b}AN&v>JhQHdD3fsGViw_=#i6fA{<L;PFHw!dhCM%$
z>KrvPO)y+YNe%pUh<DX{Z4D&&xBWPtVrna_yOd5G+5!*B{!Gd{)F`K5PC8z-bEvq>
zdl~GDJPI_qb6C;(EOsxy3XbBFC0*@0EoAgAFCYF;Oh^98fvv8{*-Ndm*onHA8;fPk
zQL)MM94|M`GXVwseSTTYb>c&;kOsePO-8Gt?b6gHzu;Eu-Cc`n32oFV0v)!%Y(40(
zjHVwjEIv|ZAGyomP|?3y8P0>kkS=W$h*lGt`$Q(hJo*GiRE<(?l2EM<1_P%sDGJ~+
zb0T=cFpw0}ze^E#McrMHpM7IVgxd%qd>938Q)S7rgdn&t4r)(m@rWFzm~bmul{0#X
zEx{RK!G6e#olGcvlTF$_8~AjYfP!s3g@8&JXQHgB;zF~~289?tN!NHN(hMtJiujbA
z85DB%S5t;1QIr_L>jJdh1SGcvA_GN8Q3@s6YqHx`Od0=S&AWz-L_ftKrs>n%;l21I
z^I~-rc{G(*Sj7DeM;Y$&t{W4Yh;_vw(qYOYH7#@Gil#(Wmg*#CDTAopWObvf1tdYf
zC4F{ZaqQUu;4A%hkrcBVYcvQuP^0j^2^S%cOeG}<C#=_GO2X=3ayh)tiYmIP`KkX0
zC5Z7Kjs=$4ylSK&(ovY@?oy#VWLe@|$kjTq!es^qMD?LPnYVhMP&UZ?D66g=s?<5{
zk3>`BVZN)%+xCJD3w7IlTDCuCR=>jF+`Q71;>V+B$+!+rw0!_b>a1jo%8XEwusz{R
z?w@adizR~Bi74BkB^8l3wG{sn2*)DN(v(1;PdehuJi&L7eYz8)yQ>9@CPKdJY!u|^
zEhQYg8GzWiSpvgf)@Yl<%_(1zdZ3_4T7Un&Zb?u^@MlFLyt*==l>Kj`GtJ4On<?+G
zMO1HGDI?61ruCu$W1L?Bbg@uDWFX}P`}KHHxl_iV5*ya2mIZwW$S?-(yK^8U(%)@n
z(Hi{=8^Ps?g9OY6$yQeDYuzs%!j%3l$z$m=pp390@P^6yS6K!?%%sTk><q1i=t?7n
z@wh5r6#n||?5xG(C;wV6Y@Dg(v0vFNI1&~TCC{4ST_5-!xVozs+PqmSdrR)Px+N<b
zLDuLsP8y3Bw}HB08@gdT8yB}vKR;J4v{X-=AH2F@cF&w2fSuEzLtb2c`(0f4bx|1o
zB4bd>a$O6YW#y&D?mr?$SK;=M#}xvrsxt3adCs1m_^s!BrL7vEJ;h&9#T%5MbvuNV
zfjmH=&G|F>mu}IKySZq+d`)-wH-Y#cudI(0;h)Efh?m68tD!tU|FxqmT8n5=X@Cs>
zL{mn*)Fo&(kQ1m!e;tR8I7?3MTCI;w8<U`Gb052F|6|zU9Eg7#g8Oc`Fi_3(n(7n)
z%Cjr9h-=?;E{mL7Sr05MG^V)YDWbdt=v2~powEr{Dp_=YX6qHlw&X4VOUT%fJH6#R
zfu7(QJ#U3ZN#>TAN1bY=w>OsS2dKVbr1B4U^U7*|M63UcyGkb3CPvN%hSopmEBv!+
zJf!h|ZGli{|EyJutZq;hRcf6LfG!Y;c3zku0jb6*nF0{S$g9sc+-+(_M_QT6W%y>{
z$P*mj6E5^|uRB@3ncS<sFJ5mWZkm)ts*JfJqJ^mazvh4Niy^AfrTY~x0!fG!1r={2
z>0{8F;zIm8Tk|=NP!VzhrG?{7=qo%F>jEc)Q0gzP`20*^&IkZ%wpMS1iSPipgoS?x
z`Lve)!Iav~nuxp&?#~sbFV=p}i&aiegOF6D1lR?65ml=_YB=#$Kue(5Y@ybjt;|vv
zYeuV}xH!n+e`ovz_X*C+cOfzQMl?IjVePX$A4Ifak&F~9ib{-Rm8;T{t7_qGGPY>C
z&6$6hdJL?8EwC(^@`2xwJ%dTxpo>-&QiqRb5UOy_!vl_Ukr={#uu~U#kdReH7+8fP
z6;VCuWHCQQ91w?>&v`zaq|)q5-`fZoVGF8Z*au<Pu_ZR4BPbkZpXUogLwQ??y6RhD
z6e;NiA9}WGFDEE}8Wn!PU%-(x$||AP5o*diO)HaSR@SVu21_t)5DIL&3O)CJ8HTUW
zGu)+SngMd}pNe}5H;V)nFZ~!g!DLx*%}>uN9rOKs#ryP#IL<|7xuHS=Au}<q*!b3n
zPh|n}A3!oK7!6o?ML|{x_!4fHf~_`aWBv_NW!Xn)*}q2+9)uVLemjqUj^A`qpgj5%
ztf7*GY*0j%Y_|q0WfAv;qFv2uq%urIosSeekshd6%W)7nX>>cd3KCAGhYLPxX^Cz%
zI4k{_$?tvY+?p4W#=6*|jUojHss``~ZG*G7(o5)6ZBdQ{sOkjbD8P;bOW3!=A)>iY
z$-Zt3^mJ<FW;YqTRfT@0O8%n^T{1ruU}z;(&xU-;el^W*lMN|%^M|uSJze93tA-d;
z7xzcrX_|-G(NNR69(96IM9cr{GLw#Sk=O2ipm-e9E}fdGepv^f(F6wFcw21b&!}R-
zsRUJk&XQ6vm=;#x+3!PU2&%+6Wk|@3sC-$=GDxG6ti2*o-g8mYBEXgf;w;<`e*#zm
zz7>hru)=FcpRgrCC)5j6;chQ5`MNAgEsjlOT^S6J-Zv?S3BF3#QjpS(I6IjIn~sH&
zOnM&Wo~|~a^#x3^?dXeQ?@Yt*GgYQSnkrviy`|iaOE8-muQN9*p1($3?`BpK6~(rw
z6|h;&fY0ZNV5^B9;t%zjcIOc>VX}w{8~`g2F6}#w2qn+zu-Ty%bqiIBtg;l#IOXHE
z#AZrDO%?(Tg-n$mi3HG1Exj;FDJYcVzzztb3{4hVEVddc*d6+k34XAVZ{;>e7UZA3
z$A<&~rErfOm+&k$8vx^-O7SgCObMhe$Jvyu;Ci*h$WF{L(RfY|^-Dq>;|(IZ3v{d3
z`b)FBEBuqZ!U4m;D)o~YPc(~jIw0pQRYO7361b95nrlvtHNK~fFR29EXK1|`8&;~f
z+ZfJ?fu;}99;ohGnp-$IvU{U3=4M&LGUc<3QUMkrcN|64m?M+fj3G?NxCwoY)#d%T
z(~b2`F=p*T0#cIYJ48Nij`z<KEi;*=_Rnuim{oWi!=*GhDZ*GnweIFzDKKY)(0Vy@
zY#^Y$%O9si+BN{#Ov+{bo9KuX%9R|2y__?SD0rYZI)+v)Ypx-mcUh74JHU<Q@c^@j
zN5hDPwqP!<K9shsn`#>`W_pwHj>v5(<lqr}3O*W-KpcXbdC`Cp;9u=i74f6GpnpyS
zA`ffNpys9R%Y4e@t0ug%-0&s3buWX7TwaX>nN50IcIT*jqql|uqguf^x@o-}y!g39
zfKHx96!=dY#un7=J-)sMo_vJa!9G)i@{XCChO#A8#km{vgj^cm?;DMR%<;nzuZ;rX
zIG>e_F&Ymxc*r)fk8nAz2%ej^4#K0RbI!wJ{W>=Su$`4z_M9K}v*bR_Hdf28t`OGe
zgz~$*VRAPJWT8>wH_+r)RGo5$7mtebOGMj1ExCMiSCgK--W80i($|)YT=#G<i0fQ8
zWE-aSG7T5f&H^nkhL?82IG`zYTIVo0v3=rz`FP0?*5Mk#V>&wBun&TCHYFS`fVt^u
zBE-EM2Fxq4V-VhIkw8UbyRqM{@$vZHar>0Myyo=2fw4E^Vg5l(Nev(<5%PZ_<{xdK
zfvqtS(Ca_BB4wF>l!0B~_xNDX39Y(_>v$=}0mWA)av{yLLKLEPBXwvRlBA$F&ns?^
zd$Gn|r+sLms~K~hY<8yJ4Y@8=YHV>Pw?d_oZbQGenzdD&-MKFA$#1(5(b@q(P#w?s
zw1LHx&0B*R4TaXs6$(t8&90SKDij^9YU)GaKl|8{)H!|QT6F;@O9ddnF}*ps5dpX<
z_drtj;oSr)%pWU|Q6U8{x>qQ&qTnQmrQo`>;c{`+&4M|B*g|`#`MdhDgl90>0+e~<
z);!T?;vTuPai2G_QAUOZY@E4jKYfnJAzzScRv#dzOjCh*)CAH=Nfa-)wA_WX`rQ%W
zHVTerYI`1~j|Fn)vf|{ID;LM}9k<^UT2pe<`e{vpTR;-z_RWY(`_}Vp$O6du9#LGs
zU_Lvk=V|oBc0r-uIIDE=RV5F}uq<u(<?jqeFt86JSR;+x)&34dj|x~UIBFzmS|%1r
ztyBM+Ga~|s71qy+SI_dgZRF410M0lAK;&QyErY~|F5^-dei$>LoG4yr>8cgC=5xIF
z5$lQMaS=EZEbN~7WHyci(gi!~_)CkA{Q@N_uJJbwyXT0xDi{T51n_a@IhRd{R=3XC
z38Nu5V7%t4p9O9CJK?)w@?k$rQS?KCB~h}*GK;%n3<gA_{~6t+?xyFTQ{0o5fc*b@
zU);p{heF-+-*_uo?;q=b?+)}UT+1=3gifMyeiWmSDn_MTP*ts1;oymS1vR#m#=6g2
zwroP;Y*H5q+35V4^N$c&=$b}u-x2~D@?TPyxyyUIQq6?ToF@m`-LeEQ*Go|8rAwGJ
zvoaJ29sfpk;O<6Aa|4q?Scs)l*s=|%!F5(#464iJBIEPTGx+MC9-@;v;9ndy`2O8p
zsNE=311I``n~I&*=G)TZWWlkXtXEKPRQ13pS$0f-2Aeu;8RWd3t-vscRRNWf3sJ4b
zWqvUD`Q-u`mTS?UxfGY}-T`+2)KN)&=WbBxZ|I-lh^Bi#`o)UA1(f~G&ai6&Jw*|r
zvu-^9JYZd(422!D#Y0C)l0LJ{f})KKD3nxYFSX1H$p~$L$L5)~?E!RCf8LbNEioGj
zVLwbs{+EzDwSao0ECzJ6sJVz(;=I|V?F4VSU<#?LysHfC_?ebQ7~F*Yt`L}1&MfYI
zcUG{O?p)hPfXFXbZvv=TcJUPySvSv$BFHL~wHbak9UA57iG}m&_!+;x$2(h+iTKk~
zPVy=Cj5`fuF#%emr<i+<H##s8;^b6NP9bW)qIjy1Y1NjYiG}x}5M=+N5ivLXZgWK4
zk-AgV8Eo;vn5$TKoR_4(_85_;Uwoe@X!VZOBGKFWK-IYi$egq@x)#Tp-ilS0h0`Ak
z9VMRGLtF9L-A7^^!p5F(+n{-3yY(dAOX@w>68tSBNZP2cradA+@5m?7<V1bXV%(vI
zp&51LF7Y9m2kmKLQ<~gH-AK!nFrQCq8Sp=goz7uW`7qZET<mg{I(j3awTGc3{5_e#
zO>As0rwtq%-xs&H@Z2V{^#5FPTY2S2Q|-TTO3cpsCrHWt3sMPnw*B-7p>8DGdn6c&
z!qno3N*e0rvdQI=xP?~Ugw;4)_3)r?k1jBcjpMU~>L~{k94|-TGl^4qM%)>_)?jwy
z;v2`YsuQ<lxX#WH?o~-)tcv`UJLcS;z3bPoK{N*Fy+k-Tnw##*=8s>R_}tnBG@e+o
z0AP#Q6MZl_JA9@3?u?PBmQN9tm2H4hije0(5rzOC-Gr&s#|X!cxG7KP*I9%*k^NX?
z19+^pD%wWGFijE_Bx-T}KCEGpi`DxWS$xjQocAi|aq(>Tmq*}^z^T<F9}I#h8ME0)
zLxijM+4`LJ*Fkk-%0x!ju{mXERW9?tugA9|PPO#r7_9}1s-RJ$U0BY!Lw&-E2Uu^+
z$Icg<t>e+cm>&x+Mx4V~j$k=?Ma%Uw-#LtZbUvqeK5zY6C#+G!5x04Wn)Mz)ap(lK
zy8$k*$P0h$3_LWJMTGKSGygmC_&41q0?Peo>O=*p0eXay9nhYEok)5ywv(iQ0s=32
zZ$;yMqll{|(e*|WwQ^t2#Kz2@fs_I4QN{%6%gv`FPv`d8>JHbSeK>kqLVX0D(_LE}
z=-SepY*=C+Q6gBhnjn#k$q-BysFq9;R2CwXB8zlo#NsO6hD+PKmji9oS|x_sL~<K_
zv#)*_h&Lz9-R+w!!-1|u3Q?+Fph=nMtR#7ecI00}0422|@I-`Xj%*Dl2Ci$Oq(29(
z%F>ar)eNcH;g*%9n9PiOFvM9hLdGOJjL))e@=E1n#?yq!kAs(IVnyJRR;1Sc7$Y2z
zT{Lm)5l{DuTI$CO^r-P}EjF@^=0qj%cv&r{f0o&^0xq~)m!Ubc*tF|MiG}K>y#9zJ
zkFAzlD8x<aQ4NnB*Q0If*r_gGJ1skA>9gLIY{`o^k@_}9w$xkQ<;J~xt63Ho?>i&l
z$drs7jf3Q)!)FVg&Rbhm?93{cL08<fnZqqdW@y38vFiKrxLxe-w@Gq#@-XXmNp62;
zTq&1)w|d}I>ZxY}^k}sk9qMg+1OKdp{b!%X!rTai2=RZbMQ0QHAKgK=e;-b%PZF2`
zp$q*DK6Y7%=BhviDzIxY@s|K-tW-PKMznDvDU(T+o*k>rk|aD{Ga-zJ1X=8hDWkSC
z=UW%yuu-Q)W(S!MVmXJk3>Pj9xUSTcIT5VmRFi@h7&x!7tr6(7proLPEATXTyo{jk
zis5_LB>6FMS1Vs{vEliPKit#E3H|WGc{XET;Zi~JT&`qegW2wQnLlrwFav;{<$YlV
zWPfK)m_1w1W^Nos!lVWvRTOB7CZ)=+lnjMJCklq4DeJ(5$Mz(M=ZG9AIqhbDYhSXN
z96#~t-FZ4lzbJ7=q48W!@_r(M18@4@E%`nb%>7EKPBj_Ir$VAFTo-19jjnL(%>zOk
z&p}Ed>?L*6YU3Y?B|cx7Cx%s&l2%71nT>qW$PN^8wN!?cS}=McMMy#aVh)2k8Q}jf
zzhz8pU6h;+oLzpbdh^e!$}(05|4on9g;-^T=dl(9p`~6L!%XtG=7lt(3}cOG>a9uI
zs$W)a)W5<zT%0097|b6ZbB-;T&D?(BKCEF<r`}R4Cnfj6D-RVOHPfT$<vK44-clig
zN&W$ir*At<4#=|75{Nv5W5M_XmkyLk0IC8=wiq6X*jJ{MJ0mz2{hG$J=~^e2grV7;
z$es(BHH$0;F7>zVT?pt_2a>84#jg!DJ%gXBA4B-pegYu9NQ`Hl2B6Qj%ftITZGMzS
z8pZE%tkxhe1En0MkfQ>Wco}_IwNxr``Ag&rvMbT(I?+TJb$9b2DkQPV;=Vp0jwm}6
zJ-Z8na&w~J_;6wwy^FCwa_DvPL@QJMY6c9jin=FW-6s@a)t6RIj5cX!Hzd={5bYGJ
z^usYkfR>Cq7pACFAjKV9Z#tt_m@3|gJzVld9+<7>wJY3m!maiVsCPAeh4rPoKyTyj
zEdq#kv1Gd#!(Da2N1)a`H^`-fYDq%8f-lKWa2hX=I0@U<F@1M5-?7Ut!}b!qhn=1G
zu{j1fn@laJJURw`RE_!XKBZhq>r%mgxQVpLC?EUd!Sj(}nIl*&BGbw@c#gDIompAn
z_W(@Nj+-rg&Ng}>rt_+}6emv0J(lu9eNKk)?^Zv*00o&wV*Yu<&fMw$B}Ed>CN@Ms
zQ2$wm{hv0>&oZoihO>V*hvg-wC<3(<9WW=Kjkwk$Aq0qK0aY~$MfhUY<;o3CLOX}+
zI#B%HZ{d6G?i+1qZ||qdnt>oAc8&l#!D3HjI+_`Wqel%rV<29W{@!7Y0Od5ndT?N%
zslAp!LF|EOL`}eMo8c`q`sDsd4JwYbqC@R;h-4l%z%cL#<6&nG|DE%WSnd14`sBkf
zaDbW7C?)V;w=3uP%m7lPmHLVwBh>Zu{#8je@n`yj0f6)>eLp*DAZSi+yF=dX81G$d
z5h*Iw`&nB9sFNRtV=JU=8gV}`Mktj9m-X6Yq@IwD&;)t-rl%XWWhvfT-wDzMcUKug
zKFjegY9Q9s#@<A#RH9Fs^I|rLrR!_L5zD{{su|q{+Jous!Ow^Gu&p>ev@(h0{~%&#
zG?ZXhN2^Xm9U+4b2%tux6PydU{~2IZtCJ3kyq}k0Xi}lrmzkvDx-ooitM1Nb6AI&B
zo$8l{1gBcSP?p4UyAPEV*G0eLh4_SH^LJY2bQILI_aT(4#myz5TV?^S%StCOPdQgq
z;V}Vjq&i!qgrY`v*^qK0EF5mId|XZ4#So@vMP*_2cjUNnVNA1@16%bBb2SV4X(BTg
z250kL<?MK?B$SN{Y<s<EQPz2t7Hx9Es&#JVAKcTx5WH?Nh|hc<47WTO%?@@h0IyUo
zZ$p#niJR8L>5pJB-IEvGb76zC3pgYl3h2LiO6x$bN-Ogim9-T|mG*TKQq6#5#qf&a
zEUD<-bDnOR{17Eu*R9>zy*I%k$npD`bD~A8K}zmCnfwv4^a<R39e2b;GjXG$UcXbk
zozKFYuY!2A!C!+gEIEr}OT9+5JrjILz%A)<PmP&+-CTvNZ8vD4;^+sscnlI9K-v8K
zT06B_tq^cTU%RRRYKY@wT9UmTn(m4+sysIePicxD6FuKV=9LzNb^lVw21l$tl?HH>
zblN7IAPxtYwK9HqN?o}6=^lV?OUUF<=p0KAU$e3kzC2!c6S#U{EzRecU*RUN;P}F>
zJwi{?uZcGNhSs)>3^E1m`5wROu?5QwE(yo}aA0xe3kZvN8BE=%*zP_2T{G8yR2Roc
z7DD`%(d%`;WHFS2xP3s-=4c|55^?=PJ?2g#ucXhEze>Ef=gc*8c~Uw<t9@YX98=7a
zt#f(rLRvKtiL)1e+LhkO>~3e~^cMB2=`*`j$3(+7_Dz26vLBH>lQV;iw+;f*;2Y2(
zLq);2{dQk0Rm}Z?IPe78&ixwHXIM;i1Ppy-z_ppLjd~Zk9Vi#tnpEhcFb_|a<H#X&
zx&I-A)`%}eEL2M_3?EX*%;^EXq<;?4RImZB80U|(!YqD53g*ibUkU!m&cEcz!w2yH
z0NBdH+L{Q+?>`4AJ90mDlkX2HL@Qw8I&CnLq>74BErZ2@1+vk)kcx=yK2q%9n4ww7
z=Tk>Rc8P(=x)8E}(YtpK?~dE_-jHnWXO|EL%x+kmLpM|pPdM{X@j*84A@DU)zP`yO
zKecjv{V&jD!{13kL@iK`kem)o`i!BV3mJn7V{OX3>uWCe?_LVyNtQ?Ob}LFb_u@+7
z?_NJ0+M%={KyQr?VQ_om5HxC3zcjSAMnO;Yq6egs=PdyU2ED*ipNAZWg<pXF<xslM
zp?Fzf$ne9&IN90YvhF6p9p*p-P2_SF(xI4M!UFo}Qr*;Tl35Ztv_2py3!(WsT*25-
zec6rR8ef?!Dg{pAt&5$(-e;D1ss;O_tH9v-bJk=rE@MTM>Jjf(cy+;rUMY9-50(5i
z`A_;Gv?;%$jJPdnNVPYAWgxNRw}3#S@dSJH5#>u<IbR~}GL{5*xyTdU6zV0DhjfCA
zP0N<^FEyV{I;%*wMy8uK98Vr^m3V9@OM;&@og+vM6rmoeYb#Q@y8tQ{RUK5D@HUle
z-&F~&&N_|y55bZ)v}M!9lLtzApT2jK#@M}Q*Tgwn4U{}+_ac^sxein|`H&qyc(&O8
zdZu<h*`lLNew+;TrO_N|!Bamc<RKWRDg)eTm}DWCgKfZ|j?>1Zf?3;7sPfMjQk17v
z!s6=I>X8w|&?oj)Yxvar;Dv~$^&V5}N)C4c8nH)nmp6PModTR*rf7_>tYT|ZiXx<W
z8T@VGrq+uOnUDRr-DtOQQG#ZyVFJCag1jT1?Y+#ixs+7wIAG|-jopMQDjk}<pW1Bh
zjrh{iU=RVERb28q(K(56KED`{)!m!aOyn4Oz1Ui;iI1YP0I|(}t1INc`W!e0lDgc)
zkGnc97xiK7vn9OPVRvUDc|I5PYev+t;-bh!W=&H|%Lk2NPY}%O@t}`o$g+}1Xj5;;
zf>s(e@uViVWWfrJbQ9gYEEG8`e{f>d#;!U(RlsrpI@O&p+lXS%rjuq>q+F&RVt&+V
z&m9(ybyHvX+o$Hahs8!oB7?7hhgsB(j|c-sET?b$Sg1_?`8!`u(p;Z;ZBY%>w79Y6
zK|cS^w`K5SaslX?p6IVG0b={#Bw{GlVfVB=wiP@JjCDIqJqH^F26GO>jO}PKFMI!A
z8xS992P-k;r&_gr!yg}@+N^K||DZcVa2b>c{eLs#e-HD2GdcSI6gGN4g$>Hk4)i-5
z__ID+JL3rk5uC9dFQn|P!{GC>a6{vvDaz*~?O8iqw%u09m&DB(4+r0<{hAeQ!N2^N
zGBNeZ^s}r{mut_p(@xrx<|Y`u48w(9sJeB2|MwnAKo^s%^mAmN0XX@T#BU}k<N42|
zZa|m<Y3O4n82cSxZO9S<kjGJyr~wQ)JNzULZmgrE*>f#+m5h=zDdXzKR;wKJRY6%$
z<qH{yTFh6l-i}CXZkgJ&cdE`tnt73o<l%USC{opN8<AwJ@&nByS;N3g4Iqhgo%UMx
zkH52r8m=AyQX!-%z5--D2*>}At8ZWrbX}H>ZQHhO+qP}nwrx9^*yhBxGqJ77+{`-r
zto@w(7rw8$-|p(F?vt4#AP{+?&!A+ptYJb6JJBA<0d_GPN;?CRwZq)FFNsgeQ<l}d
zKbWaCao@Y+`GdJ8d>nI-6v8**(Wv2={(jFi+6Pb~r2l+R6+<U;)9*7Ql>Z2zb)z=~
zP<+up;lXKCwlR=e8beW~K9<S{-K6oQAe$zZWw_;p%xqlzeeKC2@kw>{St2HKbGDpM
zwwT=;y3dzyU>WcZyOt!?#N>-Kl7F>KsMbe;$XBvZ;KIXDM%4!PuOQSIk5Ew?C<jH*
z@|$8UEPx4-GxU`zF*pjA#LlkQ)e82ZQyWfoz<5|3*4OFW)l}>P*HOethcou_{4oOZ
zSy_-OJc@2$T4djovH)FAYM%x$%T{KD;kmVE)Aq>N1us5EtxUx?-$*((qrFqyh#mKp
z{nd~XDa$xub52OwAy*46$L}++jbx}$?^BV5X*(RZ*sU22E80PEx#K>~*2|fqJXb}K
ztOj^?B<97BCuvu3JAw8!KNpW0S>&g<uIt2(@Y?&QibSAvqZ{@aM`A|=gKnerecXle
zL-@-^P?GTHc&%8Lq43M8;fW#td4D^yBfvh~zRwqaMG=3AT;U7M(dGcWxrK3PDcqyc
zPN>{N6V{HbzU(&acQ1zH%5ChsffmMnrx6R?qZVTCIoQ>cINwU=iNd{5VX)wp9o!nn
z!`z5Pnh|mdHz3R+$BdbL$B-EWNJU-A1UJk1QxlEN64;U%mYt+|$(lXOQw!Z5wo!?_
zLQK8m0C-0K=C<Kz%GTWK2EY0NcHL?L2AiRc0%KY3+3NO8!?Vw#t86OKU;<>HG^l`h
z+wq&7*UJSH2kJ~|EbP;{j2zk8)lXx-k^hUK7&4=82j_n<B<kpD=^$fj_6;NEZy5Ec
z>e??dp!n7={c%{=Yov<Zu%ogmvd9_+MnXa&xWmXiDr0QQMc76BSwH61+Xi<(M+0Ab
z_2K9fSMNLPPX7D2$@zPiBDT7tTG)+0-|Z(cnMqnY`EMFHAK8wu1wp|nSGqMp;AjeJ
z0&~!02@Qc1rWSG7Odu)5IXlTBqB+ID3ZUe(C8R0yL<22;MZg_4X?K}JA20_YRUIyk
z{_-3C?}Svq;Yjw1FUF&sI`5at!@m3nL_2~JaL1td#DJ~_P=NnP!-E>XRh`d9&)!Ev
z-yRD)iX?(b^w@;uaxX5~#IvB`Q3_8PO1hl|kn-MF%1#M<M=it+moNY*8OYU&yy76z
z<!dWYhQKg>kk~Ouf}lEb6qH(6oJXZ>t49h3Kc=@jnw$>Ezwq><ndmuZBYM$&3s2r-
z>BY->#<k?e>tR$y=xPeNo%IBlsWV)iTR}(VBL0os%)o3gx0BC82($Cd(Y+0PaQCRT
z&GkyR)<<2|eA3-~+w4zdaib6uBb<3tl_Omns+=%&0nHNbekU9EaR=|)S;c0uC*(Pr
zxxn`QJH9(7t-HD<z2FWY?AoOHy8H`=ui&{>!C9o_CS=EkJ8y$E^z=wmZeWDyOM-c6
zBqsV9)C<`CV}a*zi0^=cB@QNSwZ+6U4;H$Y)&NcS_bv8hHJ19cVSCK?E4zHpALoUX
zIs2}5qp^a|Fm78YYS}f@tPSlrx}AZtZmoW!g4k#3xgT%Posf;be*yKAfaSm4`aghD
zvNX5&MwG<g#H9A`!CH<D-gZLP$Sc<i4Gs3c)ODRPJR!z%?-W++r6iNx^Xd)BdSszq
zqd-l#2!HQ~+)J+9{jY<PtItcMZ~A&bREzEIWS6xb?{!vY@$*SC+YuxlQ+-ZDKfy`$
zmrZeiH4VxsOdx4zia<h18dB&Cdw`iZYMDtXGezitCRLXL0)z??VyJvmdD`(O%|xaW
z{c_;T_7?jT<NPIMxh`Oi0<$zY^6UF!G){ldURG1iAH%HlLE5Zi67Q2Q@in0+>%Cn2
z$C_;FCV+x-s8aN9$TA0HS;B5l?$9^exmu&%=VT=dsl*^qpMy?=RQiTHtUM*UdP0&(
znA$wEIjo(I1hlRM0FpY=s+uvG^F!u9Gc!0*uB7)D7q)$4p-6Qf>QBpUjnD~M^vb%@
zfUXqF)-BOaEcU7J++Jdl7bfrRj@x7$&1_?ACR3M=^Vr{2YMC!TT@JxCRiRp3z=z$3
zGRmu~{V^CcQ=FpPir*4n_auBgNcheVrzs<#&Ei^`R8^dWt7<ESi?`AuHz<tF!-e-$
z8p&2(Yj~AQ08PEwLN^VpCTDG@6kla2m6y-CR7QYR9(q*d?*EiP!70P;&;qOM8&=%{
zEMKHiamk>zsI06VD>MM{st-1)iW`LNhUdH_KKPCo#KSxj4)HN<g~z;0pwD}(PNPpz
zdyr)AdyDRjd2mhlC~Mzy5Zl{^X4+l$^818tlx}P{9vA7;2;AcE^^bt^R&ILoi@uNU
zrFsIm{anlMlM4<s{|hrlB9Q+tZ~YG!@O?q(Ut{dIQ)54?IUtv-=FmgXV9L6&ZtY&d
z<&^7j;F}EK($*o7LO$c%(eFD<d~Zm0@oWGkA-M6-@B1L|<=MV?xgTN7$?0b=O*X>y
z{q!#Vi5<<EDF5=#$$iVJ3btYcg=G3u#tvrKve1acD+()WfvN{Y8$t7&6o@O{X$cJq
zmQ8eJ5lL2u&`NO0cj*3JG)K}Hj{ul|rG%ehXziz`m>l3GBE8x-E8zKsjv0VmTa%Re
zuCAqOG3$~aW2<-vMdr77k5M>oCq;s1Uoc1-DQxfIwZk7U1W6~boM#mO8`I^}ARE9;
z)o2+T&fsxq1b}YTjui|1I2GP<Lrl0?j$$#cw?8)8CiQ|M{bd-}(<n3=N)`*os1>0^
z{`cV#IurAnp#s^wWL_R8(fN@;<<ZZMxC!s#ESl?881ew^RbvD7)Uaw1Elz9U9$uRa
zeXS#Sgl#pw<w0`>y5>?zgS};x=AS&st)7Fh*+p`naL8OvfS9-Kh~{n=FJlh5B)#ua
zt9K1znrIs=y*8<5C}Ay>{&Y+hlAG4$tOp%IX2;dKw`@uiwHC803()6aqPC#sLJ;)0
zFwnxfYWT+Rdi17oij>q{m8@r~eC2k^zORsB1g;B?;pc=iYLLC;Zq?)>bU#xiy|uy2
z&s&}A0IQm8(BS)%RQ1{(;8g0l6z(cd2$ykw!zuV2`#aow;SDaG`a_YHmm7!nBf2jc
z&^_heeyY5|wZ=ZC-NUud3VG#8`hu707?peUU{+oF`93Ch7pwH^XpWmsIFhC61Wz&H
z;S^@nZ*jq>)K`W&v^n~zrKv#1UhHU*vV|&h;KLRaZO&726zVeUl2}MUTFEp6aLN;j
z+XcW0;@N5ZJ_zcAL|)X-{^H7Dz}cHT5NN7Fu5ZFLGV20-*5qyg)L|OEW#f1S6Fc&^
zckz@g0Xu-rz58^Z;)h=~q=9v_1M@TYefzySafI#emJ5hqchOT04oQhfb#_D5Y4`B~
z$-5cbT3SYV%!!T+**F8wB&SG0)#||K=9e(~MO;d8oO!hk4-wSHfCnNA+!<#yIU-pP
z^D>9g)%R8Wy@a7acXSqBSEXZ$Xot@&BiZ~e&n9VLo)nX8+Fa$W?tNYNgc8$tX(g`R
z8#wWEJrtck3upeAGw2$$<<5{(Futxq)Ffh!-{#>nO!M20h5Fi5V#Pa*yw)-il`2lD
z3B5Q$OZ*30XfEK{;T0T?9e(%t7B4QYA|AU_BEgTUVxgx;%j9*}pSj*y|8H>j9Y+EE
zTiE_@kC5^A{rIj(Hohwo@dJLHd0qvvVjsj)mXb;({O3kF?b7c;eO#I@w*0$?Z%X<7
zz77Y7!~{VlV$eQu*O5Qgk(K{+{!(Ya5@eqeYPs)^DnirI?e4rH%^5fr;Y87l4?#I=
z)OgUKG0Nz0h3XLo7@iUs;owX^j+jXZIg{(whdvzg;B|c4+js*p<_EtQlRD?Z5EP!@
z$AEB~s3<5Y^9M;#S&dHx9a1D~sO$a(h%lrbK<jO^(9O9P58&1`>}?Jw_|v0KXDd^a
zchJKSgc5liB%E_gF)?AvKm!IED+<D{|Hl{tp>JFW+X^;+%G*@i8^BTfc%t}E0W`ge
zDg9PCI)#B;6s!@(AdCsFc?R;(dgPaU=Oj@UjI^hO($rrqHC0mF0%Ay8MJDvmgkDZ<
z7#`4Rn{hFB@T1sAwd^}=X5gj6VXP@9*TqFOV2J~hrW<0b099*RftVAfjY2azu>RI<
z#|v?-wj(>3yo%E5&Bju8<;)w2($d>s!Ov#K87`t-Wl1L4XtAN6#I+jHG4<{J!>eZ4
z8r(>)L}78YPrPB7oGS~sTl~Iw&EMP6vog7}`L_9aTW_jHMizJo9mm>_cxJ2iwie_y
zp@H?8^6jxba)kXaaAb&lDs}hqO}u3_X=iJO$)rR2(pjWQ>>4(0s~}odc0)uE`UH|n
zWBm2SHM96&{VC8=<4Va^b8rs`Jd=*Gp=>q1QIKy$pt>XpO&y6so5UG^$d@=|qbMP*
za@!-gQiM;EXy*20p666&X@;pYVTfjh`)pUz4gM(G5iDyo)XlJ2<(XL$B)uTM#z<a_
zl*F|d%YcKMQG`4#-r;q9tsxsZqiTGiC@Y_-Uo1(ek6x7!P+TG@NcXQ-vE%p)S)YJS
zkbft3%7$*HVwQgug4h4>PPWmTVhCS&<Ng>nF!#B3wGWvHGP3a{EYsn02|C(R9K%{z
zxvi(M+p0dRNq_Rzmp6Z&=xi84lc+V#c3)2s%d(62<nd<@u48@@MzwE+;=h@HYMMwa
zL>KFg!fura4a|52X;e@h!b72SgoOA|Q9#d8vLWdWC#3R#p-K)5F*Z6}PUZ7QGu18m
z-QNn6dyb%{0_{bNG#u~2?5u9eh}^a+WT7Jt-snK}mQv;P<F9IkA$i6i0j!j*fzBd6
z*H`j_GkAk9p_pM<#=uv&YLizj*KhWX^DIkQ3^3oZuNKi{$vS5i2y-!Xhd<59%}I3c
z9a!;=wszEyt>bZCV<1Nrz+&_eiuJ`0gn|B3FTLIxfu7hgF>5H^rw{zJndhtJLY+cF
zOAQ?rqF(E#E_BxW0pz|TH_R0Z-LCbXP}DBn;%kXokNbc<mfmDt-4qy^8Ft2BH^`~u
zXL!$doF%UXO6vqu8T=5XVs{$qcm+yq?m?eYrpv6!Ucu57gx_<~!xS;BYGE?%+48fd
zrU7HgCu4k~dnlHe5hD#-u@Apg$LU<r^86`II`uvVGw6pn^O_{dI$Uuh-Q!|Ecd#<N
zl<}8+0C!<AO5fp@5Wl<3EsI)umU-b|gh6oy`mNYK6>6eUtcFvp9j|6eYE`NMB0F?s
zq)2Kj`RXj!a*{c0duX0PFF#DLJVR*llvuKGr~qAdEafN3TU}`g*KQF{Ny1#vPNR~N
zX_V5j3&?W|pnH??#?#%U44h`ngmuN8o;S;J7zmJ8#=fiA;YQ7nStI*gHCC+xrrQq<
zGeBK7d*pDaD~ZbT;~Lq%{G?ue3S~hNFhJueOd_*SH-dm#QUa*!@9nJ@Pu6m^GhPiR
zr@lyS`9a$F&m!q<4+9#_#KN(nWR<Yl!xi=FaAey<%{uHrl$fDri^HZ2Vfet>zbwSv
z&tF+wJWxS~Q$Hk?{Pk$hK0#<B3h8A$pud-?h@EsyH;d!^IVcq@^TRIQ9b5RgB(JCM
zeZvPzZ(e9*^F5Av4|*Ts<C2gQf52dLMxYgjfpBj!m8Fd02C9rg<GLejGQh0=7#nU&
zd>zfSznli&{A0+Gclntvcfu|B){t|fI&rC$_a|R4M%k?wJ0>L3v-I<i&eZ(~P1rj9
z#d_BS`#mn{_e#ffLGQit;`#WBGq<nd&J1iSec-1*x966c*p25PenXEWmC<r+{D`FP
z&+I$ni?2h6Un)RLsK4Fk$m`OoQrwc{w5L{A5`V$!Z6St#nE`Vs3c{JMCOoyn=_12P
zlqs||ANx_vOv^m+`(;pmmH|#t|GsUPygH-?7nsuhn+iff{Xzaqb6MCs{Hy1R{7Z8w
z$yyHzAoM_gg@@}cjqafnl?wg18c;5zeIy{VW@6J$(p}$1xT?RoCes?go5o9;&YtpS
zwlCxDJF{flIDNXE5T%Kp_9l9fXPV52ur2UkJWRPwbch{{9@ue`WsDI?k*I_e&!o0-
zo(8pqr8GbaYGoA^kCF&UJ6yS9$5#AVv(W<V!4aIIWU|IqY6je1NS_DC+illZ3y>Cs
zJ)`tB1e0C_R-56rM~=7)Q}DoBIYZFzf@Hw-kZy-s<bp1ygn=Yx90$sdxfvc5B{yK4
zTo8XpAt3Zg&G=O;<#QC)C_4(rW~n2XDDxnr6S!j~-fKmBZ%i#P*_qq<G8ve?()p=4
zFPA7s_p>pXaE!$Pqr<n>l*!(Ikag;yvo?9tFa=53)PNkdJr^6y5F@Xa);LZ4htXj_
zT>V!4R>f?JIdx=dDh;6fPsgnxRG>t2Z6#JuxB2?T8ZWnMh5=nwarmLLJ$`lH#=_t;
z9H2E-{5Z3~-Teo$I-a3UZ?`#qKfo4Lsn5SZ%Ax(&e?@o7-#<#o)sqOQ`=1U%+Wy;b
z*$Y1IpCRkjpj^AhA(;r`nC%NtDX(eLwkC`K(JUfvL#c#H$#Gr3i<#tA>b4O~O9D2%
z-`$&OFM>bo_Kt&xGc*C|gHE+rePmrX8UKXEzI*dXNPkO<4yHDPXfl|RR0~UU&Z;c|
zH>+h1)(n*G%zy!w(R`pYQqg%40}rn>5#yQ4vek^ObHAjd@jXT44jIf0MsC;tjD$0&
z3qh5M^3Ook@+9O<@jC$Qc<#R>jEkWcWC6TYJaLv$f+?c&WX%$B;OdFlyF`C)&j8!E
zr61O$*Q2j}Z9E`@cWc)fjiB})NJic`q}oKTbDo5LP59D<Cf1U0zZe||v&)jP)un8o
z&M=MFEtCI{eJC7qhhK-SB2ViLs8ma%w%*%@NlDOy5Z06_SqZa85t64T0LEia;o*C`
zk=A|llZP;}ne{7XHB&b8xLG<ps!XhLs`H6{8^g>TkUtv9WsT?USu8I+I71sjH7`}O
zuaax4XsnuBW}8L>4R2h;4#K{ToZL7fPKy6ix<MCbh-XvMsfOmTKxGSfrrprT!Jq*V
zJ&Ba@lc0JHDkDXXaPNCOR$?%$bhEOjVUb;c{AYvkv$G#RR22QkLG`?p30wG!16ypt
zV4_qO`D?9gpcHMzU@}LX_J!^_N^!6aNo!dTf0!>>$Z_Czcz+<eT?wkW{@7d2gIJT!
z^$B|vHhxoFl*NR)iPP4X8brplXlFEh2kmr0o_x9(O7FV3@azI7#6RCOSGz4SN!1;z
zqtH9pphsJOZArX|!?Dl0`+TDp#*d(~-*7b9urZSeZbYIa2a^~Eyg`-`EJW3ZpO3^r
z)!08<NH4H5j^%K1MV&7dG3?TAz<Q|)l5F@KAzCk~Gin$2Y(au>;RsGnsDsbspKBZ!
zy&CGmBzvhbJqCiR+%4Fg7Iuq_Udt>^JU5c`(re#h3J8yq4FFyS6U_oV@#`2Zz40-!
ze^?mmnuOUEs&v)yk2JvbH22+TGx0|aOJE{ICVr3DOAb!B+-rdHKP>2Q01ow0jP^0I
zoG}he6M9p&q8?_*Ss|4UEsba+=L>=H3qBhGO~Sh2$TrfIxM&Q{-{*mv7tuZ7+c@L=
z9bY{9XS4>lywX&R-Xg|M1!DbiX#nM|w?KyC<xim>pW}OaI<M=h+K=T(!J)(7abvq3
zH2c_yd+|so^L%v^ED+Y_JQMTU9+LA+cl?A#C0XIayIorzE;sTu=kthYE!*+Tar|T=
zlInwS-)oV9+fco4|Hk#>2tM$CYq9UR{`PEq&j1Vl32fWHGr+I7VgL34vKAU<1Slbk
z?XKphMY6SKc!=*2Al(iQcholO^M$*4*V&}S2nmv4%35#N3Er-=<4btF*VXmq&;X!M
zdM88EWfjX)ssfa_KF_(R;hr@m?UWA*MM*7cUlT!Y#cf?7+X|F*={y4?tVRgo6MVnA
zI#fdhjLi;2Atsl%4U(I?(@3rE37}ppu~6jJ-4CQLZh-jlICpUHThC8q;C=~d@{T0`
zc40EE2-OJ4M%>_66M)NRG}#-9z{5wLz$QSx+?=xC3~yxYR$6B@2W<=?EHG?F3lQ33
z&V^(!mPpNe5u+h=Tt#Qa4skz?L`)Y^c~8Cb%Cgz8c2KtNE=04~w~swK2-<=#)mr7`
z2CsjKaTn%>k_*o%g-UAV8kcAqkMtxrn4o6{_G8cJ?1s26w2;)|Gmqvim>mC_wb72k
zTUf;JM$(+db|144EGu8epjLU_SEXoh@cdJgx6#;kbfvZPcw((ZaW%w?VHUJ1W-p4E
z#)BdL__{0Mp`2+(jnH>6z!B7U#qey1B8BI~ybRYMZhZ*gEimE_xyO)JcfjhPD=>eH
z>2MkCM8^+v?oQzn4qyO?KR{oWUQm}l!;K$g$#^ksvM=QUNNx!P%cj@J)8EDxoYqQQ
zQv1|P5XkT@B;dtnx}EFBk04yUCh$B2_der+$N|T_n%JDKRGz`;i_d;N{Z!-+c(fH&
zYQ|0-8a7FfPfsUyg(1>!(WjX5I%P7i?|#2+ZBU)fs%q=-m=@(xov*4`)Be^rMSCmu
zdI;(}jqKyJ2lF|4V+bg>#kCa31Y7(>5#koO<TtUkx$v`f#rL!`v13i+(k2LgYEyBN
zMRr8>Sf5z0rEs7Q%ZQrnaU|-DM^)(nAa88Y8;o+rl%AJ=tWZtdy`5|d|NSlbc_=PC
zfzU6=>ExG3cE2uC0*EPI9S%g0oOZo+M5z)c=jA+Y;7cCuebhAR*Hf{n4bxD=uNzN2
zD6)Cwt(lykAnZJKY^<}T#W-xv%|Ge7!yX?|R3pT5J{sauA3BJ{gGq`c(O5v5&jP+a
zCV0MjG`$g(Tp#V`F>xyr`XAR8Q$mmmzXKLLV^I_4Dt<QTZD$0pmuL9)kp=`0WQYLn
zSjNn;Vb>P<lSBnpUy@+=TY004lUcbf+w)K}Y;mV760i9hI-t-R80TR3AUlVz)PVB*
z+<>&<s0Q(AN@&gHNS|@n)~6KjP4zc;P18Ss{#ASZeU#-~ZH@kJ_JRHm-yXFKyYGp_
z7r*6=L-UpRMyVpbag1d!<fs9XjWPNaxKLs`N35a|_+}wB{UGq25e~PUJvA0GY+}|c
z2VeRPce=}iL+R@K23hl_!=wj|*uE-NR1;HQG13b+bx#a&yIf{a;uC1QR0zmuw378`
z_-!qT4l^%UBETYxdI9KGDuuKH%cOwA9A!%w3K$esQp!C5yV~@`yH*NfDc%AQ_|uMc
z5d%s9>VnC%Aok2n?}Ee-rFm9j%x{7$$en=t45IlKWN5HRT4<`CI{2QiJosQ;XYUpJ
zj_+PKNWww3L(KuAK66GA(Shq;jAn(>#bEA*u+%2Qikf4DI9Xn0kH#6BvqQY&q(rDO
zqG-#NsearIoFX3E=sk*Px@^hkH3HDr3H20spHU~H0INt>@d{JUM}Wwu;T64|DW0?O
zwpT!1QT#Q42|yBAQuQ7GwFy?{5Yih~adca!s{c&s9?PW(gT7pZEx?LQ7Wy};2qr0<
zJ<Y_oRTR-FN%^LNDi;@D?~=}XnqUA_Dw6?pAaqI+P0MlJ&{}8F`|2tGC026R?Z=z#
z=X=MGr2!T5x$SC~cka|UX{iFy2wPTuE~&~87*e^mewY4&F6N6_-0cwK=C~pK<Qgi+
z&A190%J@-*gK?!e^h9R6G2(-*s7SIxENT*R3`ops1B%9WF3e20tPp!5cvLuEd#gg!
zHB2?!wwa;MS)HL4b7(u!6k@=h?K;7})yQk^xEIV9X-}Q=W}z>3Iq+aUF6X@I!Pgun
zMQ`i6aygPT#x0bLA7x}VoQ&6eR?A7GsMI72mtEerMqb9!$R)p>JU4sPenX*NhCq|h
zQq0%$P+#5X=k<E~Z#SlD&h7wnS6Yh()DjleKr78RjE}EnS1YX|M75S_wX|GKQ0QZv
z96MEJM)MX!hV6LrJi^<{qY?RYUYzd^Uh`01Y8Vy4>~4z}_jXt$T?xPP5aM~Qp^d(#
z185&ea`yX&Z5{17a*Um{na7eEg2|2*oe`#JHhzJO&|VJh_yJSMFmV2j6c76N{~Ia)
z%ancm^Ux`NSFkXDw-xnUvrkzf6FV+!D$ty|we8Q9!>$6pIB<YO)h=zUH=0vQH|g^$
zCE0SuF5=9gL>OuwiQf~8R;53v|K{fJ3aO@kB{5O@=2k5g`7Fv-q59(Wp5kE!^eYt_
z7+VPttESe}0(DNL^#p$a6?)bQNKinRwks7S^qT;2{pvT;RpF=D`%@#D>0Aj*05w-8
z)F(KCdcrh(Q!hLJrkTT7n%4xvzq-4_I5Im6pqI!B46c4Vc5jbo-JUK4ofi2gLrhQ3
zfO<b8a3cZ|OrTa;4|K7OAJ!0QpZJ{-Yw(c_tKBxQcCbAG>!Hv9?j~eL6H}@el8tDd
zGR7bZiV{7(k`2226}l7)wPgG<JgT0mPD#rlGbdsqzBUor;Uu(SNCv|^N7YTZ=6tW`
zl+v%Ku0)p;2*8MjirRKHJ4O2S^(1_A^WzwM>BJmvm$xy8UP|rERzeE83mGFsfh1Tr
zMLs7rlqaHzk%*q?x7IIFSA>W}5qLRdhx8WI-aRU62x(i?P?NNekmM*^v@HHJ1GW%G
zwQ~%76(97OTsiHIHT8bo;KmB4G+bi_EbU~ISicp6is(=wez5KCa3R_?-8mCShXx?J
z{g=*NKxrgGe8xCbPc?Qx0G*(M+fhRdH;VGKN}=T(v%!!4maEby@}@P}wE0h(-e#{C
z>P;`{)~VNo&N>kxmeWB-&|y%FPNAf<P&}?kG|_SYA6+E9Ha(Fbm`#S($1`YB!t?CM
z(4JE${8E_Vh?p{NOBXB&7k!4k*_0%S)m|3@xV^apth{vs3c#+cMnfbKg6#BnomCWz
zJ2BSno@zYLw_aNb{UJ!14AW@OdsVY58Qh~pZwHEt1%4x#V!ti6z|G+7V@=VL(;LXf
zj78}UMaPU~-5Xx-s+!`e^55mI{FQsKwq?tw@iJw3GTx~>thfD)%Rsl*O(VP=E>0#R
z#3}5;rHSoeuMp#v$?!R;FnSVytXzBVcM)Xl?!Sx~gb9#`Ae|W5!!&nXsQO6|?iLFW
z^ccQqo~o{y7ZU!=!s;lf!(AAE-;&O?#9mXqYqri2f`jea%c|~OS$a;8e5{F<xlFm!
zRWT(k(E~-_)h9<6HaDJ|$@9&v=~2xvc@JrulgD_j(Y13t;|!)(zOkU2{sk{8!`N-^
z_)|EL5tPmQvGbILx4So;1})3r!`r#7$+)U08+!^-PyFLl+l<QttEg=?;8L?K%;PP(
zr6V)$>bHRyKgq<~9Jk4a2@fHGZctmrS>qm66SCS+i#O-C?=zsem@jg7b7o0VFDOit
z<Spfww7{w7UQ6e((udg&WzBomjsJyCvTxMXq5nq572w~@&|s7KUouk8(AHGc#PWLr
zOZ1%=rqwpBHU$uT;g9gko};h6{cs^hLONR{u#cp)h3Vl6-&Cad=1=M$U4wFcwR7_4
z^e)X>x{f*M)gmC`S-H8BoK4J|x%iKqeCLA(0K4tC#j)O#E3Z2zStZ56e3jU*I1ZrL
zhmfbVil@PG0272fVv!(%*Mvv~z#w!7BIZcHBt`ZUVuerqzHjBqRGPgzBudj|4jvK*
z01p~Y4FK?wP9}KY3Q|mmgx{u0&ZH4mp?xyemQp9aQ2_336?9&lVfDLT60kUQd55P<
zph`v%kFdszNL%>od<n=SYaNAzexg(RWHMxw7qcjE%<4_1vTk<j^^?@jQR|aiBTRTn
zT8dIjpiAJJVi$b07g4p|8O;u}(j1(XQvpy#Dn5@27xb~4KQd>|+>^qn$Du>U3Q=ba
zk*->!aRagUz`nQw5Od_h5ej@ESUecA(=o9elcJC?=V&J;H_6-s<$EG(wJwBW+rjUJ
zT?9m%-vJk2F;T7)XEM{_qK50d==ELi#^a7rZu!=SFQ1w0Qb%PYTP0AXui%J6m|?x;
zC3}u+^0qxIysj`5&L$~ztqc?;IjK!8|3>{lQb$rv@Fn>%%hIVCx#)Q7Le(axRdLU~
z6p3P~+&wcGu8r*m-6CnJL|b5;ScR-KR3E4vyp|5M!@V0`-AynFrm#fe3J|NUi-<5I
z4RZXkCMH8UYSN|t+BBA2??gdQH5L!qhqPXOFQEdpQ*EYR7?MWTQ6V;<OoGDFJT}T2
zR`Ek{+;F=DfIjo33GzZ4<K)c!frAY8+Bwu0w>r*0HPP4BN=4yEpQ>t>s^HNnD3Yi8
z=)4qim5FAyM;y8lXLKFuroei1UU{w9d=cM91!X^SjsogD7VUjQ3FGqh=kMR;O~D<_
zgn4pfEdG;CJOLA!ISC(tGUgpdyqx*>j*Cf`w&7+m^5*OQ@pS;dM;V&V_$AQ5w<b+S
z12T{6QeV)Xqkb^wAeOX6uea~owdk0(4RBY<li>-4(3jb1SLKz%jo>L=N>XP|cu>-E
zKw+0O!>q^3WDooIS2`W~xCv$F`*%!wSpN;5rgiuK&X)g%kEET0>v#M_eCy16G;EbO
zIS{^PVE!0l7XTAN0w&?P1W+qb=un>h8gz7rNk(i<YB#r8O~PK#_mBTXTbCpNhs^Zk
z(W~v=NH-@PSoo6hkA{|3p;>78m0{QCJ8}KiaR`bu^egjgiEHUxGw6L^DWpxn;oFrM
zw7Hc)@)k@|JmzC2aSiQ+o5U-Zb{~%8AvSo+=}y(adO<=%hrxzyL;~NO4ui`$fQ}v!
zHw%{?K31D-*5&Hq;wbcCbt}dj0Tmvqv=6}n#s@?ms#L=n`UuGZJQKL9G;J<{-jBYA
zWKoh;pWp|c)sHVgy{senj@%CR1@tAy`bVIM#%P+Wgh>H}Er7k!40!>q0d^_CtBO*A
zGG1ed;RcQY0D13>9aloP09>QLP33`}1iKv^r(c#8ujD2G9zvij3t$1h0G<aRSmnXl
zs6;v;Ef95&_LgwDJNOa00r(PVxtyp+H6F87$RaLksr{pj!v9)h!Kn2qS#r|#xFKzV
z+oHe&5pRSFDE^~*8Ohe}D&<rc)_(J;wnby&N^ZmfcLJBvB0rACbGAEb=%d<qGKH6F
z@mVd>YwP^kgkl)qPayji+($9iB;VbK&MOhYgDkn*7NpnVcWeCIGKc#VXK7n$Yto?!
zb)oQ~w*jPe9H(4cEr|!_tDIkbd!&;K_wHKu(C{qboQx*3NhJoGx#K79DmnCUu~n(k
zdMu`3$>|Tx>IJS8Y!z^~{o7+Xmd2n&B8b!}JOeitd(s^CC6iTF-xd4nA>*e)kzl29
z`B0zdT5SbBGwYnMi88Ay_99hjmCZ;RG_186W9$d&J;ycDiekdd#THK8&~4`Opg4Qk
zUlW`bxE(=F8_vaF1Cg=LZ)JCHY*}WmNi+Ow<%Xrj&2YAAAo$sfEtF`+GXl>v<<fL@
zz<k#rGVTGJLGkz0&y@0w9v(Q0&Ge&-wCFK2Ei{$KV=>D5+d+DPa2tY*&}=lMIisRK
zCBYckyNy&!>|MLI{<yND?DqXxYwy*OHbbO!M|9DK2|0Qh_t|V(H*m$&Ycye?i{0B$
z|AB3~9ou}y8V_VYjGynFGqIFgUC-<aW^QJ?RE)_gU@;0GZ?>qU5(;a!s7pY4Nih_7
z>iAHZkbROrqm}iiaGep17YFnluKs6L4R;-hSmF<)j$S)MjGU}gSOwh&;`)yDUqkg|
zN+eDUO@j>6*ecbBJH4<iJGb5{i{|w6=r7>%TZ8(9g~0DIC(By)L5!1SdUeLt3#eY0
z56Fn}oYrE+PHq!2yRnV-MX<8t&5%&`4>OaeE{;y`8#YkBc}X&b-tmrS0acuIxC&2-
zbd|r%<x97!yiCiBmEQanE$s)LE@nxUG}h7)DBYP%7VGk9XQ$iqZXA#+O@VO93hF>}
zCR_7Lr_BCX*a6*$W=`NJ)z2FQhIb7#<AU8V!IpSYB@g+~hL_(ze4neG{!H@HUMfG&
zH)sAM6uK*OK4(r;Ig+exp3#06{+J<WkVmR`1B>)B)oQ*9YZ3D95x1Im9pYrSlEG3+
zAOBfQ;PVNN^#dF4J4*r2UiAJuW%wsS{coe}`L|J4xBZsx{ljx{w8%(pvNQt|sv%}z
z*ry^C03Hm55V1RI6%RwU7TbM#&CpvWx59*EiC$stzWLbCZhQW|t(g7o?TZ1ok9{cl
zBks7nW+|LXUm-B&P7%KrvbQE9q(u?zH4P0YW2F*9ABa7w6h4GJOItE)&#c7=XDKQR
z*olf%Q^{Q{pxJor@T-S|SP2gTlBYV7K2pRPAP$4b83$(n@Blm(b&69t#^e%Rv1Tu=
zGCzbiGf7dd&d>}U0UcExS0i~2CHZiwU`Opiz!`7`yEO!M2xrv{nG;$1bO?0ffQmRu
zNCz^qQol*0mH<`s+UbU3$HWKh(Oi^Cd@g_jx-zC&IbX%o51BUOr(~p-URHX*V#~|v
zQn+||ORAc>2|SdxQDD(3RnkV+P6<22Wga5W_9_C2OcCgklZmR*zN}Bby!Jo?Y8s-2
zb{>ygt3+0*ppJuRN0M!J?c>^|zGABmWs?QeSCArv`74WssH9PuU8^FWc)-HNmDZe!
zLPukCl?;PlBC`g;3`_2P2{BDyDb%^$0wmAdvBOnm6-d3~YOQhpW?be^7l=H-vL-_f
zbG`7q-?*16o6D)bqAq^$2%&s3<eg*eft+EK_ZYjtlJ1OM4Xpl=6~sQ7imz64Yl<;&
z!aZ~Yw5$m#o^=*s-;7)RwXF6Tos>Pu#0?2cteD!%NyjnZF@!kISXkX*@DO;{EfBfO
zfT1i&N(4&Iq*_?1!Lc!cg=D1He&({x^V6b0zH`FM`C%J8ToV9%+Nm9heMu2#84(q;
z(;=_GhlH%lUAhbLBD*i>8PFz0fr!k-!J;#f9$`1do`H(!Ht2vYv@WFwcT0eNbYLt}
zocBeN*J+8oLg(>nw_}9%w~Bv709!JNgyG3GK}Nu|B|!=S=X$XWE&ebg18(Z94b(;c
z_>!KfR^a8w?GgT9>&4<}fP5|I!JfTYXRTEs`N~yBdrqJ4i>WdEwbk*SCqy~x#UF)v
z3}08?u7<oDJy|TcOYfxlNBX#K|KG=Tzt;jU_`O|Mf&Vx~C&6K<LkHJ(sUVoAL<q;A
z=sTpMdNJJ#9g##&E!c`x(SROOJ$aEQ8!kL#Cq7+dIh-;6soyKbAQMEu85huYCmQEk
zP?w3nnn9a7GiKJm)LjPm9QizZ5v2A%9{YTQy@<>N{aZbJ{YeD=ca?*zsk5`8`L_@N
z{`*2(50<q(Hv7GI;8%Dh?jDJ@8p-;^x?t+@`9Tao`f<YZHJ`?4&_*dqD|KB%i4CXd
z*9R<qm$VbUlXmqxfyKoBl*0~l_2F5QU+>pBhMe4<e+>D$@M9p9U>XYgY~E9GMgJ@{
znSm`ue=r$Ddm}0fV5Z>UFd1n)!I>P~UBC10!$ti;3Iw7KYA-FCUlC<2X=b^HZ-6;U
zfY`SR&G8EwDc~hXQcUSNQzGpScuwjRNJCIWA56f8o#jS14$OhC6Qe)$oz;)`d{Z}z
zF3fS1^p{dUO0T(-ESs<#z85@AA~i?w!vug@3az>le>?b1rU3;jPa8pH!OV=gPFH7V
zCyVqA8c8AIAzy*!bSskv-CE=@m9Vj9*yg5=iKoe0_TYG-l+na>_L?B?B5qxN>@v}>
zi9nR!z*<gZaE4-1Es~+QbDH<8haw9Wy6tsZem_X8u_QZpV6MDOaOyO(YyfXCc5O_D
z+b%e#X&HQ&L1&bJfny1T<FTogtnI>4?`KD*_k~>_fFrs@2e;E&zvZUS-v_rnhB!(|
z*s;ePYVisbR*6U_$vMIBNG!F&)-mvpNxoW^oP$km?rGpuwt-kxPJvX>b9Rz*D)%S}
z$|<9y$6Qb+!4c}2(3BYg29X(#fj82$VpVg2!;9JKvISv!BqWlgaRWC9R!r1K;@;h4
zJY*In`0OmuHNeR|*2g_$!I@DN2!|p_V?n6LLufIx0^9?QU)u|D(loQy9<@B%v~2FI
z%qL&W{AYU#RloLgK9F^fRBGUk7Cb|HhCqMEf`0XvvrMKEH2TOcNbqABl!lE-q0*k6
zVI=zpou){|+_Ais+V}o46h3M^_Pas96=2w`rU=|hTzHxPbKFc(ZLxp~)ZF*xW~kc$
z+8!WuBR+7XX|<P1O@MN*1Tb}$bawy<K+T}((MI=pz;f8Uv1%>-BiDb?n=^a+>*dSN
zZL<qES9d%2+1#D}<2L(O1q^!|{itxJ=p|e)iiHA4!>=UGGKCOQ%@;SgTzpRn@(HRk
z7*UvK&Fci_gP@zNws0KueOMe^P907qZNxY#uB`nN3CnW}HmumVX0Z9=YfAH!vF6O}
zbs6YEytjprr%n+rz6C?{RlA=p6N=F|b%&kZtVx@PyLvHwTbxTl$?TI*UI&b>!lW^=
zWCy4digH|^!Z1B7lWc0r+I7v97&=7VLD%RMcxo{2UOnv%n2AOH1nc{gu6_1TbM;H5
zx<+i(Xen)!)C@q?E2yXBRBfE<E=@SbROF);Is~HVBPTd6Dw+vhy}#V2QN{p8t4W9x
zsDe0@T7+Ct83lyTy=B%FOs=N4m4=_LwPSF#-j44!DL=PEFJK&_5Rv!1-ZzP_xAnIz
zGbtgRTuT+aw!G~Uwq%>u$O6~+67(&3+fq+HRep&wJwQ5T+P>R4C_ZssH3*}+>i6Io
zZXVKJ%w6L@7*ik4=SXBK;ZyY2C5^sX9SqH>T=JKuzEq^}<mnh;aOE4cbM|#ZD7;lc
z-I`z{F>4w%#p8mj&|-p?Z?y<(LRLX2jaoW1Fk#?jO!~7$p2N!EfhC6r*Ju~b3E4>Y
z2hs#}`(4n&7`U?!C)FrJ{E<LHg=4-od4edf5O*J;yp-Z(L4)_-!;&Mso2q&zB!?e>
z<R2%2C}4KH0g^LhS1|JiiU)32Xo`engVrNaU)VT1L&!TMvjEF$Q!aXlJl!K*GvA2*
z=q*mWd<R|HF_J;uu&4IzHg319z7g94nzKhX?JeDrn}?6f%BXUe;<KLi4IV08CAqXD
zj$%$bZPqipBJ@$8C^Jk_0NZ-8dJyj^KaoZS|4j!nltlkfjO?Z^LdFvNa|T;5SHNpy
zxjnbQ_Di&9R$k)|hT%XT^T1Mq0{LA$+xb`Y&f=p%ZejrwRMuEsj+trrkBb)6_~cF_
zq6%JGJW!&FEO+l8Rl`H0t|ixf+aQTUqIQ5|P!7{c!_&2Jx8uQi6c*j^_5r;3y3OKY
z_ve5Q(K@NmcE-nK^21!7PgQg=0A!D^T4c3$P8`Y~<-L)Tso;$jwvk(zP#XZ{WPJ)Q
z;Z<Qxz((>WzuK!4pv68UD_hEC>9lkDuv?PX6Qr2wmBrVyWDX-Xhf*)XiYa%j(OmIw
zM%(!rvt3Q?wVyyIS7&NnSn#ASebQL|)Rp7!c6YcbHJktf@v@V~_n=3lqeMf-W(w%X
zfz;-H;GO}O*(J^=0t;as%Yw=haj!t$*VIW(X+SgaSFUhH{zkrLqky=qHMRN_k)|Ny
zkm=8%3a)^6v@+h4nl|MPK6%?Ui7+Y%|7jq$6hzx$3{Oj}RFCuowpCa18!$XC_nNik
z1~>VPs@nzZGH<T;Y4X?aFl%^kvrV?$<>VVZc3^XcXNH!I0CFmQEB}7se5HCmS%T@j
zE!w22m@9U@o7qmGJ2j114(UDxVJ72!m$48OviS#@s+6J_US}$^6VT$=pM{LBGJ@GV
zt?g`oQqXPbe0utU{Bd9%l9Q*SMvN*hVkGi!nT(!#TUO+kkX1~9XS1nrhvV>aKTmeO
z^h><^vFlX~Hp(K|Thtg8DAgj9;SKb}Y+DRT6{|K-<7bmR`*f1k9kZJ#b#%Cb?xS10
zUaft8;VMD5ey{0U_x*Bgue#lslHsfL7rr%pPe+MJ%q>2WSgQ3_@%~&%<hQqJmyLI`
zf`7$R+#e|*_f7{Mb}S-?9k?v}R2Htaa(5(HHv0LCO342={<k3aADt@(!z?fn#(&H=
z3WiQDp8raPF#f7tRiy1V8DM(RPyGoNaFeE3vuY^9j0VEK51uJU+YP~q8d5OfS~r;r
zCtbMp`H|qB{5Z~l2%<?mxHu%wpN8X-lb<o*3DX}fQ_bF@MAti3)uhT!I{qvO79NP-
z@~|Mqnyb6Z5US`m4&)NZHXfh<LBc%ABk&8LM~zj;G*G2Mfe?kFuG=kwt?YLpAt&#A
z=)E64)oo$AUwX=NP!k{rf!YDws6*H5bjFqjatzg!KB|mqJOcFyj10a=6roKv*7hwC
zP?manV~iRWO{0c7TLCPd+3k9W((;cHx3w&mBL}#fGQ=Z_--ko3`$A{@lB(3UgV31r
zb#z?6$hQY3@$kWR*W3^W_NpKKZreLefYKx@^UfArY}Hvxw^7UFS|E3S0onYLQYCSz
zcPjq#lnk*$qZ$c`d)|JiR+K8MR`Stq47ZwqHH$0n{wZlH1^y6{B2oqwuN_5x2%C91
zj}V`*hz66OzoqE$82U35yQ%^C_LN8;I2fRn68)6zXYWeDETBsrPO6x_(y(~ZZW(cs
zCP@9>6(+iQb7U8ad3Fu}PG2hK)}r{h#8OaOwb0mHE?wws@|pL+uMoGct*sCS(Zq&6
zLVCn0&M1y6JdoLWJ?Y9|M{UhI%ijc%JW99oj@i8SIph`?V5aFJUHPt6gN%NPTWw-F
z<XS;cCYu#DB|pY)JBfYSS7H$~Oy0oNYzDOd)|kYAH6Z^2=YJN(|L^ce@BhlAw_3an
zP>KdAkd!matZG>xEf+P~z(Z(~w-DrK!flid`utYm0s%B%gzoo-?>h8P@HSTuqxq&s
zS(`U+rAY)k&EU5%B9(`xr52@LisE5G`H2b*uZjc-T*%(kf+G={p`k1xbfm`HnZ9jT
zdId%Kk-;=NZUw%f86HR13o0zwy+>N=KLB6C`>?WM1E3oZw*;|!>HLcA_oRtp_LM&N
z#Y!Y$e*nP<q6q3R0(hksT5Y@S`R0f12ZZh1K5yG0nx4K{8Zj_pjouQ-Ofl0BxLVT!
zAq%EYaUm3Hh>gm+h2@j<7MN7WgeK9~p3xjB8G}>lJ#2{?Rw#(O1xYF(FMppnwWN)0
zJ^};3;WoRdHH!ixOSANt*^A7WLBAaGO{NlC7=iT}H{Ua3P1R%hK6$1?`>kPTBsaxq
z8T7Jz_ft@VO-*<4ZZzi6CsOA|3K_^4@exMt)4j*Y<i6k$4|{&}6Ao)tT%u}!;<-^h
zs+&lKGdJ=BF=DGDptEouf`y415x8TWM1*`B?^>m_;Zn!}5g(`E9$GgpSgjYiaDH@f
zh(X)Wlz@B7Pr_ONpDwB9kyM=`bzbzxY}bLYld;b4w>U)_f9TEP`SQu>e`sS@|A<kr
z;(4W37hWCYlr7#LU`oIHD(2JVr##2F`V3&IlH9EBd06l?E0!<iz5j(~(kTXNIqECO
z-eye%LQR@PI-H}DBie0{)R_aF>LzsjtBtFPKn*CDB_1`e%NRogez_XIkp2A1BK?oE
z>qAww_v!9-uKOIUKVV>m3C~~nQMTX#{(taOGIe&f`Q}LfCvVBdXMgWx`M&&!arG>K
zl*Wc1rKU=(O8qpaT)ixH1<T1mV+SjDr%=$>Yb*@Z6;*W=rGYq*$L?pJH>PtVhPyby
zI(2d@d;FtrkXx|i7EiV^f|$J+P8t-xl0|`&Euxf@Vjcq_lg=3^x4&48F@h&dezz|u
z!Y{Q^K#!mR1<*5>5$IXYtRFkhcGLxl(r}8Ce^0p2%7F_IV;;W^cWQs~3tS8&-&s<L
z;!QkZ$rHO7_yV~3u*bCmo@2MOUzyz-29-iav%qlb>^G3>a7F+RS^%E)b1qV!d9Ef-
zzqt17jN0<FE@oG<o!*(~O<oij!!JN+`wrg|;6E$Wevh~P4D8sQdILbM*>Q6PQb7_Y
zA)M>DHzcM92uI(?)?+9`vE^<FMc*=#vSE<1XAHRXZUF2JSs`vjADNfH5hc$Pg7@q#
zkMs!Z$%R_3fE5e|m6W;ncX}11w_ixmIZg#3XD?xiLW?YbSyy{F!zEus&85&|#$6L3
zQ9CW6<7^HfWi*s6W|x~{krUviX&g@6>@M07R4tUdH&`W9KCT@;wu)OvW{_z03g%eC
z7`!6~seAL({}kGFSuVGD&Zg3~8E2W-uU2ngB#$-R?3PR}+fKfdp^*%-@m9DXX7`_;
zlB{jEUfUTBiX<t1f@1l=ZeY0AkT&cypksPHPlLPlX5u2o(w?+yx>IiFdw+r=vH$tY
zS%IkVGyIoX7cn(*HUA&CDbRP)>PfYYUKIFVY=!=g`?W(^Vu_7hyElLe$C&^u+7RB0
zK)HE&#FTX%cDa({=fy57v}mn5Jc`gdG4nvry!r4ZS--!B(;FXOQ$m-%+PtyVQ#jmt
zbtYL)1!t$sM$uMCFmaoUlm;U+!6rwTGR&^npkW%KT6S0urZrG@l%lKm*SQRIa=ru;
z7R-S>ieu1k+SO7JW29Zmh66wz(&P$`f1{?a1F%KWO2hO;NMpS$Od|=|4%<iz#*m!@
zMW55ZJwMU}X+}S!NL)k%i38L*hGW>HuAr14S&gpLNRD^oF6c!tM+vxBLdU%FGpP|Q
z{#YSrS?F>SXo74tEDmb^hxIssx~n(+YLU<>Z`xo~>6;x*ZLpRI8N;=<K@^0sPRuQe
zV(@zvZbb2M?JfKB<s;Un9nqoh?6(=d@)zo6%Q&!Tsd{5`CG_nU>)1^B%}zF-qzj;1
zY$(IGR;VN`xzzhYC#&1Q6#2#`P+op8Ge>RmqzQ5@e$a90t99EQpbz0!qtmbHoO8C`
zi#2q+N<6B8Q^4Q9yWy<)rY?v2%#W{%kLUB5uj~`_l1H>@KRDW|B(>P<+>KT8(b72<
zKtb1K3pboY8n<y+lTP`CIyy#)mP@O?Ozd2DkiUJ(q?3K5ONtNM3|(YVeiKs{6!Kks
z;_$ZIDs7YUG`c|hfALZAYzy+Q_~##d{Kq_+{TCprivQW)!N2vBYyqjL#AUGp%{B`G
z2_74{;0myCJeGb~`CR0O^!KaQYFrK&wI<BWFLL+R%l+};bJF8cZR~Ci|7{)};h@bv
z0zt3dgm%l8Hs#+spNrh1G6%v+hNeJP6~qIH2%BIL2MkeeCuSv%7Mcc8D<MOQ2B+X0
z#|b>&4wSGK!K?7tG&6E1r;R|Eod}Shaf<{kQ?hq(2RDdD$#h@{#IF_|P~tcgLdqlh
zbn$^nh?meLXGMx)1(-@F6<uR_?x*qG-?I88%yN^0We-6*NoD9_T+xJ#;JNNVY^4b+
za`<-8wjen_PC^X&AxuL32GBua)~|!)Ob#$yHMkKSSI!s0H)V$J%i+b3yD3W3NI=^m
zLI*m0n>s;S2^1H*%0T7J5kd?)HNVBpdj`BrI_w?F72_qAB;^+VGb>SOjn~HzDSaZz
z;)J4^t=I_0&Pr4XuC{QrMlA6H(upg90sVpmSYn=g5V<P2SwN``T2m8Pxls@UWULl4
zz%;HPj*yo_(`sf%iAa(NFQkao0rp};$)n$H1wggUsWjEsySiWkO#c<8_~PM)ojBtn
ze{nH8G1!=VPr9S)>y>_jofEuKMkKv{c|EUh8Xeetq)GPj#(r>4<e*1ovZx9(J(JxF
zedg5XNI2c$GH3Gwmp@VT5V_E5tZ860(9xx0Y^Rwl_U_)SH_5@sYUK6fcy+`B7FTw^
ze_to#><(PjzQ^GGs9uaKs_X(m5u<fZ4IFjxfYy8{b(vJ^wam_*+rC9{Rk{Uru?w7v
z9hd9*aW$`rx`^E|y=~X)y;Z#BT^~Y8ezw%xtL}2~A)~q}IWWVjnouphdo0DaKZ<%K
zb*YoO-j<%pl+PdV^wRn->jzxwcS8g(=;ZY8We(YI#E$&eu9g!i3soZ=>RKTzs-=E)
zVQH~FW_(0~ev6ee?k09tzZ)wXwOPoUNUJ2_L-#^_vSs~ZCf?JTiw6d*W2I|z&^Cww
zOdsd9jCt!y3M*4tN_wkpN)gO}097;-)4WhNr*Uhm9wMTVjVx0Yxit6xxO&GRQJQF5
zux;D6ZJf4k+qUgKecHBd+qP}n=Ja=OOw7C&QBf69zccsVxpKj)q>W)16dJf!nbg9p
z<K-FuL3Yk_0<(VWovF#%?T3W<@XrWY{l=ZiW!oTV^%lDucQ2xa%N|2-r=(-regczf
zY2vMpIc0pNH1wM~BCZt@rUigf8B_aEK*fr=2AZg*Mk(+#_4tJQ0HOMu*mM)*_9Bu+
zPC`ziCfUCV<hD*^nYdpeFug=Z{VdwT#|j$Mm^t8@@*jnSGQEvmuXp&^`yqxnS6a!*
zTa#}Ct}djr$k1$BCt{UHXUb)ijH<duxLb8boKQ+z&Ovh|A}vueGeF0Y-q)qGvaoIY
zlClgAS}K#Z+1zf}=L`8Y%*07v-K4Zzr9V_w5-V2qt@l;z@R~Cf=NFlRbI0<2&G~d@
znIhM7euK$g-&&@8%T7;5{A$rj^0YHD9S3R;NQapseffU1L4ipvFSk>S$J9;ER)`*O
zMq#&Wy&8r42ZU?w3%$x?whKE&v46ufvO)f>L+l57n3qU--FL3=WOd9~Mm+kYfWov#
zgl3!uG2`*7^N*Cqm~q$zF3JpnUyGhfmy<%#rYH(LEK@BqmGCYZ#6oAX@^tVHpR!cz
zgoawPVCCfOJ{^M4k34lL{dE-byGzT&yT8-?y0LZO?*Rl!vpV>%I?9<H{92#=?;;bi
zHL>{>E8PDoN`{gqY=1e;A}?T{@a*<b9CSpv8@Yn>Vt8QfmYFIF5K%1k;o^n8dHQ8~
zdXZ5$<Sq#Gm&(usI6G+*oQ1;)?lm*+EPd9Y^uwnrj%B6i+K0|Ha&`eCgqZnm0_zyd
zV76NfCbd`=d928zYf}3Z;R}ikLgj%`jZvGYP|XCdjs`t?ArtrQqarV`raVwutNKAR
z*wY7ywPMQMIHs*+fA!ha(xgLNqOQ5U9~R+u(-f}9+`fPqjIj&sJ5f+cm(6v=VovTa
z1k0n=ce<jLU2~snqL_zuvf75>7i}8o;OvzWAoa*wePUUSuj#VD>6egzB&jV)wel{>
zN@)FwlKm*^>xo2*gJ4?ON$}pwrA@AjbPl1j;Ujxd@r}Ga5#JGd&XE&iPG;@+v=K1c
zXsp9IXWGiKu`$afRv*grva-H1^>%1v!7B87aka{ciVNvP*m+%p2N7WCt@|H|%)*Xa
z*jl{2I_|WDUQ<LR-mn>bwROM1(P~Kd9(@?M+6@Mpuxo9jEp3>}HZ%IH4CR{aQG~`E
zOOO1_5$)O?EW?%O`4*hDShpJf;n=2b%4--2RQbdN#G_2x0DR~;`g!yZ`k$Mn%VTb0
zIFuIM{}^}SQM(O$qR!L3iz5+Tzpo9N$>qFeRXV)I^t1ut1^-uW-mank-<2R><ZSm#
zk1hXQ30?o6SG4XJT0N!JsY}_JE&nsHr{#hYrD)TLRRA&OKk5DN_h=IG3|cMEQYBm%
ztgbn)2h&3lzO(chH1#U`tIRF5m7*3|BJ_mnKLIWUm{hg7m$+KsYcJBMog!=M6CftJ
zfq^u66RM0t8KIfaQR{24-a>cng)dq0l@JpoTuqD*8jALZu-iC{GiJTPszVpG{j?q=
z^<GM6iXL~TBmOVHELeM0W%7*yF#AI<GyCUUHf87WH^RRqpI4F@k*+(yQPM8?=XRO5
z`&McaTjW&D{MvB#J9Fx<hK(4q{49J!&a^V8o;jT7;%_YztsR}8-hN&!d~z63x_7<V
zY?yzos<4vH1oNN!Snfd=2+7kT)Hrp2&^*)ljeLjSPbfSdzs2pPp7b7l-`$y$Hu=p5
zhI&x$MNG4~J&x})t6Y-U<_Y;02N#zq@#!5gwyx9m`{3RXi4Nuw(+pogn0fwUW<zjp
z$?qs^7|3w{@Pl=j2iw?Pf=}gjodpDS-TS;25$V?^@vYee>V}BN5iy~3hht8N%}m3i
z4b9L$xs_G@x0%cNqd|y}By62c9PJ%Ve%}O)L_qDow?splT233SsJ=7O-@sT`L0Mcl
z)IMj0D$8peQ|`qL8xrf}D+2-Iqk>X#I7p3Ew$D8;+5kWVlw;YNWq3sC94EWK=^oID
zYx^3%X>XH*7c2YaEahd`pg)lbnrxzzat3Ep4ZimDcP~x0A#lxB?e(bVvPq)GOQysV
zoieFZ)W*<_Ri~Osf4yv$+fhub#HY>L6wX#`tQLonfXJ)w$H~#cp&@7aTNZS?cX@$(
zy1WSonYp3{BUbiPj(U_$^@(j7X&(Iw=Tyf2zK*HbEbnJgs93$i_cX`t(yJHTs1Vx4
z<Qi71BFI!^a2dFu?SDqO>4YcIXu3oe3Tn3==_<IJo!$Q3nH(gI+fs!R)Pq)v0J>EO
ze|zIpI!$W&=<*{M-U6tU)%5{EP$?2hq=BkS2B-~_F2m7pjDz=Fuo2E<Uni-N#clDN
z4b4$W;}+pVlVsD^gXFMjIvah<*9-wLU5BB(n{&hmgv8%M6N50Q;R7v{b%_>0S;)cU
zs6$gr+4rrIoWl}FZ|@9|*8n_x_aQQ6<5Ekpm0D`PS1o!`OrU_yh#jD<Di>9E6c)v=
z{43*9GGBZ?Nyi9``6n8(gf5X=fxvhTQz@y8?qa&ot$xl?qjWYgO&>{sq(9DG$v%dq
zf{Vd!-CI=%A>wFkxqWnjfs#(R>~CzC_;789I$QnZt@zjbMzy|1yf&7Hw!h=_S2+xE
zK!SW8A>-Z&E`R@CL_!z&mBRyF{|Mslc78N@>5N9t#o3SjY24M{_0lOM_g8xu_yzbD
z_2k`|V7-5<U}8iZ!q*Oi^&5Ev{%GjJ2N)kj`Mt^7yy}vkqK(6N5cWZo&bWkhZ*Y(|
zNW5KhMg74)MbuIp9b!Pj1M_~y*o1>RN}A~3(bM}5v|s0rr?(KiH>$jkN-2#>fzja0
z<qB8n2rzW?Dxne0YtJexL9M}->1@(BlBIh8&;mU@n}`yJk1(-#2vn!C#=)@#?9|97
zW1mm<x=yLTVR%Dm1@%K}!#=<VZLpYHRyvBdNit!k<+?8Ep$OoXf|3%tCBuErX*)e(
z3gVEzHC3881n?U)U8QIwFHuj!I;qph+7d)cG;20hVl+k;1B0ip1Z4|D21C|q)vxQB
z1YP9?1fulL+oTKZ><EWGH9q@l-Zy8_eO6T4;hmHm#Yeas-qw0Xa6}$eJ-A&()`r&V
zKa{f{%e*my{#;Yw5Yh~U2k#a2Mj3=4l$x04?{fSIsAs0km<x`TGp#5qXr`JI^Z*Uf
z^Mfluo4gpP(+uLQ0go^WtA|_G5VQIIZ55SWa6YfQjv9oS86<SWqZjxt0yG-px4iA<
zQZ&5u+zV3FAo$bo3aj^uMn8zik1V9?!Q(yZ1c5)z2&_<7yCW1!jL>J#TzUl*Y3H95
z%bgx_T4?C_wK?ip)xc)(0I?98fw~Hs1v3sepN<j#5h77g5G0AEbYw14twz0+yKhRX
zQ(xlj|B$&|+8b(M6b$-8bQxF4N&unhyF!}B4s1nVe19X)$$6dcaA_rj-R`^@^#Rul
zX+&^sIWCbGml`M4h7--wFARt5(h+LVbSDGv*Iw@*&qK<4t-lGEB0um<-R||dnifsI
zWcv@Sb?Dl=QYg%Wblm}CNGOQFjw_V{-n5o-kAqNF9B(QOcxN$WbDcv~CUjmLsZKcC
z;E>q^DZI%#=5Z!F8Hiubg4z=qMz;slXULX0Fxj97)Ce0)6-IiWFQ_>f6+g9fXO;Pp
zpR9k60zcIKgtpfU(L_B}V*kRwy{y(GTH1_K`dJtwlne9)3YeBoWm&#}t5b~t9@N_|
z@ZC`ycyxVsUO!_$zbA1RMG2GHJe1bv+&m2Yt2dhmUOybsbvBm4lhj$lRErwNMXOdN
zX`$nxni5JNq=I1r)c6XEdJQliDF+VGMtKc)TXq{aIam(h=oh9+&;FdVBABu+Knu7A
z6eW#{WGxKlvlx`v&>P_b+hBdp`tg^zOrrrudxbRq7kEuNvc83Xt@0^R)IWWfct{a9
zXG5^1nQr>m%gEDD9`i6}HE9oJ=%P$V;9ovS1G_T*J-3GGoQss--u^~cLCXxkLwvhq
z#5Dy!5X{0RO>1vJ|IU64$DZez7c0*(7W5*I#IYYtrW{rW<>?4AE()9R$_E%XfWORi
zI70;>{r-`tcbxu)R45b<P0G`U@JLvbpHEkV_@@2~iW4lov@lP?)L;oy4vnbSO+gQ`
z>nRh|r_xzemqVjeS=3AK4t}2%Kvr{4!qDNsgx~_buk!5f<Gs{vEw9erlyncs_B~V0
zj9on1aXaK3!OYV?QC^G~nNR3FOo<31Yv{m};fJZ6{U!bhHDdSq?o^yeg$)L_KuD$X
zz&OT-40T-vnxYPgvG(G;GKhKDe>RDVHJo3YB%huu(WS_>pRnBk9WVQ8cU7Oqwth86
zb08jf8x9Vygv<yL)U}%X0}`r9RnvK6z1e_%_1jS0Xl9GIa!_3*gWNoiP69qY1=IS$
zpUB;u{6gPGN5YD#MMx?ywS2HlC~&*~48J}$51Vvp`bk7=_?m=?>4qt74zYbS<xWjz
z4}{wLSi*oWnYvv!EJ2lU=VFkkE&d|VDvRd@N^&6Q00tp)Qy=<%>C04mJ=pS`G)e{t
zo}&9gWQ-S>^~e>iTf5~=vtY!2l>*mf5uYC-y>~F%f<SoK9q#~pLOtz3^D-G?dD<O!
z)S=g|5hm~~8O1CkdzURC_lhY#2h!(a1ljdQW6>6)crt-ixln)H>M*`0WEGRiV}J!!
zrwmLogp9U@9AaV%iVG983vm<pef)^kW|8uS8mQIi!JP8F62_kd(fk7VY}v~NJ|mny
zmfP8pok%;US1sfOu4dVp(w}w9b_c-j3}5_t0GHe$2_pJD8X+NnGCyI26m<mLu722M
zSO{cLLJce+Sf9cku4E_<5lyVxB`;r#0>9trVdCxoCn@W0p!C;~@c%#5FcATv{zrY$
zRQL_gM);rb>_1>M5-XGW)+La!)fVTbnCWDt4X%F>K%%5KgpCyvjM>*}cH$C^vvI~f
zN;AM$lCKZq-0*LrJ8f~lW_wcToAuq$r{e{UEy!+>o0YOrdtGmrF7V$=T>6%jj|p&H
z)_BGQXoMC26q+(;N8R&MqYm+it>GNEVf49aNSgo+DW^KfzDaMw;XepYN(u;{w>(ev
z!j<Y>=6%Mntxuq<mKe39&;$79_D$N?Lc0=@FEcT?Bg}QiQmy$n$6*999Q@swM}Du%
z9$v$+Zv#bva!(!$@vj>vNPZRnhdteZ!5Qktgc$+u?getwc&JPFgM5nxM4cOkyBi79
z>Zu&<Kuxuzc`i&EB7L0i8MvHnCLUbrNs^4rd-4)E4IVos4&jWzWZY*md1J`^B^@O~
z7BAi_=;+>(*bu}CpR3*9q%%LItK<s3ZN?K(Z2zKu@o%v-Q*Y2|4nzO#{zI7r!5N5m
z)V{oXAjzEqOR8!z&=6$Ma&}C4O#Dz6$H`vj??-Wu-p%#4`=2c^ib?_UR%Jvl1H!a|
zfGpCpPXC#QwX7|2x#_t5_TeX`Z0TS|NbSP(mv2&6$WF6NCVHr(#C3Y+5VUa<raQPf
zVxh;Wz_v%Pf}3%00g2_fMdTxgF-Uwad!MzYQ-Mr&3*C*RQSgAfJ@O*Oo7X{~fV%<o
zI4IrTyDZJuCj@@=%@66@4_6x$lSzK}SP{&gU)LLgVfd&!@U(4CV0OXE-ctDIfAH=&
z8Q~G#cHlS2x7bFCz9&a)kqEs3V4tixMO+Nc!0_4x6{U*CRH1~X&F1GjolzXwjOZUp
zW{Th}{Hcic;wXRJwJl%zBeXPDLiEPc{Mec6aW!Vvrb?*rJPd+CD{p$I85TZLB+PrC
zaW~of7Lr^0Ai!6#!96mk68!>#p)Py-bPT^9Ax`pX*BJ%F8SKfUI0b!XZcO%p!-5eB
zoqBIP6!d+){5-Egkwt^|sMJf29s<ziC=lBnJV)!8IHDhAU-BX81yj&Zh|+3=kUfLx
zc)=tJk0th6+)ovQ*Mhx55V=OE0O*XqPeYjET{Y5NMNl{R%EHx1*AmP{XNPwOAl&4m
zjw0!End0FvCBnkz&+91CUulNKxr}jFrtz0RUhJb#XOkqoE&St*N4dU+0njO9jPFiG
zl#FgxLdG44%&wN#$;I9HvFr@aivE2w9(OAT5-<%49926_dfti{_*{szcf^Bcl>;$6
z<%j;HUkt_%=i5LEjNlG|eN0H7rey?7av5(xkQ_2&-`kwgX9tl58(qVRZA0qxRk`p(
zeolgYBSjU@_&^55wa!>?(mM=LqMhjC<Y~3igwdM>$Lr!ihD?SE9-O#v7!qTH_LK&q
zU&IYEk$fkOnx&=$3z!b%R=F-)l(?R&Z4T3fneD)U9n^(G*{SCW)LNBA)YXt0<f8Op
zAp0E>1EQ;|wCsgPbnuF;%>E^uxOm2H|Kw<=L$+f8tdP#(bcpV0F_0KM>#hrN)Gf8<
zO%zVQ7U&YTdlx1|pTAg)%|o9jzAH3)5zU)t3%_WXCF@}7sG%JaiobqG^JZIii2$Fo
zBT$dPI7F25QNB*-T&0JPG?FgaW|q$(8LH*`DW1_lA(k(=V#eFg@#2ChyY8)8{qB4W
z7|o-F*_5<71&=EOBk{d}I2xM6bft|Wjta%Z8R>3-ghEQyqJsIpldBh#xAnP|py?#f
zi^W;(@2y&-$8MpL^M8R{rG*Q9VT%6hWd}J`y$JF<Vaj@wiy-9e2&p{CMj(np3KivJ
zxIp-ogYnJ1gzK{8!5dMZE<}|mVS3yJOB^OLiVt4ag|v~>g&sy3<oSMwDqFQe*%&d7
z)#OdppgqITC3IpXdo20KEGXOi5FV&WW7sHF46Pdlj+^RI5W2L|xJ{&XRG*7LVD=(>
z1nn|<?=th<$)(M5u{3^{){o8>$l&HVugJf@%9@C98sJw;ty(k3wb?M5v1^^Y)v}O2
zssCdw8D>@QFU>Yc>^=_r8}hOkY6zknD&*x>xhrWoQmG)dx>ymZk>+V6Qgav^UYE%1
zr)8f9-2kS4bl?7Ih71d`#a3$D$2QBP-qs-2GTgePxdD94h7(N?=K$Kj$bZ1p7t<Jg
zTh0q$hW`gY8;vKq2x&`?VPEq!E3Q3>*d01+d|vC;4XNTZ+ZDq%?erSqe3d!o;R4I6
zft~%He~eZ|4E#a0-C*Xh2&%#AwldcXAxY%&B?&BydS91$<P}!b(!%IbGvDsSVn*b+
z7kVLT;)(8`ivR!*d3qH*ZdFa7Bs~r;t8mUaFmGL2rfw{xML`JMt7&D}xx-qrr;D;n
zKHIgWjnkwbW=uI-UYhupaNxkv3#@_xQRGHxdcSLxP09Ujy^n~g;&V0Dj5LS0O`zZV
zVprOh(KU4tgGTY}Kb?BwD?VW`wiZ*PMagLp*w+DXy#8@I*Ml3h!?N&0bx~}24eX<1
z@;QhE6PB1K*dY-rrcXBzJrC<LJIta<r^%1^k-d8}As`{ayVOWY!Ir6~nX75S>qL<?
z1^-=y@*8eyV0C6%@Ksr9JNR0XDsYaE+6F?ljgW|q5Z!OruF0Lz`*S_ku_r#7oF$21
z3=mwM5_o1d#bAKog`5fyny_+}lND0``u=4+^-2O-Cr$}x-NheB!$7tQQv;l^jss7U
zTB<%DHz6~NZG2o>?9(L}U3w}kmPbq^Zu*8{WMXT+Z*a3u*{J_O5XBQ&!2fezVE&DB
zfOOBi($bP6=0x+gEBguRz_dV4t(E|ELOnB07o}BoT6nB{4)`ZoJT4)re7RmPq%Zoh
zbAr=B=eh+!1Ioh!AG<n|6Em}g?ph50{%}78x3)!Urd>xfh4D#NkZ2l-6P0%{74*HU
zeHddxBVjF*Qq@Ls8R;M*Sf{CgCov-*0-5xOdQ7uE+}f}yic>+V*nw{z6`F5Ld`Oj(
zFltbD!O0S!ZUFc_4DEMZFqM_ErPo8a_Xk?AH%{@^jD&p)(y0KvC1#^H#(PD^&#<3w
z;6x-CjiN|RrYR#qk8&VNBa)0oO^Byc&vnd(h&Va?3krqn9OvoE@4-sSBMXBmm~&tH
z3M8mymN{ublxAThasu}T;&k+9Rho@Ol~FI&Ll9kaj!-5Z8cR1FaAc?ubStscI%}Z$
zHrbR2Bz<Q$W@Ih&b15{JllaHVNTNmt;K6|mRl;zaH;F7O{(vO;{FCDtu_N1K*WeF?
zDDezAbG?}EPgoBdL^x`&;go}XSzJ!A_=E4OFp+`;O5%_M)JPCa&@QJSH%uuV%53DW
zuyOFTlh;&}8FS0YOsBkXlyu2qZ7n48QjEf4#Ih}>57Sx(+wm2elnjekk+maYYeiUy
zQ(m(M5B0wqxpaT>IoN@sa3Qh^K;HTX@()xUxU3lPhPlZx2H>9hGR<3@G<T-&ggD|^
z7!RYdfl!9X_Iw^=;h@$muvJ8T#&ePrxKHn__N-*MDJ-Be1_^2Iv{?dy?p=kHr<f~&
z%1GF*@^FuK)!-U6^d!6{GOs3w+1XHm(LFW>5Ehv9xUBLznA>n1zNlHhy0p_2o?C45
zcCC;duG2_U#x8Mn1hKC>bLdJ6UH{xb)UNBGd$X+bs<U@tdx&<c3Dk#6c@YOQ>99s@
z$LX*`ztHh%ausz97J(Zr$ag2pW<@8d!}ICE8a;LjOGX<*2us3B#HMpoE#|eosOudm
z`M0<0Yis?#+|D#`f(6OGaf9ZeWvm8yh6)zeBj}i|NB5imAYa2OFv0c@mgO6S_yFP!
z2Vuw&RT`Zw7mh{J4HrXss_oC?3K7L<q(Vgmh@wFfKJm>LPKD*^^_u`f$zI`2mg7<!
z&MDdu6y_Lf>*W}hNrNgrdgG(2j^*WYHbrK_W`vt&)EmsWPJR@Z8H0}Dw3>39!jib#
zp=!BFV@)mC&hpAs3~3P^{^nN{O?%b{JJ%QDutb)i9Il|?TE7~e&N7|$7vB3|owm&c
z%9P=AB)T!~dpAW1vLJglHP09F#g|JfisL$XqUvBXi`AbLAG}x<>0^?a=Y;__w7r5Y
zJ*>E1Qt*Uj`Vcs+PUvA2H~JkC4zSo<SyXXH4D<CfMYmhPq`nav!_sZrS>GAPk}Uh)
zV_=UjP^fwL?tUX@97@DZTL^AnNE(_uye(l;hNW2qjxa{}SE{5R!`J$@$tn{<e`*`!
zE}$un^4m1G_9@y0o;o5^H(-GqCx$_9O&qpi6F6^~+$c@IxGWg+G~fCR(x=jzw&ste
zzcB=*<(}G3%Fh~su4b03cUg6QrBC4`4s0p4#JAer2U$8^;N%jH55$)vnRauC!(H}R
z&7z=in@WB(=Ed3*Mp(!)yWV=E+r=@K&+riv@6PQ%zuIlwz36x&1a^YIDsaCFz(2Gw
zZ$f#j4&7YwH1GRd?e7s@KTr5Bsk>TGCfOT|aMiS-V>R#@57OK%vmHpe0>7RN)2X3I
zLZk!DrJ#PL6b=a4zQm#RfNfKqgpNHSL=`M^mR)db1$0^lD$^bQrl^HSs!c!nD;1tj
z>l4>YRk-&L#MeIRXT*Dp@R_pc4Cg&M>mVEJySyYIP2V-^qS=sQ;dm^v*Gu88_ga(+
zQ^J20X_tR5qm#k5b?8|}XniE_DaTPCgWMR}y+2k#@(h4qrVSY5*0~XX`S4T+oZk)^
zD0AoH9XjZEFAKThj&m%SWRm!(rxS={Oucp}z}7~W%GeE<Q@P_8=FNg`+5DR7n^4C+
z0a^m}pvJZmSKwP6es_uCZF(K<sZOl)p*$Cqt8Jy{%5i3O=iOnNRb-UocPDn|F%c@l
zZ|rYN_D8js{GDY1y|C2F1$$m~p;_usRXatD#`N;r^A395LmCcQb}?E5P@=&|TpoH+
z5HpWFSx#*ar?Qp8qK{-oONTvaB<qfDe5G}4N02a{TEmXtAVwg16gFdLd->xWW|4Ar
z<Ln>Iv!FtXEnNsPDWj(|oO*FJ{`z4GU^y}=H0xUWU5FUMCCCwP4P8F9V(pSq>KSug
zG)u6v6o-R?JUBojs{$M%K)Ym{^z4Bri~y!ZLZCjB+0Ql?H6o?SW1x+ealgG_Xf{#^
z@4Sw1N6^mowQ&ry-p%8k%?@*~fg_xA+|7Bo6?kKpr)!na`Ola3eg^7#9*C;dosZ>o
zZd54;>}xs~N&avI+JUu`HD!eoU*KRk(6M7F2fK#II)3{^y9e8$iPy?q$?vi7HqQ9K
zBg*$anAICd2QqJdujX#JbQczPoV4>}AgV7%t8)gU%Nxh(`-jDwXdb&jn5Vt>0z7W+
zvY5wxVkg!>On<bvExn~SZn=dXP5HnDhnD_^bvZP>AgN8=spGtXVEcGt0e*V>^@Tk`
zSBZBfYDV#KEv*}1vZ%t&(L6p}X26=7t|~0@I{<I1aP%%()A~b?@-TeZtLi`y7j>N3
zHGIKJod3A$;b3d*^(bqSa#Y)Di3J7a*<@{jBxnJqC8h+_DoC=RQ;>2eFWcu2a3~O0
zv#xX_F5~rKlqM6+HOO770{g&n8wS?{Mm&3YteIDc3lJR)S*>QD@1sNFT@`M#5VO;i
zpuvUdA`7XWeiFv&ziWXZW44Aws{vNj%Rejl;-Av=c~siN62?C_LTS4$a{51NgNxrQ
zK;DxKT+!;~$;L6S2iFeSzI_b!9(N36nqtdSI-AIEr*e;mx9l?AKU>H(_c<3Tk*vK3
zmCs%qpU9c>TsKQQz}w#1@;aefE9o1kv<bB5s4YNq(!3c+!GQoKoxAdo!mt5biZ1>R
z21^PKbAlJ!X#=^EkTKeSH>(^QsnNeK?2fDLfd3nk#;YZO|IZ<bg$QWxH+p<a)8;==
z<y$xRCqRUqKmvKiP6AsWuf16SO&>6_XcY`3pjX^1BU~7g$Y$i@i96miuN1vQWV0PQ
zwioH9jrjM8IqA&gIh%PfqaT|?Y}-egCjtGGf<sD|Wa1mlOCbMJXdXS`L=M(Co(Dw-
zN$w@RJD|wtLEt4m3RBLlB!C74)L`T^%N*r2=S^V&x-q3C5l$l@S}MhCV}M%v1AmmW
zZZVUCnUTDc%};y?iCerBM|@9s%=AylG3esuguqpw%-`bL(~beBRBikj-yt*BA~RkC
ziykR)7MZc&oK*;Gj2i~+k-b`P^Z7=+M$Ln{m3d!sD~$7qnLx0H*zapWI*zoyX{(-_
zi4eRwl(0K3_B#&{0RDdM3vvNvFjJU?u_lVj`_jR`SE}I-GVTn>G4Y=4;EnmdS=@s#
z)?$Y+!f!5d?&B7_mSa-QdnnDA#rOwEW1c~;?K`~t?8NX!Y5c2AmI;a6UoNf0hbp)K
zjN-tV6<qcmYT}hiOHJ0QdVBbv&E}uIb@|XSZ{<zZrd7*O$$#lqIEdZh*D`3$Gya|P
z^GOigUBu)rb$xjzriE$|+%gZ+OTKN_Wezja`?=-Qs;sKzrSu1e#qW8uMLC+u(hwP@
z`}AbN4Gex;z4K=}oa#)d`+Qb;<00l%yk@P&=leNwR}}8jI8nt%FL0xqBIfWr&IG}K
zXQMldV{}Z3-qjnN)A!n=2&+wRr1yfQ17;38jk1|s{OwQ}{KX1G#$33OL~stZaH*Nm
zT=(UB`?4|$6A?nK!8XHO86?}hFaG2yD*gnJ+(FI5E!_8sT-Zw-TlINkmGeTjp4R5%
z23H7*$puf`vmX?Ibw-n_EA|;~BQ{BC!l9i+KGj8`?IKi7ICxXcqq;qDoRzs%+7!%d
zSjp?9HBAv#t1L5H%w|h~Dg3=OFeAg1S0ekz#a!0QYG$iOX7W&JGJiHK%{1ysmSr<a
z5>#O}pJBr^=6{j)=$ausPP2k^=Dor5E7rI#?NPxq;bGkcSH&|hi7VcnNKRyuY?h*&
z3gI8geK9#p*ax-D2zZP<Ic`uUSBZEVAN1t8JK%uDD5;-g4++S|mS1PTsM@<IPJ~tu
z6O*zIQcv^kmjmRt>p=j%-F%9oHQAu2RywYhJ)w*)QQlfPt<;hrJ5>SEDiAX>j#}wt
za@4LK0bL<oaHl0u!<YJ60+Q9ix?M3604<YXL&c3K5l-<S0eYfYS5Es?f;#X9sJMv~
z9Q&Y!39xS_*S03dTGwhJQbx!Kwv)w+$cyO}v!pTWJr<AqW#iM|u79rkWNGH<D@0)}
zG($rAu-;gt(W0c^N74nHQd-ZJgLFmeBa$wo-bK*YKBJc9R}g}Q!7@^yy$CY3)i#WG
zou5M2y2v#U$AJlu->M)xrfMWpZE)?8%h=<(&k-fkK(1un7LdKJUOGvksap+aZN$Fk
zxBC5N?_HT!UBZ}<6eH}RA+656lB)V%*BkmQ9>M)ZLxj{AB(XKzMF(fcvX=j%=A7|m
zi@lCinPU1jG4&%P*IKU{V>OwFU$brtuupHAa@8+ex5YfN>P|Q9nyiQ^cZx7b!lx2n
z<mL??fe97afhz|mNQ7Y3TYw^lmp8`t74F$?Ctq?XyINfv#7eg<vZVNBr;82c)dPkN
zThg}n{gi{gaPl|0V*NrMc)^1Wn3WWz*&N7LewG|u<kKF(QfC}e7f_ulnS2a<6}9?t
zrQ{go5+@+wT4y=)@{6$E^xZOtdZtB-vTJ-(E1r-{+%Cq}>!qBm9+(MTkB<)mOA8}#
zOCz!p4(j&9b+@XdBUYK>&vByd&I4Rcm3Y*wMdfu%vjJ>At@w}H1~^yUn7+>_pNnrC
zuJ8L<pS9jau#Kg4nlzWlGJe1^hTUHI+n0a}6^>P~%4u_5WEU+gk#2tdU0cBA=H2sP
z`H!o*504Tr$kl{D>y{<XSsTt8JN!1E&t(+kE@k?IRv|VEDT-O>rX}MT$`iTkueF*X
ziNWl0t>m%egM>e|!dh+>mWR8jzw&?qK?=(jH{c;^^Uh${)6j|~x9!!tWt<uiH2aR|
zUWGe9(6loZgLG*Ph~R}zeice4DMmR7jwkycTmH}2Y{>{KcR!CVCw@3w{%tjB?rr9v
z?Jt^jyAhpRe{H?XO}7Hm9RY)`H6M=aE1T1;(&96_Zg|6!r#17-S2=d;vSyiLgYDj$
z7E53<<q1lAE$A;vt35BTd#u-eEsy)fJL5uYH!sDAPlD{u-FD8Nk9Je%<5xt-2^(D+
zkY?8++nFTKsv6w-2mV4U`5%`1T-QkL4$@{=?DrYJ*3Hqu|9YRJO2+@il3*nQ;sXB<
zAkh1-_xaJ!-t;yBCpTuFjJmGFF|1chMFK%<E&{$IfB+FIG|Nk%2y-<*oQ?1!iOeM)
zHO5`SOb8*IMRy+DxQ}!c+<V{W^2_D$fYa;x%R!20q!T`4;}kIz=zC9!_wb*>r-0I(
z5CZ0r(P@!@<Z30#@9uGgM##O#Py8h?=mepGxbI^sd|&`{jvnN}H;CFiOP5DEiLxds
zksMFUj75Hr`pFaUdKVsFwD)=k@dpQymIl}LpMW7F(dY1q*lkCp<b#4b)G@Q~*K?T5
z0Wu}C2d4ZN>x~Y!yMhUxVvzkjFt`-qJqn&V%b-!p4wE7>ES-#6BfoF8u;6W>kvjQ@
zDtQIiI6CE%Q#802^BgcUfMo#B>#$}hH8zx^?u>-ofg1UsQeNz2vcxTo2A_UQuso{`
z<^0#=c!G~wwMZ4GH{6=eBeK+HiXdE{PisJt3@Z^xAhkI4O>y$YGwKxQV^gR4lR*e?
zscZ$R%5AbE4WZd!Y-txunoM85I@l_e8udVHuo=t%EQEBE4Hdc3*(kL=Zw6(tguiW@
z&)npe8}`#G$Zxfm-ax+{`#^MM3gNg$WD&510eVj+Sey@m@`4Y>Jif9}TSZ_KaL5Lk
zLk77Ln+$_ZW;VFt80h9pE7d(*1P#CHaKdfh?$#0LaTfUxzJm~gaFv#uwe1!?rlBzi
z5E}g?L7(hjnBs?7;x7WB(`g3Xv1+mOdFl)!fg$FLRpjS*Mn13RfJi6;)7McCO%B!9
z_9M(U_~%7kn<rxjE-nqe`XUdfW|huQWw0aS0l(1FitL#3y<2r9#=doiMkq*9Ne!EB
zNb&yDu$bN)m|gN_09~q-{c>~)$sBO1$e416d^6#d15=TV{z8?V1pMU|!s(~Qy)Bek
zS9L5+#=9|?v8FzdhE1k~i1H(h-Z*+9hq8M~@+#`Wr(vM1D(nTy$0}Ps@K41xAGBV{
z?eFrEf0s2ev;~=lsp>Lvmem+b)2xc=^S<W<qg`-F#=Hp0PKo|2-k(HUjjV1MEd&tD
zO4I2f4V+bb%jSmu1K_ot)Ab1;eiBHR#M5|rxwh}|g|uDgXQ4SQ7_D6}Vu-E&78ihC
zt2&eb1uz1Bu;J=i<JCzR$y86MS6A?b+lecUj$ph?Xb+C*)E2`Yv&{Kw@akKRb{Ts?
zQS#Qz_HxEplj0X0hRO$<z*}wL+C7P&GNPeNjp0JN@{yV5T1)bKIrP%5V(4D|LtyUB
zoWNdf6%5mw^dpCZl#hbz%IPSZmo$b1^DdUM{N<STVGh={(N^ja8gg07jOpv$^Nc8U
zO6?D@kKJ~%3iGZ4${^uep_lxv$KTG;X3|07Do80D0##m%tyo1oglSA;e@qFU{fB7B
z(zM4G5!zPwGl3&iakggWtu(`)8=-9WDiNg)@<pAUu1A1xougBBeUOH?P@HS<bcTi&
zRMdBY`MzvU*VP)|O_#g7#2$k@N`h3VPdxtSt5El-UL->uR?(H88L%;sO6i%U0Sw&c
z+i!IY)PC9bdAaJ{1vcZK?(lGhagL;g8EY|9|El!JcAZlebOiXz+b6rPK43$Yok7~-
z{D`Ihar~1<@4GXWuR~^qE)_u{6vT?8=;oEWd^>D=)*nMNWux3lGPQ?(AGBTOO%uAA
z(^d6sv`O!u`xqa7LW+IiZ_Z!#6>|QWchWLiUr*l7@R(K|J@}{;S~%t1duQXh87YGc
za3!4GN8L)k@b}UIv+jbbO`7T0j=S8OCXfRt#@ncr2m_5Tz*6uC7<}6Oladq<$A<WR
z<neh>9_whXp(}P=RlrrAkA)&w#Q}AGAYjiGwzIL5BDyCFm8S{<+Emt4I(;vBaz@~P
z)O3_GYqYNk?pm6UBbTT|i9+)CwRkl7Xa}1Rr4vM~IT5N8^Z@WxiJHUr``Sjm%ZoX~
z&O~VDviTqW{X<ak#?PFKNQ_P8!Nn9`X04~D=GN*OXNb0hm-dTCvhgB->5TT(oeF%V
zm*_yf*&}JiOwGR&b}xDc;k(r&HI5&zAp`f2+IQa0Ky*{F46`G@b>?nEC=0i4M(Zth
zcZ=9Nk-L8XLWsAHRNW|!#%A&C(Uaygh6McRb@l~b$>6C2E2}B{*|#-~VS3{Z#}<bR
z*Tjo9u~-rB-tGkB&|!9vp%g(gfnM3k<(q@B5>Nkn2zGld$!M|XJm8;K+|Q@Gd>a<A
z^7~m*Du|&T>_<D(y4L;Di^&_v0;lh>%M;Km5b~tIP-U%&mVJ?a6JGl2N6T5w(F?1q
za!S;qhrKUK9~@bl&q}ze;H^1y@=*=9a1QjZ1<;*~TOBg>L*NIQRbcZ}9)2Rf9>!){
zd8OCQw1Kn)rtuYE15hqKaaa45E~kq+&1ACxq(4Zzz1k|L+%~wmcey~bi(m+x;{L@b
zB{~3winKBW05|Bq;hap9Y4clg2tD7RWv*JszfBc5tBd6SJWsL_0X2aB_EgOaD`Iwp
zAH2~Yh9fx36Gde17{1aC?S)vJLQ-ugH3(A$SCg9X%B|`{9`pAex5xFAl{%>|&K-w0
z{pI;daps=1wVcCFtm-E_uM5=6%U<q0^JG&L{=9^E={^PYl5UNQ99`(|@H7xrO}Y$7
z$j4|XPy?ncB*d}oBq+`}3Tgu~3y>G-A!+}}vN|WxVwP6V#7NmJ0?Ts^ZYN9F^9a20
z8gBCqE!Qc<&E^(>Wef%*IM-eDe3TOVG*ZH(_y`H;3t{I=BmB#or>9um&n*n$e1uBw
ze#~Jusd(je3AWG`L<N%Cpp}tSW(-%Dpw4aVf4dcg5W`iKY%U_Go9c3-GJ$8T$Hx05
zdU7m=5XS2bOaV!l`|-@{<|HJUMl{K(cZw=P501kT06I8=OK~UCfBnZ}3mc0U_3{Ui
zHPkSp%K6T1c4BXrV?rBf2CU&y!<`iin9LM)@GoxQ3$k%_J1ry2f+V?uJOj4}c5X?s
zcVEefiK1#MhQ%l-cJZyEB1cR5H%{S-C{szVa&_>wVF=|?m1_J!87DxZAXCULrxl@(
z0yy6TB9g84OG_i*8BzHlnW@aQC1BRNwgStb@mI-W89Ielsb{~F9Hjwkv2vluXE>?5
zM#Y`eqg<f5$s^>YQ7EtX^^AQWC8IEu5J;6HYfz=jWLt%WrR#)8@jGV->@+k17r+PP
z8Y9ojD65tYa1#TWz^SHQYO$)n=v(QcI|iPJ;;stXe{jk-uk=}^!Sxt)a9sYKsbm(?
zOUT|w`h+S}_LElvmbvlIkV=9z3KPfFf{{reNzD2S5&h}W!7OLhs;d{GNGOV9cMX6U
z<a6>C9Q_+?;r_zb>BDPK0AD^{Oh`7*70I2bd;)K)E-%hRU?isP!>g>wE=^Sach~%8
zc4GBQ*rZ2A@xd$arpuY^K+^*y?^N}(v^|%)*M2T_b1o?}Pka8p*vV3{JU%m9xqO<p
zQSI00cfj3V-0Ykbx?~e&qB1*}YV5pn8?GCt0-cLwGT0chVI_XTqbrU{wsQ3RUw<MG
zh=FuHXw<h-?f^L>A~MuTip_}<|I0nhos?oaqBp0ZqzBI=vFN-E=&@G`*2>m8W9hq(
z-{O;1D;J|1K>I@O&|p&g*YWJNa=^9Wfj>F(gYp^ONy;B4%X0#=gVayadi0W8B}QxA
zHNNs$fwFL<F6fQe*$zsjNYM@k(iYL;9a?7>Ia-^u-dLyv@Z)wOz1x3(S7HY4$K@ds
z-@Uuqk_s6<BoUP3UAqS~6bl-GSO2)s{&76vHZNm)Ovvu#T~+Yme_S2Ff?+_Jo7q-P
zT3s}kxuEo0@*RigTl>ZCnFi<-MYcyhw-fIVh>gl;r<M)2?3fSdJ7#BL-<K``V!$I}
zTdkU8Syk?v6>0q{66YwFPm#Jp!EWOKd}9`6S`u3_TcU3Ss9!zdYhnA<8)g{TRrL*p
zf%@Ny2e(X)&T_8YCI)5-wA$rSOXtJ>U8SJATUz#HNAtn!x529dR$;Cy+tWM!Xo|gV
z{QSG+$?sq#+N7;fu*^ookz>t(&*vmyW3nJ+0!^sNQWFZS?073l_wuReDUtaW#hZQz
zeDMeX9{_W-Nqm<*E0?f{*5E7(P>rW5FwEa?$BSmSy0W6>G1}iw^Q^3B8#w7)4^SmW
z9>z|zZ`C-Hr#{oOxXb0ub6>2o+TYAP2D^inBe26fxmuZUyO=O3bNjT$su3mPBu#^e
zYWfi*jvJFM)y!{kV95DqH9A}Tf>@`T->HE=8!txBzv2i>*13nevc;gV`^WxX-(aH*
z=5-+?()vXQIH;{o*G0Ao0wDYNQ`Q*$$Ik~M*mppRfWh%$r2`vkKtpssHKYodQ5_#4
z!Eiz<H}-YhetyE;_pV<f0xwzKTW$n1iLo$~N7at<3Iea?U+;NoMvNa|K?C0Xe<!5W
z>GS{V3YDD*X#cmGFKJ%HApchL=)oTb&_XgC;W6IaB&=P{>c>J=5uBasx$(6u610xz
z@e7dB*8}e67lRuzwLcnkhXWQ3%-JJ$czE1ye(ftWTih>udqS-!SSr=A-~9w;k^>8b
zad<aRM$Ua3sPz6`=Zl&s{@5s3hG{0!BtxSPLzL9vE&eV6kew%<L!hUqnw&N2p>s<k
zf<~%L^O8a?iO}S;2%>{McC**p4qUvO*V}-r#QLf@Ji$Av(lm&4Ag1_xF)O_067~v&
z_*t3Klhg(8sFtyuRK<vFG&%*ut756Dg`>Xsow=EWtB|4lo=jdK-!BKtF9~b4^LLtK
z7?7gKTD$AwiQ|Y{>`}8Ec%%3;p|Rqx#*{fYEr_md1m4o^5M>71T_@1BQ3Wb+GwCa)
z0+6({SO{u?lNfu+2~L<RST>@N;a0M=229q$vs^ok3z*U+wfYtTY`9iaVx+b`(mu$!
z2C4mp9x;u+)GKp~@FB#cODXSlz69t+v)ang6mlz(lHzUXq<T9NUQ2%Scz!JsT0}<-
zmWDcwMn2|@ONXX62E1n#a@y3|Oi8JMcr&>S)AF|FbRiZ1Alx+-kyM`o{VacJ)Esch
z#;hOdsW7YVb88AmQEq7xBpXoBD7D@}t@gE$Cv4}+_Q=?Ig!+S7t4uf1CgTS+xFBGw
zyi`}UHi<&gHh-;`xihc#6>njOjT-|WSgv>x<-8;Y$AOP|ZVwC~6=XP2CTAWp6*D4Q
zf7baQwAw?80{bzTLcpb%k1a?|_?T|oE7(RFG+@)JMo{ID*2gm}E6IRg4WI&B1mzvU
zk31+8+@%mH&=gI&!1u<!1Ld({+bRg@_{ibfHJ8_`!orZ^E0Vn7dzh+}f}Q%9O<m)*
zfgc{BvF10iN;GND6s*`CXv+^_-6rlycfoZ}`!`}F`$v(oKeTpHkDx1N{U=gjt2C9A
zh_mI%LOP}aZMo><TrW~+j3&OlcI5O}r=wpu`?f{r7f<SJn`hTf98NBcp6nHveiKCM
z84Z$STEo|2R6@yII5ysKK)I+ka1`jK)~Y0XRG0CTfqv*zq-m+X$-d4`#@8l_VxeTj
zC+pf#E1Se+ej^ep(Rcu3voBrPO0*N888$%|gB((!WSxyk-v=IKB%7C^U?5~1)vV?1
z3mr}o&7F*r)Fu@_OAVq)(!j|6jom(1Of(;Iy&Eu%SQW{ij?RhQw61O?0JCbLH(ztO
z-cD=u9V90s%SnA88Hc6r<H{{u;~|M#o-={~u_#F`2AFMKWR8q<V`e{ehOa&Zbl9>C
zjL)8ISl9<L$}vc4<Pn$f=f9EN7gt<;`<4C4SC#RBh9U9kXh`78EFz?fThraTiu{BM
z%kj}IPnM);yAz_Gk+qv{2(fA3gYAVQ4NWrLpSCr;=$c$PckI`t)2(RAt$zP*pjx2w
zvR!#Q&RNR^XLJiygEfsFCc6+dtiCcS3G?4EkRmS!6Pr$y%L{!lHiC=OM|_f?#~BvG
z&7kwPzKF)%%)&Vz_To#COc4w2X5U_LII>0-)?fA~gY4kWKe%PKvx?%HyW5|S7LP%X
zqmkL8N3m*+L^Zq_m|QcqOT_|AtK%WVw>Gdr*5}BNJn(`VN8Q+Mff~Ql4N}CIu!D)*
zd)*E+bhUc*T9~j)Fkq4OW`H%<w_|G|vdE@k6~05e^-!_}MA~*t;NPKek@Kllwh3xx
zLs<^J8nwXWEY=c>j@@s&#w}yUF9THz0W0TcF-L6zmFLSCqbX9FX`=34qu|i)L)`oj
z+pGZjrZjoWkdc&go`s551L8lu^+TFGRUycFMKS}#WtFOOMlgonlIAcSf1Kn<pA@Z=
zo}JW?qY5kUjtgdzlCXK<L60fM-RtP0$vS&Aklo*STy9WeP~M^kPi+*P^gf1K>zJ->
za%#SK6tbh~U~r?U#H2z+yI2%Pj$p8lUQts!luJ9hMvB_J3;okws@CGG4ox<C{rD=P
zl>haBU-*aYf1;+wu+D&p5R{BeY)$l(Eu8;LoV)+M7`oEXveRP!U-NfTAN%&jzsUNh
zTp%_H#RC2&5SDH}7@@##>dj4=*d$q8XSF|kiYZP>Th-AY^_b@R4`h+~e2SOfXF<Mr
z{Oe&Qat1gLQDVq>$kB;r@b7t~`t>MK`@xi;peYa9#ZWA?;8e+(X7Zyv$C44&jKU#d
z+lL2Yu2;)^fOz&L!#F%4R%A@AWo!*WDyH6Wl+}Ve7E=|R(rLx=meq|#k(@l78QM|g
z&*U5trO5!X+9~rIdux*!AEai?sf<&_(hgGIg8am27ur<zIZER43`EoVH?ZGddrf=r
zN4Rs(aOve_ui8~Aye*%()$OPf^#*Hod*CV|#}-AH@?Au}@=ik<ab_2|-}-L?I%Eq|
z4osi9RAgpUY=dY0_d)HN#~yVCYY}^4LX~O98G_cYdsC)FCYr74pln)q1G0aEsjHVX
zOK|x!RXoy<H3s?bVQ4|>$8YIjxI1sWLNIF$c0zX)wnnIZ|JItgJe=k5xT>9x1r}{$
z^M**hA4wZ~FU>d4w!~JdN3J^RmI)g6=kKq2m$~4WaiDUUfI@Y4w0Ym{XAVj6v4nz6
zU8yT3?w#AjP-@d;^hp{wY^JFav$VWW>tWix;M}E#pLi6DsHzSk6Gf*Ki5^WN>Tzbo
zHANudPo|u1&Rf6-&B={~-F9H%<{Nyv-H!;!dvKWC*(9RVpuOYK{`2L5n%E+IIDCc3
ze&V2JT#$MNj2?(IetLa#!bj;50O4no;RwWA(Jm%3N~<<b=IJJ7F~LHbP7LK4XfVU)
zoMdDT*nuok0glM35)w9t;q=sB3ID{>O#U=u;y^B^q-2@Y*avK>aa%VwdIJGeH;WD(
zK!!gtf1qt=5eUY|YSD#z9zH$&*4zJ>+sPu)ZGmVzAuUgzrGRS{ssUA>z1TX&h-*!R
z;$85d_lPp=GWt{{x$GtkExM3hh`yEFR3oiC$#bjns((#U(u~R+P$_)RpN3Y#1}g~K
zhO--G^x~bNtNB3p;?OBX^uTX-9<8|ER6hZYC2$3__W^W%nx-2`{%X&R@D>+UD3?g5
zQx0l|M|b0)Lqu&fPD27IOm?!!6N2rC^4SO=X=@SK(NF$xza01g!WFyi<83>hc%UjM
zLOd%AucSCjEcG#ZiU&{|JhkXbY81{`Px9cMDr)B259rX1)f^(7Kzj;M;x8z53%ZdN
zxHHx*xl?v@?VvQXBcV?{JYKGZJ-|W#9_$*&mY&si7(EeKggHcs0B>A5=oETru0CN6
zw<YF2Rld6GtbsEIx3PR^te|<14{t_A<e4_mw9GQAHGB<>UDf_L>|LxqD=AW^Y4zr0
z;II3Gw`k!SdV)u9;JKr*WrQZG#e&Q=yv-iPq-)qTD9lT=q0D>6v_yIKRQoO>6FrB?
zY9*&fer+E$T?dGw=Jml<K5(`jxOEg;@j&0(g1{|VXfKSbIpa=)f`=DH59D6u4p7}C
zS?G>kOFj8wpV_?oitAFqz|KxSJt2*)EK$cyLAvK{P!Z-<3rK$$x5N=rpsF`q7YFR4
zhtbPWx@ku>cLG!%b3sckUfD6I`m%<0$(ASUOv=(6TTXi(uCo^-4ON~|PWhQZ{wz%_
zxboa(K~l|p<KJ`8Oz0}oF(XfWzMYM$5bR@3%AL<Hd?}eeqD0^Q`~3}U=Z>&iPAHJx
zt?y_iWYYuwCF>$t>4n}7ATi**H2ZT_P6TFKAk`Tl7V%^`mMyOmz;C##df37?)dbc_
zPKr;Sg9AS~*+Q?*s9b|iYL*eY_;bOhb#n&;JbmYOE2;nPVOn$s+NwXKdZxXSSxV4I
z9in~OLY*Dm6F}|7sa8^vqU;cb(#6~^5&LYh<~T;v@xkQ2WT3|(9<!_q)e3A4l<LMM
zYie!7M~kpISZ(*P_H7#GuHh3`<x5`Vugg326Eu0H)mPWJm2wkuISgMsrGAi=T1i-o
zD{yUijke0<at}c=VsZsdcJ9wpp$5O?=xaVawr0CEm<d8Yu3KCD`5`_Q_Rsfxt-=!u
z4tHN?=UE?VP|Q<_ux*=~@`MTD`i%pwhK7xZjLGZWT+fD`=~#5I;Ou{xj$ZvQX>~Vi
zB<qIvf7dr){1kltzR_FyeL-L(wWI+lt#<n&M6GX32LAqcU;zEPAn$Lyy9(_;{9<!5
z7;m!?8$b!Vb#^zC3;xLgyVdi?QkUa~=(>)W^?#qG?z=uZpCTNj0j@R-t(o@dM{BOs
zv`HUuL$*GJO#t+!$X&U*Bd0x0yGV4H8m(H(WLd#=>FR#F`Fl-->sqm6U&m<o*Kf{=
zW9BlUaL$dz#@7~RGhfrIiqn1x&l7)zJ-iv+yea&6hCk(#i1)v9(A;?!AQ9aEwnCZz
zhpTsN4{Z&$He=hiZD++cS8Ut1ZQHhO+s=w@JL&BA^y%)azs(;ot42MAaqHU=0VV!U
ziKhQQ8xm4bQ)f)<6cPHg2t|_{V4x{<W*V153cnz~O<`k6g7UUs7Y1C)2ozeXGreC=
zPqCHm`|DR6T`#we)!tBexbcJ0LoU+*<J6{*o8Iduc-T02%NlVV#bWX4!-fQG5w<2W
zs?;b*#YrktN&ET?;Ex{g*IWN)oT&IX-k60l;@EN0qW~>uq4Yk<{uBf@x?4<Zodx=+
zG7SgVpR|@*-3|2H?5qUKm#Bjr=$5N+n?9uu1EWb1h32BvtI4Sz5Zs@%(94A$_++m*
zWr`Yi(l9HHS~`;IRi3|&+lbvV5c29O&EEcUMP--hMZQ(gP{iu<u$I(=^IXNz`s;{$
z1vV^R2F41u3309BYw;e$^TI#YQxBsB2^;TYsWtNT5v$5oYI_*|&*J*}@wu{u;71FH
z5bENhy=}G9O+?#+giBDB<whV~WcE!Ri1hup?8m}7_9}lP;w?B6UflKD!Gf;i@6_ID
z(>5HkYx7IOYr>8@E>B7$`?D&ea;7hZKm5GJ1m?^E>G(5{%A<+n!UV8;pLakO*U&~s
zYjDWY2KB3P6MC<+5CM`$<+n4&HJDy`$dplv=+0;pixNN+b&N_7EvrGL1}ly-u_n@?
ztRt*DLo{Zn71Hde4I=6&Q@d!?1-j_Q*rqHQT%^`ukvBG$Esw1nNqtrzcG$c0QWTfX
z$`Q480=ib4%Wdp(0>ECCPbL3i$J&jUGK`rOY`mPSnzy6_b3zL;j9GL``Uk0i0PbUx
z#l{qJU1DNC4%XdJ+#Cq=(UDGL!gXDNftd(HHdd=ZmYlbvj!VDMrzZhALJ7@Xdx}e&
z<~@v>n+wG|EY3FPy@bRaZ$DJ6(_QfL&w%nptA4HTN`B+<FQbEGF=Yc65c1N!`R^u{
z<_|UdvsT^9GSERmUzJ{M>=mf&c@hxHM@OS@4}#g!7^AQTGW<=~zx(%Pjx}9(8Dk1&
zb#t;Je%(v_u&X;>hO;7?LaO~_DyKmlr7t0c8uj_~H-%juxD%J~EUynFCnq5gST_SW
z+xYphNC+2g4adaC#X%YlXD?j$vWy)35S=~)i|E~ng^jhYv8IxCM6Yb?Bk*d~X9enC
zwhh^Rg}@dG>E8|!GWjxF+6>Q*x7g`@l7^iDi_vs-S%{Z#g}uAYMhwF`lK02;6V&d0
zwg9%g+O%@O?J-Y)8xdoTr2zC``e!^dvUh>XTNsv*azexgPk8-wA@t(ko1BcAp@d0T
zWu4W;J30PnL7hl-iz3J2-Zw2|>fAe^Lq($8p_93W^fa(+)b@N*_^kmRfVuf8hB7(X
zH`A!vU1JU{09LgZ`ZCd>F?02iMn<Z?lj)o@N_GYM2VMPZTL;<`A|uMOmM-*PV><f|
ztOLRNHbaO=!Gx!Y;pVQgXwfTv>Y7m8ijc!c=KulLFEASS%Ms&^>2L4*!*BCug!qP}
zwrOTQ!ia_0{qMtv*yICCg{IIW=VfpnYe4UctOyU7D&8f+Nzg5302@?lFGBL)KBj&9
z(~kGS+i+mt^OdV7`1CNT)BgIWOt;7GaX>ib%Y4d5{<9(Gc6Q#ToynQwI&Eebq&35W
zQhXQmqgjY+ri@U~kv^l>gYLfjZ)OLPQ%HfL%c-E3wa5wLk`wwul4FFFl;|m9B%wu3
zxsPPV@DdX3Iuk?!LQ>1yPMHIak!8LC(8yPiu1GhkY7z|ifp-9$**UmcYx79`{CULw
zfV|Yl!ju{^K?^p=0GepDq+F<0N)o3<$5ywW`wRU33(0Q{7m$7@2F+(4R?snK;9!15
z@<qi1n=q_giGTa91YtTA*NC-y@eq_&e$uUnWK*L%5GRu^e!R2e5B$+pb#JPd!G~m*
zS*yt3EUMG(095|&CA6VyEHk?9Z^MnkGWr#nLF-FxT@jXKO0EJZB+8M*2G)GuMd!n=
z`h=C+8{g1Ej)cae=$Vzs^>J@er{{3FV|i)Xn=@dudTM3LimsKBNr~=`i%T-7EtVc4
z)w`b?z3Ox?BK5T5r=cdsU!$e8Ih@P7f~~-hou*2G5kaRo29txsIotqu$c_Qqu;gSH
zUvE!St3h5@cSX??2M1IB0O~<sRGsy=Xii-rQ_nvzR)M@f-gz3gU?_nzs4aCUK6_^F
zwPV^^dL%l!xqPLzH;)EwAVwQ44SBpL>8vYgr8hoIK3{qTOu^v|cRqH=yMVtEm*ce&
zU<ev2D>4+fGqC4{je_b10N^Q~vIc*d6Hos(H;B_l4k#Vb6n4`WYJRy=CTCx`Zc50K
zey1uSt(<dk86IpUS7zwG)hnG+u%nfgLC>|L;R0KD!66#dps6%3CJq&9f;{^yFJ^KI
znhMs1nMEryJSo#W%i=sj;R&?P8UsqvL$(xz_9n$5Kn?M4xW*Y=w7X^>7e3z|2~)TG
zbtOm@8OhfceK{Gp!5#aWy+Zdn)+4?vbG>;zJF~dAexo}aL+H>yAD*%El~Dw~ZcrlF
zzr`BC{c|bQ@yM!m$t-;hV-d*K$mE92#=B7-2iaPA)9PM=b2x;}kpfxX){|q@>nO&E
z{lgu7AdNlWe@fj4R0~Q3|9>mBv5hkk5chAp@<?s_*Bl+@ccJ6Q-x6vHQjyptiwEQ(
zg>*822L(C~&65I3s3*~y_JvjA@9Ou3nB)uLcDA8wSfD;{U$~6oe&`r}IX4F1#l!nD
zAP#Q7P#^Li_t``o$eWxeLfBh<LKF~0B`793)AA_Pp)y!y0!}%CMDxC6r17rU``N4g
zi@&PP7o>g6@8&Im#IJ_$=<qCCq=L|B;jD{9GBk;J_ijW9alXOO5DOe85)cA(DpbD8
z1ea7}ili0JvzCTqro~wG$GoFCj9EAdAbrJR)xHR+<a;?pFFD~L*OfGDi8qWE^*VTY
zBVszZ14!D^sVT)^r!Sjv=4=Yo#qL|WB}~fR{<_fN`mI48C<@A9SuT;cy^isyM8qiW
z4|(Y`%b5XACgPXS^pGdQZ357?>RL$j(3RvX7D=y*Ug=tz9(;R~|8_qQG5(bIGipTU
zDt$)XI)>yv%!X!TKTQhtKFVbmII{<m#FlCaas@_7bPp`$?WDCr$yTMM^>1=+a54gU
zqn#=nC^IbU@z4dEweAENEQSFGE9Z-#uz%VH1a>?z&gD}eXE>-VuFYLD=JR?O-`gN!
zUy`wH$y_!eP*)T{Bn~VVrV)(Eh+y0oA!ZWcid!jKp|=nVU1mpNG)FU}XNy>YY7A{n
zUP%!lHz#wyjJ^87NaonA_Xvc;cA?&f491%Ry{A*^b`v%`@gXcLTuQoY@Pd`|;O4kd
zotPh@KaeVDK-tEho;n)wIMZb}MT4Edf>R1);vrQR$7jUQI?u|9t(c8eTpd<hRKo2Z
zQ^Pw<3rM9bRRis+Hdqk?E!#4|(R7KLYw*K+2QpMIUK@tU2k#An&}ul0SF%k<i(7_^
zH)tK`o}X2zLau?t&uct&lA!)+rhK?yN#589Q&EzJVBw=tW2%h|rjk?;3&kJFb7P^#
z1W+1ZH+*ZXfGHKeCKZd?S1!sN<PaLR)S>I27@C=a{JG38vq6BZ-U{KmYuEYnLBsx%
z5xF&G=k{?i^Sty&^`t3u<&sPwSxXLVLwi1=arANE(teAAJ*7?HIa(<0<pfMp*2-lc
zdbB=9L}72LD6RsFe-XHIgdW%z(eIEeRl>B;e%>?@(gvOs+N+lf_IA@I^gDH&`IHu2
z?In}QyKR-{QLaDe1FEEb#T-Z~Bo!mvk*Zd1B_KP+;Lpi@YR;Rxy}imbVi?C#EN}`4
zPe5p9!gVYN2S>j0EH?I4LiqlS4!l%;Am}Ly_(qlgDkw?J<RskWdB}q@o3?MK=W2|E
ztW1%IzhQxBT}vZ^AWa2R_wbDK_v<N4h~}|aW1FYR7o;fbJ9>Z4@dYcEBDiO&-KL05
z+gBc^KC#H(HSSxIl1h`D4b5!V)IxH-H32Sd3R3BX+_`^G-h=j3hyL<yd+Z%5bPu?W
z%;8O}isi}Du1(2_G9xR1R|i{O&!$$M$3Xaf8@vPe^ZuBTNz|*sffOaiJ?a%5l%C)4
z<4xzs_ueDBONV}|>^-#rQPKcumLl$$DC1oRT;j8`e+9`CaQ&Wb39BJ3@T#uxt)z9=
zfY=_<ia^;+OV%Q6?j4>}uv*u>5`${SKgSubMMleD2lsPIDbSI=ErpavKYGCutcDQL
z3E2F@LRqmH4!8Ag9M^NelCDc)kI#drX&*#01N>9Oh|n?|Y{VP&vLs6#xW#(pwC~=x
z#7^c_I!|T|F}`~V69PI>i6zFmuCF52@?DMSxl1|L)GM~2a!A?=ndv#~IK&JXoi@{z
zZQpX94MUIhzCVG*V=w;?@NEW30PufPs)UoVH4#wOZ%Un3+xc%t?!Tk^JuuU>#Acla
zG*5_KBlAoXcL)R)+GhqBFxqVE0w&V91YGd916MIgCdzRc#kI3f1o8blpS$aim^0Yc
zch9#1aBy%t<otno;~2;HTaQY<7JyvS1^y%mLjoaQiKi_;5=%Xz=rV#u^PmxNR@}JH
z79p><f%NA>kTruWRa~6D<T$9B3pE!#(h<n1aVWmVY3e&v{SXN-sq%fNw~6BAZjO9D
zclX1dK7{WU_`=@P1Acwd!A=dPtny}Q_?ajPV#@nI1I>N{meWo6t(o8)1Dy*0p8OLY
z&~mheG5dg9Y~DzUROl`G=r&whKEBOa9Txwsyao24aB&!y2@dXjarhZqMk<OeEofsS
zx<#fNbPXeB%ya?A{1Zt6iNz`JUGgxcmw^l2hBRajR7aY~UX99RG}WSJk&3FZGkVup
zwM>w<!{C*g*bJE<-ApFa1Lcz$G0t+2cy4F1C6oinxRqy^7r0LrkihXG4FC*F6y3_d
z%10^h`C{9C>2nZ=Psc2>W4GGbPw)#y<pSd5#@1;rgzyIBOA6k<^x~<18fOP^@_okN
zQrQ={{C>W1&i+=iDfD=URB8}Ps2OcpuYCio`&`EuMDZlWe8lR4m9*)7afxsjbI9Ox
zY3Lfw6QP$O4E6mD$Qqm1=hq?5zEY)MC*=sI^rl<R+Uwgp=5KCqt>Hf42Sl?<pi%-X
z)!~Cw5P4BtapTQdvI@D+R~L78onNeJTI2>IrUgXOyT@JcJ)`36Ow@x~26jpD%D%Bv
zk>`b*OiZU|9qJQ28H~773aGGoH1%d`_iv~Y49_p{FZgsNFLJSW-6yM{s0PYr(NuD(
zFu@o{7{H;xMJ&1cnZA=LhGdW21N1%@8Iq0&@))HBbgId5i8dGf8Sxxfz8yUre@tv@
za4Q%2=&rBjJ<oin0NZ4~0fR6f9n^#X@gM0qqvCO6uxGduK|bClLO6-`5XZBhCmHtf
z587E#422&6a95Npnl?~WDUE^1k*NTw=2(O_TcIG5Rq-4<;<Ee35&pf#=h~+-gMnbQ
zrkwiC*$LMR60U3~2=i63pdQeELWzCcGJne6J{;d(ja*&mQ?3r1P&YH@qd3=GAP70h
zNn4KRY;ycw;e;A;?<&-E6<Qiuas;*7`R;r^k9r7A(xRUu=-^ieGmNc_(1!kt5p8FO
z=PdqHYHl(TikstVHfa;H@TOIUVJDCWn2N8~FG#|49hPZaK2~)qK4Q1;IsE<)e1ZlL
zDI{M91bDBbM8bS!f$OpbO{1aPz&;Xj+;$T7Yu|}UEA&gPR3P1euB_>kl>WZPm>ZVJ
zzn1~dtV#@Qgqj2D$ZJf(Y@l&Vb#R)x;wwdmHihuQqfAp(l0h}0tCW=@m%sfl?@WT2
z36Z5;`crqm=|E>%yKb1dKjh7wSS$lJSTim><2S~OFSg-Wrl7sT!=594G$Rt~Aa>pb
zLXik>fDgW>&j6=x$(Lk_$wYbSG#Jsm_zNxbMbVh!boGja*tXH(!H?nfc5H|Hja>jW
zJ(F@)M^F;c!%h42VWq(z(Qa8@=DGabpOdW43CFz^NhIHq)1sz0F!PPEhN2;-QL_=I
z#tG8mfsn40mUQ!IEU)lX0+l#2u0CbYW>uRW`~W9Prx7ivZuw4usS))V@I6>-r7ZGj
z;JblC)dxY^MN?dz8;V{y?tu5w$=%*+8qR!Mkj*GL<riKmeP5pvgs)ZGhucIoH)3$U
zzP{Llozi-GL)A}&4<Gm!uqjPqLvbnGHH;j4VBAXNLW#){F?2;RkWhTa2)ig~NeT&3
z8oLg2thygyY4jj$_!$s%l8FR444AIF#6AbhMbm1_)WH)+8R>sN%|Uw~R-?u(jfAa1
zFR>W^E^~hXKDb!L{wsq~L8d_ecXp#>Y5pIf9`kp0Gp(-vTL&Zfz{mYC1S2WC7%a;M
zpfOam&CD<H2Vlhq{z38QzfwfYM0FK%I9j`ny@}fjY!o8_PC(@4=sd*9+QZqg0z0Vw
z#`}ZO_x(qji0;klUW5d)2FL2jRHbiN&@2q8gw;rETB&&{ubOKveqT$lWFgFw_V5S-
zv&H&w5L}179$7Ckh0DGU-gox<Al{$(m!%utrY~BwV7q}IDP2(_IP!^&^TBRs%grG>
zbwbg}0gfM1F>3dU^17;J^fZuj1o#@b0BY-!JLx7C^U)U+^gspWau`c$apwZJi_8A6
zYtD}4ZJt!~-h3pf9j~4B%l0&Bmh=bwIe0LD98+sg)Z+=INuO+WnL5!P@zAGu&QQI?
z2ekR?0I%fN0ZIHmVMNM8p?xg7jaQ22@r25D=Is2~TnT<x`GN&$3W1nQIQrCo@B#TR
zMhV?~G3cKBL8AmC&|kqw^?^NfuMy-hRC@SJP7U%NyGeg`i0!f@_7F}fmYbqG4~lVs
ze?A8aG0#}TMQFw*KwU~SnqlIx8Q8%1DH0hbKK*|Lvfj}<e<&lX!L7$oimSFNgN|d0
zhKY<)us<y$2`g2AR^YbG?7zyZpgJ~+IJ1i<UYR4@)zz){v>DvT4-ybw@XR$K_evSf
za;7F>{nGa@rQS41JZ~BLV2;u-ac-BsY_baXGbb)=gJu+`3A54b^Ebm8B6t=4zOugz
z%oS;}fCY4KC)4`U=2k?m2~0!Twnyan$b}rjiY-*n#Ttcn#8>cTCMK8^PM&Nq3d5xG
zJ}IZtu83eSADx-Qgu(zsWNMA8UaE9NN-h>|-mFY?QV9upjxCgb`v5_N6wG#ea>Lfl
zea+0)>ZM>OO12q<t)V<0HhAqqdiyg;YUwyQGdb0cj@CY(3p(Z0S#}{~-hq(WPCD<X
zJvFm=aW1SG#9O>VJT*GZH%ha@8_CoJg`>43)3i@vi?oy(9ssR-^Fytk$2_l$E?jhO
zzH)J-2E!}Vprn$uw-}??<Hz=A08=c{xQRW`Kg>KUB%qLdZ{InLTcrwhI%*GFCQCEm
z1)@OeVWyN*_C=;LiO|c&pBSA=h!NGqXlu{V^tSI&wPnfFj4}tW3VmU_wJD-JKzy)r
z9n#s$GtG<hm)^c@4Orq9W4eyVldRJ2M14L_GV;J*{b>$2YK#I%&M2sqQ~=p4Gvlns
za2My~b@Blc^Ss5#(U0Kc^O~R34a6+G_hDT&r$99cjTMZx_nV$!HN<8bk`sb1!vzp>
z1^v6~gb}g?-PUbQ`>oN~1gAO!2`<KpDCZP<y2BPH7!nK2!9^nY28JXU!+^$ZKt7Bj
zf)KbC7KEsB$WiFjF5G*Mdd!v8T|Y&QQ?XC?*JGo+FgpT6Cq%5_UMF-wYiD3#a5+M+
zk4uIDw;^TDK9;Rw{0JW{pa3qo{a<2Gu(GC^c?$PoKJ9nVIA?oE!L5;<Jg%haBE@ou
zgYTgfH;G+HbC;Qo0u^jdW>}%0h<#9khXCb()&)_X|Ga>J2h=1M?J#HQys8>Q<{Lh(
zC&^mC==br%-SzZ|VP*e&SFci_Gfh*KP7%QyI}<efA7CELL4}i%gBo-9qG1_^q@|u1
zP?Nl?)WbzNIcnROYMlcx>#whE-VYzwoMGT9;f#wL&(_iK7Le~(pI&+^ujW4U6d$8D
zdN-UIa6YU*K9y<L{Vcp;WJ3s<UYhHt7ZY&tF32#0QDRfy+??RS+uYNYcnOmr#Xo6w
z7}F47t5{d9rb|Fm^2)&gY?GHodk$+EH-OPDZgN=p9BmHrjRXo?qIJ)U(Ex<plHzN7
zI1g7C!h52%)n!m}k!w&iH`ji!jS6KNrY|>UFO9HQbR>!UP)8OorCW5#5G(L}t)It~
z>`cAp_Wo^WuEBo-b&=LQ;Gb<)mH7^tT-*29M{b)Xn>H$%+gG4Px${p&`JI?CI^cq8
z{PQjV%J4-4f||n-9YseW9g=?y8M7Yq)n48>we>+YBaL?m%Zs~!^I%H|K6J4*u>&p4
zxw8YWp|2L5;`p!=fJ7|Mry^*Zb8qDEuJK<^d{+uWr2kV4k@@3a|KI;<oQT*voBucD
z_;1lmebeTE4Z&Mi@5et_sZSQy(0g18fH+fTk%d2iE<yV-p8`a^z>uw>C_y>v@PeDf
z8B<c3ruDAnNr=GSWNa^eFFk)Dv-j-gs}qlthr|^yy4>~7bVLz@(_=ALBfv|YQ6OLp
zJ)kIw9=QiCsN!gaB}Et{Yay+O2eJ%-rU&1DUeosRi@UL>`LEzVyH*b_2XP<uPXS<w
z8UwO){CafV1`;;Grw8D4yVzkuZzA&J=+jn75h0}tWquV4+Y4v$R0h{;x+_EYlf%Ke
zdvGwYiIBM17Cev1qZUjLB?qif&w-y2Q^q$fvc;TRjX^4tTwVu>;`KjZU@cyDH?`%d
z?^=IiAJbl81D`$heGmBL8~p2yi0>&?StNOxL6E;H@Vj#L?NAnFYLMrPtxiv;dceXJ
zFEfuK{OnzNE$Z7;h(aL~ow7BfEXn>72%-&AF~-dsWzMhZvuvBN*keq$V9MZ%j&4So
z1QLmx3X%Xmkdjidxwql;#azzqiE}Y*OL#UUK0A?Lt;=qVYBqZw!pVxn*#n9Z%79R-
z)xrJkhsU=B5r8O_k{zx{yV(y1!|bDP$3HluYtOAwBM@~Kn3WeuA}Pm|mm`s$icIj8
z5ki%BmVTg89-EM0u3li!x6hyyRBfKBO(Eg`ATU$=8d^qrHq$<_inlZOGMX%)sOV_F
zKk&ptiy+`es0fR{IToHXQ-^?1w>#%Uspaf12*s--0%a=z>9Pq$<S(UfVt9*(48tQG
zZ^+IU%~!CvSClaT{fDL=TA;#WjxMt)(&#eJh;~&=wyj#;6{?}kO>w?kPJ0YU%tRO~
zT_<ul#D(4udC3ibyfuA+dzrQLuYYFz`u785r@v<ZRZ2)5C!_jw-HC=0mNiXOgtwea
zEwel+wQAJ4*908!!*~f8Up8fsns~d)58w~V38p4Byd6UPcU#~$$eA41sa*VbQ{Xqu
z*(}#7K6}_XRDwpnVjegP1ZX<%F(wR-Sz$<UhpJsLjUDb>O_7$_$V2LF*oL`KRk3ec
z3rI3v6QB;O5TD6>9EvX(U95c@E?glj`)4yUyc(_zg6e+yQs$B$wtg@k=PGuEi<<cE
zK5@57MU=B9vqo`>I6*vx$eUlzw6jx4u#{sk1Scu}ZbLz+C=Je<=O!f*l$-7!<v;z<
zDa8>FlKCEk3(ch3#OCm3Y9>53Kugw@2gj<TZk42MbzX4pG9;1;pv*~X*FppQg+P#I
zPsz9m3;e7!_LwOcYm^<m3nm(wwZ_biq3<Ew#SOrXorqD$s;z<M61SWK0UE5<#RbTD
zHxv`u4^6V<E*4m2tSSaBWT>9z$~ij4=^-7C+qQ|6MYWZI*z5f|4-mw)gx|tw=}8jO
zY&`^&LpmtiY`f;~?vQLRNx9EY7vtmPL$<lZKbZT7;4DP0=)-O8ACac{Hc0^<lx9!x
zdfvSlEMz%(W;LC#iT#qS(EM`hSF#DMUk{(yE3js#o##e%ywNkRI|rQi&?fx3`F=y|
ziO$6RAm{$KOTz_6UZfV0mq(z#HklgeTTzH3)BiX&Jlf^Ofz5#RKRQ9m7#f6}N)(lK
z0V@;L7n%>&gt}6ENGkpmy7LQ&+)q_2_&9Ik9c*qJdTovwI_mFG#x{q;E~J8-&m}&o
zR6Y0KhH_e{)bDz(x;Dn^(Jwhm3$|z}Zd<MPlDB4IeWinY@88`6{b=;G2>En#AFh4`
z;^4R$Ns#G;c7tj=JodtkvD0eK6m*?b1k<PgR2Qf)5!D=PQq(8kaK)Jjgo_<qfj{D}
z@WLj_9%jokInM!=ABB`wL9~(ooe3xi{a(qg-ApcVFRZ_@`SCGZF1D`z<}+xH@WIgt
zWe_)j%tW_Yt%~VsF_2jqp?ROxCE)R0`Y%@->@<NAA^uOU{$Dhc`7aV+Sw+fnlOLf6
z{2sq#40O|4SjrY`k&Ok`KPZGFKU8r_18aSAtn+-P!sqins!2ohzHmtozap?I`^0C5
z2j?;NJu4S<?rMNQFnG`(m5m%t8|R7Aq3=K#Nw}OK07j-@I>~Rsi$7jKISvz-FkboK
zclZqZ@Hs_lO9aY6w8Dhrw6}SRE{bN8)TCJCKv}gkK^Z9~teTmx%s7*OA}gOGYnP3I
z9HYGry!o``?e>Cp>q^(yoTu~(;AOF~EE|lc;zhK79i(j6YY~Wi$9O~oX9}=thTFwu
z7qW#FNeRcSe@R4R{8%VEA$Q|To-^Ni7p3B%3hL01pJ?BAb0oIxnm?evIehUd{?{?e
zAyO||p2T|;Knpuw#z=UtgvidRSi@9S-b<irJAaPPxPCVbG|6J5%LbK&UZzE>Xu@Ig
z#z1<Qi_}i8(O~kTl2VbSIFl_`Y(vdeEd4c}UUfjYjB(^&oHH$zD2mRLKZ8scke-n|
z&xhf1P;;ywH+Z`NgxAFv3t5(1_`jpbB5C9R*^2x5n)l#(W^U^jZnRw0uI#+03lYd&
zGJh$IqZJEK=6=uh+pRZ6J3_7c>i7f3jM%IDwF_;R6_IYaVIZP>B58fQqazzPGXb<x
z!aIz5mCoVxV05ljLVem5Ju+(+z)JlHsvWbn3i9{m_a4JYhp<0YKp0K!3YxtA82E6b
zuXVwU>_ghl2qO!{;dcsw1MY@LR#uzr-fq20cOI*XP!e?Z=)v{UNGxSm4}320*_xW;
zN1xy}w(uv<&rVzSpx@%tW<L`*cvyS;KYBf%l)Cgac=ad${ethk5+MKE6cjc8Z#S^^
z|B#_If634&K4SZPIHz$7j0O33%8VG;*q8d~<<g$~We$mnD>Ti-oB5jvNS~_T5To{V
z*U_kIVI?hh?Y`eL^{eaMt0#Mba8@>ge1iUg#5qK?Je{kfqJHp(HU8fir#wQa#nP7I
zML^7=bC=NG!cYnT$c#k^!$+RtD=*r&gWz;sy3BpNs@iRVG91`GBV&E_yCIE9J4}Pc
zc7h*KjMHFXwXlzQuM48~j6l38N`P7@Yiguv4v3TH(CQ;;@_9_WFy~Pnst|RnMQxi!
zmc|tODg4~}%5Uunh!!$tP0Ei!1#MW|D0dcsClxNOg3G#Sd|)@`j3{lw<V$8yZUNoy
z7?TK~)5ryzRydtjf2H^`0=z#DjamfSj0apWuG@-9!Squu?B&VU$n%SvWSDj}l}}OO
zs#^4rVcc3ZkCkomWNKo|iz%Oi?9VVEg+L^{Cty-6JVk^f{8y89N5Z-k!V_tlOaevQ
z3d&-0zQ_Y6M2FINFp~|F$M#r7+w)%|Ag3!$0NqN}*pB1jPC#)-Q<NvBXxDTRCZQ_e
zw2T;+0ob-33X~f*%yr6W((K}oLjIV;lT|@NF3pgr)p04Z4PBmh&HRS!$kAA$#qPX(
z)QEHxRbKxDTT`~otr<E*MG+DJ3~EE=dGkL(Tl!g46X|^H>PkInid*aGcg-5+a`WEA
zgj5g6cEeH@vB_ZT8mTl^3S=u=Gmb}ki!RMHjBk?_5_Q<L+8#Kao}Sj+QAnI$pp__8
z8WU`KLA{znaM=Es_{oS_(7CgG*Ru!sc8C)=jf{SP3C#hXIAa*&eg+31pvo{P>)!21
z_P|>m2fD)QN{$Buw|JM!^~!l=DG=-Xzt1QDc{2ynl;y6U6V{ublH;&&h(%UvmkHMs
zGv1-+qL}sqb5V@?$LpqYzW8*mi&oRrQk{L*Hd<{iPFOfX*zK~c$?6g4dD@BO5_*e%
z0|2$7aAlVYfr26iln}_W*`(w$v^Vw8?@!-#3^ZnPV|JCkZ+&8Wr#bcv3;|-_xOkm9
z0T$Ec0%k0;%lB_tlI+A{K239C%^x)hwTgM>to(vm9XF`i&RY<jPno3S+l<nQ`!g*Y
z+ng_CQ@R;+%*L&wo7ek?k633+W~2FJ;;HBCp!~z*v-=80%S<}=6*hI3Z)o+6E}cc0
zB^`vlq+OeD%)5w7cXpLlBrCqnvlbWRms!*sHG4mftlj$VRhOQb=c`tEZA~AZ8bazn
zK7ezY^k4slaqL;z{}aYa`Yyj={Q9dSSE@3W*o+9>zd8cO9qODxNBgLZB`L9yAY?`m
zj3cNvvaw#JQQai2f&H@TN>a^tutK@UxeOjy%zk4oYAcGDbMxfr#S*lr)P`DA-Zl(*
zH*nGI69D8@TMV2($7wdMI>H8rQ|XVKA}(YZO>k1=GlkiEgAyB?@W>?fI`{KRgjxzy
zH(ErDn>EmS2akkT)AWdx{28o+<qc4sKo#d0p9bT1(KfZdTa!`{65$wBex?k`yy&06
z2iYa@^m2TlhhiX}3SKct3VFui+@`K|?_Z(kr0{H@F0NrHRHz(BxJ8jwoMp>b+MFo%
zkA7>)-NHdkWHRisNH{i9Bm~`N+}^afR2WImoHOMGCm_*baY6AN25j*z4?ZVkjtD7a
z4g!l7(jh;puzf}a6ezg>iOLcy57IpM*=QL*Gj_G)0n|u$5yd+n!kWu?El_gL;03<l
z>l<qM6Ttt_g^JfR)O$g1v-K=sDEQxA+LF-f+Hpq7gSJ#pBX5iAG8o~RO|*St><h5|
z^L5`$7eB3dcNo1$lE#C9#ydEBiJuDJ_scK;fTY>mi=FPH1%II6X{Yp`ET1&iyE+Dl
zatxeNSuac?p%(G1t3sj3-uQ?B=;ywmxjj}5gO1yBuV<Yw7v1HT5MKfY{hNwEyL%2f
zeUsT2jcHLmooi$&7y+IArP5lrS6W~SmHTEpS7&UPSG`t|e|x)z>m!4QLA(?GtlS+|
zb)~|Q@oLlhJ&9?ZD!WNDj`14-fpn>NkrjltDX_Vj_-(_w==-w4q;2)2p&Q~L`)Mr;
zH>UQF7m5EJ%s-op?=^eGyK}D?3^HK0R|?S68qCCOTcg~*0y=jfX?f?*6{+iEMv+Xn
zZ&wivtOz;0CLyXV16Fy;_O(LVcZEW6tUZIjp>yZ|-n~hZ)hA`-1@bO3^`+WXmscj5
zU{Oy1+qK&uHNp*>u}{TSW=&)cOwp;<z0s*!M(E;NN18hMc`RHb>NUq}@(g~4YIkg)
zb+P`7hoM9d;Qy61X<L0GBB0{`WKH#dypZq+e)h1?({P*w{d}-9(AGLYLD6W+v>yxk
zBTLh;MW9GfN8g^hiJuIL%`buOU`SHNPjWna7ccKc_)5u{Iru_F!oebYtK*z*FCu-^
zfN54Igvx_o=JG15DtXNoz<Qj*z_3iE9(B?;vu^3H_Rk~~c|9O+I`Dldqf5yF=ue%B
z0v%sXpXgHn|6rmf&7BK?7*8WQNmTJaNft0y{V=cW^9A`i8)n;S*3D-*eZ8wLsommg
z4WRPTpK-Fcoeif}h~k3)@>nE1@TbZ<&u<uyQ8wl8W(s14zYMv>GiZS9QvfN<6EYtY
z8KFNoNr?bNz=THf_-4isP%#kguYVT&WS6_cE1=pfqzGppbl>j@trUVu6A>Ya9=8ZE
z>;3CX=iUTF!qq);W_kFknI}H2r!O3$J6=yKLkt&{g`JkN{^DoVf`{)ZE*YQcsZnW{
z&9SzsB(<`J*04{pzAS+sua~`sApJs=Ix3IYGdW!)Mr~pZzD(kky@B~toaNtiI!zB~
zfLS!TV%A{k8$7iu8cAEV5en{9_u9xO$N8u!XFkP?2Akiost7WVPZmEAs|6=?F;$r5
z47DG3arTnP>{WD3cZ^ASJ@!}7Ir>4%y!L&=WlWkxz0PQ8O6+Yr!jSflTIlV^GAjh}
znde<lf8}OJquWc8Tp0{hM>ZejVJ_-@V5Ke=6H56N_L!CwwE#yx>$wj*z`uM*WZa<X
zO^TI78a68VSb07MISsn(pc8jFd#T?OM3{qXx2yY522##jUlu7$6&Xo-+%MrfQvdCH
z>_JTByb4dUJSi|7zM^_Uv@Hbu&XBa|hws+MWHxQB-}4|8*ReJQ`I*=xKYVu0)q$go
zigp+l3k(FAL|Ln~rnT(@1KhYAK~LH&U1;3V0pzOW0~Pg+6%t!Zlpbg4iSb~2K5fqV
zx%*r9B#ML~9S@YO4{IUBYQM^paMv(pt}mt!M&r<!r=V|!$80;vDkt!r$><I&)Ju`l
zml@!zk|4Dcc#*|JC`}F&+^pv5elt8vJBEx&KMNaru9_u{tqLS*&06swoz>zBDyOmL
zBP-ZU*5SyAW^6;6r1?o?Nsou3h)oE1LCGY3O0`kL3oefUnG(4rWv2`s?ExdGE1j54
zuAZjEheh6L=)T2g>xMh_FI35y(ms^1EHYGQRW{B}U*=(}lO5~(SvAf_OY!jPc$tSC
zV;)yXHkiKG8*EO79*_Tm_n4{=<bStxMQna!7w<QAmsNM<egRg$C8=+l0v;5VwkDgo
zPzA;n#(qAMq5uy8O8a<oz1h{2i*iS=&k2d_L!oiT5)*7VMSJJ$^Y+Vjd-S*L4;(y}
zod=X5KB&hkQQl2s_V+sM?w>=fPtHXwB4wp=G%OP<e?KCCD{5iD_=G<e)5BFVY1*dl
zZgDoc;wXBd<z$onlu;PycB!Qeq1r%M0|74eH!ib?o&vW=2K{9zQglG=(%K!+-W(mN
zcC*tsu}p@uSflz@6tWz@vq!k}Tl<{!9%E{cvxq}qX`L>83tMO{woYA7TDOI5G+L>j
zlUZ`?{;R(Mxi4IHst+{odV;SI-P3)jfS$Q*fI^3jb5-%MZ9XD=Y!IT1`R#j5m2=Ss
z3S-{eHC$Mf>W-AZufQFGxU<kFK4HK@ROI3kD(4=rc@D^OfwnLMAvtR2mVZdQD_j<3
z_!BmF@(rqnHDrqEk5OLd86zz!V?!{&=;A$w)*^8D?|JrroZ<Y!1)ul-C>X_k77KI?
zhf#uXJv}qYnjh$%6700c6p6+yCOlU-ftsfYZ7Tvv*?h)nfJA{9qH0jt=ZI!n#%i-I
z_Q)i8DVAYFn^{&oqPbK^SV<65172HGDZgzGic?IGrtX#0%NLixkeGlmgh$5%r9_Q1
z7YH0Li4+yRvqsFCl+k65p9~M@^^I?5Rrkr6Kt|POf32~_m;T+@EvTN4q^NM0=4LjP
zCd{F`=av;VKyBbh{Hr!&^l#SWJ&Y)!{E<_aKR-OVY&^>W=i57GaG)Kmh?;BFNTr<N
zwSHlVr|2o++)I>Jk(P(|Zdrsz==?ZFd$W14!xnc&y!KFnK|6AOou}5YA_ru#F)f#o
z{pmF+cq492ZSw0$%Ef=6koSrqY2jb-?csHU>6lGE@6*C@fawC<+(|~;^zfIdIro^x
zR`5J)8)ow<qmBRaJcZ^X6<nK@oC&n8r2jO1_Kd`OK0Eg*394s(<hf(Zg0O_UHToB_
z&-QG>%YN$?&JTTWF^hvJXzoqwur*5wAIVPS(EiW{ZLsauAKM*XiSfiyTQQ2b|EQS2
zsaXO<$p6zy_#f8uf2gSDUzg-&EKA!>j(bo4Z*UvO$VSg{i_$Y6iWTdc*ehB)zzDL)
zuU{7=+C?_{29hv`tjpRR%pR5`3UW_uY_sz?=E3y6uJpq7M4uc!ZUcJVhDd1?qOY+`
zGIT5DyAJ(D#>;Mx1$ev>x>dz`niI)-$)(ALe-v!&;FVQq1$rvlCW4geRY-kq7Vf!x
z%%Mv0xqOC~kjBf0Yf>&V#{E6+=5Tfsf;8)3vi&!1$F;#$B(q2O0gyS>>(Ml5Ray<A
zRuv7$zqq@n0QN0{FT-JWA`w4fwDRqo`jUSUcz)|Lnbz6>V@77WTM-2kshqmyB$J@E
zp#X1PAX1t2q_fMr<`lXb)$K^|{4?$@iD-2Yb|#L4o}Ro~b$u{&qmnwnHiQphf2vKI
ztfbMR%PKYc<Rs;{sq@Y-$oa#OrdzN8j||x`xzBej0BgwjSB=%vhnc^4lcDK_^4vNx
zA^a^<dPbkcvL3Me-ByxVCnu&u0y!`H$R@G@<&}8Aqx<iAs4s#gcRA$Kf;qzn%dpcm
zMatRj<CaraQ`DWYz~gV1BWl*AX*0|9k>h+;br<AJcqxZ$Sia01rfQZRG13BkZFhIh
zp4{Nm5Ah%XSN<Sa6B!RPuk!$5p&eO|5*@^~DvrDV18injVzXr61TLdNjOuv_w0I5a
z6h=ogr@gNL|G-y^8iawC@-N8BEe~PWT;`q<UV!eFfZOK3JfNNj=3~F0Em{t%uwZ}$
zd%lcWgudn8)oHtVW{Hr|avn7XKJKB#fz=X!62xwaSxe=Px5jqj)1ly}v&KlCoRjZ<
z;ACLStVgGZVKCIS)TuTuNkG$c+RxH*>mCM_>yOiIi(XCj5$g8o|2{%k2mWkpj0i@C
ztpNn09?JR4W_9*z&WrdW&7a*;5h|VhK@qgGR^W7kU%x}8$Ik%6!6x+*v|$m47eP}&
zJ0d0h*tN_U_z@6|w?fZ~hgjpH|6Sb}a*S9rfd;FlT;*Pm1PvaxTE;Nmh;O1N_tv0t
z(uMXp@^!u}`uL(vW0}7ar%8=v$(XxjQi(k%(33;xz6}uaI_UXrT3&(FfO&W{_fWWJ
zsGs)&5()?Lv};FxyEUV8TDnJOb}udFc{0owM>0Opjj&jWBB57?pU2<wi~!JW`(WZH
zT*t{zGWTUy1X)km1aK?MwvKfUvXWF4Z{55R0%L6%u1xvEz%+bBIuIRh{{Wf=bIq_T
zsQrOiM?fUox86X<ULy_2iDi_G{xTyZU1Q!S5rv=HdTaSNEH+h_jt(;gQe=I|=pCvo
z>}<H<k0{;Xz3C4(zxEfVR7G@<lJzJM=h2g|6vcV3C9ynsMbl5Kc2$|eEl;R(j~{*r
zVN7xULh}P-pr5=IyQ4f4#-`{lJE(u0Il5?_M5PO^_M<3}uoB5TAS4Jj25#Qv01W$s
z`BVeYv4sQcmb*?1=O}WivC&9m5>R?rX{87M&+AjxH0Ths?!$RhzBn6H#P%{-wSx~I
z(FuQ+w7$1AeBEDARRN0jkbJc$*%3w;FZ6)ij^0ym0aIQIB#p(9??G(y$;}BYySW1x
zoONynaYPTfzoKO(RxoQQ1VhI;;oRj}BMi)GDs5gGjRyrN5n9P$QY`nOIcr5=k>s?A
zk8em;@$*fyq6jFX-G@Id#1hoTVwZ!Q4b9>7D`YWMZKs2m*<S@~X7_L)dW)`RjhDae
zTFhE$EndGw<U|&jSDka@mIk+Q)%I$C*vC16Zri$i_oQ7lGB7=Oz+#=)xI5Qv&Qi3J
z?n+n;diyC+1ZL*w9Cl_b_N=|roxCssrt<z)n3v0Od+90`gPx{AaGa>{lunqQS#NC2
zXkm`?Gm?7_`GBDTXiT8!BBCo?E;$3gz*Ce%-rRoa5bl#6bFQwV3-bX`wi|FJQ(g@5
zGrbU!I=hm5wQgD{?lK~DHlF3W+dr!5ee-{LF(ArxG|epWj+dY!WDWY|yTiGgb|n%>
zN-pMCN@_l>4!GtyxDZ?BKd6Vk@kB~|?*c;sCI7z9U8JPg2*cJ_(V&$OS}M`pLu&h#
ziNp&uQf9JF;xK98Bgya(>DLQiP!DDAA);y}J%U^kyQw6X8RV|Ch`<$dP9iB=dqCq}
z15pP`f9!PYnl1jWzqauPvj-Qbo9D-8n=wV(SsEY)9s+^_8F8BlRcNv3Pd3|Pt<68?
zEb=7}E3ROdAS+Z7IUuM&5MtzJx>qg{BIwbukr#`1a@qdf%bV9q)hwYH(HkDs_68pF
zgl42#o0SLCy93v4d%Gu=7Zd(u!c$VN@Z$$nuufw#;Kv=pqYxQN8wPqw7CO_3pca<5
z3M-mgrXTMJ7-P+rPJr~ZPG$RqQ{DMESY7_1&&E~~Ehavewox?XIFl~ubg0|i@s~zh
zn>1q5CrDJcFlGw+j*%WY3kizoG{Sa!YU!bbhGfbI5uki^E2;bQPc_QOe-y69S$r~|
z#(H#>Etusss}MM-q783Q3zKTK?11{Q)RL%?tccJzr=GI<HJ%e&&r1u^;uTy6%gX93
z=}Guo+<{BWhuyJi=kxF!AU!)~7%pLY9H#bR<F0Pq$<$?ymic9<K~w4$a(Aw$`&H0Q
z0ZQewk?~52r~EO;GGL#v1XB91l)88`SRj;B0Dh*<Ple5t!VYLvXes4^;Q}*Y&CZws
zHHt`cX@Y;i2h6f1ujBP+!O=*%Oz#gg(PX+gBq4V9)r5g)j)^!%7gD;MsTanS0Qcok
zhmxg~=&;q&SajJamoZo~M>n{Iu!~S28Smoi(xc4k>op|$Hg1ht0v5w|@>6sRH%E8x
zc6v>kJ@ZxkGq16zDX8kR-G<ajlXBi`6uVy-Tm*2~ZB0P+OcDE1acA+~x|#0FRVPGA
zz;1izMK`V02B;OctY94|7S@R{WrJ)4j?cyVV4k}~2|X`-*Hcg}ukS^-skrc=dDrZu
z&#*#akFKS)8@Yw{H5eTUO9+b}&gIE2LcLZ*RX8GfiGd&9Ih=n6{>HGH6EL^p=&S0V
zKV#R;k2Yr8J?Pg5BbS%iPl=P1O0Y-=HL;rq(tL<KF|^nV0!LgcZ8g*zj^<%0#dd9-
zDhT+*$p2bmKPG|yow}t;FO(dF9u10Z^u>);UU_20@j=f~kkwyv+rBP*M4+U>n>X7?
z#Sf_D3otrd$}<@A)XZ%t)exZGT*|Q+y+J4dO~sh1tJ7EAB|PTl56p}W*i@e^`(gT$
zx!lzBOVx{V&5L^koPC!VA>0J*cF(^<f1?>A+`#s8i|~9>=jq=n0e!3DGpm6rG_`)&
z{N`6=5FeAs{~ke*6l1{uzk==;lNIvc@|W8G>*&l6HD!anJf7kWaa>}Zg7(|S5a)8@
zm;b$29N&5bi;qbBe&4>6DJpKGOL3b7C*H@s89T}0#%pKyo$D=?dmei@Ii%7@joeY7
zgcc=(wI=1v3b6VS_?g3eYdQ=d0Ywd9shU1-K{3k5jVv;*B9hT0mxj<eLY#6t{rclw
zko}?Q^BxojzE#O22A~qouhV3;L*Q9ow9lATOhXKmJq+u?(Z{GYu$*9;FqToKZ!ofR
zTFYtgQ3_f}n=c~3@aS4(bQI9fPvou*S^Y#)N*bBWBPq`ZH?$iivB1ifav7qc7zvW7
zjeK#p7TrkYO|rJrTBmp~mZ%tR1ok?evD8x<8{}L1Sq-}TmrPyrJ|Z5qRtJ^!R@QD^
z0YvuVHtKV^m~&B=<HS%@)mh{`#jl4)G>?G5LA_M96qH|+d8e-oDDSj{IBm&TLf^m;
zQ_L#>=Z_5l%+0c(?6jbZ@YkScnQxoumr!mqzY#ySQ)R~ndX*mkB^5h!62q~|gpK~c
zZvnn3+cbS==!6LLm1A`gbn#XKB!0gpops|p3bq2ZNFr+_>G2lBOcdL;-P68RkQ)2^
zt@G`uj%CmGS!+?~$z=QKf3>9+m0}X^#(gtT86P4-4GrPa--Q}hg$xGAx@d&rcsgux
zrWW}KiaM;>O=f1*HB`H9kXDqm!Z$^;Leu*`nyUNtSEU5tuB!7Pm_3mNE~olll4#jU
z^2MqsF?VRYM&*^J_=r>DEj+X8o=gh4qobvZcpI*?)d{5PThYf55*?}l!Guv=^hrS^
z;u&{Q@@M8xs#0b|Ca2^FZ;BiGIBgWCxK=cPM1%XaGal(Cfo;hAE8=}A0*?1EE^=3S
z*=X2pLODU|=m=zaQ?dP2@N)pjkk)CoNa{4c2=cKccjH|(kb3aUH2Er3sN+21^#DO4
zFHh7)sqp=51gGYNAbb9Yq(g=UJ|(VeFA?1g1lBkP$JJJcC|~f*uWKN#<motmK*_0S
z5`T9m@<{1!Ag0~>_5B}1nwMJ0DE6g?2!bYfp}{L<mo3=gth?($mlx%msxQcxkgZ_+
z`Xp%$TD8WIa|OCv(H#px@P%Lx-h(Yoy9qjdqwwW^nzb!XFP6Pz?B|T1^v;s-L8Zc1
z>X-}-<;|twsJzL{z2PZY8Tcn0K{3p-0m|lX*zKW~dDD2rYLD|b0E&8UL=K%R2AbuZ
zAWbY+(pAU3fHCX{iV_3Ytt5R2#hAr0b~5n^ZxA|m=r~w~zS0XL;?fsV^K8)xcz;o#
zo`;Iba8+YBf3gxm12LFf!-q9y7ZkuFyI6h+)!K?}*hj^_Tp8HP$sI?VlgI%qxWNR4
zU8fqEl{(WqHTCZ%mQQ>aVULRcO!%1_HYcCvdD){1o3TR{7e}ijDLMHbJk<xI65fXD
zoa_~1rH%)BSl@aQJ^0I@-f1;%YooHh-0u?R8m_4%&Z7>U;|JKQbXuY!a?Dy~bjRh(
ze;OjvwpVqlB6oHXUVDfIAGD~?W6Z`EliF<togUtUAVfIctTXmamNo{z;yeibC#Eb_
z?6|L+{9|<r$T$#v-edzDOxb147WuKlbr6GmvKL#bJYcG)25c*~*2f6d80Ee+s(x^W
z6c)paDK*PzYXZ}C159YmW_Z}CMX^sCTU?5ss;SvMxlNmB?^L_1>5FZ&*W0mq-0^?m
z7O`Fpgg~OGT_9<SQ{+(1S1GC5;V5tE6eOWWE<d`n1*c<-AFjh>X2S6{yu+Le*eHd2
z^LUVBO}kE@7edXJ-^Ozw{IT>0S>qVu9!v|z=*nYldhAsME#&gLmf8YFkT*)(obwO5
zo+DmeJN(u0*>&s;q_LeQ1Erdw`Jq*E6uv*4J*atR0ep*lO?4QQZG<LaZP1E#?!xAF
zKOJ4Kc3z+J*tqHdvKhN_L-}BM(xG5~sIP4q@)Hdk<6FnhVcAeFMx~<&J!OAfOo9C7
zP?@|S77WQ;_~U2K@gJ~!%7YY!Rgnosq?A5!3+UipomvWTbpLXFtW?JK7GjJVvc}v@
zHLlay{#AAc?euwYKH=@z;Zjx(&bNkxPLR@AHvs2k3rPA4eJ3q}V9(~~hH~g#Tdk`L
zlqQiP-;s4^fAi3;8&Tg2Xb}}>DxNnFE@5pnxT!aLZ~YIvxm_y7|AchD*|e>yj;vY3
zGmhe=Cy%dha%JS7Hydut==ll0Yi!Qhe+t#gYYX)MQ>b4s6W@Qn%m431{ay%)+Csjl
zPK!5%UXw(s4QNZV8ry#t^$pVN!bTDV#YMjt^>-pjl<^IQ!VR4)_$?W>u3eoc?ZoAQ
zXMx|m-VOk>xq~Xgibz^PBJl_uQ$nhJ>xj?YZgYHuFyA_ga0*BcaGd(~BdRzik_@pJ
zgp`Lgkq{>=+R}C-LN_mG$fR3a_lx8J@NIwFaq?84^~WB{#xT0ZRVx{?2Sbg=LgU!U
z8SMz^$AW{H=gFGdG#1+Yh=A8&I=-6US%Xb*C<&4>LU1OM5`%<AIFwrYAsguP&a%8l
z%;{w_Ogw~uj`%}(DP<~1eW!!A#BH-m+|>czu@&#tCl!g42mH<8&P@_#!0#gzEAK};
zHLCf7HBOR00k;meO6SgAXeO6?O^pPUp5*591x-`t9<ju63dMH6Hd|HrqPd@cX6*b1
z`H-8JQ1%)2im*y#s)c(Z0r&LZN>i3V`cQIc2T&nFl(uAy&~xqHgO&aB10{j<P#2V~
zd(M~zpGHfP;|q++m1-Z}WYR>1N6VB8&zqD#^r6U2LUFUTtNAh-`P@xbT&UF~sA{{>
z&#Rb3gWQueqJ~Jxw_@B`@z?|FsLU4BHQ|uNJ&g_Or=BvFHCoH`T`UPh3fu4huK)-m
z_uN1a2$})oVke8?10y#yEBP4k$r(j=?K6I2$~FMdaTh2uE^CMT5p%i`V*Zj{!e8q!
z^Wqz32E>e=|NoT|g}P-vEKqzq6<Ym5xv*X<;><CxWmjwZM7hBRfP3T(<y1(ph91CW
zD&_j!q(jRmw+SZqz(%YYc1>|(i-bJmw4hnqx1^|dEVw*}lb?^xrByQm?YM89s&+aa
zHr(Dage&}$&%**sd3)C~GL8lcyHbj5m7hq5SZ1&8AY=^fjio=45ukZW@S^MwRKLx?
z){21|rwUVJd0n(RmnR8tn0LJdHLfFpU(+P1BE};^j?td(m7xZ9WYB`F)`$>8HjyC5
zdCb%b|6Y4JA?Ox43ptId2{m``IL_fENWH4oQR3cZ3Tgifn3YA5rErVqtDNEa*1&))
zq$UNUiv?k?4&~36FE5UoWd0!uk*7rkoWRv()vi)AzvJlg2}d1p)ZsH!C#)LPlt80i
zt>rtH<y94Dl`g)r%dS0$wb?iK-|QPh!3&03FJX4)j@qbXT&QbtH=uRU=RMS0jk{fv
z6pn=)EGEL}+N{H*ndc<JEP~oMhTg=~)il%CM)EN<?bb@TB}P(tEW~k>Yg8Dl5^>E0
z73j{QQqiyC14{>0P<B~WTj)eAA=zqw4dgg%Dzf%&w@bfzyQgA_MH#aB{%-gF@n9Kf
z)B70l=eeuU#yS(ri9EBvwmR*GhRm_v$mpa^>p11$y4|L>R-BKM++4-WAK^8zOC()`
z>sr{Xj6CJJ-l@5WYqHX1KXd9Oy2e927$;8J87zJNilEV;NGj$ha}ZkqT(nraOkEjU
z9Cj?LTPZ--s={jD7ce7G)~cyuUauj`QxM#e6&=8;<#CAsXTLgBb0&0t)M1lZ`Q-~?
z_v8{a$!3zCYZ4!AZAV%z%34EM${ciFTOLi(EZ2n>O)Y@=A!c1tsiT;>1LIMa6H)w&
zHx?W!Yk-ayCu-Q#nP#`BD*7}ClcZL_JW(||oQY^^H~!RBOtGa`vF;JiqnHR>rJSJ`
zG3E6@-Vgc*%ftJeo9sk8PHJ+TdL?wsgSDNQjPrDVUNV+&Ox^da<gR)|d^#$gUFM{Y
znYEz>FPa87>(1VMRHg~4Y29DTb(+j0em>sBBaNZ*jy6Oq?O2ymovh==&-O`2>ag3K
zW2>N2j@`ENjN?1RcmVx>$~V4r(~666@{Q{@TIUPn!dvGH<BEIl^MwaxBEDP*8!Th&
zoE{Oq3sTgdyjV`OE)=)2oAYIXFEjkH=#=8_YyYi_(Ds9M>+!*%h5zkgOJ1^6*qop|
z^t2aMZz~UsLqo17E3KySFs5n9cn8~i8uDaS5l*g*`gmx_bfSZX?rFDgH1svmkSaJY
zWv00@H#ykHq^>eYo(+179E{U*@&7=oI!Vdx;cK2VbO0v>9u~-Lp0VQOs9N!y^DLr*
zw3Z~v?X$L-c13UHe}sbZvs$V8ux0BHOw12k)_h@74;{|oBBaN0x4TY}2F)|fZ&|#i
zuAQra&R{S;3PzmQ2;=ZEri*3qspjL}FK3Jgunj&WTI=cNrf0pY&9MjY8=X5M6|8`C
zABjg|2=&R?I1J&cKqN!-)*m%PNL76daeCyaTw0mX$btPtVy^KhiDaCpa90`@k@Q!l
zHj&sdqlsi_{9MUWW*q!%^rotfVO3#M{Vi!AwN((ZOUaG$tMz#FC~+~4x7}5+g^P6$
z;5IT^!C>TAcYa!*op$kg?$A(vCk_PTAbEo)C~X__98<$sXev;=324o`_eY7@QQYc0
zG+K!5e;Ty$YCHXFhO7L~f2ayzDO(6>1c#CN0U{GqV`Xk-UqWGYbZliHG$H~t3wWH>
zTWxRLHWL0GApe1l3*5Tr=<M~&6$fnNq|T)VE_XqlehLDCmbhMBw2~ld?fBaM_nR4#
z5-CwDt>fLa2IB0J!y)H|4`+t--t19-o<7-Q-+jlfB9V#k6|bsPut~woik<93-}6WP
z!O7VBMIu?0aw%CM%6VQcCA(G=%cvA0V?~)qLdqn&31Gxy%lq_+n%oxo=@Z5tQC4Ed
zK&urh@-0s?_HM!DHl~TioJpJ}EO3SsY{SW~7RkI~RnDlH>GpH=ZN_T4_p35vQNGG5
z)$;8PUy862%OX%l2`i-d>x>=MtOYNl1><RI>?UqSR<VNL2&ss`sw~N3@fm)z!ypL0
zjd{hxs?763emJN9!zBI~(3n6b{}XB;@_!>Li=%1B&#>^dj6Tqu9~)Meb5^0d(O_Bd
zjKP-=C{az6%&9k^-dQcC8vkPovN9f3Nsd}t7OAL2%;qV-kquo}XSDo~$n=_E>2sdS
zS{#wZ>SO%@6<gt4pgS(vDw84=QN^!QJ?NbJLZ#Okdw$e3C$}P0Q<u<_C8=TgI>Ye{
zH}pLUu;f|H?tn#pXFLMCLfsXru0XML*X*afO=N;IIHY^*B9Sz)6308Sl4i`rUdo<{
zQHM+1aLUus1bvQ;WTDv*Rk^Bpyyc(3r!%p<*QRfrTD1au%?|x9z{W(##<V~aEP+XA
z54Q|W6KJo>%UG0ptTiUI+pX;^D^VC9RlE5lq&DrjdX_DK87=yyTJ(SF#ccu3`n7PG
zB~`*xKnvydK%l)|GG3Pa-r5m%-;90uXn4GgV{Jvy<~lB8&E4h^6f3!y(8&Fc<#Bek
zCq~S!2<zEt{{_@IFgek5C%+I;64#C=3xQCE^Q37rseuugw$0p3s=wPV9ul|CjQ>h9
z!B&MkWul#)&C7hrZc4!`A<4M`ZDr-RVIcFe`iA}b8$Y=ItzJkFt;!OiR#69Pg6E9;
zJAU8p4*6#ZW@5h-a6~~6)u7P+mNv?YW^xYx2+_>O1=W1FfUv4Q*_?4ib!3rE`^lyj
z*>OMFu|;;$Pj+IFo%WNRT4ZPaWM_`^?cT^5nb|*#vlpd+9n10aP8`5C<R1G8cltu4
zg?s2?%h1scAx^o(jSF;tOLM9BJp@YsUBx$6pa#*^U7j5<1gSX#$_k_h&9kMb7I|z4
zOMwAb2OD5CL|j@~fIJbz`!)K+xscgkAP)ST7({?6tTS8>Xrdk~>@jfw0FND@nobGp
zDMC9^b3}4tS_l`*RhGd_R=lW|A@4!qOA|~a8E6em4!;9E;zbi7+A8qJervTsT99MZ
z@J&k%c-{c8E(DLsPRsnZHed&0V}arAq@VqM?@)+VF+v$0>x!J^TI3Y+JyxHCBrls_
zhOyuf4(dD+5WLpWeyxq}NrCYJ_`{*)4U~wvQE*{0GV+Ngg_;ieZ4-p>ELqY9XO|ZY
zc_MH4rhMn}!W?CW><Cg7Rxhk+pStaei%uf!9uo)B!HG6y`P`?#zQmxbDr9H7U<#*k
zd=H|dqr_^W>pDel^xd!xbUxxZUXSXo(xhN9U)E`zhuxxJKd?j6X1hzm@K6nZ;dr8-
zCKU5IBv5^nnyAPNC;YdT`)>|X@Kk97{?94Zu7qE|fl^wiNJ74<a>M9nF)xK&(CC$P
z5m~hvOfD6rKkT1+!~W^lJnyD}__TNIZMl<^ZtB1Y%wMCXopi0##%P<W6&>o4&M^RH
zsLDj)F%}In03h%IV8EkKDlzzoh}!A^%(}O03tcB^*utKfB8vf<I?}3Z1bQmjz+po&
zAnGUZGiG7q;DBo`lgJ)XZ;&2EMLa`$Xw25@+dw5Jwz#SQV-W0GpncI=ltxr}NBVUU
zf(=l;IkjhlSv|w&xLPpmh#N3e3y)Q+KP`P#@(hb=Q3SaWN(t){oLU+QRdhdWU@Kxi
zMCN2evueuPsKw-NV1QLx*_i?klAn?^bp}yO@1Q9TN<j6_7;Nwju}=lZ4#&;O;Fw|7
zBqlBU9PcRdrvk_;+77x5@-qpv)jCM8q11UzNYHzh`nR$h86lozyoqC)<FXaCw3$2o
z-BHtlQB!M_l11sXu0KcxvTJ}Nfm8Oy<PGll*H*b@9L!j#%FKS9IdvY`k#W8Z^{#am
z18$be5$L{V4pq%@=b*ZcGl#G_n9A>fnKd(_9$bK2=6SVn7BHcamNG5GZ-al=XpRi)
zjrP(iQ+>J7#wqm6j5f|OwrDi90M}@=fYC;y4Uct33}+PwI856mKHpiTnylNEmqn4@
zGdKPz8%V?-tSD*`u%OuD+N@S}1d53c+$SxS?R(_uuPxlHco}buj7N=h7l|xVP}8$F
z$mtobzf(_XRa7L%R*BD$2GcE-t`OY8i7o?L&jCByA6~kU5iiyxTy5CHWT{r=SV^ZI
zNng{%n~7=$*`n>S*Omy~H3_G;UlDPRkq|_ai#j^rz?R3&ayAPi#|DwTA!J_w>5+7M
z;R<f__hx^;((A|lc!gmc<{g(hSlgq;$tW)b7Vv2E>90sH4ZR8OwsD1x?&N~QgjTR`
zxq~r+PA!^TuN5q85-QY@_w~Iax#_2n+i9^PWLQBeSnB}zBEWAWq`J=;cVO>3E2MB7
zD`>6js?k?VT9ecmP(|*A-PN~N-a6DBxOTp%YXnP?m^<%4k3(mutH%?gNBGxK<CyzF
ztw(h$JYJ8Y710jp@wBB!Hu>otJKSfFq)#R2%qM5-(M2PyE=E%+Pf5Qh4jtLYN!}Lq
z%(X~Y(uY`Pc(IRUsK4XtS5lNi&N>+VxM$^BaJ1s!O+xZN5jbwPsn>(!A7@v81$5l(
zlv#_8f0#pN%iyTwoO#6bVWXn9;6@2Q4jbEoKL{H)w9D{XAIVIQ4vkx`1*$-LceTLY
z`m1^~X%%eGRm^UlOVT&_VZgZ+`y{Sw(p$P&S*bUPkTrp=S-hf;SMSV4JIhz~on6l)
zYNZj+Lg4UXqNELy*mAW$;nl$}lHN*Pz0)>q3th11Gi_P;5=ObK&Hn`#jQO2T@G`vT
z%RQODKkwHI!BI`>Z|ceIa&otrtVVlk$lVHZi?k^mtJ%zbe(Tb`dx@?YwK{B8-fJ6Q
zYHF<DWT>hfrj%)4J&&t_=?a)~ZGQpmK#Sl$rPwmaVUb{m7}s}Sq#&-jUOLB*HNfGQ
zL3|_DF1&f6h?sTJNMn(GW)jB+hVZM6LXS}&(hH69Os<yATX2lxX}WfYe&<;V49#I#
zF^Pi#d_9XTL7GdY^Lq8oX0~6B>Ixz8+7u{=@k4Qf29JUXm(qt4-IqBYkkDH7VuXG`
z3w+dW)wXzO?D(Jy85^lOg?lenkwiYIB5OVvsmS>aP~n$d!P5E{DaZH%vvw>U?$Ucq
z{fMmG-5ZtTTHk9I#3rzvFE21rKRjR+hQfCX&?x@(f?U`y-Q3+_UF5cXkH&{I-hJI<
z-A?sh&6=BA{{?T~Aegc5A(ab*&fg-{Ab9dMo#v$DG|I_$=PD<DSFv$squtqSO#9xw
zL#u2!(e3Jm9HxKI-X>B$^ZYqOz1Ri5Myk{ce)c_^qq^k*oM<<^jOpOa=KweoD6*SM
z$DikSJgGwZ>ob`4d%wG!dfnypYr4xRxQkX!tWL(=Im)Tg(!*bPKR8=3VSxRFbDUQu
z=C0XtDkrCMdOMFYd;VU|@sl&JpPYS7KRE+G(JI`XgPa-lY?1(vOMZ1I>O@j_YTfeG
zfC?T{?WpR9_JbqHa-Dbg_JBI3w;Lh0Z!xWFYD16l>9zmF9v!5KtPa>=7tS{OD?9r2
ze~C<~M_UMK1ctI_0wNDnV`Xk-UsGsra3TVw26&w9T3>J5HV}U=(C@%CeXxVnO|x!j
z17uy3W?3IH6wQi041+;Sv`ti^R8gwqe)`>!`a@EbtQ2+<w9A7d@s4-LyW{<iwD(T7
z`uFg`9@*a~R{;}jdbLba7<jVPKh!|}UUEr-h)PLPmd%qamPCR!B7=-ELDDP<n3P;B
zCcwY#B|dzhRhz3MWQ*%m;>bR^q+F19^;&kIC1i6FgBE;7otN|zBTE*gWW`08tn~Qr
zI5O2E<b-@w57R$ka3a{snj0i>Ohsr<F9%x^&~;~;))KTxB1a02v_xFMU^Ca`nOp<c
z^B0F6${HxYKDX3`MI5hfeQKzs@RUl13P*<r<k``S0}upHKmT$xw&cwUM;Z)x*MC~9
zmAJ<X8nbE6;&g(UJY6J7D95eI6B^|F3j-N*8cEisf8mnPq8<i2mS$+J1xOY}_6l&s
zyM!ws7%?#T{MMQbesfKZf%bkbsK|M~CS0UNZd)#jc*ZiX?SCnfVZFucx8G**uAp*a
zPV+)KZd7A_M=Fx(N|U!s)A=<Eiky)=qeAkWC*^Lw$Y{Fcft<L6JzZF$L>Dfio=BMJ
z7o>kkLkbcxCCidp(Q2WEVrfm$-sb{qGHp~6@)ilLS$|}x!X9;bUeA&&*EaHbRpGJz
zFR56tuwn$-V~G`+{B(lZJFf_Y%rZtlRj*8xQ|gC3sIe@i86#kIw;Si6_-pO;H(aKP
zWF(oF;g#)LISDnBw+uQ&vp(4rvko~VV_Vw<a|78FJ9(X1R=OFq(p5WvIGq3=>X7dM
z-^_ff^Rzo=Cc7Ili)Kd5B3J>lC`P=jaWh;N!H$+a#|oCc$hUI`h;hH@T6RnV3YA^+
zPfIR64|b5dU_Hm)nf4??GL{#aXzeMmp#i}z{lL-aZlRo`w`T6sY2a3uQe<hgw&BWA
z+pzcP_2N&L1v;#a4L;CutT3l|?YNyiN=B<Cl;5uG8t-%u+nJ}_ehNvJ=ZPRI3TJ@~
z8fDgGv&Nh}<BJ8$UX9f2@$u=n!IpOsT|;C<z#?*WUXANsOs*xgV-v}yDR7M*g9Wr2
z)Kefe3|Utzo(D^kC(u!+4s4dlbW)xfE~(Ku_hr@D&6js(m~;wQ1}4qcZoq;flYn(l
z-?<6W0W`O*8UUZ{y5dmLKSbHaZmc~SvH*G%Ft_pL5N}q~On;)xGllR~twzscMTwJ;
zHC+CRW%o#m&#KDaR!Xt?TJ1b5I#?Px-8>nC&Ot5>Vpm&d%21AehF&o1&+U0y)zRI$
z+IvuN{OCU`^e{QzR&G4PC4Me=zH2x3m4Hn}fb}BktyXs*Ztu9V*VP1^$a4GOL^$}|
z+w~v;4~52VYk2P)KD7537f^kvz0Eo|nVIulJIvzQaA`2$+F;lTv@0rtN6q5TGlUj(
zvy`*zdLvq$w`BPgiK9o4#ywkMJJ5ImS=QtVSkjwIrB1~ITY`%(G~(d_K@81!z;JNM
z7fS}`M+h@SRIoL|t2FG=y`I*i+=J8A`$P-*t;{Sqi{|SIo-bMjYgT;y3QBHPuJk0k
zSecHsicjMjTxYcgtdT)dh&pn*RWLoIO2_+m7stnMjZs2$=L)Vh7l#weo_3^Nz{7D{
z(nm(qL~M|?QcMG+z0Tq!+aQc0Pp2%)PmmBVUzVQ2+XEV9jD~C5YewiReJ3#OP6FEn
zdEW+jP|;`<6cOS^Os{!d#DvC}BWn4oQ0SJengLw6!;FjvUmTKG=*Ht#?vtk`t1aUn
z_;-NQo|InwcM@}9Sk|hw&iTwLxm&4}_8AUpna-XAqD(bbGVYk-uk>A)jSbUXbO_#4
z_KsVGrVswnk$uw*`;a^K?+mrg_1duA*G_gel!K68jn(jfNJfRAWzj=(YO^<>KGwkR
z0uKJ~8;11_mnB#tByojF)p`4*lAX+bp0qL0z7f1B=548l3`RXb^P_De-=M3MyMV_H
zm%%#*N;5I;8&qO7_IpR6W|;|3vCisPZc3THbnHmlTfG+@bceZ(OULdD!(o?u+q;b$
za%Iqe+qIo$LFKLbS<p?gR{i?o$IjVP$k6g9RBrpB!7fU`b$CV_Io6l(weLOe_`ts#
z{%ws5%Ec5X*4TRBdQQKMeUjaFz$05X1K%XwX%9TYRda9y*~ad`c)Ztl+JsR^0Q1Kr
zDu2xHq1)dz+~A9d7X4mSFZ^{;e>N%?_h#eBZA7+`lWG_2C?}QdUFD<_eup{P^L@>?
zCFOm`Gxbk>{0FGipO{++X#^%PxdI{&Q)6XrWnWHVZDk??3j=tZy;k2(+b|G*pTz%g
zqdXL}ReMINw((;KO>EN`+5<w7>s(ul#EEQ2E&TO6+i~Kg4Iot3hc>a#-`#!p-MORb
zPCt9^MsRcl*Bm7#KUj{m@NuUf>jC~Og$AB6t)WCUFI28Uk~a{ttPE(b5G9nV;Hb5b
ziwT|Db)tLkd;oE-06Waq!NCz+F(Khslgk@;NpTK2d9lyd=LH&I+!V?$d~we(g@XlU
znYcH7>t77!<wQ2iiAe7P$`!juSP7XHD_sL&Doo;+2=1?YaMYdC#zf+3?0tQJK6=j9
z312dGSR=VYZ-u(FI~FU%alS@g83d!4)WV3O&htXCaw)i;^fyMH@~kLIzhIvrE&Pk!
zzbR8jh&IMrY+<hft(?im5id|7t!7#462OPuKlM#n7v0sq&DU9>jE_;wgZ6EIESX$j
z8VqUgKwGWC`zdJ5=3xV1rjXr-SCsXU=3zwY!;&ckih7vFIXQmBaO6zrvd{>{d{_gM
z)EjN7X}nbj@&>Kt>Ah(PeS^M=tJSDrn334LOGp>!at<djtBffmtQd_!MbjY^n@a8F
zL}f!}K9Ako@$t!Fs~Q5}mC{sDqS=+xYK9s36bYsi8hzs$rqk8}K%uFW+>nmbOvWC7
zGs!W7>+`Vg`&vI}YVC=}q$I2H0cFO*qCb*ojDkJG3~dMF+JwbUXfwte{l+0h5~h4l
zpC`;Hu~?vL7(0ClW4AxQ-^HYL%4UZa%`{Y&IVrN1JBR3REe$m2%tO1^=iZqS!2W(~
zV-bG4WWf|xYplwQ1B`7tFqAV*S4?W-F4k}~FO8=u`>c9=q>S6LzqI)NU|jrdI_qgI
za-1R;+E%9P`gzCUVBdA$amVclPTh?4mt~K7f0NZrZL$}m42S;Oz(;Vs5{56WGICb-
zE-45%!L<JOa>dH_#@tN1)7OJ-Kv%TLtNhvVF?6+WFtSBOuT#*|+1RN9ZJYMx|8z&k
z4e%es9#YKf^g{n3(zM6J);Y`4bUZ*t1GZ)Ux*zxT577~4#ajqz1fWDE10oYsV`Xk-
zUq@kWWp8$6av}l?0(hLYR84Q&FbusH=zrjl9FhPtwqd6N!M1i;&_jS=PS1gC)3#7s
z5+r3=_v=SlmOs)A!-m8Mo8lw=s3(e(<wc*{n+Yry5T__`zh*VcAE?Rs_M(qtfnCWB
zq!lv;6zW{++CV{!;3&bQ8c~4KGDTy!C?ZO_^j>doJpbu-0WP@V=6A4w4dVi~-F~jX
zl3@-tu{hgtZrC#pBrP;kB~Ly2*(l8|!V==fhy)%-NR)6}GerU4x9hvR2bPu?6|F?G
zX~rzun-^oT?!0?J#yqgcRw}q(Z-9x6zOnaDU2sTDih8dq_A(Q^nxDnZDL#QMIR?Ah
ztj;8o)#RNob5P{!C#DCI!D=Q9w_LX3t-V$z>Vet&5AWu^v~-x2l*&7t1)1~<hd(J|
zZpHVl9I)=shbH7z3K!~N>Fq8A>k9&Sbik{uZ`x6ey{9o>5~;1Pk>}xNxyx5FQD7DV
z37Z;s6X4Af3|4sn01}PtIV@4MDV;%wqERu8Kvn-)%bbXRVMzJPjgp2=G5<@Cww)Md
zK4FZFod0&7AN%9{kMbXLNSL)1aiOu^>lD1-t>Rsfs?~D|)W9Rn+RqinjBkjit_7|z
zV}||J2=M^P!CEQc$Y_{r8gQYjND<$+R`a4j{b|-LX`amc{)~^@rX^SjmODYm7pBwD
zPwAZt>8I6D&*t?T{IuKqTL@_c`3tTBA`nw!Wo~6(L}g-iXCeZ-1bCd?SKDseMi6}u
zkbjukevoWSk!;0?jjC;YtpU3+>;!!%3SmW#q=hMx*j-w7zP__uQoOBhj+7M910n95
znc2A=?rwM2`g{9k8+Lc$!9gE;=h%;iw9;7XPrHE6BQC-5n3NEr7zAQ0!PV|SIs(y$
zPy`N2$^BuI6xJQ&+c(B{Ax?lbMjD%gUASf3hr4Mo8}Q=d0LJ7+|JOcm*(1V)`))9i
zX6+9T2dZb5pbLM;e@xUjBx(9MNq~Y6M>CN3T9kv1&<iWbQzlVkYVG5LeK>qik51>q
zKC}-$)T??;C-4>eN|J$7uEs2kbvv!2eK<a<rvcrgRDnQh34G!~B)u1q=%J&~1+H*h
z4YH|%uqWb;?F`u%dxQ#`aews^kwuA~_-s>&1(pmo$AOEaP_UxcY*_7=yJfUlO(VT{
zMki7TN-$q?#e<}%SAvBj?#O0Yux<Lw3xd!r=zrh_=0(fDgf1hCI;3Q@QrXmK6hkU1
z+z%r~Pd%J0a|v**1r@DJp<NVL%b1V-Kq#|EK1e5B6Tyi2Lv&Lh$#$fkO!%d%OFc*h
z0DXb%F?~fpQJMbH%`y-uM>G*hMocwzZwVtxk#_<^Mr}p$%}zLJ;8#pl&bbT&i4Y8C
z4_MPRAX^U<Mfpj{Ns?eTz(uA+U#3Ob01@RYKJBDpt~NM91wno*MMK3+-r_hA{43f>
zWfptbHZdg?JAaf_a-^~i*8|Y9BvX1Mn4|a;o`AzVFUe|8LyQJZNWqvv7soCK2N0+t
z;a8@G{KlDC;5f!)o(svey3Q$BeSe=GhuUOB1Y^x?eWL@A%YB^WQ|L!Z1wKre)ZZ~F
zQ?{dg8a`E&vmuJ#Yw_#J$!R^~%{!01P(geLJ$SfC*G-?v7fG$wl-LUiRofx=EL}7z
zJ&8G64->AO5vV{@Wa*QTux>Xw7u}i<^5PykTRpt9a(FH}ToM7V6kw`U3{lgxHmM0V
z_f4sg40OBD%DycMpH-WJ-#UZZ1szO89ZulWU+@k-U0!ZwIO`Fn=?XUKX%n^1KD6lE
zqfar1bO4IYPIrf%M2ky(4kK@kHZ8^{Eqd8&ZxxXTF%oKbY=}`<kMXS%=1^nq4TkpT
z*JDGib!~qsb*)y=KUhuws8iBE%+lw(S)D)XN!D|o=de_4;YUi%faUUUBQnA$5zT<4
zMBbV+65o~D?Bu;+Zp)GT|Bc+H9g*Yw`3*6<*vs@x+7OL)wucKrm!Jao*jwK5kckD{
zdW9-GmPo_g@8F3E&iWq0^|=8$kq~4vIUU&!O?$SD=W1wd&-lbwxN-sMFGc(Fi2t?J
zZ!Q2&D5wA_aaU}{k)r%3OWMDbwVEHOIfy)g6>?L!RFo@ezoJm?(h4p}c)O5rGwe$w
zoh~-W)HLV!*H?djuI8PhlXUf2E$c?9obzj+juE=+)3_w`U$Wh&hNsd(?)SQRq`uKU
z^Kmo=kB_;ct06j%nOI*9=h*rUj+0-eGT(dGqLKT^ytdr=L;dO%yScdBY{Aa)8w%Da
z7mWL_F4(WoSiNEvmGzbE{xuW!Bc`jh{CKr~*7>@5&2asQ$y%~ljY_e8j@inejpN6E
z0)FTDTL@_c26_$xA_+}lX>K9{Z~=Intx`d5+b|Hk8}J_{QVwq52t|(pd?*Sx$RTcl
zq~~Hytt__Gk|3$3NzlJ{DcLP@H!mbOvpX|O)|<1g<)X&b74FH39<R^3N^gAZGDo!B
zS+Q~elj&g`rL+c_Jd#6*-f&6<-SfdpLeG&Ktv+|u<zf<8E`S<eBL|9%&PU`(l5Dnq
z!fqpl-kQ{Ok@<yZ`aS(*B*Vh+`yXsFR@r7(?vy3(3hQ#lH+U%f_s4=a!cTLDPvjg1
z9W(~cy>CGY&TDGjkCiroyH1<iUz6-pZ&l$4UTh%NmFtsIGtiudrJXfCQ>*^Q{3gc#
zbgK{V)oA2oM#eTq@i#Zy-Iwj|aV~!tLvTE><hLmJx8ZP_PmQ|{qtITxWe*=%(5cZi
zTAPBSXAPJV9T+6-$y*@^4P`o)7tN8-q;bEhb{=WeZ&4`F*Jy3j5%~CwYgB7g)im4?
dt>jhp?VqmxsCKTYUr*itG=)4#{snPD<w;Yl%5wk!

diff --git a/src/cache/data.rs b/src/cache/data.rs
deleted file mode 100644
index e2b204b2..00000000
--- a/src/cache/data.rs
+++ /dev/null
@@ -1,502 +0,0 @@
-// Copyright (C) 2023 Lily Lyons
-//
-// This file is part of Luminol.
-//
-// Luminol is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Luminol is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
-//
-//     Additional permission under GNU GPL version 3 section 7
-//
-// If you modify this Program, or any covered work, by linking or combining
-// it with Steamworks API by Valve Corporation, containing parts covered by
-// terms of the Steamworks API by Valve Corporation, the licensors of this
-// Program grant you additional permission to convey the resulting work.
-
-use crate::prelude::*;
-use core::ops::{Deref, DerefMut};
-
-#[derive(Default, Debug)]
-pub struct Cache {
-    state: AtomicRefCell<State>,
-}
-
-// Loaded is used 99% of the time. The size discrepancy is okay.
-#[allow(clippy::large_enum_variant)]
-#[derive(Default, Debug)]
-enum State {
-    #[default]
-    Unloaded,
-    Loaded {
-        actors: AtomicRefCell<rpg::Actors>,
-        animations: AtomicRefCell<rpg::Animations>,
-        armors: AtomicRefCell<rpg::Armors>,
-        classes: AtomicRefCell<rpg::Classes>,
-        common_events: AtomicRefCell<rpg::CommonEvents>,
-        enemies: AtomicRefCell<rpg::Enemies>,
-        items: AtomicRefCell<rpg::Items>,
-        mapinfos: AtomicRefCell<rpg::MapInfos>,
-        scripts: AtomicRefCell<Vec<rpg::Script>>,
-        skills: AtomicRefCell<rpg::Skills>,
-        states: AtomicRefCell<rpg::States>,
-        system: AtomicRefCell<rpg::System>,
-        tilesets: AtomicRefCell<rpg::Tilesets>,
-        troops: AtomicRefCell<rpg::Troops>,
-        weapons: AtomicRefCell<rpg::Weapons>,
-
-        maps: dashmap::DashMap<usize, rpg::Map>,
-    },
-}
-
-impl Cache {
-    /// Load all data required when opening a project.
-    /// Does not load config. That is expected to have been loaded beforehand.
-    pub fn load(&self) -> Result<(), String> {
-        let filesystem = &state!().filesystem;
-        let ext = self.rxdata_ext();
-
-        let mut scripts = None;
-        let scripts_paths = [
-            project_config!().scripts_path.clone(),
-            "xScripts".to_string(),
-            "Scripts".to_string(),
-        ];
-        for file in scripts_paths {
-            match filesystem.read_data(format!("Data/{file}.{ext}")) {
-                Ok(s) => {
-                    scripts = Some(s);
-                    project_config!().scripts_path = file;
-                    break;
-                }
-                Err(e) => {
-                    eprintln!("Error loading Data/{file}.{ext}: {e:#?}");
-                }
-            }
-        }
-        let Some(scripts) = scripts else {
-            return Err("Unable to load scripts, tried scripts file from config, then xScripts, then Scripts".to_string());
-        };
-
-        let actors = AtomicRefCell::new(
-            filesystem
-                .read_nil_padded(format!("Data/Actors.{ext}"))
-                .map_err(|e| format!("Failed to load Actors.{ext}: {e}"))?,
-        );
-        let animations = AtomicRefCell::new(
-            filesystem
-                .read_nil_padded(format!("Data/Animations.{ext}"))
-                .map_err(|e| format!("Failed to load Animations.{ext}: {e}"))?,
-        );
-        let armors = AtomicRefCell::new(
-            filesystem
-                .read_nil_padded(format!("Data/Armors.{ext}"))
-                .map_err(|e| format!("Failed to load Armors.{ext}: {e}"))?,
-        );
-        let classes = AtomicRefCell::new(
-            filesystem
-                .read_nil_padded(format!("Data/Classes.{ext}"))
-                .map_err(|e| format!("Failed to load Classes.{ext}: {e}"))?,
-        );
-        let common_events = AtomicRefCell::new(
-            filesystem
-                .read_nil_padded(format!("Data/CommonEvents.{ext}"))
-                .map_err(|e| format!("Failed to load CommonEvents.{ext}: {e}"))?,
-        );
-        let enemies = AtomicRefCell::new(
-            filesystem
-                .read_nil_padded(format!("Data/Enemies.{ext}"))
-                .map_err(|e| format!("Failed to load Enemies.{ext}: {e}"))?,
-        );
-        let items = AtomicRefCell::new(
-            filesystem
-                .read_nil_padded(format!("Data/Items.{ext}"))
-                .map_err(|e| format!("Failed to load Items.{ext}: {e}"))?,
-        );
-        let mapinfos = AtomicRefCell::new(
-            filesystem
-                .read_data(format!("Data/MapInfos.{ext}"))
-                .map_err(|e| format!("Failed to load MapInfos.{ext}: {e}"))?,
-        );
-        let skills = AtomicRefCell::new(
-            filesystem
-                .read_nil_padded(format!("Data/Skills.{ext}"))
-                .map_err(|e| format!("Failed to load Skills.{ext}: {e}"))?,
-        );
-        let states = AtomicRefCell::new(
-            filesystem
-                .read_nil_padded(format!("Data/States.{ext}"))
-                .map_err(|e| format!("Failed to load States.{ext}: {e}"))?,
-        );
-        let system = AtomicRefCell::new(
-            filesystem
-                .read_data(format!("Data/System.{ext}"))
-                .map_err(|e| format!("Failed to load System.{ext}: {e}"))?,
-        );
-        let tilesets = AtomicRefCell::new(
-            filesystem
-                .read_nil_padded(format!("Data/Tilesets.{ext}"))
-                .map_err(|e| format!("Failed to load Tilesets.{ext}: {e}"))?,
-        );
-        let troops = AtomicRefCell::new(
-            filesystem
-                .read_nil_padded(format!("Data/Troops.{ext}"))
-                .map_err(|e| format!("Failed to load Troops.{ext}: {e}"))?,
-        );
-        let weapons = AtomicRefCell::new(
-            filesystem
-                .read_nil_padded(format!("Data/Weapons.{ext}"))
-                .map_err(|e| format!("Failed to load Weapons.{ext}: {e}"))?,
-        );
-
-        *self.state.borrow_mut() = State::Loaded {
-            actors,
-            animations,
-            armors,
-            classes,
-            common_events,
-            enemies,
-            items,
-            mapinfos,
-            skills,
-            states,
-            system,
-            tilesets,
-            troops,
-            weapons,
-
-            maps: Default::default(),
-            scripts: AtomicRefCell::new(scripts),
-        };
-
-        Ok(())
-    }
-
-    pub fn rxdata_ext(&self) -> &'static str {
-        match project_config!().editor_ver {
-            config::RMVer::XP => "rxdata",
-            config::RMVer::VX => "rvdata",
-            config::RMVer::Ace => "rvdata2",
-        }
-    }
-
-    /// Save all cached data to disk.
-    /// Will flush the cache too.
-    pub fn save(&self) -> Result<(), String> {
-        config::Project::save()?;
-
-        let filesystem = &state!().filesystem;
-
-        let state = self.state.borrow();
-        let State::Loaded {
-            actors,
-            animations,
-            armors,
-            classes,
-            common_events,
-            enemies,
-            items,
-            mapinfos,
-            scripts,
-            skills,
-            states,
-            system,
-            tilesets,
-            troops,
-            weapons,
-            maps,
-        } = &*state
-        else {
-            return Err("Project not loaded".to_string());
-        };
-
-        let ext = self.rxdata_ext();
-
-        filesystem.save_nil_padded(format!("Data/Actors.{ext}"), &actors.borrow())?;
-        filesystem.save_nil_padded(format!("Data/Animations.{ext}"), &animations.borrow())?;
-        filesystem.save_nil_padded(format!("Data/Armors.{ext}"), &armors.borrow())?;
-        filesystem.save_nil_padded(format!("Data/Classes.{ext}"), &classes.borrow())?;
-        filesystem.save_nil_padded(format!("Data/CommonEvents.{ext}"), &common_events.borrow())?;
-        filesystem.save_nil_padded(format!("Data/Enemies.{ext}"), &enemies.borrow())?;
-        filesystem.save_nil_padded(format!("Data/Items.{ext}"), &items.borrow())?;
-        filesystem.save_data(format!("Data/MapInfos.{ext}"), &*mapinfos.borrow())?;
-        filesystem.save_nil_padded(format!("Data/Scripts.{ext}"), &scripts.borrow())?;
-        filesystem.save_nil_padded(format!("Data/Skills.{ext}"), &skills.borrow())?;
-        filesystem.save_nil_padded(format!("Data/States.{ext}"), &states.borrow())?;
-        filesystem.save_data(format!("Data/System.{ext}"), &*system.borrow())?;
-        filesystem.save_nil_padded(format!("Data/Tilesets.{ext}"), &tilesets.borrow())?;
-        filesystem.save_nil_padded(format!("Data/Troops.{ext}"), &troops.borrow())?;
-        filesystem.save_nil_padded(format!("Data/Weapons.{ext}"), &weapons.borrow())?;
-
-        for entry in maps.iter() {
-            filesystem.save_data(format!("Data/Map{:0>3}.{ext}", entry.key()), entry.value())?
-        }
-        maps.clear();
-
-        Ok(())
-    }
-
-    #[cfg(not(target_arch = "wasm32"))]
-    pub async fn create_project(&self, config: config::project::Config) -> Result<(), String> {
-        if let Some(path) = rfd::AsyncFileDialog::default().pick_folder().await {
-            let path = path.path().join(&config.project_name);
-            std::fs::create_dir(path).map_err(|e| e.to_string())?;
-
-            let command_db = config::CommandDB::new(config.editor_ver);
-
-            let mut game_ini = ini::Ini::new();
-            game_ini
-                .with_section(Some("Game"))
-                .set("Library", "RGSS104E.dll")
-                .set("Scripts", &config.scripts_path)
-                .set("Title", &config.project_name)
-                .set("RTP1", "")
-                .set("RTP2", "")
-                .set("RTP3", "");
-
-            *config::PROJECT.borrow_mut() = config::Project::Loaded {
-                command_db,
-                config,
-                game_ini,
-            };
-
-            self.setup_defaults();
-            self.save()?;
-        } else {
-            return Err("Cancelled picking a project directory".to_string());
-        }
-
-        Ok(())
-    }
-
-    #[cfg(target_arch = "wasm32")]
-    pub async fn create_project(&self, config: config::project::Config) -> Result<(), String> {
-        if !filesystem::web::FileSystem::filesystem_supported() {
-            return Err("Your browser does not support File System Access API".to_string());
-        }
-
-        if let Some(dir) = filesystem::web::FileSystem::from_directory_picker().await {
-            if let Some(idb_key) = dir.idb_key() {
-                filesystem::web::FileSystem::idb_drop(idb_key.to_string());
-            }
-
-            dir.create_dir(&config.project_name)
-                .map_err(|e| e.to_string())?;
-
-            // TODO: Save the project in here
-            let _subdir = dir
-                .subdir(&config.project_name)
-                .map_err(|e| e.to_string())?;
-
-            let command_db = config::CommandDB::new(config.editor_ver);
-
-            let mut game_ini = ini::Ini::new();
-            game_ini
-                .with_section(Some("Game"))
-                .set("Library", "RGSS104E.dll")
-                .set("Scripts", &config.scripts_path)
-                .set("Title", &config.project_name)
-                .set("RTP1", "")
-                .set("RTP2", "")
-                .set("RTP3", "");
-
-            *config::PROJECT.borrow_mut() = config::Project::Loaded {
-                command_db,
-                config,
-                game_ini,
-            };
-
-            self.setup_defaults();
-            self.save()?;
-        } else {
-            return Err("Cancelled picking a project directory".to_string());
-        }
-
-        Ok(())
-    }
-
-    /// Setup default values
-    // FIXME: Code jank
-    pub fn setup_defaults(&self) {
-        let mut mapinfos = rpg::MapInfos::new();
-        mapinfos.insert(
-            1,
-            rpg::MapInfo {
-                parent_id: 0,
-                name: "Map 001".to_string(),
-                order: 0,
-                expanded: false,
-                scroll_x: 0,
-                scroll_y: 0,
-            },
-        );
-        let mapinfos = mapinfos.into();
-
-        let maps = dashmap::DashMap::new();
-        maps.insert(
-            1,
-            rpg::Map {
-                tileset_id: 1,
-                width: 20,
-                height: 15,
-                data: rmxp_types::Table3::new(20, 15, 3),
-                ..Default::default()
-            },
-        );
-
-        let system = rpg::System {
-            magic_number: rand::random(),
-            ..Default::default()
-        }
-        .into();
-
-        let scripts = match project_config!().editor_ver {
-            config::RMVer::XP => alox_48::from_bytes(include_bytes!("Scripts.rxdata")).unwrap(),
-            config::RMVer::VX => todo!(),
-            config::RMVer::Ace => todo!(),
-        };
-        let scripts = AtomicRefCell::new(scripts);
-
-        *self.state.borrow_mut() = State::Loaded {
-            actors: AtomicRefCell::new(vec![rpg::Actor::default()]),
-            animations: AtomicRefCell::new(vec![rpg::Animation::default()]),
-            armors: AtomicRefCell::new(vec![rpg::Armor::default()]),
-            classes: AtomicRefCell::new(vec![rpg::Class::default()]),
-            common_events: AtomicRefCell::new(vec![rpg::CommonEvent::default()]),
-            enemies: AtomicRefCell::new(vec![rpg::Enemy::default()]),
-            items: AtomicRefCell::new(vec![rpg::Item::default()]),
-            skills: AtomicRefCell::new(vec![rpg::Skill::default()]),
-            states: AtomicRefCell::new(vec![rpg::State::default()]),
-            tilesets: AtomicRefCell::new(vec![rpg::Tileset::default()]),
-            troops: AtomicRefCell::new(vec![rpg::Troop::default()]),
-            weapons: AtomicRefCell::new(vec![rpg::Weapon::default()]),
-
-            mapinfos,
-            maps,
-            system,
-            scripts,
-        };
-    }
-}
-
-macro_rules! nested_ref_getter {
-    ($(
-        $typ:ty, $name:ident, $($enum_type:ident :: $variant:ident),+
-    );*) => {
-        $(
-            #[allow(unsafe_code, dead_code)]
-            pub fn $name<'a>(&'a self) -> impl core::ops::DerefMut<Target = $typ> + 'a {
-                struct _Ref<'b> {
-                    _this_ref: atomic_refcell::AtomicRef<'b, State>,
-                    _other_ref: atomic_refcell::AtomicRefMut<'b, $typ>,
-                }
-                impl<'b> core::ops::Deref for _Ref<'b> {
-                    type Target = $typ;
-
-                    fn deref(&self) -> &Self::Target {
-                        &self._other_ref
-                    }
-                }
-                impl<'b> core::ops::DerefMut for _Ref<'b> {
-                    fn deref_mut(&mut self) -> &mut Self::Target {
-                        &mut self._other_ref
-                    }
-                }
-
-                let _this_ref = self.state.borrow();
-                let _other_ref: atomic_refcell::AtomicRefMut<'a, $typ> = unsafe {
-                    // See Self::map for safety
-                    match &*(&*_this_ref as *const _) {
-                        $(
-                            $enum_type::$variant { $name, .. } => $name.borrow_mut(),
-                        )+
-                        _ => panic!("Project not loaded"),
-                    }
-                };
-
-                _Ref {
-                    _this_ref,
-                    _other_ref,
-                }
-            }
-        )+
-    };
-
-}
-
-impl Cache {
-    nested_ref_getter! {
-        rpg::Actors, actors, State::Loaded;
-        rpg::Animations, animations, State::Loaded;
-        rpg::Armors, armors, State::Loaded;
-        rpg::Classes, classes, State::Loaded;
-        rpg::CommonEvents, common_events, State::Loaded;
-        rpg::Enemies, enemies, State::Loaded;
-        rpg::Items, items, State::Loaded;
-        rpg::MapInfos, mapinfos, State::Loaded;
-        Vec<rpg::Script>, scripts, State::Loaded;
-        rpg::Skills, skills, State::Loaded;
-        rpg::States, states, State::Loaded;
-        rpg::System, system, State::Loaded;
-        rpg::Tilesets, tilesets, State::Loaded;
-        rpg::Troops, troops, State::Loaded;
-        rpg::Weapons, weapons, State::Loaded
-    }
-
-    /// Load a map.
-    #[allow(unsafe_code)]
-    #[allow(clippy::panic)]
-    pub fn map<'a>(&'a self, id: usize) -> impl DerefMut<Target = rpg::Map> + 'a {
-        struct Ref<'b> {
-            _state: atomic_refcell::AtomicRef<'b, State>,
-            map_ref: dashmap::mapref::one::RefMut<'b, usize, rpg::Map>,
-        }
-        impl<'b> Deref for Ref<'b> {
-            type Target = rpg::Map;
-
-            fn deref(&self) -> &Self::Target {
-                &self.map_ref
-            }
-        }
-        impl<'b> DerefMut for Ref<'b> {
-            fn deref_mut(&mut self) -> &mut Self::Target {
-                &mut self.map_ref
-            }
-        }
-
-        let state = self.state.borrow();
-        let State::Loaded { ref maps, .. } = &*state else {
-            panic!("project not loaded")
-        };
-        //? # SAFETY
-        // For starters, this has been tested against miri. Miri is okay with it.
-        // Ref is self referential- map_ref borrows from _state. We need to store _state so it gets dropped at the same time as map_ref.
-        // If it didn't, map_ref would invalidate the refcell. We could unload the project, changing State while map_ref is live. Storing _state prevents this.
-        // Because the rust borrow checker isn't smart enough for this, we need to create an unbounded reference to maps to get a map out. We're not actually using this reference
-        // for any longer than it would be valid for (notice the fact that we assign map_ref a lifetime of 'a, which is the lifetime it should have anyway) so this is okay.
-        let map_ref: dashmap::mapref::one::RefMut<'a, _, _> = unsafe {
-            let unsafe_maps_ref: &dashmap::DashMap<usize, rpg::Map> = &*(maps as *const _);
-            unsafe_maps_ref
-                .entry(id)
-                .or_try_insert_with(|| {
-                    state!()
-                        .filesystem
-                        .read_data(format!("Data/Map{id:0>3}.{}", self.rxdata_ext()))
-                })
-                .expect("failed to load map") // FIXME
-        };
-
-        Ref {
-            _state: state,
-            map_ref,
-        }
-    }
-}
diff --git a/src/components/command_view/command_ui.rs b/src/components/command_view/command_ui.rs
deleted file mode 100644
index fc4811a4..00000000
--- a/src/components/command_view/command_ui.rs
+++ /dev/null
@@ -1,278 +0,0 @@
-// Copyright (C) 2023 Lily Lyons
-//
-// This file is part of Luminol.
-//
-// Luminol is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Luminol is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
-//
-//     Additional permission under GNU GPL version 3 section 7
-//
-// If you modify this Program, or any covered work, by linking or combining
-// it with Steamworks API by Valve Corporation, containing parts covered by
-// terms of the Steamworks API by Valve Corporation, the licensors of this
-// Program grant you additional permission to convey the resulting work.
-
-use super::WindowState;
-use crate::prelude::*;
-
-use command_lib::{CommandKind, Parameter, ParameterKind};
-
-impl CommandView {
-    pub fn command_ui<'i, I>(
-        &mut self,
-        ui: &mut egui::Ui,
-        db: &config::CommandDB,
-        (index, command): (usize, &'i mut rpg::EventCommand),
-        iter: &mut std::iter::Peekable<I>,
-    ) where
-        I: Iterator<Item = (usize, &'i mut rpg::EventCommand)>,
-    {
-        let desc = match db.get(command.code as _) {
-            Some(desc) => desc,
-            None if command.code == 0 => {
-                if ui
-                    .selectable_value(&mut self.selected_index, index, "#> Insert")
-                    .double_clicked()
-                {
-                    self.window_state = WindowState::Insert { index, tab: 0 };
-                }
-
-                return;
-            }
-            None => {
-                ui.selectable_value(
-                    &mut self.selected_index,
-                    index,
-                    error!(format!("Unrecognized command {} 🔥", command.code)),
-                );
-                ui.horizontal(|ui| {
-                    ui.monospace(error!(
-                        "You may want to add this command to the database if it is custom"
-                    ));
-                    ui.hyperlink_to(
-                        "or file an issue.",
-                        "https://github.com/Astrabit-ST/Luminol/issues",
-                    )
-                });
-
-                #[cfg(debug_assertions)]
-                {
-                    ui.label("Parameters:");
-                    ui.label(format!("{:#?}", command.parameters));
-                }
-
-                return;
-            }
-        };
-
-        let label = match desc.kind {
-            CommandKind::Branch { ref parameters, .. } | CommandKind::Single(ref parameters) => {
-                let mut str = format!("[{}] {}:", desc.code, desc.name);
-
-                for parameter in parameters.iter() {
-                    parameter_label(&mut str, parameter, command).expect("failed to format");
-                }
-
-                Some(str)
-            }
-            CommandKind::Multi { .. } => None,
-        };
-
-        let response = match desc.kind {
-            CommandKind::Branch { end_code, .. } => {
-                let header = egui::collapsing_header::CollapsingState::load_with_default_open(
-                    ui.ctx(),
-                    egui::Id::new(command.guid),
-                    true,
-                );
-                let open = header.is_open();
-
-                let response = header
-                    .show_header(ui, |ui| {
-                        ui.selectable_value(
-                            &mut self.selected_index,
-                            index,
-                            color_text!(label.unwrap(), Color32::BLUE),
-                        )
-                    })
-                    .body(|ui| {
-                        while let Some((index, command)) = iter.next() {
-                            if command.code == end_code {
-                                break;
-                            }
-
-                            self.command_ui(ui, db, (index, command), iter);
-                        }
-                    });
-
-                if !open {
-                    for (_, command) in iter.by_ref() {
-                        if command.code == end_code {
-                            break;
-                        }
-                    }
-                }
-
-                ui.label(color_text!("End Branch", Color32::BLUE));
-
-                response.1.inner
-            }
-            CommandKind::Multi { code, highlight } => {
-                let mut str = get_or_resize!(command.parameters, 0).into_string().clone();
-
-                loop {
-                    match iter.peek_mut() {
-                        Some((_, command)) if command.code == code => {
-                            match command.parameters.get_mut(0) {
-                                Some(p) => {
-                                    str += "\n";
-                                    str += p.into_string();
-                                }
-                                None => break,
-                            }
-
-                            iter.next();
-                        }
-                        _ => break,
-                    }
-                }
-
-                ui.horizontal(|ui| {
-                    ui.label(color_text!(
-                        format!("[{}] {}:", desc.code, desc.name),
-                        Color32::YELLOW
-                    ));
-                    if highlight {
-                        let theme = global_config!().theme;
-
-                        ui.selectable_value(
-                            &mut self.selected_index,
-                            index,
-                            syntax_highlighting::highlight(ui.ctx(), theme, &str, "rb"),
-                        )
-                    } else {
-                        ui.selectable_value(&mut self.selected_index, index, str)
-                    }
-                })
-                .inner
-            }
-            CommandKind::Single(_) => {
-                //
-                ui.selectable_value(&mut self.selected_index, index, label.unwrap())
-            }
-        };
-
-        let response = response.context_menu(|ui| {
-            if ui.button("Insert above").clicked() {
-                self.window_state = WindowState::Insert {
-                    index: index.saturating_sub(1),
-                    tab: 0,
-                };
-            }
-            if ui.button("Delete").clicked() {}
-            if ui.button("Insert below").clicked() {
-                self.window_state = WindowState::Insert {
-                    index: index + 1,
-                    tab: 0,
-                };
-            }
-        });
-
-        if response.double_clicked()
-            && match desc.kind {
-                CommandKind::Multi { .. } => true,
-                CommandKind::Branch { ref parameters, .. }
-                | CommandKind::Single(ref parameters) => !parameters.is_empty(),
-            }
-        {
-            self.window_state = WindowState::Edit { index };
-        }
-    }
-}
-
-fn parameter_label(
-    string: &mut String,
-    parameter: &Parameter,
-    command: &mut rpg::EventCommand,
-) -> std::fmt::Result {
-    use std::fmt::Write;
-
-    match parameter {
-        Parameter::Group { parameters, .. } => parameters
-            .iter()
-            .try_for_each(|p| parameter_label(string, p, command)),
-        Parameter::Selection {
-            parameters, index, ..
-        } => {
-            let Some((_, parameter)) = parameters.iter().find(|(i, _)| {
-                *i as i32
-                    == match command.parameters.get_mut(index.as_usize()) {
-                        Some(i) => *i.into_integer(),
-                        None => return false,
-                    }
-            }) else {
-                return write!(string, " invalid selection");
-            };
-            parameter_label(string, parameter, command)
-        }
-        Parameter::Single { kind, index, .. } => {
-            let Some(value) = command.parameters.get_mut(index.as_usize()) else {
-                return write!(string, " missing value");
-            };
-            match kind {
-                ParameterKind::Int => {
-                    write!(string, " {}", value.into_integer())
-                }
-                ParameterKind::Switch => {
-                    let id = *value.into_integer() as usize;
-                    let system = state!().data_cache.system();
-                    let switch = system
-                        .variables
-                        .get(id)
-                        .map(String::as_str)
-                        .unwrap_or(" invalid switch");
-                    write!(string, " [{id}: {switch}]")
-                }
-                ParameterKind::Variable => {
-                    let id = *value.into_integer() as usize;
-                    let system = state!().data_cache.system();
-                    let variable = system
-                        .variables
-                        .get(id)
-                        .map(String::as_str)
-                        .unwrap_or(" invalid variable");
-                    write!(string, " [{id}: {variable}]")
-                }
-                ParameterKind::Enum { variants } => {
-                    let value = variants
-                        .iter()
-                        .find(|(_, i)| *i as i32 == *value.into_integer())
-                        .map(|(s, _)| s.as_str())
-                        .unwrap_or("Invalid value");
-                    write!(string, " {}", value)
-                }
-                ParameterKind::SelfSwitch => {
-                    write!(string, " {}", value.into_string())
-                }
-                ParameterKind::IntBool => {
-                    write!(string, " {}", value.truthy())
-                }
-                ParameterKind::String => {
-                    write!(string, " {}", value.into_string())
-                }
-            }
-        }
-        Parameter::Label(s) => write!(string, " {s}"),
-        Parameter::Dummy => Ok(()),
-    }
-}
diff --git a/src/components/command_view/parameter_ui.rs b/src/components/command_view/parameter_ui.rs
deleted file mode 100644
index 7713d6b7..00000000
--- a/src/components/command_view/parameter_ui.rs
+++ /dev/null
@@ -1,146 +0,0 @@
-// Copyright (C) 2023 Lily Lyons
-//
-// This file is part of Luminol.
-//
-// Luminol is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Luminol is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
-//
-//     Additional permission under GNU GPL version 3 section 7
-//
-// If you modify this Program, or any covered work, by linking or combining
-// it with Steamworks API by Valve Corporation, containing parts covered by
-// terms of the Steamworks API by Valve Corporation, the licensors of this
-// Program grant you additional permission to convey the resulting work.
-
-use crate::prelude::*;
-
-use command_lib::{Parameter, ParameterKind};
-
-impl CommandView {
-    #[allow(clippy::only_used_in_recursion)]
-    pub fn parameter_ui(
-        &mut self,
-        ui: &mut egui::Ui,
-        parameter: &Parameter,
-        command: &mut rpg::EventCommand,
-    ) {
-        match parameter {
-            Parameter::Selection {
-                index, parameters, ..
-            } => {
-                if !parameters.iter().map(|(i, _)| *i).any(|v| {
-                    v as i32 == *get_or_resize!(command.parameters, index.as_usize()).into_integer()
-                }) {
-                    ui.label(error!("Your definition of this command is likely incomplete. This selection has an out of bounds value 🔥"));
-                    return;
-                }
-                for (value, parameter) in parameters.iter() {
-                    ui.horizontal(|ui| {
-                        let selection =
-                            get_or_resize!(command.parameters, index.as_usize()).into_integer();
-                        ui.radio_value(selection, *value as _, "");
-                        ui.add_enabled_ui(*value as i32 == *selection, |ui| {
-                            self.parameter_ui(ui, parameter, command);
-                        });
-                    });
-                }
-            }
-            Parameter::Group { parameters, .. } => {
-                ui.group(|ui| {
-                    for parameter in parameters.iter() {
-                        self.parameter_ui(ui, parameter, command);
-                    }
-                });
-            }
-            Parameter::Dummy => {}
-            Parameter::Label(l) => {
-                ui.label(l);
-            }
-
-            Parameter::Single {
-                index, kind, guid, .. // TODO: Display description and name
-            } => {
-                if !ui.is_enabled() {
-                    match kind {
-                        ParameterKind::Int => {
-                            ui.add(egui::DragValue::new(&mut 0));
-                        }
-                        ParameterKind::String => {
-                            ui.text_edit_singleline(&mut "");
-                        }
-                        _ => {
-                            let _ = ui.button("Disabled");
-                        }
-                    }
-                    return;
-                }
-
-                let value = get_or_resize!(command.parameters, index.as_usize());
-                match kind {
-                    ParameterKind::Int => {
-                        ui.add(egui::DragValue::new(value.into_integer()));
-                    }
-                    ParameterKind::IntBool => {
-                        let mut bool = value.truthy();
-                        ui.checkbox(&mut bool, "");
-                        *value.into_integer() = bool as _;
-                    }
-                    ParameterKind::Enum { variants } => {
-                        let value = value.into_integer();
-                        ui.menu_button(
-                            format!(
-                                "{} ⏷",
-                                variants
-                                    .iter()
-                                    .find(|(_, i)| *i == *value as i8)
-                                    .map(|(s, _)| s.as_str())
-                                    .unwrap_or("Invalid value")
-                            ),
-                            |ui| {
-                                for (name, variant) in variants.iter() {
-                                    ui.selectable_value(value, *variant as _, name);
-                                }
-                            },
-                        );
-                    }
-
-                    ParameterKind::SelfSwitch => {
-                        let value = value.into_string_with("A".to_string()); // we convert the value into
-                        ui.menu_button(format!("Self Switch {value} ⏷"), |ui| {
-                            ui.selectable_value(value, "A".to_string(), "A");
-                            ui.selectable_value(value, "B".to_string(), "B");
-                            ui.selectable_value(value, "C".to_string(), "C");
-                            ui.selectable_value(value, "D".to_string(), "D");
-                        });
-                    }
-                    ParameterKind::Switch => {
-                        let mut data = *value.into_integer_with(1) as usize;
-                        let state = self.modals.entry(*guid).or_insert(false);
-                        switch::Modal::new(self.id.with(guid)).button(ui, state, &mut data);
-                        *value.into_integer() = data as i32;
-                    }
-                    ParameterKind::Variable => {
-                        let mut data = *value.into_integer_with(1) as usize;
-                        let state = self.modals.entry(*guid).or_insert(false);
-                        variable::Modal::new(self.id.with(guid)).button(ui, state, &mut data);
-                        *value.into_integer() = data as i32;
-                    }
-
-                    ParameterKind::String => {
-                        ui.text_edit_singleline(value.into_string());
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/src/components/command_view/ui.rs b/src/components/command_view/ui.rs
deleted file mode 100644
index 55196221..00000000
--- a/src/components/command_view/ui.rs
+++ /dev/null
@@ -1,241 +0,0 @@
-// Copyright (C) 2023 Lily Lyons
-//
-// This file is part of Luminol.
-//
-// Luminol is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Luminol is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
-//
-//     Additional permission under GNU GPL version 3 section 7
-//
-// If you modify this Program, or any covered work, by linking or combining
-// it with Steamworks API by Valve Corporation, containing parts covered by
-// terms of the Steamworks API by Valve Corporation, the licensors of this
-// Program grant you additional permission to convey the resulting work.
-
-use super::WindowState;
-use crate::prelude::*;
-
-use command_lib::CommandKind;
-use itertools::Itertools;
-
-impl CommandView {
-    #[allow(clippy::ptr_arg)]
-    pub fn ui(
-        &mut self,
-        ui: &mut egui::Ui,
-        db: &config::CommandDB,
-        commands: &mut Vec<rpg::EventCommand>,
-    ) {
-        ui.style_mut().override_text_style = Some(egui::TextStyle::Monospace);
-        let mut iter = commands.iter_mut().enumerate().peekable();
-        while let Some(i) = iter.next() {
-            self.command_ui(ui, db, i, &mut iter);
-        }
-
-        ui.input(|i| {
-            if i.key_pressed(egui::Key::ArrowUp) {
-                self.selected_index = self.selected_index.saturating_sub(1);
-            }
-
-            if i.key_pressed(egui::Key::ArrowDown) {
-                self.selected_index = (self.selected_index + 1).min(commands.len() - 1);
-            }
-
-            if i.key_pressed(egui::Key::Enter) {
-                let index = self.selected_index;
-                match commands[index].code {
-                    0 => self.window_state = WindowState::Insert { index, tab: 0 },
-                    _ => self.window_state = WindowState::Edit { index },
-                }
-            }
-        });
-
-        let mut open = true;
-        match self.window_state {
-            WindowState::Edit { index } => {
-                egui::Window::new(format!("Editing a command at {index}"))
-                    .open(&mut open)
-                    .id(self.id.with("window"))
-                    .show(ui.ctx(), |ui| {
-                        let Some(command) = commands.get_mut(index) else {
-                            self.window_state = WindowState::None;
-                            eprintln!("editing command does not exist");
-                            return;
-                        };
-                        let desc = db.get(command.code).expect(
-                            "the user is editing a command that is invalid. this should not happen",
-                        );
-
-                        ui.monospace(&desc.name);
-                        if !desc.description.is_empty() {
-                            ui.monospace(&desc.description);
-                        }
-                        ui.separator();
-
-                        match desc.kind {
-                            CommandKind::Branch { ref parameters, .. }
-                            | CommandKind::Single(ref parameters) => {
-                                for parameter in parameters {
-                                    self.parameter_ui(ui, parameter, command)
-                                }
-                            }
-                            CommandKind::Multi { code, highlight } => {
-                                let mut str = String::new();
-                                let indent = command.indent;
-
-                                for command in &mut commands[index..] {
-                                    if command.code != code && command.code != desc.code {
-                                        break;
-                                    }
-
-                                    str += command.parameters[0].into_string();
-                                    str += "\n";
-                                }
-
-                                let mut text_edit = egui::TextEdit::multiline(&mut str)
-                                    .code_editor()
-                                    .desired_width(f32::INFINITY);
-                                let mut layouter =
-                                    |ui: &egui::Ui, string: &str, wrap_width: f32| {
-                                        let theme = global_config!().theme;
-                                        let mut layout_job = syntax_highlighting::highlight(
-                                            ui.ctx(),
-                                            theme,
-                                            string,
-                                            "rb",
-                                        );
-                                        layout_job.wrap.max_width = wrap_width;
-                                        ui.fonts(|f| f.layout_job(layout_job))
-                                    };
-
-                                if highlight {
-                                    text_edit = text_edit.layouter(&mut layouter);
-                                }
-
-                                if ui.add(text_edit).changed() {
-                                    let mut index = index;
-                                    let mut command_code = commands[index].code;
-
-                                    for s in str.lines() {
-                                        if command_code == code || command_code == desc.code {
-                                            *get_or_resize!(commands[index].parameters, 0)
-                                                .into_string() = s.to_string();
-                                        } else {
-                                            commands.insert(
-                                                index,
-                                                rpg::EventCommand {
-                                                    code,
-                                                    indent,
-                                                    parameters: vec![s.into()],
-                                                    guid: rand::random(),
-                                                },
-                                            )
-                                        }
-                                        index += 1;
-                                        command_code = commands[index].code;
-                                    }
-
-                                    if command_code == code {
-                                        let mut range = index..index;
-                                        while commands
-                                            .get(range.end)
-                                            .is_some_and(|c| c.code == code)
-                                        {
-                                            range.end += 1;
-                                        }
-                                        commands.drain(range);
-                                    }
-                                }
-                            }
-                        }
-                    });
-            }
-            WindowState::Insert { index, mut tab } => {
-                egui::Window::new(format!("Inserting a command at index {index}"))
-                    .open(&mut open)
-                    .id(self.id.with("window"))
-                    .show(ui.ctx(), |ui| {
-                        ui.horizontal(|ui| {
-                            for i in 0..=(db.len() / 32) {
-                                ui.selectable_value(&mut tab, i, i.to_string());
-                                ui.separator();
-                            }
-                            self.window_state = WindowState::Insert { index, tab };
-                        });
-                        ui.separator();
-
-                        let iter = db
-                            .iter()
-                            .enumerate()
-                            .filter(|(i, _)| ((tab * 32)..((tab + 1) * 32)).contains(i))
-                            .chunks(16);
-
-                        for chunk in iter.into_iter() {
-                            ui.horizontal(|ui| {
-                                ui.vertical(|ui| {
-                                    for (_, desc) in chunk {
-                                        let mut response = ui.button(&desc.name);
-                                        if !desc.description.is_empty() {
-                                            response =
-                                                response.on_disabled_hover_text(&desc.description);
-                                        }
-                                        if response.clicked() {
-                                            let indent = commands[index].indent;
-                                            commands.insert(
-                                                index,
-                                                rpg::EventCommand {
-                                                    code: desc.code,
-                                                    indent,
-                                                    parameters: vec![],
-                                                    guid: rand::random(),
-                                                },
-                                            );
-                                            if let CommandKind::Branch { end_code, .. } = desc.kind
-                                            {
-                                                commands.insert(
-                                                    index + 1,
-                                                    rpg::EventCommand {
-                                                        code: 0,
-                                                        indent: indent + 1,
-                                                        parameters: vec![],
-                                                        guid: rand::random(),
-                                                    },
-                                                );
-                                                commands.insert(
-                                                    index + 2,
-                                                    rpg::EventCommand {
-                                                        code: end_code,
-                                                        indent,
-                                                        parameters: vec![],
-                                                        guid: rand::random(),
-                                                    },
-                                                );
-                                            }
-
-                                            self.window_state = WindowState::Edit { index };
-                                        }
-                                    }
-                                });
-
-                                ui.separator()
-                            });
-                        }
-                    });
-            }
-            WindowState::None => {}
-        }
-        if !open {
-            self.window_state = WindowState::None;
-        }
-    }
-}
diff --git a/src/components/top_bar.rs b/src/components/top_bar.rs
deleted file mode 100644
index 7bedfdd4..00000000
--- a/src/components/top_bar.rs
+++ /dev/null
@@ -1,256 +0,0 @@
-// Copyright (C) 2023 Lily Lyons
-//
-// This file is part of Luminol.
-//
-// Luminol is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Luminol is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
-//
-//     Additional permission under GNU GPL version 3 section 7
-//
-// If you modify this Program, or any covered work, by linking or combining
-// it with Steamworks API by Valve Corporation, containing parts covered by
-// terms of the Steamworks API by Valve Corporation, the licensors of this
-// Program grant you additional permission to convey the resulting work.
-
-use crate::prelude::*;
-
-use crate::Pencil;
-
-/// The top bar for managing the project.
-#[derive(Default)]
-pub struct TopBar {
-    open_project_promise: Option<Promise<Result<(), String>>>,
-
-    fullscreen: bool,
-}
-
-impl TopBar {
-    /// Display the top bar.
-    #[allow(unused_variables)]
-    pub fn ui(&mut self, ui: &mut egui::Ui, frame: &mut crate::luminol::CustomFrame<'_>) {
-        let state = state!();
-        egui::widgets::global_dark_light_mode_switch(ui);
-
-        #[cfg(not(target_arch = "wasm32"))]
-        {
-            ui.checkbox(&mut self.fullscreen, "Fullscreen");
-            frame.set_fullscreen(self.fullscreen);
-        }
-
-        let mut open_project = ui.input(|i| i.modifiers.command && i.key_pressed(egui::Key::O))
-            && state.filesystem.project_loaded();
-        let mut save_project = ui.input(|i| i.modifiers.command && i.key_pressed(egui::Key::S))
-            && state.filesystem.project_loaded();
-        if ui.input(|i| i.modifiers.command && i.key_pressed(egui::Key::N)) {
-            state.windows.add_window(new_project::Window::default());
-        }
-
-        ui.separator();
-
-        ui.menu_button("File", |ui| {
-            ui.label(if let Some(path) = state.filesystem.project_path() {
-                format!("Current project:\n{}", path)
-            } else {
-                "No project open".to_string()
-            });
-
-            if ui.button("New Project").clicked() {
-                state.windows.add_window(new_project::Window::default());
-            }
-
-            open_project |= ui.button("Open Project").clicked();
-
-            ui.separator();
-
-            ui.add_enabled_ui(state.filesystem.project_loaded(), |ui| {
-                if ui.button("Project Config").clicked() {
-                    state.windows.add_window(config_window::Window {});
-                }
-
-                if ui.button("Close Project").clicked() {
-                    state.windows.clean_windows();
-                    state.tabs.clean_tabs(|t| !t.requires_filesystem());
-                    state.audio.clear_sinks(); // audio loads files borrows from the filesystem. unloading while they are playing is a crash
-                    state.filesystem.unload_project();
-                }
-
-                save_project |= ui.button("Save Project").clicked();
-            });
-
-            ui.separator();
-
-            ui.add_enabled_ui(state.filesystem.project_loaded(), |ui| {
-                if ui.button("Command Maker").clicked() {
-                    state
-                        .windows
-                        .add_window(crate::command_gen::CommandGeneratorWindow::default());
-                }
-            });
-
-            #[cfg(not(target_arch = "wasm32"))]
-            {
-                ui.separator();
-
-                if ui.button("Quit").clicked() {
-                    frame.close();
-                }
-            }
-        });
-
-        ui.separator();
-
-        ui.menu_button("Edit", |ui| {
-            //
-            if ui.button("Preferences").clicked() {
-                state
-                    .windows
-                    .add_window(global_config_window::Window::default())
-            }
-
-            if ui.button("Appearance").clicked() {
-                state.windows.add_window(appearance::Window::default())
-            }
-        });
-
-        ui.separator();
-
-        ui.menu_button("Data", |ui| {
-            ui.add_enabled_ui(state.filesystem.project_loaded(), |ui| {
-                if ui.button("Maps").clicked() {
-                    state.windows.add_window(map_picker::Window::default());
-                }
-
-                if ui.button("Items").clicked() {
-                    state.windows.add_window(items::Window::default());
-                }
-
-                if ui.button("Common Events").clicked() {
-                    state
-                        .windows
-                        .add_window(common_event_edit::Window::default());
-                }
-
-                if ui.button("Scripts").clicked() {
-                    state.windows.add_window(script_edit::Window::default());
-                }
-
-                if ui.button("Sound Test").clicked() {
-                    state.windows.add_window(sound_test::Window::default());
-                }
-            });
-        });
-
-        ui.separator();
-
-        ui.menu_button("Help", |ui| {
-            ui.button("Contents").clicked();
-
-            if ui.button("About...").clicked() {
-                state.windows.add_window(about::Window::default());
-            };
-        });
-
-        ui.menu_button("Debug", |ui| {
-            if ui.button("Egui Inspection").clicked() {
-                state.windows.add_window(misc::EguiInspection::default());
-            }
-
-            if ui.button("Egui Memory").clicked() {
-                state.windows.add_window(misc::EguiMemory::default());
-            }
-
-            let mut debug_on_hover = ui.ctx().debug_on_hover();
-            ui.toggle_value(&mut debug_on_hover, "Debug on hover");
-            ui.ctx().set_debug_on_hover(debug_on_hover);
-
-            ui.separator();
-
-            if ui.button("Filesystem Debug").clicked() {
-                state.windows.add_window(misc::FilesystemDebug::default());
-            }
-        });
-
-        #[cfg(not(target_arch = "wasm32"))]
-        {
-            ui.separator();
-
-            ui.add_enabled_ui(state.filesystem.project_loaded(), |ui| {
-                if ui.button("Playtest").clicked() {
-                    let mut cmd = luminol_term::CommandBuilder::new("steamshim");
-                    cmd.cwd(state.filesystem.project_path().expect("project not loaded"));
-
-                    let result = crate::windows::console::Console::new(cmd).or_else(|_| {
-                        let mut cmd = luminol_term::CommandBuilder::new("game");
-                        cmd.cwd(state.filesystem.project_path().expect("project not loaded"));
-
-                        crate::windows::console::Console::new(cmd)
-                    });
-
-                    match result {
-                        Ok(w) => state.windows.add_window(w),
-                        Err(e) => state.toasts.error(format!(
-                            "error starting game (tried steamshim.exe and then game.exe): {e}"
-                        )),
-                    }
-                }
-
-                if ui.button("Terminal").clicked() {
-                    #[cfg(windows)]
-                    let shell = "powershell";
-                    #[cfg(unix)]
-                    let shell = std::env::var("SHELL").unwrap_or_else(|_| "bash".to_string());
-                    let mut cmd = luminol_term::CommandBuilder::new(shell);
-                    cmd.cwd(state.filesystem.project_path().expect("project not loaded"));
-
-                    match crate::windows::console::Console::new(cmd) {
-                        Ok(w) => state.windows.add_window(w),
-                        Err(e) => state.toasts.error(format!("error starting shell: {e}")),
-                    }
-                }
-            });
-        }
-
-        ui.separator();
-
-        ui.label("Brush:");
-
-        let mut toolbar = state.toolbar.borrow_mut();
-        for brush in Pencil::iter() {
-            ui.selectable_value(&mut toolbar.pencil, brush, brush.to_string());
-        }
-
-        if open_project {
-            self.open_project_promise = Some(Promise::spawn_local(
-                state.filesystem.spawn_project_file_picker(),
-            ));
-        }
-
-        if save_project {
-            state.toasts.info("Saving project...");
-            match state.data_cache.save() {
-                Ok(_) => state.toasts.info("Saved project sucessfully!"),
-                Err(e) => state.toasts.error(e),
-            }
-        }
-
-        if self.open_project_promise.is_some() {
-            if let Some(r) = self.open_project_promise.as_ref().unwrap().ready() {
-                match r {
-                    Ok(_) => state.toasts.info("Opened project successfully!"),
-                    Err(e) => state.toasts.error(e),
-                }
-                self.open_project_promise = None;
-            }
-        }
-    }
-}
diff --git a/src/config/mod.rs b/src/config/mod.rs
deleted file mode 100644
index 436d27d9..00000000
--- a/src/config/mod.rs
+++ /dev/null
@@ -1,248 +0,0 @@
-// Copyright (C) 2023 Lily Lyons
-//
-// This file is part of Luminol.
-//
-// Luminol is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Luminol is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
-use crate::prelude::*;
-
-mod command_db;
-pub mod global;
-pub mod project;
-
-pub use command_db::CommandDB;
-pub use global::Config;
-
-#[derive(Default, Debug, Clone)]
-#[allow(clippy::large_enum_variant)]
-pub enum Project {
-    #[default]
-    Unloaded,
-    Loaded {
-        config: project::Config,
-        command_db: CommandDB,
-        game_ini: ini::Ini,
-    },
-}
-
-impl Project {
-    pub fn load() -> Result<(), String> {
-        let filesystem = &state!().filesystem;
-
-        if !filesystem.exists(".luminol").map_err(|e| e.to_string())? {
-            filesystem
-                .create_dir(".luminol")
-                .map_err(|e| e.to_string())?;
-        }
-
-        let config = match filesystem
-            .read_to_string(".luminol/config")
-            .ok()
-            .and_then(|s| ron::from_str(&s).ok())
-        {
-            Some(c) => c,
-            None => {
-                let Some(editor_ver) = filesystem.detect_rm_ver() else {
-                    return Err("Unable to detect RPG Maker version".to_string());
-                };
-                let config = project::Config {
-                    editor_ver,
-                    ..Default::default()
-                };
-                filesystem
-                    .write(".luminol/config", ron::to_string(&config).unwrap())
-                    .map_err(|e| e.to_string())?;
-                config
-            }
-        };
-
-        let command_db = match filesystem
-            .read_to_string(".luminol/commands")
-            .ok()
-            .and_then(|s| ron::from_str(&s).ok())
-        {
-            Some(c) => c,
-            None => {
-                let command_db = CommandDB::new(config.editor_ver);
-                filesystem
-                    .write(".luminol/commands", ron::to_string(&command_db).unwrap())
-                    .map_err(|e| e.to_string())?;
-                command_db
-            }
-        };
-
-        let game_ini = match filesystem
-            .read_to_string("Game.ini")
-            .ok()
-            .and_then(|i| ini::Ini::load_from_str_noescape(&i).ok())
-        {
-            Some(i) => i,
-            None => {
-                let mut ini = ini::Ini::new();
-                ini.with_section(Some("Game"))
-                    .set("Library", "RGSS104E.dll")
-                    .set("Scripts", &config.scripts_path)
-                    .set("Title", &config.project_name)
-                    .set("RTP1", "")
-                    .set("RTP2", "")
-                    .set("RTP3", "");
-
-                ini
-            }
-        };
-
-        *PROJECT.borrow_mut() = Project::Loaded {
-            config,
-            command_db,
-            game_ini,
-        };
-
-        Ok(())
-    }
-
-    pub fn save() -> Result<(), String> {
-        match &*PROJECT.borrow() {
-            Project::Unloaded => return Err("Project not loaded".to_string()),
-            Project::Loaded {
-                config,
-                command_db,
-                game_ini,
-            } => {
-                state!()
-                    .filesystem
-                    .write(
-                        ".luminol/commands",
-                        ron::to_string(command_db).map_err(|e| e.to_string())?,
-                    )
-                    .map_err(|e| e.to_string())?;
-
-                state!()
-                    .filesystem
-                    .write(
-                        ".luminol/config",
-                        ron::to_string(config).map_err(|e| e.to_string())?,
-                    )
-                    .map_err(|e| e.to_string())?;
-
-                let mut ini_file = state!()
-                    .filesystem
-                    .open_file(
-                        "Game.ini",
-                        filesystem::OpenFlags::Write | filesystem::OpenFlags::Create,
-                    )
-                    .map_err(|e| e.to_string())?;
-                game_ini
-                    .write_to(&mut ini_file)
-                    .map_err(|e| e.to_string())?;
-            }
-        }
-
-        Ok(())
-    }
-}
-
-pub static PROJECT: AtomicRefCell<Project> = AtomicRefCell::new(Project::Unloaded);
-
-#[macro_export]
-macro_rules! project_config {
-    () => {{
-        AtomicRefMut::map($crate::config::PROJECT.borrow_mut(), |c| match c {
-            $crate::config::Project::Unloaded => panic!("Project not loaded"),
-            $crate::config::Project::Loaded { config, .. } => config,
-        })
-    }};
-}
-
-#[macro_export]
-macro_rules! command_db {
-    () => {
-        AtomicRefMut::map($crate::config::PROJECT.borrow_mut(), |c| match c {
-            $crate::config::Project::Unloaded => panic!("Project not loaded"),
-            $crate::config::Project::Loaded { command_db, .. } => command_db,
-        })
-    };
-}
-
-#[macro_export]
-macro_rules! game_ini {
-    () => {
-        AtomicRefMut::map($crate::config::PROJECT.borrow_mut(), |c| match c {
-            $crate::config::Project::Unloaded => panic!("Project not loaded"),
-            $crate::config::Project::Loaded { game_ini, .. } => game_ini,
-        })
-    };
-}
-
-pub static GLOBAL: Lazy<AtomicRefCell<global::Config>> =
-    Lazy::new(|| AtomicRefCell::new(global::Config::new()));
-
-#[macro_export]
-macro_rules! global_config {
-    () => {
-        $crate::config::GLOBAL.borrow_mut()
-    };
-}
-
-#[derive(
-    Clone,
-    Copy,
-    PartialEq,
-    Eq,
-    Hash,
-    serde::Serialize,
-    serde::Deserialize,
-    strum::EnumIter,
-    strum::Display,
-    Debug
-)]
-#[allow(missing_docs)]
-pub enum RGSSVer {
-    #[strum(to_string = "ModShot")]
-    ModShot,
-    #[strum(to_string = "mkxp-oneshot")]
-    MKXPOneShot,
-    #[strum(to_string = "rsgss")]
-    RSGSS,
-    #[strum(to_string = "mkxp")]
-    MKXP,
-    #[strum(to_string = "mkxp-freebird")]
-    MKXPFreebird,
-    #[strum(to_string = "mkxp-z")]
-    MKXPZ,
-    #[strum(to_string = "Stock RGSS1")]
-    RGSS1,
-}
-
-#[derive(
-    Clone,
-    Copy,
-    PartialEq,
-    Eq,
-    Hash,
-    serde::Serialize,
-    serde::Deserialize,
-    strum::EnumIter,
-    strum::Display,
-    Default,
-    Debug
-)]
-#[allow(missing_docs)]
-pub enum RMVer {
-    #[default]
-    #[strum(to_string = "RPG Maker XP")]
-    XP = 1,
-    #[strum(to_string = "RPG Maker VX")]
-    VX = 2,
-    #[strum(to_string = "RPG Maker VX Ace")]
-    Ace = 3,
-}
diff --git a/src/filesystem/project.rs b/src/filesystem/project.rs
deleted file mode 100644
index ff4c05a0..00000000
--- a/src/filesystem/project.rs
+++ /dev/null
@@ -1,638 +0,0 @@
-// Copyright (C) 2023 Lily Lyons
-//
-// This file is part of Luminol.
-//
-// Luminol is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Luminol is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
-use crate::prelude::*;
-
-use super::FileSystem as FileSystemTrait;
-use super::{archiver, host, list, path_cache, DirEntry, Error, Metadata, OpenFlags};
-
-#[cfg(target_arch = "wasm32")]
-use super::web;
-
-#[derive(Default)]
-pub struct FileSystem {
-    state: AtomicRefCell<State>,
-}
-
-#[derive(Default)]
-enum State {
-    #[default]
-    Unloaded,
-    #[cfg(not(target_arch = "wasm32"))]
-    HostLoaded(host::FileSystem),
-    #[cfg(target_arch = "wasm32")]
-    HostLoaded(web::FileSystem),
-    Loaded {
-        filesystem: path_cache::FileSystem<list::FileSystem>,
-        project_path: camino::Utf8PathBuf,
-    },
-}
-
-#[ouroboros::self_referencing]
-pub struct File<'fs> {
-    state: AtomicRef<'fs, State>,
-    #[borrows(state)]
-    #[not_covariant]
-    file: FileType<'this>,
-}
-
-enum FileType<'fs> {
-    #[cfg(not(target_arch = "wasm32"))]
-    Host(<host::FileSystem as FileSystemTrait>::File<'fs>),
-    #[cfg(target_arch = "wasm32")]
-    Host(<web::FileSystem as FileSystemTrait>::File<'fs>),
-    Loaded(<path_cache::FileSystem<list::FileSystem> as FileSystemTrait>::File<'fs>),
-}
-
-impl FileSystem {
-    pub fn new() -> Self {
-        Self::default()
-    }
-
-    pub fn read_data<T>(&self, path: impl AsRef<camino::Utf8Path>) -> Result<T, String>
-    where
-        T: serde::de::DeserializeOwned,
-    {
-        let data = self.read(path).map_err(|e| e.to_string())?;
-
-        alox_48::from_bytes(&data).map_err(|e| e.to_string())
-    }
-
-    pub fn read_nil_padded<T>(&self, path: impl AsRef<camino::Utf8Path>) -> Result<Vec<T>, String>
-    where
-        T: serde::de::DeserializeOwned,
-    {
-        let data = self.read(path).map_err(|e| e.to_string())?;
-
-        alox_48::Deserializer::new(&data)
-            .and_then(|mut de| rmxp_types::nil_padded::deserialize(&mut de))
-            .map_err(|e| e.to_string())
-    }
-
-    pub fn save_data<T>(&self, path: impl AsRef<camino::Utf8Path>, data: &T) -> Result<(), String>
-    where
-        T: serde::ser::Serialize,
-    {
-        self.write(path, alox_48::to_bytes(data).map_err(|e| e.to_string())?)
-            .map_err(|e| e.to_string())
-    }
-
-    pub fn save_nil_padded<T>(
-        &self,
-        path: impl AsRef<camino::Utf8Path>,
-        data: &[T],
-    ) -> Result<(), String>
-    where
-        T: serde::ser::Serialize,
-    {
-        let mut ser = alox_48::Serializer::new();
-        rmxp_types::nil_padded::serialize(data, &mut ser).map_err(|e| e.to_string())?;
-        self.write(path, ser.output).map_err(|e| e.to_string())
-    }
-
-    pub fn project_path(&self) -> Option<camino::Utf8PathBuf> {
-        let state = self.state.borrow();
-        match &*state {
-            State::Unloaded => None,
-            State::HostLoaded(h) => Some(h.root_path().to_path_buf()),
-            State::Loaded { project_path, .. } => Some(project_path.clone()),
-        }
-    }
-
-    pub fn project_loaded(&self) -> bool {
-        !matches!(&*self.state.borrow(), State::Unloaded)
-    }
-
-    pub fn unload_project(&self) {
-        *self.state.borrow_mut() = State::Unloaded;
-    }
-
-    pub fn detect_rm_ver(&self) -> Option<config::RMVer> {
-        if self.exists("Data/Actors.rxdata").ok()? {
-            return Some(config::RMVer::XP);
-        }
-
-        if self.exists("Data/Actors.rvdata").ok()? {
-            return Some(config::RMVer::VX);
-        }
-
-        if self.exists("Data/Actors.rvdata2").ok()? {
-            return Some(config::RMVer::Ace);
-        }
-
-        for path in self.read_dir("").ok()? {
-            let path = path.path();
-            if path.extension() == Some("rgssad") {
-                return Some(config::RMVer::XP);
-            }
-
-            if path.extension() == Some("rgss2a") {
-                return Some(config::RMVer::VX);
-            }
-
-            if path.extension() == Some("rgss3a") {
-                return Some(config::RMVer::Ace);
-            }
-        }
-
-        None
-    }
-
-    #[cfg(not(target_arch = "wasm32"))]
-    pub async fn spawn_project_file_picker(&self) -> Result<(), String> {
-        if let Some(path) = rfd::AsyncFileDialog::default()
-            .add_filter("project file", &["rxproj", "rvproj", "rvproj2", "lumproj"])
-            .pick_file()
-            .await
-        {
-            self.load_project(path.path())
-        } else {
-            Err("Cancelled loading project".to_string())
-        }
-    }
-
-    #[cfg(target_arch = "wasm32")]
-    pub async fn spawn_project_file_picker(&self) -> Result<(), String> {
-        if !web::FileSystem::filesystem_supported() {
-            return Err("Your browser does not support File System Access API".to_string());
-        }
-        if let Some(dir) = web::FileSystem::from_directory_picker().await {
-            let idb_key = dir.idb_key().map(|k| k.to_string());
-            if let Err(e) = self.load_project(dir) {
-                if let Some(idb_key) = idb_key {
-                    web::FileSystem::idb_drop(idb_key);
-                }
-                Err(e)
-            } else {
-                Ok(())
-            }
-        } else {
-            Err("Cancelled loading project".to_string())
-        }
-    }
-
-    #[cfg(windows)]
-    fn find_rtp_paths() -> Vec<camino::Utf8PathBuf> {
-        let ini = game_ini!();
-        let Some(section) = ini.section(Some("Game")) else {
-            return vec![];
-        };
-        let mut paths = vec![];
-        let mut seen_rtps = vec![];
-        // FIXME: handle vx ace?
-        for rtp in ["RTP1", "RTP2", "RTP3"] {
-            if let Some(rtp) = section.get(rtp) {
-                if seen_rtps.contains(&rtp) || rtp.is_empty() {
-                    continue;
-                }
-                seen_rtps.push(rtp);
-
-                let hklm = winreg::RegKey::predef(winreg::enums::HKEY_LOCAL_MACHINE);
-                if let Ok(value) = hklm
-                    .open_subkey("SOFTWARE\\WOW6432Node\\Enterbrain\\RGSS\\RTP")
-                    .and_then(|key| key.get_value::<String, _>(rtp))
-                {
-                    let path = camino::Utf8PathBuf::from(value);
-                    if path.exists() {
-                        paths.push(path);
-                        continue;
-                    }
-                }
-
-                if let Ok(value) = hklm
-                    .open_subkey("SOFTWARE\\WOW6432Node\\Enterbrain\\RPGXP")
-                    .and_then(|key| key.get_value::<String, _>("ApplicationPath"))
-                {
-                    let path = camino::Utf8PathBuf::from(value).join("rtp");
-                    if path.exists() {
-                        paths.push(path);
-                        continue;
-                    }
-                }
-
-                if let Ok(value) = hklm
-                    .open_subkey(
-                        "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App 235900",
-                    )
-                    .and_then(|key| key.get_value::<String, _>("InstallLocation"))
-                {
-                    let path = camino::Utf8PathBuf::from(value).join("rtp");
-                    if path.exists() {
-                        paths.push(path);
-                        continue;
-                    }
-                }
-
-                if let Some(path) = global_config!().rtp_paths.get(rtp) {
-                    let path = camino::Utf8PathBuf::from(path);
-                    if path.exists() {
-                        paths.push(path);
-                        continue;
-                    }
-                }
-
-                state!()
-                    .toasts
-                    .warning(format!("Failed to find suitable path for the RTP {rtp}"));
-                state!()
-                    .toasts
-                    .info(format!("You may want to set an RTP path for {rtp}"));
-            }
-        }
-        paths
-    }
-
-    #[cfg(not(any(windows, target_arch = "wasm32")))]
-    fn find_rtp_paths() -> Vec<camino::Utf8PathBuf> {
-        let ini = game_ini!();
-        let Some(section) = ini.section(Some("Game")) else {
-            return vec![];
-        };
-        let mut paths = vec![];
-        let mut seen_rtps = vec![];
-        // FIXME: handle vx ace?
-        for rtp in ["RTP1", "RTP2", "RTP3"] {
-            if let Some(rtp) = section.get(rtp) {
-                if seen_rtps.contains(&rtp) || rtp.is_empty() {
-                    continue;
-                }
-                seen_rtps.push(rtp);
-
-                if let Some(path) = global_config!().rtp_paths.get(rtp) {
-                    let path = camino::Utf8PathBuf::from(path);
-                    if path.exists() {
-                        paths.push(path);
-                        continue;
-                    }
-                }
-
-                state!()
-                    .toasts
-                    .warning(format!("Failed to find suitable path for  the RTP {rtp}"));
-                state!()
-                    .toasts
-                    .info(format!("You may want to set an RTP path for {rtp}"));
-            }
-        }
-        paths
-    }
-
-    #[cfg(target_arch = "wasm32")]
-    fn find_rtp_paths(dir: &web::FileSystem) -> Vec<camino::Utf8PathBuf> {
-        let ini = game_ini!();
-        let Some(section) = ini.section(Some("Game")) else {
-            return vec![];
-        };
-        let mut paths = vec![];
-        let mut seen_rtps = vec![];
-        // FIXME: handle vx ace?
-        for rtp in ["RTP1", "RTP2", "RTP3"] {
-            if let Some(rtp) = section.get(rtp) {
-                if seen_rtps.contains(&rtp) || rtp.is_empty() {
-                    continue;
-                }
-                seen_rtps.push(rtp);
-
-                let path = camino::Utf8PathBuf::from("RTP").join(rtp);
-                if let Ok(exists) = dir.exists(&path) {
-                    if exists {
-                        paths.push(path);
-                        continue;
-                    }
-                }
-
-                state!()
-                    .toasts
-                    .warning(format!("Failed to find suitable path for the RTP {rtp}"));
-                state!()
-                    .toasts
-                    .info(format!("Please place the {rtp} RTP in the 'RTP/{rtp}' subdirectory in your project directory"));
-            }
-        }
-        paths
-    }
-
-    #[cfg(not(target_arch = "wasm32"))]
-    pub fn load_project(&self, project_path: impl AsRef<Path>) -> Result<(), String> {
-        let original_path = camino::Utf8Path::from_path(project_path.as_ref()).unwrap();
-        let path = original_path.parent().unwrap_or(original_path);
-
-        *self.state.borrow_mut() = State::HostLoaded(host::FileSystem::new(path));
-
-        config::Project::load()?;
-
-        let mut list = list::FileSystem::new();
-
-        let dir = host::FileSystem::new(path);
-        let archive = dir
-            .read_dir("")
-            .map_err(|e| e.to_string())?
-            .into_iter()
-            .find(|entry| {
-                entry.metadata.is_file
-                    && matches!(entry.path.extension(), Some("rgssad" | "rgss2a" | "rgss3a"))
-            })
-            .map(|entry| dir.open_file(entry.path, OpenFlags::Read | OpenFlags::Write))
-            .transpose()
-            .map_err(|e| e.to_string())?
-            .map(archiver::FileSystem::new)
-            .transpose()
-            .map_err(|e| e.to_string())?;
-
-        list.push(dir);
-        for path in Self::find_rtp_paths() {
-            list.push(host::FileSystem::new(path))
-        }
-        if let Some(archive) = archive {
-            list.push(archive);
-        }
-
-        let path_cache = path_cache::FileSystem::new(list).map_err(|e| e.to_string())?;
-
-        *self.state.borrow_mut() = State::Loaded {
-            filesystem: path_cache,
-            project_path: path.to_path_buf(),
-        };
-
-        let mut projects: std::collections::VecDeque<_> = global_config!()
-            .recent_projects
-            .iter()
-            .filter(|p| p.as_str() != original_path)
-            .cloned()
-            .collect();
-        projects.push_front(original_path.to_string());
-        global_config!().recent_projects = projects;
-
-        if let Err(e) = state!().data_cache.load() {
-            *self.state.borrow_mut() = State::Unloaded;
-            return Err(e);
-        }
-
-        Ok(())
-    }
-
-    #[cfg(target_arch = "wasm32")]
-    pub fn load_project(&self, dir: web::FileSystem) -> Result<(), String> {
-        let entries = dir.read_dir("").map_err(|e| e.to_string())?;
-        let Some(entry) = entries.iter().find(|e| {
-            if let Some(extension) = e.path.extension() {
-                e.metadata.is_file
-                    && (extension == "rxproj"
-                        || extension == "rvproj"
-                        || extension == "rvproj2"
-                        || extension == "lumproj")
-            } else {
-                false
-            }
-        }) else {
-            return Err("Invalid project folder".to_string());
-        };
-
-        *self.state.borrow_mut() = State::HostLoaded(dir);
-        config::Project::load()?;
-        let State::HostLoaded(dir) =
-            std::mem::replace(&mut *self.state.borrow_mut(), State::Unloaded)
-        else {
-            unreachable!();
-        };
-
-        let root_path = dir.root_path().to_path_buf();
-        let idb_key = dir.idb_key().map(|k| k.to_string());
-
-        let mut list = list::FileSystem::new();
-
-        let paths = Self::find_rtp_paths(&dir);
-
-        let archive = dir
-            .read_dir("")
-            .map_err(|e| e.to_string())?
-            .into_iter()
-            .find(|entry| {
-                entry.metadata.is_file
-                    && matches!(entry.path.extension(), Some("rgssad" | "rgss2a" | "rgss3a"))
-            })
-            .map(|entry| dir.open_file(entry.path, OpenFlags::Read | OpenFlags::Write))
-            .transpose()
-            .map_err(|e| e.to_string())?
-            .map(archiver::FileSystem::new)
-            .transpose()
-            .map_err(|e| e.to_string())?;
-
-        list.push(dir);
-        for path in paths {
-            list.push(host::FileSystem::new(path))
-        }
-        if let Some(archive) = archive {
-            list.push(archive);
-        }
-
-        let path_cache = path_cache::FileSystem::new(list).map_err(|e| e.to_string())?;
-
-        *self.state.borrow_mut() = State::Loaded {
-            filesystem: path_cache,
-            project_path: root_path.clone(),
-        };
-
-        if let Some(idb_key) = idb_key {
-            let mut projects: std::collections::VecDeque<_> = global_config!()
-                .recent_projects
-                .iter()
-                .filter(|(_, k)| k.as_str() != idb_key.as_str())
-                .cloned()
-                .collect();
-            projects.push_front((root_path.join(&entry.path).to_string(), idb_key));
-            global_config!().recent_projects = projects;
-        }
-
-        if let Err(e) = state!().data_cache.load() {
-            *self.state.borrow_mut() = State::Unloaded;
-            return Err(e);
-        }
-
-        Ok(())
-    }
-
-    pub fn debug_ui(&self, ui: &mut egui::Ui) {
-        let state = self.state.borrow();
-        match &*state {
-            State::Unloaded => {
-                ui.label("Unloaded");
-            }
-            State::HostLoaded(fs) => {
-                ui.label("Host Filesystem Loaded");
-                ui.horizontal(|ui| {
-                    ui.label("Project path: ");
-                    ui.label(fs.root_path().as_str());
-                });
-            }
-            State::Loaded { filesystem, .. } => {
-                ui.label("Loaded");
-                filesystem.debug_ui(ui);
-            }
-        }
-    }
-}
-
-impl<'fs> std::io::Write for File<'fs> {
-    fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
-        self.with_file_mut(|f| match f {
-            FileType::Host(f) => f.write(buf),
-            FileType::Loaded(f) => f.write(buf),
-        })
-    }
-
-    fn write_vectored(&mut self, bufs: &[std::io::IoSlice<'_>]) -> std::io::Result<usize> {
-        self.with_file_mut(|f| match f {
-            FileType::Host(f) => f.write_vectored(bufs),
-            FileType::Loaded(f) => f.write_vectored(bufs),
-        })
-    }
-
-    fn flush(&mut self) -> std::io::Result<()> {
-        self.with_file_mut(|f| match f {
-            FileType::Host(f) => f.flush(),
-            FileType::Loaded(f) => f.flush(),
-        })
-    }
-}
-
-impl<'fs> std::io::Read for File<'fs> {
-    fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
-        self.with_file_mut(|f| match f {
-            FileType::Host(f) => f.read(buf),
-            FileType::Loaded(f) => f.read(buf),
-        })
-    }
-
-    fn read_vectored(&mut self, bufs: &mut [std::io::IoSliceMut<'_>]) -> std::io::Result<usize> {
-        self.with_file_mut(|f| match f {
-            FileType::Host(f) => f.read_vectored(bufs),
-            FileType::Loaded(f) => f.read_vectored(bufs),
-        })
-    }
-
-    fn read_exact(&mut self, buf: &mut [u8]) -> std::io::Result<()> {
-        self.with_file_mut(|f| match f {
-            FileType::Host(f) => f.read_exact(buf),
-            FileType::Loaded(f) => f.read_exact(buf),
-        })
-    }
-}
-
-impl<'fs> std::io::Seek for File<'fs> {
-    fn seek(&mut self, pos: std::io::SeekFrom) -> std::io::Result<u64> {
-        self.with_file_mut(|f| match f {
-            FileType::Host(f) => f.seek(pos),
-            FileType::Loaded(f) => f.seek(pos),
-        })
-    }
-
-    fn stream_position(&mut self) -> std::io::Result<u64> {
-        self.with_file_mut(|f| match f {
-            FileType::Host(f) => f.stream_position(),
-            FileType::Loaded(f) => f.stream_position(),
-        })
-    }
-}
-
-impl FileSystemTrait for FileSystem {
-    type File<'fs> = File<'fs> where Self: 'fs;
-
-    fn open_file(
-        &self,
-        path: impl AsRef<camino::Utf8Path>,
-        flags: OpenFlags,
-    ) -> Result<Self::File<'_>, Error> {
-        let state = self.state.borrow();
-        File::try_new(state, |state| {
-            //
-            match &**state {
-                State::Unloaded => Err(Error::NotLoaded),
-                State::HostLoaded(f) => f.open_file(path, flags).map(FileType::Host),
-                State::Loaded { filesystem: f, .. } => {
-                    f.open_file(path, flags).map(FileType::Loaded)
-                }
-            }
-        })
-    }
-
-    fn metadata(&self, path: impl AsRef<camino::Utf8Path>) -> Result<Metadata, Error> {
-        let state = self.state.borrow();
-        match &*state {
-            State::Unloaded => Err(Error::NotLoaded),
-            State::HostLoaded(f) => f.metadata(path),
-            State::Loaded { filesystem: f, .. } => f.metadata(path),
-        }
-    }
-
-    fn rename(
-        &self,
-        from: impl AsRef<camino::Utf8Path>,
-        to: impl AsRef<camino::Utf8Path>,
-    ) -> Result<(), Error> {
-        let state = self.state.borrow();
-        match &*state {
-            State::Unloaded => Err(Error::NotLoaded),
-            State::HostLoaded(f) => f.rename(from, to),
-            State::Loaded { filesystem, .. } => filesystem.rename(from, to),
-        }
-    }
-
-    fn exists(&self, path: impl AsRef<camino::Utf8Path>) -> Result<bool, Error> {
-        let state = self.state.borrow();
-        match &*state {
-            State::Unloaded => Err(Error::NotLoaded),
-            State::HostLoaded(f) => f.exists(path),
-            State::Loaded { filesystem, .. } => filesystem.exists(path),
-        }
-    }
-
-    fn create_dir(&self, path: impl AsRef<camino::Utf8Path>) -> Result<(), Error> {
-        let state = self.state.borrow();
-        match &*state {
-            State::Unloaded => Err(Error::NotLoaded),
-            State::HostLoaded(f) => f.create_dir(path),
-            State::Loaded { filesystem, .. } => filesystem.create_dir(path),
-        }
-    }
-
-    fn remove_dir(&self, path: impl AsRef<camino::Utf8Path>) -> Result<(), Error> {
-        let state = self.state.borrow();
-        match &*state {
-            State::Unloaded => Err(Error::NotLoaded),
-            State::HostLoaded(f) => f.remove_dir(path),
-            State::Loaded { filesystem, .. } => filesystem.remove_dir(path),
-        }
-    }
-
-    fn remove_file(&self, path: impl AsRef<camino::Utf8Path>) -> Result<(), Error> {
-        let state = self.state.borrow();
-        match &*state {
-            State::Unloaded => Err(Error::NotLoaded),
-            State::HostLoaded(f) => f.remove_file(path),
-            State::Loaded { filesystem, .. } => filesystem.remove_file(path),
-        }
-    }
-
-    fn read_dir(&self, path: impl AsRef<camino::Utf8Path>) -> Result<Vec<DirEntry>, Error> {
-        let state = self.state.borrow();
-        match &*state {
-            State::Unloaded => Err(Error::NotLoaded),
-            State::HostLoaded(f) => f.read_dir(path),
-            State::Loaded { filesystem, .. } => filesystem.read_dir(path),
-        }
-    }
-}
diff --git a/src/graphics/map.rs b/src/graphics/map.rs
deleted file mode 100644
index ce676b98..00000000
--- a/src/graphics/map.rs
+++ /dev/null
@@ -1,193 +0,0 @@
-// Copyright (C) 2023 Lily Lyons
-//
-// This file is part of Luminol.
-//
-// Luminol is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Luminol is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
-
-pub use crate::prelude::*;
-
-use std::time::Duration;
-
-#[derive(Debug)]
-pub struct Map {
-    resources: Arc<Resources>,
-    ani_time: Option<f64>,
-
-    pub fog_enabled: bool,
-    pub pano_enabled: bool,
-    pub enabled_layers: Vec<bool>,
-}
-
-#[derive(Debug)]
-struct Resources {
-    tiles: primitives::Tiles,
-    viewport: primitives::Viewport,
-    panorama: Option<Plane>,
-    fog: Option<Plane>,
-}
-
-type ResourcesSlab = slab::Slab<Arc<Resources>>;
-
-impl Map {
-    pub fn new(
-        map: &rpg::Map,
-        tileset: &rpg::Tileset,
-        use_push_constants: bool,
-    ) -> Result<Self, String> {
-        let atlas = state!().atlas_cache.load_atlas(tileset)?;
-
-        let tiles = primitives::Tiles::new(atlas, &map.data, use_push_constants);
-
-        let panorama = if let Some(ref panorama_name) = tileset.panorama_name {
-            Some(Plane::new(
-                state!()
-                    .image_cache
-                    .load_wgpu_image("Graphics/Panoramas", panorama_name)?,
-                tileset.panorama_hue,
-                100,
-                BlendMode::Normal,
-                255,
-                map.width,
-                map.height,
-                use_push_constants,
-            ))
-        } else {
-            None
-        };
-        let fog = if let Some(ref fog_name) = tileset.fog_name {
-            Some(Plane::new(
-                state!()
-                    .image_cache
-                    .load_wgpu_image("Graphics/Fogs", fog_name)?,
-                tileset.fog_hue,
-                tileset.fog_zoom,
-                tileset.fog_blend_type,
-                tileset.fog_opacity,
-                map.width,
-                map.height,
-                use_push_constants,
-            ))
-        } else {
-            None
-        };
-        let viewport = primitives::Viewport::new(
-            glam::Mat4::orthographic_rh(
-                0.0,
-                map.width as f32 * 32.,
-                map.height as f32 * 32.,
-                0.0,
-                -1.0,
-                1.0,
-            ),
-            use_push_constants,
-        );
-
-        Ok(Self {
-            resources: Arc::new(Resources {
-                tiles,
-                viewport,
-                panorama,
-                fog,
-            }),
-
-            ani_time: None,
-
-            fog_enabled: true,
-            pano_enabled: true,
-            enabled_layers: vec![true; map.data.zsize()],
-        })
-    }
-
-    pub fn set_tile(&self, tile_id: i16, position: (usize, usize, usize)) {
-        self.resources.tiles.set_tile(tile_id, position);
-    }
-
-    pub fn set_proj(&self, proj: glam::Mat4) {
-        self.resources.viewport.set_proj(proj);
-    }
-
-    pub fn paint(
-        &mut self,
-        painter: &egui::Painter,
-        selected_layer: Option<usize>,
-        rect: egui::Rect,
-    ) {
-        let time = painter.ctx().input(|i| i.time);
-        if let Some(ani_time) = self.ani_time {
-            if time - ani_time >= 16. / 60. {
-                self.ani_time = Some(time);
-                self.resources.tiles.autotiles.inc_ani_index();
-            }
-        } else {
-            self.ani_time = Some(time);
-        }
-
-        painter
-            .ctx()
-            .request_repaint_after(Duration::from_secs_f64(16. / 60.));
-
-        let resources = self.resources.clone();
-        let resource_id = Arc::new(OnceCell::new());
-
-        let prepare_id = resource_id;
-        let paint_id = prepare_id.clone();
-
-        let fog_enabled = self.fog_enabled;
-        let pano_enabled = self.pano_enabled;
-        let enabled_layers = self.enabled_layers.clone();
-
-        let paint_callback = egui_wgpu::CallbackFn::new()
-            .prepare(move |_device, _queue, _encoder, paint_callback_resources| {
-                let res_hash: &mut ResourcesSlab = paint_callback_resources
-                    .entry()
-                    .or_insert_with(Default::default);
-                let id = res_hash.insert(resources.clone());
-                prepare_id.set(id).expect("resources id already set?");
-
-                vec![]
-            })
-            .paint(move |_info, render_pass, paint_callback_resources| {
-                let res_hash: &ResourcesSlab = paint_callback_resources.get().unwrap();
-                let id = paint_id.get().copied().expect("resources id is unset");
-                let resources = &res_hash[id];
-                let Resources {
-                    tiles,
-                    viewport,
-                    panorama,
-                    fog,
-                    ..
-                } = resources.as_ref();
-
-                viewport.bind(render_pass);
-
-                if pano_enabled {
-                    if let Some(panorama) = panorama {
-                        panorama.draw(viewport, render_pass);
-                    }
-                }
-
-                tiles.draw(viewport, &enabled_layers, selected_layer, render_pass);
-                if fog_enabled {
-                    if let Some(fog) = fog {
-                        fog.draw(viewport, render_pass);
-                    }
-                }
-            });
-
-        painter.add(egui::PaintCallback {
-            rect,
-            callback: Arc::new(paint_callback),
-        });
-    }
-}
diff --git a/src/graphics/mod.rs b/src/graphics/mod.rs
deleted file mode 100644
index 412a8d34..00000000
--- a/src/graphics/mod.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (C) 2023 Lily Lyons
-//
-// This file is part of Luminol.
-//
-// Luminol is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Luminol is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
-
-pub mod primitives;
-
-mod event;
-mod map;
-mod plane;
-
-pub use event::Event;
-pub use map::Map;
-pub use plane::Plane;
diff --git a/src/graphics/primitives/sprite/shader.rs b/src/graphics/primitives/sprite/shader.rs
deleted file mode 100644
index 55c00178..00000000
--- a/src/graphics/primitives/sprite/shader.rs
+++ /dev/null
@@ -1,216 +0,0 @@
-// Copyright (C) 2023 Lily Lyons
-//
-// This file is part of Luminol.
-//
-// Luminol is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Luminol is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
-use crate::prelude::*;
-
-use super::graphic::Graphic;
-use super::{BlendMode, Vertex};
-use const_format::str_replace;
-use primitives::Viewport;
-
-pub struct Shader {
-    pub pipeline: wgpu::RenderPipeline,
-}
-
-impl Shader {
-    pub fn new(target: wgpu::BlendState, use_push_constants: bool) -> Self {
-        let render_state = &state!().render_state;
-
-        let shader_module = if use_push_constants {
-            render_state
-                .device
-                .create_shader_module(wgpu::ShaderModuleDescriptor {
-                    label: Some("sprite.wgsl (push constants)"),
-                    source: wgpu::ShaderSource::Wgsl(
-                        str_replace!(
-                            concat!(
-                                include_str!("sprite_header_push_constants.wgsl"),
-                                include_str!("sprite.wgsl"),
-                            ),
-                            "HOST.",
-                            "push_constants."
-                        )
-                        .into(),
-                    ),
-                })
-        } else {
-            render_state
-                .device
-                .create_shader_module(wgpu::ShaderModuleDescriptor {
-                    label: Some("sprite.wgsl (uniforms)"),
-                    source: wgpu::ShaderSource::Wgsl(
-                        str_replace!(
-                            concat!(
-                                include_str!("sprite_header_uniforms.wgsl"),
-                                include_str!("sprite.wgsl"),
-                            ),
-                            "HOST.",
-                            ""
-                        )
-                        .into(),
-                    ),
-                })
-        };
-
-        let pipeline_layout = if use_push_constants {
-            render_state
-                .device
-                .create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
-                    label: Some("Tilemap Sprite Pipeline Layout (push constants)"),
-                    bind_group_layouts: &[image_cache::Cache::bind_group_layout()],
-                    push_constant_ranges: &[
-                        // Viewport
-                        wgpu::PushConstantRange {
-                            stages: wgpu::ShaderStages::VERTEX,
-                            range: 0..64,
-                        },
-                        wgpu::PushConstantRange {
-                            stages: wgpu::ShaderStages::FRAGMENT,
-                            range: 64..(64 + 4 + 4 + 4),
-                        },
-                    ],
-                })
-        } else {
-            render_state
-                .device
-                .create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
-                    label: Some("Tilemap Sprite Pipeline Layout (uniforms)"),
-                    bind_group_layouts: &[
-                        image_cache::Cache::bind_group_layout(),
-                        Viewport::layout(),
-                        Graphic::layout(),
-                    ],
-                    push_constant_ranges: &[],
-                })
-        };
-
-        let pipeline =
-            render_state
-                .device
-                .create_render_pipeline(&wgpu::RenderPipelineDescriptor {
-                    label: Some("Tilemap Sprite Render Pipeline"),
-                    layout: Some(&pipeline_layout),
-                    vertex: wgpu::VertexState {
-                        module: &shader_module,
-                        entry_point: "vs_main",
-                        buffers: &[Vertex::desc()],
-                    },
-                    fragment: Some(wgpu::FragmentState {
-                        module: &shader_module,
-                        entry_point: "fs_main",
-                        targets: &[Some(wgpu::ColorTargetState {
-                            blend: Some(target),
-                            ..render_state.target_format.into()
-                        })],
-                    }),
-                    primitive: wgpu::PrimitiveState {
-                        // polygon_mode: wgpu::PolygonMode::Line,
-                        ..Default::default()
-                    },
-                    depth_stencil: None,
-                    multisample: wgpu::MultisampleState::default(),
-                    multiview: None,
-                });
-
-        Shader { pipeline }
-    }
-
-    pub fn bind(mode: BlendMode, use_push_constants: bool, render_pass: &mut wgpu::RenderPass<'_>) {
-        if use_push_constants {
-            render_pass.set_pipeline(&EVENT_SHADERS_PUSH_CONSTANTS[&mode].pipeline)
-        } else {
-            render_pass.set_pipeline(&EVENT_SHADERS_UNIFORMS[&mode].pipeline)
-        }
-    }
-}
-
-static EVENT_SHADERS_PUSH_CONSTANTS: Lazy<HashMap<BlendMode, Shader>> = Lazy::new(|| {
-    [
-        (BlendMode::Normal, wgpu::BlendState::ALPHA_BLENDING),
-        (
-            BlendMode::Add,
-            wgpu::BlendState {
-                color: wgpu::BlendComponent {
-                    src_factor: wgpu::BlendFactor::SrcAlpha,
-                    dst_factor: wgpu::BlendFactor::One,
-                    operation: wgpu::BlendOperation::Add,
-                },
-                alpha: wgpu::BlendComponent {
-                    src_factor: wgpu::BlendFactor::One,
-                    dst_factor: wgpu::BlendFactor::One,
-                    operation: wgpu::BlendOperation::Add,
-                },
-            },
-        ),
-        (
-            BlendMode::Subtract,
-            wgpu::BlendState {
-                color: wgpu::BlendComponent {
-                    src_factor: wgpu::BlendFactor::SrcAlpha,
-                    dst_factor: wgpu::BlendFactor::One,
-                    operation: wgpu::BlendOperation::ReverseSubtract,
-                },
-                alpha: wgpu::BlendComponent {
-                    src_factor: wgpu::BlendFactor::Zero,
-                    dst_factor: wgpu::BlendFactor::One,
-                    operation: wgpu::BlendOperation::ReverseSubtract,
-                },
-            },
-        ),
-    ]
-    .into_iter()
-    .map(|(mode, target)| (mode, Shader::new(target, true)))
-    .collect()
-});
-
-static EVENT_SHADERS_UNIFORMS: Lazy<HashMap<BlendMode, Shader>> = Lazy::new(|| {
-    [
-        (BlendMode::Normal, wgpu::BlendState::ALPHA_BLENDING),
-        (
-            BlendMode::Add,
-            wgpu::BlendState {
-                color: wgpu::BlendComponent {
-                    src_factor: wgpu::BlendFactor::SrcAlpha,
-                    dst_factor: wgpu::BlendFactor::One,
-                    operation: wgpu::BlendOperation::Add,
-                },
-                alpha: wgpu::BlendComponent {
-                    src_factor: wgpu::BlendFactor::One,
-                    dst_factor: wgpu::BlendFactor::One,
-                    operation: wgpu::BlendOperation::Add,
-                },
-            },
-        ),
-        (
-            BlendMode::Subtract,
-            wgpu::BlendState {
-                color: wgpu::BlendComponent {
-                    src_factor: wgpu::BlendFactor::SrcAlpha,
-                    dst_factor: wgpu::BlendFactor::One,
-                    operation: wgpu::BlendOperation::ReverseSubtract,
-                },
-                alpha: wgpu::BlendComponent {
-                    src_factor: wgpu::BlendFactor::Zero,
-                    dst_factor: wgpu::BlendFactor::One,
-                    operation: wgpu::BlendOperation::ReverseSubtract,
-                },
-            },
-        ),
-    ]
-    .into_iter()
-    .map(|(mode, target)| (mode, Shader::new(target, false)))
-    .collect()
-});
diff --git a/src/graphics/primitives/sprite/sprite_header_push_constants.wgsl b/src/graphics/primitives/sprite/sprite_header_push_constants.wgsl
deleted file mode 100644
index f16f7805..00000000
--- a/src/graphics/primitives/sprite/sprite_header_push_constants.wgsl
+++ /dev/null
@@ -1,6 +0,0 @@
-struct PushConstants {
-    viewport: Viewport,
-    graphic: Graphic,
-}
-
-var<push_constant> push_constants: PushConstants;
diff --git a/src/graphics/primitives/sprite/sprite_header_uniforms.wgsl b/src/graphics/primitives/sprite/sprite_header_uniforms.wgsl
deleted file mode 100644
index 7d092f72..00000000
--- a/src/graphics/primitives/sprite/sprite_header_uniforms.wgsl
+++ /dev/null
@@ -1,4 +0,0 @@
-@group(1) @binding(0)
-var<uniform> viewport: Viewport;
-@group(2) @binding(0)
-var<uniform> graphic: Graphic;
diff --git a/src/graphics/primitives/tiles/shader.rs b/src/graphics/primitives/tiles/shader.rs
deleted file mode 100644
index f290b484..00000000
--- a/src/graphics/primitives/tiles/shader.rs
+++ /dev/null
@@ -1,150 +0,0 @@
-// Copyright (C) 2023 Lily Lyons
-//
-// This file is part of Luminol.
-//
-// Luminol is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Luminol is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
-use crate::prelude::*;
-
-use super::autotiles::Autotiles;
-use super::instance::Instances;
-use super::opacity::Opacity;
-use const_format::str_replace;
-use primitives::{Vertex, Viewport};
-
-#[derive(Debug)]
-pub struct Shader {
-    pub pipeline: wgpu::RenderPipeline,
-}
-
-impl Shader {
-    fn new(use_push_constants: bool) -> Self {
-        let render_state = &state!().render_state;
-
-        let shader_module = if use_push_constants {
-            render_state
-                .device
-                .create_shader_module(wgpu::ShaderModuleDescriptor {
-                    label: Some("tilemap.wgsl (push constants)"),
-                    source: wgpu::ShaderSource::Wgsl(
-                        str_replace!(
-                            str_replace!(
-                                concat!(
-                                    include_str!("tilemap_header_push_constants.wgsl"),
-                                    include_str!("tilemap.wgsl"),
-                                ),
-                                "FRAGMENT_OPACITY",
-                                "HOST.opacity"
-                            ),
-                            "HOST.",
-                            "push_constants."
-                        )
-                        .into(),
-                    ),
-                })
-        } else {
-            render_state
-                .device
-                .create_shader_module(wgpu::ShaderModuleDescriptor {
-                    label: Some("tilemap.wgsl (uniforms)"),
-                    source: wgpu::ShaderSource::Wgsl(
-                        str_replace!(
-                            str_replace!(
-                                concat!(
-                                    include_str!("tilemap_header_uniforms.wgsl"),
-                                    include_str!("tilemap.wgsl"),
-                                ),
-                                "FRAGMENT_OPACITY",
-                                "HOST.opacity[input.layer / 4u][input.layer % 4u]"
-                            ),
-                            "HOST.",
-                            ""
-                        )
-                        .into(),
-                    ),
-                })
-        };
-
-        let pipeline_layout = if use_push_constants {
-            render_state
-                .device
-                .create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
-                    label: Some("Tilemap Render Pipeline Layout (push constants)"),
-                    bind_group_layouts: &[image_cache::Cache::bind_group_layout()],
-                    push_constant_ranges: &[
-                        // Viewport + Autotiles
-                        wgpu::PushConstantRange {
-                            stages: wgpu::ShaderStages::VERTEX,
-                            range: 0..(64 + 36),
-                        },
-                        // Fragment
-                        wgpu::PushConstantRange {
-                            stages: wgpu::ShaderStages::FRAGMENT,
-                            range: (64 + 36)..(64 + 36 + 4),
-                        },
-                    ],
-                })
-        } else {
-            render_state
-                .device
-                .create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
-                    label: Some("Tilemap Render Pipeline Layout (uniforms)"),
-                    bind_group_layouts: &[
-                        image_cache::Cache::bind_group_layout(),
-                        Viewport::layout(),
-                        Autotiles::layout(),
-                        Opacity::layout(),
-                    ],
-                    push_constant_ranges: &[],
-                })
-        };
-
-        let pipeline =
-            render_state
-                .device
-                .create_render_pipeline(&wgpu::RenderPipelineDescriptor {
-                    label: Some("Tilemap Render Pipeline"),
-                    layout: Some(&pipeline_layout),
-                    vertex: wgpu::VertexState {
-                        module: &shader_module,
-                        entry_point: "vs_main",
-                        buffers: &[Vertex::desc(), Instances::desc()],
-                    },
-                    fragment: Some(wgpu::FragmentState {
-                        module: &shader_module,
-                        entry_point: "fs_main",
-                        targets: &[Some(wgpu::ColorTargetState {
-                            blend: Some(wgpu::BlendState::ALPHA_BLENDING),
-                            ..render_state.target_format.into()
-                        })],
-                    }),
-                    primitive: wgpu::PrimitiveState::default(),
-                    depth_stencil: None,
-                    multisample: wgpu::MultisampleState::default(),
-                    multiview: None,
-                });
-
-        Self { pipeline }
-    }
-
-    pub fn bind(use_push_constants: bool, render_pass: &mut wgpu::RenderPass<'_>) {
-        if use_push_constants {
-            render_pass.set_pipeline(&TILEMAP_SHADER_PUSH_CONSTANTS.pipeline)
-        } else {
-            render_pass.set_pipeline(&TILEMAP_SHADER_UNIFORMS.pipeline)
-        }
-    }
-}
-
-static TILEMAP_SHADER_PUSH_CONSTANTS: Lazy<Shader> = Lazy::new(|| Shader::new(true));
-static TILEMAP_SHADER_UNIFORMS: Lazy<Shader> = Lazy::new(|| Shader::new(false));
diff --git a/src/graphics/primitives/tiles/tilemap_header_push_constants.wgsl b/src/graphics/primitives/tiles/tilemap_header_push_constants.wgsl
deleted file mode 100644
index 534b64e0..00000000
--- a/src/graphics/primitives/tiles/tilemap_header_push_constants.wgsl
+++ /dev/null
@@ -1,7 +0,0 @@
-struct PushConstants {
-    viewport: Viewport,
-    autotiles: Autotiles,
-    opacity: f32,
-}
-
-var<push_constant> push_constants: PushConstants;
diff --git a/src/graphics/primitives/tiles/tilemap_header_uniforms.wgsl b/src/graphics/primitives/tiles/tilemap_header_uniforms.wgsl
deleted file mode 100644
index 69c93a2f..00000000
--- a/src/graphics/primitives/tiles/tilemap_header_uniforms.wgsl
+++ /dev/null
@@ -1,6 +0,0 @@
-@group(1) @binding(0)
-var<uniform> viewport: Viewport;
-@group(2) @binding(0)
-var<storage, read> autotiles: Autotiles;
-@group(3) @binding(0)
-var<uniform> opacity: array<vec4<f32>, 1>;
diff --git a/src/lib.rs b/src/lib.rs
deleted file mode 100644
index 8c60b761..00000000
--- a/src/lib.rs
+++ /dev/null
@@ -1,190 +0,0 @@
-//! Luminol is a supercharged FOSS version of the RPG Maker XP editor.
-//!
-//! Authors:
-//!     Lily Madeline Lyons <lily@nowaffles.com>
-//!
-// #![warn(missing_docs)]
-
-// Copyright (C) 2023 Lily Lyons
-//
-// This file is part of Luminol.
-//
-// Luminol is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Luminol is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
-//
-//     Additional permission under GNU GPL version 3 section 7
-//
-// If you modify this Program, or any covered work, by linking or combining
-// it with Steamworks API by Valve Corporation, containing parts covered by
-// terms of the Steamworks API by Valve Corporation, the licensors of this
-// Program grant you additional permission to convey the resulting work.
-
-#![warn(rust_2018_idioms)]
-#![warn(
-    clippy::all,
-    clippy::panic,
-    clippy::panic_in_result_fn,
-    clippy::panicking_unwrap,
-    clippy::unnecessary_wraps,
-    // unsafe code is sometimes fine but in general we don't want to use it.
-    unsafe_code,
-)]
-// These may be turned on in the future.
-// #![warn(clippy::unwrap, clippy::pedantic)]
-#![allow(
-    clippy::missing_errors_doc,
-    clippy::doc_markdown,
-    clippy::missing_panics_doc,
-    clippy::too_many_lines
-)]
-// You must provide a safety doc. DO NOT TURN OFF THESE LINTS.
-#![forbid(clippy::missing_safety_doc, unsafe_op_in_unsafe_fn)]
-// Okay, lemme run through *why* some of these are enabled
-// 1) min_specialization
-// min_specialization is used in alox-48 to deserialize extra data types.
-// 2) int_roundings
-// int_roundings is close to stabilization.
-#![feature(min_specialization, int_roundings)]
-
-pub use prelude::*;
-
-/// The main Luminol application.
-pub mod luminol;
-
-pub mod prelude;
-
-/// Audio related structs and funtions.
-pub mod audio;
-
-pub mod config;
-
-pub mod cache;
-
-pub mod components;
-
-pub mod command_gen;
-
-/// Floating windows to be displayed anywhere.
-pub mod windows;
-
-/// Stack defined windows that edit values.
-pub mod modals;
-
-/// Tabs to be displayed in the center of Luminol.
-pub mod tabs;
-
-/// Filesystem related structs.
-/// Swaps between filesystem_native and filesystem_wasm depending on the target arch.
-pub mod filesystem;
-
-/// The code for handling lumi, the friendly world machine!
-pub mod lumi;
-
-/// Utilities specific to WebAssembly builds of Luminol.
-#[cfg(target_arch = "wasm32")]
-pub mod web;
-
-#[cfg(feature = "steamworks")]
-pub mod steam;
-
-pub mod graphics;
-
-pub use luminol::Luminol;
-use tabs::tab::Tab;
-
-/// Embedded icon 256x256 in size.
-pub const ICON: &[u8] = include_bytes!("../assets/icon-256.png");
-
-#[allow(missing_docs)]
-#[derive(Default)]
-pub struct ToolbarState {
-    /// The currently selected pencil.
-    pub pencil: Pencil,
-}
-
-#[derive(Default, strum::EnumIter, strum::Display, PartialEq, Eq, Clone, Copy)]
-#[allow(missing_docs)]
-pub enum Pencil {
-    #[default]
-    Pen,
-    Circle,
-    Rectangle,
-    Fill,
-}
-
-/// Passed to windows and widgets when updating.
-pub struct State {
-    /// Filesystem to be passed around.
-    pub filesystem: filesystem::project::FileSystem,
-    /// The data cache.
-    pub data_cache: data::Cache,
-    pub image_cache: image_cache::Cache,
-    pub atlas_cache: atlas::Cache,
-    /// Windows that are displayed.
-    pub windows: window::Windows,
-    /// Tabs that are displayed.
-    pub tabs: tabs::tab::Tabs<Box<dyn Tab + Send>>,
-    #[cfg(not(target_arch = "wasm32"))]
-    /// Audio that's played.
-    pub audio: audio::Audio,
-    #[cfg(target_arch = "wasm32")]
-    /// Audio that's played.
-    pub audio: audio::AudioWrapper,
-    /// Toasts to be displayed.
-    pub toasts: Toasts,
-    pub render_state: egui_wgpu::RenderState,
-    /// Toolbar state
-    pub toolbar: AtomicRefCell<ToolbarState>,
-}
-
-static_assertions::assert_impl_all!(State: Send, Sync);
-
-impl State {
-    /// Create a new UpdateInfo.
-    pub fn new(
-        render_state: egui_wgpu::RenderState,
-        #[cfg(target_arch = "wasm32")] audio_wrapper: audio::AudioWrapper,
-    ) -> Self {
-        Self {
-            filesystem: filesystem::project::FileSystem::default(),
-            data_cache: data::Cache::default(),
-            image_cache: image_cache::Cache::default(),
-            atlas_cache: atlas::Cache::default(),
-            windows: windows::window::Windows::default(),
-            tabs: tab::Tabs::new("global_tabs", vec![Box::new(started::Tab::new())]),
-            #[cfg(not(target_arch = "wasm32"))]
-            audio: audio::Audio::default(),
-            #[cfg(target_arch = "wasm32")]
-            audio: audio_wrapper,
-            toasts: Toasts::default(),
-            render_state,
-            toolbar: AtomicRefCell::default(),
-        }
-    }
-}
-
-static STATE: once_cell::sync::OnceCell<State> = once_cell::sync::OnceCell::new();
-
-#[allow(clippy::panic)]
-fn set_state(info: State) {
-    if STATE.set(info).is_err() {
-        panic!("failed to set updateinfo")
-    }
-}
-
-#[macro_export]
-macro_rules! state {
-    () => {
-        $crate::STATE.get().expect("failed to get updateinfo")
-    };
-}
diff --git a/src/lumi/mod.rs b/src/lumi/mod.rs
index 34ebd764..0a8de598 100644
--- a/src/lumi/mod.rs
+++ b/src/lumi/mod.rs
@@ -22,8 +22,6 @@
 // terms of the Steamworks API by Valve Corporation, the licensors of this
 // Program grant you additional permission to convey the resulting work.
 
-use crate::prelude::*;
-
 mod state;
 
 #[allow(dead_code)]
@@ -70,7 +68,7 @@ impl Lumi {
             self.idle.texture_id(ctx),
             egui::Rect::from_min_size(pos, size),
             egui::Rect::from_min_max(egui::pos2(0.0, 0.0), egui::pos2(1.0, 1.0)),
-            Color32::WHITE,
+            egui::Color32::WHITE,
         );
     }
 }
diff --git a/src/luminol.rs b/src/luminol.rs
deleted file mode 100644
index 1414a543..00000000
--- a/src/luminol.rs
+++ /dev/null
@@ -1,233 +0,0 @@
-// Copyright (C) 2023 Lily Lyons
-//
-// This file is part of Luminol.
-//
-// Luminol is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Luminol is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
-//
-//     Additional permission under GNU GPL version 3 section 7
-//
-// If you modify this Program, or any covered work, by linking or combining
-// it with Steamworks API by Valve Corporation, containing parts covered by
-// terms of the Steamworks API by Valve Corporation, the licensors of this
-// Program grant you additional permission to convey the resulting work.
-
-use crate::lumi::Lumi;
-use crate::prelude::*;
-
-/// Custom implementation of `eframe::Frame` for Luminol.
-/// We need this because the normal `eframe::App` uses a struct with private fields in its
-/// definition of `update()`, and that prevents us from implementing custom app runners.
-pub struct CustomFrame<'a>(
-    #[cfg(not(target_arch = "wasm32"))] pub &'a mut eframe::Frame,
-    #[cfg(target_arch = "wasm32")] pub std::marker::PhantomData<&'a ()>,
-);
-
-#[cfg(not(target_arch = "wasm32"))]
-impl std::ops::Deref for CustomFrame<'_> {
-    type Target = eframe::Frame;
-    fn deref(&self) -> &Self::Target {
-        self.0
-    }
-}
-
-#[cfg(not(target_arch = "wasm32"))]
-impl std::ops::DerefMut for CustomFrame<'_> {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        self.0
-    }
-}
-
-/// Custom implementation of `eframe::App` for Luminol.
-/// We need this because the normal `eframe::App` uses a struct with private fields in its
-/// definition of `update()`, and that prevents us from implementing custom app runners.
-pub trait CustomApp
-where
-    Self: eframe::App,
-{
-    fn custom_update(&mut self, ctx: &egui::Context, frame: &mut CustomFrame<'_>);
-}
-
-#[macro_export]
-macro_rules! app_use_custom_update {
-    () => {
-        fn update(&mut self, ctx: &egui::Context, frame: &mut eframe::Frame) {
-            #[cfg(not(target_arch = "wasm32"))]
-            self.custom_update(ctx, &mut CustomFrame(frame))
-        }
-    };
-}
-
-/// The main Luminol struct. Handles rendering, GUI state, that sort of thing.
-pub struct Luminol {
-    top_bar: TopBar,
-    lumi: Lumi,
-}
-
-impl Luminol {
-    /// Called once before the first frame.
-    #[must_use]
-    pub fn new(
-        cc: &eframe::CreationContext<'_>,
-        try_load_path: Option<std::ffi::OsString>,
-        #[cfg(target_arch = "wasm32")] audio_wrapper: crate::audio::AudioWrapper,
-    ) -> Self {
-        let storage = cc.storage.unwrap();
-
-        if let Some(global_config) = eframe::get_value(storage, "SavedState") {
-            *global_config!() = global_config;
-        }
-        let style =
-            eframe::get_value(storage, "EguiStyle").map_or_else(|| cc.egui_ctx.style(), |s| s);
-        cc.egui_ctx.set_style(style.clone());
-
-        let info = State::new(
-            cc.wgpu_render_state.clone().unwrap(),
-            #[cfg(target_arch = "wasm32")]
-            audio_wrapper,
-        );
-        crate::set_state(info);
-
-        #[cfg(not(debug_assertions))]
-        state!()
-            .render_state
-            .device
-            .on_uncaptured_error(Box::new(|e| {
-                use std::fmt::Write;
-
-                let mut message_description = String::new();
-                match e {
-                    wgpu::Error::OutOfMemory { source } => {
-                        message_description.push_str("wgpu error: Out of memory\n");
-                        writeln!(message_description, "{source:#?}").unwrap();
-                    }
-                    wgpu::Error::Validation {
-                        source,
-                        description,
-                    } => {
-                        message_description.push_str("wgpu error: Validation error\n");
-                        writeln!(message_description, "{source}").unwrap();
-                        writeln!(message_description, "---------").unwrap();
-                        writeln!(message_description, "{}", source.source().unwrap()).unwrap();
-                        writeln!(message_description, "---------").unwrap();
-                        writeln!(message_description, "{source:#?}").unwrap();
-                        writeln!(message_description, "---------").unwrap();
-                        message_description.push_str(&description);
-                    }
-                }
-                rfd::MessageDialog::new()
-                    .set_title("Luminol has crashed!")
-                    .set_level(rfd::MessageLevel::Error)
-                    .set_description(&message_description)
-                    .show();
-
-                let backtrace = std::backtrace::Backtrace::force_capture();
-                rfd::MessageDialog::new()
-                    .set_title("Backtrace")
-                    .set_level(rfd::MessageLevel::Error)
-                    .set_description(&backtrace.to_string())
-                    .show();
-
-                std::process::abort();
-            }));
-
-        #[cfg(not(target_arch = "wasm32"))]
-        if let Some(path) = try_load_path {
-            state!()
-                .filesystem
-                .load_project(path)
-                .expect("failed to load project");
-        }
-
-        let lumi = Lumi::new().expect("failed to load lumi images");
-
-        Self {
-            top_bar: TopBar::default(),
-            lumi,
-        }
-    }
-}
-
-impl CustomApp for Luminol {
-    /// Called each time the UI needs repainting, which may be many times per second.
-    fn custom_update(&mut self, ctx: &eframe::egui::Context, frame: &mut CustomFrame<'_>) {
-        ctx.input(|i| {
-            if let Some(f) = i.raw.dropped_files.first() {
-                let path = f.path.clone().expect("dropped file has no path");
-
-                #[cfg(not(target_arch = "wasm32"))]
-                if let Err(e) = state!().filesystem.load_project(path) {
-                    state!()
-                        .toasts
-                        .error(format!("Error opening dropped project: {e}"))
-                } else {
-                    state!().toasts.info(format!(
-                        "Successfully opened {:?}",
-                        state!()
-                            .filesystem
-                            .project_path()
-                            .expect("project not open")
-                    ));
-                }
-            }
-        });
-
-        egui::TopBottomPanel::top("top_toolbar").show(ctx, |ui| {
-            // We want the top menubar to be horizontal. Without this it would fill up vertically.
-            ui.horizontal_wrapped(|ui| {
-                // Turn off button frame.
-                ui.visuals_mut().button_frame = false;
-                // Show the bar
-                self.top_bar.ui(ui, frame);
-            });
-        });
-
-        // Central panel with tabs.
-        egui::CentralPanel::default()
-            .frame(egui::Frame::central_panel(&ctx.style()).inner_margin(0.))
-            .show(ctx, |ui| {
-                ui.group(|ui| state!().tabs.ui(ui));
-            });
-
-        // Update all windows.
-        state!().windows.update(ctx);
-
-        // Show toasts.
-        state!().toasts.show(ctx);
-
-        #[cfg(not(target_arch = "wasm32"))]
-        poll_promise::tick_local();
-
-        self.lumi.ui(ctx);
-
-        #[cfg(feature = "steamworks")]
-        Steamworks::update()
-    }
-}
-
-impl eframe::App for Luminol {
-    app_use_custom_update!();
-
-    /// Called by the frame work to save state before shutdown.
-    fn save(&mut self, storage: &mut dyn eframe::Storage) {
-        eframe::set_value(storage, "SavedState", &*global_config!());
-    }
-
-    fn persist_egui_memory(&self) -> bool {
-        true
-    }
-
-    fn persist_native_window(&self) -> bool {
-        true
-    }
-}
diff --git a/src/main.rs b/src/main.rs
index 355545b4..1fc26dcc 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,5 +1,3 @@
-#![warn(clippy::all, rust_2018_idioms)]
-#![allow(clippy::uninlined_format_args)]
 // Copyright (C) 2023 Lily Lyons
 //
 // This file is part of Luminol.
@@ -23,26 +21,59 @@
 // it with Steamworks API by Valve Corporation, containing parts covered by
 // terms of the Steamworks API by Valve Corporation, the licensors of this
 // Program grant you additional permission to convey the resulting work.
+#![warn(rust_2018_idioms)]
+#![warn(
+    clippy::all,
+    clippy::panic,
+    clippy::panic_in_result_fn,
+    clippy::panicking_unwrap,
+    clippy::unnecessary_wraps,
+    // unsafe code is sometimes fine but in general we don't want to use it.
+    unsafe_code,
+)]
+// These may be turned on in the future.
+// #![warn(clippy::unwrap, clippy::pedantic)]
+#![allow(
+    clippy::missing_errors_doc,
+    clippy::doc_markdown,
+    clippy::missing_panics_doc,
+    clippy::too_many_lines
+)]
+// You must provide a safety doc.
+#![forbid(clippy::missing_safety_doc, unsafe_op_in_unsafe_fn)]
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release
 
-use luminol::prelude::*;
-
 #[cfg(target_arch = "wasm32")]
 use wasm_bindgen::prelude::*;
 
+/// Embedded icon 256x256 in size.
+const ICON: &[u8] = include_bytes!("../assets/icon-256.png");
+
+mod app;
+mod lumi;
+
+#[cfg(all(feature = "steamworks", target_arch = "wasm32"))]
+compile_error!("Steamworks is not supported on webassembly");
+
+#[cfg(feature = "steamworks")]
+mod steam;
+
 #[cfg(not(target_arch = "wasm32"))]
 fn main() {
     #[cfg(feature = "steamworks")]
-    if let Err(e) = luminol::steam::Steamworks::setup() {
-        rfd::MessageDialog::new()
-            .set_title("Error")
-            .set_level(rfd::MessageLevel::Error)
-            .set_description(format!(
-                "Steam error: {e}\nPerhaps you want to compile yourself a free copy?"
-            ))
-            .show();
-        return;
-    }
+    let steamworks = match steam::Steamworks::new() {
+        Ok(s) => s,
+        Err(e) => {
+            rfd::MessageDialog::new()
+                .set_title("Error")
+                .set_level(rfd::MessageLevel::Error)
+                .set_description(format!(
+                    "Steam error: {e}\nPerhaps you want to compile yourself a free copy?"
+                ))
+                .show();
+            return;
+        }
+    };
 
     #[cfg(debug_assertions)]
     std::thread::spawn(|| loop {
@@ -58,7 +89,7 @@ fn main() {
         rfd::MessageDialog::new()
             .set_title("Fatal Error")
             .set_level(rfd::MessageLevel::Error)
-            .set_description(&format!(
+            .set_description(format!(
                 "Luminol has deadlocked! Please file an issue.\n{} deadlocks detected",
                 deadlocks.len()
             ))
@@ -82,14 +113,11 @@ fn main() {
     // Log to stdout (if you run with `RUST_LOG=debug`).
     tracing_subscriber::fmt::init();
 
-    color_eyre::install().expect("failed to setup eyre hooks");
-
-    #[cfg(windows)]
-    if let Err(e) = setup_file_assocs() {
-        eprintln!("error setting up registry {e}")
-    }
+    color_backtrace::BacktracePrinter::new()
+        .verbosity(color_backtrace::Verbosity::Full)
+        .install(color_backtrace::default_output_stream());
 
-    let image = image::load_from_memory(luminol::ICON).expect("Failed to load Icon data.");
+    let image = image::load_from_memory(ICON).expect("Failed to load Icon data.");
 
     let native_options = eframe::NativeOptions {
         drag_and_drop_support: true,
@@ -97,12 +125,12 @@ fn main() {
         icon_data: Some(eframe::IconData {
             width: image.width(),
             height: image.height(),
-            rgba: image.into_bytes(),
+            rgba: image.to_rgba8().into_vec(),
         }),
         wgpu_options: eframe::egui_wgpu::WgpuConfiguration {
             supported_backends: eframe::wgpu::util::backend_bits_from_env()
                 .unwrap_or(eframe::wgpu::Backends::PRIMARY),
-            device_descriptor: luminol::Arc::new(|_| eframe::wgpu::DeviceDescriptor {
+            device_descriptor: std::sync::Arc::new(|_| eframe::wgpu::DeviceDescriptor {
                 label: Some("luminol device descriptor"),
                 features: eframe::wgpu::Features::PUSH_CONSTANTS,
                 limits: eframe::wgpu::Limits {
@@ -113,13 +141,21 @@ fn main() {
             ..Default::default()
         },
         app_id: Some("astrabit.luminol".to_string()),
+        persist_window: true,
         ..Default::default()
     };
 
     eframe::run_native(
         "Luminol",
         native_options,
-        Box::new(|cc| Box::new(luminol::Luminol::new(cc, std::env::args_os().nth(1)))),
+        Box::new(|cc| {
+            Box::new(app::App::new(
+                cc,
+                std::env::args_os().nth(1),
+                #[cfg(feature = "steamworks")]
+                steamworks,
+            ))
+        }),
     )
     .expect("failed to start luminol");
 }
@@ -132,35 +168,38 @@ const CANVAS_ID: &str = "luminol-canvas";
 
 #[cfg(target_arch = "wasm32")]
 struct WorkerData {
-    audio: luminol::audio::AudioWrapper,
+    audio: luminol_audio::AudioWrapper,
     prefers_color_scheme_dark: Option<bool>,
-    filesystem_tx: mpsc::UnboundedSender<filesystem::web::FileSystemCommand>,
-    output_tx: mpsc::UnboundedSender<luminol::web::WebWorkerRunnerOutput>,
-    event_rx: mpsc::UnboundedReceiver<egui::Event>,
-    custom_event_rx: mpsc::UnboundedReceiver<luminol::web::WebWorkerRunnerEvent>,
+    filesystem_tx: flume::Sender<luminol_filesystem::host::FileSystemCommand>,
+    output_tx: flume::Sender<luminol_web::WebWorkerRunnerOutput>,
+    event_rx: flume::Receiver<egui::Event>,
+    custom_event_rx: flume::Receiver<luminol_web::WebWorkerRunnerEvent>,
 }
 
 #[cfg(target_arch = "wasm32")]
-static WORKER_DATA: Lazy<AtomicRefCell<Option<WorkerData>>> =
-    Lazy::new(|| AtomicRefCell::new(None));
+static WORKER_DATA: parking_lot::RwLock<Option<WorkerData>> = parking_lot::RwLock::new(None);
 
 #[cfg(target_arch = "wasm32")]
 #[wasm_bindgen]
 pub fn luminol_main_start() {
-    let (panic_tx, mut panic_rx) = mpsc::unbounded_channel::<()>();
+    let (panic_tx, mut panic_rx) = flume::unbounded::<()>();
 
     wasm_bindgen_futures::spawn_local(async move {
-        if panic_rx.recv().await.is_some() {
+        if panic_rx.recv_async().await.is_ok() {
             let _ = web_sys::window().map(|window| window.alert_with_message("Luminol has crashed! Please check your browser's developer console for more details."));
         }
     });
 
-    let (panic, _) = color_eyre::config::HookBuilder::new().into_hooks();
     std::panic::set_hook(Box::new(move |info| {
-        luminol::web::web_worker_runner::panic_hook();
+        luminol_web::web_worker_runner::panic_hook();
 
-        let report = panic.panic_report(info);
-        web_sys::console::log_1(&js_sys::JsString::from(report.to_string()));
+        let backtrace_printer =
+            color_backtrace::BacktracePrinter::new().verbosity(color_backtrace::Verbosity::Full);
+        let mut buffer = color_backtrace::termcolor::Ansi::new(vec![]);
+        backtrace_printer.print_panic_info(info, &mut buffer);
+        let report = String::from_utf8(buffer.into_inner()).expect("panic report not valid utf-8");
+
+        web_sys::console::log_1(&js_sys::JsString::from(report));
 
         let _ = panic_tx.send(());
     }));
@@ -187,26 +226,26 @@ pub fn luminol_main_start() {
         .transfer_control_to_offscreen()
         .expect("could not transfer canvas control to offscreen");
 
-    if !luminol::web::bindings::cross_origin_isolated() {
+    if !luminol_web::bindings::cross_origin_isolated() {
         tracing::error!("Luminol requires Cross-Origin Isolation to be enabled in order to run.");
         return;
     }
 
-    let (filesystem_tx, filesystem_rx) = mpsc::unbounded_channel();
-    let (output_tx, output_rx) = mpsc::unbounded_channel();
-    let (event_tx, event_rx) = mpsc::unbounded_channel();
-    let (custom_event_tx, custom_event_rx) = mpsc::unbounded_channel();
+    let (filesystem_tx, filesystem_rx) = flume::unbounded();
+    let (output_tx, output_rx) = flume::unbounded();
+    let (event_tx, event_rx) = flume::unbounded();
+    let (custom_event_tx, custom_event_rx) = flume::unbounded();
 
-    filesystem::web::setup_main_thread_hooks(filesystem_rx);
-    luminol::web::web_worker_runner::setup_main_thread_hooks(
+    luminol_filesystem::host::setup_main_thread_hooks(filesystem_rx);
+    luminol_web::web_worker_runner::setup_main_thread_hooks(
         canvas,
         event_tx.clone(),
         custom_event_tx.clone(),
         output_rx,
     );
 
-    *WORKER_DATA.borrow_mut() = Some(WorkerData {
-        audio: luminol::audio::Audio::default().into(),
+    *WORKER_DATA.write() = Some(WorkerData {
+        audio: luminol_audio::Audio::default().into(),
         prefers_color_scheme_dark,
         filesystem_tx,
         output_tx,
@@ -241,14 +280,14 @@ pub async fn luminol_worker_start(canvas: web_sys::OffscreenCanvas) {
         output_tx,
         event_rx,
         custom_event_rx,
-    } = WORKER_DATA.borrow_mut().take().unwrap();
+    } = WORKER_DATA.write().take().unwrap();
 
-    filesystem::web::FileSystem::setup_filesystem_sender(filesystem_tx);
+    luminol_filesystem::host::FileSystem::setup_filesystem_sender(filesystem_tx);
 
     let web_options = eframe::WebOptions::default();
 
-    let runner = luminol::web::WebWorkerRunner::new(
-        Box::new(|cc| Box::new(luminol::Luminol::new(cc, None, audio))),
+    let runner = luminol_web::WebWorkerRunner::new(
+        Box::new(|cc| Box::new(app::App::new(cc, audio))),
         canvas,
         web_options,
         "astrabit.luminol",
@@ -260,54 +299,3 @@ pub async fn luminol_worker_start(canvas: web_sys::OffscreenCanvas) {
     .await;
     runner.setup_render_hooks();
 }
-
-#[cfg(windows)]
-fn setup_file_assocs() -> std::io::Result<()> {
-    /*
-       use winreg::enums::*;
-       use winreg::RegKey;
-
-       let path = std::env::current_exe().expect("failed to get current executable path");
-       let path = path.to_string_lossy();
-       let command = format!("\"{path}\" \"%1\"");
-
-       let hkcu = RegKey::predef(HKEY_CURRENT_USER);
-
-       // RXPROJ
-       let (key, _) = hkcu.create_subkey("Software\\Classes\\.rxproj")?;
-       key.set_value("", &"Luminol.rxproj")?;
-       let (rxproj_key, _) = hkcu.create_subkey("Software\\Classes\\Luminol.rxproj")?;
-       rxproj_key.set_value("", &"RPG Maker XP Project")?;
-       let (open_key, _) = rxproj_key.create_subkey("shell\\open\\command")?;
-       open_key.set_value("", &command)?;
-       let (icon_key, _) = rxproj_key.create_subkey("DefaultIcon")?;
-       icon_key.set_value("", &format!("\"{path}\",2"))?;
-
-       // RXDATA
-       let (key, _) = hkcu.create_subkey("Software\\Classes\\.rxdata")?;
-       key.set_value("", &"Luminol.rxdata")?;
-       let (rxdata_key, _) = hkcu.create_subkey("Software\\Classes\\Luminol.rxdata")?;
-       rxdata_key.set_value("", &"RPG Maker XP Data")?;
-       let (icon_key, _) = rxdata_key.create_subkey("DefaultIcon")?;
-       icon_key.set_value("", &format!("\"{path}\",3"))?;
-
-       // LUMPROJ
-       let (key, _) = hkcu.create_subkey("Software\\Classes\\.lumproj")?;
-       key.set_value("", &"Luminol.lumproj")?;
-       let (lumproj_key, _) = hkcu.create_subkey("Software\\Classes\\Luminol.lumproj")?;
-       lumproj_key.set_value("", &"Luminol project")?;
-       let (open_key, _) = lumproj_key.create_subkey("shell\\open\\command")?;
-       open_key.set_value("", &command)?;
-       let (icon_key, _) = lumproj_key.create_subkey("DefaultIcon")?;
-       icon_key.set_value("", &format!("\"{path}\",4"))?;
-
-       let (app_key, _) = hkcu.create_subkey("Software\\Classes\\Applications\\luminol.exe")?;
-       app_key.set_value("FriendlyAppName", &"Luminol")?;
-       let (supported_key, _) = app_key.create_subkey("SupportedTypes")?;
-       supported_key.set_value(".rxproj", &"")?;
-       supported_key.set_value(".lumproj", &"")?;
-       let (open_key, _) = app_key.create_subkey("shell\\open\\command")?;
-       open_key.set_value("", &command)?;
-    */
-    Ok(())
-}
diff --git a/src/prelude.rs b/src/prelude.rs
deleted file mode 100644
index c810a5dc..00000000
--- a/src/prelude.rs
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright (C) 2023 Lily Lyons
-//
-// This file is part of Luminol.
-//
-// Luminol is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Luminol is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
-//
-//     Additional permission under GNU GPL version 3 section 7
-//
-// If you modify this Program, or any covered work, by linking or combining
-// it with Steamworks API by Valve Corporation, containing parts covered by
-// terms of the Steamworks API by Valve Corporation, the licensors of this
-// Program grant you additional permission to convey the resulting work.
-
-pub use crate::audio;
-pub use crate::cache::*;
-pub use crate::components::*;
-pub use crate::config;
-pub use crate::graphics::*;
-pub use crate::modals::*;
-pub use crate::tabs::*;
-pub use crate::windows::*;
-
-pub use crate::filesystem;
-pub use crate::filesystem::FileSystem;
-
-pub use crate::app_use_custom_update;
-pub use crate::luminol::CustomApp;
-
-pub use std::collections::HashMap;
-pub use std::num::NonZeroUsize;
-pub use std::path::{Path, PathBuf};
-pub use std::sync::Arc;
-
-pub use atomic_refcell::{AtomicRef, AtomicRefCell, AtomicRefMut};
-pub use once_cell::sync::{Lazy, OnceCell};
-pub use parking_lot::{MappedMutexGuard, Mutex, MutexGuard};
-pub use parking_lot::{MappedRwLockWriteGuard, RwLock, RwLockWriteGuard};
-
-#[cfg(target_arch = "wasm32")]
-pub use tokio::sync::mpsc;
-#[cfg(target_arch = "wasm32")]
-pub use tokio::sync::oneshot;
-
-pub use crate::State;
-
-pub use crate::command_db;
-pub use crate::game_ini;
-pub use crate::global_config;
-pub use crate::project_config;
-pub use crate::state;
-
-pub use eframe::egui;
-pub use eframe::egui_wgpu;
-pub use eframe::egui_wgpu::wgpu;
-
-pub use egui::epaint;
-pub use egui::Color32;
-pub use egui::TextureOptions;
-pub use egui_extras::RetainedImage;
-
-pub use itertools::Itertools;
-
-pub use poll_promise::Promise;
-
-pub use strum::IntoEnumIterator;
-
-pub use rmxp_types::*;
-
-#[cfg(feature = "steamworks")]
-pub use crate::steam::Steamworks;
diff --git a/src/steam.rs b/src/steam.rs
index 27c8ecd2..e14a0556 100644
--- a/src/steam.rs
+++ b/src/steam.rs
@@ -21,41 +21,27 @@
 // it with Steamworks API by Valve Corporation, containing parts covered by
 // terms of the Steamworks API by Valve Corporation, the licensors of this
 // Program grant you additional permission to convey the resulting work.
-use once_cell::sync::OnceCell;
-use parking_lot::Mutex;
 
 const APPID: u32 = 2501490;
 
 pub struct Steamworks {
     pub client: steamworks::Client<steamworks::ClientManager>,
-    pub single: Mutex<steamworks::SingleClient<steamworks::ClientManager>>,
+    pub single: parking_lot::Mutex<steamworks::SingleClient<steamworks::ClientManager>>,
 }
 
 impl Steamworks {
-    pub fn setup() -> Result<(), steamworks::SteamError> {
+    pub fn new() -> Result<Self, steamworks::SteamError> {
         let (client, single) = steamworks::Client::init_app(APPID)?;
-        let single = Mutex::new(single);
+        let single = parking_lot::Mutex::new(single);
 
         let steamworks = Steamworks { client, single };
 
-        STEAMWORKS
-            .set(steamworks)
-            .ok()
-            .expect("steamworks already initialized");
-
-        Ok(())
-    }
-
-    pub fn get() -> &'static Self {
-        STEAMWORKS.get().expect("failed to get steamworks")
+        Ok(steamworks)
     }
 
-    pub fn update() {
-        let steamworks = Self::get();
-        let single = steamworks.single.lock();
+    pub fn update(&self) {
+        let single = self.single.lock();
 
         single.run_callbacks();
     }
 }
-
-static STEAMWORKS: OnceCell<Steamworks> = OnceCell::new();
diff --git a/src/tabs/map.rs b/src/tabs/map.rs
deleted file mode 100644
index d364eed3..00000000
--- a/src/tabs/map.rs
+++ /dev/null
@@ -1,1023 +0,0 @@
-// Copyright (C) 2023 Lily Lyons
-//
-// This file is part of Luminol.
-//
-// Luminol is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Luminol is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
-//
-//     Additional permission under GNU GPL version 3 section 7
-//
-// If you modify this Program, or any covered work, by linking or combining
-// it with Steamworks API by Valve Corporation, containing parts covered by
-// terms of the Steamworks API by Valve Corporation, the licensors of this
-// Program grant you additional permission to convey the resulting work.
-
-#![allow(unused_imports)]
-use egui::Pos2;
-use std::{cell::RefMut, collections::HashMap, collections::VecDeque};
-
-use crate::prelude::*;
-use crate::Pencil;
-
-const HISTORY_SIZE: usize = 50;
-
-pub struct Tab {
-    /// ID of the map that is being edited.
-    pub id: usize,
-    /// The tilemap.
-    pub view: MapView,
-    pub tilepicker: Tilepicker,
-
-    dragging_event: bool,
-    drawing_shape: bool,
-    event_windows: window::Windows,
-    force_close: bool,
-
-    /// When event dragging starts, this is set to the difference between
-    /// the dragged event's tile and the cursor position
-    event_drag_offset: Option<egui::Vec2>,
-
-    layer_cache: Vec<i16>,
-
-    /// This cache is used by the depth-first search when using the fill brush
-    dfs_cache: Vec<bool>,
-    /// This is used to save a copy of the current layer when using the
-    /// rectangle or circle brush
-    brush_layer_cache: Vec<i16>,
-    /// When drawing with any brush,
-    /// this is set to the position of the original tile we began drawing on
-    drawing_shape_pos: Option<egui::Pos2>,
-
-    /// Undo history
-    history: VecDeque<HistoryEntry>,
-    /// When operations are undone, they are put here so that they can be redone
-    redo_history: Vec<HistoryEntry>,
-    /// When starting to draw tiles, this is set to the state of the layer before
-    /// any tiles are drawn in order to compute the deltas for the history
-    tilemap_undo_cache: Vec<i16>,
-    /// The layer tilemap_undo_cache refers to
-    tilemap_undo_cache_layer: usize,
-}
-
-// TODO: If we add support for changing event IDs, these need to be added as history entries
-// in order to not corrupt the EventMoved and EventCreated entries.
-enum HistoryEntry {
-    /// Contains the (x, y, tile_id) delta for a changed map layer.
-    Tiles {
-        layer: usize,
-        delta: Vec<(usize, usize, i16)>,
-    },
-    /// Contains the original map coordinates of a moved event and the ID of the event.
-    EventMoved { id: usize, x: i32, y: i32 },
-    /// Contains the ID of a created event.
-    EventCreated(usize),
-    /// Contains a deleted event and its corresponding graphic.
-    EventDeleted {
-        event: rpg::Event,
-        sprites: Option<(Event, Event)>,
-    },
-}
-
-impl Tab {
-    /// Create a new map editor.
-    pub fn new(id: usize) -> Result<Self, String> {
-        let map = state!().data_cache.map(id);
-        let tilesets = state!().data_cache.tilesets();
-        let tileset = &tilesets[map.tileset_id];
-
-        Ok(Self {
-            id,
-            view: MapView::new(&map, tileset)?,
-            tilepicker: Tilepicker::new(tileset)?,
-
-            dragging_event: false,
-            drawing_shape: false,
-            event_windows: window::Windows::default(),
-            force_close: false,
-
-            event_drag_offset: None,
-
-            layer_cache: vec![0; map.data.xsize() * map.data.ysize()],
-
-            dfs_cache: vec![false; map.data.xsize() * map.data.ysize()],
-            brush_layer_cache: vec![0; map.data.xsize() * map.data.ysize()],
-            drawing_shape_pos: None,
-
-            history: VecDeque::with_capacity(HISTORY_SIZE),
-            redo_history: Vec::with_capacity(HISTORY_SIZE),
-            tilemap_undo_cache: vec![0; map.data.xsize() * map.data.ysize()],
-            tilemap_undo_cache_layer: 0,
-        })
-    }
-
-    fn recompute_autotile(&self, map: &rpg::Map, position: (usize, usize, usize)) -> i16 {
-        if map.data[position] >= 384 {
-            return map.data[position];
-        }
-
-        let autotile = map.data[position] / 48;
-        if autotile == 0 {
-            return 0;
-        }
-
-        let x_array: [i8; 8] = [-1, 0, 1, 1, 1, 0, -1, -1];
-        let y_array: [i8; 8] = [-1, -1, -1, 0, 1, 1, 1, 0];
-
-        /*
-         * 765
-         * 0 4
-         * 123
-         */
-        let mut bitfield = 0u8;
-
-        // Loop through the 8 neighbors of this position
-        for (x, y) in x_array.into_iter().zip(y_array.into_iter()) {
-            bitfield <<= 1;
-            // Out-of-bounds tiles always count as valid neighbors
-            let is_out_of_bounds = ((x == -1 && position.0 == 0)
-                || (x == 1 && position.0 + 1 == map.data.xsize()))
-                || ((y == -1 && position.1 == 0) || (y == 1 && position.1 + 1 == map.data.ysize()));
-            // Otherwise, we only consider neighbors that are autotiles of the same type
-            let is_same_autotile = !is_out_of_bounds
-                && map.data[(
-                    if x == -1 {
-                        position.0 - 1
-                    } else {
-                        position.0 + x as usize
-                    },
-                    if y == -1 {
-                        position.1 - 1
-                    } else {
-                        position.1 + y as usize
-                    },
-                    position.2,
-                )] / 48
-                    == autotile;
-
-            if is_out_of_bounds || is_same_autotile {
-                bitfield |= 1
-            }
-        }
-
-        // Check how many edges have valid neighbors
-        autotile * 48
-            + match (bitfield & 0b01010101).count_ones() {
-                4 => {
-                    // If the autotile is surrounded on all 4 edges,
-                    // then the autotile variant is one of the first 16,
-                    // depending on which corners are surrounded
-                    let tl = (bitfield & 0b10000000 == 0) as u8;
-                    let tr = (bitfield & 0b00100000 == 0) as u8;
-                    let br = (bitfield & 0b00001000 == 0) as u8;
-                    let bl = (bitfield & 0b00000010 == 0) as u8;
-                    tl | (tr << 1) | (br << 2) | (bl << 3)
-                }
-
-                3 => {
-                    // Rotate the bitfield 90 degrees counterclockwise until
-                    // the one edge that is not surrounded is at the left
-                    let mut bitfield = bitfield;
-                    let mut i = 16u8;
-                    while bitfield & 0b00000001 != 0 {
-                        bitfield = bitfield.rotate_left(2);
-                        i += 4;
-                    }
-                    // Now, the variant is one of the next 16
-                    let tr = (bitfield & 0b00100000 == 0) as u8;
-                    let br = (bitfield & 0b00001000 == 0) as u8;
-                    i + (tr | (br << 1))
-                }
-
-                // Top and bottom edges
-                2 if bitfield & 0b01000100 == 0b01000100 => 32,
-
-                // Left and right edges
-                2 if bitfield & 0b00010001 == 0b00010001 => 33,
-
-                2 => {
-                    // Rotate the bitfield 90 degrees counterclockwise until
-                    // the two edges that are surrounded are at the right and bottom
-                    let mut bitfield = bitfield;
-                    let mut i = 34u8;
-                    while bitfield & 0b00010100 != 0b00010100 {
-                        bitfield = bitfield.rotate_left(2);
-                        i += 2;
-                    }
-                    let br = (bitfield & 0b00001000 == 0) as u8;
-                    i + br
-                }
-
-                1 => {
-                    // Rotate the bitfield 90 degrees clockwise until
-                    // the edge is at the bottom
-                    let mut bitfield = bitfield;
-                    let mut i = 42u8;
-                    while bitfield & 0b00000100 == 0 {
-                        bitfield = bitfield.rotate_right(2);
-                        i += 1;
-                    }
-                    i
-                }
-
-                0 => 46,
-
-                _ => unreachable!(),
-            } as i16
-    }
-
-    fn set_tile(&self, map: &mut rpg::Map, tile: SelectedTile, position: (usize, usize, usize)) {
-        map.data[position] = tile.to_id();
-
-        for y in -1i8..=1i8 {
-            for x in -1i8..=1i8 {
-                // Don't check tiles that are out of bounds
-                if ((x == -1 && position.0 == 0) || (x == 1 && position.0 + 1 == map.data.xsize()))
-                    || ((y == -1 && position.1 == 0)
-                        || (y == 1 && position.1 + 1 == map.data.ysize()))
-                {
-                    continue;
-                }
-                let position = (
-                    if x == -1 {
-                        position.0 - 1
-                    } else {
-                        position.0 + x as usize
-                    },
-                    if y == -1 {
-                        position.1 - 1
-                    } else {
-                        position.1 + y as usize
-                    },
-                    position.2,
-                );
-                let tile_id = self.recompute_autotile(map, position);
-                map.data[position] = tile_id;
-            }
-        }
-    }
-
-    fn add_event(&self, map: &mut rpg::Map) -> Option<usize> {
-        let mut first_vacant_id = 1;
-        let mut max_event_id = 0;
-
-        for (_, event) in map.events.iter() {
-            if event.id == first_vacant_id {
-                first_vacant_id += 1;
-            }
-            max_event_id = event.id;
-
-            if event.x == self.view.cursor_pos.x as i32 && event.y == self.view.cursor_pos.y as i32
-            {
-                state!()
-                    .toasts
-                    .error("Cannot create event on an existing event's tile");
-                return None;
-            }
-        }
-
-        // Try first to allocate the event number directly after the current highest one.
-        // However, valid event number range in RPG Maker XP and VX is 1-999.
-        let new_event_id = if max_event_id < 999 {
-            max_event_id + 1
-        }
-        // Otherwise, we'll try to use a non-allocated event ID that isn't zero.
-        else if first_vacant_id <= 999 {
-            first_vacant_id
-        } else {
-            state!()
-                .toasts
-                .error("Event limit reached, please delete some events");
-            return None;
-        };
-
-        map.events.insert(
-            new_event_id,
-            rpg::Event::new(
-                self.view.cursor_pos.x as i32,
-                self.view.cursor_pos.y as i32,
-                new_event_id,
-            ),
-        );
-
-        self.event_windows
-            .add_window(event_edit::Window::new(new_event_id, self.id));
-        Some(new_event_id)
-    }
-}
-
-impl tab::Tab for Tab {
-    fn name(&self) -> String {
-        let mapinfos = state!().data_cache.mapinfos();
-        format!("Map {}: {}", self.id, mapinfos[&self.id].name)
-    }
-
-    fn id(&self) -> egui::Id {
-        egui::Id::new("luminol_map").with(self.id)
-    }
-
-    fn force_close(&mut self) -> bool {
-        self.force_close
-    }
-
-    fn show(&mut self, ui: &mut egui::Ui) {
-        // Display the toolbar.
-        egui::TopBottomPanel::top(format!("map_{}_toolbar", self.id)).show_inside(ui, |ui| {
-            ui.horizontal_wrapped(|ui| {
-                ui.add(
-                    egui::Slider::new(&mut self.view.scale, 15.0..=300.)
-                        .text("Scale")
-                        .fixed_decimals(0),
-                );
-
-                ui.separator();
-
-                ui.menu_button(
-                    // Format the text based on what layer is selected.
-                    match self.view.selected_layer {
-                        SelectedLayer::Events => "Events ⏷".to_string(),
-                        SelectedLayer::Tiles(layer) => format!("Layer {} ⏷", layer + 1),
-                    },
-                    |ui| {
-                        // TODO: Add layer enable button
-                        // Display all layers.
-                        ui.columns(2, |columns| {
-                            columns[1].visuals_mut().button_frame = true;
-                            columns[0].label(egui::RichText::new("Panorama").underline());
-                            columns[1].checkbox(&mut self.view.map.pano_enabled, "👁");
-
-                            for (index, layer) in
-                                self.view.map.enabled_layers.iter_mut().enumerate()
-                            {
-                                columns[0].selectable_value(
-                                    &mut self.view.selected_layer,
-                                    SelectedLayer::Tiles(index),
-                                    format!("Layer {}", index + 1),
-                                );
-                                columns[1].checkbox(layer, "👁");
-                            }
-
-                            // Display event layer.
-                            columns[0].selectable_value(
-                                &mut self.view.selected_layer,
-                                SelectedLayer::Events,
-                                egui::RichText::new("Events").italics(),
-                            );
-                            columns[1].checkbox(&mut self.view.event_enabled, "👁");
-
-                            columns[0].label(egui::RichText::new("Fog").underline());
-                            columns[1].checkbox(&mut self.view.map.fog_enabled, "👁");
-                        });
-                    },
-                );
-
-                ui.separator();
-
-                ui.checkbox(&mut self.view.visible_display, "Display Visible Area")
-                    .on_hover_text("Display the visible area in-game (640x480)");
-                ui.checkbox(&mut self.view.move_preview, "Preview event move routes")
-                    .on_hover_text("Preview event page move routes");
-                ui.checkbox(&mut self.view.snap_to_grid, "Snap to grid")
-                    .on_hover_text("Snap's the viewport to the tile grid");
-                ui.checkbox(
-                    &mut self.view.darken_unselected_layers,
-                    "Darken unselected layers",
-                )
-                .on_disabled_hover_text("Toggles darkening unselected layers");
-
-                /*
-                if ui.button("Save map preview").clicked() {
-                    self.tilemap.save_to_disk();
-                }
-
-                if map.preview_move_route.is_some()
-                && ui.button("Clear move route preview").clicked()
-                {
-                    map.preview_move_route = None;
-                }
-                */
-            });
-        });
-
-        // Display the tilepicker.
-        let spacing = ui.spacing();
-        let tilepicker_default_width = 256.
-            + 3. * spacing.window_margin.left
-            + spacing.scroll_bar_inner_margin
-            + spacing.scroll_bar_width
-            + spacing.scroll_bar_outer_margin;
-        egui::SidePanel::left(format!("map_{}_tilepicker", self.id))
-            .default_width(tilepicker_default_width)
-            .max_width(tilepicker_default_width)
-            .show_inside(ui, |ui| {
-                egui::ScrollArea::both().show_viewport(ui, |ui, rect| {
-                    self.tilepicker.ui(ui, rect);
-                    ui.separator();
-                });
-            });
-
-        egui::CentralPanel::default().show_inside(ui, |ui| {
-            egui::Frame::canvas(ui.style()).show(ui, |ui| {
-                // Get the map.
-                let mut map = state!().data_cache.map(self.id);
-
-                // Save the state of the selected layer into the cache
-                if let SelectedLayer::Tiles(tile_layer) = self.view.selected_layer {
-                    for x in 0..map.data.xsize() {
-                        for y in 0..map.data.ysize() {
-                            self.layer_cache[x + y * map.data.xsize()] =
-                                map.data[(x, y, tile_layer)];
-                        }
-                    }
-                }
-
-                let response = self.view.ui(
-                    ui,
-                    &map,
-                    &self.tilepicker,
-                    self.dragging_event,
-                    self.drawing_shape,
-                    self.drawing_shape_pos,
-                    matches!(state!().toolbar.borrow().pencil, Pencil::Pen),
-                );
-
-                let layers_max = map.data.zsize();
-                let map_x = self.view.cursor_pos.x as i32;
-                let map_y = self.view.cursor_pos.y as i32;
-
-                if self.dragging_event && self.view.selected_event_id.is_none() {
-                    self.dragging_event = false;
-                    self.event_drag_offset = None;
-                }
-
-                if !response.dragged_by(egui::PointerButton::Primary) {
-                    if self.drawing_shape {
-                        self.drawing_shape = false;
-                    }
-
-                    if self.drawing_shape_pos.is_some() {
-                        self.drawing_shape_pos = None;
-                        self.redo_history.clear();
-                        if self.history.len() == HISTORY_SIZE {
-                            self.history.pop_front();
-                        }
-                        self.history.push_back(HistoryEntry::Tiles {
-                            layer: self.tilemap_undo_cache_layer,
-                            delta: (0..map.data.ysize())
-                                .cartesian_product(0..map.data.xsize())
-                                .filter_map(|(y, x)| {
-                                    let old_id = self.tilemap_undo_cache[x + y * map.data.xsize()];
-                                    if map.data[(x, y, self.tilemap_undo_cache_layer)] != old_id {
-                                        Some((x, y, old_id))
-                                    } else {
-                                        None
-                                    }
-                                })
-                                .collect(),
-                        });
-                    }
-                }
-
-                if let SelectedLayer::Tiles(tile_layer) = self.view.selected_layer {
-                    // Before drawing tiles, save the state of the current layer so we can undo it
-                    // later if we need to
-                    if response.drag_started_by(egui::PointerButton::Primary)
-                        && !ui.input(|i| i.modifiers.command)
-                    {
-                        self.tilemap_undo_cache_layer = tile_layer;
-                        for i in 0..self.layer_cache.len() {
-                            self.tilemap_undo_cache[i] = self.layer_cache[i];
-                        }
-                    }
-
-                    // Tile drawing
-                    let position = (map_x as usize, map_y as usize, tile_layer);
-                    let initial_tile = SelectedTile::from_id(map.data[position]);
-                    let left = self.tilepicker.selected_tiles_left;
-                    let right = self.tilepicker.selected_tiles_right;
-                    let top = self.tilepicker.selected_tiles_top;
-                    let bottom = self.tilepicker.selected_tiles_bottom;
-                    let width = right - left + 1;
-                    let height = bottom - top + 1;
-                    if response.dragged_by(egui::PointerButton::Primary)
-                        && !ui.input(|i| i.modifiers.command)
-                    {
-                        match state!().toolbar.borrow().pencil {
-                            Pencil::Pen => {
-                                let drawing_shape_pos =
-                                    if let Some(drawing_shape_pos) = self.drawing_shape_pos {
-                                        drawing_shape_pos
-                                    } else {
-                                        self.drawing_shape_pos = Some(self.view.cursor_pos);
-                                        self.view.cursor_pos
-                                    };
-                                for y in 0..height {
-                                    for x in 0..width {
-                                        // Skip out-of-bounds tiles
-                                        if ((x == -1 && position.0 == 0)
-                                            || (x == 1 && position.0 + 1 == map.data.xsize()))
-                                            || ((y == -1 && position.1 == 0)
-                                                || (y == 1 && position.1 + 1 == map.data.ysize()))
-                                        {
-                                            continue;
-                                        }
-
-                                        self.set_tile(
-                                            &mut map,
-                                            self.tilepicker.get_tile_from_offset(
-                                                x + (self.view.cursor_pos.x - drawing_shape_pos.x)
-                                                    as i16,
-                                                y + (self.view.cursor_pos.y - drawing_shape_pos.y)
-                                                    as i16,
-                                            ),
-                                            (
-                                                position.0 + x as usize,
-                                                position.1 + y as usize,
-                                                tile_layer,
-                                            ),
-                                        );
-                                    }
-                                }
-                            }
-
-                            Pencil::Fill
-                                if initial_tile == self.tilepicker.get_tile_from_offset(0, 0) => {}
-                            Pencil::Fill => {
-                                // Use depth-first search to find all of the orthogonally
-                                // contiguous matching tiles
-                                let mut stack = vec![position; 1];
-                                let initial_x = position.0;
-                                let initial_y = position.1;
-                                while let Some(position) = stack.pop() {
-                                    self.set_tile(
-                                        &mut map,
-                                        self.tilepicker.get_tile_from_offset(
-                                            position.0 as i16 - initial_x as i16,
-                                            position.1 as i16 - initial_y as i16,
-                                        ),
-                                        position,
-                                    );
-                                    self.dfs_cache[position.0 + position.1 * map.data.xsize()] =
-                                        true;
-
-                                    let x_array: [i8; 4] = [-1, 1, 0, 0];
-                                    let y_array: [i8; 4] = [0, 0, -1, 1];
-                                    for (x, y) in x_array.into_iter().zip(y_array.into_iter()) {
-                                        // Don't search tiles that are out of bounds
-                                        if ((x == -1 && position.0 == 0)
-                                            || (x == 1 && position.0 + 1 == map.data.xsize()))
-                                            || ((y == -1 && position.1 == 0)
-                                                || (y == 1 && position.1 + 1 == map.data.ysize()))
-                                        {
-                                            continue;
-                                        }
-
-                                        let position = (
-                                            if x == -1 {
-                                                position.0 - 1
-                                            } else {
-                                                position.0 + x as usize
-                                            },
-                                            if y == -1 {
-                                                position.1 - 1
-                                            } else {
-                                                position.1 + y as usize
-                                            },
-                                            position.2,
-                                        );
-
-                                        // Don't search tiles that we've already searched before
-                                        // because that would cause an infinite loop
-                                        if self.dfs_cache
-                                            [position.0 + position.1 * map.data.xsize()]
-                                        {
-                                            continue;
-                                        }
-
-                                        if SelectedTile::from_id(map.data[position]) == initial_tile
-                                        {
-                                            stack.push(position);
-                                        }
-                                    }
-                                }
-
-                                for x in self.dfs_cache.iter_mut() {
-                                    *x = false;
-                                }
-                            }
-
-                            Pencil::Rectangle => {
-                                if !self.drawing_shape {
-                                    // Save the current layer
-                                    for x in 0..map.data.xsize() {
-                                        for y in 0..map.data.ysize() {
-                                            self.brush_layer_cache[x + y * map.data.xsize()] =
-                                                map.data[(x, y, tile_layer)];
-                                        }
-                                    }
-                                    self.drawing_shape = true;
-                                } else {
-                                    // Restore the previously stored state of the current layer
-                                    for y in 0..map.data.ysize() {
-                                        for x in 0..map.data.xsize() {
-                                            map.data[(x, y, tile_layer)] =
-                                                self.brush_layer_cache[x + y * map.data.xsize()];
-                                        }
-                                    }
-                                }
-
-                                if let Some(drawing_shape_pos) = self.drawing_shape_pos {
-                                    let bounding_rect = egui::Rect::from_two_pos(
-                                        drawing_shape_pos,
-                                        self.view.cursor_pos,
-                                    );
-                                    for y in (bounding_rect.min.y as usize)
-                                        ..=(bounding_rect.max.y as usize)
-                                    {
-                                        for x in (bounding_rect.min.x as usize)
-                                            ..=(bounding_rect.max.x) as usize
-                                        {
-                                            let position = (x, y, tile_layer);
-                                            self.set_tile(
-                                                &mut map,
-                                                self.tilepicker.get_tile_from_offset(
-                                                    x as i16 - drawing_shape_pos.x as i16,
-                                                    y as i16 - drawing_shape_pos.y as i16,
-                                                ),
-                                                position,
-                                            );
-                                        }
-                                    }
-                                } else {
-                                    self.drawing_shape_pos = Some(self.view.cursor_pos);
-                                }
-                            }
-
-                            Pencil::Circle => {
-                                if !self.drawing_shape {
-                                    // Save the current layer
-                                    for x in 0..map.data.xsize() {
-                                        for y in 0..map.data.ysize() {
-                                            self.brush_layer_cache[x + y * map.data.xsize()] =
-                                                map.data[(x, y, tile_layer)];
-                                        }
-                                    }
-                                    self.drawing_shape = true;
-                                } else {
-                                    // Restore the previously stored state of the current layer
-                                    for y in 0..map.data.ysize() {
-                                        for x in 0..map.data.xsize() {
-                                            map.data[(x, y, tile_layer)] =
-                                                self.brush_layer_cache[x + y * map.data.xsize()];
-                                        }
-                                    }
-                                }
-
-                                // Use Bresenham's algorithm to draw the ellipse.
-                                // We consider (x, y) to be the top-left corner of the tile at
-                                // (x, y).
-                                if let Some(drawing_shape_pos) = self.drawing_shape_pos {
-                                    let bounding_rect = egui::Rect::from_two_pos(
-                                        drawing_shape_pos,
-                                        self.view.cursor_pos,
-                                    );
-                                    // Edge case: Bresenham's algorithm breaks down when drawing a
-                                    // 1x1 ellipse.
-                                    if drawing_shape_pos == self.view.cursor_pos {
-                                        self.set_tile(
-                                            &mut map,
-                                            self.tilepicker.get_tile_from_offset(
-                                                map_x as i16 - drawing_shape_pos.x as i16,
-                                                map_y as i16 - drawing_shape_pos.y as i16,
-                                            ),
-                                            (map_x as usize, map_y as usize, tile_layer),
-                                        );
-                                    } else {
-                                        let bounding_rect =
-                                            bounding_rect.translate(egui::vec2(0.5, 0.5));
-
-                                        // Calculate where the center of the ellipse should be.
-                                        let x0 = bounding_rect.center().x;
-                                        let y0 = bounding_rect.center().y;
-
-                                        // Calculate the radii of the ellipse along the
-                                        // x and y directions.
-                                        let rx = bounding_rect.width() / 2.;
-                                        let ry = bounding_rect.height() / 2.;
-                                        let rx2 = rx * rx;
-                                        let ry2 = ry * ry;
-
-                                        // Let the "ellipse function" be defined as
-                                        // f(x, y) = b^2 x^2 + a^2 y^2 - a^2 b^2
-                                        // where a is the x-radius of an ellipse centered at (0, 0)
-                                        // and b is the y-radius.
-                                        // This function is positive when (x, y) is outside the
-                                        // ellipse, negative when it's inside the ellipse and zero when
-                                        // it's exactly on the edge.
-
-                                        // We'll start by drawing the part of the outer edge of the
-                                        // bottom-right quadrant of the ellipse where dy/dx >= -1,
-                                        // starting from the bottom of the ellipse and going to the
-                                        // right.
-                                        let mut x = if rx.floor() == rx { 0. } else { 0.5 };
-                                        let mut y = ry;
-
-                                        // Keep looping until dy/dx < -1.
-                                        while rx2 * y >= ry2 * x {
-                                            for i in ((-y).floor() as i32)..=(y.floor() as i32) {
-                                                let i = if y.floor() == y {
-                                                    i as f32
-                                                } else {
-                                                    i as f32 + 0.5
-                                                };
-                                                for j in [x, -x] {
-                                                    let x = (x0 + j).floor();
-                                                    let y = (y0 + i).floor();
-                                                    self.set_tile(
-                                                        &mut map,
-                                                        self.tilepicker.get_tile_from_offset(
-                                                            x as i16 - drawing_shape_pos.x as i16,
-                                                            y as i16 - drawing_shape_pos.y as i16,
-                                                        ),
-                                                        (x as usize, y as usize, tile_layer),
-                                                    );
-                                                }
-                                            }
-
-                                            // The next tile will either be at (x + 1, y) or
-                                            // (x + 1, y - 1), whichever is closest to the actual edge
-                                            // of the ellipse.
-                                            // To determine which is closer, we evaluate the ellipse
-                                            // function at (x + 1, y - 0.5).
-                                            // If it's positive, then (x + 1, y - 1) is closer.
-                                            // If it's negative, then (x + 1, y) is closer.
-                                            let f = ry2 * (x + 1.).powi(2)
-                                                + rx2 * (y - 0.5).powi(2)
-                                                - rx2 * ry2;
-                                            if f > 0. {
-                                                y -= 1.;
-                                            }
-                                            x += 1.;
-                                        }
-
-                                        // Now we draw the part of the outer edge of the
-                                        // bottom-right quadrant of the ellipse where dy/dx <= -1,
-                                        // starting from the right of the ellipse and going down.
-                                        let mut x = rx;
-                                        let mut y = if ry.floor() == ry { 0. } else { 0.5 };
-
-                                        // Keep looping until dy/dx > -1.
-                                        while rx2 * y <= ry2 * x {
-                                            for i in ((-x).floor() as i32)..=(x.floor() as i32) {
-                                                let i = if x.floor() == x {
-                                                    i as f32
-                                                } else {
-                                                    i as f32 + 0.5
-                                                };
-                                                for j in [y, -y] {
-                                                    let x = (x0 + i).floor();
-                                                    let y = (y0 + j).floor();
-                                                    self.set_tile(
-                                                        &mut map,
-                                                        self.tilepicker.get_tile_from_offset(
-                                                            x as i16 - drawing_shape_pos.x as i16,
-                                                            y as i16 - drawing_shape_pos.y as i16,
-                                                        ),
-                                                        (x as usize, y as usize, tile_layer),
-                                                    );
-                                                }
-                                            }
-
-                                            // The next tile will either be at (x, y + 1) or
-                                            // (x - 1, y + 1), whichever is closest to the actual edge
-                                            // of the ellipse.
-                                            // To determine which is closer, we evaluate the ellipse
-                                            // function at (x - 0.5, y + 1).
-                                            // If it's positive, then (x - 1, y + 1) is closer.
-                                            // If it's negative, then (x, y + 1) is closer.
-                                            let f = ry2 * (x - 0.5).powi(2)
-                                                + rx2 * (y + 1.).powi(2)
-                                                - rx2 * ry2;
-                                            if f > 0. {
-                                                x -= 1.;
-                                            }
-                                            y += 1.;
-                                        }
-                                    }
-                                } else {
-                                    self.drawing_shape_pos = Some(self.view.cursor_pos);
-                                }
-                            }
-                        };
-                    }
-                } else if let Some(selected_event_id) = self.view.selected_event_id {
-                    if response.double_clicked()
-                        || (response.hovered()
-                            && ui.memory(|m| m.focus().is_none())
-                            && ui.input(|i| i.key_pressed(egui::Key::Enter)))
-                    {
-                        // Double-click/press enter on events to edit them
-                        if ui.input(|i| !i.modifiers.command) {
-                            self.dragging_event = false;
-                            self.event_drag_offset = None;
-                            self.event_windows
-                                .add_window(event_edit::Window::new(selected_event_id, self.id));
-                        }
-                    }
-                    // Allow drag and drop to move events
-                    else if !self.dragging_event
-                        && self.view.selected_event_is_hovered
-                        && response.drag_started_by(egui::PointerButton::Primary)
-                    {
-                        self.dragging_event = true;
-                    } else if self.dragging_event
-                        && !response.dragged_by(egui::PointerButton::Primary)
-                    {
-                        self.dragging_event = false;
-                        self.event_drag_offset = None;
-                    }
-
-                    // Press delete or backspace to delete the selected event
-                    if response.hovered()
-                        && ui.memory(|m| m.focus().is_none())
-                        && ui.input(|i| {
-                            i.key_pressed(egui::Key::Delete) || i.key_pressed(egui::Key::Backspace)
-                        })
-                    {
-                        let event = map.events.remove(selected_event_id);
-                        let sprites = self.view.events.try_remove(selected_event_id).ok();
-                        self.redo_history.clear();
-                        if self.history.len() == HISTORY_SIZE {
-                            self.history.pop_front();
-                        }
-                        self.history
-                            .push_back(HistoryEntry::EventDeleted { event, sprites });
-                    }
-
-                    if let Some(hover_tile) = self.view.hover_tile {
-                        if self.dragging_event {
-                            if let Some(selected_event) = map.events.get(selected_event_id) {
-                                // If we just started dragging an event, save the offset between the
-                                // cursor and the event's tile so that the event will be dragged
-                                // with that offset from the cursor
-                                if self.event_drag_offset.is_none() {
-                                    self.event_drag_offset = Some(
-                                        egui::Pos2::new(
-                                            selected_event.x as f32,
-                                            selected_event.y as f32,
-                                        ) - hover_tile,
-                                    );
-
-                                    // Also save the original position of the event to the history
-                                    self.redo_history.clear();
-                                    if self.history.len() == HISTORY_SIZE {
-                                        self.history.pop_front();
-                                    }
-                                    self.history.push_back(HistoryEntry::EventMoved {
-                                        id: selected_event_id,
-                                        x: selected_event.x,
-                                        y: selected_event.y,
-                                    });
-                                };
-                            }
-
-                            if let Some(offset) = self.event_drag_offset {
-                                // If moving an event, move the dragged event's tile to the cursor
-                                // after adjusting for drag offset, unless that would put the event
-                                // on the same tile as an existing event
-                                let adjusted_hover_tile = hover_tile + offset;
-                                if !map.events.iter().any(|(_, e)| {
-                                    adjusted_hover_tile.x == e.x as f32
-                                        && adjusted_hover_tile.y == e.y as f32
-                                }) {
-                                    if let Some(selected_event) =
-                                        map.events.get_mut(selected_event_id)
-                                    {
-                                        selected_event.x = adjusted_hover_tile.x as i32;
-                                        selected_event.y = adjusted_hover_tile.y as i32;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                } else {
-                    // Double-click/press enter on an empty space to add an event
-                    // (hold shift to prevent events from being selected)
-                    if response.double_clicked()
-                        || (response.hovered()
-                            && ui.memory(|m| m.focus().is_none())
-                            && ui.input(|i| i.key_pressed(egui::Key::Enter)))
-                    {
-                        self.dragging_event = false;
-                        self.event_drag_offset = None;
-                        if let Some(id) = self.add_event(&mut map) {
-                            self.redo_history.clear();
-                            if self.history.len() == HISTORY_SIZE {
-                                self.history.pop_front();
-                            }
-                            self.history.push_back(HistoryEntry::EventCreated(id));
-                        }
-                    }
-                }
-
-                // Handle undo/redo keypresses
-                let is_dragged_by_primary = response.dragged_by(egui::PointerButton::Primary);
-                let is_undo_pressed = ui.input(|i| {
-                    i.modifiers.command && !i.modifiers.shift && i.key_pressed(egui::Key::Z)
-                });
-                let is_redo_pressed = ui.input(|i| {
-                    i.modifiers.command
-                        && (i.modifiers.shift || i.key_pressed(egui::Key::Y))
-                        && (!i.modifiers.shift || i.key_pressed(egui::Key::Z))
-                });
-                if !is_dragged_by_primary && (is_undo_pressed || is_redo_pressed) {
-                    let new_entry = match if is_undo_pressed {
-                        self.history.pop_back()
-                    } else {
-                        self.redo_history.pop()
-                    } {
-                        None => None,
-
-                        Some(HistoryEntry::Tiles { layer, mut delta }) => {
-                            for d in delta.iter_mut() {
-                                let position = (d.0, d.1, layer);
-                                let new_id = d.2;
-                                *d = (d.0, d.1, map.data[position]);
-                                map.data[position] = new_id;
-                                self.view.map.set_tile(new_id, position);
-                            }
-                            Some(HistoryEntry::Tiles { layer, delta })
-                        }
-
-                        Some(HistoryEntry::EventMoved { id, x, y }) => {
-                            let event = map.events.get_mut(id).unwrap();
-                            let new_entry = Some(HistoryEntry::EventMoved {
-                                id,
-                                x: event.x,
-                                y: event.y,
-                            });
-                            event.x = x;
-                            event.y = y;
-                            new_entry
-                        }
-
-                        Some(HistoryEntry::EventCreated(id)) => {
-                            let event = map.events.remove(id);
-                            let sprites = self.view.events.try_remove(id).ok();
-                            Some(HistoryEntry::EventDeleted { event, sprites })
-                        }
-
-                        Some(HistoryEntry::EventDeleted { event, sprites }) => {
-                            let id = event.id;
-                            map.events.insert(id, event);
-                            if let Some(sprites) = sprites {
-                                self.view.events.insert(id, sprites);
-                            }
-                            Some(HistoryEntry::EventCreated(id))
-                        }
-                    };
-
-                    if let Some(new_entry) = new_entry {
-                        if is_undo_pressed {
-                            self.redo_history.push(new_entry);
-                        } else {
-                            self.history.push_back(new_entry);
-                        }
-                    }
-                }
-
-                for (_, event) in map.events.iter_mut() {
-                    event.extra_data.is_editor_open = false;
-                }
-
-                if let SelectedLayer::Tiles(tile_layer) = self.view.selected_layer {
-                    // Write the buffered tile changes to the tilemap
-                    for y in 0..map.data.ysize() {
-                        for x in 0..map.data.xsize() {
-                            let position = (x, y, tile_layer);
-                            let new_tile_id = map.data[position];
-                            if new_tile_id != self.layer_cache[x + y * map.data.xsize()] {
-                                self.view.map.set_tile(new_tile_id, position);
-                            }
-                        }
-                    }
-                }
-            })
-        });
-
-        self.event_windows.update(ui.ctx());
-    }
-
-    fn requires_filesystem(&self) -> bool {
-        true
-    }
-}
diff --git a/src/tabs/started.rs b/src/tabs/started.rs
deleted file mode 100644
index 034efdf9..00000000
--- a/src/tabs/started.rs
+++ /dev/null
@@ -1,150 +0,0 @@
-// Copyright (C) 2023 Lily Lyons
-//
-// This file is part of Luminol.
-//
-// Luminol is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Luminol is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
-//
-//     Additional permission under GNU GPL version 3 section 7
-//
-// If you modify this Program, or any covered work, by linking or combining
-// it with Steamworks API by Valve Corporation, containing parts covered by
-// terms of the Steamworks API by Valve Corporation, the licensors of this
-// Program grant you additional permission to convey the resulting work.
-
-use crate::prelude::*;
-
-/// The Luminol "get started screen" similar to vscode's.
-#[derive(Default)]
-pub struct Tab {
-    load_project_promise: Option<poll_promise::Promise<()>>,
-}
-
-// FIXME
-#[allow(unsafe_code)]
-unsafe impl Send for Tab {}
-
-impl Tab {
-    /// Create a new starting screen.
-    #[must_use]
-    pub fn new() -> Self {
-        Self::default()
-    }
-}
-
-impl tab::Tab for Tab {
-    fn name(&self) -> String {
-        "Get Started".to_string()
-    }
-
-    fn id(&self) -> egui::Id {
-        egui::Id::new("luminol_started_tab")
-    }
-
-    fn show(&mut self, ui: &mut egui::Ui) {
-        let state = state!();
-        ui.label(
-            egui::RichText::new("Luminol")
-                .size(40.)
-                .color(egui::Color32::LIGHT_GRAY),
-        );
-
-        ui.add_space(100.);
-
-        ui.heading("Start");
-
-        if self
-            .load_project_promise
-            .as_ref()
-            .is_some_and(|p| p.ready().is_none())
-        {
-            ui.spinner();
-        } else {
-            if ui
-                .button(egui::RichText::new("New Project").size(20.))
-                .clicked()
-            {
-                state!()
-                    .windows
-                    .add_window(crate::windows::new_project::Window::default());
-            }
-            if ui
-                .button(egui::RichText::new("Open Project").size(20.))
-                .clicked()
-            {
-                self.load_project_promise = Some(Promise::spawn_local(async move {
-                    if let Err(e) = state.filesystem.spawn_project_file_picker().await {
-                        state
-                            .toasts
-                            .error(format!("Error loading the project: {e}"));
-                    }
-                }));
-            }
-
-            ui.add_space(100.);
-
-            ui.heading("Recent");
-
-            for path in &global_config!().recent_projects {
-                #[cfg(target_arch = "wasm32")]
-                let (path, idb_key) = path;
-
-                if ui.button(path).clicked() {
-                    let path = path.clone();
-                    #[cfg(target_arch = "wasm32")]
-                    let idb_key = idb_key.clone();
-
-                    self.load_project_promise =
-                        Some(Promise::spawn_local(async move {
-                            #[cfg(not(target_arch = "wasm32"))]
-                            let result = state.filesystem.load_project(path);
-
-                            #[cfg(target_arch = "wasm32")]
-                            let result =
-                                match filesystem::web::FileSystem::from_idb_key(idb_key.clone())
-                                    .await
-                                {
-                                    Some(dir) => {
-                                        let idb_key = dir.idb_key().map(|k| k.to_string());
-                                        if let Err(e) = state.filesystem.load_project(dir) {
-                                            if let Some(idb_key) = idb_key {
-                                                filesystem::web::FileSystem::idb_drop(idb_key);
-                                            }
-                                            Err(e)
-                                        } else {
-                                            Ok(())
-                                        }
-                                    }
-                                    None => Err("Could not restore project handle from IndexedDB"
-                                        .to_string()),
-                                };
-
-                            if let Err(why) = result {
-                                state
-                                    .toasts
-                                    .error(format!("Error loading the project: {why}"));
-                            } else {
-                                state!().toasts.info(format!(
-                                    "Successfully opened {:?}",
-                                    state!()
-                                        .filesystem
-                                        .project_path()
-                                        .expect("project not open")
-                                ));
-                            }
-                        }));
-                }
-            }
-        }
-    }
-}
diff --git a/src/tabs/tab.rs b/src/tabs/tab.rs
deleted file mode 100644
index 0766b228..00000000
--- a/src/tabs/tab.rs
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright (C) 2023 Lily Lyons
-//
-// This file is part of Luminol.
-//
-// Luminol is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Luminol is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
-//
-//     Additional permission under GNU GPL version 3 section 7
-//
-// If you modify this Program, or any covered work, by linking or combining
-// it with Steamworks API by Valve Corporation, containing parts covered by
-// terms of the Steamworks API by Valve Corporation, the licensors of this
-// Program grant you additional permission to convey the resulting work.
-
-use parking_lot::Mutex;
-use std::hash::Hash;
-
-/// Helper struct for tabs.
-pub struct Tabs<T> {
-    tree: Mutex<egui_dock::Tree<T>>,
-    id: egui::Id,
-}
-
-impl<T> Tabs<T>
-where
-    T: Tab,
-{
-    /// Create a new Tab viewer without any tabs.
-    pub fn new(id: impl Hash, tabs: Vec<T>) -> Self {
-        Self {
-            id: egui::Id::new(id),
-            tree: egui_dock::Tree::new(tabs).into(),
-        }
-    }
-
-    /// Display all tabs.
-    pub fn ui(&self, ui: &mut egui::Ui) {
-        egui_dock::DockArea::new(&mut self.tree.lock())
-            .id(self.id)
-            .show_inside(
-                ui,
-                &mut TabViewer {
-                    marker: std::marker::PhantomData,
-                },
-            );
-    }
-
-    /// Add a tab.
-    pub fn add_tab(&self, tab: T) {
-        let mut tree = self.tree.lock();
-        for n in tree.iter() {
-            if let egui_dock::Node::Leaf { tabs, .. } = n {
-                if tabs.iter().any(|t| t.id() == tab.id()) {
-                    return;
-                }
-            }
-        }
-        tree.push_to_focused_leaf(tab);
-    }
-
-    /// Removes tabs that the provided closure returns `false` when called.
-    pub fn clean_tabs<F: FnMut(&mut T) -> bool>(&self, mut f: F) {
-        let mut tree = self.tree.lock();
-        for node in tree.iter_mut() {
-            if let egui_dock::Node::Leaf { tabs, .. } = node {
-                tabs.retain_mut(&mut f)
-            }
-        }
-    }
-
-    /// Returns the name of the focused tab.
-    pub fn focused_name(&self) -> Option<String> {
-        let mut tree = self.tree.lock();
-        tree.find_active().map(|(_, t)| t.name())
-    }
-}
-
-struct TabViewer<T: Tab> {
-    // we don't actually own any types of T, but we use them in TabViewer
-    // *const is used here to avoid needing lifetimes and to indicate to the drop checker that we don't own any types of T
-    marker: std::marker::PhantomData<*const T>,
-}
-
-impl<T> egui_dock::TabViewer for TabViewer<T>
-where
-    T: Tab,
-{
-    type Tab = T;
-
-    fn title(&mut self, tab: &mut Self::Tab) -> egui::WidgetText {
-        tab.name().into()
-    }
-
-    fn ui(&mut self, ui: &mut egui::Ui, tab: &mut Self::Tab) {
-        ui.push_id(tab.id(), |ui| tab.show(ui));
-    }
-
-    fn force_close(&mut self, tab: &mut Self::Tab) -> bool {
-        tab.force_close()
-    }
-}
-
-/// A tab trait.
-pub trait Tab {
-    /// Optionally used as the title of the tab.
-    fn name(&self) -> String {
-        "Untitled Window".to_string()
-    }
-
-    /// Required to prevent duplication.
-    fn id(&self) -> egui::Id;
-
-    /// Show this tab.
-    fn show(&mut self, ui: &mut egui::Ui);
-
-    /// Does this tab need the filesystem?
-    fn requires_filesystem(&self) -> bool {
-        false
-    }
-
-    /// Does this tab need to be closed?
-    fn force_close(&mut self) -> bool {
-        false
-    }
-}
-
-impl Tab for Box<dyn Tab + Send> {
-    fn force_close(&mut self) -> bool {
-        self.as_mut().force_close()
-    }
-
-    fn name(&self) -> String {
-        self.as_ref().name()
-    }
-
-    fn id(&self) -> egui::Id {
-        self.as_ref().id()
-    }
-
-    fn requires_filesystem(&self) -> bool {
-        self.as_ref().requires_filesystem()
-    }
-
-    fn show(&mut self, ui: &mut egui::Ui) {
-        self.as_mut().show(ui)
-    }
-}
diff --git a/src/windows/event_edit.rs b/src/windows/event_edit.rs
deleted file mode 100644
index cf740f20..00000000
--- a/src/windows/event_edit.rs
+++ /dev/null
@@ -1,337 +0,0 @@
-// Copyright (C) 2023 Lily Lyons
-//
-// This file is part of Luminol.
-//
-// Luminol is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Luminol is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
-//
-//     Additional permission under GNU GPL version 3 section 7
-//
-// If you modify this Program, or any covered work, by linking or combining
-// it with Steamworks API by Valve Corporation, containing parts covered by
-// terms of the Steamworks API by Valve Corporation, the licensors of this
-// Program grant you additional permission to convey the resulting work.
-
-use crate::prelude::*;
-
-/// The event editor window.
-pub struct Window {
-    id: usize,
-    map_id: usize,
-    selected_page: usize,
-    name: String,
-    viewed_tab: u8,
-    modals: (bool, bool, bool),
-}
-
-impl Window {
-    /// Create a new event editor.
-    pub fn new(id: usize, map_id: usize) -> Self {
-        Self {
-            id,
-            map_id,
-            selected_page: 0,
-            name: String::from("(unknown)"),
-            viewed_tab: 2,
-            modals: (false, false, false),
-        }
-    }
-}
-
-impl window::Window for Window {
-    fn name(&self) -> String {
-        format!("Event: {}, {} in Map {}", self.name, self.id, self.map_id)
-    }
-
-    fn id(&self) -> egui::Id {
-        egui::Id::new("luminol_event_edit")
-            .with(self.map_id)
-            .with(self.id)
-    }
-
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
-        let mut map = state!().data_cache.map(self.map_id);
-        let event = match map.events.get_mut(self.id) {
-            Some(e) => e,
-            None => {
-                *open = false;
-                return;
-            }
-        };
-        event.extra_data.is_editor_open = true;
-        self.name.clone_from(&event.name);
-
-        let mut win_open = true;
-
-        egui::Window::new(self.name())
-            .id(egui::Id::new(format!("event_{}_{}", self.id, self.map_id)))
-            .open(&mut win_open)
-            .show(ctx, |ui| {
-                ui.horizontal(|ui| {
-                    ui.text_edit_singleline(&mut event.name);
-
-                    ui.button("New page").clicked();
-                    ui.button("Copy page").clicked();
-                    ui.button("Paste page").clicked();
-                    ui.button("Clear page").clicked();
-                });
-
-                ui.separator();
-
-                ui.horizontal(|ui| {
-                    for (page, _) in event.pages.iter().enumerate() {
-                        if ui
-                            .selectable_value(&mut self.selected_page, page, page.to_string())
-                            .clicked()
-                        {
-                            self.modals = (false, false, false);
-                        }
-                    }
-                });
-
-                ui.separator();
-
-                ui.horizontal(|ui| {
-                    ui.selectable_value(&mut self.viewed_tab, 0, "Configuration");
-                    ui.selectable_value(&mut self.viewed_tab, 1, "Graphic");
-                    ui.selectable_value(&mut self.viewed_tab, 2, "Commands");
-                });
-
-                ui.separator();
-
-                let page = event.pages.get_mut(self.selected_page).unwrap();
-
-                match self.viewed_tab {
-                    0 => {
-                        ui.horizontal(|ui| {
-                            ui.vertical(|ui| {
-                                ui.label("Condition");
-                                ui.group(|ui| {
-                                    ui.horizontal(|ui| {
-                                        ui.checkbox(&mut page.condition.switch1_valid, "Switch");
-
-                                        ui.add_enabled_ui(page.condition.switch1_valid, |ui| {
-                                            switch::Modal::new(
-                                                format!(
-                                                    "event_{}_{}_switch1",
-                                                    self.id, self.map_id
-                                                )
-                                                .into(),
-                                            )
-                                            .button(
-                                                ui,
-                                                &mut self.modals.0,
-                                                &mut page.condition.switch1_id,
-                                            );
-                                        });
-                                    });
-
-                                    ui.horizontal(|ui| {
-                                        ui.checkbox(&mut page.condition.switch2_valid, "Switch");
-
-                                        ui.add_enabled_ui(page.condition.switch2_valid, |ui| {
-                                            switch::Modal::new(
-                                                format!(
-                                                    "event_{}_{}_switch2",
-                                                    self.id, self.map_id
-                                                )
-                                                .into(),
-                                            )
-                                            .button(
-                                                ui,
-                                                &mut self.modals.1,
-                                                &mut page.condition.switch2_id,
-                                            );
-                                        });
-                                    });
-
-                                    ui.horizontal(|ui| {
-                                        ui.checkbox(&mut page.condition.variable_valid, "Variable");
-
-                                        ui.add_enabled_ui(page.condition.variable_valid, |ui| {
-                                            variable::Modal::new(
-                                                format!(
-                                                    "event_{}_{}_variable",
-                                                    self.id, self.map_id
-                                                )
-                                                .into(),
-                                            )
-                                            .button(
-                                                ui,
-                                                &mut self.modals.2,
-                                                &mut page.condition.variable_id,
-                                            );
-                                        });
-
-                                        ui.add_enabled(
-                                            page.condition.variable_valid,
-                                            egui::DragValue::new(
-                                                &mut page.condition.variable_value,
-                                            ),
-                                        );
-                                        ui.label("or above");
-                                    });
-
-                                    ui.horizontal(|ui| {
-                                        ui.checkbox(
-                                            &mut page.condition.self_switch_valid,
-                                            "Self Switch",
-                                        );
-                                        ui.add_enabled_ui(page.condition.self_switch_valid, |ui| {
-                                            egui::ComboBox::new(
-                                                format!(
-                                                    "event_{}_{}_self_switch_combo",
-                                                    self.id, self.map_id
-                                                ),
-                                                "is on",
-                                            )
-                                            .selected_text(page.condition.self_switch_ch.clone())
-                                            .show_ui(
-                                                ui,
-                                                |ui| {
-                                                    for ch in ["A", "B", "C", "D"] {
-                                                        ui.selectable_value(
-                                                            &mut page.condition.self_switch_ch,
-                                                            ch.to_string(),
-                                                            ch,
-                                                        );
-                                                    }
-                                                },
-                                            )
-                                        });
-                                    });
-                                });
-
-                                /*
-                                ui.label("Autonomous Movement");
-                                ui.group(|ui| {
-                                    egui::ComboBox::new(
-                                        format!("event_{}_{}_move_type", self.id, self.map_id),
-                                        "Type",
-                                    )
-                                    .selected_text(MOVE_TYPES[page.move_type])
-                                    .show_ui(ui, |ui| {
-                                        for (id, name) in MOVE_TYPES.iter().enumerate() {
-                                            ui.selectable_value(&mut page.move_type, id, *name);
-                                        }
-                                    });
-
-                                    ui.add_enabled_ui(page.move_type == 3, |ui| {
-                                        if ui.button("Move route").clicked() {}
-                                    });
-
-                                    egui::ComboBox::new(
-                                        format!("event_{}_{}_move_speed", self.id, self.map_id),
-                                        "Speed",
-                                    )
-                                    .selected_text(MOVE_SPEEDS[page.move_speed - 1])
-                                    .show_ui(ui, |ui| {
-                                        for (id, name) in MOVE_SPEEDS.iter().enumerate() {
-                                            ui.selectable_value(
-                                                &mut page.move_speed,
-                                                id + 1,
-                                                *name,
-                                            );
-                                        }
-                                    });
-
-                                    egui::ComboBox::new(
-                                        format!("event_{}_{}_move_freq", self.id, self.map_id),
-                                        "Frequency",
-                                    )
-                                    .selected_text(MOVE_FREQS[page.move_frequency - 1])
-                                    .show_ui(ui, |ui| {
-                                        for (id, name) in MOVE_FREQS.iter().enumerate() {
-                                            ui.selectable_value(
-                                                &mut page.move_frequency,
-                                                id + 1,
-                                                *name,
-                                            );
-                                        }
-                                    });
-                                });
-                                */
-
-                                ui.horizontal(|ui| {
-                                    ui.vertical(|ui| {
-                                        ui.label("Options");
-                                        ui.group(|ui| {
-                                            ui.checkbox(&mut page.step_anime, "Move Animation");
-                                            ui.checkbox(&mut page.walk_anime, "Stop Animation");
-                                            ui.checkbox(&mut page.direction_fix, "Direction Fix");
-                                            ui.checkbox(&mut page.through, "Through");
-                                            ui.checkbox(&mut page.always_on_top, "Always on Top");
-                                        });
-                                    });
-
-                                    ui.vertical(|ui| {
-                                        ui.label("Trigger");
-                                        ui.group(|ui| {
-                                            ui.radio_value(&mut page.trigger, 0, "Action Button");
-                                            ui.radio_value(&mut page.trigger, 1, "Player Touch");
-                                            ui.radio_value(&mut page.trigger, 2, "Event Touch");
-                                            ui.radio_value(&mut page.trigger, 3, "Autorun");
-                                            ui.radio_value(
-                                                &mut page.trigger,
-                                                4,
-                                                "Parallel Process",
-                                            );
-                                        });
-                                    })
-                                });
-                            });
-                        });
-                    }
-
-                    1 => {}
-
-                    2 => {
-                        ui.vertical(|ui| {
-                            ui.group(|ui| {
-                                egui::ScrollArea::both()
-                                    .max_height(500.)
-                                    .auto_shrink([false; 2])
-                                    .show(ui, |_ui| {
-                                        // CommandView::new(&mut page.list)
-                                        //     .ui(ui, &info.data_cache.commanddb());
-                                    });
-                            });
-                        });
-                    }
-                    _ => unreachable!(),
-                }
-
-                ui.separator();
-
-                ui.horizontal(|ui| {
-                    let ok_clicked = ui.button("Ok").clicked();
-                    let apply_clicked = ui.button("Apply").clicked();
-                    let cancel_clicked = ui.button("Cancel").clicked();
-
-                    if apply_clicked || ok_clicked {
-                        //let mut map = state!().data_cache.map(self.map_id);
-                        //map.events[self.id] = event.clone();
-                    }
-
-                    if cancel_clicked || ok_clicked {
-                        *open = false;
-                    }
-                });
-            });
-        *open = *open && win_open;
-    }
-
-    fn requires_filesystem(&self) -> bool {
-        true
-    }
-}
diff --git a/src/windows/graphic_picker.rs b/src/windows/graphic_picker.rs
deleted file mode 100644
index 3d71c401..00000000
--- a/src/windows/graphic_picker.rs
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright (C) 2023 Lily Lyons
-//
-// This file is part of Luminol.
-//
-// Luminol is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Luminol is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
-//
-//     Additional permission under GNU GPL version 3 section 7
-//
-// If you modify this Program, or any covered work, by linking or combining
-// it with Steamworks API by Valve Corporation, containing parts covered by
-// terms of the Steamworks API by Valve Corporation, the licensors of this
-// Program grant you additional permission to convey the resulting work.
-
-use crate::prelude::*;
-
-pub struct Graphic {
-    pub name: String,
-    pub image: Arc<RetainedImage>,
-}
-
-pub struct Window {
-    icons: Vec<Graphic>,
-    selected_icon: usize,
-}
-
-impl Window {
-    #[must_use]
-    pub fn new(icons: Vec<camino::Utf8PathBuf>) -> Self {
-        let mut retained_images = Vec::new();
-
-        for mut icon_path in icons {
-            icon_path.set_extension("");
-
-            let image = match state!()
-                .image_cache
-                .load_egui_image("Graphics/Icons", &icon_path)
-            {
-                Ok(ri) => ri,
-                Err(why) => {
-                    state!()
-                        .toasts
-                        .error(format!("Cannot load `{icon_path}` icon: {why}"));
-                    continue;
-                }
-            };
-            retained_images.push(Graphic {
-                name: icon_path.to_string(),
-                image,
-            });
-        }
-
-        Self {
-            icons: retained_images,
-            selected_icon: 0,
-        }
-    }
-
-    pub fn set_active_icon(&mut self, active_icon_index: usize) {
-        if active_icon_index < self.icons.len() {
-            self.selected_icon = active_icon_index;
-        }
-    }
-
-    pub fn show(&mut self, ctx: &egui::Context, open: &mut bool, graphic_icon: &mut String) {
-        egui::Window::new("Graphic Picker")
-            .id(egui::Id::new("icon_picker"))
-            .resize(|res| res.min_width(480.))
-            .open(open)
-            .show(ctx, |ui| {
-                egui::SidePanel::left(egui::Id::new("item_picker_sidebar")).show_inside(ui, |ui| {
-                    egui::ScrollArea::both().max_height(600.).show_rows(
-                        ui,
-                        ui.text_style_height(&egui::TextStyle::Body),
-                        self.icons.len(),
-                        |ui, rows| {
-                            for (id, icon) in self
-                                .icons
-                                .iter()
-                                .enumerate()
-                                .filter(|(ele, _)| rows.contains(ele))
-                            {
-                                ui.selectable_value(&mut self.selected_icon, id, icon.name.clone());
-                                *graphic_icon =
-                                    self.icons.get(self.selected_icon).unwrap().name.clone();
-                            }
-                        },
-                    );
-                });
-
-                let icon = &self.icons[self.selected_icon];
-                icon.image.show_scaled(ui, 3.);
-            });
-    }
-}
diff --git a/src/windows/new_project.rs b/src/windows/new_project.rs
deleted file mode 100644
index ea6f8ec1..00000000
--- a/src/windows/new_project.rs
+++ /dev/null
@@ -1,308 +0,0 @@
-// Copyright (C) 2023 Lily Lyons
-//
-// This file is part of Luminol.
-//
-// Luminol is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Luminol is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
-//
-//     Additional permission under GNU GPL version 3 section 7
-//
-// If you modify this Program, or any covered work, by linking or combining
-// it with Steamworks API by Valve Corporation, containing parts covered by
-// terms of the Steamworks API by Valve Corporation, the licensors of this
-// Program grant you additional permission to convey the resulting work.
-
-use crate::prelude::*;
-use config::{RGSSVer, RMVer};
-
-use std::io::Read;
-use std::sync::atomic::{AtomicUsize, Ordering};
-use std::sync::Arc;
-
-/// The new project window
-pub struct Window {
-    name: String,
-    rgss_ver: RGSSVer,
-    editor_ver: RMVer,
-    project_promise: Option<poll_promise::Promise<Result<(), String>>>,
-    download_executable: bool,
-    progress: Arc<Progress>,
-    init_git: bool,
-    git_branch_name: String,
-}
-
-#[derive(Default)]
-struct Progress {
-    total_progress: AtomicUsize,
-    current_progress: AtomicUsize,
-    zip_total: AtomicUsize,
-    zip_current: AtomicUsize,
-}
-
-impl Default for Window {
-    fn default() -> Self {
-        Self {
-            name: "My Project".to_string(),
-            rgss_ver: RGSSVer::RGSS1,
-            editor_ver: RMVer::XP,
-            project_promise: None,
-            download_executable: false,
-            progress: Arc::default(),
-            init_git: false,
-            git_branch_name: "master".to_string(),
-        }
-    }
-}
-
-impl window::Window for Window {
-    fn name(&self) -> String {
-        "New Project".to_string()
-    }
-
-    fn id(&self) -> egui::Id {
-        egui::Id::new("New Project")
-    }
-
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
-        let mut win_open = true;
-        egui::Window::new(self.name())
-            .open(&mut win_open)
-            .show(ctx, |ui| {
-                ui.add_enabled_ui(self.project_promise.is_none(), |ui| {
-                    ui.label("Project Name");
-                    ui.text_edit_singleline(&mut self.name);
-
-                    ui.checkbox(&mut self.init_git, "Initialize with git repository");
-                    ui.add_enabled_ui(self.init_git, |ui| {
-                        ui.label("Git Branch");
-                        ui.text_edit_singleline(&mut self.git_branch_name);
-                    });
-
-                    egui::ComboBox::from_label("RGSS runtime")
-                        .selected_text(self.rgss_ver.to_string())
-                        .show_ui(ui, |ui| {
-                            for ver in RGSSVer::iter() {
-                                ui.selectable_value(&mut self.rgss_ver, ver, ver.to_string());
-                            }
-                        });
-
-                    if matches!(
-                        self.rgss_ver,
-                        RGSSVer::ModShot | RGSSVer::MKXPFreebird | RGSSVer::MKXPZ
-                    ) {
-                        ui.checkbox(
-                            &mut self.download_executable,
-                            format!("Download latest version of {}", self.rgss_ver),
-                        );
-                    }
-                });
-
-                ui.separator();
-
-                ui.horizontal(|ui| {
-                    if let Some(ref promise) = self.project_promise {
-                        if let Some(res) = promise.ready() {
-                            match res {
-                                Ok(_) => *open = false,
-                                Err(e) => {
-                                    state!()
-                                        .toasts
-                                        .error(format!("Failed to create project: {e}"));
-                                    self.project_promise = None;
-                                }
-                            }
-                        }
-
-                        if self.progress.zip_total.load(Ordering::Relaxed) != 0 {
-                            ui.label(format!(
-                                "Downloadind & Unzipping {}/{}",
-                                self.progress.zip_current.load(Ordering::Relaxed) + 1,
-                                self.progress.zip_total.load(Ordering::Relaxed)
-                            ));
-                        }
-
-                        let total = self.progress.total_progress.load(Ordering::Relaxed);
-                        let current = self.progress.current_progress.load(Ordering::Relaxed) + 1;
-                        if total == 0 {
-                            ui.spinner();
-                        } else {
-                            // FIXME: find a way to avoid cast precision loss
-                            #[allow(clippy::cast_precision_loss)]
-                            ui.add({
-                                egui::ProgressBar::new(current as f32 / total as f32)
-                                    .animate(true)
-                                    .show_percentage()
-                            });
-                        }
-                    } else {
-                        if ui.button("Ok").clicked() {
-                            let rgss_ver = self.rgss_ver;
-                            let config = config::project::Config {
-                                project_name: self.name.clone(),
-                                rgss_ver,
-                                editor_ver: self.editor_ver,
-                                ..Default::default()
-                            };
-                            let download_executable = self.download_executable
-                                && matches!(
-                                    rgss_ver,
-                                    RGSSVer::ModShot | RGSSVer::MKXPFreebird | RGSSVer::MKXPZ
-                                );
-                            let progress = self.progress.clone();
-
-                            let init_git = self.init_git;
-
-                            let branch_name = self.git_branch_name.clone();
-
-                            self.project_promise =
-                                Some(poll_promise::Promise::spawn_local(async move {
-                                    let state = state!();
-                                    let result = state.data_cache.create_project(config).await;
-
-                                    if init_git && result.is_ok() {
-                                        use std::process::Command;
-                                        match Command::new("git")
-                                            .arg("init")
-                                            .arg("-b")
-                                            .arg(branch_name)
-                                            .current_dir(state.filesystem.project_path().unwrap())
-                                            .spawn()
-                                        {
-                                            Ok(mut c) => {
-                                                if let Err(e) = c.wait() {
-                                                    state.toasts.error(format!(
-                                                        "Failed to initialize git repository {e}"
-                                                    ));
-                                                }
-                                            }
-                                            Err(e) => state.toasts.error(format!(
-                                                "Failed to initialize git repository {e}"
-                                            )),
-                                        }
-                                    }
-
-                                    if download_executable && result.is_ok() {
-                                        if let Err(e) =
-                                            Self::download_executable(rgss_ver, progress).await
-                                        {
-                                            state.toasts.error(e);
-                                        }
-                                    }
-
-                                    result
-                                }));
-                        }
-                        if ui.button("Cancel").clicked() {
-                            *open = false;
-                        }
-                    }
-                })
-            });
-
-        *open &= win_open;
-    }
-
-    fn requires_filesystem(&self) -> bool {
-        false
-    }
-}
-
-impl Window {
-    async fn download_executable(rgss_ver: RGSSVer, progress: Arc<Progress>) -> Result<(), String> {
-        let zip_url: &[_] = match rgss_ver {
-            RGSSVer::ModShot => &[
-                "https://github.com/thehatkid/ModShot/releases/download/latest/ModShot_Windows_bb6bcbc_Ruby-3.1-ucrt64_Steam-false.zip", 
-                "https://github.com/thehatkid/ModShot/releases/download/latest/ModShot_Linux_bb6bcbc_Ruby-3.1_Steam-false.zip"
-            ],
-            RGSSVer::MKXPZ => &[
-                "https://github.com/mkxp-z/mkxp-z/releases/download/v2.4.0-github/mkxp-z_2.4.0-linux.zip",
-                "https://github.com/mkxp-z/mkxp-z/releases/download/v2.4.0-github/mkxp-z_2.4.0-windows.zip"
-            ],
-            RGSSVer::MKXPFreebird => &[
-                // The cert has expired for mapleshrine.eu.
-                // "https://mapleshrine.eu/releases/mkxp-freebird/win64/mkxp-win64-211207-5d38b1f.zip",
-                // Use an unofficial host for now
-                "https://nowaffles.com/wp-content/uploads/2022/11/mkxp-win64-211207-5d38b1f.zip",
-                ],
-                _ => unreachable!()
-        };
-
-        progress.zip_total.store(zip_url.len(), Ordering::Relaxed);
-
-        let zips = futures::future::join_all(zip_url.iter().map(|url| reqwest::get(*url))).await;
-
-        for (index, zip_response) in zips.into_iter().enumerate() {
-            progress.zip_current.store(index, Ordering::Relaxed);
-
-            progress.total_progress.store(0, Ordering::Relaxed);
-            let response =
-                zip_response.map_err(|e| format!("Error downloading {rgss_ver}: {e}"))?;
-
-            let bytes = response
-                .bytes()
-                .await
-                .map_err(|e| format!("Error getting response body for {rgss_ver}: {e}"))?;
-
-            let mut archive = zip::ZipArchive::new(std::io::Cursor::new(bytes))
-                .map_err(|e| format!("Failed to read zip archive for {rgss_ver}: {e}"))?;
-            progress
-                .total_progress
-                .store(archive.len(), Ordering::Relaxed);
-
-            let state = state!();
-            for index in 0..archive.len() {
-                let mut file = archive.by_index(index).unwrap();
-                progress.current_progress.store(index, Ordering::Relaxed);
-
-                let file_path = match file.enclosed_name() {
-                    Some(p) => p.to_owned(),
-                    None => continue,
-                };
-
-                let file_path = file_path
-                    .strip_prefix("mkxp-z_2.4.0/")
-                    .unwrap_or(&file_path);
-                let file_path = file_path
-                    .to_str()
-                    .ok_or(format!("Invalid file path {file_path:#?}"))?;
-
-                if file_path.is_empty()
-                    || state
-                        .filesystem
-                        .exists(file_path)
-                        .map_err(|e| e.to_string())?
-                {
-                    continue;
-                }
-
-                if file.is_dir() {
-                    state
-                        .filesystem
-                        .create_dir(file_path)
-                        .map_err(|e| format!("Failed to create directory {file_path}: {e}"))?;
-                } else {
-                    let mut bytes = Vec::new();
-                    file.read_to_end(&mut bytes)
-                        .map_err(|e| e.to_string())
-                        .map_err(|e| format!("Failed to read file data {file_path}: {e}"))?;
-                    state
-                        .filesystem
-                        .write(file_path, bytes)
-                        .map_err(|e| format!("Failed to save file data {file_path}: {e}"))?;
-                }
-            }
-        }
-
-        Ok(())
-    }
-}
diff --git a/src/windows/window.rs b/src/windows/window.rs
deleted file mode 100644
index d4e2c8ea..00000000
--- a/src/windows/window.rs
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright (C) 2023 Lily Lyons
-//
-// This file is part of Luminol.
-//
-// Luminol is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Luminol is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
-//
-//     Additional permission under GNU GPL version 3 section 7
-//
-// If you modify this Program, or any covered work, by linking or combining
-// it with Steamworks API by Valve Corporation, containing parts covered by
-// terms of the Steamworks API by Valve Corporation, the licensors of this
-// Program grant you additional permission to convey the resulting work.
-
-use parking_lot::Mutex;
-
-/// A window management system to handle heap allocated windows
-///
-/// Will deny any duplicated window titles and is not specialized like modals
-#[derive(Default)]
-pub struct Windows {
-    // A dynamic array of Windows. Iterated over and cleaned up in fn update().
-    windows: Mutex<Vec<Box<dyn Window + Send>>>,
-}
-
-impl Windows {
-    /// A function to add a window.
-    pub fn add_window<T>(&self, window: T)
-    where
-        T: Window + Send + 'static,
-    {
-        let mut windows = self.windows.lock();
-        if windows.iter().any(|w| w.id() == window.id()) {
-            return;
-        }
-        windows.push(Box::new(window));
-    }
-
-    /// Clean all windows that need the data cache.
-    /// This is usually when a project is closed.
-    pub fn clean_windows(&self) {
-        let mut windows = self.windows.lock();
-        windows.retain(|window| !window.requires_filesystem());
-    }
-
-    /// Update and draw all windows.
-    pub fn update(&self, ctx: &egui::Context) {
-        // Iterate through all the windows and clean them up if necessary.
-        let mut windows = self.windows.lock();
-        windows.retain_mut(|window| {
-            // Pass in a bool requesting to see if the window open.
-            let mut open = true;
-            window.show(ctx, &mut open);
-            open
-        });
-    }
-}
-
-/// A heap allocated window, unlike modals which are stored on the stack.
-/// This makes them very unspecialized and they rely heavily on `UpdateInfo`.
-///
-/// However, they can store internal state and allow for multiple windows to be open at one time.
-/// This makes up for most of their losses. Modals are still useful in certain cases, though.
-pub trait Window {
-    /// Show this window.
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool);
-
-    /// Optionally used as the title of the window.
-    fn name(&self) -> String {
-        "Untitled Window".to_string()
-    }
-
-    /// Required to prevent duplication.
-    fn id(&self) -> egui::Id;
-
-    ///  A function to determine if this window needs the data cache.
-    fn requires_filesystem(&self) -> bool {
-        false
-    }
-}