diff --git a/.clang-format b/.clang-format
index 4e18f1c..0a4a8f9 100644
--- a/.clang-format
+++ b/.clang-format
@@ -4,10 +4,10 @@ AccessModifierOffset: "-4"
 AlignAfterOpenBracket: Align
 AlignEscapedNewlines: Left
 AlignOperands: true
-AllowShortBlocksOnASingleLine: Always
-AllowShortCaseLabelsOnASingleLine: true
-AllowShortIfStatementsOnASingleLine: AllIfsAndElse
-AllowShortLoopsOnASingleLine: true
+AllowShortBlocksOnASingleLine: Empty
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLoopsOnASingleLine: false
 BreakBeforeBinaryOperators: NonAssignment
 BreakBeforeBraces: Allman
 BreakBeforeTernaryOperators: false
@@ -23,6 +23,7 @@ IndentCaseLabels: true
 IndentPPDirectives: BeforeHash
 IndentWidth: "4"
 IndentWrappedFunctionNames: true
+InsertBraces: true
 KeepEmptyLinesAtEOF: true
 KeepEmptyLinesAtTheStartOfBlocks: false
 MaxEmptyLinesToKeep: "2"