backend-infra-engineer: Release 0.2.2 snapshot

2024-12-31 21:00:27 -05:00
209 changed files with 7446 additions and 3633 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -4,19 +4,7 @@ build/
 .vscode/
 disasm/
 src/etc
-src/lib/SDL2
-src/lib/cmake
-src/lib/GL
-src/lib/abseil-cpp
-src/lib/libGLEW.2.2.0.dylib
-src/lib/libGLEW.2.2.dylib
-src/lib/libGLEW.a
-src/lib/libGLEW.dylib
-src/lib/libSDL2_test.a
-src/lib/libSDL2-2.0.0.dylib
-src/lib/libSDL2.a
-src/lib/libSDL2.dylib
-src/lib/libSDL2main.a
+src/lib/
 checks.json
 assets/lib/libasar.dll
 cmake/yaze.plist.in
@@ -29,4 +17,5 @@ assets/asm/EditorCore.asm
 src/app/emu/cpu/internal/old_cpu.cc
 build-windows
 src/lib/libpng
-src/lib/zlib
+src/lib/zlib
+assets/layouts/ow_toolset.zeml
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,12 +1,6 @@
 [submodule "src/lib/imgui"]
 	path = src/lib/imgui
 	url = https://github.com/ocornut/imgui.git
-[submodule "src/lib/ImGuiFileDialog"]
-	path = src/lib/ImGuiFileDialog
-	url = https://github.com/aiekick/ImGuiFileDialog.git
-[submodule "src/lib/ImGuiColorTextEdit"]
-	path = src/lib/ImGuiColorTextEdit
-	url = https://github.com/BalazsJako/ImGuiColorTextEdit.git
 [submodule "assets/asm/alttp-hacker-workspace"]
 	path = assets/asm/alttp-hacker-workspace
 	url = https://github.com/scawful/alttp-hacker-workspace.git
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Yet Another Zelda3 Editor
 # by scawful
 cmake_minimum_required(VERSION 3.10)
-project(yaze VERSION 0.2.0
+project(yaze VERSION 0.2.2
             DESCRIPTION "Yet Another Zelda3 Editor"
             LANGUAGES CXX)
+configure_file(src/yaze_config.h.in yaze_config.h)

 # Build Flags
 set(YAZE_BUILD_APP ON)
@@ -18,7 +19,7 @@ set(YAZE_INSTALL_LIB OFF)
 add_definitions("-DYAZE_LIB_PNG=1")

 # C++ Standard and CMake Specifications
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
@@ -28,11 +29,19 @@ set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
 set(BUILD_SHARED_LIBS OFF)
 set(CMAKE_FIND_FRAMEWORK LAST)
 set(CMAKE_SHARED_MODULE_PREFIX "")
+
+if (UNIX)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Dlinux -Dstricmp=strcasecmp")
+endif()
+
 if (MACOS)
  set(CMAKE_INSTALL_PREFIX /usr/local)
 endif()

+if (WIN32)
+  include(cmake/vcpkg.cmake)
+endif()
+
 # Abseil Standard Specifications
 include(cmake/absl.cmake)

--- a/4
+++ b/4
@@ -48,7 +48,7 @@ PROJECT_NAME           = "yaze"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.

-PROJECT_NUMBER         = "0.2.0"
+PROJECT_NUMBER         = "0.2.2"

 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -1284,7 +1284,7 @@ ALPHABETICAL_INDEX     = YES
 # after removing the prefix.
 # This tag requires that the tag ALPHABETICAL_INDEX is set to YES.

-IGNORE_PREFIX          =
+IGNORE_PREFIX          = googletest

 #---------------------------------------------------------------------------
 # Configuration options related to the HTML output
--- a/cmake/absl.cmake
+++ b/cmake/absl.cmake
@@ -1,14 +1,14 @@
 if (MINGW)
  add_subdirectory(src/lib/abseil-cpp)
 else()
-find_package(absl)
+  find_package(absl)
 endif()
 set(ABSL_PROPAGATE_CXX_STD ON)
 set(ABSL_CXX_STANDARD 17)
 set(ABSL_USE_GOOGLETEST_HEAD ON)
 set(ABSL_ENABLE_INSTALL ON)
 set(
-  ABSL_TARGETS   
+  ABSL_TARGETS
  absl::strings
  absl::flags
  absl::status
@@ -21,4 +21,4 @@ set(
  absl::raw_logging_internal
  absl::failure_signal_handler
  absl::flat_hash_map
-)
+)
--- a/cmake/imgui.cmake
+++ b/cmake/imgui.cmake
@@ -4,19 +4,9 @@ file(GLOB IMGUI_SOURCES ${IMGUI_PATH}/*.cpp)
 add_library("ImGui" STATIC ${IMGUI_SOURCES})
 target_include_directories("ImGui" PUBLIC ${IMGUI_PATH})
 target_include_directories(ImGui PUBLIC ${SDL2_INCLUDE_DIR})
-target_compile_definitions(ImGui PUBLIC 
+target_compile_definitions(ImGui PUBLIC
  IMGUI_IMPL_OPENGL_LOADER_CUSTOM=<SDL2/SDL_opengl.h>  GL_GLEXT_PROTOTYPES=1)

-set(IMGUI_FILE_DLG_PATH ${CMAKE_SOURCE_DIR}/src/lib/ImGuiFileDialog)
-file(GLOB IMGUI_FILE_DLG_SOURCES ${IMGUI_FILE_DLG_PATH}/*.cpp)
-add_library("ImGuiFileDialog" STATIC ${IMGUI_FILE_DLG_SOURCES})
-target_include_directories(ImGuiFileDialog PUBLIC ${IMGUI_PATH}  ${CMAKE_SOURCE_DIR}/src/lib)
-
-set(IMGUI_COLOR_TEXT_EDIT_PATH ${CMAKE_SOURCE_DIR}/src/lib/ImGuiColorTextEdit)
-file(GLOB IMGUI_COLOR_TEXT_EDIT_SOURCES ${IMGUI_COLOR_TEXT_EDIT_PATH}/*.cpp)
-add_library("ImGuiColorTextEdit" STATIC ${IMGUI_COLOR_TEXT_EDIT_SOURCES})
-target_include_directories(ImGuiColorTextEdit PUBLIC ${IMGUI_PATH} ${CMAKE_SOURCE_DIR}/src/lib)
-
 set(IMGUI_TEST_ENGINE_PATH ${CMAKE_SOURCE_DIR}/src/lib/imgui_test_engine/imgui_test_engine)
 file(GLOB IMGUI_TEST_ENGINE_SOURCES ${IMGUI_TEST_ENGINE_PATH}/*.cpp)
 add_library("ImGuiTestEngine" STATIC ${IMGUI_TEST_ENGINE_SOURCES})
@@ -25,16 +15,14 @@ target_link_libraries(ImGuiTestEngine PUBLIC ImGui)

 set(
  IMGUI_SRC
-  ${IMGUI_PATH}/imgui.cpp 
+  ${IMGUI_PATH}/imgui.cpp
  ${IMGUI_PATH}/imgui_demo.cpp
-  ${IMGUI_PATH}/imgui_draw.cpp 
+  ${IMGUI_PATH}/imgui_draw.cpp
  ${IMGUI_PATH}/imgui_widgets.cpp
  ${IMGUI_PATH}/backends/imgui_impl_sdl2.cpp
-  ${IMGUI_PATH}/backends/imgui_impl_sdlrenderer2.cpp 
+  ${IMGUI_PATH}/backends/imgui_impl_sdlrenderer2.cpp
  ${IMGUI_PATH}/misc/cpp/imgui_stdlib.cpp
-  ${IMGUI_FILE_DLG_PATH}/ImGuiFileDialog.cpp
-  ${IMGUI_COLOR_TEXT_EDIT_PATH}/TextEditor.cpp
 )

 # For integration test
-add_definitions("-DIMGUI_ENABLE_TEST_ENGINE -DIMGUI_TEST_ENGINE_ENABLE_COROUTINE_STDTHREAD_IMPL=1")
+add_definitions("-DIMGUI_ENABLE_TEST_ENGINE -DIMGUI_TEST_ENGINE_ENABLE_COROUTINE_STDTHREAD_IMPL=1")
--- a/cmake/sdl2.cmake
+++ b/cmake/sdl2.cmake
@@ -9,19 +9,8 @@ set(SDL_TARGETS SDL2::SDL2)

 if(WIN32 OR MINGW)
    list(PREPEND SDL_TARGETS SDL2::SDL2main ws2_32)
-    add_definitions(-DSDL_MAIN_HANDLED)
+    add_definitions("-DSDL_MAIN_HANDLED")
 endif()

 # libpng
-if (MINGW)
-  set(ZLIB_ROOT ${CMAKE_SOURCE_DIR}/build-windows/src/lib/zlib)
-  set(ZLIB_LIBRARY ${CMAKE_SOURCE_DIR}/build-windows/lib/libzlib.dll.a)
-  include_directories(${CMAKE_SOURCE_DIR}/src/lib/zlib ${CMAKE_SOURCE_DIR}/src/lib/libpng)
-  set(ZLIB_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/lib/zlib)
-  set(YAZE_BUILD_PYTHON OFF)
-  set(YAZE_BUILD_EXTENSIONS OFF)
-  add_subdirectory(src/lib/zlib)
-  add_subdirectory(src/lib/libpng)
-else()
-  find_package(PNG REQUIRED)
-endif()
+find_package(PNG REQUIRED)
--- a/cmake/vcpkg.cmake
+++ b/cmake/vcpkg.cmake
@@ -0,0 +1,6 @@
+
+add_definitions("-DMICROSOFT_WINDOWS_WINBASE_H_DEFINE_INTERLOCKED_CPLUSPLUS_OVERLOADS=0")
+
+set(VCPKG_TARGET_ARCHITECTURE x64)
+set(VCPKG_CRT_LINKAGE dynamic)
+set(VCPKG_LIBRARY_LINKAGE dynamic)
--- a/docs/asm-style-guide.md
+++ b/docs/asm-style-guide.md
@@ -23,13 +23,12 @@ Custom assembly code applied to the game should be included through the `yaze.as
 ## File Structure

 - **File Extension**: Use `.asm` as the file extension for 65816 assembly files.
- **Header Comments**: Include a header comment at the beginning of each file describing its purpose and the author. 
+- **Header Comments**: Include a header comment at the beginning of each file describing its purpose and the author.

 Example:

 ```asm
 ; =========================================================
-; File: my_file.asm
 ; Purpose: [Brief description of the file’s functionality]
 ; Author: [Your Name]
 ; =========================================================
@@ -68,11 +67,10 @@ Sprite_Minecart_Main:
 }
 ```

-
 ## Comments

 - **Purpose**: Comments should explain why the code exists and what it is intended to do, especially for complex logic.
- **Placement**: 
+- **Placement**:
  - Comments can be placed above the code block they describe for longer explanations.
  - Inline comments can be used for single lines of code where the purpose might not be immediately clear.
 - **Clarity**: Avoid stating the obvious. Focus on explaining the logic rather than restating the code.
@@ -83,22 +81,6 @@ Example:
 LDA $22 : SEC : SBC $3F : STA $31   ; Adjust X position for camera movement
 ```

-## Directives
-
- **Organization**: Use `%macro`, `include`, and other Asar directives in a structured manner, keeping related directives grouped together.
- **Usage**: Ensure all directives are used consistently throughout the codebase, following the naming conventions and formatting rules established.
-
-Example:
-
-```asm
-%macro InitMovement
-    LDA.b $22 : STA.b $3F
-    LDA.b $23 : STA.b $41
-    LDA.b $20 : STA.b $3E
-    LDA.b $21 : STA.b $40
-endmacro
-```
-
 ## Instructions

 - **Single Line Instructions**: Combine multiple instructions on a single line using colons (`:`) where appropriate for related operations.
@@ -121,11 +103,11 @@ Example:

 ```asm
 %macro HandlePlayerCamera
-    LDA $22 : SEC : SBC $3F : STA $31
-    LDA $20 : SEC : SBC $3E : STA $30
-    JSL Link_HandleMovingAnimation_FullLongEntry
-    JSL HandleIndoorCameraAndDoors
-    RTS
+  LDA $22 : SEC : SBC $3F : STA $31
+  LDA $20 : SEC : SBC $3E : STA $30
+  JSL Link_HandleMovingAnimation_FullLongEntry
+  JSL HandleIndoorCameraAndDoors
+  RTS
 endmacro
 ```

@@ -137,12 +119,12 @@ endmacro
 Example:

 ```asm
-.loop_start
-    LDA $00 : CMP #$10 : BEQ .end_loop
+  .loop_start
+  LDA $00 : CMP #$10 : BEQ .end_loop
    INC $00
    BRA .loop_start
-.end_loop
-    RTS
+  .end_loop
+  RTS
 ```

 ## Data Structures
@@ -155,10 +137,10 @@ Example:
 ```asm
 .DirectionTileLookup
 {
-    db $02, $00, $04, $00 ; North
-    db $00, $00, $03, $01 ; East
-    db $00, $02, $00, $04 ; South
-    db $03, $01, $00, $00 ; West
+  db $02, $00, $04, $00 ; North
+  db $00, $00, $03, $01 ; East
+  db $00, $02, $00, $04 ; South
+  db $03, $01, $00, $00 ; West
 }
 ```

@@ -206,7 +188,6 @@ AncillaAdd_Hookshot:
 - **Logical Grouping**: Organize code into logical sections, with related routines and macros grouped together.
 - **Separation of Concerns**: Ensure that each section of code is responsible for a specific task or set of related tasks, avoiding tightly coupled code.
 - **Modularity**: Write code in a modular way, making it easier to reuse and maintain.
- **Status Registers and Stack Operations**: Indent code blocks when using status register operations (REP, SEP, PHX, PLX, etc.) to improve readability.

 Example:

@@ -216,22 +197,20 @@ Example:
 ; =========================================================
 Sprite_Minecart_Main:
 {
-    JSR HandleTileDirections
-    JSR HandleDynamicSwitchTileDirections
-    PHX
-      JSR HandleMinecartMovement
-    PLX
+  PHX
+  JSR HandleMinecartMovement
+  PLX

-    REP #$20
-      LDA !SpriteDirection : STA $00
-    SEP #$20
-    RTS
+  REP #$20
+  LDA !SpriteDirection : STA $00
+  SEP #$20
+  RTS
 }
 ```

 ## Custom Code

- **Integration**: Include custom assembly code in the `yaze.asm` file to ensure it is applied correctly to the ROM. The module should include a define and conditional statement to allow users to disable the module if needed. 
+- **Integration**: Include custom assembly code in the `yaze.asm` file to ensure it is applied correctly to the ROM. The module should include a define and conditional statement to allow users to disable the module if needed.

 Example:

@@ -241,4 +220,4 @@ Example:
 if !YAZE_CUSTOM_MOSAIC != 0
  incsrc "mosaic_change.asm"
 endif
-```
+```
--- a/docs/build-instructions.md
+++ b/docs/build-instructions.md
@@ -9,11 +9,47 @@ Yaze uses CMake to build the project. If you are unexperienced with CMake, pleas

 The gui editor is built using SDL2 and ImGui. For reference on how to use ImGui, see the [Getting Started](https://github.com/ocornut/imgui/wiki/Getting-Started) guide. For SDL2, see the [SDL2 documentation](https://wiki.libsdl.org/).

-For those who want to reduce compile times, consider installing the dependencies on your system. 
+For those who want to reduce compile times, consider installing the dependencies on your system.

 ## Windows

-Recommended to use [msys2](https://www.msys2.org/) for a Unix-like environment on Windows.
+### vcpkg
+
+For Visual Studio users, follow the [Install and use packages with CMake](https://learn.microsoft.com/en-us/vcpkg/get_started/get-started) tutorial from Microsoft.
+
+Define the following dependencies in `vcpkg.json`
+
+```
+{
+  "dependencies": [
+    "abseil",
+    "sdl2",
+    "libpng"
+  ]
+}
+```
+
+Target the architecture in `CMakePresets.json`
+
+```
+{
+  "name": "vcpkg",
+  "generator": "Ninja",
+  "binaryDir": "${sourceDir}/build",
+  "architecture": {
+    "value": "arm64/x64",
+    "strategy": "external"
+  },
+  "cacheVariables": {
+    "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
+    "CMAKE_SYSTEM_PROCESSOR": "arm64/x64"
+  }
+}
+```
+
+### msys2
+
+[msys2](https://www.msys2.org/) is an alternative you may use for a Unix-like environment on Windows. Beware that this is for more experienced developers who know how to manage their system PATH.

 Add to environment variables `C:\msys64\mingw64\bin`

@@ -55,4 +91,4 @@ You will need to link `SDL2.framework` and `libpng.a` to the project.

 You can use your package manager to install the same dependencies as macOS.

-I trust you know how to use your package manager.
+I trust you know how to use your package manager.
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -1,26 +1,39 @@
 # Changelog

-## 0.0.1 (06-08-2022)
+## 0.2.2 (12-31-2024)

- Started project
- Added ImGui
- Added SDL2
- Added yaze_test target with gtest
+- DungeonMap editing improvements
+- ZSCustomOverworld support
+- Cross platform file handling

-## 0.0.2 - 0.0.4
+## 0.2.1 (08-20-2024)

- TODO: Track changes over this time
+- Improved MessageEditor parsing
+- Added integration test window
+- Bitmap bug fixes

-## 0.0.5 (11-21-2023)
+## 0.2.0 (07-20-2024)

- DungeonEditor 
- DungeonObjectRenderer
+- iOS app support
+- Graphics Sheet Browser
+- Project Files

-## 0.0.6 (11-22-2023)
+## 0.1.0 (05-11-2024)

- ScreenEditor DungeonMap 
- Tile16 Editor
- Canvas updates
+- Bitmap bug fixes
+- Error handling improvements
+
+## 0.0.9 (04-14-2024)
+
+- Documentation updates
+- Entrance tile types
+- Emulator subsystem overhaul
+
+## 0.0.8 (02-08-2024)
+
+- Hyrule Magic Compression
+- Dungeon Room Entrances
+- Png Export

 ## 0.0.7 (01-27-2024)

@@ -30,18 +43,60 @@
  - Items
  - Sprites

-## 0.1.0 (05-11-2024)
+## 0.0.6 (11-22-2023)

- TODO: Track changes over this time
+- ScreenEditor DungeonMap
+- Tile16 Editor
+- Canvas updates

-## 0.2.0 (07-20-2024)
+## 0.0.5 (11-21-2023)

- iOS app support
- Graphics Sheet Browser
- Project Files
+- DungeonEditor
+- DungeonObjectRenderer

-## 0.2.1 (08-20-2024)
+## 0.0.4 (11-11-2023)

- Improved MessageEditor parsing
- Added integration test window
- Bitmap bug fixes
+- Tile16Editor
+- GfxGroupEditor
+- Add GfxGroups fns to Rom
+- Add Tile16Editor and GfxGroupEditor to OverworldEditor
+
+## 0.0.3 (10-26-2023)
+
+- Emulator subsystem
+  - Snes Ppu and PpuRegisters
+  - Direct Memory Access
+  - Cpu Tests
+- Read/Write Tile16 functions
+- CompressionV3
+- Rom::LoadLinkGraphics
+
+
+## 0.0.2 (08-26-2023)
+
+- Emulator subsystem
+  - Spc700
+  - Emulator loop
+  - Clock and MockClock
+  - Ppu and Apu cycling
+  - Setup Snes initialization
+  - 65816 Cpu opcodes
+- JP Font support
+- SCAD Format support for CGX, COL, OBJ files
+- Overworld Save
+- Overworld Map Tile Editing
+
+## 0.0.1 (07-22-2023)
+
+- GraphicsEditor
+- Palette management
+- lc_lz2 Compression
+- SnesTo8bppSheet
+- Bitmap Canvas
+
+## 0.0.0 (06-08-2022)
+
+- Started project
+- Added ImGui
+- Added SDL2
+- Added yaze_test target with gtest
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -20,7 +20,7 @@ Assembly code should follow the [65816 Style Guide](docs/asm-style-guide.md).

 ## Testing Facilities

-The project includes the `yaze_test` target which defines unit tests and an integration test window. The unit tests make use of GoogleTest and GoogleMock. The integration test window is an ImGui window build out of the yaze::app::core::Controller and yaze::test::integration::TestEditor. The integration test window can be accessed by passing the argument `integration` to the target.
+The project includes the `yaze_test` target which defines unit tests and an integration test window. The unit tests make use of GoogleTest and GoogleMock. The integration test window is an ImGui window build out of the yaze::core::Controller and yaze::test::integration::TestEditor. The integration test window can be accessed by passing the argument `integration` to the target.

 New modules should define unit tests in the `src/test` directory and integration tests in the `src/test/integration` directory. The `yaze_test` target will automatically include all tests in these directories.

@@ -54,37 +54,6 @@ yaze includes an emulator subsystem that allows developers to test their modific
 - Implementing new debugging tools, such as memory viewers, breakpoints, or trace logs.
 - Extending the emulator to support additional features, such as save states, cheat codes, or multiplayer modes.

-### 4. Editor Management
-
-The `EditorManager` class manages the core functionalities of YAZE, including rendering the UI, handling user input, and managing multiple editors. While this class is central to yaze's operations, it has many responsibilities. You can help by:
-
- Refactoring `EditorManager` to delegate responsibilities to specialized managers (e.g., `MenuManager`, `TabManager`, `StatusManager`).
- Optimizing the rendering and update loop to improve performance, especially when handling large textures or complex editors.
- Implementing new features that streamline the editing process, such as better keyboard shortcuts, command palette integration, or project management tools.
-
-### 5. User Interface and UX
-
-yaze's UI is built with ImGui, offering a flexible and customizable interface. Contributions to the UI might include:
-
- Designing and implementing new themes or layouts to improve the user experience.
- Adding new UI components, such as toolbars, context menus, or customizable panels.
- Improving the accessibility of the editor, ensuring it is usable by a wide range of users, including those with disabilities.
-
-### 6. ROM Manipulation
-
-The `Rom` class is at the heart of yaze's ability to modify and interact with ROM data. Contributions here might involve:
-
- Optimizing the loading and saving processes to handle larger ROMs or more complex modifications efficiently. 
- Extensions should be able to change the way the `Rom` class interacts with the ROM data with custom pointers to expanded data structures.
-
-### 7. Testing and Documentation
-
-Quality assurance and documentation are critical to yaze's success. Contributions in this area include:
-
- Writing unit tests for new and existing features to ensure they work correctly and remain stable over time.
- Contributing to the documentation, both for end-users and developers, to make yaze easier to use and extend.
- Creating tutorials or guides that help new developers get started with building extensions or contributing to the project.
-
 ## Building the Project

 For detailed instructions on building YAZE, including its dependencies and supported platforms, refer to [build-instructions.md](docs/build-instructions.md).
--- a/docs/infrastructure.md
+++ b/docs/infrastructure.md
@@ -18,14 +18,14 @@ The goal of yaze is to build a cross platform editor for the Legend of Zelda: A
 - **assets**: Hosts assets like fonts, icons, assembly source, etc.
 - **cmake**: Contains CMake configurations.
 - **docs**: Contains documentation for users and developers.
- **src**: Contains source files. 
+- **incl**: Contains the public headers for `yaze_c`
+- **src**: Contains source files.
  - **app**:  Contains the GUI editor `yaze`
  - **app/emu**:  Contains a standalone Snes emulator application `yaze_emu`
  - **cli**:  Contains the command line interface `z3ed`
-  - **incl**: Contains the data headers for `yaze_c`
+  - **cli/python**:   Contains the Python module `yaze_py`
  - **ios**:  Contains the iOS application `yaze_ios`
  - **lib**:  Contains the dependencies as git submodules
-  - **py**:   Contains the Python module `yaze_py`
  - **test**: Contains testing interface `yaze_test`
  - **win32**: Contains Windows resource file and icon

@@ -83,4 +83,3 @@ Currently implemented as a singleton with SharedRom which is not great but has h
 - app/gfx/bitmap.h

 This class is responsible for creating, managing, and manipulating bitmap data, which can be displayed on the screen using SDL2 Textures and the ImGui draw list. It also provides functions for exporting these bitmaps to the clipboard in PNG format using libpng.
-
--- a/incl/dungeon.h
+++ b/incl/dungeon.h
@@ -54,8 +54,14 @@ typedef enum z3_dungeon_background2 {
  DarkRoom
 } z3_dungeon_background2;

+typedef struct z3_dungeon_room {
+  z3_dungeon_background2 bg2;
+  z3_dungeon_destination pits;
+  z3_dungeon_destination stairs[4];
+} z3_dungeon_room;
+
 #ifdef __cplusplus
 }
 #endif

-#endif  // YAZE_BASE_DUNGEON_H_
+#endif // YAZE_BASE_DUNGEON_H_
--- a/incl/overworld.h
+++ b/incl/overworld.h
@@ -31,7 +31,7 @@ typedef struct z3_overworld_map {
 * @brief Primitive of the overworld.
 */
 typedef struct z3_overworld {
-  void *impl; // yaze::app::Overworld*
+  void *impl; // yaze::Overworld*

  uint8_t *tile32_data; /**< Pointer to the 32x32 tile data. */
  uint8_t *tile16_data; /**< Pointer to the 16x16 tile data. */
--- a/incl/system/extension.h
+++ b/incl/system/extension.h
@@ -1,91 +0,0 @@
-#ifndef EXTENSION_INTERFACE_H
-#define EXTENSION_INTERFACE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "yaze.h"
-
-typedef void (*yaze_initialize_func)(yaze_editor_context* context);
-typedef void (*yaze_cleanup_func)(void);
-typedef void (*yaze_extend_ui_func)(yaze_editor_context* context);
-typedef void (*yaze_manipulate_rom_func)(z3_rom* rom);
-typedef void (*yaze_command_func)(void);
-typedef void (*yaze_event_hook_func)(void);
-
-typedef enum {
-  YAZE_EVENT_ROM_LOADED,
-  YAZE_EVENT_ROM_SAVED,
-  YAZE_EVENT_SPRITE_MODIFIED,
-  YAZE_EVENT_PALETTE_CHANGED,
-} yaze_event_type;
-
-/**
- * @brief Extension interface for Yaze.
- *
- * @details Yaze extensions can be written in C or Python.
- */
-typedef struct yaze_extension {
-  const char* name;
-  const char* version;
-
-  /**
-   * @brief Function to initialize the extension.
-   *
-   * @details This function is called when the extension is loaded. It can be
-   * used to set up any resources or state needed by the extension.
-   */
-  yaze_initialize_func initialize;
-
-  /**
-   * @brief Function to clean up the extension.
-   *
-   * @details This function is called when the extension is unloaded. It can be
-   * used to clean up any resources or state used by the extension.
-   */
-  yaze_cleanup_func cleanup;
-
-  /**
-   * @brief Function to manipulate the ROM.
-   *
-   * @param rom The ROM to manipulate.
-   *
-   */
-  yaze_manipulate_rom_func manipulate_rom;
-
-  /**
-   * @brief Function to extend the UI.
-   *
-   * @param context The editor context.
-   *
-   * @details This function is called when the extension is loaded. It can be
-   * used to add custom UI elements to the editor. The context parameter
-   * provides access to the project, command registry, event dispatcher, and
-   * ImGui context.
-   */
-  yaze_extend_ui_func extend_ui;
-
-  /**
-   * @brief Register commands in the yaze_command_registry.
-   */
-  yaze_command_func register_commands;
-
-  /**
-   * @brief Register custom tools in the yaze_command_registry.
-   */
-  yaze_command_func register_custom_tools;
-
-  /**
-   * @brief Register event hooks in the yaze_event_dispatcher.
-   */
-  void (*register_event_hooks)(yaze_event_type event,
-                               yaze_event_hook_func hook);
-
-} yaze_extension;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // EXTENSION_INTERFACE_H
--- a/incl/yaze.h
+++ b/incl/yaze.h
@@ -19,9 +19,6 @@ typedef struct yaze_project yaze_project;
 typedef struct yaze_command_registry yaze_command_registry;
 typedef struct yaze_event_dispatcher yaze_event_dispatcher;

-/**
- * @brief Extension editor context.
- */
 typedef struct yaze_editor_context {
  z3_rom* rom;
  yaze_project* project;
@@ -30,19 +27,10 @@ typedef struct yaze_editor_context {
  yaze_event_dispatcher* event_dispatcher;
 } yaze_editor_context;

-/**
- * @brief Initialize the Yaze library.
- */
+void yaze_check_version(const char* version);
 int yaze_init(yaze_editor_context*);
-
-/**
- * @brief Clean up the Yaze library.
- */
 void yaze_cleanup(yaze_editor_context*);

-/**
- * @brief Primitive of a Yaze project.
- */
 struct yaze_project {
  const char* name;
  const char* filepath;
@@ -53,29 +41,16 @@ struct yaze_project {

 yaze_project yaze_load_project(const char* filename);

-/**
- * @brief Primitive of a Zelda3 ROM.
- */
 struct z3_rom {
  const char* filename;
  const uint8_t* data;
  size_t size;
-  void* impl;  // yaze::app::Rom*
+  void* impl;  // yaze::Rom*
 };

-/**
- * @brief Load a Zelda3 ROM from a file.
- */
 z3_rom* yaze_load_rom(const char* filename);
-
-/**
- * @brief Unload a Zelda3 ROM.
- */
 void yaze_unload_rom(z3_rom* rom);

-/**
- * @brief Primitive of a Bitmap
- */
 typedef struct yaze_bitmap {
  int width;
  int height;
@@ -83,41 +58,100 @@ typedef struct yaze_bitmap {
  uint8_t* data;
 } yaze_bitmap;

-/**
- * @brief Load a bitmap from a file.
- */
 yaze_bitmap yaze_load_bitmap(const char* filename);

-/**
- * @brief Get a color from a palette set.
- */
 snes_color yaze_get_color_from_paletteset(const z3_rom* rom, int palette_set,
                                          int palette, int color);

-/**
- * @brief Load the overworld from a Zelda3 ROM.
- */
 z3_overworld* yaze_load_overworld(const z3_rom* rom);

-/**
- * @brief Check the version of the Yaze library.
- */
-void yaze_check_version(const char* version);
+z3_dungeon_room* yaze_load_all_rooms(const z3_rom* rom);

-/**
- * @brief Command registry.
- */
 struct yaze_command_registry {
  void (*register_command)(const char* name, void (*command)(void));
 };

-/**
- * @brief Event dispatcher.
- */
 struct yaze_event_dispatcher {
  void (*register_event_hook)(void (*event_hook)(void));
 };

+typedef void (*yaze_initialize_func)(yaze_editor_context* context);
+typedef void (*yaze_cleanup_func)(void);
+typedef void (*yaze_extend_ui_func)(yaze_editor_context* context);
+typedef void (*yaze_manipulate_rom_func)(z3_rom* rom);
+typedef void (*yaze_command_func)(void);
+typedef void (*yaze_event_hook_func)(void);
+
+typedef enum {
+  YAZE_EVENT_ROM_LOADED,
+  YAZE_EVENT_ROM_SAVED,
+  YAZE_EVENT_SPRITE_MODIFIED,
+  YAZE_EVENT_PALETTE_CHANGED,
+} yaze_event_type;
+
+/**
+ * @brief Extension interface for Yaze.
+ *
+ * @details Yaze extensions can be written in C or Python.
+ */
+typedef struct yaze_extension {
+  const char* name;
+  const char* version;
+
+  /**
+   * @brief Function to initialize the extension.
+   *
+   * @details This function is called when the extension is loaded. It can be
+   * used to set up any resources or state needed by the extension.
+   */
+  yaze_initialize_func initialize;
+
+  /**
+   * @brief Function to clean up the extension.
+   *
+   * @details This function is called when the extension is unloaded. It can be
+   * used to clean up any resources or state used by the extension.
+   */
+  yaze_cleanup_func cleanup;
+
+  /**
+   * @brief Function to manipulate the ROM.
+   *
+   * @param rom The ROM to manipulate.
+   *
+   */
+  yaze_manipulate_rom_func manipulate_rom;
+
+  /**
+   * @brief Function to extend the UI.
+   *
+   * @param context The editor context.
+   *
+   * @details This function is called when the extension is loaded. It can be
+   * used to add custom UI elements to the editor. The context parameter
+   * provides access to the project, command registry, event dispatcher, and
+   * ImGui context.
+   */
+  yaze_extend_ui_func extend_ui;
+
+  /**
+   * @brief Register commands in the yaze_command_registry.
+   */
+  yaze_command_func register_commands;
+
+  /**
+   * @brief Register custom tools in the yaze_command_registry.
+   */
+  yaze_command_func register_custom_tools;
+
+  /**
+   * @brief Register event hooks in the yaze_event_dispatcher.
+   */
+  void (*register_event_hooks)(yaze_event_type event,
+                               yaze_event_hook_func hook);
+
+} yaze_extension;
+
 #ifdef __cplusplus
 }
 #endif
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -105,6 +105,7 @@ if (YAZE_BUILD_LIB)
    ${CMAKE_SOURCE_DIR}/src/
    ${PNG_INCLUDE_DIRS}
    ${SDL2_INCLUDE_DIR}
+    ${PROJECT_BINARY_DIR}
  )

  target_link_libraries(
--- a/src/app/app.cmake
+++ b/src/app/app.cmake
@@ -5,35 +5,34 @@ include(app/gui/gui.cmake)
 include(app/zelda3/zelda3.cmake)

 if (APPLE)
-add_executable(
-  yaze
-  MACOSX_BUNDLE
-  app/main.cc
-  app/rom.cc
-  ${YAZE_APP_EMU_SRC}
-  ${YAZE_APP_CORE_SRC}
-  ${YAZE_APP_EDITOR_SRC}
-  ${YAZE_APP_GFX_SRC}
-  ${YAZE_APP_ZELDA3_SRC}
-  ${YAZE_GUI_SRC}
-  ${IMGUI_SRC}
-
-  # Bundled Resources
-  ${YAZE_RESOURCE_FILES}
-)
+  add_executable(
+    yaze
+    MACOSX_BUNDLE
+    app/main.cc
+    app/rom.cc
+    ${YAZE_APP_EMU_SRC}
+    ${YAZE_APP_CORE_SRC}
+    ${YAZE_APP_EDITOR_SRC}
+    ${YAZE_APP_GFX_SRC}
+    ${YAZE_APP_ZELDA3_SRC}
+    ${YAZE_GUI_SRC}
+    ${IMGUI_SRC}
+    # Bundled Resources
+    ${YAZE_RESOURCE_FILES}
+  )
 else()
-add_executable(
-  yaze
-  app/main.cc
-  app/rom.cc
-  ${YAZE_APP_EMU_SRC}
-  ${YAZE_APP_CORE_SRC}
-  ${YAZE_APP_EDITOR_SRC}
-  ${YAZE_APP_GFX_SRC}
-  ${YAZE_APP_ZELDA3_SRC}
-  ${YAZE_GUI_SRC}
-  ${IMGUI_SRC}
-)
+  add_executable(
+    yaze
+    app/main.cc
+    app/rom.cc
+    ${YAZE_APP_EMU_SRC}
+    ${YAZE_APP_CORE_SRC}
+    ${YAZE_APP_EDITOR_SRC}
+    ${YAZE_APP_GFX_SRC}
+    ${YAZE_APP_ZELDA3_SRC}
+    ${YAZE_GUI_SRC}
+    ${IMGUI_SRC}
+  )
 endif()

 target_include_directories(
@@ -46,6 +45,7 @@ target_include_directories(
  ${CMAKE_SOURCE_DIR}/src/lib/imgui_test_engine
  ${PNG_INCLUDE_DIRS}
  ${SDL2_INCLUDE_DIR}
+  ${PROJECT_BINARY_DIR}
 )

 target_link_libraries(
@@ -63,11 +63,3 @@ if (APPLE)
  target_link_libraries(yaze PUBLIC ${COCOA_LIBRARY})
 endif()

-if (WIN32 OR MINGW)
-  target_link_libraries(
-    yaze PUBLIC
-    ${CMAKE_SOURCE_DIR}/build/build-windows/bin/libpng16.dll
-    zlib
-    mingw32
-    ws2_32)
-endif()
--- a/src/app/core/common.cc
+++ b/src/app/core/common.cc
@@ -9,11 +9,11 @@
 #include <vector>

 #include "absl/status/statusor.h"
+#include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"

 namespace yaze {
-namespace app {
 namespace core {

 namespace {
@@ -59,7 +59,6 @@ unsigned ldle(uint8_t const *const p_arr, unsigned const p_index) {

 void stle(uint8_t *const p_arr, size_t const p_index, unsigned const p_val) {
  uint8_t v = (p_val >> (8 * p_index)) & 0xff;
-
  p_arr[p_index] = v;
 }

@@ -91,30 +90,75 @@ uint32_t ldle2(uint8_t const *const p_arr) { return ldle(p_arr, 2); }
 // Helper function to get the third byte in a little endian number
 uint32_t ldle3(uint8_t const *const p_arr) { return ldle(p_arr, 3); }

+void HandleHexStringParams(const std::string &hex,
+                           const HexStringParams &params) {
+  std::string result = hex;
+  switch (params.prefix) {
+    case HexStringParams::Prefix::kDollar:
+      result = absl::StrCat("$", result);
+      break;
+    case HexStringParams::Prefix::kHash:
+      result = absl::StrCat("#", result);
+      break;
+    case HexStringParams::Prefix::k0x:
+      result = absl::StrCat("0x", result);
+    case HexStringParams::Prefix::kNone:
+    default:
+      break;
+  }
+}
+
 }  // namespace

-std::string UppercaseHexByte(uint8_t byte, bool leading) {
-  if (leading) {
-    std::string result = absl::StrFormat("0x%02X", byte);
-    return result;
+std::string HexByte(uint8_t byte, HexStringParams params) {
+  std::string result;
+  const static std::string kLowerFormat = "%02x";
+  const static std::string kUpperFormat = "%02X";
+  if (params.uppercase) {
+    result = absl::StrFormat(kUpperFormat.c_str(), byte);
+  } else {
+    result = absl::StrFormat(kLowerFormat.c_str(), byte);
  }
-  std::string result = absl::StrFormat("%02X", byte);
+  HandleHexStringParams(result, params);
  return result;
 }
-std::string UppercaseHexWord(uint16_t word, bool leading) {
-  if (leading) {
-    std::string result = absl::StrFormat("0x%04X", word);
-    return result;
+
+std::string HexWord(uint16_t word, HexStringParams params) {
+  std::string result;
+  const static std::string kLowerFormat = "%04x";
+  const static std::string kUpperFormat = "%04X";
+  if (params.uppercase) {
+    result = absl::StrFormat(kUpperFormat.c_str(), word);
+  } else {
+    result = absl::StrFormat(kLowerFormat.c_str(), word);
  }
-  std::string result = absl::StrFormat("%04X", word);
+  HandleHexStringParams(result, params);
  return result;
 }
-std::string UppercaseHexLong(uint32_t dword) {
-  std::string result = absl::StrFormat("0x%06X", dword);
+
+std::string HexLong(uint32_t dword, HexStringParams params) {
+  std::string result;
+  const static std::string kLowerFormat = "%06x";
+  const static std::string kUpperFormat = "%06X";
+  if (params.uppercase) {
+    result = absl::StrFormat(kUpperFormat.c_str(), dword);
+  } else {
+    result = absl::StrFormat(kLowerFormat.c_str(), dword);
+  }
+  HandleHexStringParams(result, params);
  return result;
 }
-std::string UppercaseHexLongLong(uint64_t qword) {
-  std::string result = absl::StrFormat("0x%08X", qword);
+
+std::string HexLongLong(uint64_t qword, HexStringParams params) {
+  std::string result;
+  const static std::string kLowerFormat = "%08x";
+  const static std::string kUpperFormat = "%08X";
+  if (params.uppercase) {
+    result = absl::StrFormat(kUpperFormat.c_str(), qword);
+  } else {
+    result = absl::StrFormat(kLowerFormat.c_str(), qword);
+  }
+  HandleHexStringParams(result, params);
  return result;
 }

@@ -127,8 +171,6 @@ bool StringReplace(std::string &str, const std::string &from,
  return true;
 }

-std::shared_ptr<ExperimentFlags::Flags> ExperimentFlags::flags_;
-
 uint32_t Get24LocalFromPC(uint8_t *data, int addr, bool pc) {
  uint32_t ret =
      (PcToSnes(addr) & 0xFF0000) | (data[addr + 1] << 8) | data[addr];
@@ -317,17 +359,5 @@ void ApplyBpsPatch(const std::vector<uint8_t> &source,
  }
 }

-absl::StatusOr<std::string> CheckVersion(const char *version) {
-  std::string version_string = version;
-  if (version_string != kYazeVersion) {
-    std::string message =
-        absl::StrFormat("Yaze version mismatch: expected %s, got %s",
-                        kYazeVersion.data(), version_string.c_str());
-    return absl::InvalidArgumentError(message);
-  }
-  return version_string;
-}
-
 }  // namespace core
-}  // namespace app
 }  // namespace yaze
--- a/src/app/core/common.h
+++ b/src/app/core/common.h
@@ -7,23 +7,27 @@
 #include <memory>
 #include <string>

+#include "absl/container/flat_hash_map.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_format.h"
-#include "absl/container/flat_hash_map.h"

 namespace yaze {
-namespace app {

 /**
- * @namespace yaze::app::core
+ * @namespace yaze::core
 * @brief Core application logic and utilities.
 */
 namespace core {

-std::string UppercaseHexByte(uint8_t byte, bool leading = false);
-std::string UppercaseHexWord(uint16_t word, bool leading = false);
-std::string UppercaseHexLong(uint32_t dword);
-std::string UppercaseHexLongLong(uint64_t qword);
+struct HexStringParams {
+  enum class Prefix { kNone, kDollar, kHash, k0x } prefix = Prefix::kDollar;
+  bool uppercase = true;
+};
+
+std::string HexByte(uint8_t byte, HexStringParams params = {});
+std::string HexWord(uint16_t word, HexStringParams params = {});
+std::string HexLong(uint32_t dword, HexStringParams params = {});
+std::string HexLongLong(uint64_t qword, HexStringParams params = {});

 bool StringReplace(std::string &str, const std::string &from,
                   const std::string &to);
@@ -33,16 +37,11 @@ bool StringReplace(std::string &str, const std::string &from,
 * @brief A class to manage experimental feature flags.
 */
 class ExperimentFlags {
-public:
+ public:
  struct Flags {
    // Log instructions to the GUI debugger.
    bool kLogInstructions = true;

-    // Flag to enable ImGui input config flags. Currently is
-    // handled manually by controller class but should be
-    // ported away from that eventually.
-    bool kUseNewImGuiInput = false;
-
    // Flag to enable the saving of all palettes to the Rom.
    bool kSaveAllPalettes = false;

@@ -97,60 +96,44 @@ public:
    } overworld;
  };

-  ExperimentFlags() = default;
-  virtual ~ExperimentFlags() = default;
-  auto flags() const {
-    if (!flags_) {
-      flags_ = std::make_shared<Flags>();
-    }
-    Flags *flags = flags_.get();
-    return flags;
-  }
-  Flags *mutable_flags() {
-    if (!flags_) {
-      flags_ = std::make_shared<Flags>();
-    }
-    return flags_.get();
+  static Flags &get() {
+    static Flags instance;
+    return instance;
  }
+
  std::string Serialize() const {
    std::string result;
    result +=
-        "kLogInstructions: " + std::to_string(flags_->kLogInstructions) + "\n";
+        "kLogInstructions: " + std::to_string(get().kLogInstructions) + "\n";
    result +=
-        "kUseNewImGuiInput: " + std::to_string(flags_->kUseNewImGuiInput) +
+        "kSaveAllPalettes: " + std::to_string(get().kSaveAllPalettes) + "\n";
+    result += "kSaveGfxGroups: " + std::to_string(get().kSaveGfxGroups) + "\n";
+    result +=
+        "kSaveWithChangeQueue: " + std::to_string(get().kSaveWithChangeQueue) +
        "\n";
-    result +=
-        "kSaveAllPalettes: " + std::to_string(flags_->kSaveAllPalettes) + "\n";
-    result +=
-        "kSaveGfxGroups: " + std::to_string(flags_->kSaveGfxGroups) + "\n";
-    result += "kSaveWithChangeQueue: " +
-              std::to_string(flags_->kSaveWithChangeQueue) + "\n";
    result += "kDrawDungeonRoomGraphics: " +
-              std::to_string(flags_->kDrawDungeonRoomGraphics) + "\n";
+              std::to_string(get().kDrawDungeonRoomGraphics) + "\n";
    result += "kNewFileDialogWrapper: " +
-              std::to_string(flags_->kNewFileDialogWrapper) + "\n";
+              std::to_string(get().kNewFileDialogWrapper) + "\n";
    result += "kLoadTexturesAsStreaming: " +
-              std::to_string(flags_->kLoadTexturesAsStreaming) + "\n";
+              std::to_string(get().kLoadTexturesAsStreaming) + "\n";
    result +=
-        "kSaveDungeonMaps: " + std::to_string(flags_->kSaveDungeonMaps) + "\n";
-    result += "kLogToConsole: " + std::to_string(flags_->kLogToConsole) + "\n";
+        "kSaveDungeonMaps: " + std::to_string(get().kSaveDungeonMaps) + "\n";
+    result += "kLogToConsole: " + std::to_string(get().kLogToConsole) + "\n";
    result += "kDrawOverworldSprites: " +
-              std::to_string(flags_->overworld.kDrawOverworldSprites) + "\n";
+              std::to_string(get().overworld.kDrawOverworldSprites) + "\n";
    result += "kSaveOverworldMaps: " +
-              std::to_string(flags_->overworld.kSaveOverworldMaps) + "\n";
+              std::to_string(get().overworld.kSaveOverworldMaps) + "\n";
    result += "kSaveOverworldEntrances: " +
-              std::to_string(flags_->overworld.kSaveOverworldEntrances) + "\n";
+              std::to_string(get().overworld.kSaveOverworldEntrances) + "\n";
    result += "kSaveOverworldExits: " +
-              std::to_string(flags_->overworld.kSaveOverworldExits) + "\n";
+              std::to_string(get().overworld.kSaveOverworldExits) + "\n";
    result += "kSaveOverworldItems: " +
-              std::to_string(flags_->overworld.kSaveOverworldItems) + "\n";
+              std::to_string(get().overworld.kSaveOverworldItems) + "\n";
    result += "kSaveOverworldProperties: " +
-              std::to_string(flags_->overworld.kSaveOverworldProperties) + "\n";
+              std::to_string(get().overworld.kSaveOverworldProperties) + "\n";
    return result;
  }
-
-private:
-  static std::shared_ptr<Flags> flags_;
 };

 /**
@@ -158,8 +141,9 @@ private:
 * @brief A class to manage a value that can be modified and notify when it
 * changes.
 */
-template <typename T> class NotifyValue {
-public:
+template <typename T>
+class NotifyValue {
+ public:
  NotifyValue() : value_(), modified_(false), temp_value_() {}
  NotifyValue(const T &value)
      : value_(value), modified_(false), temp_value_() {}
@@ -192,14 +176,14 @@ public:

  bool modified() const { return modified_; }

-private:
+ private:
  T value_;
  bool modified_;
  T temp_value_;
 };

 static bool log_to_console = false;
-static std::string log_file_out = "log.txt";
+static const std::string kLogFileOut = "yaze_log.txt";

 template <typename... Args>
 static void logf(const absl::FormatSpec<Args...> &format, const Args &...args) {
@@ -207,39 +191,10 @@ static void logf(const absl::FormatSpec<Args...> &format, const Args &...args) {
  if (log_to_console) {
    std::cout << message << std::endl;
  }
-  static std::ofstream fout(log_file_out, std::ios::out | std::ios::app);
+  static std::ofstream fout(kLogFileOut, std::ios::out | std::ios::app);
  fout << message << std::endl;
 }

-struct StructuredLog {
-  std::string raw_message;
-  std::string category;
-};
-
-static absl::flat_hash_map<std::string, std::vector<std::string>> log_categories;
-
-template <typename... Args>
-static void logm(const std::string &category,
-                 const absl::FormatSpec<Args...> &format, const Args &...args) {
-  std::string message = absl::StrFormat(format, args...);
-  if (log_to_console) {
-    std::cout << category << ": " << message << std::endl;
-  }
-  if (log_categories.contains(category)) {
-    log_categories[category].push_back(message);
-  } else {
-    log_categories[category] = {message};
-  }
-}
-
-class Logger {
-public:
-  static void log(std::string message) {
-    static std::ofstream fout(log_file_out, std::ios::out | std::ios::app);
-    fout << message << std::endl;
-  }
-};
-
 constexpr uint32_t kFastRomRegion = 0x808000;

 inline uint32_t SnesToPc(uint32_t addr) noexcept {
@@ -310,12 +265,7 @@ void ApplyBpsPatch(const std::vector<uint8_t> &source,
                   const std::vector<uint8_t> &patch,
                   std::vector<uint8_t> &target);

-constexpr std::string_view kYazeVersion = "0.2.1";
-
-absl::StatusOr<std::string> CheckVersion(const char *version);
-
-} // namespace core
-} // namespace app
-} // namespace yaze
+}  // namespace core
+}  // namespace yaze

 #endif
--- a/src/app/core/controller.cc
+++ b/src/app/core/controller.cc
@@ -16,40 +16,8 @@
 #include "imgui/imgui.h"

 namespace yaze {
-namespace app {
 namespace core {

-namespace {
-
-constexpr ImGuiWindowFlags kMainEditorFlags =
-    ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoCollapse |
-    ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_MenuBar |
-    ImGuiWindowFlags_NoBringToFrontOnFocus | ImGuiWindowFlags_NoTitleBar;
-
-using ImGui::Begin;
-using ImGui::End;
-using ImGui::GetIO;
-using ImGui::NewFrame;
-using ImGui::SetNextWindowPos;
-using ImGui::SetNextWindowSize;
-
-void NewMasterFrame() {
-  const ImGuiIO &io = GetIO();
-  ImGui_ImplSDLRenderer2_NewFrame();
-  ImGui_ImplSDL2_NewFrame();
-  NewFrame();
-  SetNextWindowPos(gui::kZeroPos);
-  ImVec2 dimensions(io.DisplaySize.x, io.DisplaySize.y);
-  SetNextWindowSize(dimensions, ImGuiCond_Always);
-
-  if (!Begin("##YazeMain", nullptr, kMainEditorFlags)) {
-    End();
-    return;
-  }
-}
-
-}  // namespace
-
 absl::Status Controller::OnEntry(std::string filename) {
 #if defined(__APPLE__) && defined(__MACH__)
 #if TARGET_IPHONE_SIMULATOR == 1 || TARGET_OS_IPHONE == 1
@@ -68,7 +36,7 @@ absl::Status Controller::OnEntry(std::string filename) {
  RETURN_IF_ERROR(CreateRenderer())
  RETURN_IF_ERROR(CreateGuiContext())
  RETURN_IF_ERROR(LoadAudioDevice())
-  editor_manager_.SetupScreen(filename);
+  editor_manager_.Initialize(filename);
  active_ = true;
  return absl::OkStatus();
 }
@@ -81,30 +49,30 @@ void Controller::OnInput() {
  while (SDL_PollEvent(&event)) {
    ImGui_ImplSDL2_ProcessEvent(&event);
    switch (event.type) {
-      case SDL_KEYDOWN:
-      case SDL_KEYUP: {
-        ImGuiIO &io = ImGui::GetIO();
-        io.KeyShift = ((SDL_GetModState() & KMOD_SHIFT) != 0);
-        io.KeyCtrl = ((SDL_GetModState() & KMOD_CTRL) != 0);
-        io.KeyAlt = ((SDL_GetModState() & KMOD_ALT) != 0);
-        io.KeySuper = ((SDL_GetModState() & KMOD_GUI) != 0);
+    case SDL_KEYDOWN:
+    case SDL_KEYUP: {
+      ImGuiIO &io = ImGui::GetIO();
+      io.KeyShift = ((SDL_GetModState() & KMOD_SHIFT) != 0);
+      io.KeyCtrl = ((SDL_GetModState() & KMOD_CTRL) != 0);
+      io.KeyAlt = ((SDL_GetModState() & KMOD_ALT) != 0);
+      io.KeySuper = ((SDL_GetModState() & KMOD_GUI) != 0);
+      break;
+    }
+    case SDL_WINDOWEVENT:
+      switch (event.window.event) {
+      case SDL_WINDOWEVENT_CLOSE:
+        active_ = false;
        break;
-      }
-      case SDL_WINDOWEVENT:
-        switch (event.window.event) {
-          case SDL_WINDOWEVENT_CLOSE:
-            active_ = false;
-            break;
-          case SDL_WINDOWEVENT_SIZE_CHANGED:
-            io.DisplaySize.x = static_cast<float>(event.window.data1);
-            io.DisplaySize.y = static_cast<float>(event.window.data2);
-            break;
-          default:
-            break;
-        }
+      case SDL_WINDOWEVENT_SIZE_CHANGED:
+        io.DisplaySize.x = static_cast<float>(event.window.data1);
+        io.DisplaySize.y = static_cast<float>(event.window.data2);
        break;
      default:
        break;
+      }
+      break;
+    default:
+      break;
    }
  }

@@ -125,15 +93,26 @@ absl::Status Controller::OnLoad() {
    active_ = false;
  }
 #if TARGET_OS_IPHONE != 1
-  if (platform_ != Platform::kiOS) {
-    NewMasterFrame();
+  constexpr ImGuiWindowFlags kMainEditorFlags =
+      ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoCollapse |
+      ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_MenuBar |
+      ImGuiWindowFlags_NoBringToFrontOnFocus | ImGuiWindowFlags_NoTitleBar;
+
+  const ImGuiIO &io = ImGui::GetIO();
+  ImGui_ImplSDLRenderer2_NewFrame();
+  ImGui_ImplSDL2_NewFrame();
+  ImGui::NewFrame();
+  ImGui::SetNextWindowPos(gui::kZeroPos);
+  ImVec2 dimensions(io.DisplaySize.x, io.DisplaySize.y);
+  ImGui::SetNextWindowSize(dimensions, ImGuiCond_Always);
+
+  if (!ImGui::Begin("##YazeMain", nullptr, kMainEditorFlags)) {
+    ImGui::End();
  }
 #endif
  RETURN_IF_ERROR(editor_manager_.Update());
 #if TARGET_OS_IPHONE != 1
-  if (platform_ != Platform::kiOS) {
-    End();
-  }
+  ImGui::End();
 #endif
  return absl::OkStatus();
 }
@@ -162,9 +141,6 @@ void Controller::OnExit() {

 absl::Status Controller::CreateWindow() {
  auto sdl_flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_TIMER;
-  if (flags()->kUseNewImGuiInput) {
-    sdl_flags |= SDL_INIT_GAMECONTROLLER;
-  }

  if (SDL_Init(sdl_flags) != 0) {
    return absl::InternalError(
@@ -177,11 +153,11 @@ absl::Status Controller::CreateWindow() {
  int screen_height = display_mode.h * 0.8;

  window_ = std::unique_ptr<SDL_Window, core::SDL_Deleter>(
-      SDL_CreateWindow("Yet Another Zelda3 Editor",  // window title
-                       SDL_WINDOWPOS_UNDEFINED,      // initial x position
-                       SDL_WINDOWPOS_UNDEFINED,      // initial y position
-                       screen_width,                 // width, in pixels
-                       screen_height,                // height, in pixels
+      SDL_CreateWindow("Yet Another Zelda3 Editor", // window title
+                       SDL_WINDOWPOS_UNDEFINED,     // initial x position
+                       SDL_WINDOWPOS_UNDEFINED,     // initial y position
+                       screen_width,                // width, in pixels
+                       screen_height,               // height, in pixels
                       SDL_WINDOW_RESIZABLE),
      core::SDL_Deleter());
  if (window_ == nullptr) {
@@ -202,9 +178,6 @@ absl::Status Controller::CreateGuiContext() {

  ImGuiIO &io = ImGui::GetIO();
  io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;
-  if (flags()->kUseNewImGuiInput) {
-    io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad;
-  }

  // Initialize ImGui based on the backend
  ImGui_ImplSDL2_InitForSDLRenderer(window_.get(),
@@ -235,7 +208,7 @@ absl::Status Controller::LoadAudioDevice() {
  want.format = AUDIO_S16;
  want.channels = 2;
  want.samples = 2048;
-  want.callback = NULL;  // Uses the queue
+  want.callback = NULL; // Uses the queue
  audio_device_ = SDL_OpenAudioDevice(NULL, 0, &want, &have, 0);
  if (audio_device_ == 0) {
    return absl::InternalError(
@@ -277,6 +250,5 @@ absl::Status Controller::LoadConfigFiles() {
  return absl::OkStatus();
 }

-}  // namespace core
-}  // namespace app
-}  // namespace yaze
+} // namespace core
+} // namespace yaze
--- a/src/app/core/controller.h
+++ b/src/app/core/controller.h
@@ -8,8 +8,8 @@
 #include "absl/status/status.h"
 #include "app/core/platform/renderer.h"
 #include "app/core/utils/file_util.h"
-#include "app/editor/editor_manager.h"
 #include "app/editor/editor.h"
+#include "app/editor/editor_manager.h"
 #include "imgui/backends/imgui_impl_sdl2.h"
 #include "imgui/backends/imgui_impl_sdlrenderer2.h"
 #include "imgui/imconfig.h"
@@ -18,7 +18,6 @@
 int main(int argc, char **argv);

 namespace yaze {
-namespace app {
 namespace core {

 /**
@@ -45,7 +44,7 @@ class Controller : public ExperimentFlags {
  absl::Status LoadConfigFiles();

  void SetupScreen(std::string filename = "") {
-    editor_manager_.SetupScreen(filename);
+    editor_manager_.Initialize(filename);
  }
  auto editor_manager() -> editor::EditorManager & { return editor_manager_; }
  auto renderer() -> SDL_Renderer * {
@@ -54,13 +53,14 @@ class Controller : public ExperimentFlags {
  auto window() -> SDL_Window * { return window_.get(); }
  void init_test_editor(editor::Editor *editor) { test_editor_ = editor; }
  void set_active(bool active) { active_ = active; }
+  auto active() { return active_; }

 private:
  friend int ::main(int argc, char **argv);

-  bool active_;
+  bool active_ = false;
  Platform platform_;
-  editor::Editor *test_editor_;
+  editor::Editor *test_editor_ = nullptr;
  editor::EditorManager editor_manager_;

  int audio_frequency_ = 48000;
@@ -70,7 +70,6 @@ class Controller : public ExperimentFlags {
 };

 }  // namespace core
-}  // namespace app
 }  // namespace yaze

 #endif  // YAZE_APP_CORE_CONTROLLER_H
--- a/src/app/core/platform/app_delegate.mm
+++ b/src/app/core/platform/app_delegate.mm
@@ -206,8 +206,8 @@
 }

 - (void)openFileAction:(id)sender {
-  if (!yaze::app::SharedRom::shared_rom_
-           ->LoadFromFile(yaze::app::core::FileDialogWrapper::ShowOpenFileDialog())
+  if (!yaze::SharedRom::shared_rom_
+           ->LoadFromFile(yaze::core::FileDialogWrapper::ShowOpenFileDialog())
           .ok()) {
    NSAlert *alert = [[NSAlert alloc] init];
    [alert setMessageText:@"Error"];
@@ -238,7 +238,7 @@ extern "C" void yaze_initialize_cococa() {

 extern "C" void yaze_run_cocoa_app_delegate(const char *filename) {
  yaze_initialize_cococa();
-  yaze::app::core::Controller controller;
+  yaze::core::Controller controller;
  RETURN_VOID_IF_ERROR(controller.OnEntry(filename));
  while (controller.IsActive()) {
    @autoreleasepool {
--- a/src/app/core/platform/clipboard.cc
+++ b/src/app/core/platform/clipboard.cc
@@ -4,7 +4,6 @@
 #include <vector>

 namespace yaze {
-namespace app {
 namespace core {

 void CopyImageToClipboard(const std::vector<uint8_t>& data) {}
@@ -12,5 +11,4 @@ void GetImageFromClipboard(std::vector<uint8_t>& data, int& width,
                           int& height) {}

 }  // namespace core
-}  // namespace app
 }  // namespace yaze
--- a/src/app/core/platform/clipboard.h
+++ b/src/app/core/platform/clipboard.h
@@ -5,14 +5,12 @@
 #include <vector>

 namespace yaze {
-namespace app {
 namespace core {

 void CopyImageToClipboard(const std::vector<uint8_t> &data);
 void GetImageFromClipboard(std::vector<uint8_t> &data, int &width, int &height);

 }  // namespace core
-}  // namespace app
 }  // namespace yaze

 #endif  // YAZE_APP_CORE_PLATFORM_CLIPBOARD_H
--- a/src/app/core/platform/clipboard.mm
+++ b/src/app/core/platform/clipboard.mm
@@ -6,7 +6,7 @@
 #ifdef TARGET_OS_MAC
 #import <Cocoa/Cocoa.h>

-void yaze::app::core::CopyImageToClipboard(const std::vector<uint8_t>& pngData) {
+void yaze::core::CopyImageToClipboard(const std::vector<uint8_t>& pngData) {
  NSData* data = [NSData dataWithBytes:pngData.data() length:pngData.size()];
  NSImage* image = [[NSImage alloc] initWithData:data];

@@ -15,7 +15,7 @@ void yaze::app::core::CopyImageToClipboard(const std::vector<uint8_t>& pngData)
  [pasteboard writeObjects:@[ image ]];
 }

-void yaze::app::core::GetImageFromClipboard(std::vector<uint8_t>& pixel_data, int& width, int& height) {
+void yaze::core::GetImageFromClipboard(std::vector<uint8_t>& pixel_data, int& width, int& height) {
  NSPasteboard* pasteboard = [NSPasteboard generalPasteboard];
  NSArray* classArray = [NSArray arrayWithObject:[NSImage class]];
  NSDictionary* options = [NSDictionary dictionary];
--- a/src/app/core/platform/file_dialog.cc
+++ b/src/app/core/platform/file_dialog.cc
@@ -7,12 +7,11 @@
 #endif  // _WIN32

 namespace yaze {
-namespace app {
 namespace core {

 #ifdef _WIN32

- std::string FileDialogWrapper::ShowOpenFileDialog() {
+std::string FileDialogWrapper::ShowOpenFileDialog() {
  CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE);

  IFileDialog *pfd = NULL;
@@ -44,7 +43,7 @@ namespace core {
  return file_path_windows;
 }

- std::string FileDialogWrapper::ShowOpenFolderDialog() {
+std::string FileDialogWrapper::ShowOpenFolderDialog() {
  CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE);

  IFileDialog *pfd = NULL;
@@ -141,5 +140,4 @@ std::vector<std::string> FileDialogWrapper::GetFilesInFolder(
 #endif

 }  // namespace core
-}  // namespace app
 }  // namespace yaze
--- a/src/app/core/platform/file_dialog.h
+++ b/src/app/core/platform/file_dialog.h
@@ -5,7 +5,6 @@
 #include <vector>

 namespace yaze {
-namespace app {
 namespace core {

 class FileDialogWrapper {
@@ -28,7 +27,6 @@ class FileDialogWrapper {
 };

 }  // namespace core
-}  // namespace app
 }  // namespace yaze

 #endif  // YAZE_APP_CORE_PLATFORM_FILE_DIALOG_H
--- a/src/app/core/platform/file_dialog.mm
+++ b/src/app/core/platform/file_dialog.mm
@@ -37,20 +37,18 @@ std::string ShowOpenFileDialogSync() {

  return result;
 }
-}
+}  // namespace

-std::string yaze::app::core::FileDialogWrapper::ShowOpenFileDialog() {
-  return ShowOpenFileDialogSync();
-}
+std::string yaze::core::FileDialogWrapper::ShowOpenFileDialog() { return ShowOpenFileDialogSync(); }

-std::string yaze::app::core::FileDialogWrapper::ShowOpenFolderDialog() { return ""; }
+std::string yaze::core::FileDialogWrapper::ShowOpenFolderDialog() { return ""; }

-std::vector<std::string> yaze::app::core::FileDialogWrapper::GetFilesInFolder(
+std::vector<std::string> yaze::core::FileDialogWrapper::GetFilesInFolder(
    const std::string &folder) {
  return {};
 }

-std::vector<std::string> yaze::app::core::FileDialogWrapper::GetSubdirectoriesInFolder(
+std::vector<std::string> yaze::core::FileDialogWrapper::GetSubdirectoriesInFolder(
    const std::string &folder) {
  return {};
 }
@@ -60,7 +58,7 @@ std::vector<std::string> yaze::app::core::FileDialogWrapper::GetSubdirectoriesIn

 #import <Cocoa/Cocoa.h>

-std::string yaze::app::core::FileDialogWrapper::ShowOpenFileDialog() {
+std::string yaze::core::FileDialogWrapper::ShowOpenFileDialog() {
  NSOpenPanel* openPanel = [NSOpenPanel openPanel];
  [openPanel setCanChooseFiles:YES];
  [openPanel setCanChooseDirectories:NO];
@@ -75,7 +73,7 @@ std::string yaze::app::core::FileDialogWrapper::ShowOpenFileDialog() {
  return "";
 }

-std::string yaze::app::core::FileDialogWrapper::ShowOpenFolderDialog() {
+std::string yaze::core::FileDialogWrapper::ShowOpenFolderDialog() {
  NSOpenPanel* openPanel = [NSOpenPanel openPanel];
  [openPanel setCanChooseFiles:NO];
  [openPanel setCanChooseDirectories:YES];
@@ -90,7 +88,7 @@ std::string yaze::app::core::FileDialogWrapper::ShowOpenFolderDialog() {
  return "";
 }

-std::vector<std::string> yaze::app::core::FileDialogWrapper::GetFilesInFolder(
+std::vector<std::string> yaze::core::FileDialogWrapper::GetFilesInFolder(
    const std::string& folder) {
  std::vector<std::string> filenames;
  NSFileManager* fileManager = [NSFileManager defaultManager];
@@ -106,7 +104,7 @@ std::vector<std::string> yaze::app::core::FileDialogWrapper::GetFilesInFolder(
  return filenames;
 }

-std::vector<std::string> yaze::app::core::FileDialogWrapper::GetSubdirectoriesInFolder(
+std::vector<std::string> yaze::core::FileDialogWrapper::GetSubdirectoriesInFolder(
    const std::string& folder) {
  std::vector<std::string> subdirectories;
  NSFileManager* fileManager = [NSFileManager defaultManager];
--- a/src/app/core/platform/file_path.h
+++ b/src/app/core/platform/file_path.h
@@ -4,7 +4,6 @@
 #include <string>

 namespace yaze {
-namespace app {
 namespace core {

 /**
@@ -14,7 +13,6 @@ namespace core {
 std::string GetBundleResourcePath();

 }  // namespace core
-}  // namespace app
 }  // namespace yaze

 #endif  // YAZE_APP_CORE_PLATFORM_FILE_PATH_H
--- a/src/app/core/platform/file_path.mm
+++ b/src/app/core/platform/file_path.mm
@@ -8,14 +8,14 @@
 #include <TargetConditionals.h>

 #if TARGET_IPHONE_SIMULATOR == 1 || TARGET_OS_IPHONE == 1
-std::string yaze::app::core::GetBundleResourcePath() {
+std::string yaze::core::GetBundleResourcePath() {
  NSBundle* bundle = [NSBundle mainBundle];
  NSString* resourceDirectoryPath = [bundle bundlePath];
  NSString* path = [resourceDirectoryPath stringByAppendingString:@"/"];
  return [path UTF8String];
 }
 #elif TARGET_OS_MAC == 1
-std::string yaze::app::core::GetBundleResourcePath() {
+std::string yaze::core::GetBundleResourcePath() {
  NSBundle* bundle = [NSBundle mainBundle];
  NSString* resourceDirectoryPath = [bundle bundlePath];
  NSString* path = [resourceDirectoryPath stringByAppendingString:@"/"];
--- a/src/app/core/platform/font_loader.cc
+++ b/src/app/core/platform/font_loader.cc
@@ -1,9 +1,9 @@
 #include "app/core/platform/font_loader.h"

+#include <filesystem>
 #include <string>
 #include <unordered_set>
 #include <vector>
-#include <filesystem>

 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
@@ -13,7 +13,6 @@
 #include "imgui/imgui.h"

 namespace yaze {
-namespace app {
 namespace core {

 absl::Status LoadPackageFonts() {
@@ -63,7 +62,8 @@ absl::Status LoadPackageFonts() {
                                    "Contents/Resources/font/", font_path);
 #endif
 #else
-    actual_font_path = std::filesystem::absolute(font_path).string();
+	actual_font_path = absl::StrCat("assets/font/", font_path);
+    actual_font_path = std::filesystem::absolute(actual_font_path).string();
 #endif

    if (!io.Fonts->AddFontFromFileTTF(actual_font_path.data(), font_size)) {
@@ -86,8 +86,11 @@ absl::Status LoadPackageFonts() {
 #else
    actual_icon_font_path = std::filesystem::absolute(icon_font_path).string();
 #endif
-    io.Fonts->AddFontFromFileTTF(actual_icon_font_path.data(), ICON_FONT_SIZE,
-                                 &icons_config, icons_ranges);
+    if (!io.Fonts->AddFontFromFileTTF(actual_icon_font_path.data(),
+                                      ICON_FONT_SIZE, &icons_config,
+                                      icons_ranges)) {
+      return absl::InternalError("Failed to load icon fonts");
+    }

    // Merge Japanese font
    std::string actual_japanese_font_path = "";
@@ -102,8 +105,9 @@ absl::Status LoadPackageFonts() {
                     japanese_font_path);
 #endif
 #else
+	actual_japanese_font_path = absl::StrCat("assets/font/", japanese_font_path);
    actual_japanese_font_path =
-        std::filesystem::absolute(japanese_font_path).string();
+        std::filesystem::absolute(actual_japanese_font_path).string();
 #endif
    io.Fonts->AddFontFromFileTTF(actual_japanese_font_path.data(), 18.0f,
                                 &japanese_font_config,
@@ -237,5 +241,4 @@ void LoadSystemFonts() {
 #endif

 }  // namespace core
-}  // namespace app
-}  // namespace yaze
+}  // namespace yaze
--- a/src/app/core/platform/font_loader.h
+++ b/src/app/core/platform/font_loader.h
@@ -4,14 +4,12 @@
 #include "absl/status/status.h"

 namespace yaze {
-namespace app {
 namespace core {

 void LoadSystemFonts();
 absl::Status LoadPackageFonts();

 }  // namespace core
-}  // namespace app
 }  // namespace yaze

 #endif  // YAZE_APP_CORE_PLATFORM_FONTLOADER_H
--- a/src/app/core/platform/font_loader.mm
+++ b/src/app/core/platform/font_loader.mm
@@ -8,13 +8,13 @@

 #if TARGET_OS_IPHONE == 1 || TARGET_IPHONE_SIMULATOR == 1
 /* iOS */
-void yaze::app::core::LoadSystemFonts() {}
+void yaze::core::LoadSystemFonts() {}

 #elif TARGET_OS_MAC == 1
 /* macOS */
 #import <Cocoa/Cocoa.h>

-void yaze::app::core::LoadSystemFonts() {
+void yaze::core::LoadSystemFonts() {
  NSArray *fontNames = @[ @"Helvetica", @"Times New Roman", @"Courier", @"Arial", @"Verdana" ];

  for (NSString *fontName in fontNames) {
--- a/src/app/core/platform/renderer.h
+++ b/src/app/core/platform/renderer.h
@@ -11,7 +11,6 @@
 #include "app/gfx/bitmap.h"

 namespace yaze {
-namespace app {
 namespace core {

 /**
@@ -77,7 +76,6 @@ class Renderer {
 };

 }  // namespace core
-}  // namespace app
 }  // namespace yaze

 #endif
--- a/src/app/core/platform/view_controller.h
+++ b/src/app/core/platform/view_controller.h
@@ -10,7 +10,7 @@
@end
 #else
@interface AppViewController : UIViewController <MTKViewDelegate>
-@property(nonatomic) yaze::app::core::Controller *controller;
+@property(nonatomic) yaze::core::Controller *controller;
@property(nonatomic) UIHoverGestureRecognizer *hoverGestureRecognizer;
@property(nonatomic) UIPinchGestureRecognizer *pinchRecognizer;
@property(nonatomic) UISwipeGestureRecognizer *swipeRecognizer;
--- a/src/app/core/project.cc
+++ b/src/app/core/project.cc
@@ -9,7 +9,6 @@
 #include "imgui/misc/cpp/imgui_stdlib.h"

 namespace yaze {
-namespace app {

 absl::Status Project::Open(const std::string& project_path) {
  filepath = project_path;
@@ -185,5 +184,5 @@ std::string ResourceLabelManager::CreateOrGetLabel(
  return labels_[type][key];
 }

-}  // namespace app
+
 }  // namespace yaze
--- a/src/app/core/project.h
+++ b/src/app/core/project.h
@@ -11,7 +11,6 @@
 #include "app/core/utils/file_util.h"

 namespace yaze {
-namespace app {

 const std::string kRecentFilesFilename = "recent_files.txt";
 constexpr char kEndOfProjectFile[] = "EndOfProjectFile";
@@ -25,7 +24,7 @@ constexpr char kEndOfProjectFile[] = "EndOfProjectFile";
 * user can have different rom file names for a single project and keep track of
 * backups.
 */
-struct Project : public core::ExperimentFlags {
+struct Project {
  absl::Status Create(const std::string& project_name) {
    name = project_name;
    project_opened_ = true;
@@ -130,7 +129,7 @@ class RecentFilesManager {
  std::vector<std::string> recent_files_;
 };

-}  // namespace app
+
 }  // namespace yaze

 #endif  // YAZE_APP_CORE_PROJECT_H
--- a/src/app/core/utils/file_util.cc
+++ b/src/app/core/utils/file_util.cc
@@ -11,7 +11,6 @@
 #include <sstream>

 namespace yaze {
-namespace app {
 namespace core {

 std::string GetFileExtension(const std::string &filename) {
@@ -30,8 +29,31 @@ std::string GetFileName(const std::string &filename) {
  return filename.substr(slash + 1);
 }

-std::string LoadFile(const std::string &filename, Platform platform) {
+std::string LoadFile(const std::string &filename) {
  std::string contents;
+  std::ifstream file(filename);
+  if (file.is_open()) {
+    std::stringstream buffer;
+    buffer << file.rdbuf();
+    contents = buffer.str();
+    file.close();
+  } else {
+    // Throw an exception
+    throw std::runtime_error("Could not open file: " + filename);
+  }
+  return contents;
+}
+
+std::string LoadConfigFile(const std::string &filename) {
+  std::string contents;
+  Platform platform;
+#if defined(_WIN32)
+  platform = Platform::kWindows;
+#elif defined(__APPLE__)
+  platform = Platform::kMacOS;
+#else
+  platform = Platform::kLinux;
+#endif
  std::string filepath = GetConfigDirectory(platform) + "/" + filename;
  std::ifstream file(filepath);
  if (file.is_open()) {
@@ -56,19 +78,18 @@ void SaveFile(const std::string &filename, const std::string &contents,
 std::string GetConfigDirectory(Platform platform) {
  std::string config_directory = ".yaze";
  switch (platform) {
-    case Platform::kWindows:
-      config_directory = "~/AppData/Roaming/yaze";
-      break;
-    case Platform::kMacOS:
-    case Platform::kLinux:
-      config_directory = "~/.config/yaze";
-      break;
-    default:
-      break;
+  case Platform::kWindows:
+    config_directory = "~/AppData/Roaming/yaze";
+    break;
+  case Platform::kMacOS:
+  case Platform::kLinux:
+    config_directory = "~/.config/yaze";
+    break;
+  default:
+    break;
  }
  return config_directory;
 }

-}  // namespace core
-}  // namespace app
-}  // namespace yaze
+} // namespace core
+} // namespace yaze
--- a/src/app/core/utils/file_util.h
+++ b/src/app/core/utils/file_util.h
@@ -4,21 +4,20 @@
 #include <string>

 namespace yaze {
-namespace app {
 namespace core {

 enum class Platform { kUnknown, kMacOS, kiOS, kWindows, kLinux };

 std::string GetFileExtension(const std::string &filename);
 std::string GetFileName(const std::string &filename);
-std::string LoadFile(const std::string &filename, Platform platform);
+std::string LoadFile(const std::string &filename);
+std::string LoadConfigFile(const std::string &filename);
 std::string GetConfigDirectory(Platform platform);

 void SaveFile(const std::string &filename, const std::string &data,
              Platform platform);

-} // namespace core
-} // namespace app
-} // namespace yaze
+}  // namespace core
+}  // namespace yaze

-#endif // YAZE_APP_CORE_UTILS_FILE_UTIL_H
+#endif  // YAZE_APP_CORE_UTILS_FILE_UTIL_H
--- a/src/app/core/utils/sdl_deleter.h
+++ b/src/app/core/utils/sdl_deleter.h
@@ -4,7 +4,6 @@
 #include <SDL.h>

 namespace yaze {
-namespace app {
 namespace core {

 /**
@@ -19,22 +18,17 @@ struct SDL_Deleter {
 * @brief Deleter for SDL_Texture.
 */
 struct SDL_Texture_Deleter {
-  void operator()(SDL_Texture *p) const {
-    SDL_DestroyTexture(p);
-  }
+  void operator()(SDL_Texture *p) const { SDL_DestroyTexture(p); }
 };

 /**
 * @brief Deleter for SDL_Surface.
 */
 struct SDL_Surface_Deleter {
-  void operator()(SDL_Surface *p) const {
-    SDL_FreeSurface(p);
-  }
+  void operator()(SDL_Surface *p) const { SDL_FreeSurface(p); }
 };

 }  // namespace core
-}  // namespace app
 }  // namespace yaze

 #endif  // YAZE_APP_CORE_UTILS_SDL_DELETER_H_
--- a/src/app/editor/code/assembly_editor.cc
+++ b/src/app/editor/code/assembly_editor.cc
@@ -1,13 +1,11 @@
 #include "assembly_editor.h"

-#include "ImGuiColorTextEdit/TextEditor.h"
-#include "ImGuiFileDialog/ImGuiFileDialog.h"
 #include "absl/strings/str_cat.h"
 #include "app/core/platform/file_dialog.h"
 #include "app/gui/icons.h"
+#include "app/gui/modules/text_editor.h"

 namespace yaze {
-namespace app {
 namespace editor {

 using core::FileDialogWrapper;
@@ -278,21 +276,14 @@ void AssemblyEditor::DrawFileTabView() {
 void AssemblyEditor::DrawFileMenu() {
  if (ImGui::BeginMenu("File")) {
    if (ImGui::MenuItem("Open", "Ctrl+O")) {
-      ImGuiFileDialog::Instance()->OpenDialog(
-          "ChooseASMFileDlg", "Open ASM file", ".asm,.txt", ".");
+      auto filename = core::FileDialogWrapper::ShowOpenFileDialog();
+      ChangeActiveFile(filename);
    }
    if (ImGui::MenuItem("Save", "Ctrl+S")) {
      // TODO: Implement this
    }
    ImGui::EndMenu();
  }
-
-  if (ImGuiFileDialog::Instance()->Display("ChooseASMFileDlg")) {
-    if (ImGuiFileDialog::Instance()->IsOk()) {
-      ChangeActiveFile(ImGuiFileDialog::Instance()->GetFilePathName());
-    }
-    ImGuiFileDialog::Instance()->Close();
-  }
 }

 void AssemblyEditor::DrawEditMenu() {
@@ -364,5 +355,4 @@ absl::Status AssemblyEditor::Redo() {
 absl::Status AssemblyEditor::Update() { return absl::OkStatus(); }

 }  // namespace editor
-}  // namespace app
 }  // namespace yaze
--- a/src/app/editor/code/assembly_editor.h
+++ b/src/app/editor/code/assembly_editor.h
@@ -3,13 +3,12 @@

 #include <string>

-#include "ImGuiColorTextEdit/TextEditor.h"
 #include "app/core/common.h"
 #include "app/editor/editor.h"
+#include "app/gui/modules/text_editor.h"
 #include "app/gui/style.h"

 namespace yaze {
-namespace app {
 namespace editor {

 /**
@@ -69,7 +68,6 @@ class AssemblyEditor : public Editor {
 };

 }  // namespace editor
-}  // namespace app
 }  // namespace yaze

 #endif
--- a/src/app/editor/code/memory_editor.h
+++ b/src/app/editor/code/memory_editor.h
@@ -28,7 +28,6 @@
 #include "imgui_memory_editor.h"

 namespace yaze {
-namespace app {
 namespace editor {

 using ImGui::SameLine;
@@ -78,7 +77,6 @@ struct MemoryEditorWithDiffChecker : public SharedRom {
 };

 }  // namespace editor
-}  // namespace app
 }  // namespace yaze

 #endif  // YAZE_APP_EDITOR_CODE_MEMORY_EDITOR_H
--- a/src/app/editor/dungeon/dungeon_editor.cc
+++ b/src/app/editor/dungeon/dungeon_editor.cc
@@ -10,10 +10,10 @@
 #include "app/rom.h"
 #include "app/zelda3/dungeon/object_names.h"
 #include "imgui/imgui.h"
+#include "imgui_memory_editor.h"
 #include "zelda3/dungeon/room.h"

 namespace yaze {
-namespace app {
 namespace editor {

 using core::Renderer;
@@ -72,11 +72,12 @@ absl::Status DungeonEditor::Update() {

 absl::Status DungeonEditor::Initialize() {
  auto dungeon_man_pal_group = rom()->palette_group().dungeon_main;
+
  for (int i = 0; i < 0x100 + 40; i++) {
-    rooms_.emplace_back(zelda3::dungeon::Room(/*room_id=*/i));
+    rooms_.emplace_back(zelda3::Room(/*room_id=*/i));
    rooms_[i].LoadHeader();
    rooms_[i].LoadRoomFromROM();
-    if (flags()->kDrawDungeonRoomGraphics) {
+    if (core::ExperimentFlags::get().kDrawDungeonRoomGraphics) {
      rooms_[i].LoadRoomGraphics();
    }

@@ -96,11 +97,11 @@ absl::Status DungeonEditor::Initialize() {
  LoadDungeonRoomSize();
  // LoadRoomEntrances
  for (int i = 0; i < 0x07; ++i) {
-    entrances_.emplace_back(zelda3::dungeon::RoomEntrance(*rom(), i, true));
+    entrances_.emplace_back(zelda3::RoomEntrance(*rom(), i, true));
  }

  for (int i = 0; i < 0x85; ++i) {
-    entrances_.emplace_back(zelda3::dungeon::RoomEntrance(*rom(), i, false));
+    entrances_.emplace_back(zelda3::RoomEntrance(*rom(), i, false));
  }

  // Load the palette group and palette for the dungeon
@@ -117,31 +118,36 @@ absl::Status DungeonEditor::Initialize() {
 }

 absl::Status DungeonEditor::RefreshGraphics() {
-  for (int i = 0; i < 8; i++) {
-    int block = rooms_[current_room_id_].blocks()[i];
-    RETURN_IF_ERROR(graphics_bin_[block].ApplyPaletteWithTransparent(
-        current_palette_group_[current_palette_id_], 0));
-    Renderer::GetInstance().UpdateBitmap(&graphics_bin_[block]);
-  }
+  std::for_each_n(
+      rooms_[current_room_id_].blocks().begin(), 8,
+      [this](int block) -> absl::Status {
+        RETURN_IF_ERROR(graphics_bin_[block].ApplyPaletteWithTransparent(
+            current_palette_group_[current_palette_id_], 0));
+        Renderer::GetInstance().UpdateBitmap(&graphics_bin_[block]);
+        return absl::OkStatus();
+      });
+
  auto sprites_aux1_pal_group = rom()->palette_group().sprites_aux1;
-  for (int i = 9; i < 16; i++) {
-    int block = rooms_[current_room_id_].blocks()[i];
-    RETURN_IF_ERROR(graphics_bin_[block].ApplyPaletteWithTransparent(
-        sprites_aux1_pal_group[current_palette_id_], 0));
-    Renderer::GetInstance().UpdateBitmap(&graphics_bin_[block]);
-  }
+  std::for_each_n(
+      rooms_[current_room_id_].blocks().begin() + 8, 8,
+      [this, &sprites_aux1_pal_group](int block) -> absl::Status {
+        RETURN_IF_ERROR(graphics_bin_[block].ApplyPaletteWithTransparent(
+            sprites_aux1_pal_group[current_palette_id_], 0));
+        Renderer::GetInstance().UpdateBitmap(&graphics_bin_[block]);
+        return absl::OkStatus();
+      });
  return absl::OkStatus();
 }

 void DungeonEditor::LoadDungeonRoomSize() {
  std::map<int, std::vector<int>> rooms_by_bank;
-  for (const auto& room : room_size_addresses_) {
+  for (const auto &room : room_size_addresses_) {
    int bank = room.second >> 16;
    rooms_by_bank[bank].push_back(room.second);
  }

  // Process and calculate room sizes within each bank
-  for (auto& bank_rooms : rooms_by_bank) {
+  for (auto &bank_rooms : rooms_by_bank) {
    // Sort the rooms within this bank
    std::sort(bank_rooms.second.begin(), bank_rooms.second.end());

@@ -151,7 +157,7 @@ void DungeonEditor::LoadDungeonRoomSize() {
      // Identify the room ID for the current room pointer
      int room_id =
          std::find_if(room_size_addresses_.begin(), room_size_addresses_.end(),
-                       [room_ptr](const auto& entry) {
+                       [room_ptr](const auto &entry) {
                         return entry.second == room_ptr;
                       })
              ->first;
@@ -315,14 +321,14 @@ void DungeonEditor::DrawRoomSelector() {
    gui::InputHexWord("Room ID", &current_room_id_);
    gui::InputHex("Palette ID", &current_palette_id_);

-    if (ImGuiID child_id = ImGui::GetID((void*)(intptr_t)9);
+    if (ImGuiID child_id = ImGui::GetID((void *)(intptr_t)9);
        BeginChild(child_id, ImGui::GetContentRegionAvail(), true,
                   ImGuiWindowFlags_AlwaysVerticalScrollbar)) {
      int i = 0;
-      for (const auto each_room_name : zelda3::dungeon::kRoomNames) {
+      for (const auto each_room_name : zelda3::kRoomNames) {
        rom()->resource_label()->SelectableLabelWithNameEdit(
            current_room_id_ == i, "Dungeon Room Names",
-            core::UppercaseHexByte(i), each_room_name.data());
+            core::HexByte(i), each_room_name.data());
        if (ImGui::IsItemClicked()) {
          // TODO: Jump to tab if room is already open
          current_room_id_ = i;
@@ -396,8 +402,8 @@ void DungeonEditor::DrawEntranceSelector() {
      for (int i = 0; i < 0x85 + 7; i++) {
        rom()->resource_label()->SelectableLabelWithNameEdit(
            current_entrance_id_ == i, "Dungeon Entrance Names",
-            core::UppercaseHexByte(i),
-            zelda3::dungeon::kEntranceNames[i].data());
+            core::HexByte(i),
+            zelda3::kEntranceNames[i].data());

        if (ImGui::IsItemClicked()) {
          current_entrance_id_ = i;
@@ -428,12 +434,12 @@ void DungeonEditor::DrawDungeonTabView() {
    for (int n = 0; n < active_rooms_.Size;) {
      bool open = true;

-      if (active_rooms_[n] > sizeof(zelda3::dungeon::kRoomNames) / 4) {
+      if (active_rooms_[n] > sizeof(zelda3::kRoomNames) / 4) {
        active_rooms_.erase(active_rooms_.Data + n);
        continue;
      }

-      if (BeginTabItem(zelda3::dungeon::kRoomNames[active_rooms_[n]].data(),
+      if (BeginTabItem(zelda3::kRoomNames[active_rooms_[n]].data(),
                       &open, ImGuiTabItemFlags_None)) {
        DrawDungeonCanvas(active_rooms_[n]);
        EndTabItem();
@@ -514,7 +520,7 @@ void DungeonEditor::DrawRoomGraphics() {
 void DungeonEditor::DrawTileSelector() {
  if (BeginTabBar("##TabBar", ImGuiTabBarFlags_FittingPolicyScroll)) {
    if (BeginTabItem("Room Graphics")) {
-      if (ImGuiID child_id = ImGui::GetID((void*)(intptr_t)3);
+      if (ImGuiID child_id = ImGui::GetID((void *)(intptr_t)3);
          BeginChild(child_id, ImGui::GetContentRegionAvail(), true,
                     ImGuiWindowFlags_AlwaysVerticalScrollbar)) {
        DrawRoomGraphics();
@@ -543,7 +549,7 @@ void DungeonEditor::DrawObjectRenderer() {

    int selected_object = 0;
    int i = 0;
-    for (const auto object_name : zelda3::dungeon::Type1RoomObjectNames) {
+    for (const auto object_name : zelda3::Type1RoomObjectNames) {
      if (ImGui::Selectable(object_name.data(), selected_object == i)) {
        selected_object = i;
        current_object_ = i;
@@ -577,7 +583,7 @@ void DungeonEditor::DrawObjectRenderer() {
  if (object_loaded_) {
    ImGui::Begin("Memory Viewer", &object_loaded_, 0);
    static MemoryEditor mem_edit;
-    mem_edit.DrawContents((void*)object_renderer_.mutable_memory(),
+    mem_edit.DrawContents((void *)object_renderer_.mutable_memory(),
                          object_renderer_.mutable_memory()->size());
    ImGui::End();
  }
@@ -586,7 +592,7 @@ void DungeonEditor::DrawObjectRenderer() {
 // ============================================================================

 void DungeonEditor::CalculateUsageStats() {
-  for (const auto& room : rooms_) {
+  for (const auto &room : rooms_) {
    if (blockset_usage_.find(room.blockset) == blockset_usage_.end()) {
      blockset_usage_[room.blockset] = 1;
    } else {
@@ -608,15 +614,15 @@ void DungeonEditor::CalculateUsageStats() {
 }

 void DungeonEditor::RenderSetUsage(
-    const absl::flat_hash_map<uint16_t, int>& usage_map, uint16_t& selected_set,
+    const absl::flat_hash_map<uint16_t, int> &usage_map, uint16_t &selected_set,
    int spriteset_offset) {
  // Sort the usage map by set number
  std::vector<std::pair<uint16_t, int>> sorted_usage(usage_map.begin(),
                                                     usage_map.end());
  std::sort(sorted_usage.begin(), sorted_usage.end(),
-            [](const auto& a, const auto& b) { return a.first < b.first; });
+            [](const auto &a, const auto &b) { return a.first < b.first; });

-  for (const auto& [set, count] : sorted_usage) {
+  for (const auto &[set, count] : sorted_usage) {
    std::string display_str;
    if (spriteset_offset != 0x00) {
      display_str = absl::StrFormat("%#02x, %#02x: %d", set,
@@ -637,7 +643,7 @@ namespace {
 // Range for spritesets 0-0x8F
 // Range for palettes 0-0x47
 template <typename T>
-void RenderUnusedSets(const absl::flat_hash_map<T, int>& usage_map, int max_set,
+void RenderUnusedSets(const absl::flat_hash_map<T, int> &usage_map, int max_set,
                      int spriteset_offset = 0x00) {
  std::vector<int> unused_sets;
  for (int i = 0; i < max_set; i++) {
@@ -645,7 +651,7 @@ void RenderUnusedSets(const absl::flat_hash_map<T, int>& usage_map, int max_set,
      unused_sets.push_back(i);
    }
  }
-  for (const auto& set : unused_sets) {
+  for (const auto &set : unused_sets) {
    if (spriteset_offset != 0x00) {
      Text("%#02x, %#02x", set, (set + spriteset_offset));
    } else {
@@ -755,7 +761,7 @@ void DungeonEditor::DrawUsageGrid() {
        break;
      }
      // Determine if this square should be highlighted
-      const auto& room = rooms_[row * squaresWide + col];
+      const auto &room = rooms_[row * squaresWide + col];

      // Create a button or selectable for each square
      ImGui::BeginGroup();
@@ -828,5 +834,4 @@ void DungeonEditor::DrawUsageGrid() {
 }

 }  // namespace editor
-}  // namespace app
 }  // namespace yaze
--- a/src/app/editor/dungeon/dungeon_editor.h
+++ b/src/app/editor/dungeon/dungeon_editor.h
@@ -1,11 +1,11 @@
 #ifndef YAZE_APP_EDITOR_DUNGEONEDITOR_H
 #define YAZE_APP_EDITOR_DUNGEONEDITOR_H

-#include "app/core/common.h"
 #include "absl/container/flat_hash_map.h"
+#include "app/core/common.h"
+#include "app/editor/editor.h"
 #include "app/editor/graphics/gfx_group_editor.h"
 #include "app/editor/graphics/palette_editor.h"
-#include "app/editor/editor.h"
 #include "app/gui/canvas.h"
 #include "app/rom.h"
 #include "imgui/imgui.h"
@@ -14,7 +14,6 @@
 #include "zelda3/dungeon/room_object.h"

 namespace yaze {
-namespace app {
 namespace editor {

 constexpr ImGuiTabItemFlags kDungeonTabFlags =
@@ -40,9 +39,7 @@ constexpr ImGuiTableFlags kDungeonTableFlags =
 * tile selector, and object renderer. Additionally, it handles loading room
 * entrances, calculating usage statistics, and rendering set usage.
 */
-class DungeonEditor : public Editor,
-                      public SharedRom,
-                      public core::ExperimentFlags {
+class DungeonEditor : public Editor, public SharedRom {
 public:
  DungeonEditor() { type_ = EditorType::kDungeon; }

@@ -120,9 +117,9 @@ class DungeonEditor : public Editor,
  std::array<gfx::Bitmap, kNumGfxSheets> graphics_bin_;

  std::vector<gfx::Bitmap*> room_gfx_sheets_;
-  std::vector<zelda3::dungeon::Room> rooms_;
-  std::vector<zelda3::dungeon::RoomEntrance> entrances_;
-  zelda3::dungeon::DungeonObjectRenderer object_renderer_;
+  std::vector<zelda3::Room> rooms_;
+  std::vector<zelda3::RoomEntrance> entrances_;
+  zelda3::DungeonObjectRenderer object_renderer_;

  absl::flat_hash_map<uint16_t, int> spriteset_usage_;
  absl::flat_hash_map<uint16_t, int> blockset_usage_;
@@ -143,7 +140,6 @@ class DungeonEditor : public Editor,
 };

 }  // namespace editor
-}  // namespace app
 }  // namespace yaze

 #endif
--- a/src/app/editor/editor.cc
+++ b/src/app/editor/editor.cc
@@ -1,52 +1,7 @@
 #include "editor.h"

-#include "app/core/constants.h"
-#include "imgui/imgui.h"
-
 namespace yaze {
-namespace app {
 namespace editor {

-absl::Status DrawEditor(EditorLayoutParams *params) {
-  if (params->editor == nullptr) {
-    return absl::InternalError("Editor is not initialized");
-  }
-
-  // Draw the editors based on h_split and v_split in a recursive manner
-  if (params->v_split) {
-    ImGui::BeginTable("##VerticalSplitTable", 2);
-
-    ImGui::TableNextColumn();
-    if (params->left)
-      RETURN_IF_ERROR(DrawEditor(params->left));
-
-    ImGui::TableNextColumn();
-    if (params->right)
-      RETURN_IF_ERROR(DrawEditor(params->right));
-
-    ImGui::EndTable();
-  } else if (params->h_split) {
-    ImGui::BeginTable("##HorizontalSplitTable", 1);
-
-    ImGui::TableNextColumn();
-    if (params->top)
-      RETURN_IF_ERROR(DrawEditor(params->top));
-
-    ImGui::TableNextColumn();
-    if (params->bottom)
-      RETURN_IF_ERROR(DrawEditor(params->bottom));
-
-    ImGui::EndTable();
-  } else {
-    // No split, just draw the single editor
-    ImGui::Text("%s Editor",
-                kEditorNames[static_cast<int>(params->editor->type())]);
-    RETURN_IF_ERROR(params->editor->Update());
-  }
-
-  return absl::OkStatus();
-}
-
 } // namespace editor
-} // namespace app
 } // namespace yaze
--- a/src/app/editor/editor.h
+++ b/src/app/editor/editor.h
@@ -11,10 +11,9 @@
 #include "app/editor/system/resource_manager.h"

 namespace yaze {
-namespace app {

 /**
- * @namespace yaze::app::editor
+ * @namespace yaze::editor
 * @brief Editors are the view controllers for the application.
 */
 namespace editor {
@@ -74,32 +73,7 @@ class Editor {
  EditorContext context_;
 };

-/**
- * @brief Dynamic Editor Layout Parameters
- */
-typedef struct EditorLayoutParams {
-  bool v_split;
-  bool h_split;
-  int v_split_pos;
-  int h_split_pos;
-  Editor *editor = nullptr;
-  EditorLayoutParams *left = nullptr;
-  EditorLayoutParams *right = nullptr;
-  EditorLayoutParams *top = nullptr;
-  EditorLayoutParams *bottom = nullptr;
-
-  EditorLayoutParams() {
-    v_split = false;
-    h_split = false;
-    v_split_pos = 0;
-    h_split_pos = 0;
-  }
-} EditorLayoutParams;
-
-absl::Status DrawEditor(EditorLayoutParams *params);
-
 }  // namespace editor
-}  // namespace app
 }  // namespace yaze

 #endif  // YAZE_APP_CORE_EDITOR_H
--- a/src/app/editor/editor_manager.cc
+++ b/src/app/editor/editor_manager.cc
@@ -24,7 +24,6 @@
 #include "imgui/misc/cpp/imgui_stdlib.h"

 namespace yaze {
-namespace app {
 namespace editor {

 using namespace ImGui;
@@ -32,8 +31,8 @@ using core::FileDialogWrapper;

 namespace {

-bool BeginCentered(const char* name) {
-  ImGuiIO const& io = GetIO();
+bool BeginCentered(const char *name) {
+  ImGuiIO const &io = GetIO();
  ImVec2 pos(io.DisplaySize.x * 0.5f, io.DisplaySize.y * 0.5f);
  SetNextWindowPos(pos, ImGuiCond_Always, ImVec2(0.5f, 0.5f));
  ImGuiWindowFlags flags =
@@ -42,19 +41,18 @@ bool BeginCentered(const char* name) {
  return Begin(name, nullptr, flags);
 }

-bool IsEditorActive(Editor* editor, std::vector<Editor*>& active_editors) {
+bool IsEditorActive(Editor *editor, std::vector<Editor *> &active_editors) {
  return std::find(active_editors.begin(), active_editors.end(), editor) !=
         active_editors.end();
 }

 }  // namespace

-void EditorManager::SetupScreen(std::string filename) {
+void EditorManager::Initialize(std::string filename) {
  if (!filename.empty()) {
    PRINT_IF_ERROR(rom()->LoadFromFile(filename));
  }
-  overworld_editor_.InitializeZeml();
-  InitializeCommands();
+  overworld_editor_.Initialize();
 }

 absl::Status EditorManager::Update() {
@@ -66,17 +64,12 @@ absl::Status EditorManager::Update() {
  DrawInfoPopup();

  if (rom()->is_loaded() && !rom_assets_loaded_) {
-    // Load all of the graphics data from the game.
    RETURN_IF_ERROR(rom()->LoadAllGraphicsData())
-    // Initialize overworld graphics, maps, and palettes
    RETURN_IF_ERROR(overworld_editor_.LoadGraphics());
    rom_assets_loaded_ = true;
  }

-  if (dynamic_layout_)
-    RETURN_IF_ERROR(DrawDynamicLayout())
-  else
-    ManageActiveEditors();
+  ManageActiveEditors();

  return absl::OkStatus();
 }
@@ -244,12 +237,6 @@ void EditorManager::ManageActiveEditors() {
  }
 }

-absl::Status EditorManager::DrawDynamicLayout() {
-  // Dynamic layout for multiple editors to be open at once
-  // Allows for tiling and resizing of editors using ImGui
-  return DrawEditor(&root_layout_);
-}
-
 void EditorManager::ManageKeyboardShortcuts() {
  bool ctrl_or_super = (GetIO().KeyCtrl || GetIO().KeySuper);

@@ -309,81 +296,6 @@ void EditorManager::ManageKeyboardShortcuts() {
  }
 }

-void EditorManager::InitializeCommands() {
-  if (root_layout_.editor == nullptr) {
-    root_layout_.editor = &overworld_editor_;
-  }
-
-  // New editor popup for window management commands
-  static EditorLayoutParams new_layout;
-  if (ImGui::BeginPopup("NewEditor")) {
-    ImGui::Text("New Editor");
-    ImGui::Separator();
-    if (ImGui::Button("Overworld")) {
-      new_layout.editor = &overworld_editor_;
-      ImGui::CloseCurrentPopup();
-    }
-    if (ImGui::Button("Dungeon")) {
-      new_layout.editor = &dungeon_editor_;
-      ImGui::CloseCurrentPopup();
-    }
-    if (ImGui::Button("Graphics")) {
-      new_layout.editor = &graphics_editor_;
-      ImGui::CloseCurrentPopup();
-    }
-    if (ImGui::Button("Music")) {
-      new_layout.editor = &music_editor_;
-      ImGui::CloseCurrentPopup();
-    }
-    if (ImGui::Button("Palette")) {
-      new_layout.editor = &palette_editor_;
-      ImGui::CloseCurrentPopup();
-    }
-    if (ImGui::Button("Screen")) {
-      new_layout.editor = &screen_editor_;
-      ImGui::CloseCurrentPopup();
-    }
-    if (ImGui::Button("Sprite")) {
-      new_layout.editor = &sprite_editor_;
-      ImGui::CloseCurrentPopup();
-    }
-    if (ImGui::Button("Code")) {
-      new_layout.editor = &assembly_editor_;
-      ImGui::CloseCurrentPopup();
-    }
-    if (ImGui::Button("Settings")) {
-      new_layout.editor = &settings_editor_;
-      ImGui::CloseCurrentPopup();
-    }
-    if (ImGui::Button("Message")) {
-      new_layout.editor = &message_editor_;
-      ImGui::CloseCurrentPopup();
-    }
-    ImGui::EndPopup();
-  }
-
-  editor_context_.command_manager.RegisterPrefix("window", 'w',
-                                                 "window management", "");
-  editor_context_.command_manager.RegisterSubcommand(
-      "window", "vsplit", '/', "vertical split",
-      "split windows vertically and place editor in new window", [this]() {
-        ImGui::OpenPopup("NewEditor");
-        root_layout_.v_split = true;
-      });
-  editor_context_.command_manager.RegisterSubcommand(
-      "window", "hsplit", '-', "horizontal split",
-      "split windows horizontally and place editor in new window", [this]() {
-        ImGui::OpenPopup("NewEditor");
-        root_layout_.h_split = true;
-      });
-  editor_context_.command_manager.RegisterSubcommand(
-      "window", "close", 'd', "close", "close the current editor", [this]() {
-        if (root_layout_.editor != nullptr) {
-          root_layout_.editor = nullptr;
-        }
-      });
-}
-
 void EditorManager::DrawStatusPopup() {
  static absl::Status prev_status;
  if (!status_.ok()) {
@@ -415,7 +327,7 @@ void EditorManager::DrawStatusPopup() {
 void EditorManager::DrawAboutPopup() {
  if (about_) OpenPopup("About");
  if (BeginPopupModal("About", nullptr, ImGuiWindowFlags_AlwaysAutoResize)) {
-    Text("Yet Another Zelda3 Editor - v%s", core::kYazeVersion.data());
+    Text("Yet Another Zelda3 Editor - v%s", version_.c_str());
    Text("Written by: scawful");
    Spacing();
    Text("Special Thanks: Zarby89, JaredBrian");
@@ -434,7 +346,7 @@ void EditorManager::DrawInfoPopup() {
  if (BeginPopupModal("ROM Information", nullptr,
                      ImGuiWindowFlags_AlwaysAutoResize)) {
    Text("Title: %s", rom()->title().c_str());
-    Text("ROM Size: %s", core::UppercaseHexLongLong(rom()->size()).c_str());
+    Text("ROM Size: %s", core::HexLongLong(rom()->size()).c_str());

    if (Button("Close", gui::kDefaultModalSize) ||
        IsKeyPressed(ImGuiKey_Escape)) {
@@ -457,7 +369,7 @@ void EditorManager::DrawYazeMenu() {
      show_display_settings = !show_display_settings;
    }
    PopStyleColor();
-    Text("yaze v%s", core::kYazeVersion.data());
+    Text("yaze v%s", version_.c_str());
    EndMenuBar();
  }

@@ -483,7 +395,7 @@ void EditorManager::DrawYazeMenuBar() {
      if (manager.GetRecentFiles().empty()) {
        MenuItem("No Recent Files", nullptr, false, false);
      } else {
-        for (const auto& filePath : manager.GetRecentFiles()) {
+        for (const auto &filePath : manager.GetRecentFiles()) {
          if (MenuItem(filePath.c_str())) {
            OpenRomOrProject(filePath);
          }
@@ -643,7 +555,6 @@ void EditorManager::DrawYazeMenuBar() {
  }

  if (BeginMenu("View")) {
-    MenuItem("Dynamic Layout", nullptr, &dynamic_layout_);
    MenuItem("Emulator", nullptr, &show_emulator);
    Separator();
    MenuItem("Memory Editor", nullptr, &show_memory_editor);
@@ -772,7 +683,7 @@ void EditorManager::LoadRom() {
 }

 void EditorManager::SaveRom() {
-  if (flags()->kSaveDungeonMaps) {
+  if (core::ExperimentFlags::get().kSaveDungeonMaps) {
    status_ = screen_editor_.SaveDungeonMaps();
    RETURN_VOID_IF_ERROR(status_);
  }
@@ -783,7 +694,7 @@ void EditorManager::SaveRom() {
  status_ = rom()->SaveToFile(backup_rom_, save_new_auto_);
 }

-void EditorManager::OpenRomOrProject(const std::string& filename) {
+void EditorManager::OpenRomOrProject(const std::string &filename) {
  if (absl::StrContains(filename, ".yaze")) {
    status_ = current_project_.Open(filename);
    if (status_.ok()) {
@@ -816,5 +727,4 @@ absl::Status EditorManager::OpenProject() {
 }

 }  // namespace editor
-}  // namespace app
 }  // namespace yaze
--- a/src/app/editor/editor_manager.h
+++ b/src/app/editor/editor_manager.h
@@ -19,9 +19,9 @@
 #include "app/emu/emulator.h"
 #include "app/gui/input.h"
 #include "app/rom.h"
+#include "yaze_config.h"

 namespace yaze {
-namespace app {
 namespace editor {

 /**
@@ -35,7 +35,7 @@ namespace editor {
 * variable points to the currently active editor in the tab view.
 *
 */
-class EditorManager : public SharedRom, public core::ExperimentFlags {
+class EditorManager : public SharedRom {
 public:
  EditorManager() {
    current_editor_ = &overworld_editor_;
@@ -46,9 +46,13 @@ class EditorManager : public SharedRom, public core::ExperimentFlags {
    active_editors_.push_back(&sprite_editor_);
    active_editors_.push_back(&message_editor_);
    active_editors_.push_back(&screen_editor_);
+    std::stringstream ss;
+    ss << YAZE_VERSION_MAJOR << "." << YAZE_VERSION_MINOR << "."
+       << YAZE_VERSION_PATCH;
+    ss >> version_;
  }

-  void SetupScreen(std::string filename = "");
+  void Initialize(std::string filename = "");
  absl::Status Update();

  auto emulator() -> emu::Emulator & { return emulator_; }
@@ -56,10 +60,7 @@ class EditorManager : public SharedRom, public core::ExperimentFlags {

 private:
  void ManageActiveEditors();
-  absl::Status DrawDynamicLayout();
-
  void ManageKeyboardShortcuts();
-  void InitializeCommands();

  void DrawStatusPopup();
  void DrawAboutPopup();
@@ -81,16 +82,12 @@ class EditorManager : public SharedRom, public core::ExperimentFlags {
  bool save_new_auto_ = true;
  bool show_status_ = false;
  bool rom_assets_loaded_ = false;
-  bool dynamic_layout_ = false;
+
+  std::string version_ = "";

  absl::Status status_;
-
  emu::Emulator emulator_;
-
  std::vector<Editor *> active_editors_;
-  std::vector<EditorLayoutParams> active_layouts_;
-
-  EditorLayoutParams root_layout_;

  Project current_project_;
  EditorContext editor_context_;
@@ -100,7 +97,7 @@ class EditorManager : public SharedRom, public core::ExperimentFlags {
  DungeonEditor dungeon_editor_;
  GraphicsEditor graphics_editor_;
  MusicEditor music_editor_;
-  OverworldEditor overworld_editor_;
+  OverworldEditor overworld_editor_{*rom()};
  PaletteEditor palette_editor_;
  ScreenEditor screen_editor_;
  SpriteEditor sprite_editor_;
@@ -110,7 +107,6 @@ class EditorManager : public SharedRom, public core::ExperimentFlags {
 };

 }  // namespace editor
-}  // namespace app
 }  // namespace yaze

 #endif  // YAZE_APP_EDITOR_EDITOR_MANAGER_H
--- a/src/app/editor/graphics/gfx_group_editor.cc
+++ b/src/app/editor/graphics/gfx_group_editor.cc
@@ -11,7 +11,6 @@
 #include "imgui/imgui.h"

 namespace yaze {
-namespace app {
 namespace editor {

 using ImGui::BeginChild;
@@ -297,5 +296,4 @@ void GfxGroupEditor::DrawPaletteViewer() {
 }

 }  // namespace editor
-}  // namespace app
 }  // namespace yaze
--- a/src/app/editor/graphics/gfx_group_editor.h
+++ b/src/app/editor/graphics/gfx_group_editor.h
@@ -7,7 +7,6 @@
 #include "app/rom.h"

 namespace yaze {
-namespace app {
 namespace editor {

 /**
@@ -43,6 +42,5 @@ class GfxGroupEditor : public SharedRom {
 };

 }  // namespace editor
-}  // namespace app
 }  // namespace yaze
 #endif  // YAZE_APP_EDITOR_GFX_GROUP_EDITOR_H
--- a/src/app/editor/graphics/graphics_editor.cc
+++ b/src/app/editor/graphics/graphics_editor.cc
@@ -1,9 +1,11 @@
 #include "graphics_editor.h"

-#include "ImGuiFileDialog/ImGuiFileDialog.h"
+#include <filesystem>
+
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "app/core/platform/clipboard.h"
+#include "app/core/platform/file_dialog.h"
 #include "app/core/platform/renderer.h"
 #include "app/editor/graphics/palette_editor.h"
 #include "app/gfx/bitmap.h"
@@ -23,7 +25,6 @@
 #include "imgui_memory_editor.h"

 namespace yaze {
-namespace app {
 namespace editor {

 using core::Renderer;
@@ -515,22 +516,19 @@ absl::Status GraphicsEditor::DrawCgxImport() {
  gui::TextWithSeparators("Cgx Import");
  InputInt("BPP", &current_bpp_);

-  InputText("##CGXFile", cgx_file_name_, sizeof(cgx_file_name_));
+  InputText("##CGXFile", &cgx_file_name_);
  SameLine();

-  gui::FileDialogPipeline("ImportCgxKey", ".CGX,.cgx\0", "Open CGX", [this]() {
-    strncpy(cgx_file_path_,
-            ImGuiFileDialog::Instance()->GetFilePathName().c_str(),
-            sizeof(cgx_file_path_));
-    strncpy(cgx_file_name_,
-            ImGuiFileDialog::Instance()->GetCurrentFileName().c_str(),
-            sizeof(cgx_file_name_));
+  if (ImGui::Button("Open CGX")) {
+    auto filename = core::FileDialogWrapper::ShowOpenFileDialog();
+    cgx_file_name_ = filename;
+    cgx_file_path_ = std::filesystem::absolute(filename).string();
    is_open_ = true;
    cgx_loaded_ = true;
-  });
+  }

  if (ImGui::Button("Copy CGX Path")) {
-    ImGui::SetClipboardText(cgx_file_path_);
+    ImGui::SetClipboardText(cgx_file_path_.c_str());
  }

  if (ImGui::Button("Load CGX Data")) {
@@ -548,19 +546,15 @@ absl::Status GraphicsEditor::DrawCgxImport() {
 }

 absl::Status GraphicsEditor::DrawScrImport() {
-  InputText("##ScrFile", scr_file_name_, sizeof(scr_file_name_));
+  InputText("##ScrFile", &scr_file_name_);

-  gui::FileDialogPipeline(
-      "ImportScrKey", ".SCR,.scr,.BAK\0", "Open SCR", [this]() {
-        strncpy(scr_file_path_,
-                ImGuiFileDialog::Instance()->GetFilePathName().c_str(),
-                sizeof(scr_file_path_));
-        strncpy(scr_file_name_,
-                ImGuiFileDialog::Instance()->GetCurrentFileName().c_str(),
-                sizeof(scr_file_name_));
-        is_open_ = true;
-        scr_loaded_ = true;
-      });
+  if (ImGui::Button("Open SCR")) {
+    auto filename = core::FileDialogWrapper::ShowOpenFileDialog();
+    scr_file_name_ = filename;
+    scr_file_path_ = std::filesystem::absolute(filename).string();
+    is_open_ = true;
+    scr_loaded_ = true;
+  }

  InputInt("SCR Mod", &scr_mod_value_);

@@ -584,38 +578,35 @@ absl::Status GraphicsEditor::DrawScrImport() {

 absl::Status GraphicsEditor::DrawPaletteControls() {
  gui::TextWithSeparators("COL Import");
-  InputText("##ColFile", col_file_name_, sizeof(col_file_name_));
+  InputText("##ColFile", &col_file_name_);
  SameLine();

-  gui::FileDialogPipeline(
-      "ImportColKey", ".COL,.col,.BAK,.bak\0", "Open COL", [this]() {
-        strncpy(col_file_path_,
-                ImGuiFileDialog::Instance()->GetFilePathName().c_str(),
-                sizeof(col_file_path_));
-        strncpy(col_file_name_,
-                ImGuiFileDialog::Instance()->GetCurrentFileName().c_str(),
-                sizeof(col_file_name_));
-        status_ = temp_rom_.LoadFromFile(col_file_path_,
-                                         /*z3_load=*/false);
-        auto col_data_ = gfx::GetColFileData(temp_rom_.data());
-        if (col_file_palette_group_.size() != 0) {
-          col_file_palette_group_.clear();
-        }
-        auto col_file_palette_group_status =
-            gfx::CreatePaletteGroupFromColFile(col_data_);
-        if (col_file_palette_group_status.ok()) {
-          col_file_palette_group_ = col_file_palette_group_status.value();
-        }
-        col_file_palette_ = gfx::SnesPalette(col_data_);
+  if (ImGui::Button("Open COL")) {
+    auto filename = core::FileDialogWrapper::ShowOpenFileDialog();
+    col_file_name_ = filename;
+    col_file_path_ = std::filesystem::absolute(filename).string();
+    status_ = temp_rom_.LoadFromFile(col_file_path_,
+                                     /*z3_load=*/false);
+    auto col_data_ = gfx::GetColFileData(temp_rom_.mutable_data());
+    if (col_file_palette_group_.size() != 0) {
+      col_file_palette_group_.clear();
+    }
+    auto col_file_palette_group_status =
+        gfx::CreatePaletteGroupFromColFile(col_data_);
+    if (col_file_palette_group_status.ok()) {
+      col_file_palette_group_ = col_file_palette_group_status.value();
+    }
+    col_file_palette_ = gfx::SnesPalette(col_data_);

-        // gigaleak dev format based code
-        decoded_col_ = gfx::scad_format::DecodeColFile(col_file_path_);
-        col_file_ = true;
-        is_open_ = true;
-      });
+    // gigaleak dev format based code
+    decoded_col_ = gfx::scad_format::DecodeColFile(col_file_path_);
+    col_file_ = true;
+    is_open_ = true;
+  }
+  HOVER_HINT(".COL, .BAK");

  if (ImGui::Button("Copy Col Path")) {
-    ImGui::SetClipboardText(col_file_path_);
+    ImGui::SetClipboardText(col_file_path_.c_str());
  }

  if (rom()->is_loaded()) {
@@ -636,17 +627,17 @@ absl::Status GraphicsEditor::DrawPaletteControls() {
 absl::Status GraphicsEditor::DrawObjImport() {
  gui::TextWithSeparators("OBJ Import");

-  InputText("##ObjFile", obj_file_path_, sizeof(obj_file_path_));
+  InputText("##ObjFile", &obj_file_path_);
  SameLine();

-  gui::FileDialogPipeline(
-      "ImportObjKey", ".obj,.OBJ,.bak,.BAK\0", "Open OBJ", [this]() {
-        strncpy(file_path_,
-                ImGuiFileDialog::Instance()->GetFilePathName().c_str(),
-                sizeof(file_path_));
-        status_ = temp_rom_.LoadFromFile(file_path_);
-        is_open_ = true;
-      });
+  if (ImGui::Button("Open OBJ")) {
+    auto filename = core::FileDialogWrapper::ShowOpenFileDialog();
+    obj_file_path_ = std::filesystem::absolute(filename).string();
+    status_ = temp_rom_.LoadFromFile(obj_file_path_);
+    is_open_ = true;
+    obj_loaded_ = true;
+  }
+  HOVER_HINT(".OBJ, .BAK");

  return absl::OkStatus();
 }
@@ -654,23 +645,22 @@ absl::Status GraphicsEditor::DrawObjImport() {
 absl::Status GraphicsEditor::DrawTilemapImport() {
  gui::TextWithSeparators("Tilemap Import");

-  InputText("##TMapFile", tilemap_file_path_, sizeof(tilemap_file_path_));
+  InputText("##TMapFile", &tilemap_file_path_);
  SameLine();

-  gui::FileDialogPipeline(
-      "ImportTilemapKey", ".DAT,.dat,.BIN,.bin,.hex,.HEX\0", "Open Tilemap",
-      [this]() {
-        strncpy(tilemap_file_path_,
-                ImGuiFileDialog::Instance()->GetFilePathName().c_str(),
-                sizeof(tilemap_file_path_));
-        status_ = tilemap_rom_.LoadFromFile(tilemap_file_path_);
+  if (ImGui::Button("Open Tilemap")) {
+    auto filename = core::FileDialogWrapper::ShowOpenFileDialog();
+    tilemap_file_path_ = std::filesystem::absolute(filename).string();
+    status_ = tilemap_rom_.LoadFromFile(tilemap_file_path_);
+    status_ = tilemap_rom_.LoadFromFile(tilemap_file_path_);

-        // Extract the high and low bytes from the file.
-        auto decomp_sheet = gfx::lc_lz2::DecompressV2(
-            tilemap_rom_.data(), gfx::lc_lz2::kNintendoMode1);
-        tilemap_loaded_ = true;
-        is_open_ = true;
-      });
+    // Extract the high and low bytes from the file.
+    auto decomp_sheet = gfx::lc_lz2::DecompressV2(tilemap_rom_.data(),
+                                                  gfx::lc_lz2::kNintendoMode1);
+    tilemap_loaded_ = true;
+    is_open_ = true;
+  }
+  HOVER_HINT(".DAT, .BIN, .HEX");

  return absl::OkStatus();
 }
@@ -678,30 +668,30 @@ absl::Status GraphicsEditor::DrawTilemapImport() {
 absl::Status GraphicsEditor::DrawFileImport() {
  gui::TextWithSeparators("BIN Import");

-  InputText("##ROMFile", file_path_, sizeof(file_path_));
+  InputText("##ROMFile", &file_path_);
  SameLine();

-  gui::FileDialogPipeline("ImportDlgKey", ".bin,.hex\0", "Open BIN", [this]() {
-    strncpy(file_path_, ImGuiFileDialog::Instance()->GetFilePathName().c_str(),
-            sizeof(file_path_));
+  if (ImGui::Button("Open BIN")) {
+    auto filename = core::FileDialogWrapper::ShowOpenFileDialog();
+    file_path_ = filename;
    status_ = temp_rom_.LoadFromFile(file_path_);
    is_open_ = true;
-  });
+  }
+  HOVER_HINT(".BIN, .HEX");

  if (Button("Copy File Path")) {
-    ImGui::SetClipboardText(file_path_);
+    ImGui::SetClipboardText(file_path_.c_str());
  }

  gui::InputHex("BIN Offset", &current_offset_);
  gui::InputHex("BIN Size", &bin_size_);

  if (Button("Decompress BIN")) {
-    if (strlen(file_path_) > 0) {
-      RETURN_IF_ERROR(DecompressImportData(bin_size_))
-    } else {
+    if (file_path_.empty()) {
      return absl::InvalidArgumentError(
-          "Please select a file before importing.");
+          "Please select a file before decompressing.");
    }
+    RETURN_IF_ERROR(DecompressImportData(bin_size_))
  }

  return absl::OkStatus();
@@ -740,13 +730,12 @@ absl::Status GraphicsEditor::DrawClipboardImport() {
 absl::Status GraphicsEditor::DrawExperimentalFeatures() {
  gui::TextWithSeparators("Experimental");
  if (Button("Decompress Super Donkey Full")) {
-    if (strlen(file_path_) > 0) {
-      RETURN_IF_ERROR(DecompressSuperDonkey())
-    } else {
+    if (file_path_.empty()) {
      return absl::InvalidArgumentError(
          "Please select `super_donkey_1.bin` before "
          "importing.");
    }
+    RETURN_IF_ERROR(DecompressSuperDonkey())
  }
  ImGui::SetItemTooltip(
      "Requires `super_donkey_1.bin` to be imported under the "
@@ -758,7 +747,8 @@ absl::Status GraphicsEditor::DrawMemoryEditor() {
  std::string title = "Memory Editor";
  if (is_open_) {
    static MemoryEditor mem_edit;
-    mem_edit.DrawWindow(title.c_str(), temp_rom_.data(), temp_rom_.size());
+    mem_edit.DrawWindow(title.c_str(), temp_rom_.mutable_data(),
+                        temp_rom_.size());
  }
  return absl::OkStatus();
 }
@@ -844,5 +834,4 @@ absl::Status GraphicsEditor::DecompressSuperDonkey() {
 }

 }  // namespace editor
-}  // namespace app
 }  // namespace yaze
--- a/src/app/editor/graphics/graphics_editor.h
+++ b/src/app/editor/graphics/graphics_editor.h
@@ -4,19 +4,18 @@
 #include <stack>

 #include "absl/status/status.h"
-#include "app/editor/graphics/palette_editor.h"
 #include "app/editor/editor.h"
+#include "app/editor/graphics/palette_editor.h"
 #include "app/gfx/bitmap.h"
 #include "app/gfx/snes_tile.h"
-#include "app/gui/modules/asset_browser.h"
 #include "app/gui/canvas.h"
+#include "app/gui/modules/asset_browser.h"
 #include "app/rom.h"
 #include "app/zelda3/overworld/overworld.h"
 #include "imgui/imgui.h"
 #include "imgui_memory_editor.h"

 namespace yaze {
-namespace app {
 namespace editor {

 // "99973","A3D80",
@@ -143,16 +142,16 @@ class GraphicsEditor : public SharedRom, public Editor {
  bool obj_loaded_ = false;
  bool tilemap_loaded_ = false;

-  char file_path_[256] = "";
-  char col_file_path_[256] = "";
-  char col_file_name_[256] = "";
-  char cgx_file_path_[256] = "";
-  char cgx_file_name_[256] = "";
-  char scr_file_path_[256] = "";
-  char scr_file_name_[256] = "";
-  char obj_file_path_[256] = "";
-  char tilemap_file_path_[256] = "";
-  char tilemap_file_name_[256] = "";
+  std::string file_path_ = "";
+  std::string col_file_path_ = "";
+  std::string col_file_name_ = "";
+  std::string cgx_file_path_ = "";
+  std::string cgx_file_name_ = "";
+  std::string scr_file_path_ = "";
+  std::string scr_file_name_ = "";
+  std::string obj_file_path_ = "";
+  std::string tilemap_file_path_ = "";
+  std::string tilemap_file_name_ = "";

  gui::GfxSheetAssetBrowser asset_browser_;

@@ -160,7 +159,7 @@ class GraphicsEditor : public SharedRom, public Editor {

  Rom temp_rom_;
  Rom tilemap_rom_;
-  zelda3::overworld::Overworld overworld_;
+  zelda3::Overworld overworld_;
  MemoryEditor cgx_memory_editor_;
  MemoryEditor col_memory_editor_;
  PaletteEditor palette_editor_;
@@ -196,7 +195,6 @@ class GraphicsEditor : public SharedRom, public Editor {
 };

 }  // namespace editor
-}  // namespace app
 }  // namespace yaze

 #endif  // YAZE_APP_EDITOR_GRAPHICS_EDITOR_H
--- a/src/app/editor/graphics/palette_editor.cc
+++ b/src/app/editor/graphics/palette_editor.cc
@@ -8,7 +8,6 @@
 #include "imgui/imgui.h"

 namespace yaze {
-namespace app {
 namespace editor {

 using ImGui::AcceptDragDropPayload;
@@ -472,5 +471,4 @@ absl::Status PaletteEditor::ResetColorToOriginal(
 }

 }  // namespace editor
-}  // namespace app
 }  // namespace yaze
--- a/src/app/editor/graphics/palette_editor.h
+++ b/src/app/editor/graphics/palette_editor.h
@@ -14,7 +14,6 @@
 #include "imgui/imgui.h"

 namespace yaze {
-namespace app {
 namespace editor {

 namespace palette_internal {
@@ -120,7 +119,6 @@ class PaletteEditor : public SharedRom, public Editor {
 };

 }  // namespace editor
-}  // namespace app
 }  // namespace yaze

 #endif
--- a/src/app/editor/graphics/screen_editor.cc
+++ b/src/app/editor/graphics/screen_editor.cc
@@ -13,12 +13,12 @@
 #include "app/gfx/snes_tile.h"
 #include "app/gfx/tilesheet.h"
 #include "app/gui/canvas.h"
+#include "app/gui/color.h"
 #include "app/gui/icons.h"
 #include "app/gui/input.h"
 #include "imgui/imgui.h"

 namespace yaze {
-namespace app {
 namespace editor {

 using core::Renderer;
@@ -167,7 +167,7 @@ absl::Status ScreenEditor::LoadDungeonMaps() {
          gdata[j] = rom()->data()[pc_ptr_gfx++];
        }

-        std::string label = core::UppercaseHexByte(rdata[j]);
+        std::string label = core::HexByte(rdata[j]);
        dungeon_map_labels_[d][i][j] = label;
      }

@@ -318,7 +318,7 @@ void ScreenEditor::DrawDungeonMapsTabs() {
            std::string label =
                dungeon_map_labels_[selected_dungeon][floor_number][j];
            screen_canvas_.DrawText(label, (posX * 2), (posY * 2));
-            std::string gfx_id = core::UppercaseHexByte(tile16_id);
+            std::string gfx_id = core::HexByte(tile16_id);
            screen_canvas_.DrawText(gfx_id, (posX * 2), (posY * 2) + 16);
          }
        }
@@ -392,13 +392,30 @@ void ScreenEditor::DrawDungeonMapsEditor() {
      sheets_.emplace(1, rom()->gfx_sheets()[213]);
      sheets_.emplace(2, rom()->gfx_sheets()[214]);
      sheets_.emplace(3, rom()->gfx_sheets()[215]);
+      int current_tile8 = 0;
+      int tile_data_offset = 0;
+      for (int i = 0; i < 4; ++i) {
+        for (int j = 0; j < 32; j++) {
+          std::vector<uint8_t> tile_data(64, 0);  // 8x8 tile (64 bytes
+          int tile_index = current_tile8 + j;
+          int x = (j % 8) * 8;
+          int y = (j / 8) * 8;
+          sheets_[i].Get8x8Tile(tile_index, 0, 0, tile_data, tile_data_offset);
+          tile8_individual_.emplace_back(gfx::Bitmap(8, 8, 4, tile_data));
+          RETURN_VOID_IF_ERROR(tile8_individual_.back().ApplyPalette(
+              *rom()->mutable_dungeon_palette(3)));
+          Renderer::GetInstance().RenderBitmap(&tile8_individual_.back());
+        }
+        tile_data_offset = 0;
+      }
      dungeon_maps_loaded_ = true;
    } else {
      ImGui::Text("Failed to load dungeon map tile16");
    }
  }

-  if (ImGui::BeginTable("##DungeonMapToolset", 2, ImGuiTableFlags_SizingFixedFit)) {
+  if (ImGui::BeginTable("##DungeonMapToolset", 2,
+                        ImGuiTableFlags_SizingFixedFit)) {
    ImGui::TableSetupColumn("Draw Mode");
    ImGui::TableSetupColumn("Edit Mode");

@@ -470,8 +487,13 @@ void ScreenEditor::DrawDungeonMapsEditor() {
      }

      ImGui::Separator();
-      current_tile_canvas_.DrawBackground(ImVec2(64 * 2 + 2, 64 * 2 + 4));
+      current_tile_canvas_
+          .DrawBackground();  // ImVec2(64 * 2 + 2, 64 * 2 + 4));
      current_tile_canvas_.DrawContextMenu();
+      if (current_tile_canvas_.DrawTilePainter(
+              tile8_individual_[selected_tile8_], 16)) {
+        // Modify the tile16 based on the selected tile and current_tile16_info
+      }
      current_tile_canvas_.DrawBitmap(tile16_individual_[selected_tile16_], 2,
                                      4.0f);
      current_tile_canvas_.DrawGrid(16.f);
@@ -538,8 +560,10 @@ void ScreenEditor::LoadBinaryGfx() {
          gfx_sheets.emplace_back(converted_bin.begin() + (i * 0x1000),
                                  converted_bin.begin() + ((i + 1) * 0x1000));
          sheets_.emplace(i, gfx::Bitmap(128, 32, 8, gfx_sheets[i]));
-          sheets_[i].ApplyPalette(*rom()->mutable_dungeon_palette(3));
-          Renderer::GetInstance().RenderBitmap(&sheets_[i]);
+          status_ = sheets_[i].ApplyPalette(*rom()->mutable_dungeon_palette(3));
+          if (status_.ok()) {
+            Renderer::GetInstance().RenderBitmap(&sheets_[i]);
+          }
        }
        binary_gfx_loaded_ = true;
      } else {
@@ -589,5 +613,4 @@ void ScreenEditor::DrawToolset() {
 }

 }  // namespace editor
-}  // namespace app
 }  // namespace yaze
--- a/src/app/editor/graphics/screen_editor.h
+++ b/src/app/editor/graphics/screen_editor.h
@@ -15,7 +15,6 @@
 #include "imgui/imgui.h"

 namespace yaze {
-namespace app {
 namespace editor {

 /**
@@ -33,7 +32,7 @@ namespace editor {
 * The class inherits from the SharedRom class.
 */
 class ScreenEditor : public SharedRom, public Editor {
-public:
+ public:
  ScreenEditor() {
    screen_canvas_.SetCanvasSize(ImVec2(512, 512));
    type_ = EditorType::kScreen;
@@ -50,7 +49,7 @@ public:

  absl::Status SaveDungeonMaps();

-private:
+ private:
  void DrawTitleScreenEditor();
  void DrawNamingScreenEditor();
  void DrawOverworldMapEditor();
@@ -86,12 +85,13 @@ private:
  bool copy_button_pressed = false;
  bool paste_button_pressed = false;

-  std::vector<uint8_t> all_gfx_;
+  std::array<uint16_t, 4> current_tile16_data_;
  std::unordered_map<int, gfx::Bitmap> tile16_individual_;
+  std::vector<gfx::Bitmap> tile8_individual_;
+  std::vector<uint8_t> all_gfx_;
+  std::vector<uint8_t> gfx_bin_data_;
  std::vector<zelda3::screen::DungeonMap> dungeon_maps_;
  std::vector<std::vector<std::array<std::string, 25>>> dungeon_map_labels_;
-  std::array<uint16_t, 4> current_tile16_data_;
-  std::vector<uint8_t> gfx_bin_data_;

  absl::Status status_;

@@ -100,18 +100,17 @@ private:
  gfx::Tilesheet tile16_sheet_;
  gfx::InternalTile16 current_tile16_info;

-  gui::Canvas current_tile_canvas_{"##CurrentTileCanvas"};
+  gui::Canvas current_tile_canvas_{"##CurrentTileCanvas", ImVec2(32, 32),
+                                   gui::CanvasGridSize::k16x16, 2.0f};
  gui::Canvas screen_canvas_;
  gui::Canvas tilesheet_canvas_;
-  gui::Canvas tilemap_canvas_{"##TilemapCanvas",
-                              ImVec2(128 + 2, (192) + 4),
+  gui::Canvas tilemap_canvas_{"##TilemapCanvas", ImVec2(128 + 2, (192) + 4),
                              gui::CanvasGridSize::k8x8, 2.f};

  zelda3::screen::Inventory inventory_;
 };

-} // namespace editor
-} // namespace app
-} // namespace yaze
+}  // namespace editor
+}  // namespace yaze

 #endif
--- a/src/app/editor/graphics/tile16_editor.cc
+++ b/src/app/editor/graphics/tile16_editor.cc
@@ -2,12 +2,12 @@

 #include <cmath>

-#include "ImGuiFileDialog/ImGuiFileDialog.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
+#include "app/core/platform/file_dialog.h"
 #include "app/core/platform/renderer.h"
-#include "app/editor/graphics/palette_editor.h"
 #include "app/editor/editor.h"
+#include "app/editor/graphics/palette_editor.h"
 #include "app/gfx/bitmap.h"
 #include "app/gfx/snes_palette.h"
 #include "app/gfx/snes_tile.h"
@@ -21,7 +21,6 @@
 #include "imgui/imgui.h"

 namespace yaze {
-namespace app {
 namespace editor {

 using core::Renderer;
@@ -52,7 +51,7 @@ using ImGui::Text;
 absl::Status Tile16Editor::InitBlockset(
    const gfx::Bitmap& tile16_blockset_bmp, const gfx::Bitmap& current_gfx_bmp,
    const std::vector<gfx::Bitmap>& tile16_individual,
-    uint8_t all_tiles_types[0x200]) {
+    std::array<uint8_t, 0x200>& all_tiles_types) {
  all_tiles_types_ = all_tiles_types;
  tile16_blockset_bmp_ = tile16_blockset_bmp;
  tile16_individual_ = tile16_individual;
@@ -60,7 +59,7 @@ absl::Status Tile16Editor::InitBlockset(
  RETURN_IF_ERROR(LoadTile8());
  ImVector<std::string> tile16_names;
  for (int i = 0; i < 0x200; ++i) {
-    std::string str = core::UppercaseHexByte(all_tiles_types_[i]);
+    std::string str = core::HexByte(all_tiles_types_[i]);
    tile16_names.push_back(str);
  }

@@ -251,7 +250,7 @@ absl::Status Tile16Editor::DrawTileEditControls() {
  gui::InputHexByte("Palette", &notify_palette.mutable_get());
  notify_palette.apply_changes();
  if (notify_palette.modified()) {
-    auto palette = palettesets_[current_palette_].main;
+    auto palette = palettesets_[current_palette_].main_;
    auto value = notify_palette.get();
    if (notify_palette.get() > 0x04 && notify_palette.get() < 0x06) {
      palette = palettesets_[current_palette_].aux1;
@@ -364,16 +363,10 @@ absl::Status Tile16Editor::UpdateTile16Transfer() {
 absl::Status Tile16Editor::UpdateTransferTileCanvas() {
  // Create a button for loading another ROM
  if (Button("Load ROM")) {
-    ImGuiFileDialog::Instance()->OpenDialog(
-        "ChooseTransferFileDlgKey", "Open Transfer ROM", ".sfc,.smc", ".");
+    auto file_name = core::FileDialogWrapper::ShowOpenFileDialog();
+    transfer_status_ = transfer_rom_.LoadFromFile(file_name);
+    transfer_started_ = true;
  }
-  gui::FileDialogPipeline(
-      "ChooseTransferFileDlgKey", ".sfc,.smc", std::nullopt, [&]() {
-        std::string filePathName =
-            ImGuiFileDialog::Instance()->GetFilePathName();
-        transfer_status_ = transfer_rom_.LoadFromFile(filePathName);
-        transfer_started_ = true;
-      });

  // TODO: Implement tile16 transfer
  if (transfer_started_ && !transfer_blockset_loaded_) {
@@ -400,5 +393,4 @@ absl::Status Tile16Editor::UpdateTransferTileCanvas() {
 }

 }  // namespace editor
-}  // namespace app
 }  // namespace yaze
--- a/src/app/editor/graphics/tile16_editor.h
+++ b/src/app/editor/graphics/tile16_editor.h
@@ -13,18 +13,17 @@
 #include "imgui/imgui.h"

 namespace yaze {
-namespace app {
 namespace editor {

 /**
 * @brief Popup window to edit Tile16 data
 */
-class Tile16Editor : public GfxContext, public SharedRom {
+class Tile16Editor : public gfx::GfxContext, public SharedRom {
 public:
  absl::Status InitBlockset(const gfx::Bitmap& tile16_blockset_bmp,
                            const gfx::Bitmap& current_gfx_bmp,
                            const std::vector<gfx::Bitmap>& tile16_individual,
-                            uint8_t all_tiles_types[0x200]);
+                            std::array<uint8_t, 0x200>& all_tiles_types);

  absl::Status Update();
  absl::Status DrawMenu();
@@ -63,7 +62,7 @@ class Tile16Editor : public GfxContext, public SharedRom {
  bool priority_tile;
  int tile_size;

-  uint8_t* all_tiles_types_;
+  std::array<uint8_t, 0x200> all_tiles_types_;

  // Tile16 blockset for selecting the tile to edit
  gui::Canvas blockset_canvas_{"blocksetCanvas", ImVec2(0x100, 0x4000),
@@ -91,7 +90,7 @@ class Tile16Editor : public GfxContext, public SharedRom {
  PaletteEditor palette_editor_;

  gfx::SnesPalette palette_;
-  zelda3::overworld::Overworld transfer_overworld_;
+  zelda3::Overworld transfer_overworld_;

  absl::Status status_;

@@ -100,6 +99,5 @@ class Tile16Editor : public GfxContext, public SharedRom {
 };

 }  // namespace editor
-}  // namespace app
 }  // namespace yaze
 #endif  // YAZE_APP_EDITOR_TILE16EDITOR_H
--- a/src/app/editor/message/message_data.cc
+++ b/src/app/editor/message/message_data.cc
@@ -3,7 +3,6 @@
 #include "app/core/common.h"

 namespace yaze {
-namespace app {
 namespace editor {

 uint8_t FindMatchingCharacter(char value) {
@@ -145,7 +144,7 @@ std::vector<uint8_t> ParseMessageToData(std::string str) {
  return bytes;
 }

-std::vector<DictionaryEntry> BuildDictionaryEntries(app::Rom* rom) {
+std::vector<DictionaryEntry> BuildDictionaryEntries(Rom* rom) {
  std::vector<DictionaryEntry> AllDictionaries;
  for (int i = 0; i < kNumDictionaryEntries; i++) {
    std::vector<uint8_t> bytes;
@@ -178,5 +177,4 @@ std::vector<DictionaryEntry> BuildDictionaryEntries(app::Rom* rom) {
 }

 }  // namespace editor
-}  // namespace app
 }  // namespace yaze
--- a/src/app/editor/message/message_data.h
+++ b/src/app/editor/message/message_data.h
@@ -11,7 +11,6 @@
 #include "app/rom.h"

 namespace yaze {
-namespace app {
 namespace editor {

 const uint8_t kMessageTerminator = 0x7F;
@@ -78,7 +77,7 @@ constexpr int kTextDataEnd = 0xE7FFF;
 constexpr int kNumDictionaryEntries = 97;
 constexpr int kPointersDictionaries = 0x74703;

-std::vector<DictionaryEntry> BuildDictionaryEntries(app::Rom* rom);
+std::vector<DictionaryEntry> BuildDictionaryEntries(Rom* rom);

 std::string ReplaceAllDictionaryWords(std::string str,
                                      std::vector<DictionaryEntry> dictionary);
@@ -278,7 +277,6 @@ ParsedElement FindMatchingElement(const std::string& str);
 std::string ParseTextDataByte(uint8_t value);

 }  // namespace editor
-}  // namespace app
 }  // namespace yaze

 #endif  // YAZE_APP_EDITOR_MESSAGE_MESSAGE_DATA_H
--- a/src/app/editor/message/message_editor.cc
+++ b/src/app/editor/message/message_editor.cc
@@ -15,9 +15,9 @@
 #include "app/gui/style.h"
 #include "app/rom.h"
 #include "imgui.h"
+#include "imgui/misc/cpp/imgui_stdlib.h"

 namespace yaze {
-namespace app {
 namespace editor {

 using core::Renderer;
@@ -88,7 +88,7 @@ absl::Status MessageEditor::Initialize() {

  for (const auto& each_message : list_of_texts_) {
    std::cout << "Message #" << each_message.ID << " at address "
-              << core::UppercaseHexLong(each_message.Address) << std::endl;
+              << core::HexLong(each_message.Address) << std::endl;
    std::cout << "  " << each_message.RawString << std::endl;

    // Each string has a [:XX] char encoded
@@ -162,10 +162,6 @@ absl::Status MessageEditor::Update() {
 }

 void MessageEditor::DrawMessageList() {
-  if (InputText("Search", &search_text_)) {
-    // TODO: ImGui style text filtering
-  }
-
  if (BeginChild("##MessagesList", ImVec2(0, 0), true,
                 ImGuiWindowFlags_AlwaysVerticalScrollbar)) {
    if (BeginTable("##MessagesTable", 3, kMessageTableFlags)) {
@@ -177,7 +173,7 @@ void MessageEditor::DrawMessageList() {

      for (const auto& message : list_of_texts_) {
        TableNextColumn();
-        if (Button(core::UppercaseHexWord(message.ID).c_str())) {
+        if (Button(core::HexWord(message.ID).c_str())) {
          current_message_ = message;
          DrawMessagePreview();
        }
@@ -186,7 +182,7 @@ void MessageEditor::DrawMessageList() {
        TableNextColumn();
        TextWrapped(
            "%s",
-            core::UppercaseHexLong(list_of_texts_[message.ID].Address).c_str());
+            core::HexLong(list_of_texts_[message.ID].Address).c_str());
      }

      EndTable();
@@ -256,7 +252,7 @@ void MessageEditor::DrawDictionary() {

      for (const auto& dictionary : all_dictionaries_) {
        TableNextColumn();
-        Text("%s", core::UppercaseHexWord(dictionary.ID).c_str());
+        Text("%s", core::HexWord(dictionary.ID).c_str());
        TableNextColumn();
        Text("%s", dictionary.Contents.c_str());
      }
@@ -336,13 +332,14 @@ void MessageEditor::ReadAllTextDataV2() {
      current_raw_message.append("[");
      current_raw_message.append(DICTIONARYTOKEN);
      current_raw_message.append(":");
-      current_raw_message.append(core::UppercaseHexWord(dictionary));
+      current_raw_message.append(core::HexWord(dictionary));
      current_raw_message.append("]");

      uint32_t address = core::Get24LocalFromPC(
-          rom()->data(), kPointersDictionaries + (dictionary * 2));
+          rom()->mutable_data(), kPointersDictionaries + (dictionary * 2));
      uint32_t address_end = core::Get24LocalFromPC(
-          rom()->data(), kPointersDictionaries + ((dictionary + 1) * 2));
+          rom()->mutable_data(),
+          kPointersDictionaries + ((dictionary + 1) * 2));

      for (uint32_t i = address; i < address_end; i++) {
        parsed_message.push_back(rom()->data()[i]);
@@ -435,13 +432,13 @@ void MessageEditor::ReadAllTextData() {
      current_message_raw.append("[");
      current_message_raw.append(DICTIONARYTOKEN);
      current_message_raw.append(":");
-      current_message_raw.append(core::UppercaseHexWord(dictionary));
+      current_message_raw.append(core::HexWord(dictionary));
      current_message_raw.append("]");

      uint32_t address = core::Get24LocalFromPC(
-          rom()->data(), kPointersDictionaries + (dictionary * 2));
+          rom()->mutable_data(), kPointersDictionaries + (dictionary * 2));
      uint32_t address_end = core::Get24LocalFromPC(
-          rom()->data(), kPointersDictionaries + ((dictionary + 1) * 2));
+          rom()->mutable_data(), kPointersDictionaries + ((dictionary + 1) * 2));

      for (uint32_t i = address; i < address_end; i++) {
        temp_bytes_parsed.push_back(rom()->data()[i]);
@@ -703,5 +700,4 @@ void MessageEditor::SelectAll() {
 }

 }  // namespace editor
-}  // namespace app
 }  // namespace yaze
--- a/src/app/editor/message/message_editor.h
+++ b/src/app/editor/message/message_editor.h
@@ -12,7 +12,6 @@
 #include "app/rom.h"

 namespace yaze {
-namespace app {
 namespace editor {

 constexpr int kGfxFont = 0x70000;  // 2bpp format
@@ -163,7 +162,6 @@ class MessageEditor : public Editor, public SharedRom {
 };

 }  // namespace editor
-}  // namespace app
 }  // namespace yaze

 #endif  // YAZE_APP_EDITOR_MESSAGE_EDITOR_H
--- a/src/app/editor/music/music_editor.cc
+++ b/src/app/editor/music/music_editor.cc
@@ -9,7 +9,6 @@
 #include "app/gui/input.h"

 namespace yaze {
-namespace app {
 namespace editor {

 absl::Status MusicEditor::Update() {
@@ -218,5 +217,4 @@ void MusicEditor::DrawToolset() {
 }

 }  // namespace editor
-}  // namespace app
 }  // namespace yaze
--- a/src/app/editor/music/music_editor.h
+++ b/src/app/editor/music/music_editor.h
@@ -12,7 +12,6 @@
 #include "imgui/imgui.h"

 namespace yaze {
-namespace app {
 namespace editor {

 static const char* kGameSongs[] = {"Title",
@@ -85,7 +84,6 @@ class MusicEditor : public SharedRom, public Editor {
 };

 }  // namespace editor
-}  // namespace app
 }  // namespace yaze

 #endif
--- a/src/app/editor/overworld/entity.cc
+++ b/src/app/editor/overworld/entity.cc
@@ -5,7 +5,6 @@
 #include "app/gui/style.h"

 namespace yaze {
-namespace app {
 namespace editor {

 using ImGui::BeginChild;
@@ -92,7 +91,7 @@ void HandleEntityDragging(zelda3::GameEntity *entity, ImVec2 canvas_p0,
      ImGui::SetDragDropPayload("ENTITY_PAYLOAD", &entity,
                                sizeof(zelda3::GameEntity));
      Text("Moving %s ID: %s", entity_type.c_str(),
-           core::UppercaseHexByte(entity->entity_id_).c_str());
+           core::HexByte(entity->entity_id_).c_str());
      ImGui::EndDragDropSource();
    }
    MoveEntityOnGrid(dragged_entity, canvas_p0, scrolling, free_movement);
@@ -128,7 +127,7 @@ bool DrawEntranceInserterPopup() {

 // TODO: Implement deleting OverworldEntrance objects, currently only hides them
 bool DrawOverworldEntrancePopup(
-    zelda3::overworld::OverworldEntrance &entrance) {
+    zelda3::OverworldEntrance &entrance) {
  static bool set_done = false;
  if (set_done) {
    set_done = false;
@@ -178,7 +177,7 @@ void DrawExitInserterPopup() {
  }
 }

-bool DrawExitEditorPopup(zelda3::overworld::OverworldExit &exit) {
+bool DrawExitEditorPopup(zelda3::OverworldExit &exit) {
  static bool set_done = false;
  if (set_done) {
    set_done = false;
@@ -317,8 +316,8 @@ void DrawItemInsertPopup() {
    Text("Add Item");
    BeginChild("ScrollRegion", ImVec2(150, 150), true,
               ImGuiWindowFlags_AlwaysVerticalScrollbar);
-    for (size_t i = 0; i < zelda3::overworld::kSecretItemNames.size(); i++) {
-      if (Selectable(zelda3::overworld::kSecretItemNames[i].c_str(),
+    for (size_t i = 0; i < zelda3::kSecretItemNames.size(); i++) {
+      if (Selectable(zelda3::kSecretItemNames[i].c_str(),
                     i == new_item_id)) {
        new_item_id = i;
      }
@@ -341,7 +340,7 @@ void DrawItemInsertPopup() {
 }

 // TODO: Implement deleting OverworldItem objects, currently only hides them
-bool DrawItemEditorPopup(zelda3::overworld::OverworldItem &item) {
+bool DrawItemEditorPopup(zelda3::OverworldItem &item) {
  static bool set_done = false;
  if (set_done) {
    set_done = false;
@@ -351,8 +350,8 @@ bool DrawItemEditorPopup(zelda3::overworld::OverworldItem &item) {
    BeginChild("ScrollRegion", ImVec2(150, 150), true,
               ImGuiWindowFlags_AlwaysVerticalScrollbar);
    ImGui::BeginGroup();
-    for (size_t i = 0; i < zelda3::overworld::kSecretItemNames.size(); i++) {
-      if (Selectable(zelda3::overworld::kSecretItemNames[i].c_str(),
+    for (size_t i = 0; i < zelda3::kSecretItemNames.size(); i++) {
+      if (Selectable(zelda3::kSecretItemNames[i].c_str(),
                     item.id_ == i)) {
        item.id_ = i;
      }
@@ -489,5 +488,4 @@ bool DrawSpriteEditorPopup(zelda3::Sprite &sprite) {
 }

 }  // namespace editor
-}  // namespace app
 }  // namespace yaze
--- a/src/app/editor/overworld/entity.h
+++ b/src/app/editor/overworld/entity.h
@@ -7,7 +7,6 @@
 #include "app/zelda3/overworld/overworld.h"

 namespace yaze {
-namespace app {
 namespace editor {

 bool IsMouseHoveringOverEntity(const zelda3::GameEntity &entity,
@@ -23,14 +22,14 @@ void HandleEntityDragging(zelda3::GameEntity *entity, ImVec2 canvas_p0,
                          bool free_movement = false);

 bool DrawEntranceInserterPopup();
-bool DrawOverworldEntrancePopup(zelda3::overworld::OverworldEntrance &entrance);
+bool DrawOverworldEntrancePopup(zelda3::OverworldEntrance &entrance);

 void DrawExitInserterPopup();
-bool DrawExitEditorPopup(zelda3::overworld::OverworldExit &exit);
+bool DrawExitEditorPopup(zelda3::OverworldExit &exit);

 void DrawItemInsertPopup();

-bool DrawItemEditorPopup(zelda3::overworld::OverworldItem &item);
+bool DrawItemEditorPopup(zelda3::OverworldItem &item);

 enum MyItemColumnID {
  MyItemColumnID_ID,
@@ -81,7 +80,6 @@ void DrawSpriteInserterPopup();
 bool DrawSpriteEditorPopup(zelda3::Sprite &sprite);

 }  // namespace editor
-}  // namespace app
 }  // namespace yaze

 #endif  // YAZE_APP_EDITOR_OVERWORLD_ENTITY_H
--- a/src/app/editor/overworld/overworld_editor.cc
+++ b/src/app/editor/overworld/overworld_editor.cc
@@ -15,20 +15,21 @@
 #include "app/gfx/bitmap.h"
 #include "app/gfx/snes_palette.h"
 #include "app/gui/canvas.h"
+#include "app/gui/color.h"
 #include "app/gui/icons.h"
 #include "app/gui/input.h"
 #include "app/gui/style.h"
 #include "app/gui/zeml.h"
 #include "app/rom.h"
+#include "app/zelda3/common.h"
 #include "app/zelda3/overworld/overworld.h"
 #include "imgui/imgui.h"
+#include "imgui_memory_editor.h"

 namespace yaze {
-namespace app {
 namespace editor {

 using core::Renderer;
-
 using ImGui::BeginChild;
 using ImGui::BeginTabBar;
 using ImGui::BeginTabItem;
@@ -58,11 +59,11 @@ constexpr int kTile16Size = 0x10;

 absl::Status OverworldEditor::Update() {
  status_ = absl::OkStatus();
-  if (rom()->is_loaded() && !all_gfx_loaded_) {
+  if (rom_.is_loaded() && !all_gfx_loaded_) {
    RETURN_IF_ERROR(tile16_editor_.InitBlockset(
        tile16_blockset_bmp_, current_gfx_bmp_, tile16_individual_,
        *overworld_.mutable_all_tiles_types()));
-    RETURN_IF_ERROR(LoadEntranceTileTypes(*rom()));
+    ASSIGN_OR_RETURN(entrance_tiletypes_, zelda3::LoadEntranceTileTypes(rom_));
    all_gfx_loaded_ = true;
  }

@@ -96,125 +97,106 @@ void OverworldEditor::DrawToolset() {
  static bool show_gfx_group = false;
  static bool show_properties = false;

-  if (BeginTable("OWToolset", 22, kToolsetTableFlags, ImVec2(0, 0))) {
-    for (const auto &name : kToolsetColumnNames)
-      ImGui::TableSetupColumn(name.data());
-
-    NEXT_COLUMN()
-    if (Button(ICON_MD_UNDO)) {
-      status_ = Undo();
-    }
-
-    NEXT_COLUMN()
-    if (Button(ICON_MD_REDO)) {
-      status_ = Redo();
-    }
-
-    TEXT_COLUMN(ICON_MD_MORE_VERT)  // Separator
-
-    NEXT_COLUMN()
-    if (Button(ICON_MD_ZOOM_OUT)) {
-      ow_map_canvas_.ZoomOut();
-    }
-
-    NEXT_COLUMN()
-    if (Button(ICON_MD_ZOOM_IN)) {
-      ow_map_canvas_.ZoomIn();
-    }
-
-    NEXT_COLUMN()
-    if (Button(ICON_MD_OPEN_IN_FULL)) {
-      overworld_canvas_fullscreen_ = !overworld_canvas_fullscreen_;
-    }
-    HOVER_HINT("Fullscreen Canvas")
-
-    TEXT_COLUMN(ICON_MD_MORE_VERT)  // Separator
-
-    NEXT_COLUMN()
-    if (Selectable(ICON_MD_PAN_TOOL_ALT, current_mode == EditingMode::PAN)) {
-      current_mode = EditingMode::PAN;
-      ow_map_canvas_.set_draggable(true);
-    }
-    HOVER_HINT("Pan (Right click and drag)")
-
-    NEXT_COLUMN()
-    if (Selectable(ICON_MD_DRAW, current_mode == EditingMode::DRAW_TILE)) {
-      current_mode = EditingMode::DRAW_TILE;
-    }
-    HOVER_HINT("Draw Tile")
-
-    NEXT_COLUMN()
-    if (Selectable(ICON_MD_DOOR_FRONT, current_mode == EditingMode::ENTRANCES))
-      current_mode = EditingMode::ENTRANCES;
-    HOVER_HINT("Entrances")
-
-    NEXT_COLUMN()
-    if (Selectable(ICON_MD_DOOR_BACK, current_mode == EditingMode::EXITS))
-      current_mode = EditingMode::EXITS;
-    HOVER_HINT("Exits")
-
-    NEXT_COLUMN()
-    if (Selectable(ICON_MD_GRASS, current_mode == EditingMode::ITEMS))
-      current_mode = EditingMode::ITEMS;
-    HOVER_HINT("Items")
-
-    NEXT_COLUMN()
-    if (Selectable(ICON_MD_PEST_CONTROL_RODENT,
-                   current_mode == EditingMode::SPRITES))
-      current_mode = EditingMode::SPRITES;
-    HOVER_HINT("Sprites")
-
-    NEXT_COLUMN()
-    if (Selectable(ICON_MD_ADD_LOCATION,
-                   current_mode == EditingMode::TRANSPORTS))
-      current_mode = EditingMode::TRANSPORTS;
-    HOVER_HINT("Transports")
-
-    NEXT_COLUMN()
-    if (Selectable(ICON_MD_MUSIC_NOTE, current_mode == EditingMode::MUSIC))
-      current_mode = EditingMode::MUSIC;
-    HOVER_HINT("Music")
-
-    TableNextColumn();
-    if (Button(ICON_MD_GRID_VIEW)) {
-      show_tile16_editor_ = !show_tile16_editor_;
-    }
-    HOVER_HINT("Tile16 Editor")
-
-    TableNextColumn();
-    if (Button(ICON_MD_TABLE_CHART)) {
-      show_gfx_group = !show_gfx_group;
-    }
-    HOVER_HINT("Gfx Group Editor")
-
-    TEXT_COLUMN(ICON_MD_MORE_VERT)  // Separator
-
-    TableNextColumn();
-    if (Button(ICON_MD_CONTENT_COPY)) {
-      std::vector<uint8_t> png_data;
-      if (gfx::ConvertSurfaceToPNG(maps_bmp_[current_map_].surface(),
-                                   png_data)) {
-        core::CopyImageToClipboard(png_data);
-      } else {
-        status_ = absl::InternalError(
-            "Failed to convert overworld map surface to PNG");
+  if (toolset_table_.column_contents.empty()) {
+    gui::AddTableColumn(toolset_table_, "##Undo", [&]() {
+      if (Button(ICON_MD_UNDO)) status_ = Undo();
+    });
+    gui::AddTableColumn(toolset_table_, "##Redo", [&]() {
+      if (Button(ICON_MD_REDO)) status_ = Redo();
+    });
+    gui::AddTableColumn(toolset_table_, "##Sep1", ICON_MD_MORE_VERT);
+    gui::AddTableColumn(toolset_table_, "##ZoomOut", [&]() {
+      if (Button(ICON_MD_ZOOM_OUT)) ow_map_canvas_.ZoomOut();
+    });
+    gui::AddTableColumn(toolset_table_, "##ZoomIn", [&]() {
+      if (Button(ICON_MD_ZOOM_IN)) ow_map_canvas_.ZoomIn();
+    });
+    gui::AddTableColumn(toolset_table_, "##Fullscreen", [&]() {
+      if (Button(ICON_MD_OPEN_IN_FULL))
+        overworld_canvas_fullscreen_ = !overworld_canvas_fullscreen_;
+      HOVER_HINT("Fullscreen Canvas")
+    });
+    gui::AddTableColumn(toolset_table_, "##Sep2", ICON_MD_MORE_VERT);
+    gui::AddTableColumn(toolset_table_, "##Pan", [&]() {
+      if (Selectable(ICON_MD_PAN_TOOL_ALT, current_mode == EditingMode::PAN)) {
+        current_mode = EditingMode::PAN;
+        ow_map_canvas_.set_draggable(true);
      }
-    }
-    HOVER_HINT("Copy Map to Clipboard");
+      HOVER_HINT("Pan (Right click and drag)");
+    });
+    gui::AddTableColumn(toolset_table_, "##DrawTile", [&]() {
+      if (Selectable(ICON_MD_DRAW, current_mode == EditingMode::DRAW_TILE)) {
+        current_mode = EditingMode::DRAW_TILE;
+      }
+      HOVER_HINT("Draw Tile");
+    });
+    gui::AddTableColumn(toolset_table_, "##Entrances", [&]() {
+      if (Selectable(ICON_MD_DOOR_FRONT,
+                     current_mode == EditingMode::ENTRANCES))
+        current_mode = EditingMode::ENTRANCES;
+      HOVER_HINT("Entrances");
+    });
+    gui::AddTableColumn(toolset_table_, "##Exits", [&]() {
+      if (Selectable(ICON_MD_DOOR_BACK, current_mode == EditingMode::EXITS))
+        current_mode = EditingMode::EXITS;
+      HOVER_HINT("Exits");
+    });
+    gui::AddTableColumn(toolset_table_, "##Items", [&]() {
+      if (Selectable(ICON_MD_GRASS, current_mode == EditingMode::ITEMS))
+        current_mode = EditingMode::ITEMS;
+      HOVER_HINT("Items");
+    });
+    gui::AddTableColumn(toolset_table_, "##Sprites", [&]() {
+      if (Selectable(ICON_MD_PEST_CONTROL_RODENT,
+                     current_mode == EditingMode::SPRITES))
+        current_mode = EditingMode::SPRITES;
+      HOVER_HINT("Sprites");
+    });
+    gui::AddTableColumn(toolset_table_, "##Transports", [&]() {
+      if (Selectable(ICON_MD_ADD_LOCATION,
+                     current_mode == EditingMode::TRANSPORTS))
+        current_mode = EditingMode::TRANSPORTS;
+      HOVER_HINT("Transports");
+    });
+    gui::AddTableColumn(toolset_table_, "##Music", [&]() {
+      if (Selectable(ICON_MD_MUSIC_NOTE, current_mode == EditingMode::MUSIC))
+        current_mode = EditingMode::MUSIC;
+      HOVER_HINT("Music");
+    });
+    gui::AddTableColumn(toolset_table_, "##Tile16Editor", [&]() {
+      if (Button(ICON_MD_GRID_VIEW)) show_tile16_editor_ = !show_tile16_editor_;
+      HOVER_HINT("Tile16 Editor");
+    });
+    gui::AddTableColumn(toolset_table_, "##GfxGroupEditor", [&]() {
+      if (Button(ICON_MD_TABLE_CHART)) show_gfx_group = !show_gfx_group;
+      HOVER_HINT("Gfx Group Editor");
+    });
+    gui::AddTableColumn(toolset_table_, "##sep3", ICON_MD_MORE_VERT);
+    gui::AddTableColumn(toolset_table_, "##Properties", [&]() {
+      if (Button(ICON_MD_CONTENT_COPY)) {
+        std::vector<uint8_t> png_data;
+        if (gfx::ConvertSurfaceToPNG(maps_bmp_[current_map_].surface(),
+                                     png_data)) {
+          core::CopyImageToClipboard(png_data);
+        } else {
+          status_ = absl::InternalError(
+              "Failed to convert overworld map surface to PNG");
+        }
+      }
+      HOVER_HINT("Copy Map to Clipboard");
+    });
+    gui::AddTableColumn(toolset_table_, "##Palette", [&]() {
+      status_ = DisplayPalette(palette_, overworld_.is_loaded());
+    });
+    gui::AddTableColumn(toolset_table_, "##Sep4", ICON_MD_MORE_VERT);
+    gui::AddTableColumn(toolset_table_, "##Properties",
+                        [&]() { Checkbox("Properties", &show_properties); });

-    TableNextColumn();  // Palette
-    status_ = DisplayPalette(palette_, overworld_.is_loaded());
-
-    TEXT_COLUMN(ICON_MD_MORE_VERT)  // Separator
-
-    TableNextColumn();
-    Checkbox("Properties", &show_properties);
-
-    ImGui::EndTable();
+  } else {
+    gui::DrawTable(toolset_table_);
  }

  if (show_tile16_editor_) {
-    // Create a table in ImGui for the Tile16 Editor
    ImGui::Begin("Tile16 Editor", &show_tile16_editor_,
                 ImGuiWindowFlags_MenuBar);
    status_ = tile16_editor_.Update();
@@ -639,7 +621,7 @@ void OverworldEditor::CheckForMousePan() {

 void OverworldEditor::DrawOverworldCanvas() {
  if (all_gfx_loaded_) {
-    if (flags()->overworld.kLoadCustomOverworld) {
+    if (core::ExperimentFlags::get().overworld.kLoadCustomOverworld) {
      DrawCustomOverworldMapSettings();
    } else {
      DrawOverworldMapSettings();
@@ -724,7 +706,7 @@ void OverworldEditor::DrawTile8Selector() {
  graphics_bin_canvas_.DrawContextMenu();
  if (all_gfx_loaded_) {
    int key = 0;
-    for (auto &value : rom()->gfx_sheets()) {
+    for (auto &value : rom_.gfx_sheets()) {
      int offset = 0x40 * (key + 1);
      int top_left_y = graphics_bin_canvas_.zero_point().y + 2;
      if (key >= 1) {
@@ -808,7 +790,7 @@ void OverworldEditor::DrawOverworldEntrances(ImVec2 canvas_p0, ImVec2 scrolling,
        color = ImVec4(255, 255, 255, 200);
      }
      ow_map_canvas_.DrawRect(each.x_, each.y_, 16, 16, color);
-      std::string str = core::UppercaseHexByte(each.entrance_id_);
+      std::string str = core::HexByte(each.entrance_id_);

      if (current_mode == EditingMode::ENTRANCES) {
        HandleEntityDragging(&each, canvas_p0, scrolling, is_dragging_entity_,
@@ -891,7 +873,7 @@ void OverworldEditor::DrawOverworldExits(ImVec2 canvas_p0, ImVec2 scrolling) {
        }
      }

-      std::string str = core::UppercaseHexByte(i);
+      std::string str = core::HexByte(i);
      ow_map_canvas_.DrawText(str, each.x_, each.y_);
    }
    i++;
@@ -937,8 +919,8 @@ void OverworldEditor::DrawOverworldItems() {
        }
      }
      std::string item_name = "";
-      if (item.id_ < zelda3::overworld::kSecretItemNames.size()) {
-        item_name = zelda3::overworld::kSecretItemNames[item.id_];
+      if (item.id_ < zelda3::kSecretItemNames.size()) {
+        item_name = zelda3::kSecretItemNames[item.id_];
      } else {
        item_name = absl::StrFormat("0x%02X", item.id_);
      }
@@ -1027,22 +1009,22 @@ void OverworldEditor::DrawOverworldSprites() {
 }

 absl::Status OverworldEditor::Save() {
-  if (flags()->overworld.kSaveOverworldMaps) {
+  if (core::ExperimentFlags::get().overworld.kSaveOverworldMaps) {
    RETURN_IF_ERROR(overworld_.CreateTile32Tilemap());
    RETURN_IF_ERROR(overworld_.SaveMap32Tiles());
    RETURN_IF_ERROR(overworld_.SaveMap16Tiles());
    RETURN_IF_ERROR(overworld_.SaveOverworldMaps());
  }
-  if (flags()->overworld.kSaveOverworldEntrances) {
+  if (core::ExperimentFlags::get().overworld.kSaveOverworldEntrances) {
    RETURN_IF_ERROR(overworld_.SaveEntrances());
  }
-  if (flags()->overworld.kSaveOverworldExits) {
+  if (core::ExperimentFlags::get().overworld.kSaveOverworldExits) {
    RETURN_IF_ERROR(overworld_.SaveExits());
  }
-  if (flags()->overworld.kSaveOverworldItems) {
+  if (core::ExperimentFlags::get().overworld.kSaveOverworldItems) {
    RETURN_IF_ERROR(overworld_.SaveItems());
  }
-  if (flags()->overworld.kSaveOverworldProperties) {
+  if (core::ExperimentFlags::get().overworld.kSaveOverworldProperties) {
    RETURN_IF_ERROR(overworld_.SaveMapProperties());
  }
  return absl::OkStatus();
@@ -1050,7 +1032,7 @@ absl::Status OverworldEditor::Save() {

 absl::Status OverworldEditor::LoadGraphics() {
  // Load the Link to the Past overworld.
-  RETURN_IF_ERROR(overworld_.Load(*rom()))
+  RETURN_IF_ERROR(overworld_.Load(rom_))
  palette_ = overworld_.current_area_palette();

  // Create the area graphics image
@@ -1066,10 +1048,10 @@ absl::Status OverworldEditor::LoadGraphics() {

  // Copy the tile16 data into individual tiles.
  auto tile16_data = overworld_.tile16_blockset_data();
-  tile16_individual_.reserve(zelda3::overworld::kNumTile16Individual);
+  tile16_individual_.reserve(zelda3::kNumTile16Individual);

  // Loop through the tiles and copy their pixel data into separate vectors
-  for (uint i = 0; i < zelda3::overworld::kNumTile16Individual; i++) {
+  for (uint i = 0; i < zelda3::kNumTile16Individual; i++) {
    std::vector<uint8_t> tile_data(kTile16Size * kTile16Size, 0x00);

    // Copy the pixel data for the current tile into the vector
@@ -1092,7 +1074,7 @@ absl::Status OverworldEditor::LoadGraphics() {
  }

  // Render the overworld maps loaded from the ROM.
-  for (int i = 0; i < zelda3::overworld::kNumOverworldMaps; ++i) {
+  for (int i = 0; i < zelda3::kNumOverworldMaps; ++i) {
    overworld_.set_current_map(i);
    auto palette = overworld_.current_area_palette();
    RETURN_IF_ERROR(Renderer::GetInstance().CreateAndRenderBitmap(
@@ -1100,7 +1082,7 @@ absl::Status OverworldEditor::LoadGraphics() {
        overworld_.current_map_bitmap_data(), maps_bmp_[i], palette));
  }

-  if (flags()->overworld.kDrawOverworldSprites) {
+  if (core::ExperimentFlags::get().overworld.kDrawOverworldSprites) {
    RETURN_IF_ERROR(LoadSpriteGraphics());
  }

@@ -1235,7 +1217,7 @@ absl::Status OverworldEditor::RefreshTile16Blockset() {

  std::vector<std::future<void>> futures;
  // Loop through the tiles and copy their pixel data into separate vectors
-  for (uint i = 0; i < zelda3::overworld::kNumTile16Individual; i++) {
+  for (uint i = 0; i < zelda3::kNumTile16Individual; i++) {
    futures.push_back(std::async(
        std::launch::async,
        [&](int index) {
@@ -1259,7 +1241,7 @@ absl::Status OverworldEditor::RefreshTile16Blockset() {
  }

  // Render the bitmaps of each tile.
-  for (uint id = 0; id < zelda3::overworld::kNumTile16Individual; id++) {
+  for (uint id = 0; id < zelda3::kNumTile16Individual; id++) {
    RETURN_IF_ERROR(tile16_individual_[id].ApplyPalette(palette_));
    Renderer::GetInstance().UpdateBitmap(&tile16_individual_[id]);
  }
@@ -1385,8 +1367,9 @@ absl::Status OverworldEditor::UpdateUsageStats() {
    if (BeginChild("UnusedSpritesetScroll", ImVec2(0, 0), true,
                   ImGuiWindowFlags_HorizontalScrollbar)) {
      for (int i = 0; i < 0x81; i++) {
-        auto entrance_name = rom()->resource_label()->GetLabel(
-            "Dungeon Entrance Names", core::UppercaseHexByte(i));
+        auto entrance_name = rom_.resource_label()->CreateOrGetLabel(
+            "Dungeon Entrance Names", core::HexByte(i),
+            zelda3::kEntranceNames[i].data());
        std::string str = absl::StrFormat("%#x - %s", i, entrance_name);
        if (Selectable(str.c_str(), selected_entrance_ == i,
                       overworld_.entrances().at(i).deleted
@@ -1500,7 +1483,7 @@ void OverworldEditor::DrawDebugWindow() {
  }
 }

-void OverworldEditor::InitializeZeml() {
+void OverworldEditor::Initialize() {
  // Load zeml string from layouts/overworld.zeml
  std::string layout = gui::zeml::LoadFile("overworld.zeml");
  // Parse the zeml string into a Node object
@@ -1511,24 +1494,23 @@ void OverworldEditor::InitializeZeml() {
  gui::zeml::Bind(&*layout_node_.GetNode("OverworldTileSelector"),
                  [this]() { status_ = DrawTileSelector(); });
  gui::zeml::Bind(&*layout_node_.GetNode("OwUsageStats"), [this]() {
-    if (rom()->is_loaded()) {
+    if (rom_.is_loaded()) {
      status_ = UpdateUsageStats();
    }
  });
  gui::zeml::Bind(&*layout_node_.GetNode("owToolset"),
                  [this]() { DrawToolset(); });
  gui::zeml::Bind(&*layout_node_.GetNode("OwTile16Editor"), [this]() {
-    if (rom()->is_loaded()) {
+    if (rom_.is_loaded()) {
      status_ = tile16_editor_.Update();
    }
  });
  gui::zeml::Bind(&*layout_node_.GetNode("OwGfxGroupEditor"), [this]() {
-    if (rom()->is_loaded()) {
+    if (rom_.is_loaded()) {
      status_ = gfx_group_editor_.Update();
    }
  });
 }

 }  // namespace editor
-}  // namespace app
 }  // namespace yaze
--- a/src/app/editor/overworld/overworld_editor.h
+++ b/src/app/editor/overworld/overworld_editor.h
@@ -1,30 +1,21 @@
 #ifndef YAZE_APP_EDITOR_OVERWORLDEDITOR_H
 #define YAZE_APP_EDITOR_OVERWORLDEDITOR_H

-#include <cmath>
-#include <unordered_map>
-
-#include "absl/container/flat_hash_map.h"
 #include "absl/status/status.h"
-#include "absl/status/statusor.h"
-#include "absl/strings/str_format.h"
 #include "app/editor/editor.h"
 #include "app/editor/graphics/gfx_group_editor.h"
 #include "app/editor/graphics/palette_editor.h"
 #include "app/editor/graphics/tile16_editor.h"
-#include "app/editor/overworld/entity.h"
 #include "app/gfx/bitmap.h"
 #include "app/gfx/snes_palette.h"
-#include "app/gfx/snes_tile.h"
 #include "app/gui/canvas.h"
-#include "app/gui/icons.h"
+#include "app/gui/input.h"
 #include "app/gui/zeml.h"
 #include "app/rom.h"
 #include "app/zelda3/overworld/overworld.h"
 #include "imgui/imgui.h"

 namespace yaze {
-namespace app {
 namespace editor {

 constexpr uint k4BPP = 4;
@@ -65,32 +56,6 @@ constexpr absl::string_view kTileSelectorTab = "##TileSelectorTabBar";
 constexpr absl::string_view kOWEditTable = "##OWEditTable";
 constexpr absl::string_view kOWMapTable = "#MapSettingsTable";

-constexpr int kEntranceTileTypePtrLow = 0xDB8BF;
-constexpr int kEntranceTileTypePtrHigh = 0xDB917;
-constexpr int kNumEntranceTileTypes = 0x2C;
-
-class EntranceContext {
- public:
-  absl::Status LoadEntranceTileTypes(Rom& rom) {
-    int offset_low = kEntranceTileTypePtrLow;
-    int offset_high = kEntranceTileTypePtrHigh;
-
-    for (int i = 0; i < kNumEntranceTileTypes; i++) {
-      // Load entrance tile types
-      ASSIGN_OR_RETURN(auto value_low, rom.ReadWord(offset_low + i));
-      entrance_tile_types_low_.push_back(value_low);
-      ASSIGN_OR_RETURN(auto value_high, rom.ReadWord(offset_high + i));
-      entrance_tile_types_low_.push_back(value_high);
-    }
-
-    return absl::OkStatus();
-  }
-
- private:
-  std::vector<uint16_t> entrance_tile_types_low_;
-  std::vector<uint16_t> entrance_tile_types_high_;
-};
-
 /**
 * @class OverworldEditor
 * @brief Manipulates the Overworld and OverworldMap data in a Rom.
@@ -107,15 +72,11 @@ class EntranceContext {
 * Provides access to the GfxGroupEditor and Tile16Editor through popup windows.
 *
 */
-class OverworldEditor : public Editor,
-                        public SharedRom,
-                        public EntranceContext,
-                        public GfxContext,
-                        public core::ExperimentFlags {
+class OverworldEditor : public Editor, public gfx::GfxContext {
 public:
-  OverworldEditor() { type_ = EditorType::kOverworld; }
+  OverworldEditor(Rom& rom) : rom_(rom) { type_ = EditorType::kOverworld; }

-  void InitializeZeml();
+  void Initialize();

  absl::Status Update() final;
  absl::Status Undo() override { return absl::UnimplementedError("Undo"); }
@@ -130,9 +91,6 @@ class OverworldEditor : public Editor,

  auto overworld() { return &overworld_; }

-  /**
-   * @brief
-   */
  int jump_to_tab() { return jump_to_tab_; }
  int jump_to_tab_ = -1;

@@ -281,6 +239,8 @@ class OverworldEditor : public Editor,
  std::vector<std::vector<uint8_t>> tile8_individual_data_;
  std::vector<gfx::Bitmap> tile8_individual_;

+  Rom& rom_;
+
  Tile16Editor tile16_editor_;
  GfxGroupEditor gfx_group_editor_;
  PaletteEditor palette_editor_;
@@ -296,14 +256,15 @@ class OverworldEditor : public Editor,
  gfx::BitmapTable current_graphics_set_;
  gfx::BitmapTable sprite_previews_;

-  zelda3::overworld::Overworld overworld_;
-  zelda3::OWBlockset refresh_blockset_;
+  zelda3::Overworld overworld_;
+  zelda3::OverworldBlockset refresh_blockset_;

  zelda3::Sprite current_sprite_;

-  zelda3::overworld::OverworldEntrance current_entrance_;
-  zelda3::overworld::OverworldExit current_exit_;
-  zelda3::overworld::OverworldItem current_item_;
+  zelda3::OverworldEntrance current_entrance_;
+  zelda3::OverworldExit current_exit_;
+  zelda3::OverworldItem current_item_;
+  zelda3::OverworldEntranceTileTypes entrance_tiletypes_;

  zelda3::GameEntity* current_entity_;
  zelda3::GameEntity* dragged_entity_;
@@ -317,11 +278,15 @@ class OverworldEditor : public Editor,
  gui::Canvas graphics_bin_canvas_{"GraphicsBin", kGraphicsBinCanvasSize,
                                   gui::CanvasGridSize::k16x16};
  gui::Canvas properties_canvas_;
+
+  gui::Table toolset_table_{"##ToolsetTable0", 22, kToolsetTableFlags};
+  gui::Table map_settings_table_{kOWMapTable.data(), 8, kOWMapFlags,
+                                 ImVec2(0, 0)};
+
  gui::zeml::Node layout_node_;
  absl::Status status_;
 };
 }  // namespace editor
-}  // namespace app
 }  // namespace yaze

 #endif
--- a/src/app/editor/sprite/sprite_editor.cc
+++ b/src/app/editor/sprite/sprite_editor.cc
@@ -7,7 +7,6 @@
 #include "app/zelda3/sprite/sprite.h"

 namespace yaze {
-namespace app {
 namespace editor {

 using ImGui::BeginTable;
@@ -191,7 +190,7 @@ void SpriteEditor::DrawSpritesList() {
    int i = 0;
    for (const auto each_sprite_name : zelda3::kSpriteDefaultNames) {
      rom()->resource_label()->SelectableLabelWithNameEdit(
-          current_sprite_id_ == i, "Sprite Names", core::UppercaseHexByte(i),
+          current_sprite_id_ == i, "Sprite Names", core::HexByte(i),
          zelda3::kSpriteDefaultNames[i].data());
      if (ImGui::IsItemClicked()) {
        current_sprite_id_ = i;
@@ -275,5 +274,4 @@ void SpriteEditor::DrawCustomSpritesMetadata() {
 }

 }  // namespace editor
-}  // namespace app
 }  // namespace yaze
--- a/src/app/editor/sprite/sprite_editor.h
+++ b/src/app/editor/sprite/sprite_editor.h
@@ -8,7 +8,6 @@
 #include "app/rom.h"

 namespace yaze {
-namespace app {
 namespace editor {

 constexpr ImGuiTabItemFlags kSpriteTabFlags =
@@ -111,7 +110,6 @@ class SpriteEditor : public SharedRom, public Editor {
 };

 }  // namespace editor
-}  // namespace app
 }  // namespace yaze

 #endif  // YAZE_APP_EDITOR_SPRITE_EDITOR_H
--- a/src/app/editor/sprite/zsprite.h
+++ b/src/app/editor/sprite/zsprite.h
@@ -13,7 +13,6 @@
 #include "imgui/imgui.h"

 namespace yaze {
-namespace app {
 namespace editor {
 /**
 * @brief Namespace for the ZSprite format from Zarby's ZSpriteMaker.
@@ -390,7 +389,6 @@ struct ZSprite {

 }  // namespace zsprite
 }  // namespace editor
-}  // namespace app
 }  // namespace yaze

 #endif  // YAZE_APP_EDITOR_SPRITE_ZSPRITE_H
--- a/src/app/editor/system/command_manager.cc
+++ b/src/app/editor/system/command_manager.cc
@@ -5,7 +5,6 @@
 #include "imgui/imgui.h"

 namespace yaze {
-namespace app {
 namespace editor {

 ImGuiKey MapKeyToImGuiKey(char key) {
@@ -139,5 +138,4 @@ void CommandManager::LoadKeybindings(const std::string &filepath) {
 }

 }  // namespace editor
-}  // namespace app
 }  // namespace yaze
--- a/src/app/editor/system/command_manager.h
+++ b/src/app/editor/system/command_manager.h
@@ -8,16 +8,15 @@
 #include "imgui/imgui.h"

 namespace yaze {
-namespace app {
 namespace editor {

 ImGuiKey MapKeyToImGuiKey(char key);

 class CommandManager {
-public:
+ public:
  CommandManager() = default;
  ~CommandManager() = default;
-  
+
  using Command = std::function<void()>;

  struct CommandInfo {
@@ -27,7 +26,9 @@ public:
    std::string desc;
    CommandInfo(Command command, char mnemonic, const std::string &name,
                const std::string &desc)
-        : command(std::move(command)), mnemonic(mnemonic), name(name),
+        : command(std::move(command)),
+          mnemonic(mnemonic),
+          name(name),
          desc(desc) {}
    CommandInfo() = default;
  };
@@ -72,12 +73,11 @@ public:
  void SaveKeybindings(const std::string &filepath);
  void LoadKeybindings(const std::string &filepath);

-private:
+ private:
  std::unordered_map<std::string, CommandInfoOrPrefix> commands_;
 };

-} // namespace editor
-} // namespace app
-} // namespace yaze
+}  // namespace editor
+}  // namespace yaze

-#endif // YAZE_APP_EDITOR_SYSTEM_COMMAND_MANAGER_H
+#endif  // YAZE_APP_EDITOR_SYSTEM_COMMAND_MANAGER_H
--- a/src/app/editor/system/constant_manager.h
+++ b/src/app/editor/system/constant_manager.h
@@ -7,7 +7,6 @@
 #include "imgui/imgui.h"

 namespace yaze {
-namespace app {
 namespace editor {

 class ConstantManager {
@@ -27,23 +26,23 @@ class ConstantManager {
        ImGui::Text("Overworld constants");
        ImGui::Separator();
        ImGui::Text("OverworldCustomASMHasBeenApplied: %d",
-                    zelda3::overworld::OverworldCustomASMHasBeenApplied);
+                    zelda3::OverworldCustomASMHasBeenApplied);
        ImGui::Text("OverworldCustomAreaSpecificBGPalette: %d",
-                    zelda3::overworld::OverworldCustomAreaSpecificBGPalette);
+                    zelda3::OverworldCustomAreaSpecificBGPalette);
        ImGui::Text("OverworldCustomAreaSpecificBGEnabled: %d",
-                    zelda3::overworld::OverworldCustomAreaSpecificBGEnabled);
+                    zelda3::OverworldCustomAreaSpecificBGEnabled);
        ImGui::Text("OverworldCustomMainPaletteArray: %d",
-                    zelda3::overworld::OverworldCustomMainPaletteArray);
+                    zelda3::OverworldCustomMainPaletteArray);
        ImGui::Text("OverworldCustomMainPaletteEnabled: %d",
-                    zelda3::overworld::OverworldCustomMainPaletteEnabled);
+                    zelda3::OverworldCustomMainPaletteEnabled);
        ImGui::Text("OverworldCustomMosaicArray: %d",
-                    zelda3::overworld::OverworldCustomMosaicArray);
+                    zelda3::OverworldCustomMosaicArray);
        ImGui::Text("OverworldCustomMosaicEnabled: %d",
-                    zelda3::overworld::OverworldCustomMosaicEnabled);
+                    zelda3::OverworldCustomMosaicEnabled);
        ImGui::Text("OverworldCustomAnimatedGFXArray: %d",
-                    zelda3::overworld::OverworldCustomAnimatedGFXArray);
+                    zelda3::OverworldCustomAnimatedGFXArray);
        ImGui::Text("OverworldCustomAnimatedGFXEnabled: %d",
-                    zelda3::overworld::OverworldCustomAnimatedGFXEnabled);
+                    zelda3::OverworldCustomAnimatedGFXEnabled);

        ImGui::EndTabItem();
      }
@@ -71,7 +70,6 @@ class ConstantManager {
 };

 }  // namespace editor
-}  // namespace app
 }  // namespace yaze

 #endif  // YAZE_APP_EDITOR_SYSTEM_CONSTANT_MANAGER_H
--- a/src/app/editor/system/extension_manager.cc
+++ b/src/app/editor/system/extension_manager.cc
@@ -5,13 +5,12 @@
 #include <dlfcn.h>
 #endif

-#include <system/extension.h>
+#include <yaze.h>

 #include <iostream>
 #include <vector>

 namespace yaze {
-namespace app {
 namespace editor {

 void ExtensionManager::LoadExtension(const std::string& filename,
@@ -81,5 +80,4 @@ void ExtensionManager::ExecuteExtensionUI(yaze_editor_context* context) {
 }

 }  // namespace editor
-}  // namespace app
 }  // namespace yaze
--- a/src/app/editor/system/extension_manager.h
+++ b/src/app/editor/system/extension_manager.h
@@ -1,13 +1,12 @@
 #ifndef YAZE_APP_EDITOR_SYSTEM_EXTENSION_MANAGER_H
 #define YAZE_APP_EDITOR_SYSTEM_EXTENSION_MANAGER_H

-#include <system/extension.h>
+#include <yaze.h>

 #include <string>
 #include <vector>

 namespace yaze {
-namespace app {
 namespace editor {

 class ExtensionManager {
@@ -23,7 +22,6 @@ class ExtensionManager {
 };

 }  // namespace editor
-}  // namespace app
 }  // namespace yaze

 #endif  // YAZE_APP_EDITOR_SYSTEM_EXTENSION_MANAGER_H
--- a/src/app/editor/system/flags.h
+++ b/src/app/editor/system/flags.h
@@ -5,60 +5,59 @@
 #include "imgui/imgui.h"

 namespace yaze {
-namespace app {
 namespace editor {

+using core::ExperimentFlags;
 using ImGui::BeginMenu;
 using ImGui::Checkbox;
 using ImGui::EndMenu;
 using ImGui::MenuItem;
 using ImGui::Separator;

-struct FlagsMenu : public core::ExperimentFlags {
+struct FlagsMenu {
  void Draw() {
    if (BeginMenu("Overworld Flags")) {
      Checkbox("Enable Overworld Sprites",
-               &mutable_flags()->overworld.kDrawOverworldSprites);
+               &ExperimentFlags::get().overworld.kDrawOverworldSprites);
      Separator();
      Checkbox("Save Overworld Maps",
-               &mutable_flags()->overworld.kSaveOverworldMaps);
+               &ExperimentFlags::get().overworld.kSaveOverworldMaps);
      Checkbox("Save Overworld Entrances",
-               &mutable_flags()->overworld.kSaveOverworldEntrances);
+               &ExperimentFlags::get().overworld.kSaveOverworldEntrances);
      Checkbox("Save Overworld Exits",
-               &mutable_flags()->overworld.kSaveOverworldExits);
+               &ExperimentFlags::get().overworld.kSaveOverworldExits);
      Checkbox("Save Overworld Items",
-               &mutable_flags()->overworld.kSaveOverworldItems);
+               &ExperimentFlags::get().overworld.kSaveOverworldItems);
      Checkbox("Save Overworld Properties",
-               &mutable_flags()->overworld.kSaveOverworldProperties);
+               &ExperimentFlags::get().overworld.kSaveOverworldProperties);
      Checkbox("Load Custom Overworld",
-               &mutable_flags()->overworld.kLoadCustomOverworld);
+               &ExperimentFlags::get().overworld.kLoadCustomOverworld);
      ImGui::EndMenu();
    }

    if (BeginMenu("Dungeon Flags")) {
      Checkbox("Draw Dungeon Room Graphics",
-               &mutable_flags()->kDrawDungeonRoomGraphics);
+               &ExperimentFlags::get().kDrawDungeonRoomGraphics);
      Separator();
-      Checkbox("Save Dungeon Maps", &mutable_flags()->kSaveDungeonMaps);
+      Checkbox("Save Dungeon Maps", &ExperimentFlags::get().kSaveDungeonMaps);
      ImGui::EndMenu();
    }

    Checkbox("Use built-in file dialog",
-             &mutable_flags()->kNewFileDialogWrapper);
-    Checkbox("Enable Console Logging", &mutable_flags()->kLogToConsole);
+             &ExperimentFlags::get().kNewFileDialogWrapper);
+    Checkbox("Enable Console Logging", &ExperimentFlags::get().kLogToConsole);
    Checkbox("Enable Texture Streaming",
-             &mutable_flags()->kLoadTexturesAsStreaming);
+             &ExperimentFlags::get().kLoadTexturesAsStreaming);
    Checkbox("Log Instructions to Debugger",
-             &mutable_flags()->kLogInstructions);
-    Checkbox("Save All Palettes", &mutable_flags()->kSaveAllPalettes);
-    Checkbox("Save Gfx Groups", &mutable_flags()->kSaveGfxGroups);
-    Checkbox("Save Graphics Sheets", &mutable_flags()->kSaveGraphicsSheet);
-    Checkbox("Use New ImGui Input", &mutable_flags()->kUseNewImGuiInput);
+             &ExperimentFlags::get().kLogInstructions);
+    Checkbox("Save All Palettes", &ExperimentFlags::get().kSaveAllPalettes);
+    Checkbox("Save Gfx Groups", &ExperimentFlags::get().kSaveGfxGroups);
+    Checkbox("Save Graphics Sheets",
+             &ExperimentFlags::get().kSaveGraphicsSheet);
  }
 };

 }  // namespace editor
-}  // namespace app
 }  // namespace yaze

 #endif  // YAZE_APP_EDITOR_UTILS_FLAGS_H_
--- a/src/app/editor/system/history_manager.h
+++ b/src/app/editor/system/history_manager.h
@@ -6,7 +6,6 @@
 #include <vector>

 namespace yaze {
-namespace app {
 namespace editor {

 // System history manager, undo and redo.
@@ -26,7 +25,6 @@ class HistoryManager {
 };

 }  // namespace editor
-}  // namespace app
 }  // namespace yaze

 #endif  // YAZE_APP_EDITOR_SYSTEM_HISTORY_MANAGER_H
--- a/src/app/editor/system/popup_manager.cc
+++ b/src/app/editor/system/popup_manager.cc
@@ -3,7 +3,6 @@
 #include "imgui/imgui.h"

 namespace yaze {
-namespace app {
 namespace editor {

 PopupManager::PopupManager() {
@@ -15,5 +14,5 @@ PopupManager::~PopupManager() {


 } // namespace editor
-} // namespace app
+
 } // namespace yaze
--- a/src/app/editor/system/popup_manager.h
+++ b/src/app/editor/system/popup_manager.h
@@ -2,7 +2,6 @@
 #define YAZE_APP_EDITOR_POPUP_MANAGER_H

 namespace yaze {
-namespace app {
 namespace editor {

 // ImGui popup manager.
@@ -15,7 +14,7 @@ class PopupManager {
 };

 } // namespace editor
-} // namespace app
+
 } // namespace yaze

 #endif // YAZE_APP_EDITOR_POPUP_MANAGER_H
--- a/src/app/editor/system/resource_manager.h
+++ b/src/app/editor/system/resource_manager.h
@@ -4,7 +4,6 @@
 #include <cstddef>

 namespace yaze {
-namespace app {
 namespace editor {

 // System resource manager.
@@ -24,7 +23,6 @@ class ResourceManager {
 };

 } // namespace editor
-} // namespace app
 } // namespace yaze

 #endif // YAZE_APP_EDITOR_SYSTEM_RESOURCE_MANAGER_H
--- a/src/app/editor/system/settings_editor.cc
+++ b/src/app/editor/system/settings_editor.cc
@@ -6,7 +6,6 @@
 #include "imgui/imgui.h"

 namespace yaze {
-namespace app {
 namespace editor {

 using ImGui::BeginChild;
@@ -79,5 +78,4 @@ absl::Status SettingsEditor::DrawKeyboardShortcuts() {
 }

 }  // namespace editor
-}  // namespace app
 }  // namespace yaze
--- a/src/app/editor/system/settings_editor.h
+++ b/src/app/editor/system/settings_editor.h
@@ -7,7 +7,6 @@
 #include "app/editor/editor.h"

 namespace yaze {
-namespace app {
 namespace editor {

 // Simple representation for a tree
@@ -226,7 +225,6 @@ class SettingsEditor : public Editor {
 };

 }  // namespace editor
-}  // namespace app
 }  // namespace yaze

 #endif  // YAZE_APP_EDITOR_SETTINGS_EDITOR_H_
--- a/src/app/emu/audio/apu.cc
+++ b/src/app/emu/audio/apu.cc
@@ -3,19 +3,14 @@
 #include <SDL.h>

 #include <cstdint>
-#include <functional>
-#include <iostream>
 #include <vector>

 #include "app/emu/audio/dsp.h"
 #include "app/emu/audio/spc700.h"
-#include "app/emu/cpu/clock.h"
 #include "app/emu/memory/memory.h"

 namespace yaze {
-namespace app {
 namespace emu {
-namespace audio {

 static const double apuCyclesPerMaster = (32040 * 32) / (1364 * 262 * 60.0);
 static const double apuCyclesPerMasterPal = (32040 * 32) / (1364 * 312 * 50.0);
@@ -201,7 +196,5 @@ void Apu::SpcWrite(uint16_t adr, uint8_t val) {

 void Apu::SpcIdle(bool waiting) { Cycle(); }

-}  // namespace audio
 }  // namespace emu
-}  // namespace app
-}  // namespace yaze
+}  // namespace yaze
--- a/src/app/emu/audio/apu.h
+++ b/src/app/emu/audio/apu.h
@@ -2,7 +2,6 @@
 #define YAZE_APP_EMU_APU_H_

 #include <cstdint>
-#include <iostream>
 #include <vector>
 #include <array>

@@ -11,11 +10,7 @@
 #include "app/emu/memory/memory.h"

 namespace yaze {
-namespace app {
 namespace emu {
-namespace audio {
-
-using namespace memory;

 typedef struct Timer {
  uint8_t cycles;
@@ -93,9 +88,7 @@ class Apu {
  Spc700 spc700_{callbacks_};
 };

-}  // namespace audio
 }  // namespace emu
-}  // namespace app
 }  // namespace yaze

-#endif
+#endif
--- a/src/app/emu/audio/dsp.cc
+++ b/src/app/emu/audio/dsp.cc
@@ -5,9 +5,7 @@
 #include "app/emu/memory/memory.h"

 namespace yaze {
-namespace app {
 namespace emu {
-namespace audio {

 static const int rateValues[32] = {0,   2048, 1536, 1280, 1024, 768, 640, 512,
                                   384, 320,  256,  192,  160,  128, 96,  80,
@@ -631,7 +629,5 @@ void Dsp::GetSamples(int16_t* sample_data, int samples_per_frame,
  }
 }

-}  // namespace audio
 }  // namespace emu
-}  // namespace app
-}  // namespace yaze
+}  // namespace yaze
--- a/src/app/emu/audio/dsp.h
+++ b/src/app/emu/audio/dsp.h
@@ -9,9 +9,7 @@
 #include "app/emu/memory/memory.h"

 namespace yaze {
-namespace app {
 namespace emu {
-namespace audio {

 typedef struct DspChannel {
  // pitch
@@ -155,9 +153,7 @@ class Dsp {
  uint32_t lastFrameBoundary;
 };

-}  // namespace audio
 }  // namespace emu
-}  // namespace app
 }  // namespace yaze

-#endif  // YAZE_APP_EMU_AUDIO_S_DSP_H
+#endif  // YAZE_APP_EMU_AUDIO_S_DSP_H
--- a/src/app/emu/audio/internal/addressing.cc
+++ b/src/app/emu/audio/internal/addressing.cc
@@ -1,9 +1,7 @@
 #include "app/emu/audio/spc700.h"

 namespace yaze {
-namespace app {
 namespace emu {
-namespace audio {

 // adressing modes

@@ -146,7 +144,5 @@ uint16_t Spc700::addr_plus_i_indexed() {
  return read(addr) | (read(addr + 1) << 8);
 }

-}  // namespace audio
 }  // namespace emu
-}  // namespace app
-}  // namespace yaze
+}  // namespace yaze
--- a/src/app/emu/audio/internal/instructions.cc
+++ b/src/app/emu/audio/internal/instructions.cc
@@ -1,9 +1,7 @@
 #include "app/emu/audio/spc700.h"

 namespace yaze {
-namespace app {
 namespace emu {
-namespace audio {

 // opcode functions

@@ -481,7 +479,5 @@ void Spc700::SLEEP() {}

 void Spc700::STOP() {}

-}  // namespace audio
 }  // namespace emu
-}  // namespace app
-}  // namespace yaze
+}  // namespace yaze
--- a/src/app/emu/audio/spc700.cc
+++ b/src/app/emu/audio/spc700.cc
@@ -4,14 +4,11 @@
 #include <iostream>
 #include <sstream>
 #include <string>
-#include <vector>

 #include "app/emu/audio/internal/opcodes.h"

 namespace yaze {
-namespace app {
 namespace emu {
-namespace audio {

 void Spc700::Reset(bool hard) {
  if (hard) {
@@ -1324,7 +1321,5 @@ void Spc700::LogInstruction(uint16_t initial_pc, uint8_t opcode) {
  // log_.push_back(log_entry);
 }

-}  // namespace audio
 }  // namespace emu
-}  // namespace app
 }  // namespace yaze
--- a/src/app/emu/audio/spc700.h
+++ b/src/app/emu/audio/spc700.h
@@ -3,14 +3,11 @@

 #include <cstdint>
 #include <functional>
-#include <iostream>
-#include <unordered_map>
 #include <vector>
+#include <string>

 namespace yaze {
-namespace app {
 namespace emu {
-namespace audio {

 /**
 * @brief AudioRam is an interface for the Audio RAM used by the SPC700.
@@ -337,8 +334,7 @@ class Spc700 {
  // CBNE DBNZ
 };

-}  // namespace audio
 }  // namespace emu
-}  // namespace app
 }  // namespace yaze
-#endif  // YAZE_APP_EMU_SPC700_H
+
+#endif  // YAZE_APP_EMU_SPC700_H
--- a/src/app/emu/cpu/clock.h
+++ b/src/app/emu/cpu/clock.h
@@ -4,11 +4,10 @@
 #include <cstdint>

 namespace yaze {
-namespace app {
 namespace emu {

 class Clock {
- public:
+public:
  virtual ~Clock() = default;
  virtual void UpdateClock(double delta) = 0;
  virtual unsigned long long GetCycleCount() const = 0;
@@ -18,23 +17,23 @@ class Clock {
 };

 class ClockImpl : public Clock {
- public:
+public:
  ClockImpl() = default;
  virtual ~ClockImpl() = default;

-  void UpdateCycleCount(double deltaTime) {
-    accumulatedTime += deltaTime;
-    double cycleTime = 1.0 / frequency;
+  void UpdateCycleCount(double delta_time) {
+    accumulated_time += delta_time;
+    double cycle_time = 1.0 / frequency;

-    while (accumulatedTime >= cycleTime) {
+    while (accumulated_time >= cycle_time) {
      Cycle();
-      accumulatedTime -= cycleTime;
+      accumulated_time -= cycle_time;
    }
  }

  void Cycle() {
    cycle++;
-    cycleCount++;
+    cycle_count++;
  }

  void UpdateClock(double delta) override {
@@ -42,22 +41,21 @@ class ClockImpl : public Clock {
    ResetAccumulatedTime();
  }

-  void ResetAccumulatedTime() override { accumulatedTime = 0.0; }
-  unsigned long long GetCycleCount() const override { return cycleCount; }
+  void ResetAccumulatedTime() override { accumulated_time = 0.0; }
+  unsigned long long GetCycleCount() const override { return cycle_count; }
  float GetFrequency() const override { return frequency; }
  void SetFrequency(float new_frequency) override {
    this->frequency = new_frequency;
  }

- private:
+private:
  uint64_t cycle = 0;                 // Current cycle
  float frequency = 0.0;              // Frequency of the clock in Hz
-  unsigned long long cycleCount = 0;  // Total number of cycles executed
-  double accumulatedTime = 0.0;  // Accumulated time since the last cycle update
+  unsigned long long cycle_count = 0; // Total number of cycles executed
+  double accumulated_time = 0.0; // Accumulated time since the last cycle update
 };

-}  // namespace emu
-}  // namespace app
-}  // namespace yaze
+} // namespace emu
+} // namespace yaze

-#endif  // YAZE_APP_EMU_CLOCK_H_
+#endif // YAZE_APP_EMU_CLOCK_H_
--- a/src/app/emu/cpu/cpu.cc
+++ b/src/app/emu/cpu/cpu.cc
@@ -9,7 +9,6 @@
 #include "app/emu/cpu/internal/opcodes.h"

 namespace yaze {
-namespace app {
 namespace emu {

 void Cpu::Reset(bool hard) {
@@ -1804,7 +1803,7 @@ void Cpu::ExecuteInstruction(uint8_t opcode) {

 void Cpu::LogInstructions(uint16_t PC, uint8_t opcode, uint16_t operand,
                          bool immediate, bool accumulator_mode) {
-  if (flags()->kLogInstructions) {
+  if (core::ExperimentFlags::get().kLogInstructions) {
    std::ostringstream oss;
    oss << "$" << std::uppercase << std::setw(2) << std::setfill('0')
        << static_cast<int>(PB) << ":" << std::hex << PC << ": 0x"
@@ -2260,5 +2259,4 @@ uint8_t Cpu::GetInstructionLength(uint8_t opcode) {
 */

 }  // namespace emu
-}  // namespace app
-}  // namespace yaze
+}  // namespace yaze
--- a/src/app/emu/cpu/cpu.h
+++ b/src/app/emu/cpu/cpu.h
@@ -13,7 +13,6 @@
 #include "app/emu/memory/memory.h"

 namespace yaze {
-namespace app {
 namespace emu {

 class InstructionEntry {
@@ -35,10 +34,9 @@ class InstructionEntry {
  std::string instruction;  // Human-readable instruction text
 };

-class Cpu : public core::ExperimentFlags {
+class Cpu {
 public:
-  explicit Cpu(memory::Memory& mem, Clock& vclock,
-               memory::CpuCallbacks& callbacks)
+  explicit Cpu(Memory& mem, Clock& vclock, CpuCallbacks& callbacks)
      : memory(mem), clock(vclock), callbacks_(callbacks) {}
  void Reset(bool hard = false);

@@ -793,13 +791,13 @@ class Cpu : public core::ExperimentFlags {
  bool int_wanted_ = false;
  bool int_delay_ = false;

-  memory::CpuCallbacks callbacks_;
-  memory::Memory& memory;
+  CpuCallbacks callbacks_;
+  Memory& memory;
  Clock& clock;
 };

 }  // namespace emu
-}  // namespace app
+
 }  // namespace yaze

 #endif  // YAZE_APP_EMU_CPU_H_
--- a/src/app/emu/cpu/internal/addressing.cc
+++ b/src/app/emu/cpu/internal/addressing.cc
@@ -1,7 +1,6 @@
 #include "app/emu/cpu/cpu.h"

 namespace yaze {
-namespace app {
 namespace emu {

 void Cpu::AdrImp() {
@@ -186,5 +185,5 @@ uint16_t Cpu::StackRelative() {
 }

 }  // namespace emu
-}  // namespace app
+
 }  // namespace yaze
--- a/src/app/emu/cpu/internal/instructions.cc
+++ b/src/app/emu/cpu/internal/instructions.cc
@@ -5,7 +5,6 @@
 #include "app/emu/cpu/cpu.h"

 namespace yaze {
-namespace app {
 namespace emu {

 /**
@@ -398,5 +397,5 @@ void Cpu::ORA(uint32_t low, uint32_t high) {
 }

 }  // namespace emu
-}  // namespace app
+
 }  // namespace yaze
--- a/src/app/emu/emu.cc
+++ b/src/app/emu/emu.cc
@@ -1,6 +1,4 @@
-#if defined(_WIN32)
-#define main SDL_main
-#elif __APPLE__
+#if __APPLE__
 #include "app/core/platform/app_delegate.h"
 #endif

@@ -10,25 +8,14 @@
 #include <string>
 #include <vector>

-#include "absl/base/internal/raw_logging.h"
-#include "absl/base/macros.h"
-#include "absl/container/flat_hash_map.h"
 #include "absl/debugging/failure_signal_handler.h"
-#include "absl/debugging/leak_check.h"
-#include "absl/debugging/stacktrace.h"
 #include "absl/debugging/symbolize.h"
-#include "absl/flags/flag.h"
 #include "absl/status/status.h"
-#include "absl/status/statusor.h"
-#include "absl/strings/str_format.h"
 #include "app/core/utils/sdl_deleter.h"
 #include "app/emu/snes.h"
 #include "app/rom.h"
-#include "imgui/imgui.h"
-#include "imgui_memory_editor.h"

-using namespace yaze::app;
-using yaze::app::core::SDL_Deleter;
+using yaze::core::SDL_Deleter;

 int main(int argc, char **argv) {
  absl::InitializeSymbolizer(argv[0]);
@@ -38,6 +25,8 @@ int main(int argc, char **argv) {
  options.alarm_on_failure_secs = true;
  absl::InstallFailureSignalHandler(options);

+  SDL_SetMainReady();
+
  std::unique_ptr<SDL_Window, SDL_Deleter> window_;
  std::unique_ptr<SDL_Renderer, SDL_Deleter> renderer_;
  if (SDL_Init(SDL_INIT_EVERYTHING) != 0) {
@@ -96,8 +85,8 @@ int main(int argc, char **argv) {
    return EXIT_FAILURE;
  }

-  Rom rom_;
-  emu::SNES snes_;
+  yaze::Rom rom_;
+  yaze::emu::Snes snes_;
  std::vector<uint8_t> rom_data_;

  bool running = true;
@@ -191,10 +180,10 @@ int main(int argc, char **argv) {

  SDL_PauseAudioDevice(audio_device_, 1);
  SDL_CloseAudioDevice(audio_device_);
-  delete audio_buffer_;
-  // ImGui_ImplSDLRenderer2_Shutdown();
-  // ImGui_ImplSDL2_Shutdown();
-  // ImGui::DestroyContext();
+  delete[] audio_buffer_;
+  //ImGui_ImplSDLRenderer2_Shutdown();
+  //ImGui_ImplSDL2_Shutdown();
+  //ImGui::DestroyContext();
  SDL_Quit();

  return EXIT_SUCCESS;
--- a/Show More
+++ b/Show More