diff --git a/.uncrustify b/.uncrustify
index 9f80f511fa..3a3fbf0912 100644
--- a/.uncrustify
+++ b/.uncrustify
@@ -22,6 +22,7 @@ indent_func_ctor_var_param=false
 indent_template_param=false
 indent_func_param_double=false
 indent_relative_single_line_comments=false
+indent_oc_block=true
 indent_col1_comment=false
 indent_access_spec_body=false
 indent_paren_nl=false
@@ -48,7 +49,8 @@ align_single_line_func=false
 align_single_line_brace=false
 align_nl_cont=false
 align_left_shift=true
-align_oc_decl_colon=false
+align_oc_decl_colon=true
+align_oc_msg_colon_span=1
 nl_collapse_empty_body=false
 nl_assign_leave_one_liners=false
 nl_class_leave_one_liners=false
@@ -110,6 +112,16 @@ nl_end_of_file_min=1
 nl_max=2
 cmt_width=80
 cmt_reflow_mode=1
+sp_after_oc_scope=force
+sp_after_oc_colon=remove
+sp_before_oc_colon=remove
+sp_before_send_oc_colon=remove
+sp_after_oc_type=remove
+sp_after_oc_return_type=remove
+sp_after_oc_at_sel_parens=force
+sp_inside_oc_at_sel_parens=remove
+sp_before_oc_block_caret=ignore
+sp_after_oc_block_caret=remove
 indent_with_tabs=0
 sp_arith=force
 sp_assign=force