diff --git a/.clang-format b/.clang-format
index 7037a96..9d51fa7 100644
--- a/.clang-format
+++ b/.clang-format
@@ -6,30 +6,40 @@ IndentWidth: 4
 UseCRLF: true
 # spaces, not tabs!
 UseTab: Never
+
 ---
 Language: Cpp
 Standard: c++17
 AccessModifierOffset: -4
+ColumnLimit: 0
+NamespaceIndentation: All
+
+# Alignment
 # Force pointers to the type for C++.
 DerivePointerAlignment: false
 PointerAlignment: Right
-# Use 100 columns
-ColumnLimit: 120
-AlignConsecutiveAssignments: Consecutive
+ReferenceAlignment: Right
+AlignArrayOfStructures: Right
+
+# AlignConsecutiveAssignments: Consecutive
+AlignConsecutiveBitFields: Consecutive
+AlignConsecutiveMacros: AcrossEmptyLines
+
+# Lines
 AllowAllParametersOfDeclarationOnNextLine: true
 AllowShortBlocksOnASingleLine: Never
 AlwaysBreakAfterReturnType: None
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: None
 AllowShortIfStatementsOnASingleLine: Never
-SplitEmptyFunction: true
-BreakBeforeBraces: Allman
 SeparateDefinitionBlocks: Always
-NamespaceIndentation: All
+
+# Braces
+BreakBeforeBraces: Allman
+BraceWrapping:
+  SplitEmptyFunction: true
+
+# Misc
 IndentAccessModifiers: false
-ReferenceAlignment: Right
 BreakConstructorInitializers: AfterColon
-AlignArrayOfStructures: Right
-PackConstructorInitializers: CurrentLine
-AlignConsecutiveMacros: true
-...
+PackConstructorInitializers: NextLineOnly