diff --git a/CMakeLists.txt b/CMakeLists.txt
index d0ef7b1..54faec4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -129,8 +129,10 @@ add_executable(ComSquare
         sources/Renderer/QtRenderer/QtSFML.hpp
         sources/Renderer/QtRenderer/QtWidgetSFML.cpp
         sources/Renderer/QtRenderer/QtWidgetSFML.hpp
-        resources/debugger/cpu.ui
-        sources/Renderer/QtRenderer/QtWindow.cpp sources/Renderer/QtRenderer/QtWindow.hpp)
+        Ui/cpu.ui
+        sources/Renderer/QtRenderer/QtWindow.cpp
+        sources/Renderer/QtRenderer/QtWindow.hpp
+)
 
 target_compile_definitions(ComSquare PUBLIC DEBUGGER_ENABLED)
 
diff --git a/Ui/cpu.ui b/Ui/cpu.ui
new file mode 100644
index 0000000..19a841e
--- /dev/null
+++ b/Ui/cpu.ui
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>CPU</class>
+ <widget class="QWidget" name="CPU">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>584</width>
+    <height>407</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>CPU</string>
+  </property>
+  <widget class="QLabel" name="label">
+   <property name="geometry">
+    <rect>
+     <x>270</x>
+     <y>160</y>
+     <width>67</width>
+     <height>17</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>CPU</string>
+   </property>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/resources/debugger/cpu.ui b/resources/debugger/cpu.ui
deleted file mode 100644
index 097e209..0000000
--- a/resources/debugger/cpu.ui
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>MainWindow</class>
- <widget class="QMainWindow" name="MainWindow">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>800</width>
-    <height>600</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>MainWindow</string>
-  </property>
-  <widget class="QWidget" name="centralwidget">
-   <widget class="QLabel" name="label">
-    <property name="geometry">
-     <rect>
-      <x>280</x>
-      <y>120</y>
-      <width>231</width>
-      <height>171</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string>CPU DEBUGGER*</string>
-    </property>
-   </widget>
-  </widget>
-  <widget class="QMenuBar" name="menubar">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>800</width>
-     <height>28</height>
-    </rect>
-   </property>
-  </widget>
-  <widget class="QStatusBar" name="statusbar"/>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/sources/Debugger/DebugCpu.cpp b/sources/Debugger/DebugCpu.cpp
index 360c2cc..83a7610 100644
--- a/sources/Debugger/DebugCpu.cpp
+++ b/sources/Debugger/DebugCpu.cpp
@@ -8,18 +8,18 @@
 namespace ComSquare::Debugger
 {
 	CPUDebug::CPUDebug(ComSquare::CPU::CPU &basicCPU, SNES &snes)
-		: CPU::CPU(basicCPU), _renderer(600, 1000), _snes(snes)
+		: CPU::CPU(basicCPU), _snes(snes)
 	{
-		std::string name = "CPU's Debugger";
-		this->_renderer.setWindowName(name);
+		this->_ui.setupUi(&this->_widget);
+		this->_widget.show();
 	}
 
 	unsigned CPUDebug::update()
 	{
-//		if (this->_renderer.shouldExit) {
-//			this->_snes.disableCPUDebugging ();
-//			return 0;
-//		}
+		if (!this->_widget.isVisible()) {
+			this->_snes.disableCPUDebugging();
+			return 0;
+		}
 
 //		this->_renderer.drawScreen();
 //		this->_renderer.getEvents();
diff --git a/sources/Debugger/DebugCpu.hpp b/sources/Debugger/DebugCpu.hpp
index a9baf4e..e5552a2 100644
--- a/sources/Debugger/DebugCpu.hpp
+++ b/sources/Debugger/DebugCpu.hpp
@@ -9,14 +9,17 @@
 #include "../Renderer/SFRenderer.hpp"
 #include "../SNES.hpp"
 #include "../Renderer/QtRenderer/QtWindow.hpp"
+#include "../../Ui/ui_cpu.h"
 
 namespace ComSquare::Debugger
 {
 	//! @brief A custom CPU with a window that show it's registers and the disassembly.
 	class CPUDebug : public CPU::CPU {
 	private:
-		//! @brief The debug window.
-		Renderer::QtWindow _renderer;
+		//! @brief A widget that contain the whole UI.
+		QWidget _widget;
+		//! @brief The ui that reside inside the window.
+		Ui::CPU _ui;
 		//! @brief If this is set to true, the execution of the CPU will be paused.
 		bool _isPaused = true;
 		//! @brief A reference to the snes (to disable the debugger).
diff --git a/sources/Renderer/QtRenderer/QtWindow.hpp b/sources/Renderer/QtRenderer/QtWindow.hpp
index e53f693..2e726d7 100644
--- a/sources/Renderer/QtRenderer/QtWindow.hpp
+++ b/sources/Renderer/QtRenderer/QtWindow.hpp
@@ -5,7 +5,7 @@
 #ifndef COMSQUARE_QTWINDOW_HPP
 #define COMSQUARE_QTWINDOW_HPP
 
-#include <QtWidgets/QApplication>
+
 #include <QtWidgets/QFrame>
 
 namespace ComSquare::Renderer
diff --git a/sources/SNES.cpp b/sources/SNES.cpp
index 9ef413c..8f70c74 100644
--- a/sources/SNES.cpp
+++ b/sources/SNES.cpp
@@ -5,7 +5,9 @@
 #include <ios>
 #include <iostream>
 #include "SNES.hpp"
-#include "Debugger/DebugCpu.hpp"
+#ifdef DEBUGGER_ENABLED
+	#include "Debugger/DebugCpu.hpp"
+#endif
 
 namespace ComSquare
 {
@@ -31,6 +33,7 @@ namespace ComSquare
 
 	void SNES::disableCPUDebugging()
 	{
+		std::cout << "Disabling CPU debugger." << std::endl;
 		this->cpu = std::make_shared<CPU::CPU>(*this->cpu);
 	}