diff --git a/.clang-format b/.clang-format
index 298a0837..db524b9f 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,5 +1,25 @@
 ---
 Language:        Cpp
 BasedOnStyle:  LLVM
+AccessModifierOffset: -4
 AlignArrayOfStructures: Left
+AllowShortBlocksOnASingleLine: Empty
+AllowShortEnumsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortLambdasOnASingleLine: Empty
+BinPackArguments: false
+BinPackParameters: false
+BreakBeforeBinaryOperators: NonAssignment
+BreakBeforeBraces: Allman
 ColumnLimit:     160
+IncludeBlocks:   Regroup
+IndentWidth:     4
+IndentWrappedFunctionNames: true
+InsertNewlineAtEOF: true
+NamespaceIndentation: All
+PackConstructorInitializers: CurrentLine
+PointerAlignment: Left
+SeparateDefinitionBlocks: Always
+SortUsingDeclarations: Lexicographic
+SpaceAfterTemplateKeyword: false
+SpaceBeforeCpp11BracedList: true