diff --git a/.clang-format b/.clang-format
index 76669e19e..1d7d35dc5 100644
--- a/.clang-format
+++ b/.clang-format
@@ -8,7 +8,7 @@ BasedOnStyle: LLVM
 IndentWidth: 4
 TabWidth: 4
 UseTab: Never
-IndentCaseLabels: false
+
 
 # Column width
 ColumnLimit: 120
@@ -36,6 +36,7 @@ BraceWrapping:
    AfterNamespace: false
    AfterStruct: false
    BeforeElse : true
+   AfterCaseLabel: false
 # Spacing
 SpaceAfterCStyleCast: false
 SpaceAfterLogicalNot: false
@@ -65,6 +66,11 @@ SortIncludes: false  # Z3 has specific include ordering conventions
 # Namespaces
 NamespaceIndentation: All
 
+# Switch statements
+IndentCaseLabels: false
+AllowShortCaseLabelsOnASingleLine: true
+IndentCaseBlocks: false
+
 # Comments and documentation
 ReflowComments: true
 SpacesBeforeTrailingComments: 2