diff --git a/build/clutter-uncrustify.cfg b/build/clutter-uncrustify.cfg
index a634d3a69..2d41298d2 100644
--- a/build/clutter-uncrustify.cfg
+++ b/build/clutter-uncrustify.cfg
@@ -17,7 +17,7 @@ indent_func_call_param  false
 indent_func_def_param   false
 indent_func_proto_param false
 indent_switch_case      0
-indent_case_brace       0
+indent_case_brace       2
 indent_paren_close      1
 
 # spacing
@@ -47,9 +47,13 @@ sp_member                       Remove
 sp_deref                        Remove
 sp_sign                         Remove
 sp_incdec                       Remove
-sp_attribute_paren              Add
+sp_attribute_paren              remove
 sp_macro                        Force
 sp_func_call_paren              Force
+sp_brace_typedef                add
+sp_cond_colon                   add
+sp_cond_question                add
+sp_defined_paren                remove
 
 # alignment
 align_keep_tabs                 False
@@ -59,10 +63,12 @@ align_number_left               True
 align_func_params               True
 align_var_def_span              0
 align_var_def_amp_style         1
+align_var_def_colon             true
 align_enum_equ_span             0
 align_var_struct_span           2
 align_var_def_star_style        2
 align_var_def_amp_style         2
+align_typedef_span              2
 align_typedef_func              0
 align_typedef_star_style        2
 align_typedef_amp_style         2
@@ -76,7 +82,7 @@ nl_end_of_file                  Add
 nl_assign_brace                 Remove
 nl_func_var_def_blk             1
 nl_fcall_brace                  Add
-nl_enum_brace                   Force
+nl_enum_brace                   Remove
 nl_struct_brace                 Force
 nl_union_brace                  Force
 nl_if_brace                     Force
@@ -103,15 +109,21 @@ nl_create_if_one_liner          False
 nl_create_for_one_liner         False
 nl_create_while_one_liner       False
 nl_after_semicolon              True
+nl_multi_line_cond              true
 
 # mod
 mod_full_brace_for              Remove
 mod_full_brace_if               Remove
+mod_full_brace_while            Remove
+mod_full_brace_do               Remove
+mod_full_brace_nl               3
 mod_paren_on_return             Remove
 
 # line splitting
+#code_width                     = 78
 ls_for_split_full               True
 ls_func_split_full              True
 
 # positioning
 pos_bool                        Trail
+pos_conditional                 Lead