diff --git a/uncrustify.cfg b/uncrustify.cfg
index 039118e..e27a574 100644
--- a/uncrustify.cfg
+++ b/uncrustify.cfg
@@ -403,19 +403,19 @@
 
 # Add or remove space before the variadic '...' when preceded by a
 # non-punctuator.
-sp_before_ellipsis              = ignore    # ignore/add/remove/force
+sp_before_ellipsis              = force    # ignore/add/remove/force
 
 # Add or remove space between a type and '...'.
-sp_type_ellipsis                = ignore   # ignore/add/remove/force
+sp_type_ellipsis                = force    # ignore/add/remove/force
 
 # (D) Add or remove space between a type and '?'.
 #sp_type_question                = ignore   # ignore/add/remove/force
 
 # Add or remove space between ')' and '...'.
-sp_paren_ellipsis               = ignore   # ignore/add/remove/force
+sp_paren_ellipsis               = force    # ignore/add/remove/force
 
 # Add or remove space between ')' and a qualifier such as 'const'.
-sp_paren_qualifier              = ignore   # ignore/add/remove/force
+sp_paren_qualifier              = force    # ignore/add/remove/force
 
 # Add or remove space between ')' and 'noexcept'.
 sp_paren_noexcept               = ignore   # ignore/add/remove/force
@@ -453,7 +453,7 @@
 sp_after_cast                   = ignore   # ignore/add/remove/force
 
 # Add or remove spaces inside cast parentheses.
-sp_inside_paren_cast            = ignore   # ignore/add/remove/force
+sp_inside_paren_cast            = remove   # ignore/add/remove/force
 
 # Add or remove space between the type and open parenthesis in a C++ cast,
 # i.e. 'int(exp)' vs. 'int (exp)'.
@@ -463,10 +463,10 @@
 sp_sizeof_paren                 = ignore   # ignore/add/remove/force
 
 # Add or remove space between 'sizeof' and '...'.
-sp_sizeof_ellipsis              = ignore   # ignore/add/remove/force
+sp_sizeof_ellipsis              = remove   # ignore/add/remove/force
 
 # Add or remove space between 'sizeof...' and '('.
-sp_sizeof_ellipsis_paren        = ignore   # ignore/add/remove/force
+sp_sizeof_ellipsis_paren        = remove   # ignore/add/remove/force
 
 # Add or remove space between 'decltype' and '('.
 sp_decltype_paren               = ignore   # ignore/add/remove/force
@@ -475,10 +475,10 @@
 #sp_after_tag                    = ignore   # ignore/add/remove/force
 
 # Add or remove space inside enum '{' and '}'.
-sp_inside_braces_enum           = ignore   # ignore/add/remove/force
+sp_inside_braces_enum           = force    # ignore/add/remove/force
 
 # Add or remove space inside struct/union '{' and '}'.
-sp_inside_braces_struct         = ignore   # ignore/add/remove/force
+sp_inside_braces_struct         = force    # ignore/add/remove/force
 
 # (OC) Add or remove space inside Objective-C boxed dictionary '{' and '}'
 #sp_inside_braces_oc_dict        = ignore   # ignore/add/remove/force
@@ -495,21 +495,21 @@
 sp_inside_type_brace_init_lst   = ignore   # ignore/add/remove/force
 
 # Add or remove space inside '{' and '}'.
-sp_inside_braces                = ignore   # ignore/add/remove/force
+sp_inside_braces                = remove   # ignore/add/remove/force
 
 # Add or remove space inside '{}'.
-sp_inside_braces_empty          = ignore   # ignore/add/remove/force
+sp_inside_braces_empty          = remove   # ignore/add/remove/force
 
 # Add or remove space around trailing return operator '->'.
 sp_trailing_return              = ignore   # ignore/add/remove/force
 
 # Add or remove space between return type and function name. A minimum of 1
 # is forced except for pointer return types.
-sp_type_func                    = ignore    # ignore/add/remove/force
+sp_type_func                    = remove   # ignore/add/remove/force
 
 # Add or remove space between type and open brace of an unnamed temporary
 # direct-list-initialization.
-sp_type_brace_init_lst          = ignore    # ignore/add/remove/force
+sp_type_brace_init_lst          = ignore   # ignore/add/remove/force
 
 # Add or remove space between function name and '(' on function declaration.
 sp_func_proto_paren             = remove   # ignore/add/remove/force
@@ -652,7 +652,7 @@
 sp_brace_else                   = force    # ignore/add/remove/force
 
 # Add or remove space between '}' and the name of a typedef on the same line.
-sp_brace_typedef                = ignore   # ignore/add/remove/force
+sp_brace_typedef                = force    # ignore/add/remove/force
 
 # Add or remove space before the '{' of a 'catch' statement, if the '{' and
 # 'catch' are on the same line, as in 'catch (decl) <here> {'.
@@ -703,40 +703,40 @@
 # Add or remove space after the '!' (not) unary operator.
 #
 # Default: remove
-sp_not                          = ignore   # ignore/add/remove/force
+sp_not                          = remove   # ignore/add/remove/force
 
 # Add or remove space after the '~' (invert) unary operator.
 #
 # Default: remove
-sp_inv                          = ignore   # ignore/add/remove/force
+sp_inv                          = remove   # ignore/add/remove/force
 
 # Add or remove space after the '&' (address-of) unary operator. This does not
 # affect the spacing after a '&' that is part of a type.
 #
 # Default: remove
-sp_addr                         = ignore   # ignore/add/remove/force
+sp_addr                         = remove   # ignore/add/remove/force
 
 # Add or remove space around the '.' or '->' operators.
 #
 # Default: remove
-sp_member                       = ignore   # ignore/add/remove/force
+sp_member                       = remove   # ignore/add/remove/force
 
 # Add or remove space after the '*' (dereference) unary operator. This does
 # not affect the spacing after a '*' that is part of a type.
 #
 # Default: remove
-sp_deref                        = ignore   # ignore/add/remove/force
+sp_deref                        = remove   # ignore/add/remove/force
 
 # Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'.
 #
 # Default: remove
-sp_sign                         = ignore   # ignore/add/remove/force
+sp_sign                         = remove   # ignore/add/remove/force
 
 # Add or remove space between '++' and '--' the word to which it is being
 # applied, as in '(--x)' or 'y++;'.
 #
 # Default: remove
-sp_incdec                       = ignore   # ignore/add/remove/force
+sp_incdec                       = remove   # ignore/add/remove/force
 
 # Add or remove space before a backslash-newline at the end of a line.
 #
@@ -813,20 +813,20 @@
 sp_after_oc_synchronized        = ignore   # ignore/add/remove/force
 
 # Add or remove space around the ':' in 'b ? t : f'.
-sp_cond_colon                   = ignore    # ignore/add/remove/force
+sp_cond_colon                   = force    # ignore/add/remove/force
 
 # Add or remove space before the ':' in 'b ? t : f'.
 #
 # Overrides sp_cond_colon.
-sp_cond_colon_before            = ignore    # ignore/add/remove/force
+sp_cond_colon_before            = ignore   # ignore/add/remove/force
 
 # Add or remove space after the ':' in 'b ? t : f'.
 #
 # Overrides sp_cond_colon.
-sp_cond_colon_after             = ignore    # ignore/add/remove/force
+sp_cond_colon_after             = ignore   # ignore/add/remove/force
 
 # Add or remove space around the '?' in 'b ? t : f'.
-sp_cond_question                = ignore    # ignore/add/remove/force
+sp_cond_question                = force    # ignore/add/remove/force
 
 # Add or remove space before the '?' in 'b ? t : f'.
 #
@@ -842,11 +842,11 @@
 # and ':'.
 #
 # Overrides all other sp_cond_* options.
-sp_cond_ternary_short           = ignore    # ignore/add/remove/force
+sp_cond_ternary_short           = remove    # ignore/add/remove/force
 
 # Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make
 # sense here.
-sp_case_label                   = ignore    # ignore/add/remove/force
+sp_case_label                   = force    # ignore/add/remove/force
 
 # (D) Add or remove space around the D '..' operator.
 sp_range                        = ignore   # ignore/add/remove/force