diff --git a/Adventures in Lestoria/Adventures in Lestoria.vcxproj b/Adventures in Lestoria/Adventures in Lestoria.vcxproj
index 1c34f050..ba8b757c 100644
--- a/Adventures in Lestoria/Adventures in Lestoria.vcxproj	
+++ b/Adventures in Lestoria/Adventures in Lestoria.vcxproj	
@@ -670,6 +670,7 @@
       <SubType>
       </SubType>
     </ClCompile>
+    <ClCompile Include="SettingsWindow.cpp" />
     <ClCompile Include="ShootAfar.cpp" />
     <ClCompile Include="SlimeKing.cpp" />
     <ClCompile Include="SoundEffect.cpp">
diff --git a/Adventures in Lestoria/Adventures in Lestoria.vcxproj.filters b/Adventures in Lestoria/Adventures in Lestoria.vcxproj.filters
index adc7031d..61c6d975 100644
--- a/Adventures in Lestoria/Adventures in Lestoria.vcxproj.filters	
+++ b/Adventures in Lestoria/Adventures in Lestoria.vcxproj.filters	
@@ -758,6 +758,9 @@
     <ClCompile Include="GameEvent.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="SettingsWindow.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="cpp.hint" />
diff --git a/Adventures in Lestoria/SettingsWindow.cpp b/Adventures in Lestoria/SettingsWindow.cpp
index 8ddb526e..36120110 100644
--- a/Adventures in Lestoria/SettingsWindow.cpp	
+++ b/Adventures in Lestoria/SettingsWindow.cpp	
@@ -36,6 +36,7 @@ All rights reserved.
 */
 #pragma endregion
 
+#include "AdventuresInLestoria.h"
 #include "Menu.h"
 #include "MenuComponent.h"
 #include "SoundEffect.h"
@@ -44,20 +45,22 @@ All rights reserved.
 #include "Unlock.h"
 
 INCLUDE_DATA
+INCLUDE_game
+INCLUDE_WINDOW_SIZE
 
 void Menu::InitializeSettingsWindow(){
-    vf2d windowSize=game->WINDOW_SIZE-vf2d{28,28};
+    vf2d windowSize=WINDOW_SIZE-vf2d{28,28};
 	Menu*settingsWindow=CreateMenu(SETTINGS,CENTERED,windowSize);
 
-    settingsWindow->ADD("Unlock All Button",MenuComponent)({{4,4},{72,12}},"Unlock All",[](MenuFuncData data){
+    settingsWindow->ADD("Unlock All Button",MenuComponent)(geom2d::rect<float>{{4,4},{72,12}},"Unlock All",[](MenuFuncData data){
         for(auto&[key,size]:DATA["Levels"]){
             Unlock::UnlockArea(key);
         }
         SoundEffect::PlaySFX("Buy Item",SoundEffect::CENTERED);
         return true;
-    });
-    settingsWindow->ADD("Go Back",MenuComponent)({windowSize/2-vf2d{36,16},{72,12}},"Go Back",[](MenuFuncData data){
+    })END;
+    settingsWindow->ADD("Go Back",MenuComponent)(geom2d::rect<float>{windowSize/2-vf2d{36,16},{72,12}},"Go Back",[](MenuFuncData data){
         Menu::CloseMenu();
         return true;
-    });
+    })END;
 }
\ No newline at end of file
diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h
index 9c6eed31..5be9c547 100644
--- a/Adventures in Lestoria/Version.h	
+++ b/Adventures in Lestoria/Version.h	
@@ -39,7 +39,7 @@ All rights reserved.
 #define VERSION_MAJOR 0
 #define VERSION_MINOR 3
 #define VERSION_PATCH 0
-#define VERSION_BUILD 6389
+#define VERSION_BUILD 6393
 
 #define stringify(a) stringify_(a)
 #define stringify_(a) #a
diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe
index 53632e35..ef0955ce 100644
Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ