diff --git a/src/app/editor/dungeon/dungeon_editor_v2.cc b/src/app/editor/dungeon/dungeon_editor_v2.cc
index e132cb7b..13c71308 100644
--- a/src/app/editor/dungeon/dungeon_editor_v2.cc
+++ b/src/app/editor/dungeon/dungeon_editor_v2.cc
@@ -92,9 +92,9 @@ void DungeonEditorV2::Initialize(gfx::IRenderer* renderer, Rom* rom) {
        .category = "Dungeon",
        .shortcut_hint = "Ctrl+Shift+D",
        .visibility_flag = nullptr,
+       .priority = 10,
        .enabled_condition = [this]() { return rom_ && rom_->is_loaded(); },
-       .disabled_tooltip = "Load a ROM to access dungeon controls",
-       .priority = 10});
+       .disabled_tooltip = "Load a ROM to access dungeon controls"});
 
   panel_manager->RegisterPanel(
       {.card_id = kRoomSelectorId,
@@ -104,9 +104,9 @@ void DungeonEditorV2::Initialize(gfx::IRenderer* renderer, Rom* rom) {
        .category = "Dungeon",
        .shortcut_hint = "Ctrl+Shift+R",
        .visibility_flag = nullptr,
+       .priority = 20,
        .enabled_condition = [this]() { return rom_ && rom_->is_loaded(); },
-       .disabled_tooltip = "Load a ROM to browse dungeon rooms",
-       .priority = 20});
+       .disabled_tooltip = "Load a ROM to browse dungeon rooms"});
 
   panel_manager->RegisterPanel(
       {.card_id = kEntranceListId,
@@ -116,9 +116,9 @@ void DungeonEditorV2::Initialize(gfx::IRenderer* renderer, Rom* rom) {
        .category = "Dungeon",
        .shortcut_hint = "Ctrl+Shift+E",
        .visibility_flag = nullptr,
+       .priority = 25,
        .enabled_condition = [this]() { return rom_ && rom_->is_loaded(); },
-       .disabled_tooltip = "Load a ROM to browse dungeon entrances",
-       .priority = 25});
+       .disabled_tooltip = "Load a ROM to browse dungeon entrances"});
 
   panel_manager->RegisterPanel(
       {.card_id = "dungeon.entrance_properties",
@@ -128,9 +128,9 @@ void DungeonEditorV2::Initialize(gfx::IRenderer* renderer, Rom* rom) {
        .category = "Dungeon",
        .shortcut_hint = "",
        .visibility_flag = nullptr,
+       .priority = 26,
        .enabled_condition = [this]() { return rom_ && rom_->is_loaded(); },
-       .disabled_tooltip = "Load a ROM to edit entrance properties",
-       .priority = 26});
+       .disabled_tooltip = "Load a ROM to edit entrance properties"});
 
   panel_manager->RegisterPanel(
       {.card_id = kRoomMatrixId,
@@ -140,9 +140,9 @@ void DungeonEditorV2::Initialize(gfx::IRenderer* renderer, Rom* rom) {
        .category = "Dungeon",
        .shortcut_hint = "Ctrl+Shift+M",
        .visibility_flag = nullptr,
+       .priority = 30,
        .enabled_condition = [this]() { return rom_ && rom_->is_loaded(); },
-       .disabled_tooltip = "Load a ROM to view the room matrix",
-       .priority = 30});
+       .disabled_tooltip = "Load a ROM to view the room matrix"});
 
   panel_manager->RegisterPanel(
       {.card_id = kRoomGraphicsId,
@@ -152,9 +152,9 @@ void DungeonEditorV2::Initialize(gfx::IRenderer* renderer, Rom* rom) {
        .category = "Dungeon",
        .shortcut_hint = "Ctrl+Shift+G",
        .visibility_flag = nullptr,
+       .priority = 50,
        .enabled_condition = [this]() { return rom_ && rom_->is_loaded(); },
-       .disabled_tooltip = "Load a ROM to view room graphics",
-       .priority = 50});
+       .disabled_tooltip = "Load a ROM to view room graphics"});
 
   panel_manager->RegisterPanel(
       {.card_id = kPaletteEditorId,
@@ -164,9 +164,9 @@ void DungeonEditorV2::Initialize(gfx::IRenderer* renderer, Rom* rom) {
        .category = "Dungeon",
        .shortcut_hint = "Ctrl+Shift+P",
        .visibility_flag = nullptr,
+       .priority = 70,
        .enabled_condition = [this]() { return rom_ && rom_->is_loaded(); },
-       .disabled_tooltip = "Load a ROM to edit dungeon palettes",
-       .priority = 70});
+       .disabled_tooltip = "Load a ROM to edit dungeon palettes"});
 
   // Show default panels on startup
   panel_manager->ShowPanel(kControlPanelId);
diff --git a/src/app/platform/window.h b/src/app/platform/window.h
index e4d4a0e2..722dc531 100644
--- a/src/app/platform/window.h
+++ b/src/app/platform/window.h
@@ -1,16 +1,19 @@
 #ifndef YAZE_CORE_WINDOW_H_
 #define YAZE_CORE_WINDOW_H_
 
-#include "app/platform/sdl_compat.h"
-
 #include <memory>
 
+#include "app/platform/sdl_compat.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_format.h"
 #include "app/gfx/backend/irenderer.h"
 #include "app/gfx/core/bitmap.h"
 #include "util/sdl_deleter.h"
 
+#ifdef CreateWindow
+#undef CreateWindow
+#endif
+
 namespace yaze {
 namespace core {
 
@@ -30,4 +33,4 @@ absl::Status ShutdownWindow(Window& window);
 
 }  // namespace core
 }  // namespace yaze
-#endif  // YAZE_CORE_WINDOW_H_
\ No newline at end of file
+#endif  // YAZE_CORE_WINDOW_H_
diff --git a/src/cli/agent.cmake b/src/cli/agent.cmake
index 225b5bda..1fab39f9 100644
--- a/src/cli/agent.cmake
+++ b/src/cli/agent.cmake
@@ -148,6 +148,7 @@ set(YAZE_AGENT_CORE_SOURCES
   cli/handlers/rom/project_commands.cc
   cli/handlers/rom/rom_commands.cc
   cli/handlers/tools/dungeon_doctor_commands.cc
+  cli/handlers/tools/emulator_commands.cc
   cli/handlers/tools/gui_commands.cc
   cli/handlers/tools/overworld_doctor_commands.cc
   cli/handlers/tools/overworld_validate_commands.cc