diff --git a/P8000_WDC_Emulator/P8000_WDC_Emulator.atsuo b/P8000_WDC_Emulator/P8000_WDC_Emulator.atsuo
index fb54f2a..b052800 100755
Binary files a/P8000_WDC_Emulator/P8000_WDC_Emulator.atsuo and b/P8000_WDC_Emulator/P8000_WDC_Emulator.atsuo differ
diff --git a/P8000_WDC_Emulator/uncrustify.cfg b/P8000_WDC_Emulator/uncrustify.cfg
index 8d22506..9f6885d 100755
--- a/P8000_WDC_Emulator/uncrustify.cfg
+++ b/P8000_WDC_Emulator/uncrustify.cfg
@@ -1,6 +1,8 @@
 indent_columns          = 4
 indent_with_tabs        = 0
 indent_switch_case	= 4
+indent_paren_close	= 1
+indent_comma_paren	= true
 
 nl_end_of_file          = remove
 nl_enum_brace		= remove
@@ -34,7 +36,7 @@ sp_before_sparen	= remove
 sp_after_sparen		= force
 sp_after_cast		= remove
 sp_inside_braces	= force
-sp_inside_braces_struct	= force
+sp_inside_braces_struct	= remove
 sp_inside_braces_enum	= force
 sp_assign		= force
 sp_arith		= force
@@ -51,4 +53,5 @@ sp_inside_fparen	= force
 
 align_struct_init_span	= 0
 align_func_params	= true
-align_var_def_span	= 10
\ No newline at end of file
+align_var_def_span	= 3
+align_var_def_colon	= true