diff --git a/.clang-format b/.clang-format
index 4887ded..515fe06 100644
Binary files a/.clang-format and b/.clang-format differ
diff --git a/.clangd b/.clangd
index d7e6d48..92534a6 100644
Binary files a/.clangd and b/.clangd differ
diff --git a/.gitignore b/.gitignore
index bc52a22..10bb98f 100644
Binary files a/.gitignore and b/.gitignore differ
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2abe16a..c334a80 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,7 +15,9 @@ endif ()
 include(CTest)
 enable_testing()
 
-add_executable(${PROJECT_NAME} main.cpp
+add_executable(${PROJECT_NAME}
+        main.cpp
+        def.cpp
         def.h
         InteractManager.cpp
         InteractManager.h
@@ -27,17 +29,18 @@ add_executable(${PROJECT_NAME} main.cpp
         Window.h
         Hud.cpp
         Hud.h
-        includes.h
-        IText.h
-        Chars.h
         IText.cpp
-        xWindows.h
+        IText.h
+        exception.cpp
         exception.h
-        def.cpp
-        TestCode.h
         TextureManager.cpp
         TextureManager.h
-        exception.cpp)
+
+        includes.h
+        Chars.h
+        xWindows.h
+        TestCode.h
+)
 set(CPACK_PROJECT_NAME ${PROJECT_NAME})
 set(CPACK_PROJECT_VERSION ${PROJECT_VERSION})
 include(CPack)
diff --git a/Chars.h b/Chars.h
index d0b68b7..3574f16 100644
Binary files a/Chars.h and b/Chars.h differ
diff --git a/Game.cpp b/Game.cpp
index 2e116f4..a9934ed 100644
Binary files a/Game.cpp and b/Game.cpp differ
diff --git a/Game.h b/Game.h
index 6dd6848..7e00c90 100644
Binary files a/Game.h and b/Game.h differ
diff --git a/Hud.cpp b/Hud.cpp
index bc030c0..e2b0281 100644
Binary files a/Hud.cpp and b/Hud.cpp differ
diff --git a/Hud.h b/Hud.h
index 8b97a71..493a557 100644
Binary files a/Hud.h and b/Hud.h differ
diff --git a/IText.cpp b/IText.cpp
index c5a3bae..fc9f53e 100644
Binary files a/IText.cpp and b/IText.cpp differ
diff --git a/IText.h b/IText.h
index e2bac29..6f292a4 100644
Binary files a/IText.h and b/IText.h differ
diff --git a/InteractManager.cpp b/InteractManager.cpp
index 508683a..02d94c1 100644
Binary files a/InteractManager.cpp and b/InteractManager.cpp differ
diff --git a/InteractManager.h b/InteractManager.h
index b2567b0..dc9dce0 100644
Binary files a/InteractManager.h and b/InteractManager.h differ
diff --git a/LICENSE b/LICENSE
index 17d79f2..353318c 100644
Binary files a/LICENSE and b/LICENSE differ
diff --git a/Renderer.cpp b/Renderer.cpp
index 9ff466f..b00bc05 100644
Binary files a/Renderer.cpp and b/Renderer.cpp differ
diff --git a/Renderer.h b/Renderer.h
index 43bdfff..cef4ab3 100644
Binary files a/Renderer.h and b/Renderer.h differ
diff --git a/TestCode.h b/TestCode.h
index ede3af6..f4211eb 100644
Binary files a/TestCode.h and b/TestCode.h differ
diff --git a/TextureManager.cpp b/TextureManager.cpp
index 108b7a5..b21bb73 100644
Binary files a/TextureManager.cpp and b/TextureManager.cpp differ
diff --git a/TextureManager.h b/TextureManager.h
index bff6638..f1b48a8 100644
Binary files a/TextureManager.h and b/TextureManager.h differ
diff --git a/Window.cpp b/Window.cpp
index 3a555b0..b66e3e9 100644
Binary files a/Window.cpp and b/Window.cpp differ
diff --git a/Window.h b/Window.h
index 1f38036..09d8e24 100644
Binary files a/Window.h and b/Window.h differ
diff --git a/core.h b/core.h
deleted file mode 100644
index a5e7519..0000000
--- a/core.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-#include <Windows.h>
-#include <winuser.h>
-
-#include "../CarlbeksLib/gxdef.h"
-#include "../CarlbeksLib/rgui.h"
-#include "../CarlbeksLib/iwindows.h"
-
-static HINSTANCE MainInstance;
-static HWND MainWindowHandle;
-
-static inline String ApplicationName = L"High Blood Pressure";
-
-inline Carlbeks::UI::Main MainWindow;
-inline Carlbeks::UI::TickThread MainTick{ &MainWindow };
-
-inline void Initialize() noexcept {
-	Carlbeks::WindowsInterface::ShowConsoleIO();
-	MainWindow.setWindow(MainWindowHandle);
-	MainWindow.setDC(GetDC(MainWindowHandle));
-	MainTick.start();
-}
-
-inline void Finalize() noexcept {
-	MainTick.stopAndWait();
-	_wsystem(L"pause");
-}
diff --git a/def.cpp b/def.cpp
index 76bc6aa..f64fd5c 100644
Binary files a/def.cpp and b/def.cpp differ
diff --git a/def.h b/def.h
index c519fd7..c223548 100644
Binary files a/def.h and b/def.h differ
diff --git a/dev.md b/dev.md
index a659cbb..b84f169 100644
Binary files a/dev.md and b/dev.md differ
diff --git a/exception.cpp b/exception.cpp
index fe36747..240c22b 100644
Binary files a/exception.cpp and b/exception.cpp differ
diff --git a/exception.h b/exception.h
index 82c68c6..49926f3 100644
Binary files a/exception.h and b/exception.h differ
diff --git a/hbp.h b/hbp.h
index 20124e0..40ab450 100644
Binary files a/hbp.h and b/hbp.h differ
diff --git a/includes.h b/includes.h
index ba46918..afb8b7c 100644
Binary files a/includes.h and b/includes.h differ
diff --git a/main.cpp b/main.cpp
index 67b403e..8e8696c 100644
Binary files a/main.cpp and b/main.cpp differ
diff --git a/xWindows.h b/xWindows.h
index 5fcab88..1224074 100644
Binary files a/xWindows.h and b/xWindows.h differ