diff --git a/.clang-format b/.clang-format
index 8343aa31..ad2ec55a 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,50 +1,51 @@
-# .clang-format for Cutelyst projects 2023-04-18
+# .clang-format for Cutelyst projects 2023-09-15
 # Tries to be close to Qt coding style
 # but meh for ASql lambdas which LambdaBodyIndentation ins't enough
 ---
+Language: Cpp
 AccessModifierOffset: -4
 AlignAfterOpenBracket: Align
-AlignConsecutiveMacros: 'false'
-AlignConsecutiveAssignments: 'true'
-AlignConsecutiveDeclarations: 'false'
-AllowShortEnumsOnASingleLine: 'true'
+AlignConsecutiveMacros: false
+AlignConsecutiveAssignments: true
+AlignConsecutiveDeclarations: false
+AllowShortEnumsOnASingleLine: true
 AlignEscapedNewlines: DontAlign
-AlignOperands: 'true'
-AlignTrailingComments: 'true'
-AllowAllArgumentsOnNextLine: 'true'
-AllowAllParametersOfDeclarationOnNextLine: 'false'
-AllowShortBlocksOnASingleLine: 'false'
-AllowShortCaseLabelsOnASingleLine: 'false'
-AllowShortFunctionsOnASingleLine: Inline
+AlignOperands: true
+AlignTrailingComments: true
+AllowAllArgumentsOnNextLine: true
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: InlineOnly
 AllowShortIfStatementsOnASingleLine: Never
 AllowShortLambdasOnASingleLine: Inline
-AllowShortLoopsOnASingleLine: 'false'
+AllowShortLoopsOnASingleLine: false
 AlwaysBreakAfterReturnType: None
-AlwaysBreakBeforeMultilineStrings: 'false'
+AlwaysBreakBeforeMultilineStrings: false
 AlwaysBreakTemplateDeclarations: 'Yes'
-BinPackArguments: 'false'
-BinPackParameters: 'false'
+BinPackArguments: false
+BinPackParameters: false
 BreakBeforeBinaryOperators: None
 BreakBeforeBraces: Custom
 BraceWrapping:
-    AfterCaseLabel: 'true'
-    AfterClass: 'true'
-    AfterEnum: 'false'
+    AfterCaseLabel: true
+    AfterClass: true
+    AfterEnum: false
     AfterFunction:   true
-    SplitEmptyFunction: 'true'
-    SplitEmptyRecord: 'true'
-    SplitEmptyNamespace: 'true'
-BreakBeforeTernaryOperators: 'true'
+    SplitEmptyFunction: true
+    SplitEmptyRecord: true
+    SplitEmptyNamespace: true
+BreakBeforeTernaryOperators: true
 BreakConstructorInitializers: BeforeComma
 BreakInheritanceList: BeforeComma
-BreakStringLiterals: 'true'
-CompactNamespaces: 'false'
-ConstructorInitializerAllOnOneLineOrOnePerLine: 'false'
+BreakStringLiterals: true
+CompactNamespaces: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
 ConstructorInitializerIndentWidth: '4'
 ContinuationIndentWidth: '4'
 ColumnLimit: 100
-Cpp11BracedListStyle: 'true'
-FixNamespaceComments: 'true'
+Cpp11BracedListStyle: true
+FixNamespaceComments: true
 ForEachMacros:
   - forever # avoids { wrapped to next line
   - foreach
@@ -54,34 +55,33 @@ IncludeCategories:
   - Regex:           '^<Q.*'
     Priority:        200
 IncludeBlocks: Regroup
-IndentAccessModifiers: 'false'
-IndentCaseLabels: 'false'
+IndentAccessModifiers: false
+IndentCaseLabels: false
 IndentPPDirectives: AfterHash
 IndentWidth: '4'
-IndentWrappedFunctionNames: 'true'
-KeepEmptyLinesAtTheStartOfBlocks: 'true'
-Language: Cpp
+IndentWrappedFunctionNames: true
+KeepEmptyLinesAtTheStartOfBlocks: true
 LambdaBodyIndentation: OuterScope
 NamespaceIndentation: None
 PointerAlignment: Right
-ReflowComments: 'true'
-SortIncludes: 'true'
-SortUsingDeclarations: 'false'
-SpaceAfterCStyleCast: 'true'
-SpaceAfterLogicalNot: 'false'
-SpaceAfterTemplateKeyword: 'true'
-SpaceBeforeAssignmentOperators: 'true'
-SpaceBeforeCpp11BracedList: 'false'
-SpaceBeforeCtorInitializerColon: 'true'
-SpaceBeforeInheritanceColon: 'true'
+ReflowComments: true
+SortIncludes: true
+SortUsingDeclarations: false
+SpaceAfterCStyleCast: true
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
 SpaceBeforeParens: ControlStatements
-SpaceBeforeRangeBasedForLoopColon: 'true'
-SpaceInEmptyParentheses: 'false'
-SpacesInAngles: 'false'
-SpacesInCStyleCastParentheses: 'false'
-SpacesInContainerLiterals: 'false'
-SpacesInParentheses: 'false'
-SpacesInSquareBrackets: 'false'
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceInEmptyParentheses: false
+SpacesInAngles: false
+SpacesInCStyleCastParentheses: false
+SpacesInContainerLiterals: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
 Standard: Cpp11
 StatementMacros:
   - Q_UNUSED
@@ -90,4 +90,8 @@ WhitespaceSensitiveMacros:
   - C_ATTR
 UseTab: Never
 
+---
+Language: Json
+BasedOnStyle: llvm
+
 ...
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 00000000..33d019ec
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,13 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+exclude: ^(cmake/)
+repos:
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v4.4.0
+  hooks:
+  - id: trailing-whitespace
+  - id: end-of-file-fixer
+- repo: https://github.com/pre-commit/mirrors-clang-format
+  rev: v16.0.6
+  hooks:
+  - id: clang-format