diff --git a/.clang-format b/.clang-format
index 91769fe3..de25bbba 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,4 +1,5 @@
 ---
+AccessModifierOffset: -8
 AlignAfterOpenBracket: 'Align'
 AlignConsecutiveAssignments: 'true'
 AlignConsecutiveDeclarations: 'true'
@@ -7,18 +8,23 @@ AlignOperands: 'true'
 AlignTrailingComments: 'true'
 AllowAllArgumentsOnNextLine: 'false'
 AllowAllParametersOfDeclarationOnNextLine: 'false'
-AllowShortBlocksOnASingleLine: 'false'
+AllowShortBlocksOnASingleLine: 'Empty'
 AllowShortCaseLabelsOnASingleLine: 'true'
 AllowShortFunctionsOnASingleLine: 'Inline'
 AllowShortIfStatementsOnASingleLine: 'false'
+AllowShortLambdasOnASingleLine: 'All'
 AlwaysBreakAfterReturnType: 'TopLevelDefinitions'
+BraceWrapping:
+  BeforeLambdaBody: 'false'
 BinPackArguments: 'false'
 BinPackParameters: 'false'
 BreakBeforeBraces: 'WebKit'
 ColumnLimit: '100'
+Cpp11BracedListStyle: 'true'
 DerivePointerAlignment: 'false'
 IndentCaseLabels: 'false'
 IndentWidth: '8'
+IndentAccessModifiers: 'false'
 KeepEmptyLinesAtTheStartOfBlocks: 'false'
 Language: 'Cpp'
 MaxEmptyLinesToKeep: '1'