diff --git a/.clang-format b/.clang-format
index 0109e4f878d2a4c02ffbd45b531e2c2f96ec96b0..d1ee229f96f6015a3294f87431b4e1f64e5042a3 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,37 +1,43 @@
 ---
-BasedOnStyle: LLVM
+BasedOnStyle: Mozilla
 AccessModifierOffset: '-1'
-AlignConsecutiveAssignments: 'false'
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: 'true'
+AlignConsecutiveDeclarations: 'false'
 AlignEscapedNewlines: Left
 AlignOperands: 'true'
 AlignTrailingComments: 'true'
 AllowAllParametersOfDeclarationOnNextLine: 'false'
+AllowShortBlocksOnASingleLine: 'false'
+AllowShortCaseLabelsOnASingleLine: 'false'
+AllowShortFunctionsOnASingleLine: Empty
 AllowShortIfStatementsOnASingleLine: 'false'
-AllowShortLoopsOnASingleLine: 'true'
-AlwaysBreakAfterDefinitionReturnType: All
-AlwaysBreakAfterReturnType: All
+AllowShortLoopsOnASingleLine: 'false'
+AlwaysBreakAfterReturnType: AllDefinitions
+AlwaysBreakBeforeMultilineStrings: 'false'
 AlwaysBreakTemplateDeclarations: 'Yes'
-BinPackArguments: 'false'
+BinPackArguments: 'true'
 BinPackParameters: 'false'
 BreakBeforeBinaryOperators: None
 BreakBeforeBraces: Mozilla
-ColumnLimit: '100'
+BreakConstructorInitializers: BeforeColon
+ColumnLimit: '80'
+CompactNamespaces: 'true'
 ConstructorInitializerAllOnOneLineOrOnePerLine: 'true'
 Cpp11BracedListStyle: 'true'
 FixNamespaceComments: 'true'
-IndentWidth: '2'
+KeepEmptyLinesAtTheStartOfBlocks: 'false'
+Language: Cpp
+MaxEmptyLinesToKeep: '1'
+NamespaceIndentation: None
 PointerAlignment: Left
 ReflowComments: 'true'
-SortIncludes: 'true'
 SortUsingDeclarations: 'true'
 SpaceAfterTemplateKeyword: 'true'
 SpaceBeforeAssignmentOperators: 'true'
-SpaceBeforeCpp11BracedList: 'false'
-SpaceBeforeInheritanceColon: 'true'
-SpaceBeforeParens: ControlStatements
 SpaceBeforeRangeBasedForLoopColon: 'true'
-SpacesInParentheses: 'false'
-SpacesInSquareBrackets: 'false'
+SpacesBeforeTrailingComments: '3'
 Standard: Auto
+UseTab: Never
 
 ...