diff --git a/uncrustify.cfg b/uncrustify.cfg
index 002dd73d5..41c0a8ded 100644
--- a/uncrustify.cfg
+++ b/uncrustify.cfg
@@ -10,10 +10,13 @@ indent_class            	= true
 indent_col1_comment     	= true
 indent_access_spec      	= -4
 
+nl_after_func_body		= 2
+nl_collapse_empty_body	= true
 nl_enum_brace			= add
 nl_union_brace			= add
 nl_struct_brace			= add
 nl_class_brace			= add
+nl_case_colon_brace		= remove
 nl_do_brace 			= remove
 nl_if_brace 			= remove
 nl_for_brace 			= remove
@@ -29,8 +32,12 @@ nl_after_return			= false
 nl_brace_else			= add
 nl_class_leave_one_liners 	= true
 nl_before_access_spec	= 2
+nl_end_of_file			= force
+nl_end_of_file_min		= 1
+nl_namespace_brace		= add
 
 mod_full_brace_if		= remove
+mod_full_brace_if_chain	= true
 mod_full_brace_do		= remove
 mod_full_brace_while		= remove
 mod_full_brace_for		= remove