diff --git a/.clang-format b/.clang-format
index 4be096155..1db97481a 100644
--- a/.clang-format
+++ b/.clang-format
@@ -3,7 +3,9 @@ AccessModifierOffset: -4
 ColumnLimit: 120
 ---
 Language: Cpp
-BreakBeforeBraces: Custom
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortFunctionsOnASingleLine: None
+BinPackParameters: false
 BraceWrapping:
   AfterClass: true
   AfterControlStatement: false
@@ -18,18 +20,14 @@ BraceWrapping:
   SplitEmptyFunction: true
   SplitEmptyRecord: true
   SplitEmptyNamespace: true
-AllowShortFunctionsOnASingleLine: None
-BinPackParameters: false
-AllowAllParametersOfDeclarationOnNextLine: false
-IndentCaseLabels: true
-PointerAlignment: Right
-SortIncludes: true
+BreakBeforeBraces: Custom
 IncludeBlocks: Regroup
-StatementAttributeLikeMacros: [emit]
-# requires clang-format 15
+IndentCaseLabels: true
 InsertBraces: true
-# requires clang-format 16
-# RemoveSemicolon: true
+PointerAlignment: Right
+RemoveSemicolon: true
+SortIncludes: true
+StatementAttributeLikeMacros: [emit]
 ---
 Language: Proto
 AllowShortFunctionsOnASingleLine: None
diff --git a/format.sh b/format.sh
index f8c183dfc..c43f537f5 100755
--- a/format.sh
+++ b/format.sh
@@ -14,13 +14,7 @@ cd "${BASH_SOURCE%/*}/" || exit 2 # could not find path, this could happen with
 
 # defaults
 include=("cockatrice/src" \
-"libcockatrice_card" \
-"libcockatrice_deck_list" \
-"libcockatrice_network" \
-"libcockatrice_protocol" \
-"libcockatrice_rng" \
-"libcockatrice_settings" \
-"libcockatrice_utility" \
+libcockatrice_* \
 "oracle/src" \
 "servatrice/src" \
 "tests")