diff --git a/.clang-format b/.clang-format
index 09c01d6526..d6da77d7bd 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,5 +1,4 @@
----
-BasedOnStyle:  Google
+BasedOnStyle: Google
 # Only merge empty functions.
 AllowShortFunctionsOnASingleLine: Empty
 # Do not allow short if statements.
@@ -7,3 +6,16 @@ AllowShortIfStatementsOnASingleLine: false
 # Enforce always the same pointer alignment.
 DerivePointerAlignment: false
 IndentPPDirectives: AfterHash
+
+PointerAlignment: Right
+IncludeBlocks: Preserve
+FixNamespaceComments: true
+ColumnLimit: 100
+IndentWidth: 2
+#IndentAccessModifiers: false # not accepted atm
+AccessModifierOffset: -2 # set to minus IndentWidth (-IndentWidth)
+SpacesBeforeTrailingComments: 1
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+BreakConstructorInitializers: BeforeComma
+#ConstructorInitializerAllOnOneLineOrOnePerLine: false