diff --git a/.clang-format b/.clang-format
index 14fc4331f..c035f729b 100644
--- a/.clang-format
+++ b/.clang-format
@@ -3,7 +3,10 @@ Language:        Cpp
 BasedOnStyle:  Chromium
 AccessModifierOffset: -2
 AlignAfterOpenBracket: DontAlign
-BinPackParameters: true
+AllowShortFunctionsOnASingleLine: InlineOnly
+AllowShortIfStatementsOnASingleLine: false
+BinPackArguments: false
+BinPackParameters: false
 BraceWrapping:
   AfterClass:      true
   AfterControlStatement: true
@@ -18,6 +21,8 @@ BraceWrapping:
   SplitEmptyFunction: false
 BreakBeforeBraces: Custom
 BreakBeforeTernaryOperators: false
+BreakConstructorInitializers: BeforeColon
+BreakInheritanceList: AfterColon
 ColumnLimit:     100
 ConstructorInitializerIndentWidth: 2
 IncludeCategories:
@@ -33,9 +38,10 @@ IncludeCategories:
     Priority:        4
 IncludeIsMainRegex: '(Test)?$'
 IndentCaseLabels: false
-IndentWidth:     2
+IndentWidth:     4
 ContinuationIndentWidth: 4
 MaxEmptyLinesToKeep: 2
+NamespaceIndentation: None
 PenaltyBreakAssignment: 1
 PenaltyBreakComment: 50
 TabWidth:        2