diff --git a/.clang-format b/.clang-format
index 621eb83f..91769fe3 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,20 +1,20 @@
 ---
 AlignAfterOpenBracket: 'Align'
-AlignConsecutiveAssignments: 'false'
-AlignConsecutiveDeclarations: 'false'
+AlignConsecutiveAssignments: 'true'
+AlignConsecutiveDeclarations: 'true'
 AlignConsecutiveMacros: 'true'
 AlignOperands: 'true'
 AlignTrailingComments: 'true'
 AllowAllArgumentsOnNextLine: 'false'
 AllowAllParametersOfDeclarationOnNextLine: 'false'
 AllowShortBlocksOnASingleLine: 'false'
-AllowShortCaseLabelsOnASingleLine: 'false'
+AllowShortCaseLabelsOnASingleLine: 'true'
 AllowShortFunctionsOnASingleLine: 'Inline'
 AllowShortIfStatementsOnASingleLine: 'false'
-AlwaysBreakAfterReturnType: 'All'
-BinPackParameters: 'false'
+AlwaysBreakAfterReturnType: 'TopLevelDefinitions'
 BinPackArguments: 'false'
-BreakBeforeBraces: 'Linux'
+BinPackParameters: 'false'
+BreakBeforeBraces: 'WebKit'
 ColumnLimit: '100'
 DerivePointerAlignment: 'false'
 IndentCaseLabels: 'false'
@@ -22,7 +22,9 @@ IndentWidth: '8'
 KeepEmptyLinesAtTheStartOfBlocks: 'false'
 Language: 'Cpp'
 MaxEmptyLinesToKeep: '1'
-PointerAlignment: 'Right'
+PenaltyBreakAssignment: '3'
+PenaltyBreakBeforeFirstCallParameter: '15'
+PointerAlignment: 'Left'
 SortIncludes: 'false'
 SpaceAfterCStyleCast: 'false'
 SpaceBeforeAssignmentOperators : 'true'
@@ -31,8 +33,6 @@ SpaceInEmptyParentheses: 'false'
 SpacesInSquareBrackets: 'false'
 TabWidth: '8'
 UseTab: 'AlignWithSpaces'
-PenaltyBreakAssignment: '3'
-PenaltyBreakBeforeFirstCallParameter: '15'
 
 # Local Variables:
 # mode: yaml