diff --git a/.clang-format b/.clang-format
index 83d505451..5818da3ca 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,7 +1,16 @@
 BasedOnStyle: LLVM
-IndentWidth: 8
+IndentWidth: 4
+TabWidth: 4
 UseTab: Always
 BreakBeforeBraces: Attach
 AllowShortIfStatementsOnASingleLine: false
 IndentCaseLabels: false
-ColumnLimit: 0
+SortIncludes: false
+ColumnLimit: 80
+AlignAfterOpenBracket: DontAlign
+BinPackParameters: false
+BinPackArguments: false
+ContinuationIndentWidth: 8
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortLoopsOnASingleLine: true
+ReflowComments: false