diff --git a/.clang-format b/.clang-format
index e73fcaf..9aebe0c 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,9 +1,29 @@
 ---
+AllowShortIfStatementsOnASingleLine: Never
+CompactNamespaces: 'false'
+DisableFormat: 'false'
+IndentCaseLabels: 'true'
+IndentPPDirectives: BeforeHash
 IndentWidth: '4'
 Language: Cpp
 NamespaceIndentation: All
 PointerAlignment: Left
+ReflowComments: 'true'
+SortIncludes: 'true'
+SortUsingDeclarations: 'true'
+SpacesInCStyleCastParentheses: 'false'
+Standard: Cpp11
 TabWidth: '0'
 UseTab: Never
+AllowShortEnumsOnASingleLine: false
+BraceWrapping:
+  AfterEnum: true
+AccessModifierOffset: -4
+SpaceAfterTemplateKeyword: 'false'
+AllowAllParametersOfDeclarationOnNextLine: false
+AlignAfterOpenBracket: AlwaysBreak
+BinPackArguments: false
+BinPackParameters: false
+ColumnLimit: 120
 
 ...