diff --git a/uncrustify.cfg b/uncrustify.cfg
index 1493e5a33..72537534e 100644
--- a/uncrustify.cfg
+++ b/uncrustify.cfg
@@ -148,7 +148,7 @@ sp_paren_paren                  = remove   # ignore/add/remove/force
 sp_cparen_oparen                = ignore   # ignore/add/remove/force
 
 # Whether to balance spaces inside nested parentheses.
-sp_balance_nested_parens        = false    # true/false
+sp_paren_paren                  = false    # true/false
 
 # Add or remove space between ')' and '{'.
 sp_paren_brace                  = add      # ignore/add/remove/force
@@ -362,7 +362,7 @@ sp_before_ellipsis              = ignore   # ignore/add/remove/force
 sp_type_ellipsis                = ignore   # ignore/add/remove/force
 
 # (D) Add or remove space between a type and '?'.
-sp_type_question                = ignore   # ignore/add/remove/force
+sp_before_ptr_star              = ignore   # ignore/add/remove/force
 
 # Add or remove space between ')' and '...'.
 sp_paren_ellipsis               = ignore   # ignore/add/remove/force
@@ -847,10 +847,10 @@ sp_inside_newop_paren_open      = ignore   # ignore/add/remove/force
 sp_inside_newop_paren_close     = ignore   # ignore/add/remove/force
 
 # Add or remove space before a trailing or embedded comment.
-sp_before_tr_emb_cmt            = ignore   # ignore/add/remove/force
+sp_before_tr_cmt                = ignore   # ignore/add/remove/force
 
 # Number of spaces before a trailing or embedded comment.
-sp_num_before_tr_emb_cmt        = 0        # unsigned number
+sp_num_before_tr_cmt            = 0        # unsigned number
 
 # (Java) Add or remove space between an annotation and the open parenthesis.
 sp_annotation_paren             = ignore   # ignore/add/remove/force
@@ -1000,7 +1000,7 @@ indent_var_def_cont             = false    # 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                    = 0    # true/false
 
 # Whether to force indentation of function definitions to start in column 1.
 indent_func_def_force_col1      = false    # true/false
@@ -1045,7 +1045,7 @@ indent_member                   = 0        # unsigned number
 indent_member_single            = false    # true/false
 
 # Spaces to indent single line ('//') comments on lines before code.
-indent_sing_line_comments       = 0        # unsigned number
+indent_single_line_comments_before       = 0        # unsigned number
 
 # Whether to indent trailing single line ('//') comments relative to the code
 # instead of trying to keep the same absolute column.
@@ -1116,11 +1116,11 @@ indent_paren_after_func_call    = false    # true/false
 
 # Whether to indent a comma when inside a parenthesis.
 # If true, aligns under the open parenthesis.
-indent_comma_paren              = false    # true/false
+indent_comma_paren              = 0    # true/false
 
 # Whether to indent a Boolean operator when inside a parenthesis.
 # If true, aligns under the open parenthesis.
-indent_bool_paren               = false    # true/false
+indent_bool_paren               = 0    # true/false
 
 # Whether to indent a semicolon when inside a for parenthesis.
 # If true, aligns under the open for parenthesis.
@@ -1828,7 +1828,7 @@ nl_after_func_body_one_liner    = 2        # unsigned number
 # of a function body.
 #
 # 0 = No change (default).
-nl_func_var_def_blk             = 1        # unsigned number
+nl_var_def_blk_end_func_top             = 1        # unsigned number
 
 # The number of newlines before a block of typedefs. If nl_after_access_spec
 # is non-zero, that option takes precedence.
@@ -2296,7 +2296,7 @@ align_oc_msg_spec_span          = 0        # unsigned number
 
 # Whether to align macros wrapped with a backslash and a newline. This will
 # not work right if the macro contains a multi-line comment.
-align_nl_cont                   = true     # true/false
+align_nl_cont                   = 1     # true/false
 
 # Whether to align macro functions and variables together.
 align_pp_define_together        = false    # true/false
@@ -2480,7 +2480,7 @@ mod_full_brace_if               = add      # ignore/add/remove/force
 # blocks.
 #
 # Overrides mod_full_brace_if.
-mod_full_brace_if_chain         = false    # true/false
+mod_full_brace_if_chain         = 0    # true/false
 
 # 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
@@ -2623,7 +2623,7 @@ pp_indent_at_level              = false    # true/false
 pp_indent_count                 = 1        # unsigned number
 
 # Add or remove space after # based on pp_level of #if blocks.
-pp_space                        = add      # ignore/add/remove/force
+pp_space_after                        = add      # ignore/add/remove/force
 
 # Sets the number of spaces per level added with pp_space.
 pp_space_count                  = 0        # unsigned number
@@ -2678,7 +2678,10 @@ pp_indent_extern                = true     # true/false
 # inside of.
 #
 # Default: true
-pp_indent_brace                 = true     # true/false
+pp_indent_brace                 = 1     # true/false
+
+# Sets the number of spaces per level added with pp_space_after.
+pp_space_count                  = 1        # unsigned number
 
 #
 # Sort includes options