diff --git a/.clang-format.yaml b/.clang-format.yaml
index f33a4e6..923a600 100644
--- a/.clang-format.yaml
+++ b/.clang-format.yaml
@@ -12,8 +12,11 @@ AlignConsecutiveAssignments:
   PadOperators: true
 AlignConsecutiveBitFields: AcrossComments
 AlignConsecutiveDeclarations: AcrossComments
-AlignConsecutiveMacros: AcrossComments
-AlignEscapedNewlines: Right
+AlignConsecutiveMacros:
+  Enabled: true
+  AcrossEmptyLines: true
+  AcrossComments: false
+AlignEscapedNewlines: Left
 AlignOperands: DontAlign
 
 AlignTrailingComments: true
@@ -90,10 +93,10 @@ FixNamespaceComments: true
 IncludeBlocks: Preserve
 
 
-IndentCaseBlocks: true
-IndentCaseLabels: true
+IndentCaseBlocks: false
+IndentCaseLabels: false
 IndentExternBlock: AfterExternBlock
-IndentGotoLabels: true
+IndentGotoLabels: false
 IndentPPDirectives: AfterHash
 IndentRequires: true
 IndentWidth: 4