diff --git a/.clang-format b/.clang-format
index 2a9205219a..565f28130e 100644
--- a/.clang-format
+++ b/.clang-format
@@ -7,28 +7,33 @@ AlignConsecutiveDeclarations: false
 AlignEscapedNewlines: Right
 AlignOperands: false
 AlignTrailingComments: false
+AllowAllArgumentsOnNextLine: true
 AllowAllParametersOfDeclarationOnNextLine: true
 AllowShortFunctionsOnASingleLine: None
+AllowShortLambdasOnASingleLine: None
 AlwaysBreakAfterReturnType: None
 AlwaysBreakTemplateDeclarations: true
 BreakBeforeBraces: Custom
 BraceWrapping:
     AfterClass: true
+    AfterControlStatement: true
     AfterEnum: true
     AfterFunction: true
     AfterNamespace: true
+    BeforeLambdaBody: true
     AfterStruct: true
-    SplitEmptyFunction: true
-    AfterControlStatement: true
     BeforeElse: true
+    SplitEmptyFunction: true
 BreakBeforeTernaryOperators: true
 BreakConstructorInitializers: BeforeComma
+BreakInheritanceList: BeforeComma
 ColumnLimit: 140
 ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 4
-Cpp11BracedListStyle: true
+Cpp11BracedListStyle: false
 FixNamespaceComments: true
 IncludeBlocks: Preserve
+IndentCaseBlocks: true
 IndentCaseLabels: false
 IndentPPDirectives: None
 IndentWidth: 4
@@ -38,27 +43,17 @@ NamespaceIndentation: All
 PenaltyReturnTypeOnItsOwnLine: 1000
 PointerAlignment: Left
 SortIncludes: true
+SpaceAfterLogicalNot: false
 SpaceAfterTemplateKeyword: false
 SpaceBeforeAssignmentOperators: true
+SpaceBeforeCpp11BracedList: true
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
 SpaceBeforeParens: ControlStatements
+SpaceBeforeRangeBasedForLoopColon: true
 SpaceInEmptyParentheses: false
 SpacesInAngles: false
 SpacesInCStyleCastParentheses: false
 SpacesInParentheses: false
+Standard: c++17
 UseTab: Never
-
-# Not available in clang-format version 6.0.0
-#  BasedOnStyle: Microsoft
-#  Standard: c++17
-#  AllowAllArgumentsOnNextLine: true
-#  AllowShortLambdasOnASingleLine: None
-#  BreakInheritanceList: BeforeComma
-#  SpaceAfterLogicalNot: false
-#  SpaceBeforeCpp11BracedList: false
-#  SpaceBeforeCtorInitializerColon: true
-#  SpaceBeforeInheritanceColon: true
-#  SpaceBeforeRangeBasedForLoopColon: true
-
-# Not available in clang-format version 10.0.0
-#  BeforeLambdaBody: true (BraceWrapping)
-#  IndentCaseBlocks: true