diff --git a/.cmake-format.yaml b/.cmake-format.yaml
index b4985a9564356a15e0c9b564b0c1bdf888135ce3..0c4294e388e556b8c32dc630cf08281c8e50ed3a 100644
--- a/.cmake-format.yaml
+++ b/.cmake-format.yaml
@@ -1,3 +1,134 @@
-# E.g. run with: fd CMakeLists.txt Applications/ -x cmake-format -i -c .cmake-format.yaml {}
-tab_size: 4
-max_subargs_per_line: 4
+format:
+  tab_size: 4
+  max_subgroups_hwrap: 3
+  dangle_parens: true
+  command_case: "unchanged"
+
+parse:
+  additional_commands:
+    addtest:
+      pargs:
+        nargs: '*'
+        flags:
+        - DISABLED
+      spelling: AddTest
+      kwargs:
+        EXECUTABLE: 1
+        PATH: 1
+        NAME: 1
+        WRAPPER: 1
+        TESTER: 1
+        ABSTOL: 1
+        RELTOL: 1
+        RUNTIME: 1
+        DEPENDS: 1
+        WORKING_DIRECTORY: 1
+        EXECUTABLE_ARGS: +
+        DATA: +
+        DIFF_DATA:
+          pargs:
+            tags:
+            - cmdline
+        WRAPPER_ARGS: +
+        REQUIREMENTS: +
+        PYTHON_PACKAGES: +
+        VIS: +
+
+    ogstest:
+      pargs:
+        nargs: '*'
+        flags:
+        - DISABLED
+      spelling: OgsTest
+      kwargs:
+        PROJECTFILE: 1
+        RUNTIME: 1
+        WRAPPER: +
+
+    meshtest:
+      pargs:
+        nargs: '*'
+        flags:
+        - NONE
+      spelling: MeshTest
+      kwargs:
+        EXECUTABLE: 1
+        PATH: 1
+        NAME: 1
+        WRAPPER: 1
+        RUNTIME: 1
+        WORKING_DIRECTORY: 1
+        EXECUTABLE_ARGS: +
+        DATA: +
+        DIFF_DATA:
+          pargs:
+            tags:
+            - cmdline
+        WRAPPER_ARGS: +
+        REQUIREMENTS: +
+
+    cpmaddpackage:
+      pargs:
+        nargs: '*'
+        flags: []
+      spelling: CPMAddPackage
+      kwargs: &cpmaddpackagekwargs
+        NAME: 1
+        FORCE: 1
+        VERSION: 1
+        GIT_TAG: 1
+        DOWNLOAD_ONLY: 1
+        GITHUB_REPOSITORY: 1
+        GITLAB_REPOSITORY: 1
+        GIT_REPOSITORY: 1
+        SVN_REPOSITORY: 1
+        SVN_REVISION: 1
+        SOURCE_DIR: 1
+        DOWNLOAD_COMMAND: 1
+        FIND_PACKAGE_ARGUMENTS: 1
+        NO_CACHE: 1
+        GIT_SHALLOW: 1
+        URL: 1
+        URL_HASH: 1
+        URL_MD5: 1
+        DOWNLOAD_NAME: 1
+        DOWNLOAD_NO_EXTRACT: 1
+        HTTP_USERNAME: 1
+        HTTP_PASSWORD: 1
+        EXCLUDE_FROM_ALL: 1
+        OPTIONS: +
+    cpmfindpackage:
+      pargs:
+        nargs: '*'
+        flags: []
+      spelling: CPMFindPackage
+      kwargs: *cpmaddpackagekwargs
+    cpmdeclarepackage:
+      pargs:
+        nargs: '*'
+        flags: []
+      spelling: CPMDeclarePackage
+      kwargs: *cpmaddpackagekwargs
+    packageproject:
+      pargs:
+        nargs: '*'
+        flags: []
+      spelling: packageProject
+      kwargs:
+        NAME: 1
+        VERSION: 1
+        INCLUDE_DIR: 1
+        INCLUDE_DESTINATION: 1
+        BINARY_DIR: 1
+        COMPATIBILITY: 1
+        VERSION_HEADER: 1
+        DEPENDENCIES: +
+    cpmusepackagelock:
+      pargs: 1
+      spelling: CPMUsePackageLock
+    cpmregisterpackage:
+      pargs: 1
+      spelling: CPMRegisterPackage
+    cpmgetpackageversion:
+      pargs: 2
+      spelling: CPMGetPackageVersion
diff --git a/.editorconfig b/.editorconfig
index e4d57b0bad17215680138b0a0d5dee27020b7009..fd514fec516b3c0ac29c70a518b4ead9e3815eb1 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -8,5 +8,5 @@ indent_size = 4
 [*.{md,pandoc}]
 trim_trailing_whitespace = false
 
-[*.{json,yml,toml,html,css,js,scss}]
+[*.{json,yml,yaml,toml,html,css,js,scss}]
 indent_size = 2