diff --git a/.clang-format b/.clang-format
index 16d606b384..d853f50480 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,10 +1,21 @@
-BasedOnStyle:                              LLVM
-Language:                                  Cpp
-IndentWidth:                               8
-UseTab:                                    Always
-BreakBeforeBraces:                         Linux
-AllowShortIfStatementsOnASingleLine:       false
-IndentCaseLabels:                          false
-SortIncludes:                              false
-ContinuationIndentWidth:                   8
-ColumnLimit:                               80
+BasedOnStyle:					LLVM
+Language:					Cpp
+IndentWidth:					8
+UseTab:						Always
+BreakBeforeBraces:				Linux
+AllowShortIfStatementsOnASingleLine:		false
+IndentCaseLabels:				false
+SortIncludes:					false
+ContinuationIndentWidth:			8
+ColumnLimit:					0
+AlwaysBreakBeforeMultilineStrings:		true
+AllowShortLoopsOnASingleLine:			false
+AllowShortFunctionsOnASingleLine:		false
+AlignEscapedNewlinesLeft:			false
+AlignTrailingComments:				true
+AllowAllParametersOfDeclarationOnNextLine:	false
+AlignAfterOpenBracket:				true
+SpaceAfterCStyleCast:				false
+MaxEmptyLinesToKeep:				2
+BreakBeforeBinaryOperators:			NonAssignment
+BreakStringLiterals:				false