diff --git a/language/format.config.uncrustify.2_spaces b/language/format.config.uncrustify.2_spaces
new file mode 100644
index 0000000000..46e335f731
--- /dev/null
+++ b/language/format.config.uncrustify.2_spaces
@@ -0,0 +1,131 @@
+indent_align_string=false
+indent_braces=false
+indent_braces_no_func=false
+indent_brace_parent=false
+indent_namespace=false
+indent_extern=false
+indent_class=true
+indent_class_colon=false
+indent_else_if=false
+indent_func_call_param=true
+indent_func_def_param=true
+indent_func_proto_param=true
+indent_func_class_param=true
+indent_func_ctor_var_param=true
+indent_template_param=true
+indent_func_param_double=false
+indent_relative_single_line_comments=false
+indent_col1_comment=false
+indent_access_spec_body=false
+indent_paren_nl=false
+indent_comma_paren=false
+indent_bool_paren=false
+indent_square_nl=false
+indent_preserve_sql=false
+indent_align_assign=true
+sp_balance_nested_parens=true
+align_keep_tabs=false
+align_with_tabs=false
+align_on_tabstop=false
+align_number_left=false
+align_func_params=false
+align_same_func_call_params=false
+align_var_def_colon=false
+align_var_def_attribute=false
+align_var_def_inline=false
+align_right_cmt_mix=false
+align_on_operator=false
+align_mix_var_proto=false
+align_single_line_func=false
+align_single_line_brace=false
+align_nl_cont=false
+align_left_shift=true
+nl_collapse_empty_body=false
+nl_assign_leave_one_liners=true
+nl_class_leave_one_liners=true
+nl_enum_leave_one_liners=true
+nl_getset_leave_one_liners=true
+nl_func_leave_one_liners=true
+nl_if_leave_one_liners=true
+nl_multi_line_cond=false
+nl_multi_line_define=false
+nl_before_case=false
+nl_after_case=false
+nl_after_return=false
+nl_after_semicolon=false
+nl_after_brace_open=false
+nl_after_brace_open_cmt=false
+nl_after_vbrace_open=false
+nl_after_brace_close=false
+nl_define_macro=false
+nl_squeeze_ifdef=false
+nl_ds_struct_enum_cmt=false
+nl_ds_struct_enum_close_brace=false
+nl_create_if_one_liner=false
+nl_create_for_one_liner=false
+nl_create_while_one_liner=false
+ls_for_split_full=false
+ls_func_split_full=false
+nl_after_multiline_comment=false
+eat_blanks_after_open_brace=true
+eat_blanks_before_close_brace=true
+mod_pawn_semicolon=false
+mod_full_paren_if_bool=false
+mod_remove_extra_semicolon=false
+mod_sort_import=false
+mod_sort_using=false
+mod_sort_include=false
+mod_move_case_break=false
+mod_remove_empty_return=false
+cmt_indent_multi=true
+cmt_c_group=false
+cmt_c_nl_start=false
+cmt_c_nl_end=false
+cmt_cpp_group=false
+cmt_cpp_nl_start=false
+cmt_cpp_nl_end=false
+cmt_cpp_to_c=false
+cmt_star_cont=false
+cmt_multi_check_last=true
+cmt_insert_before_preproc=false
+pp_indent_at_level=false
+pp_region_indent_code=false
+pp_if_indent_code=false
+pp_define_at_level=false
+indent_columns=2
+nl_max=2
+mod_add_long_ifdef_endif_comment=0
+mod_add_long_ifdef_else_comment=0
+indent_with_tabs=0
+sp_before_assign=add
+sp_after_assign=add
+sp_enum_assign=add
+sp_enum_before_assign=add
+sp_enum_after_assign=add
+sp_pp_concat=add
+sp_pp_stringify=add
+sp_bool=add
+sp_compare=add
+sp_inside_paren=add
+sp_paren_paren=add
+sp_paren_brace=add
+sp_template_angle=add
+sp_inside_angle=add
+sp_after_angle=add
+sp_inside_sparen=add
+sp_sparen_brace=add
+sp_inside_square=add
+sp_after_comma=add
+sp_before_comma=remove
+sp_after_class_colon=add
+sp_before_class_colon=add
+sp_before_case_colon=remove
+sp_inside_paren_cast=add
+sp_func_def_paren=remove
+sp_inside_fparens=remove
+sp_inside_fparen=add
+sp_square_fparen=remove
+sp_fparen_brace=add
+nl_namespace_brace=add
+nl_class_brace=add
+nl_fdef_brace=remove
diff --git a/language/format_sources b/language/format_sources
new file mode 100644
index 0000000000..5b11d1a391
--- /dev/null
+++ b/language/format_sources
@@ -0,0 +1 @@
+*.h *.cpp : uncrustify -l CPP -f $TMPFILE -c format.config.uncrustify.2_spaces -o $TMPFILE