diff --git a/.clang-format b/.clang-format
index 0fdcf814..67f77eb5 100644
--- a/.clang-format
+++ b/.clang-format
@@ -63,8 +63,9 @@ AlignConsecutiveMacros:       true # align macro bodies
 # =============================================================================
 # Line length and wrapping
 # =============================================================================
-ColumnLimit:    0
+ColumnLimit:    150
 ReflowComments: true # preserve hand-formatted comment rulers
+AlignEscapedNewlines: Left
 
 # =============================================================================
 # Includes