diff --git a/.clang-format b/.clang-format
index 75ae89c..b16e91a 100644
--- a/.clang-format
+++ b/.clang-format
@@ -5,32 +5,9 @@ Language: Cpp
 
 AccessModifierOffset: -4
 AlwaysBreakTemplateDeclarations: Yes
+BreakBeforeBraces: Allman
 BreakConstructorInitializers: BeforeComma
 BreakInheritanceList: BeforeComma
 KeepEmptyLinesAtTheStartOfBlocks: false
 PointerAlignment: Left
 SpaceAfterTemplateKeyword: false
-
-IncludeCategories:
-    - Regex:        'stdafx'
-      Priority:     -1
-    - Regex:        'Windows'
-      Priority:     0
-
-BreakBeforeBraces: Custom
-BraceWrapping:
-    AfterCaseLabel: true
-    AfterClass: true
-    AfterControlStatement: Always
-    AfterEnum: true
-    AfterFunction: true
-    AfterNamespace: true
-    AfterStruct: true
-    AfterUnion: true
-    AfterExternBlock: true
-    BeforeCatch: true
-    BeforeElse: true
-    IndentBraces: false
-    SplitEmptyFunction: true
-    SplitEmptyRecord: true
-    SplitEmptyNamespace: true
diff --git a/.editorconfig b/.editorconfig
index 83b5fd6..360e678 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -10,8 +10,8 @@ trim_trailing_whitespace = true
 [*.{c,h,cpp,hpp}]
 indent_size = 4
 
-[*.md]
+[*.{md,yml}]
 indent_size = 2
 
-[*.yml]
+[{CMakeLists.txt,*.cmake}]
 indent_size = 2
diff --git a/.gitignore b/.gitignore
index aab9f63..d7aaa89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -362,4 +362,4 @@ MigrationBackup/
 FodyWeavers.xsd
 
 ### Custom ###
-build
+build/