diff --git a/README.md b/README.md
index 90767c1e..376a30fd 100644
--- a/README.md
+++ b/README.md
@@ -16,9 +16,32 @@ Also, `lime test windows` uses the source assets folder instead of the export on
 - Credits to [Ne_Eo](https://twitter.com/Ne_Eo_Twitch) and the [3D-HaxeFlixel](https://github.com/lunarcleint/3D-HaxeFlixel) repository for Away3D Flixel support
 - Credits to Smokey555 for the fancy Animate Atlas code (might be replaced soon)
 
-## HOW TO BUILD
-- Install the [latest version of Haxe](https://haxe.org/download/)
-- Install everything mentioned here for your platform: [`Windows`](https://lime.openfl.org/docs/advanced-setup/windows/), [`Linux`](https://lime.openfl.org/docs/advanced-setup/linux/), [`MacOS`](https://lime.openfl.org/docs/advanced-setup/macos/)
-- Run `update.bat` to install/update all libraries needed for the engine.
-    - If you're using another operating system, execute `haxe -cp update -D analyzer-optimize -main Update --interp` in a terminal.
-- Run `lime test windows` to compile the game (may take a long time)
+<details>
+  <summary><h2>How to build</h2></summary>
+
+### **Open the instructions for your platform**
+<details>
+    <summary><h3>Windows</h3></summary>
+
+##### Tested on Windows 10 21H2
+1. Install the [latest version of Haxe](https://haxe.org/download/).
+2. Download [Visual Studio Build Tools](https://aka.ms/vs/17/release/vs_BuildTools.exe)
+3. Wait for the Visual Studio Installer to install
+4. On the Visual Studio installer screen, go to the "Individual components" tab and only select those options:
+    - MSVC v143 VS 2022 C++ x64/x86 build tools (Latest)
+    - Windows 10/11 SDK (any works)
+5. This is what your Installation details panel should look like. Once correct, press "Install".
+    - ⚠ This will download around 1.07 GB of data from the internet, and will require around 5.5 GB of available space on your computer.
+
+![Installation details](art/github/windows-installation-details.png)
+
+6. Once the installation is done, close Visual Studio Installer.
+7. Download and install [`git-scm`](https://git-scm.com/download/win).
+    - Leave all installation options as default.
+8. Open the Codename Engine source folder, click on the address bar and type `cmd` to open a command prompt window.
+9. On the command prompt, run `update.bat`, and wait for the libraries to install.
+10. Once the libraries are installed, run `haxelib run lime test windows` to compile and launch the game (may take a long time)
+    - ℹ You can run `haxelib run lime setup` to make the lime command global, allowing you to execute `lime test windows` directly.
+</details>
+            
+</details>
\ No newline at end of file
diff --git a/art/github/windows-installation-details.png b/art/github/windows-installation-details.png
new file mode 100644
index 00000000..2dfdc61f
Binary files /dev/null and b/art/github/windows-installation-details.png differ
diff --git a/build.bat b/build.bat
index 6703ead0..d7c39305 100644
--- a/build.bat
+++ b/build.bat
@@ -1,2 +1,2 @@
 update.bat
-lime test windows
\ No newline at end of file
+haxelib run lime test windows
\ No newline at end of file
diff --git a/buildnumber.txt b/buildnumber.txt
index 808fe8f9..102ca05b 100644
--- a/buildnumber.txt
+++ b/buildnumber.txt
@@ -1 +1 @@
-1950
\ No newline at end of file
+1951
\ No newline at end of file
diff --git a/source/funkin/desktop/windows/WindowDragHitbox.hx b/source/funkin/desktop/windows/WindowDragHitbox.hx
index db2fa07b..b90e08af 100644
--- a/source/funkin/desktop/windows/WindowDragHitbox.hx
+++ b/source/funkin/desktop/windows/WindowDragHitbox.hx
@@ -74,6 +74,7 @@ class WindowDragHitbox extends FlxObject {
 
     override function destroy() {
         super.destroy();
-        offset.put();
+        if (offset != null)
+            offset.put();
     }
 }
\ No newline at end of file