diff --git a/.clang-format b/.clang-format
index ea53b9eee6aba780e8388800e00791064f6f5eb8..43b03c2a1870cddf120b6b130b4e7142554bd9ee 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,7 +1,7 @@
 ---
 # General configuration that applies to all files
 BasedOnStyle: LLVM
-BreakBeforeBinaryOperators: None
+BreakBeforeBinaryOperators: NonAssignment
 BreakBeforeTernaryOperators: false
 BreakStringLiterals: true
 ColumnLimit: 120
@@ -73,7 +73,7 @@ DisableFormat: false
 EmptyLineAfterAccessModifier: Never
 EmptyLineBeforeAccessModifier: LogicalBlock
 FixNamespaceComments: true
-IncludeBlocks: Preserve
+IncludeBlocks: Regroup
 IndentCaseBlocks: false
 IndentCaseLabels: true
 IndentExternBlock: AfterExternBlock
@@ -90,7 +90,7 @@ QualifierAlignment: Left
 ReferenceAlignment: Left
 ReflowComments: false
 SeparateDefinitionBlocks: Always
-SortIncludes: Never
+SortIncludes: true
 SpaceAfterCStyleCast: true
 SpaceAfterLogicalNot: false
 SpaceAfterTemplateKeyword: false