diff --git a/manifoldConfig.cmake.in b/manifoldConfig.cmake.in
index 06a019a8e..710f0f26f 100644
--- a/manifoldConfig.cmake.in
+++ b/manifoldConfig.cmake.in
@@ -15,18 +15,18 @@ set(glm_ROOT "${_FIND_ROOT}")
 find_package(glm REQUIRED)
 set(MANIFOLD_CROSS_SECTION "@MANIFOLD_CROSS_SECTION@")
 if(MANIFOLD_CROSS_SECTION)
-	set(Clipper2_ROOT "${_FIND_ROOT}")
-	find_package(Clipper2 REQUIRED)
+  set(Clipper2_ROOT "${_FIND_ROOT}")
+  find_package(Clipper2 REQUIRED)
 endif()
 set(MANIFOLD_PAR "@MANIFOLD_PAR@")
 if(MANIFOLD_PAR STREQUAL "ON")
-	find_package(TBB REQUIRED)
-	if(APPLE)
-		find_package(oneDPL REQUIRED)
-	endif()
+  find_package(TBB REQUIRED)
+  if(APPLE)
+    find_package(oneDPL REQUIRED)
+  endif()
 endif()
 set(MANIFOLD_EXPORT "@MANIFOLD_EXPORT@")
 if(MANIFOLD_EXPORT)
-	find_package(assimp REQUIRED)
+  find_package(assimp REQUIRED)
 endif(MANIFOLD_EXPORT)
 include("${CMAKE_CURRENT_LIST_DIR}/manifoldTargets.cmake")
diff --git a/scripts/format.sh b/scripts/format.sh
index 487c9cb7b..bc26793b2 100755
--- a/scripts/format.sh
+++ b/scripts/format.sh
@@ -6,16 +6,17 @@ CLANG_FORMAT=clang-format
 fi
 
 $CLANG_FORMAT -i extras/*.cpp
-$CLANG_FORMAT -i meshIO/**/*.{h,cpp}
-$CLANG_FORMAT -i samples/**/*.{h,cpp}
+$CLANG_FORMAT -i samples/*/*.{h,cpp}
 $CLANG_FORMAT -i test/*.{h,cpp}
 $CLANG_FORMAT -i bindings/*/*.cpp
 $CLANG_FORMAT -i bindings/c/include/manifold/*.h
 $CLANG_FORMAT -i bindings/wasm/*.{js,ts}
 $CLANG_FORMAT -i bindings/wasm/examples/*.{js,ts,html}
 $CLANG_FORMAT -i bindings/wasm/examples/public/*.{js,ts}
-$CLANG_FORMAT -i src/*/src/*.{h,cpp}
-$CLANG_FORMAT -i src/*/include/manifold/*.h
+$CLANG_FORMAT -i src/*.{h,cpp}
+$CLANG_FORMAT -i src/*/*.cpp
+$CLANG_FORMAT -i include/manifold/*.h
+
 black bindings/python/examples/*.py
 
 for f in $(find -name CMakeLists.txt); do
@@ -24,3 +25,10 @@ for f in $(find -name CMakeLists.txt); do
     cmake-format -i $f
   fi
 done
+
+for f in $(find -name '*.cmake.in'); do
+  # skip build directories
+  if [[ $f != *build* ]]; then
+    cmake-format -i $f
+  fi
+done