diff --git a/CMakeLists.txt b/CMakeLists.txt
index 90366340f..61b4afa07 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,13 @@
 cmake_minimum_required(VERSION 3.25 FATAL_ERROR)
+
+
+# Set defaults before project call
+if(PROJECT_IS_TOP_LEVEL)
+    set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
+endif()
+
+
+# Create project
 project(sourcepp)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -28,7 +37,7 @@ endif()
 option(FGDPP_ENABLE_SPEN_FGD_SUPPORT "Enable support for FGD alterations (https://github.com/TeamSpen210/HammerAddons/wiki/Unified-FGD) made by TeamSpen's HammerAddons. Fully backwards compatible with Valve's FGD standard." OFF)
 
 
-# Set defaults
+# Set defaults after project call
 if(PROJECT_IS_TOP_LEVEL)
     set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 endif()
diff --git a/ext/compressonator/CMakeLists.txt b/ext/compressonator/CMakeLists.txt
index ab735abe9..5c97b72d5 100644
--- a/ext/compressonator/CMakeLists.txt
+++ b/ext/compressonator/CMakeLists.txt
@@ -20,8 +20,8 @@ function(target_link_compressonator TARGET)
         endif()
     elseif(APPLE)
         target_link_libraries(${TARGET} PRIVATE
-                "${COMPRESSONATOR_DIR}/lib/osx_arm64/libCompressonator$<$<CONFIG:Debug>:d>.a"
-                "${COMPRESSONATOR_DIR}/lib/osx_arm64/libCMP_Core$<$<CONFIG:Debug>:d>.a")
+                "${COMPRESSONATOR_DIR}/lib/macOS/libCompressonator$<$<CONFIG:Debug>:d>.a"
+                "${COMPRESSONATOR_DIR}/lib/macOS/libCMP_Core$<$<CONFIG:Debug>:d>.a")
     elseif(UNIX)
         target_link_libraries(${TARGET} PRIVATE
                 "${COMPRESSONATOR_DIR}/lib/linux_x86_64/libCompressonator$<$<CONFIG:Debug>:d>.a"
diff --git a/ext/compressonator/lib/osx_arm64/libCMP_Core.a b/ext/compressonator/lib/macOS/libCMP_Core.a
similarity index 99%
rename from ext/compressonator/lib/osx_arm64/libCMP_Core.a
rename to ext/compressonator/lib/macOS/libCMP_Core.a
index 9b41c30c5..b334e5f1f 100644
Binary files a/ext/compressonator/lib/osx_arm64/libCMP_Core.a and b/ext/compressonator/lib/macOS/libCMP_Core.a differ
diff --git a/ext/compressonator/lib/osx_arm64/libCMP_Cored.a b/ext/compressonator/lib/macOS/libCMP_Cored.a
similarity index 99%
rename from ext/compressonator/lib/osx_arm64/libCMP_Cored.a
rename to ext/compressonator/lib/macOS/libCMP_Cored.a
index 8de9038ff..523764d44 100644
Binary files a/ext/compressonator/lib/osx_arm64/libCMP_Cored.a and b/ext/compressonator/lib/macOS/libCMP_Cored.a differ
diff --git a/ext/compressonator/lib/osx_arm64/libCompressonator.a b/ext/compressonator/lib/macOS/libCompressonator.a
similarity index 99%
rename from ext/compressonator/lib/osx_arm64/libCompressonator.a
rename to ext/compressonator/lib/macOS/libCompressonator.a
index 2bd3dbcc4..6ac269e9e 100644
Binary files a/ext/compressonator/lib/osx_arm64/libCompressonator.a and b/ext/compressonator/lib/macOS/libCompressonator.a differ
diff --git a/ext/compressonator/lib/osx_arm64/libCompressonatord.a b/ext/compressonator/lib/macOS/libCompressonatord.a
similarity index 99%
rename from ext/compressonator/lib/osx_arm64/libCompressonatord.a
rename to ext/compressonator/lib/macOS/libCompressonatord.a
index c40d34418..5c5e41bf9 100644
Binary files a/ext/compressonator/lib/osx_arm64/libCompressonatord.a and b/ext/compressonator/lib/macOS/libCompressonatord.a differ
diff --git a/ext/compressonator/lib/win_x86_64/CMP_Core_MD.lib b/ext/compressonator/lib/win_x86_64/CMP_Core_MD.lib
index 4d88219d1..0efe277be 100644
Binary files a/ext/compressonator/lib/win_x86_64/CMP_Core_MD.lib and b/ext/compressonator/lib/win_x86_64/CMP_Core_MD.lib differ
diff --git a/ext/compressonator/lib/win_x86_64/CMP_Core_MD_AVX.lib b/ext/compressonator/lib/win_x86_64/CMP_Core_MD_AVX.lib
index 0d0e056be..b578fb151 100644
Binary files a/ext/compressonator/lib/win_x86_64/CMP_Core_MD_AVX.lib and b/ext/compressonator/lib/win_x86_64/CMP_Core_MD_AVX.lib differ
diff --git a/ext/compressonator/lib/win_x86_64/CMP_Core_MD_AVX512.lib b/ext/compressonator/lib/win_x86_64/CMP_Core_MD_AVX512.lib
index 43a97540d..c08519b47 100644
Binary files a/ext/compressonator/lib/win_x86_64/CMP_Core_MD_AVX512.lib and b/ext/compressonator/lib/win_x86_64/CMP_Core_MD_AVX512.lib differ
diff --git a/ext/compressonator/lib/win_x86_64/CMP_Core_MD_AVX512d.lib b/ext/compressonator/lib/win_x86_64/CMP_Core_MD_AVX512d.lib
index b2e279ef2..97202b42f 100644
Binary files a/ext/compressonator/lib/win_x86_64/CMP_Core_MD_AVX512d.lib and b/ext/compressonator/lib/win_x86_64/CMP_Core_MD_AVX512d.lib differ
diff --git a/ext/compressonator/lib/win_x86_64/CMP_Core_MD_AVXd.lib b/ext/compressonator/lib/win_x86_64/CMP_Core_MD_AVXd.lib
index ced50396a..99a1b33cc 100644
Binary files a/ext/compressonator/lib/win_x86_64/CMP_Core_MD_AVXd.lib and b/ext/compressonator/lib/win_x86_64/CMP_Core_MD_AVXd.lib differ
diff --git a/ext/compressonator/lib/win_x86_64/CMP_Core_MD_SSE.lib b/ext/compressonator/lib/win_x86_64/CMP_Core_MD_SSE.lib
index 8fa071a4b..014aebdd5 100644
Binary files a/ext/compressonator/lib/win_x86_64/CMP_Core_MD_SSE.lib and b/ext/compressonator/lib/win_x86_64/CMP_Core_MD_SSE.lib differ
diff --git a/ext/compressonator/lib/win_x86_64/CMP_Core_MD_SSEd.lib b/ext/compressonator/lib/win_x86_64/CMP_Core_MD_SSEd.lib
index c87663ae0..61d410a9a 100644
Binary files a/ext/compressonator/lib/win_x86_64/CMP_Core_MD_SSEd.lib and b/ext/compressonator/lib/win_x86_64/CMP_Core_MD_SSEd.lib differ
diff --git a/ext/compressonator/lib/win_x86_64/CMP_Core_MDd.lib b/ext/compressonator/lib/win_x86_64/CMP_Core_MDd.lib
index 1bbe6bfa8..95c3ef771 100644
Binary files a/ext/compressonator/lib/win_x86_64/CMP_Core_MDd.lib and b/ext/compressonator/lib/win_x86_64/CMP_Core_MDd.lib differ
diff --git a/ext/compressonator/lib/win_x86_64/CMP_Core_MT.lib b/ext/compressonator/lib/win_x86_64/CMP_Core_MT.lib
index 271b28ff4..62660ca70 100644
Binary files a/ext/compressonator/lib/win_x86_64/CMP_Core_MT.lib and b/ext/compressonator/lib/win_x86_64/CMP_Core_MT.lib differ
diff --git a/ext/compressonator/lib/win_x86_64/CMP_Core_MT_AVX.lib b/ext/compressonator/lib/win_x86_64/CMP_Core_MT_AVX.lib
index 636dc9ebb..87defa8f6 100644
Binary files a/ext/compressonator/lib/win_x86_64/CMP_Core_MT_AVX.lib and b/ext/compressonator/lib/win_x86_64/CMP_Core_MT_AVX.lib differ
diff --git a/ext/compressonator/lib/win_x86_64/CMP_Core_MT_AVX512.lib b/ext/compressonator/lib/win_x86_64/CMP_Core_MT_AVX512.lib
index 02bf520b3..7a8681eff 100644
Binary files a/ext/compressonator/lib/win_x86_64/CMP_Core_MT_AVX512.lib and b/ext/compressonator/lib/win_x86_64/CMP_Core_MT_AVX512.lib differ
diff --git a/ext/compressonator/lib/win_x86_64/CMP_Core_MT_AVX512d.lib b/ext/compressonator/lib/win_x86_64/CMP_Core_MT_AVX512d.lib
index ef162b26d..41ef859f2 100644
Binary files a/ext/compressonator/lib/win_x86_64/CMP_Core_MT_AVX512d.lib and b/ext/compressonator/lib/win_x86_64/CMP_Core_MT_AVX512d.lib differ
diff --git a/ext/compressonator/lib/win_x86_64/CMP_Core_MT_AVXd.lib b/ext/compressonator/lib/win_x86_64/CMP_Core_MT_AVXd.lib
index 662616449..9db8d8d7c 100644
Binary files a/ext/compressonator/lib/win_x86_64/CMP_Core_MT_AVXd.lib and b/ext/compressonator/lib/win_x86_64/CMP_Core_MT_AVXd.lib differ
diff --git a/ext/compressonator/lib/win_x86_64/CMP_Core_MT_SSE.lib b/ext/compressonator/lib/win_x86_64/CMP_Core_MT_SSE.lib
index 0626a4507..2bf68a0ee 100644
Binary files a/ext/compressonator/lib/win_x86_64/CMP_Core_MT_SSE.lib and b/ext/compressonator/lib/win_x86_64/CMP_Core_MT_SSE.lib differ
diff --git a/ext/compressonator/lib/win_x86_64/CMP_Core_MT_SSEd.lib b/ext/compressonator/lib/win_x86_64/CMP_Core_MT_SSEd.lib
index 04b19ca20..538cee480 100644
Binary files a/ext/compressonator/lib/win_x86_64/CMP_Core_MT_SSEd.lib and b/ext/compressonator/lib/win_x86_64/CMP_Core_MT_SSEd.lib differ
diff --git a/ext/compressonator/lib/win_x86_64/CMP_Core_MTd.lib b/ext/compressonator/lib/win_x86_64/CMP_Core_MTd.lib
index 7e20d4456..1a21c9d03 100644
Binary files a/ext/compressonator/lib/win_x86_64/CMP_Core_MTd.lib and b/ext/compressonator/lib/win_x86_64/CMP_Core_MTd.lib differ
diff --git a/ext/compressonator/lib/win_x86_64/Compressonator_MD.lib b/ext/compressonator/lib/win_x86_64/Compressonator_MD.lib
index 5188ae8d1..1c3f6b54c 100644
Binary files a/ext/compressonator/lib/win_x86_64/Compressonator_MD.lib and b/ext/compressonator/lib/win_x86_64/Compressonator_MD.lib differ
diff --git a/ext/compressonator/lib/win_x86_64/Compressonator_MDd.lib b/ext/compressonator/lib/win_x86_64/Compressonator_MDd.lib
index 97baa0d29..46aef8db7 100644
Binary files a/ext/compressonator/lib/win_x86_64/Compressonator_MDd.lib and b/ext/compressonator/lib/win_x86_64/Compressonator_MDd.lib differ
diff --git a/ext/compressonator/lib/win_x86_64/Compressonator_MT.lib b/ext/compressonator/lib/win_x86_64/Compressonator_MT.lib
index fc9e0e6f1..49197349a 100644
Binary files a/ext/compressonator/lib/win_x86_64/Compressonator_MT.lib and b/ext/compressonator/lib/win_x86_64/Compressonator_MT.lib differ
diff --git a/ext/compressonator/lib/win_x86_64/Compressonator_MTd.lib b/ext/compressonator/lib/win_x86_64/Compressonator_MTd.lib
index 02680738a..d863c69f8 100644
Binary files a/ext/compressonator/lib/win_x86_64/Compressonator_MTd.lib and b/ext/compressonator/lib/win_x86_64/Compressonator_MTd.lib differ