diff --git a/.clang-format b/.clang-format
index 8ae243a..b3dd646 100644
--- a/.clang-format
+++ b/.clang-format
@@ -11,29 +11,29 @@ AllowAllParametersOfDeclarationOnNextLine: false
 AllowShortBlocksOnASingleLine: true
 AllowShortCaseLabelsOnASingleLine: true
 AllowShortFunctionsOnASingleLine: All
-AllowShortIfStatementsOnASingleLine: true
+AllowShortIfStatementsOnASingleLine: Always
 AllowShortLoopsOnASingleLine: true
 AlwaysBreakAfterDefinitionReturnType: None
 AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: false
 BinPackArguments: false
 BinPackParameters: false
-BraceWrapping:   
-  AfterClass:      true
-  AfterControlStatement: true
-  AfterEnum:       true
-  AfterFunction:   true
-  AfterNamespace:  true
-  AfterObjCDeclaration: true
-  AfterStruct:     true
-  AfterUnion:      true
-  AfterExternBlock: true
-  BeforeCatch:     true
-  BeforeElse:      true
-  IndentBraces:    false
-  SplitEmptyFunction: false
-  SplitEmptyRecord: false
-  SplitEmptyNamespace: false
+BraceWrapping:
+    AfterClass:      true
+    AfterControlStatement: true
+    AfterEnum:       true
+    AfterFunction:   true
+    AfterNamespace:  true
+    AfterObjCDeclaration: true
+    AfterStruct:     true
+    AfterUnion:      true
+    AfterExternBlock: true
+    BeforeCatch:     true
+    BeforeElse:      true
+    IndentBraces:    false
+    SplitEmptyFunction: false
+    SplitEmptyRecord: false
+    SplitEmptyNamespace: false
 BreakBeforeBinaryOperators: None
 BreakBeforeBraces: Allman
 BreakBeforeInheritanceComma: false
@@ -52,18 +52,30 @@ DerivePointerAlignment: false
 DisableFormat:   false
 ExperimentalAutoDetectBinPacking: false
 FixNamespaceComments: true
-ForEachMacros:   
-  - foreach
-  - Q_FOREACH
-  - BOOST_FOREACH
+ForEachMacros:
+    - foreach
+    - Q_FOREACH
+    - BOOST_FOREACH
 IncludeBlocks:   Regroup
-IncludeCategories: 
-  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
-    Priority:        2
-  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
-    Priority:        3
-  - Regex:           '.*'
-    Priority:        1
+IncludeCategories:
+    - Regex:           '^(<winsock2.h>)'
+      Priority:        -3
+      SortPriority:    -4
+    - Regex:           '^(<windows.h>)'
+      Priority:        -3
+      SortPriority:    -3
+    - Regex:           '^(<aaruformat.h>)'
+      Priority:        1
+      SortPriority:    -1
+    - Regex:           '^(<.*)'
+      Priority:        -2
+      SortPriority:    -2
+    - Regex:           '^("(win32|windows))'
+      Priority:        1
+      SortPriority:    -1
+    - Regex:           '.*'
+      Priority:        0
+      SortPriority:    0
 IncludeIsMainRegex: '(Test)?$'
 IndentCaseLabels: true
 IndentPPDirectives: None