diff --git a/.clang-format b/.clang-format
index f610d309..d9a26653 100644
--- a/.clang-format
+++ b/.clang-format
@@ -9,7 +9,7 @@ AlwaysBreakTemplateDeclarations: No
 BreakBeforeBraces: Attach
 ColumnLimit: 100
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
-IncludeBlocks: Regroup
+IncludeBlocks: Merge
 IndentPPDirectives: AfterHash
 IndentWidth: 2
 NamespaceIndentation: All
diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml
index 2ad9ba16..3089bf95 100644
--- a/.github/workflows/osx.yml
+++ b/.github/workflows/osx.yml
@@ -28,7 +28,7 @@ jobs:
           key: ${{ github.workflow }}-cpm-modules-${{ hashFiles('**/CMakeLists.txt', '**/*.cmake') }}
 
       - name: Configure CMake
-        run: cmake -Bbuild -H. -DCMAKE_BUILD_TYPE=MinSizeRel -DBUILD_EDITOR=ON
+        run: cmake -Bbuild -H. -DCMAKE_BUILD_TYPE=MinSizeRel
 
       - name: Build
         run: cmake --build build/ --parallel
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6d7a3815..13d43210 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -52,7 +52,7 @@ jobs:
           sudo apt install -y build-essential cmake mesa-common-dev libgl1-mesa-dev libx11-dev mesa-common-dev mesa-utils libgl-dev python3-distutils libgl1-mesa-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev
 
       - name: configure
-        run: cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release -DENABLE_TEST_COVERAGE=ON
+        run: cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release -DENABLE_TEST_COVERAGE=OFF
 
       - name: build
         run: cmake --build build --parallel --config MinSizeRel
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 7b1e0c1e..2cd239f2 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -28,7 +28,7 @@ jobs:
 
       - name: Configure CMake
         shell: cmd
-        run: cmake -H. -Bbuild -G "Visual Studio 17 2022" -T ClangCL -DCMAKE_BUILD_TYPE=MinSizeRel -DBUILD_EDITOR=ON
+        run: cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=MinSizeRel -DENABLE_TEST_COVERAGE=OFF
 
       - name: Build
         shell: cmd
diff --git a/scripts/emscripten-build.sh b/scripts/emscripten-build.sh
index e1b4fdf1..b30f3070 100755
--- a/scripts/emscripten-build.sh
+++ b/scripts/emscripten-build.sh
@@ -24,6 +24,6 @@ cmake --version
 
 emcmake cmake --version
 
-emcmake cmake -DCMAKE_C_ABI_COMPILED=ON -DCMAKE_CXX_ABI_COMPILED=ON -DEMSCRIPTEN=1 -DCMAKE_BUILD_TYPE=MinSizeRel -H. -Bbin-emscripten -DBUILD_EDITOR=ON
+emcmake cmake -DCMAKE_C_ABI_COMPILED=ON -DCMAKE_CXX_ABI_COMPILED=ON -DEMSCRIPTEN=1 -DCMAKE_BUILD_TYPE=MinSizeRel -H. -Bbin-emscripten
 
 cmake --build bin-emscripten/ --parallel
\ No newline at end of file
diff --git a/scripts/windows-build.bat b/scripts/windows-build.bat
index 5bfea286..2ac6680d 100644
--- a/scripts/windows-build.bat
+++ b/scripts/windows-build.bat
@@ -1,2 +1,2 @@
-cmake -H. -Bbuild -G "Visual Studio 16 2019" -T ClangCL -DCMAKE_BUILD_TYPE=MinSizeRel -DBUILD_EDITOR=ON
+cmake -H. -Bbuild -G "Visual Studio 16 2019" -T ClangCL -DCMAKE_BUILD_TYPE=MinSizeRel
 cmake --build build --config MinSizeRel
\ No newline at end of file