diff --git a/flake.nix b/flake.nix
index d528d70..ee9edcb 100755
--- a/flake.nix
+++ b/flake.nix
@@ -25,23 +25,16 @@
             src = ./.;
 
             nativeBuildInputs = with pkgs; [
-                gcc
+                clang
             ];
 
-            buildInputs = with pkgs; [
-                glfw
-                glew
-            ];
+            /*buildInputs = with pkgs; [
+            ];*/
 
             buildPhase = ''
-                g++ \
+                clang++ \
                 src/*.cpp \
-                utils/Window/*.cpp \
-                utils/Renderer/*.cpp \
-                -I src -I include -I utils \
-                -DRENDERER_OPENGL \
-                -DWINDOW_GLFW \
-                -lGL -lglfw -lGLEW \
+                -I src -I include \
                 -Wall \
                 -o $name 
             ''; 
@@ -60,15 +53,14 @@
             src = ./.;
 
             nativeBuildInputs = with pkgs; [
-                gcc
+                clang
             ];
 
             buildPhase = ''
-                g++ \
+                clang++ \
                 modules/TestMenu/src/*.cpp src/App.cpp \
                 -fpic -shared \
                 -I src \
-                -I utils \
                 -Wall \
                 -o $name 
             ''; 
@@ -87,15 +79,14 @@
             src = ./.;
 
             nativeBuildInputs = with pkgs; [
-                gcc
+                clang
             ];
 
             buildPhase = ''
-                g++ \
+                clang++ \
                 modules/Print/src/*.cpp src/App.cpp \
                 -fpic -shared \
                 -I src -I include \
-                -I utils \
                 -Wall \
                 -o $name 
             ''; 
@@ -114,15 +105,14 @@
             src = ./.;
 
             nativeBuildInputs = with pkgs; [
-                gcc
+                clang
             ];
 
             buildPhase = ''
-                g++ \
+                clang++ \
                 modules/DependsOnPrint/src/*.cpp src/App.cpp \
                 -fpic -shared \
                 -I src -I include \
-                -I utils \
                 -Wall \
                 -o $name 
             ''; 
@@ -141,7 +131,7 @@
             src = ./.;
 
             nativeBuildInputs = with pkgs; [
-                gcc
+                clang
             ];
 
             buildInputs = with pkgs; [
@@ -150,12 +140,12 @@
             ];
 
             buildPhase = ''
-                g++ \
+                clang++ \
                 modules/Window/src/*.cpp src/App.cpp \
                 utils/Window/*.cpp utils/Window/WindowGLFW/*.cpp \
                 utils/Renderer/*.cpp utils/Renderer/RendererOpenGL/*.cpp \
                 -fpic -shared \
-                -I src -I include -I utils \
+                -I src -I include \
                 -DRENDERER_OPENGL \
                 -DWINDOW_GLFW \
                 -lGL -lglfw -lGLEW \
@@ -179,7 +169,7 @@
             inherit imgui;
 
             nativeBuildInputs = with pkgs; [
-                gcc
+                clang
             ];
 
             buildInputs = with pkgs; [
@@ -188,17 +178,17 @@
             ];
 
             buildPhase = ''
-                g++ \
+                clang++ \
                 modules/GUImodules/TestImgui/src/*.cpp src/App.cpp \
                 $imgui/backends/imgui_impl_glfw.cpp \
                 $imgui/backends/imgui_impl_opengl3.cpp \
                 $imgui/*.cpp \
-                utils/Renderer/*.cpp utils/Renderer/RendererOpenGL/*.cpp \
-                utils/Window/*.cpp utils/Window/WindowGLFW/*.cpp \
+                utils/Renderer/*.cpp \
+                utils/Window/*.cpp \
                 -DRENDERER_OPENGL \
                 -DWINDOW_GLFW \
                 -fpic -shared \
-                -I src -I include -I utils -I $imgui \
+                -I src -I include -I $imgui \
                 -lGL -lglfw -lGLEW \
                 -Wall \
                 -o $name 
@@ -220,17 +210,16 @@
             inherit clay;
 
             nativeBuildInputs = with pkgs; [
-                gcc
+                clang
             ];
 
             buildPhase = ''
-                g++ \
+                clang++ \
                 modules/TestClay/src/*.cpp src/App.cpp \
                 -fpic -shared \
                 -I src -I include \
                 -DRENDERER_OPENGL \
                 -DWINDOW_GLFW \
-                -I utils \
                 -Wall \
                 -o $name 
             ''; 
@@ -251,15 +240,14 @@
             inherit imgui;
 
             nativeBuildInputs = with pkgs; [
-                gcc
+                clang
             ];
 
             buildPhase = ''
-                g++ \
+                clang++ \
                 modules/MainGUI/src/*.cpp src/App.cpp \
                 -fpic -shared \
                 -I src -I include \
-                -I utils \
                 -Wall \
                 -o $name 
             ''; 
@@ -276,7 +264,7 @@
 
         apps.${system}.default = {
             type = "app";
-            program = "${pkgs.writeShellScriptBin "RunArchimedes" "${self.Archimedes}/bin/Archimedes ${self.TestImgui}/bin/TestImgui"}";
+            program = "${self.Archimedes}/bin/Archimedes";
         };
 
     };