diff --git a/uncrustify.cfg b/uncrustify.cfg
index 4fa60cf..75a6f34 100644
--- a/uncrustify.cfg
+++ b/uncrustify.cfg
@@ -195,7 +195,7 @@
 sp_before_unnamed_ptr_star      = ignore   # ignore/add/remove/force
 
 # Add or remove space between pointer stars '*'.
-sp_between_ptr_star             = ignore   # ignore/add/remove/force
+sp_between_ptr_star             = remove   # ignore/add/remove/force
 
 # Add or remove space after pointer star '*', if followed by a word.
 #
@@ -216,11 +216,11 @@
 
 # Add or remove space after a pointer star '*', if followed by an open
 # parenthesis, as in 'void* (*)().
-sp_ptr_star_paren               = ignore   # ignore/add/remove/force
+sp_ptr_star_paren               = remove   # ignore/add/remove/force
 
 # Add or remove space before a pointer star '*', if followed by a function
 # prototype or function definition.
-sp_before_ptr_star_func         = ignore    # ignore/add/remove/force
+sp_before_ptr_star_func         = ignore   # ignore/add/remove/force
 
 # Add or remove space before a reference sign '&'.
 sp_before_byref                 = ignore    # ignore/add/remove/force
@@ -512,36 +512,36 @@
 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             = ignore   # ignore/add/remove/force
+sp_func_proto_paren             = remove   # ignore/add/remove/force
 
 # Add or remove space between function name and '()' on function declaration
 # without parameters.
-sp_func_proto_paren_empty       = ignore   # ignore/add/remove/force
+sp_func_proto_paren_empty       = remove   # ignore/add/remove/force
 
 # Add or remove space between function name and '(' with a typedef specifier.
-sp_func_type_paren              = ignore   # ignore/add/remove/force
+sp_func_type_paren              = remove   # ignore/add/remove/force
 
 # Add or remove space between alias name and '(' of a non-pointer function type typedef.
 sp_func_def_paren               = ignore   # ignore/add/remove/force
 
 # Add or remove space between function name and '()' on function definition
 # without parameters.
-sp_func_def_paren_empty         = ignore   # ignore/add/remove/force
+sp_func_def_paren_empty         = remove   # ignore/add/remove/force
 
 # Add or remove space inside empty function '()'.
 # Overrides sp_after_angle unless use_sp_after_angle_always is set to true.
-sp_inside_fparens               = ignore   # ignore/add/remove/force
+sp_inside_fparens               = remove   # ignore/add/remove/force
 
 # Add or remove space inside function '(' and ')'.
-sp_inside_fparen                = ignore   # ignore/add/remove/force
+sp_inside_fparen                = remove   # ignore/add/remove/force
 
 # Add or remove space inside the first parentheses in a function type, as in
 # 'void (*x)(...)'.
-sp_inside_tparen                = ignore   # ignore/add/remove/force
+sp_inside_tparen                = remove   # ignore/add/remove/force
 
 # Add or remove space between the ')' and '(' in a function type, as in
 # 'void (*x)(...)'.
-sp_after_tparen_close           = ignore   # ignore/add/remove/force
+sp_after_tparen_close           = remove   # ignore/add/remove/force
 
 # Add or remove space between ']' and '(' when part of a function call.
 sp_square_fparen                = ignore   # ignore/add/remove/force
@@ -587,16 +587,16 @@
 sp_func_class_paren_empty       = ignore   # ignore/add/remove/force
 
 # Add or remove space between 'return' and '('.
-sp_return_paren                 = ignore    # ignore/add/remove/force
+sp_return_paren                 = force    # ignore/add/remove/force
 
 # Add or remove space between 'return' and '{'.
-sp_return_brace                 = ignore    # ignore/add/remove/force
+sp_return_brace                 = force    # ignore/add/remove/force
 
 # Add or remove space between '__attribute__' and '('.
-sp_attribute_paren              = ignore   # ignore/add/remove/force
+sp_attribute_paren              = remove   # ignore/add/remove/force
 
 # Add or remove space between 'defined' and '(' in '#if defined (FOO)'.
-sp_defined_paren                = ignore    # ignore/add/remove/force
+sp_defined_paren                = force    # ignore/add/remove/force
 
 # Add or remove space between 'throw' and '(' in 'throw (something)'.
 sp_throw_paren                  = ignore   # ignore/add/remove/force
@@ -640,19 +640,19 @@
 sp_this_paren                   = ignore   # ignore/add/remove/force
 
 # Add or remove space between a macro name and its definition.
-sp_macro                        = ignore    # ignore/add/remove/force
+sp_macro                        = force    # ignore/add/remove/force
 
 # Add or remove space between a macro function ')' and its definition.
-sp_macro_func                   = ignore    # ignore/add/remove/force
+sp_macro_func                   = force    # ignore/add/remove/force
 
 # Add or remove space between 'else' and '{' if on the same line.
-sp_else_brace                   = ignore    # ignore/add/remove/force
+sp_else_brace                   = ignore   # ignore/add/remove/force
 
 # Add or remove space between '}' and 'else' if on the same line.
-sp_brace_else                   = force     # ignore/add/remove/force
+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                = ignore   # 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> {'.