diff --git a/uncrustify.cfg b/uncrustify.cfg
index 75a6f34..039118e 100644
--- a/uncrustify.cfg
+++ b/uncrustify.cfg
@@ -296,10 +296,10 @@
 
 # Add or remove space before '(' of control statements ('if', 'for', 'switch',
 # 'while', etc.).
-sp_before_sparen                = ignore    # ignore/add/remove/force
+sp_before_sparen                = force    # ignore/add/remove/force
 
 # Add or remove space inside '(' and ')' of control statements.
-sp_inside_sparen                = ignore   # ignore/add/remove/force
+sp_inside_sparen                = remove   # ignore/add/remove/force
 
 # Add or remove space after '(' of control statements.
 #
@@ -312,10 +312,10 @@
 sp_inside_sparen_close          = ignore   # ignore/add/remove/force
 
 # Add or remove space after ')' of control statements.
-sp_after_sparen                 = ignore    # ignore/add/remove/force
+sp_after_sparen                 = force    # ignore/add/remove/force
 
 # Add or remove space between ')' and '{' of of control statements.
-sp_sparen_brace                 = ignore    # ignore/add/remove/force
+sp_sparen_brace                 = force    # ignore/add/remove/force
 
 # (D) Add or remove space between 'invariant' and '('.
 sp_invariant_paren              = ignore   # ignore/add/remove/force
@@ -329,27 +329,27 @@
 # Add or remove space before ';'.
 #
 # Default: remove
-sp_before_semi                  = ignore   # ignore/add/remove/force
+sp_before_semi                  = remove   # ignore/add/remove/force
 
 # Add or remove space before ';' in non-empty 'for' statements.
-sp_before_semi_for              = ignore   # ignore/add/remove/force
+sp_before_semi_for              = remove   # ignore/add/remove/force
 
 # Add or remove space before a semicolon of an empty part of a for statement.
-sp_before_semi_for_empty        = ignore   # ignore/add/remove/force
+sp_before_semi_for_empty        = force    # ignore/add/remove/force
 
 # Add or remove space after ';', except when followed by a comment.
 #
 # Default: add
-sp_after_semi                   = ignore   # ignore/add/remove/force
+sp_after_semi                   = force    # ignore/add/remove/force
 
 # Add or remove space after ';' in non-empty 'for' statements.
 #
 # Default: force
-sp_after_semi_for               = ignore    # ignore/add/remove/force
+sp_after_semi_for               = force    # ignore/add/remove/force
 
 # Add or remove space after the final semicolon of an empty part of a for
 # statement, as in 'for ( ; ; <here> )'.
-sp_after_semi_for_empty         = ignore   # ignore/add/remove/force
+sp_after_semi_for_empty         = force    # ignore/add/remove/force
 
 # Add or remove space before '[' (except '[]').
 sp_before_square                = ignore   # ignore/add/remove/force
@@ -376,12 +376,12 @@
 sp_inside_square_oc_array       = ignore   # ignore/add/remove/force
 
 # Add or remove space after ',', i.e. 'a,b' vs. 'a, b'.
-sp_after_comma                  = ignore    # ignore/add/remove/force
+sp_after_comma                  = add      # ignore/add/remove/force
 
 # Add or remove space before ','.
 #
 # Default: remove
-sp_before_comma                 = ignore   # ignore/add/remove/force
+sp_before_comma                 = remove   # ignore/add/remove/force
 
 # (C#) Add or remove space between ',' and ']' in multidimensional array type
 # like 'int[,,]'.
@@ -399,7 +399,7 @@
 # i.e. '(,' vs. '( ,'.
 #
 # Default: force
-sp_paren_comma                  = ignore    # ignore/add/remove/force
+sp_paren_comma                  = force    # ignore/add/remove/force
 
 # Add or remove space before the variadic '...' when preceded by a
 # non-punctuator.
@@ -646,7 +646,7 @@
 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                   = force    # ignore/add/remove/force
 
 # Add or remove space between '}' and 'else' if on the same line.
 sp_brace_else                   = force    # ignore/add/remove/force