diff --git a/.clang-format b/.clang-format
index 0616816c..55aaf9f8 100644
--- a/.clang-format
+++ b/.clang-format
@@ -5,25 +5,31 @@ ColumnLimit: 0
 AlignAfterOpenBracket: DontAlign
 UseTab: ForContinuationAndIndentation
 IndentWidth: 4
-ContinuationIndentWidth: 4
+ContinuationIndentWidth: 8
+BracedInitializerIndentWidth: 4
 TabWidth: 4
 
 PointerAlignment: Right
-SpaceAfterCStyleCast: 'false'
+SpaceAfterCStyleCast: false
 BreakBeforeBraces: Stroustrup
 
-AlignConsecutiveMacros: 'true'
+AlignConsecutiveMacros:
+  Enabled: true
 AlignEscapedNewlines: DontAlign
-AlignTrailingComments: 'true'
-AllowShortBlocksOnASingleLine: 'true'
-AllowShortCaseLabelsOnASingleLine: 'true'
-AllowShortLoopsOnASingleLine: 'true'
-IndentCaseLabels: 'true'
+AlignTrailingComments:
+  Kind: Always
+  OverEmptyLines: 0
+AllowShortBlocksOnASingleLine: true
+AllowShortCaseLabelsOnASingleLine: true
+AllowShortLoopsOnASingleLine: false
+IndentCaseLabels: true
 MaxEmptyLinesToKeep: 2
-SortIncludes: 'false'
+SortIncludes: false
 SpacesBeforeTrailingComments: 2
 
 BreakBeforeBinaryOperators: None
-BreakBeforeTernaryOperators: 'false'
+BreakBeforeTernaryOperators: false
 BreakConstructorInitializers: AfterColon
+
+InsertNewlineAtEOF: true
 ...