diff --git a/uncrustify.cfg b/uncrustify.cfg
index d702d06..bc6be9d 100644
--- a/uncrustify.cfg
+++ b/uncrustify.cfg
@@ -949,7 +949,7 @@
 
 # The continuation indent for func_*_param if they are true. If non-zero, this
 # overrides the indent.
-indent_param                    = 0        # unsigned number
+indent_param                    = 4        # unsigned number
 
 # How to use tabs when indenting code.
 #
@@ -969,7 +969,7 @@
 
 # The number of spaces to indent multi-line XML strings.
 # Requires indent_align_string=true.
-indent_xml_string               = 2        # unsigned number
+indent_xml_string               = 4        # unsigned number
 
 # Spaces to indent '{' from level.
 indent_brace                    = 0        # unsigned number
@@ -1052,22 +1052,22 @@
 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
+indent_shift                    = true     # true/false
 
 # Whether to force indentation of function definitions to start in column 1.
 indent_func_def_force_col1      = false    # true/false
 
 # Whether to indent continued function call parameters one indent level,
 # rather than aligning parameters under the open parenthesis.
-indent_func_call_param          = false    # true/false
+indent_func_call_param          = true     # true/false
 
 # Whether to indent continued function definition parameters one indent level,
 # rather than aligning parameters under the open parenthesis.
-indent_func_def_param           = false    # true/false
+indent_func_def_param           = true     # true/false
 
 # for function definitions, only if indent_func_def_param is false
 # Allows to align params when appropriate and indent them when not
@@ -1077,23 +1077,23 @@
 
 # Whether to indent continued function call prototype one indent level,
 # rather than aligning parameters under the open parenthesis.
-indent_func_proto_param         = false    # true/false
+indent_func_proto_param         = true     # true/false
 
 # Whether to indent continued function call declaration one indent level,
 # rather than aligning parameters under the open parenthesis.
-indent_func_class_param         = false    # true/false
+indent_func_class_param         = true     # true/false
 
 # Whether to indent continued class variable constructors one indent level,
 # rather than aligning parameters under the open parenthesis.
-indent_func_ctor_var_param      = false    # true/false
+indent_func_ctor_var_param      = true     # true/false
 
 # Whether to indent continued template parameter list one indent level,
 # rather than aligning parameters under the open parenthesis.
-indent_template_param           = false    # true/false
+indent_template_param           = true     # true/false
 
 # Double the indent for indent_func_xxx_param options.
 # Use both values of the options indent_columns and indent_param.
-indent_func_param_double        = false    # true/false
+indent_func_param_double        = true     # true/false
 
 # Indentation column for standalone 'const' qualifier on a function
 # prototype.
@@ -1119,7 +1119,7 @@
 
 # Whether lines broken at '.' or '->' should be indented by a single indent.
 # The indent_member option will not be effective if this is set to true.
-indent_member_single            = false    # true/false
+indent_member_single            = true     # true/false
 
 # Spaces to indent single line ('//') comments on lines before code.
 indent_sing_line_comments       = 0        # unsigned number
@@ -1203,7 +1203,7 @@
 
 # Whether to indent a comma when inside a parenthesis.
 # If true, aligns under the open parenthesis.
-indent_comma_paren              = true     # true/false
+indent_comma_paren              = false    # true/false
 
 # Whether to indent a Boolean operator when inside a parenthesis.
 # If true, aligns under the open parenthesis.
@@ -1232,7 +1232,7 @@
 # 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
 
 # If true, the indentation of the chunks after a '=' sequence will be set at
 # LHS token indentation column before '='.
@@ -1290,7 +1290,7 @@
 
 # When indenting after virtual brace open and newline add further spaces to
 # reach this minimum indent.
-indent_min_vbrace_open          = 0        # unsigned number
+indent_min_vbrace_open          = 4        # unsigned number
 
 # Whether to add further spaces after regular indent to reach next tabstop
 # when identing after virtual brace open and newline.
@@ -1325,7 +1325,7 @@
 # 0: Off (default)
 # 1: When the `if_false` is a continuation, indent it under `if_false`
 # 2: When the `:` is a continuation, indent it under `?`
-indent_ternary_operator         = 2        # unsigned number
+indent_ternary_operator         = 0        # unsigned number
 
 # Whether to indent the statments inside ternary operator.
 indent_inside_ternary_operator  = false    # true/false
@@ -1373,13 +1373,13 @@
 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
+nl_if_leave_one_liners          = false    # true/false
 
 # Don't split one-line while statements, as in 'while(...) b++;'.
-nl_while_leave_one_liners       = true     # true/false
+nl_while_leave_one_liners       = false    # true/false
 
 # Don't split one-line for statements, as in 'for(...) b++;'.
-nl_for_leave_one_liners         = true     # true/false
+nl_for_leave_one_liners         = false    # true/false
 
 # (OC) Don't split one-line Objective-C messages.
 nl_oc_msg_leave_one_liner       = true     # true/false
@@ -1406,18 +1406,18 @@
 nl_oc_implementation_brace      = ignore   # ignore/add/remove/force
 
 # Add or remove newlines at the start of the file.
-nl_start_of_file                = ignore   # ignore/add/remove/force
+nl_start_of_file                = remove   # ignore/add/remove/force
 
 # The minimum number of newlines at the start of the file (only used if
 # nl_start_of_file is 'add' or 'force').
 nl_start_of_file_min            = 0        # unsigned number
 
 # Add or remove newline at the end of the file.
-nl_end_of_file                  = ignore    # ignore/add/remove/force
+nl_end_of_file                  = force    # ignore/add/remove/force
 
 # The minimum number of newlines at the end of the file (only used if
 # nl_end_of_file is 'add' or 'force').
-nl_end_of_file_min              = 0        # unsigned number
+nl_end_of_file_min              = 1        # unsigned number
 
 # Add or remove newline between '=' and '{'.
 nl_assign_brace                 = ignore    # ignore/add/remove/force
@@ -1458,7 +1458,7 @@
 nl_union_brace                  = ignore   # ignore/add/remove/force
 
 # Add or remove newline between 'if' and '{'.
-nl_if_brace                     = ignore   # ignore/add/remove/force
+nl_if_brace                     = remove   # ignore/add/remove/force
 
 # Add or remove newline between '}' and 'else'.
 nl_brace_else                   = remove   # ignore/add/remove/force
@@ -1468,16 +1468,16 @@
 nl_elseif_brace                 = ignore   # ignore/add/remove/force
 
 # Add or remove newline between 'else' and '{'.
-nl_else_brace                   = ignore   # ignore/add/remove/force
+nl_else_brace                   = remove   # ignore/add/remove/force
 
 # Add or remove newline between 'else' and 'if'.
-nl_else_if                      = ignore   # ignore/add/remove/force
+nl_else_if                      = remove   # ignore/add/remove/force
 
 # Add or remove newline before '{' opening brace
-nl_before_opening_brace_func_class_def = ignore   # ignore/add/remove/force
+nl_before_opening_brace_func_class_def = force   # ignore/add/remove/force
 
 # Add or remove newline before 'if'/'else if' closing parenthesis.
-nl_before_if_closing_paren      = ignore   # ignore/add/remove/force
+nl_before_if_closing_paren      = remove   # ignore/add/remove/force
 
 # Add or remove newline between '}' and 'finally'.
 nl_brace_finally                = ignore   # ignore/add/remove/force
@@ -1492,7 +1492,7 @@
 nl_getset_brace                 = ignore   # ignore/add/remove/force
 
 # Add or remove newline between 'for' and '{'.
-nl_for_brace                    = ignore   # ignore/add/remove/force
+nl_for_brace                    = remove   # ignore/add/remove/force
 
 # Add or remove newline before the '{' of a 'catch' statement, as in
 # 'catch (decl) <here> {'.
@@ -1516,7 +1516,7 @@
 nl_brace_fparen                 = ignore   # ignore/add/remove/force
 
 # Add or remove newline between 'while' and '{'.
-nl_while_brace                  = ignore   # ignore/add/remove/force
+nl_while_brace                  = remove   # ignore/add/remove/force
 
 # (D) Add or remove newline between 'scope (x)' and '{'.
 nl_scope_brace                  = ignore   # ignore/add/remove/force
@@ -1535,13 +1535,13 @@
 nl_brace_brace                  = ignore   # ignore/add/remove/force
 
 # Add or remove newline between 'do' and '{'.
-nl_do_brace                     = ignore   # ignore/add/remove/force
+nl_do_brace                     = remove   # ignore/add/remove/force
 
 # Add or remove newline between '}' and 'while' of 'do' statement.
-nl_brace_while                  = ignore   # ignore/add/remove/force
+nl_brace_while                  = remove   # ignore/add/remove/force
 
 # Add or remove newline between 'switch' and '{'.
-nl_switch_brace                 = ignore   # ignore/add/remove/force
+nl_switch_brace                 = remove   # ignore/add/remove/force
 
 # Add or remove newline between 'synchronized' and '{'.
 nl_synchronized_brace           = ignore   # ignore/add/remove/force
@@ -1569,12 +1569,12 @@
 nl_before_case                  = false    # true/false
 
 # Whether to add a newline after a 'case' statement.
-nl_after_case                   = false    # true/false
+nl_after_case                   = true     # true/false
 
 # Add or remove newline between a case ':' and '{'.
 #
 # Overrides nl_after_case.
-nl_case_colon_brace             = ignore   # ignore/add/remove/force
+nl_case_colon_brace             = remove   # ignore/add/remove/force
 
 # Add or remove newline between ')' and 'throw'.
 nl_before_throw                 = ignore   # ignore/add/remove/force
@@ -1658,7 +1658,7 @@
 # Add or remove newline between return type and function name in a function
 # definition.
 # might be modified by nl_func_leave_one_liners
-nl_func_type_name               = ignore    # ignore/add/remove/force
+nl_func_type_name               = force     # ignore/add/remove/force
 
 # Add or remove newline between return type and function name inside a class
 # definition. If set to ignore, nl_func_type_name or nl_func_proto_type_name
@@ -1675,25 +1675,25 @@
 nl_func_scope_name              = ignore   # ignore/add/remove/force
 
 # Add or remove newline between return type and function name in a prototype.
-nl_func_proto_type_name         = ignore   # ignore/add/remove/force
+nl_func_proto_type_name         = remove   # ignore/add/remove/force
 
 # Add or remove newline between a function name and the opening '(' in the
 # declaration.
-nl_func_paren                   = ignore   # ignore/add/remove/force
+nl_func_paren                   = remove   # ignore/add/remove/force
 
 # Overrides nl_func_paren for functions with no parameters.
 nl_func_paren_empty             = ignore   # ignore/add/remove/force
 
 # Add or remove newline between a function name and the opening '(' in the
 # definition.
-nl_func_def_paren               = ignore   # ignore/add/remove/force
+nl_func_def_paren               = remove   # ignore/add/remove/force
 
 # Overrides nl_func_def_paren for functions with no parameters.
 nl_func_def_paren_empty         = ignore   # ignore/add/remove/force
 
 # Add or remove newline between a function name and the opening '(' in the
 # call.
-nl_func_call_paren              = ignore   # ignore/add/remove/force
+nl_func_call_paren              = remove   # ignore/add/remove/force
 
 # Overrides nl_func_call_paren for functions with no parameters.
 nl_func_call_paren_empty        = ignore   # ignore/add/remove/force
@@ -1736,10 +1736,10 @@
 nl_func_def_args_multi_line     = false    # true/false
 
 # Add or remove newline before the ')' in a function declaration.
-nl_func_decl_end                = ignore   # ignore/add/remove/force
+nl_func_decl_end                = remove   # ignore/add/remove/force
 
 # Add or remove newline before the ')' in a function definition.
-nl_func_def_end                 = ignore   # ignore/add/remove/force
+nl_func_def_end                 = remove   # ignore/add/remove/force
 
 # Overrides nl_func_decl_end when there is only one parameter.
 nl_func_decl_end_single         = ignore   # ignore/add/remove/force
@@ -1756,20 +1756,20 @@
 nl_func_def_end_multi_line      = false    # true/false
 
 # Add or remove newline between '()' in a function declaration.
-nl_func_decl_empty              = ignore   # ignore/add/remove/force
+nl_func_decl_empty              = remove   # ignore/add/remove/force
 
 # Add or remove newline between '()' in a function definition.
-nl_func_def_empty               = ignore   # ignore/add/remove/force
+nl_func_def_empty               = remove   # ignore/add/remove/force
 
 # Add or remove newline between '()' in a function call.
-nl_func_call_empty              = ignore   # ignore/add/remove/force
+nl_func_call_empty              = remove   # ignore/add/remove/force
 
 # Whether to add a newline after '(' in a function call,
 # has preference over nl_func_call_start_multi_line.
 nl_func_call_start              = ignore   # ignore/add/remove/force
 
 # Whether to add a newline before ')' in a function call.
-nl_func_call_end                = ignore   # ignore/add/remove/force
+nl_func_call_end                = remove   # ignore/add/remove/force
 
 # Whether to add a newline after '(' in a function call if '(' and ')' are in
 # different lines.
@@ -1784,7 +1784,7 @@
 nl_func_call_end_multi_line     = false    # true/false
 
 # Whether to respect nl_func_call_XXX option incase of closure args.
-nl_func_call_args_multi_line_ignore_closures = false    # true/false
+nl_func_call_args_multi_line_ignore_closures = true    # true/false
 
 # Whether to add a newline after '<' of a template parameter list.
 nl_template_start               = false    # true/false
@@ -1800,17 +1800,17 @@
 nl_oc_msg_args                  = false    # true/false
 
 # Add or remove newline between function signature and '{'.
-nl_fdef_brace                   = ignore    # ignore/add/remove/force
+nl_fdef_brace                   = force    # ignore/add/remove/force
 
 # Add or remove newline between function signature and '{',
 # if signature ends with ')'. Overrides nl_fdef_brace.
-nl_fdef_brace_cond              = ignore   # ignore/add/remove/force
+nl_fdef_brace_cond              = force    # ignore/add/remove/force
 
 # Add or remove newline between C++11 lambda signature and '{'.
 nl_cpp_ldef_brace               = ignore   # ignore/add/remove/force
 
 # Add or remove newline between 'return' and the return expression.
-nl_return_expr                  = ignore   # ignore/add/remove/force
+nl_return_expr                  = remove   # ignore/add/remove/force
 
 # Whether to add a newline after semicolons, except in 'for' statements.
 nl_after_semicolon              = false    # true/false
@@ -1833,7 +1833,7 @@
 
 # Whether to add a newline after '{'. This also adds a newline before the
 # matching '}'.
-nl_after_brace_open             = false    # true/false
+nl_after_brace_open             = true     # true/false
 
 # Whether to add a newline between the open brace and a trailing single-line
 # comment. Requires nl_after_brace_open=true.
@@ -1849,7 +1849,7 @@
 
 # Whether to add a newline after '}'. Does not apply if followed by a
 # necessary ';'.
-nl_after_brace_close            = false    # true/false
+nl_after_brace_close            = true     # true/false
 
 # Whether to add a newline after a virtual brace close,
 # as in 'if (foo) a++; <here> return;'.
@@ -1858,7 +1858,7 @@
 # Add or remove newline between the close brace and identifier,
 # as in 'struct { int a; } <here> b;'. Affects enumerations, unions and
 # structures. If set to ignore, uses nl_after_brace_close.
-nl_brace_struct_var             = ignore   # ignore/add/remove/force
+nl_brace_struct_var             = remove   # ignore/add/remove/force
 
 # Whether to alter newlines in '#define' macros.
 nl_define_macro                 = false    # true/false
@@ -1866,11 +1866,11 @@
 # Whether to alter newlines between consecutive parenthesis closes. The number
 # of closing parentheses in a line will depend on respective open parenthesis
 # lines.
-nl_squeeze_paren_close          = false    # true/false
+nl_squeeze_paren_close          = true     # true/false
 
 # Whether to remove blanks after '#ifxx' and '#elxx', or before '#elxx' and
 # '#endif'. Does not affect top-level #ifdefs.
-nl_squeeze_ifdef                = false    # true/false
+nl_squeeze_ifdef                = true     # true/false
 
 # Makes the nl_squeeze_ifdef option affect the top-level #ifdefs as well.
 nl_squeeze_ifdef_top_level      = false    # true/false
@@ -2042,18 +2042,18 @@
 # of a function body.
 #
 # 0: No change (default).
-nl_func_var_def_blk             = 0        # unsigned number
+nl_func_var_def_blk             = 1        # unsigned number
 
 # The number of newlines before a block of typedefs. If nl_after_access_spec
 # is non-zero, that option takes precedence.
 #
 # 0: No change (default).
-nl_typedef_blk_start            = 0        # unsigned number
+nl_typedef_blk_start            = 1        # unsigned number
 
 # The number of newlines after a block of typedefs.
 #
 # 0: No change (default).
-nl_typedef_blk_end              = 0        # unsigned number
+nl_typedef_blk_end              = 1        # unsigned number
 
 # The maximum number of consecutive newlines within a block of typedefs.
 #
@@ -2071,7 +2071,7 @@
 # of a function body.
 #
 # 0: No change (default).
-nl_var_def_blk_end              = 0        # unsigned number
+nl_var_def_blk_end              = 1        # unsigned number
 
 # The maximum number of consecutive newlines within a block of variable
 # definitions.
@@ -2095,7 +2095,7 @@
 nl_after_multiline_comment      = false    # true/false
 
 # Whether to force a newline after a label's colon.
-nl_after_label_colon            = false    # true/false
+nl_after_label_colon            = true     # true/false
 
 # The number of newlines after '}' or ';' of a struct/enum/union definition.
 nl_after_struct                 = 1        # unsigned number
@@ -2186,7 +2186,7 @@
 # The number of newlines before a whole-file #ifdef.
 #
 # 0: No change (default).
-nl_before_whole_file_ifdef      = 0        # unsigned number
+nl_before_whole_file_ifdef      = 2        # unsigned number
 
 # The number of newlines after a whole-file #ifdef.
 #
@@ -2196,39 +2196,39 @@
 # The number of newlines before a whole-file #endif.
 #
 # 0: No change (default).
-nl_before_whole_file_endif      = 0        # unsigned number
+nl_before_whole_file_endif      = 2        # unsigned number
 
 # The number of newlines after a whole-file #endif.
 #
 # 0: No change (default).
-nl_after_whole_file_endif       = 0        # unsigned number
+nl_after_whole_file_endif       = 2        # unsigned number
 
 #
 # Positioning options
 #
 
 # The position of arithmetic operators in wrapped expressions.
-pos_arith                       = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_arith                       = trail    # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
 
 # The position of assignment in wrapped expressions. Do not affect '='
 # followed by '{'.
-pos_assign                      = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_assign                      = trail    # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
 
 # The position of Boolean operators in wrapped expressions.
-pos_bool                        = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_bool                        = trail    # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
 
 # The position of comparison operators in wrapped expressions.
-pos_compare                     = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_compare                     = trail    # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
 
 # The position of conditional operators, as in the '?' and ':' of
 # 'expr ? stmt : stmt', in wrapped expressions.
-pos_conditional                 = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_conditional                 = trail    # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
 
 # The position of the comma in wrapped expressions.
-pos_comma                       = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_comma                       = trail    # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
 
 # The position of the comma in enum entries.
-pos_enum_comma                  = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_enum_comma                  = trail    # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
 
 # The position of the comma in the base class list if there is more than one
 # line. Affects nl_class_init_args.
@@ -2285,12 +2285,12 @@
 align_keep_extra_space          = false    # true/false
 
 # Whether to align variable definitions in prototypes and functions.
-align_func_params               = true     # true/false
+align_func_params               = false    # true/false
 
 # The span for aligning parameter definitions in function on parameter name.
 #
 # 0: Don't align (default).
-align_func_params_span          = 1        # unsigned number
+align_func_params_span          = 0        # unsigned number
 
 # The threshold for aligning function parameter definitions.
 # Use a negative number for absolute thresholds.
@@ -2520,11 +2520,11 @@
 
 # Whether to align single-line functions with function prototypes.
 # Uses align_func_proto_span.
-align_single_line_func          = true     # true/false
+align_single_line_func          = false    # true/false
 
 # Whether to align the open brace of single-line functions.
 # Requires align_single_line_func=true. Uses align_func_proto_span.
-align_single_line_brace         = true     # true/false
+align_single_line_brace         = false    # true/false
 
 # Gap for align_single_line_brace.
 align_single_line_brace_gap     = 1        # unsigned number
@@ -2707,17 +2707,17 @@
 #
 
 # Add or remove braces on a single-line 'do' statement.
-mod_full_brace_do               = ignore    # ignore/add/remove/force
+mod_full_brace_do               = force     # ignore/add/remove/force
 
 # Add or remove braces on a single-line 'for' statement.
-mod_full_brace_for              = ignore    # ignore/add/remove/force
+mod_full_brace_for              = force     # ignore/add/remove/force
 
 # (Pawn) Add or remove braces on a single-line function definition.
-mod_full_brace_function         = ignore    # ignore/add/remove/force
+mod_full_brace_function         = force     # ignore/add/remove/force
 
 # Add or remove braces on a single-line 'if' statement. Braces will not be
 # removed if the braced statement contains an 'else'.
-mod_full_brace_if               = ignore    # ignore/add/remove/force
+mod_full_brace_if               = force     # ignore/add/remove/force
 
 # Whether to enforce that all blocks of an 'if'/'else if'/'else' chain either
 # have, or do not have, braces. If true, braces will be added if any block
@@ -2730,10 +2730,10 @@
 # Whether to add braces to all blocks of an 'if'/'else if'/'else' chain.
 # If true, mod_full_brace_if_chain will only remove braces from an 'if' that
 # does not have an 'else if' or 'else'.
-mod_full_brace_if_chain_only    = false    # true/false
+mod_full_brace_if_chain_only    = true     # true/false
 
 # Add or remove braces on single-line 'while' statement.
-mod_full_brace_while            = ignore    # ignore/add/remove/force
+mod_full_brace_while            = force     # ignore/add/remove/force
 
 # Add or remove braces on single-line 'using ()' statement.
 mod_full_brace_using            = ignore    # ignore/add/remove/force
@@ -2758,17 +2758,17 @@
 mod_full_brace_nl_block_rem_mlcond = false    # true/false
 
 # Add or remove unnecessary parenthesis on 'return' statement.
-mod_paren_on_return             = ignore   # ignore/add/remove/force
+mod_paren_on_return             = remove   # ignore/add/remove/force
 
 # (Pawn) Whether to change optional semicolons to real semicolons.
 mod_pawn_semicolon              = false    # true/false
 
 # Whether to fully parenthesize Boolean expressions in 'while' and 'if'
 # statement, as in 'if (a && b > c)' => 'if (a && (b > c))'.
-mod_full_paren_if_bool          = false    # true/false
+mod_full_paren_if_bool          = true     # true/false
 
 # Whether to remove superfluous semicolons.
-mod_remove_extra_semicolon      = false    # true/false
+mod_remove_extra_semicolon      = true     # true/false
 
 # If a function body exceeds the specified number of newlines and doesn't have
 # a comment after the close brace, a comment will be added.
@@ -2806,7 +2806,7 @@
 # Whether to sort consecutive single-line '#include' statements (C/C++) and
 # '#import' statements (Objective-C). Be aware that this has the potential to
 # break your code if your includes/imports have ordering dependencies.
-mod_sort_include                = false    # true/false
+mod_sort_include                = true     # true/false
 
 # Whether to prioritize '#include' and '#import' statements that contain
 # filename without extension when sorting is enabled.
@@ -2829,18 +2829,18 @@
 
 # Whether to move a 'break' that appears after a fully braced 'case' before
 # the close brace, as in 'case X: { ... } break;' => 'case X: { ... break; }'.
-mod_move_case_break             = false    # true/false
+mod_move_case_break             = true     # true/false
 
 # Add or remove braces around a fully braced case statement. Will only remove
 # braces if there are no variable declarations in the block.
-mod_case_brace                  = ignore   # ignore/add/remove/force
+mod_case_brace                  = remove   # ignore/add/remove/force
 
 # Whether to remove a void 'return;' that appears as the last statement in a
 # function.
-mod_remove_empty_return         = false    # true/false
+mod_remove_empty_return         = true     # true/false
 
 # Add or remove the comma after the last value of an enumeration.
-mod_enum_last_comma             = ignore    # ignore/add/remove/force
+mod_enum_last_comma             = remove   # ignore/add/remove/force
 
 # (OC) Whether to organize the properties. If true, properties will be
 # rearranged according to the mod_sort_oc_property_*_weight factors.
@@ -2968,7 +2968,7 @@
 # false: indent_func_call_param will NOT be used
 #
 # Default: true
-use_indent_func_call_param      = false    # true/false
+use_indent_func_call_param      = true    # true/false
 
 # The value of the indentation for a continuation line is calculated
 # differently if the statement is:
@@ -2984,7 +2984,7 @@
 #
 # true:  indent_continue will be used only once
 # false: indent_continue will be used every time (default)
-use_indent_continue_only_once   = false    # true/false
+use_indent_continue_only_once   = true     # true/false
 
 # The value might be used twice:
 # - at the assignment
@@ -2995,7 +2995,7 @@
 #
 # 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