diff --git a/.clang-format b/.clang-format
index faa7019..afcda5d 100644
--- a/.clang-format
+++ b/.clang-format
@@ -31,8 +31,7 @@ BreakBeforeBinaryOperators: NonAssignment
 
 # Use a Linux style brace break.
 # Break before braces on function, namespace and class definitions.
-BreakBeforeBraces: Linux
-
+BreakBeforeBraces: Stroustrup
 
 # If true, spaces will be inserted after ( and before ).
 SpacesInParentheses: false
@@ -42,3 +41,6 @@ SpacesInSquareBrackets: false
 
 # Separate definition blocks (classes, functions, structs, enums)
 SeparateDefinitionBlocks: Always
+
+# Sort includes by type
+IncludeBlocks: Regroup