diff --git a/src/cli/z3ed.cc b/src/cli/z3ed.cc
index 1f7319bf..c8ce7ac5 100644
--- a/src/cli/z3ed.cc
+++ b/src/cli/z3ed.cc
@@ -7,13 +7,13 @@
 
 #include "absl/flags/flag.h"
 #include "app/core/constants.h"
-#include "cli/command.h"
+#include "cli/z3ed.h"
+#include "tui.h"
 
 ABSL_FLAG(bool, verbose, false, "Enable verbose output");
 ABSL_FLAG(bool, debug, false, "Enable debug output");
 
 namespace yaze {
-
 /**
  * @namespace yaze::cli
  * @brief Namespace for the command line interface.
@@ -21,12 +21,13 @@ namespace yaze {
 namespace cli {
 namespace {
 
+ColorModifier ylw(ColorCode::FG_YELLOW);
+ColorModifier mag(ColorCode::FG_MAGENTA);
+ColorModifier red(ColorCode::FG_RED);
+ColorModifier reset(ColorCode::FG_RESET);
+ColorModifier underline(ColorCode::FG_UNDERLINE);
+
 void HelpCommand() {
-  ColorModifier ylw(ColorCode::FG_YELLOW);
-  ColorModifier mag(ColorCode::FG_MAGENTA);
-  ColorModifier red(ColorCode::FG_RED);
-  ColorModifier reset(ColorCode::FG_RESET);
-  ColorModifier underline(ColorCode::FG_UNDERLINE);
   std::cout << "\n";
   std::cout << ylw << " ▲  " << reset << "    z3ed\n";
   std::cout << ylw << "▲ ▲ " << reset << "    by " << mag << "scawful\n\n"
@@ -57,7 +58,7 @@ void HelpCommand() {
   std::cout << "\n";
 }
 
-int RunCommandHandler(int argc, char* argv[]) {
+int RunCommandHandler(int argc, char *argv[]) {
   if (argc == 1) {
     HelpCommand();
     return EXIT_SUCCESS;
@@ -88,6 +89,8 @@ int RunCommandHandler(int argc, char* argv[]) {
 }  // namespace cli
 }  // namespace yaze
 
-int main(int argc, char* argv[]) {
-  return yaze::cli::RunCommandHandler(argc, argv);
+int main(int argc, char *argv[]) {
+  yaze::cli::ShowMain();
+  return EXIT_SUCCESS;
+  // return yaze::cli::RunCommandHandler(argc, argv);
 }
diff --git a/src/cli/z3ed.cmake b/src/cli/z3ed.cmake
index 1dfd9b0b..61939305 100644
--- a/src/cli/z3ed.cmake
+++ b/src/cli/z3ed.cmake
@@ -22,6 +22,7 @@ add_executable(
   app/core/common.cc
   app/core/project.cc
   app/core/platform/file_path.mm
+  app/core/utils/file_util.cc
   ${YAZE_APP_EMU_SRC}
   ${YAZE_APP_GFX_SRC}
   ${YAZE_APP_ZELDA3_SRC}
diff --git a/src/cli/command.h b/src/cli/z3ed.h
similarity index 98%
rename from src/cli/command.h
rename to src/cli/z3ed.h
index c8ee1495..670c943f 100644
--- a/src/cli/command.h
+++ b/src/cli/z3ed.h
@@ -1,5 +1,5 @@
-#ifndef YAZE_CLI_COMMAND_HANDLER_H
-#define YAZE_CLI_COMMAND_HANDLER_H
+#ifndef YAZE_CLI_Z3ED_H
+#define YAZE_CLI_Z3ED_H
 
 #include <cstdint>
 #include <iostream>
@@ -13,7 +13,6 @@
 #include "app/core/common.h"
 #include "app/core/constants.h"
 #include "app/rom.h"
-#include "asar-dll-bindings/c/asar.h"
 
 namespace yaze {
 namespace cli {