diff --git a/.clang-format b/.clang-format
index b8cef3e9..57be240f 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,9 +1,35 @@
-# Documentation about the style options and their meaning
-# https://releases.llvm.org/12.0.0/tools/clang/docs/ClangFormatStyleOptions.html 
-
-Language:        Cpp
-AccessModifierOffset: 0
-AlignConsecutiveMacros: true
+---
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: 'true'
+AlignConsecutiveDeclarations: 'true'
+AlignTrailingComments: 'true'
+AllowAllArgumentsOnNextLine: 'false'
+AllowAllParametersOfDeclarationOnNextLine: 'false'
+AlwaysBreakBeforeMultilineStrings: 'false'
+AlwaysBreakTemplateDeclarations: 'Yes'
+BinPackArguments: 'false'
+BinPackParameters: 'false'
 BreakBeforeBraces: Linux
-ColumnLimit:     150
-ConstructorInitializerIndentWidth: 2
+ColumnLimit: '100'
+ConstructorInitializerAllOnOneLineOrOnePerLine: 'true'
+FixNamespaceComments: 'true'
+IndentAccessModifiers: 'true'
+IndentCaseLabels: 'true'
+IndentWidth: '2'
+Language: Cpp
+NamespaceIndentation: All
+PointerAlignment: Left
+SpaceAfterCStyleCast: 'true'
+SpaceAfterLogicalNot: 'false'
+SpaceAfterTemplateKeyword: 'false'
+SpaceBeforeAssignmentOperators: 'true'
+SpaceBeforeCtorInitializerColon: 'true'
+SpaceBeforeInheritanceColon: 'true'
+SpaceBeforeParens: ControlStatements
+SpacesInParentheses: 'false'
+SpacesInSquareBrackets: 'false'
+Standard: Cpp11
+TabWidth: '2'
+UseTab: Never
+
+...