diff --git a/Assets/compiled/Debug.frag.dxil b/Assets/compiled/Debug.frag.dxil
index 8920976..7df1d66 100644
Binary files a/Assets/compiled/Debug.frag.dxil and b/Assets/compiled/Debug.frag.dxil differ
diff --git a/Assets/compiled/Debug.vert.dxil b/Assets/compiled/Debug.vert.dxil
index 9c8b91e..aab61ce 100644
Binary files a/Assets/compiled/Debug.vert.dxil and b/Assets/compiled/Debug.vert.dxil differ
diff --git a/Assets/compiled/ImGui.frag.dxil b/Assets/compiled/ImGui.frag.dxil
index f87c1e6..54a535c 100644
Binary files a/Assets/compiled/ImGui.frag.dxil and b/Assets/compiled/ImGui.frag.dxil differ
diff --git a/Assets/compiled/ImGui.vert.dxil b/Assets/compiled/ImGui.vert.dxil
index 14ac435..fc0ecc4 100644
Binary files a/Assets/compiled/ImGui.vert.dxil and b/Assets/compiled/ImGui.vert.dxil differ
diff --git a/Assets/compiled/Skybox.frag.dxil b/Assets/compiled/Skybox.frag.dxil
index 32bb087..c5bf947 100644
Binary files a/Assets/compiled/Skybox.frag.dxil and b/Assets/compiled/Skybox.frag.dxil differ
diff --git a/Assets/compiled/Skybox.vert.dxil b/Assets/compiled/Skybox.vert.dxil
index f2a378b..545cc88 100644
Binary files a/Assets/compiled/Skybox.vert.dxil and b/Assets/compiled/Skybox.vert.dxil differ
diff --git a/Assets/compiled/SolidColor.frag.dxil b/Assets/compiled/SolidColor.frag.dxil
index 522effa..a31cc50 100644
Binary files a/Assets/compiled/SolidColor.frag.dxil and b/Assets/compiled/SolidColor.frag.dxil differ
diff --git a/Assets/compiled/Triangle.vert.dxil b/Assets/compiled/Triangle.vert.dxil
index efc42f6..98e2f65 100644
Binary files a/Assets/compiled/Triangle.vert.dxil and b/Assets/compiled/Triangle.vert.dxil differ
diff --git a/misc/FBuild.exe b/misc/FBuild.exe
deleted file mode 100644
index 4f33a9a..0000000
Binary files a/misc/FBuild.exe and /dev/null differ
diff --git a/misc/FBuildWorker.exe b/misc/FBuildWorker.exe
deleted file mode 100644
index c533a5b..0000000
Binary files a/misc/FBuildWorker.exe and /dev/null differ
diff --git a/misc/agent_build.bat b/misc/agent_build.bat
deleted file mode 100644
index a304978..0000000
--- a/misc/agent_build.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@echo off
-call misc\shell.bat
-fbuild %* -cache
\ No newline at end of file
diff --git a/misc/build.bat b/misc/build.bat
index 5fdf51f..6654993 100644
--- a/misc/build.bat
+++ b/misc/build.bat
@@ -10,7 +10,7 @@ setlocal enabledelayedexpansion
 set SCRIPT_DIR=%~dp0
 cd /d "%SCRIPT_DIR%.."
 
-set FBUILD=misc\fbuild.exe
+
 set BUILD_TOOL=misc\build_system.exe
 set BUILD_SRC=tools\build_system.c
 
@@ -47,10 +47,7 @@ if !CONFIG_SPECIFIED! equ 0 set CONFIG_DEBUG=1& if !TARGET_SPECIFIED! equ 0 set
 if !TARGET_SPECIFIED! equ 0 set TARGET_JULIET=1& set TARGET_GAME=1& set TARGET_ROMEO=1& set TARGET_SHADER=1
 
 :do_compile_build_tool
-if not exist "%FBUILD%" (
-    echo [BUILD FAILED] Could not find %FBUILD%.
-    exit /b 1
-)
+
 
 :: Find Clang / MSVC compiler
 set COMPILER=clang-cl.exe
@@ -224,7 +221,7 @@ if !TARGET_SHADER! equ 1 (
     echo STEP Building JulietShaderCompiler.exe [!CFG!]>>"!PLAN_FILE!"
     echo OUTPUT bin\x64-!CFG!\JulietShaderCompiler.exe>>"!PLAN_FILE!"
     echo DEPENDS JulietShaderCompiler^|Juliet^|External\imgui>>"!PLAN_FILE!"
-    echo COMMAND %COMPILER% %COMPILER_FLAGS% /IJulietShaderCompiler /Fe"bin\x64-!CFG!\JulietShaderCompiler.exe" Intermediate\JulietShaderCompiler\*.cpp %IMGUI_OBJS% /link %COMMON_LIBS% dxcompiler.lib /DELAYLOAD:dxcompiler.dll /SUBSYSTEM:CONSOLE /INCREMENTAL /ILK:Intermediate\x64-!CFG!\JulietShaderCompiler.ilk /PDB:Intermediate\x64-!CFG!\JulietShaderCompiler.pdb>>"!PLAN_FILE!"
+    echo COMMAND %COMPILER% %COMPILER_FLAGS% /DIMGUI_API=__declspec^(dllimport^) /IJulietShaderCompiler /Fe"bin\x64-!CFG!\JulietShaderCompiler.exe" Intermediate\JulietShaderCompiler\*.cpp /link %COMMON_LIBS% bin\x64-!CFG!\Juliet.lib dxcompiler.lib /DELAYLOAD:dxcompiler.dll /SUBSYSTEM:CONSOLE /INCREMENTAL /ILK:Intermediate\x64-!CFG!\JulietShaderCompiler.ilk /PDB:Intermediate\x64-!CFG!\JulietShaderCompiler.pdb>>"!PLAN_FILE!"
 )
 
 exit /b 0
diff --git a/misc/recompile_shaders.bat b/misc/recompile_shaders.bat
index 0d59e8a..123e49d 100644
--- a/misc/recompile_shaders.bat
+++ b/misc/recompile_shaders.bat
@@ -1,7 +1,7 @@
 @echo off
 setlocal enabledelayedexpansion
 
-set TARGET=x64Clang-Release
+set TARGET=x64-Release
 
 REM Chemin relatif vers JulietShaderCompiler.exe
 set COMPILER_PATH=bin\%TARGET%\JulietShaderCompiler.exe
diff --git a/misc/ship.bat b/misc/ship.bat
index 5f27cf5..38bbfc2 100644
--- a/misc/ship.bat
+++ b/misc/ship.bat
@@ -2,16 +2,16 @@
 setlocal
 
 REM ============================================================
-REM  ship.bat - Build clang-Release and prepare Ship/ folder
+REM  ship.bat - Build Release and prepare Ship/ folder
 REM ============================================================
 
 set ROOT=%~dp0..
-set BUILD_DIR=%ROOT%\bin\x64Clang-Release
+set BUILD_DIR=%ROOT%\bin\x64-Release
 set SHIP_DIR=%ROOT%\Ship
 
 REM Step 0: Build Shader Compiler
 echo [Ship] Building Shader Compiler...
-call "%~dp0fbuild" JulietShaderCompiler-x64Clang-Release -cache
+call "%~dp0build.bat" release shadercompiler
 if errorlevel 1 (
     echo [Ship] SHADER COMPILER BUILD FAILED
     exit /b 1
@@ -25,9 +25,9 @@ if errorlevel 1 (
     exit /b 1
 )
 
-REM Step 2: Build clang-Release
-echo [Ship] Building clang-Release...
-call "%~dp0fbuild" clang-Release -cache
+REM Step 2: Build Release
+echo [Ship] Building Release...
+call "%~dp0build.bat" release juliet game
 if errorlevel 1 (
     echo [Ship] BUILD FAILED
     exit /b 1