diff --git a/.uncrustify.cfg b/.uncrustify.cfg
index b28935dcc..6bf91ec3c 100644
--- a/.uncrustify.cfg
+++ b/.uncrustify.cfg
@@ -1041,14 +1041,14 @@ indent_else_if                  = false    # true/false
 indent_var_def_blk              = 0        # number
 
 # Whether to indent continued variable declarations instead of aligning.
-indent_var_def_cont             = false    # true/false
+indent_var_def_cont             = true    # true/false
 
 # Whether to indent continued shift expressions ('<<' and '>>') instead of
 # aligning. Set align_left_shift=false when enabling this.
 indent_shift                    = false    # true/false
 
 # Whether to force indentation of function definitions to start in column 1.
-indent_func_def_force_col1      = false    # true/false
+indent_func_def_force_col1      = true    # true/false
 
 # Whether to indent continued function call parameters one indent level,
 # rather than aligning parameters under the open parenthesis.
@@ -1118,7 +1118,7 @@ indent_sing_line_comments       = 0        # unsigned number
 indent_relative_single_line_comments = false    # true/false
 
 # Spaces to indent 'case' from 'switch'. Usually 0 or indent_columns.
-indent_switch_case              = 0        # unsigned number
+indent_switch_case              = indent_columns       # unsigned number
 
 # indent 'break' with 'case' from 'switch'.
 indent_switch_break_with_case   = false    # true/false
@@ -1217,13 +1217,13 @@ indent_preserve_sql             = false    # true/false
 # followed by a newline, the next line is indent one tab.
 #
 # Default: true
-indent_align_assign             = true     # true/false
+indent_align_assign             = false     # true/false
 
 # Whether to align continued statements at the '('. If false or the '(' is
 # followed by a newline, the next line indent is one tab.
 #
 # Default: true
-indent_align_paren              = true     # true/false
+indent_align_paren              = true    # true/false,
 
 # (OC) Whether to indent Objective-C blocks at brace level instead of usual
 # rules.
@@ -1299,7 +1299,8 @@ indent_ternary_operator         = 0        # unsigned number
 # If true, the indentation of the chunks after a `return new` sequence will be set at return indentation column.
 indent_off_after_return_new     = false    # true/false
 
-# If true, the tokens after return are indented with regular single indentation. By default (false) the indentation is after the return token.
+# If true, the tokens after return are indented with regular single indentation. 
+# By default (false) the indentation is after the return token.
 indent_single_after_return      = false    # true/false
 
 # Whether to ignore indent and alignment for 'asm' blocks (i.e. assume they
@@ -2902,7 +2903,7 @@ use_indent_continue_only_once   = false    # true/false
 #
 # true:  indentation will be used only once
 # false: indentation will be used every time (default)
-indent_cpp_lambda_only_once     = false    # true/false
+indent_cpp_lambda_only_once     = true    # true/false
 
 # Whether sp_after_angle takes precedence over sp_inside_fparen. This was the
 # historic behavior, but is probably not the desired behavior, so this is off