diff --git a/src/app/core/common.cc b/src/app/core/common.cc
index 47d8a916..d751994d 100644
--- a/src/app/core/common.cc
+++ b/src/app/core/common.cc
@@ -1,6 +1,6 @@
 #include "common.h"
 
-#include <imgui/imgui.h>
+#include "imgui/imgui.h"
 
 #include <chrono>
 #include <cstdint>
@@ -174,13 +174,12 @@ uint16_t ldle16b_i(uint8_t const *const p_arr, size_t const p_index) {
 // Initialize the static member
 std::stack<ImGuiID> ImGuiIdIssuer::idStack;
 
-int Get24LocalFromPC(uint8_t *data, int addr, bool pc) {
-  int ret = (PcToSnes(addr) & 0xFF0000) | (data[addr + 1] << 8) | data[addr];
+uint32_t Get24LocalFromPC(uint8_t *data, int addr, bool pc) {
+  uint32_t ret = (PcToSnes(addr) & 0xFF0000) | (data[addr + 1] << 8) | data[addr];
   if (pc) {
     return SnesToPc(ret);
-  } else {
-    return ret;
   }
+  return ret;
 }
 
 }  // namespace core
diff --git a/src/app/core/common.h b/src/app/core/common.h
index f14e2093..0fd56f7b 100644
--- a/src/app/core/common.h
+++ b/src/app/core/common.h
@@ -1,7 +1,7 @@
 #ifndef YAZE_CORE_COMMON_H
 #define YAZE_CORE_COMMON_H
 
-#include <imgui/imgui.h>
+#include "imgui/imgui.h"
 
 #include <chrono>
 #include <cstdint>
@@ -187,6 +187,11 @@ class Logger {
     static std::ofstream fout("log.txt", std::ios::out | std::ios::app);
     fout << message << std::endl;
   }
+
+  // log to console
+  static void logc(std::string message) { logs.emplace_back(message); }
+
+  static std::vector<std::string> logs;
 };
 
 std::string UppercaseHexByte(uint8_t byte, bool leading = false);
@@ -220,10 +225,10 @@ struct FolderItem {
 
 typedef struct FolderItem FolderItem;
 
-int Get24LocalFromPC(uint8_t *data, int addr, bool pc = true);
+uint32_t Get24LocalFromPC(uint8_t *data, int addr, bool pc = true);
 
 }  // namespace core
 }  // namespace app
 }  // namespace yaze
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/app/core/controller.cc b/src/app/core/controller.cc
index 6511b6f2..b8a91eb5 100644
--- a/src/app/core/controller.cc
+++ b/src/app/core/controller.cc
@@ -1,10 +1,10 @@
 #include "controller.h"
 
 #include <SDL.h>
-#include <imgui/backends/imgui_impl_sdl2.h>
-#include <imgui/backends/imgui_impl_sdlrenderer2.h>
-#include <imgui/imgui.h>
-#include <imgui/imgui_internal.h>
+#include "imgui/backends/imgui_impl_sdl2.h"
+#include "imgui/backends/imgui_impl_sdlrenderer2.h"
+#include "imgui/imgui.h"
+#include "imgui/imgui_internal.h"
 #include <imgui_test_engine/imgui_te_context.h>
 
 #include <memory>
diff --git a/src/app/core/controller.h b/src/app/core/controller.h
index 6ddb2f98..af42c229 100644
--- a/src/app/core/controller.h
+++ b/src/app/core/controller.h
@@ -2,11 +2,11 @@
 #define YAZE_APP_CORE_CONTROLLER_H
 
 #include <SDL.h>
-#include <imgui/backends/imgui_impl_sdl2.h>
-#include <imgui/backends/imgui_impl_sdlrenderer2.h>
-#include <imgui/imconfig.h>
-#include <imgui/imgui.h>
-#include <imgui/imgui_internal.h>
+#include "imgui/backends/imgui_impl_sdl2.h"
+#include "imgui/backends/imgui_impl_sdlrenderer2.h"
+#include "imgui/imconfig.h"
+#include "imgui/imgui.h"
+#include "imgui/imgui_internal.h"
 
 #include <memory>
 
diff --git a/src/app/core/labeling.cc b/src/app/core/labeling.cc
index 34ede935..db464091 100644
--- a/src/app/core/labeling.cc
+++ b/src/app/core/labeling.cc
@@ -1,7 +1,7 @@
 #include "app/core/labeling.h"
 
-#include <imgui/imgui.h>
-#include <imgui/misc/cpp/imgui_stdlib.h>
+#include "imgui/imgui.h"
+#include "imgui/misc/cpp/imgui_stdlib.h"
 
 #include <cstdint>
 #include <fstream>
diff --git a/src/app/core/project.h b/src/app/core/project.h
index fbf8d0f1..113716f3 100644
--- a/src/app/core/project.h
+++ b/src/app/core/project.h
@@ -1,7 +1,7 @@
 #ifndef YAZE_APP_CORE_PROJECT_H
 #define YAZE_APP_CORE_PROJECT_H
 
-#include <abseil-cpp/absl/strings/match.h>
+#include "absl/strings/match.h"
 
 #include <fstream>
 #include <string>
@@ -135,4 +135,4 @@ struct Project : public core::ExperimentFlags {
 }  // namespace app
 }  // namespace yaze
 
-#endif  // YAZE_APP_CORE_PROJECT_H
\ No newline at end of file
+#endif  // YAZE_APP_CORE_PROJECT_H
diff --git a/src/app/editor/code/assembly_editor.cc b/src/app/editor/code/assembly_editor.cc
index d31711b9..2f783b8e 100644
--- a/src/app/editor/code/assembly_editor.cc
+++ b/src/app/editor/code/assembly_editor.cc
@@ -1,6 +1,6 @@
 #include "assembly_editor.h"
 
-#include <ImGuiColorTextEdit/TextEditor.h>
+#include "ImGuiColorTextEdit/TextEditor.h"
 
 #include "app/core/platform/file_dialog.h"
 #include "app/gui/icons.h"
@@ -364,4 +364,4 @@ absl::Status AssemblyEditor::Update() { return absl::OkStatus(); }
 
 }  // namespace editor
 }  // namespace app
-}  // namespace yaze
\ No newline at end of file
+}  // namespace yaze
diff --git a/src/app/editor/code/assembly_editor.h b/src/app/editor/code/assembly_editor.h
index e722ce1a..35022c99 100644
--- a/src/app/editor/code/assembly_editor.h
+++ b/src/app/editor/code/assembly_editor.h
@@ -1,8 +1,8 @@
 #ifndef YAZE_APP_EDITOR_ASSEMBLY_EDITOR_H
 #define YAZE_APP_EDITOR_ASSEMBLY_EDITOR_H
 
-#include <ImGuiColorTextEdit/TextEditor.h>
-#include <ImGuiFileDialog/ImGuiFileDialog.h>
+#include "ImGuiColorTextEdit/TextEditor.h"
+#include "ImGuiFileDialog/ImGuiFileDialog.h"
 
 #include <fstream>
 #include <istream>
@@ -76,4 +76,4 @@ class AssemblyEditor : public Editor {
 }  // namespace app
 }  // namespace yaze
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/app/editor/code/memory_editor.h b/src/app/editor/code/memory_editor.h
index f87fb0fd..7b49cbea 100644
--- a/src/app/editor/code/memory_editor.h
+++ b/src/app/editor/code/memory_editor.h
@@ -1,9 +1,9 @@
 #ifndef YAZE_APP_EDITOR_CODE_MEMORY_EDITOR_H
 #define YAZE_APP_EDITOR_CODE_MEMORY_EDITOR_H
 
-#include <imgui/imgui.h>
-#include <imgui/misc/cpp/imgui_stdlib.h>
-#include <imgui_memory_editor.h>
+#include "imgui/imgui.h"
+#include "imgui/misc/cpp/imgui_stdlib.h"
+#include "imgui_memory_editor.h"
 
 #include "absl/status/status.h"
 #include "app/core/common.h"
@@ -85,4 +85,4 @@ struct MemoryEditorWithDiffChecker : public SharedRom {
 }  // namespace app
 }  // namespace yaze
 
-#endif  // YAZE_APP_EDITOR_CODE_MEMORY_EDITOR_H
\ No newline at end of file
+#endif  // YAZE_APP_EDITOR_CODE_MEMORY_EDITOR_H
diff --git a/src/app/editor/dungeon/dungeon_editor.cc b/src/app/editor/dungeon/dungeon_editor.cc
index ccfcc44b..c23e5d47 100644
--- a/src/app/editor/dungeon/dungeon_editor.cc
+++ b/src/app/editor/dungeon/dungeon_editor.cc
@@ -1,6 +1,6 @@
 #include "dungeon_editor.h"
 
-#include <imgui/imgui.h>
+#include "imgui/imgui.h"
 
 #include "app/core/common.h"
 #include "app/core/labeling.h"
diff --git a/src/app/editor/dungeon/dungeon_editor.h b/src/app/editor/dungeon/dungeon_editor.h
index 6930bb53..fdf52529 100644
--- a/src/app/editor/dungeon/dungeon_editor.h
+++ b/src/app/editor/dungeon/dungeon_editor.h
@@ -1,7 +1,7 @@
 #ifndef YAZE_APP_EDITOR_DUNGEONEDITOR_H
 #define YAZE_APP_EDITOR_DUNGEONEDITOR_H
 
-#include <imgui/imgui.h>
+#include "imgui/imgui.h"
 
 #include "app/core/common.h"
 #include "app/core/labeling.h"
diff --git a/src/app/editor/graphics/gfx_group_editor.cc b/src/app/editor/graphics/gfx_group_editor.cc
index 49e856e5..c5905cf2 100644
--- a/src/app/editor/graphics/gfx_group_editor.cc
+++ b/src/app/editor/graphics/gfx_group_editor.cc
@@ -1,6 +1,6 @@
 #include "gfx_group_editor.h"
 
-#include <imgui/imgui.h>
+#include "imgui/imgui.h"
 
 #include <cmath>
 
diff --git a/src/app/editor/graphics/gfx_group_editor.h b/src/app/editor/graphics/gfx_group_editor.h
index fe7391f4..fb4d8d40 100644
--- a/src/app/editor/graphics/gfx_group_editor.h
+++ b/src/app/editor/graphics/gfx_group_editor.h
@@ -1,7 +1,7 @@
 #ifndef YAZE_APP_EDITOR_GFX_GROUP_EDITOR_H
 #define YAZE_APP_EDITOR_GFX_GROUP_EDITOR_H
 
-#include <imgui/imgui.h>
+#include "imgui/imgui.h"
 
 #include <cmath>
 
diff --git a/src/app/editor/graphics/graphics_editor.cc b/src/app/editor/graphics/graphics_editor.cc
index 474b871f..fe238599 100644
--- a/src/app/editor/graphics/graphics_editor.cc
+++ b/src/app/editor/graphics/graphics_editor.cc
@@ -1,9 +1,9 @@
 #include "graphics_editor.h"
 
-#include <ImGuiFileDialog/ImGuiFileDialog.h>
-#include <imgui/imgui.h>
-#include <imgui/misc/cpp/imgui_stdlib.h>
-#include <imgui_memory_editor.h>
+#include "ImGuiFileDialog/ImGuiFileDialog.h"
+#include "imgui/imgui.h"
+#include "imgui/misc/cpp/imgui_stdlib.h"
+#include "imgui_memory_editor.h"
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
@@ -841,4 +841,4 @@ absl::Status GraphicsEditor::DecompressSuperDonkey() {
 
 }  // namespace editor
 }  // namespace app
-}  // namespace yaze
\ No newline at end of file
+}  // namespace yaze
diff --git a/src/app/editor/graphics/graphics_editor.h b/src/app/editor/graphics/graphics_editor.h
index 526cd03b..99974792 100644
--- a/src/app/editor/graphics/graphics_editor.h
+++ b/src/app/editor/graphics/graphics_editor.h
@@ -1,10 +1,10 @@
 #ifndef YAZE_APP_EDITOR_GRAPHICS_EDITOR_H
 #define YAZE_APP_EDITOR_GRAPHICS_EDITOR_H
 
-#include <ImGuiFileDialog/ImGuiFileDialog.h>
-#include <imgui/imgui.h>
-#include <imgui/misc/cpp/imgui_stdlib.h>
-#include <imgui_memory_editor.h>
+#include "ImGuiFileDialog/ImGuiFileDialog.h"
+#include "imgui/imgui.h"
+#include "imgui/misc/cpp/imgui_stdlib.h"
+#include "imgui_memory_editor.h"
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
@@ -202,4 +202,4 @@ class GraphicsEditor : public SharedRom, public Editor {
 }  // namespace app
 }  // namespace yaze
 
-#endif  // YAZE_APP_EDITOR_GRAPHICS_EDITOR_H
\ No newline at end of file
+#endif  // YAZE_APP_EDITOR_GRAPHICS_EDITOR_H
diff --git a/src/app/editor/graphics/palette_editor.cc b/src/app/editor/graphics/palette_editor.cc
index 1dbfd4b3..8f3a315f 100644
--- a/src/app/editor/graphics/palette_editor.cc
+++ b/src/app/editor/graphics/palette_editor.cc
@@ -1,6 +1,6 @@
 #include "palette_editor.h"
 
-#include <imgui/imgui.h>
+#include "imgui/imgui.h"
 
 #include "absl/status/status.h"
 #include "app/gfx/snes_palette.h"
diff --git a/src/app/editor/graphics/palette_editor.h b/src/app/editor/graphics/palette_editor.h
index 8763a336..9ee54cb8 100644
--- a/src/app/editor/graphics/palette_editor.h
+++ b/src/app/editor/graphics/palette_editor.h
@@ -1,7 +1,7 @@
 #ifndef YAZE_APP_EDITOR_PALETTE_EDITOR_H
 #define YAZE_APP_EDITOR_PALETTE_EDITOR_H
 
-#include <imgui/imgui.h>
+#include "imgui/imgui.h"
 
 #include "absl/status/status.h"
 #include "app/editor/graphics/gfx_group_editor.h"
diff --git a/src/app/editor/graphics/screen_editor.cc b/src/app/editor/graphics/screen_editor.cc
index 17899da7..9680d968 100644
--- a/src/app/editor/graphics/screen_editor.cc
+++ b/src/app/editor/graphics/screen_editor.cc
@@ -1,6 +1,6 @@
 #include "screen_editor.h"
 
-#include <imgui/imgui.h>
+#include "imgui/imgui.h"
 
 #include <algorithm>
 #include <fstream>
@@ -434,4 +434,4 @@ void ScreenEditor::DrawToolset() {
 
 }  // namespace editor
 }  // namespace app
-}  // namespace yaze
\ No newline at end of file
+}  // namespace yaze
diff --git a/src/app/editor/graphics/screen_editor.h b/src/app/editor/graphics/screen_editor.h
index 35fe8846..9faddd0c 100644
--- a/src/app/editor/graphics/screen_editor.h
+++ b/src/app/editor/graphics/screen_editor.h
@@ -1,7 +1,7 @@
 #ifndef YAZE_APP_EDITOR_SCREEN_EDITOR_H
 #define YAZE_APP_EDITOR_SCREEN_EDITOR_H
 
-#include <imgui/imgui.h>
+#include "imgui/imgui.h"
 
 #include <array>
 
@@ -103,4 +103,4 @@ class ScreenEditor : public SharedRom, public Editor {
 }  // namespace app
 }  // namespace yaze
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/app/editor/graphics/tile16_editor.cc b/src/app/editor/graphics/tile16_editor.cc
index d1b3fa85..dc52f8ac 100644
--- a/src/app/editor/graphics/tile16_editor.cc
+++ b/src/app/editor/graphics/tile16_editor.cc
@@ -1,7 +1,7 @@
 #include "tile16_editor.h"
 
-#include <ImGuiFileDialog/ImGuiFileDialog.h>
-#include <imgui/imgui.h>
+#include "ImGuiFileDialog/ImGuiFileDialog.h"
+#include "imgui/imgui.h"
 
 #include <cmath>
 
@@ -397,4 +397,4 @@ absl::Status Tile16Editor::SetCurrentTile(int id) {
 
 }  // namespace editor
 }  // namespace app
-}  // namespace yaze
\ No newline at end of file
+}  // namespace yaze
diff --git a/src/app/editor/graphics/tile16_editor.h b/src/app/editor/graphics/tile16_editor.h
index 1ef728d2..d3eaaec3 100644
--- a/src/app/editor/graphics/tile16_editor.h
+++ b/src/app/editor/graphics/tile16_editor.h
@@ -1,7 +1,7 @@
 #ifndef YAZE_APP_EDITOR_TILE16EDITOR_H
 #define YAZE_APP_EDITOR_TILE16EDITOR_H
 
-#include <imgui/imgui.h>
+#include "imgui/imgui.h"
 
 #include <cmath>
 
diff --git a/src/app/editor/music/music_editor.cc b/src/app/editor/music/music_editor.cc
index 479bf3d9..47001c94 100644
--- a/src/app/editor/music/music_editor.cc
+++ b/src/app/editor/music/music_editor.cc
@@ -1,6 +1,6 @@
 #include "music_editor.h"
 
-#include <imgui/imgui.h>
+#include "imgui/imgui.h"
 
 #include "absl/strings/str_format.h"
 #include "app/editor/code/assembly_editor.h"
diff --git a/src/app/editor/music/music_editor.h b/src/app/editor/music/music_editor.h
index c95a2b63..64cf360a 100644
--- a/src/app/editor/music/music_editor.h
+++ b/src/app/editor/music/music_editor.h
@@ -1,7 +1,7 @@
 #ifndef YAZE_APP_EDITOR_MUSIC_EDITOR_H
 #define YAZE_APP_EDITOR_MUSIC_EDITOR_H
 
-#include <imgui/imgui.h>
+#include "imgui/imgui.h"
 
 #include "absl/strings/str_format.h"
 #include "app/editor/code/assembly_editor.h"
diff --git a/src/app/editor/overworld/entity.h b/src/app/editor/overworld/entity.h
index 8e151cc3..3697972a 100644
--- a/src/app/editor/overworld/entity.h
+++ b/src/app/editor/overworld/entity.h
@@ -1,7 +1,7 @@
 #ifndef YAZE_APP_EDITOR_OVERWORLD_ENTITY_H
 #define YAZE_APP_EDITOR_OVERWORLD_ENTITY_H
 
-#include <imgui/imgui.h>
+#include "imgui/imgui.h"
 
 #include "app/editor/overworld_editor.h"
 #include "app/zelda3/common.h"
diff --git a/src/app/editor/overworld_editor.cc b/src/app/editor/overworld_editor.cc
index bfb21f31..64871849 100644
--- a/src/app/editor/overworld_editor.cc
+++ b/src/app/editor/overworld_editor.cc
@@ -1,7 +1,7 @@
 #include "overworld_editor.h"
 
-#include <ImGuiFileDialog/ImGuiFileDialog.h>
-#include <imgui/imgui.h>
+#include "ImGuiFileDialog/ImGuiFileDialog.h"
+#include "imgui/imgui.h"
 
 #include <cmath>
 #include <unordered_map>
@@ -1362,4 +1362,4 @@ void OverworldEditor::DrawDebugWindow() {
 
 }  // namespace editor
 }  // namespace app
-}  // namespace yaze
\ No newline at end of file
+}  // namespace yaze
diff --git a/src/app/editor/overworld_editor.h b/src/app/editor/overworld_editor.h
index 7d47b420..bd45c76e 100644
--- a/src/app/editor/overworld_editor.h
+++ b/src/app/editor/overworld_editor.h
@@ -1,7 +1,7 @@
 #ifndef YAZE_APP_EDITOR_OVERWORLDEDITOR_H
 #define YAZE_APP_EDITOR_OVERWORLDEDITOR_H
 
-#include <imgui/imgui.h>
+#include "imgui/imgui.h"
 
 #include <cmath>
 #include <unordered_map>
diff --git a/src/app/editor/settings_editor.cc b/src/app/editor/settings_editor.cc
index 762e49cb..3539419a 100644
--- a/src/app/editor/settings_editor.cc
+++ b/src/app/editor/settings_editor.cc
@@ -1,5 +1,5 @@
 
-#include <imgui/imgui.h>
+#include "imgui/imgui.h"
 
 #include "absl/status/status.h"
 #include "app/editor/utils/flags.h"
diff --git a/src/app/editor/settings_editor.h b/src/app/editor/settings_editor.h
index 2d51b5e3..32c6e382 100644
--- a/src/app/editor/settings_editor.h
+++ b/src/app/editor/settings_editor.h
@@ -1,7 +1,7 @@
 #ifndef YAZE_APP_EDITOR_SETTINGS_EDITOR_H
 #define YAZE_APP_EDITOR_SETTINGS_EDITOR_H
 
-#include <imgui/imgui.h>
+#include "imgui/imgui.h"
 
 #include "absl/status/status.h"
 #include "app/editor/utils/editor.h"
@@ -229,4 +229,4 @@ class SettingsEditor : public Editor {
 }  // namespace app
 }  // namespace yaze
 
-#endif  // YAZE_APP_EDITOR_SETTINGS_EDITOR_H_
\ No newline at end of file
+#endif  // YAZE_APP_EDITOR_SETTINGS_EDITOR_H_
diff --git a/src/app/editor/sprite/zsprite.h b/src/app/editor/sprite/zsprite.h
index 1408469c..19717403 100644
--- a/src/app/editor/sprite/zsprite.h
+++ b/src/app/editor/sprite/zsprite.h
@@ -1,7 +1,7 @@
 #ifndef YAZE_APP_EDITOR_SPRITE_ZSPRITE_H
 #define YAZE_APP_EDITOR_SPRITE_ZSPRITE_H
 
-#include <imgui/imgui.h>
+#include "imgui/imgui.h"
 
 #include <algorithm>
 #include <cstdint>
diff --git a/src/app/editor/utils/flags.h b/src/app/editor/utils/flags.h
index 4608f953..bde5bc19 100644
--- a/src/app/editor/utils/flags.h
+++ b/src/app/editor/utils/flags.h
@@ -1,7 +1,7 @@
 #ifndef YAZE_APP_EDITOR_UTILS_FLAGS_H
 #define YAZE_APP_EDITOR_UTILS_FLAGS_H
 
-#include <imgui/imgui.h>
+#include "imgui/imgui.h"
 
 #include "core/common.h"
 
diff --git a/src/app/editor/utils/gfx_context.cc b/src/app/editor/utils/gfx_context.cc
index 849093d9..8d829552 100644
--- a/src/app/editor/utils/gfx_context.cc
+++ b/src/app/editor/utils/gfx_context.cc
@@ -1,6 +1,6 @@
 #include "app/editor/utils/gfx_context.h"
 
-#include <imgui/imgui.h>
+#include "imgui/imgui.h"
 
 #include <cmath>
 
diff --git a/src/app/editor/utils/gfx_context.h b/src/app/editor/utils/gfx_context.h
index 5afd90ef..d3f8992e 100644
--- a/src/app/editor/utils/gfx_context.h
+++ b/src/app/editor/utils/gfx_context.h
@@ -1,7 +1,7 @@
 #ifndef YAZE_APP_EDITOR_VRAM_CONTEXT_H
 #define YAZE_APP_EDITOR_VRAM_CONTEXT_H
 
-#include <imgui/imgui.h>
+#include "imgui/imgui.h"
 
 #include <cmath>
 #include <vector>
diff --git a/src/app/editor/utils/keyboard_shortcuts.h b/src/app/editor/utils/keyboard_shortcuts.h
index 5fb4ab64..bb70ccf7 100644
--- a/src/app/editor/utils/keyboard_shortcuts.h
+++ b/src/app/editor/utils/keyboard_shortcuts.h
@@ -1,7 +1,7 @@
 #ifndef YAZE_APP_EDITOR_UTILS_KEYBOARD_SHORTCUTS_H
 #define YAZE_APP_EDITOR_UTILS_KEYBOARD_SHORTCUTS_H
 
-#include <imgui/imgui.h>
+#include "imgui/imgui.h"
 
 namespace yaze {
 namespace app {
@@ -22,4 +22,4 @@ struct KeyboardShortcuts {
 }  // namespace app
 }  // namespace yaze
 
-#endif  // YAZE_APP_EDITOR_UTILS_KEYBOARD_SHORTCUTS_H_
\ No newline at end of file
+#endif  // YAZE_APP_EDITOR_UTILS_KEYBOARD_SHORTCUTS_H_
diff --git a/src/app/emu/debug/emu.cc b/src/app/emu/debug/emu.cc
index 290c80a1..888ca42d 100644
--- a/src/app/emu/debug/emu.cc
+++ b/src/app/emu/debug/emu.cc
@@ -5,12 +5,10 @@
 #endif
 
 #include <SDL.h>
-#include <absl/status/status.h>
-#include <absl/strings/str_format.h>
-#include <failure_signal_handler.h>
-#include <imgui/imgui.h>
-#include <imgui_memory_editor.h>
-#include <rom.h>
+#include "absl/status/status.h"
+#include "absl/strings/str_format.h"
+#include "imgui/imgui.h"
+#include "imgui_memory_editor.h"
 
 #include <memory>
 #include <string>
@@ -214,4 +212,4 @@ int main(int argc, char **argv) {
   SDL_Quit();
 
   return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
diff --git a/src/app/emu/emulator.cc b/src/app/emu/emulator.cc
index 773fcd46..4373642b 100644
--- a/src/app/emu/emulator.cc
+++ b/src/app/emu/emulator.cc
@@ -1,7 +1,7 @@
 #include "app/emu/emulator.h"
 
-#include <imgui/imgui.h>
-#include <imgui_memory_editor.h>
+#include "imgui/imgui.h"
+#include "imgui_memory_editor.h"
 
 #include <cstdint>
 #include <vector>
diff --git a/src/app/emu/emulator.h b/src/app/emu/emulator.h
index 879ca38b..8255109e 100644
--- a/src/app/emu/emulator.h
+++ b/src/app/emu/emulator.h
@@ -1,7 +1,7 @@
 #ifndef YAZE_APP_CORE_EMULATOR_H
 #define YAZE_APP_CORE_EMULATOR_H
 
-#include <imgui/imgui.h>
+#include "imgui/imgui.h"
 
 #include <cstdint>
 #include <vector>
diff --git a/src/app/emu/memory/memory.cc b/src/app/emu/memory/memory.cc
index 7d1d458d..56c1231f 100644
--- a/src/app/emu/memory/memory.cc
+++ b/src/app/emu/memory/memory.cc
@@ -1,6 +1,6 @@
 #include "app/emu/memory/memory.h"
 
-#include <imgui/imgui.h>
+#include "imgui/imgui.h"
 
 #include <cstdint>
 #include <iostream>
diff --git a/src/app/gfx/snes_color.cc b/src/app/gfx/snes_color.cc
index d822bb4d..f2dfb239 100644
--- a/src/app/gfx/snes_color.cc
+++ b/src/app/gfx/snes_color.cc
@@ -1,7 +1,7 @@
 
 #include "app/gfx/snes_color.h"
 
-#include <imgui/imgui.h>
+#include "imgui/imgui.h"
 
 #include <cstdint>
 #include <vector>
@@ -101,4 +101,4 @@ std::vector<SnesColor> GetColFileData(uint8_t* data) {
 
 }  // namespace gfx
 }  // namespace app
-}  // namespace yaze
\ No newline at end of file
+}  // namespace yaze
diff --git a/src/app/gfx/snes_color.h b/src/app/gfx/snes_color.h
index 8ecafd02..dcaea639 100644
--- a/src/app/gfx/snes_color.h
+++ b/src/app/gfx/snes_color.h
@@ -1,7 +1,7 @@
 #ifndef YAZE_APP_GFX_SNES_COLOR_H_
 #define YAZE_APP_GFX_SNES_COLOR_H_
 
-#include <imgui/imgui.h>
+#include "imgui/imgui.h"
 
 #include <cstdint>
 #include <vector>
diff --git a/src/app/gfx/snes_palette.cc b/src/app/gfx/snes_palette.cc
index eb5f75de..b5388c3d 100644
--- a/src/app/gfx/snes_palette.cc
+++ b/src/app/gfx/snes_palette.cc
@@ -1,7 +1,7 @@
 #include "snes_palette.h"
 
 #include <SDL.h>
-#include <imgui/imgui.h>
+#include "imgui/imgui.h"
 
 #include <cstdint>
 #include <cstdlib>
@@ -389,4 +389,4 @@ absl::Status LoadAllPalettes(const Bytes& rom_data, PaletteGroupMap& groups) {
 
 }  // namespace gfx
 }  // namespace app
-}  // namespace yaze
\ No newline at end of file
+}  // namespace yaze
diff --git a/src/app/gfx/snes_palette.h b/src/app/gfx/snes_palette.h
index aee8bdf6..9128c2b1 100644
--- a/src/app/gfx/snes_palette.h
+++ b/src/app/gfx/snes_palette.h
@@ -2,7 +2,7 @@
 #define YAZE_APP_GFX_PALETTE_H
 
 #include <SDL.h>
-#include <imgui/imgui.h>
+#include "imgui/imgui.h"
 
 #include <cstdint>
 #include <cstdlib>
@@ -433,4 +433,4 @@ struct Paletteset {
 }  // namespace app
 }  // namespace yaze
 
-#endif  // YAZE_APP_GFX_PALETTE_H
\ No newline at end of file
+#endif  // YAZE_APP_GFX_PALETTE_H
diff --git a/src/app/gui/asset_browser.cc b/src/app/gui/asset_browser.cc
index 856fb5c9..fe6979e7 100644
--- a/src/app/gui/asset_browser.cc
+++ b/src/app/gui/asset_browser.cc
@@ -1,5 +1,7 @@
 #include "asset_browser.h"
 
+#include "absl/strings/str_format.h"
+
 namespace yaze {
 namespace app {
 namespace gui {
@@ -340,4 +342,4 @@ void GfxSheetAssetBrowser::Draw(gfx::BitmapManager* bmp_manager) {
 
 }  // namespace gui
 }  // namespace app
-}  // namespace yaze
\ No newline at end of file
+}  // namespace yaze
diff --git a/src/app/gui/asset_browser.h b/src/app/gui/asset_browser.h
index c36c9a34..ac79930a 100644
--- a/src/app/gui/asset_browser.h
+++ b/src/app/gui/asset_browser.h
@@ -1,7 +1,7 @@
 #ifndef YAZE_APP_GUI_ASSET_BROWSER_H
 #define YAZE_APP_GUI_ASSET_BROWSER_H
 
-#include <imgui/imgui.h>
+#include "imgui/imgui.h"
 
 #include <string>
 
diff --git a/src/app/gui/canvas.cc b/src/app/gui/canvas.cc
index 029ea2a6..c874815e 100644
--- a/src/app/gui/canvas.cc
+++ b/src/app/gui/canvas.cc
@@ -1,6 +1,6 @@
 #include "canvas.h"
 
-#include <imgui/imgui.h>
+#include "imgui/imgui.h"
 
 #include <cmath>
 #include <string>
diff --git a/src/app/gui/canvas.h b/src/app/gui/canvas.h
index 419baeb3..07a5c4f4 100644
--- a/src/app/gui/canvas.h
+++ b/src/app/gui/canvas.h
@@ -1,7 +1,7 @@
 #ifndef YAZE_GUI_CANVAS_H
 #define YAZE_GUI_CANVAS_H
 
-#include <imgui/imgui.h>
+#include "imgui/imgui.h"
 
 #include <cmath>
 #include <string>
@@ -236,4 +236,4 @@ void BitmapCanvasPipeline(gui::Canvas& canvas, const gfx::Bitmap& bitmap,
 }  // namespace app
 }  // namespace yaze
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/app/gui/color.cc b/src/app/gui/color.cc
index 9e6c2481..55541bed 100644
--- a/src/app/gui/color.cc
+++ b/src/app/gui/color.cc
@@ -1,13 +1,13 @@
 #include "color.h"
 
-#include <gfx/snes_color.h>
-#include <imgui/imgui.h>
+#include "imgui/imgui.h"
 
 #include <cmath>
 #include <string>
 
 #include "app/gfx/bitmap.h"
 #include "app/gfx/snes_palette.h"
+#include "app/gfx/snes_color.h"
 
 namespace yaze {
 namespace app {
@@ -123,6 +123,7 @@ absl::Status DisplayPalette(app::gfx::SnesPalette& palette, bool loaded) {
   ImGui::ColorPicker4("##picker", (float*)&color,
                       misc_flags | ImGuiColorEditFlags_NoSidePreview |
                           ImGuiColorEditFlags_NoSmallPreview);
+  return absl::OkStatus();
 }
 
 void SelectablePalettePipeline(uint64_t& palette_id, bool& refresh_graphics,
@@ -170,4 +171,4 @@ void SelectablePalettePipeline(uint64_t& palette_id, bool& refresh_graphics,
 
 }  // namespace gui
 }  // namespace app
-}  // namespace yaze
\ No newline at end of file
+}  // namespace yaze
diff --git a/src/app/gui/color.h b/src/app/gui/color.h
index 821bb9a1..6e05a008 100644
--- a/src/app/gui/color.h
+++ b/src/app/gui/color.h
@@ -1,7 +1,7 @@
 #ifndef YAZE_GUI_COLOR_H
 #define YAZE_GUI_COLOR_H
 
-#include <imgui/imgui.h>
+#include "imgui/imgui.h"
 
 #include <cmath>
 #include <string>
@@ -37,4 +37,4 @@ void SelectablePalettePipeline(uint64_t& palette_id, bool& refresh_graphics,
 }  // namespace app
 }  // namespace yaze
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/app/gui/input.cc b/src/app/gui/input.cc
index 8649cd46..06e39d64 100644
--- a/src/app/gui/input.cc
+++ b/src/app/gui/input.cc
@@ -1,9 +1,9 @@
 #include "input.h"
 
-#include <ImGuiFileDialog/ImGuiFileDialog.h>
-#include <imgui/imgui.h>
-#include <imgui/imgui_internal.h>
-#include <imgui/misc/cpp/imgui_stdlib.h>
+#include "ImGuiFileDialog/ImGuiFileDialog.h"
+#include "imgui/imgui.h"
+#include "imgui/imgui_internal.h"
+#include "imgui/misc/cpp/imgui_stdlib.h"
 
 #include <functional>
 #include <optional>
@@ -271,4 +271,4 @@ void FileDialogPipeline(absl::string_view display_key,
 
 }  // namespace gui
 }  // namespace app
-}  // namespace yaze
\ No newline at end of file
+}  // namespace yaze
diff --git a/src/app/gui/input.h b/src/app/gui/input.h
index 4c70ff7f..cd7a024b 100644
--- a/src/app/gui/input.h
+++ b/src/app/gui/input.h
@@ -3,9 +3,9 @@
 
 #define IMGUI_DEFINE_MATH_OPERATORS
 
-#include <imgui/imgui.h>
-#include <imgui/misc/cpp/imgui_stdlib.h>
-#include <imgui_memory_editor.h>
+#include "imgui/imgui.h"
+#include "imgui/misc/cpp/imgui_stdlib.h"
+#include "imgui_memory_editor.h"
 
 #include <cstddef>
 #include <cstdint>
@@ -66,4 +66,4 @@ void FileDialogPipeline(absl::string_view display_key,
 }  // namespace app
 }  // namespace yaze
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/app/gui/style.cc b/src/app/gui/style.cc
index 35f105ca..c9639717 100644
--- a/src/app/gui/style.cc
+++ b/src/app/gui/style.cc
@@ -1,7 +1,7 @@
 #include "style.h"
 
-#include <imgui/imgui.h>
-#include <imgui/imgui_internal.h>
+#include "imgui/imgui.h"
+#include "imgui/imgui_internal.h"
 
 namespace yaze {
 namespace app {
diff --git a/src/app/gui/style.h b/src/app/gui/style.h
index 8825f457..0fed9c1a 100644
--- a/src/app/gui/style.h
+++ b/src/app/gui/style.h
@@ -1,9 +1,9 @@
 #ifndef YAZE_APP_CORE_STYLE_H
 #define YAZE_APP_CORE_STYLE_H
 
-#include <ImGuiColorTextEdit/TextEditor.h>
-#include <imgui/imgui.h>
-#include <imgui/misc/cpp/imgui_stdlib.h>
+#include "ImGuiColorTextEdit/TextEditor.h"
+#include "imgui/imgui.h"
+#include "imgui/misc/cpp/imgui_stdlib.h"
 
 #include <functional>
 #include <vector>
@@ -148,4 +148,4 @@ struct MultiSelectWithClipper {
 }  // namespace app
 }  // namespace yaze
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/app/gui/zeml.cc b/src/app/gui/zeml.cc
index 3b0a8cd6..d587b78b 100644
--- a/src/app/gui/zeml.cc
+++ b/src/app/gui/zeml.cc
@@ -1,7 +1,7 @@
 
 #include "app/gui/zeml.h"
 
-#include <imgui/imgui.h>
+#include "imgui/imgui.h"
 
 #include <cctype>
 #include <fstream>
diff --git a/src/app/gui/zeml.h b/src/app/gui/zeml.h
index 4d577cf7..dbb9c396 100644
--- a/src/app/gui/zeml.h
+++ b/src/app/gui/zeml.h
@@ -1,7 +1,7 @@
 #ifndef YAZE_APP_GUI_ZEML_H
 #define YAZE_APP_GUI_ZEML_H
 
-#include <imgui/imgui.h>
+#include "imgui/imgui.h"
 
 #include <cctype>
 #include <functional>
diff --git a/src/app/zelda3/overworld/overworld_map.cc b/src/app/zelda3/overworld/overworld_map.cc
index 72321c88..47b63070 100644
--- a/src/app/zelda3/overworld/overworld_map.cc
+++ b/src/app/zelda3/overworld/overworld_map.cc
@@ -1,6 +1,6 @@
 #include "overworld_map.h"
 
-#include <imgui/imgui.h>
+#include "imgui/imgui.h"
 
 #include <cstddef>
 #include <cstdint>
diff --git a/src/app/zelda3/overworld/overworld_map.h b/src/app/zelda3/overworld/overworld_map.h
index cbb6a985..881292c5 100644
--- a/src/app/zelda3/overworld/overworld_map.h
+++ b/src/app/zelda3/overworld/overworld_map.h
@@ -1,7 +1,7 @@
 #ifndef YAZE_APP_ZELDA3_OVERWORLD_MAP_H
 #define YAZE_APP_ZELDA3_OVERWORLD_MAP_H
 
-#include <imgui/imgui.h>
+#include "imgui/imgui.h"
 
 #include <cstddef>
 #include <cstdint>