diff --git a/.clang-format b/.clang-format
index 5fafec43..0c08cabd 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,14 +1,36 @@
 Language: Cpp
-Standard: Auto
+Standard: Cpp11
 IndentWidth: 4
 TabWidth: 4
 UseCRLF: false
+AlignTrailingComments: false
+AllowAllConstructorInitializersOnNextLine: false
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortFunctionsOnASingleLine: Empty
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakTemplateDeclarations: No
+BinPackArguments: false
+BinPackParameters: false
+ExperimentalAutoDetectBinPacking: false
+IndentCaseLabels: false
+ObjCBinPackProtocolList: Auto
 SpacesInSquareBrackets: false
 SpacesInParentheses: false
+SpaceAfterCStyleCast: false
+SpaceInEmptyParentheses: false
+SpaceAfterLogicalNot: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCpp11BracedList: true
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+SpaceBeforeRangeBasedForLoopColon: true
 UseTab: Always
 ColumnLimit: 140
 BreakBeforeBraces: Allman
 AlignAfterOpenBracket: AlwaysBreak
 IndentExternBlock: Indent
 PointerAlignment: Left
-SortIncludes: false
\ No newline at end of file
+SortIncludes: false
+NamespaceIndentation: All