diff --git a/.clang-format b/.clang-format
index 405cee86d..d9f744de0 100644
--- a/.clang-format
+++ b/.clang-format
@@ -105,7 +105,7 @@ BreakFunctionDefinitionParameters: false
 BreakInheritanceList: AfterComma
 BreakStringLiterals: false
 BreakTemplateDeclarations: Yes
-ColumnLimit: 80
+ColumnLimit: 100
 CompactNamespaces: true
 ConstructorInitializerIndentWidth: 2
 ContinuationIndentWidth: 2
@@ -153,17 +153,17 @@ ObjCBreakBeforeNestedBlockParam: true
 ObjCSpaceAfterProperty: false
 ObjCSpaceBeforeProtocolList: true
 PackConstructorInitializers: BinPack
-PenaltyBreakAssignment: 2
-PenaltyBreakBeforeFirstCallParameter: 19
-PenaltyBreakComment: 300
-PenaltyBreakFirstLessLess: 120
+PenaltyBreakAssignment: 50
+PenaltyBreakBeforeFirstCallParameter: 2
+PenaltyBreakComment: 30
+PenaltyBreakFirstLessLess: 12
 PenaltyBreakOpenParenthesis: 0
 PenaltyBreakScopeResolution: 500
-PenaltyBreakString: 1000
-PenaltyBreakTemplateDeclaration: 10
-PenaltyExcessCharacter: 1000000
+PenaltyBreakString: 100
+PenaltyBreakTemplateDeclaration: 1
+PenaltyExcessCharacter: 100
 PenaltyIndentedWhitespace: 0
-PenaltyReturnTypeOnItsOwnLine: 1000
+PenaltyReturnTypeOnItsOwnLine: 200
 PointerAlignment: Left
 PPIndentWidth: -1
 QualifierAlignment: Leave