diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index ab7f8ad0..86d1a2d6 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -36,6 +36,7 @@ jobs:
           haxe -cp commandline -D analyzer-optimize --run Main setup -s
       - name: Building the game
         run: |
+          haxelib run lime rebuild linux -nocolor -nocffi -release
           haxelib run lime build linux -DCOMPILE_EXPERIMENTAL
       # - name: Tar files
       #   run: tar -zcvf CodenameEngine.tar.gz -C export/release/linux/bin .
@@ -108,7 +109,8 @@ jobs:
           haxe -cp commandline -D analyzer-optimize --run Main setup -s
       - name: Building the game
         run: |
-          haxelib run lime build linux -debug
+          haxelib run lime rebuild linux -nocolor -nocffi -debug
+          haxelib run lime build linux -debug -DCOMPILE_EXPERIMENTAL
       # - name: Tar files
       #   run: tar -zcvf CodenameEngine.tar.gz -C export/debug/linux/bin .
       - name: Uploading artifact (entire build)
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 79412650..bc054003 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -33,6 +33,7 @@ jobs:
           haxe -cp commandline -D analyzer-optimize --run Main setup -s
       - name: Building the game
         run: |
+          haxelib run lime rebuild mac -nocolor -nocffi -release
           haxelib run lime build mac -DCOMPILE_EXPERIMENTAL
       - name: Tar files
         run: tar -zcvf CodenameEngine.tar.gz -C export/release/macos/bin .
@@ -102,6 +103,7 @@ jobs:
           haxe -cp commandline -D analyzer-optimize --run Main setup -s
       - name: Building the game
         run: |
+          haxelib run lime rebuild mac -nocolor -nocffi -debug
           haxelib run lime build mac -debug -DCOMPILE_EXPERIMENTAL
       - name: Tar files
         run: tar -zcvf CodenameEngine.tar.gz -C export/debug/macos/bin .
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index be5dc8d2..fc8a11d5 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -33,6 +33,7 @@ jobs:
           haxe -cp commandline -D analyzer-optimize --run Main setup -s --no-vscheck
       - name: Building the game
         run: |
+          haxelib run lime rebuild windows -nocolor -nocffi -release
           haxelib run lime build windows -DCOMPILE_EXPERIMENTAL
       - name: Uploading artifact (executable)
         uses: actions/upload-artifact@v7
@@ -103,6 +104,7 @@ jobs:
           haxe -cp commandline -D analyzer-optimize --run Main setup -s --no-vscheck
       - name: Building the game
         run: |
+          haxelib run lime rebuild windows -nocolor -nocffi -debug
           haxelib run lime build windows -debug
       - name: Uploading artifact (entire build)
         uses: actions/upload-artifact@v7
diff --git a/building/libs.xml b/building/libs.xml
index 370981d5..d326030a 100644
--- a/building/libs.xml
+++ b/building/libs.xml
@@ -5,11 +5,11 @@
 
 		<!-- Hxcpp & OpenFL & Lime (Required for Flixel) -->
 		<git name="hxcpp" url="https://github.com/CodenameCrew/cne-hxcpp"/>
-		<git name="openfl" url="https://github.com/CodenameCrew/cne-openfl" ref="develop" skipDeps="true"/>
-		<git name="lime" url="https://github.com/CodenameCrew/cne-lime" ref="develop" skipDeps="true"/>
+		<git name="openfl" url="https://github.com/CodenameCrew/cne-openfl" ref="cne" skipDeps="true"/>
+		<git name="lime" url="https://github.com/CodenameCrew/cne-lime" ref="cne" skipDeps="true"/>
 
 		<!-- Flixel -->
-		<git name="flixel" url="https://github.com/CodenameCrew/cne-flixel" ref="dev" skipDeps="true"/>
+		<git name="flixel" url="https://github.com/CodenameCrew/cne-flixel" ref="cne" skipDeps="true"/>
 		<git name="flixel-addons" url="https://github.com/CodenameCrew/cne-flixel-addons" ref="dev" skipDeps="true"/>
 
 		<!-- CNE Core Libraries -->
@@ -19,8 +19,8 @@
 
 		<!-- Other Libraries -->
 		<git name="hxdiscord_rpc" url="https://github.com/CodenameCrew/cne-hxdiscord_rpc" skipDeps="true"/>
+		<git name="hxvlc" url="https://github.com/CodenameCrew/cne-hxvlc" skipDeps="true"/>
 		<lib name="funkin-modchart" skipDeps="true"/>
-		<lib name="hxvlc" skipDeps="true"/>
 		<lib name="hxcpp-debug-server"/>
 		<lib name="format"/>
 		<lib name="markdown"/>
@@ -37,6 +37,7 @@
 
 		<!-- Build hxcpp -->
 		<cmd inLib="hxcpp" dir="tools/hxcpp" cmd="haxe compile.hxml" />
+		<cmd inLib="lime" cmd="haxelib run lime rebuild hxcpp"/>
 	</if>
 
 	<!-- Lime Building -->