diff --git a/lint-configs/.clang-format b/lint-configs/.clang-format
index 0d8b689..1060bcd 100644
--- a/lint-configs/.clang-format
+++ b/lint-configs/.clang-format
@@ -20,6 +20,7 @@ AllowAllArgumentsOnNextLine: false
 AllowAllParametersOfDeclarationOnNextLine: false
 AllowBreakBeforeNoexceptSpecifier: "OnlyWithParen"
 AllowShortBlocksOnASingleLine: "Always"
+AllowShortCaseExpressionOnASingleLine: false
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortCompoundRequirementOnASingleLine: true
 AllowShortEnumsOnASingleLine: false
@@ -27,9 +28,7 @@ AllowShortFunctionsOnASingleLine: "Inline"
 AllowShortIfStatementsOnASingleLine: "Never"
 AllowShortLambdasOnASingleLine: "All"
 AllowShortLoopsOnASingleLine: false
-AlwaysBreakAfterReturnType: "None"
 AlwaysBreakBeforeMultilineStrings: false
-AlwaysBreakTemplateDeclarations: "Yes"
 BinPackArguments: false
 BinPackParameters: false
 BitFieldColonSpacing: "Both"
@@ -52,6 +51,7 @@ BraceWrapping:
   SplitEmptyNamespace: false
   SplitEmptyRecord: false
 BreakAfterAttributes: "Never"
+BreakAfterReturnType: "Automatic"
 BreakBeforeBinaryOperators: "All"
 BreakBeforeBraces: "Custom"
 BreakBeforeConceptDeclarations: "Always"
@@ -60,6 +60,7 @@ BreakBeforeTernaryOperators: true
 BreakConstructorInitializers: "BeforeColon"
 BreakInheritanceList: "BeforeColon"
 BreakStringLiterals: true
+BreakTemplateDeclarations: "Yes"
 CompactNamespaces: true
 ConstructorInitializerIndentWidth: 8
 ContinuationIndentWidth: 8
@@ -87,7 +88,10 @@ IntegerLiteralSeparator:
   DecimalMinDigits: 5
   Hex: 4
   HexMinDigits: 4
-KeepEmptyLinesAtTheStartOfBlocks: false
+KeepEmptyLines:
+  AtEndOfFile: true
+  AtStartOfBlock: false
+  AtStartOfFile: false
 LambdaBodyIndentation: "Signature"
 LineEnding: "LF"
 MaxEmptyLinesToKeep: 1
@@ -139,6 +143,7 @@ SpacesInLineCommentPrefix:
   Maximum: -1
 SpacesInParens: "Custom"
 SpacesInParensOptions:
+  ExceptDoubleParentheses: false
   InConditionalStatements: false
   InCStyleCasts: false
   InEmptyParentheses: false