diff --git a/.clang-format b/.clang-format
index 67b9bd0..d6d61cf 100644
--- a/.clang-format
+++ b/.clang-format
@@ -4,14 +4,11 @@ AlignAfterOpenBracket: Align
 AlignEscapedNewlines: Left
 AlignOperands: true
 AlignTrailingComments: true
-AllowShortBlocksOnASingleLine: true
-AllowShortCaseLabelsOnASingleLine: true
-AllowShortIfStatementsOnASingleLine: true
-AllowShortLoopsOnASingleLine: true
 BreakBeforeBinaryOperators: None
 BreakBeforeBraces: Linux
 ContinuationIndentWidth: 0
-DerivePointerAlignment: true
-MaxEmptyLinesToKeep: 2
+PointerAlignment: Right
+MaxEmptyLinesToKeep: 1
 SortIncludes: false
 SpacesBeforeTrailingComments: 2
+ColumnLimit: 78