diff --git a/.clang-format b/.clang-format
index d4365e1..edd8dd3 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,41 +1,58 @@
 ---
-BasedOnStyle: Chromium
-AlignEscapedNewlinesLeft: 'true'
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: 'true'
+AlignEscapedNewlines: Left
+AlignOperands: 'true'
 AlignTrailingComments: 'true'
+AllowAllParametersOfDeclarationOnNextLine: 'true'
 AllowShortBlocksOnASingleLine: 'true'
+AllowShortCaseLabelsOnASingleLine: 'true'
+AllowShortFunctionsOnASingleLine: Empty
 AllowShortIfStatementsOnASingleLine: 'false'
 AllowShortLoopsOnASingleLine: 'false'
-AlwaysBreakBeforeMultilineStrings: 'true'
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: 'false'
 AlwaysBreakTemplateDeclarations: 'true'
-BreakBeforeBinaryOperators: 'true'
-BreakBeforeBraces: Stroustrup
+BinPackArguments: 'true'
+BinPackParameters: 'true'
+BreakAfterJavaFieldAnnotations: 'true'
+BreakBeforeBinaryOperators: All
+BreakBeforeBraces: Linux
+BreakBeforeInheritanceComma: 'false'
 BreakBeforeTernaryOperators: 'true'
-BreakConstructorInitializersBeforeComma: 'false'
+BreakConstructorInitializers: BeforeColon
+BreakStringLiterals: 'true'
 ColumnLimit: '80'
-ConstructorInitializerAllOnOneLineOrOnePerLine: 'true'
+CompactNamespaces: 'false'
+ConstructorInitializerAllOnOneLineOrOnePerLine: 'false'
 Cpp11BracedListStyle: 'true'
+FixNamespaceComments: 'true'
+IncludeBlocks: Regroup
 IndentCaseLabels: 'false'
+IndentPPDirectives: AfterHash
+IndentWrappedFunctionNames: 'false'
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: 'true'
 KeepEmptyLinesAtTheStartOfBlocks: 'false'
 Language: Cpp
-MaxEmptyLinesToKeep: '2'
-PointerAlignment: Left
+MaxEmptyLinesToKeep: '1'
+NamespaceIndentation: Inner
+PointerAlignment: Right
+ReflowComments: 'true'
+SortIncludes: 'true'
+SortUsingDeclarations: 'true'
+SpaceAfterCStyleCast: 'false'
+SpaceAfterTemplateKeyword: 'false'
 SpaceBeforeAssignmentOperators: 'true'
 SpaceBeforeParens: ControlStatements
 SpaceInEmptyParentheses: 'false'
+SpacesBeforeTrailingComments: '2'
 SpacesInAngles: 'false'
 SpacesInCStyleCastParentheses: 'false'
+SpacesInContainerLiterals: 'false'
 SpacesInParentheses: 'false'
+SpacesInSquareBrackets: 'false'
 Standard: Cpp11
-TabWidth: '2'
 UseTab: ForIndentation
-IncludeCategories:
-  - Regex:           '^"(llvm-c|clang-c)/'
-    Priority:        2
-  - Regex:           '^"(llvm|clang)/'
-    Priority:        3
-  - Regex:           '^(<|"(gtest|isl|json)/)'
-    Priority:        4
-  - Regex:           '.*'
-    Priority:        1
 
 ...