diff --git a/.uncrustify.cfg b/.uncrustify.cfg
index 23305adcf..b28935dcc 100644
--- a/.uncrustify.cfg
+++ b/.uncrustify.cfg
@@ -97,7 +97,7 @@ sp_cpp_lambda_square_paren      = ignore   # ignore/add/remove/force
 
 # Add or remove space after the capture specification of a C++11 lambda with
 # no argument list is present, as in '[] <here> { ... }'.
-sp_cpp_lambda_square_brace      = ignore   # ignore/add/remove/force
+sp_cpp_lambda_square_brace      = remove  # ignore/add/remove/force
 
 # Add or remove space after the argument list of a C++11 lambda, as in
 # '[](int x) <here> { ... }'.
@@ -279,11 +279,11 @@ sp_angle_word                   = ignore   # ignore/add/remove/force
 # Add or remove space between '>' and '>' in '>>' (template stuff).
 #
 # Default: add
-sp_angle_shift                  = add      # ignore/add/remove/force
+sp_angle_shift                  = ignore      # ignore/add/remove/force
 
 # (C++11) Permit removal of the space between '>>' in 'foo<bar<int> >'. Note
 # that sp_angle_shift cannot remove the space without this option.
-sp_permit_cpp11_shift           = false    # true/false
+sp_permit_cpp11_shift           = true    # true/false
 
 # Add or remove space before '(' of control statements ('if', 'for', 'switch',
 # 'while', etc.).
@@ -1157,7 +1157,7 @@ indent_label                    = 1        # number
 # <=0: Subtract from brace indent
 #
 # Default: 1
-indent_access_spec              = 1        # number
+indent_access_spec              = -4        # number
 
 # Whether to indent the code after an access specifier by one level.
 # If true, this option forces 'indent_access_spec=0'.
@@ -1333,7 +1333,7 @@ nl_cs_property_leave_one_liners = true    # true/false
 nl_func_leave_one_liners        = true    # true/false
 
 # Don't split one-line C++11 lambdas, as in '[]() { return 0; }'.
-nl_cpp_lambda_leave_one_liners  = false    # true/false
+nl_cpp_lambda_leave_one_liners  = true    # true/false
 
 # Don't split one-line if/else statements, as in 'if(...) b++;'.
 nl_if_leave_one_liners          = true    # true/false