diff --git a/P8000_WDC_Emulator/P8000_WDC_Emulator.atsuo b/P8000_WDC_Emulator/P8000_WDC_Emulator.atsuo
index 43c8129..a0fa717 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 a9d87d1..41e7a80 100755
--- a/P8000_WDC_Emulator/uncrustify.cfg
+++ b/P8000_WDC_Emulator/uncrustify.cfg
@@ -1,66 +1,64 @@
-newlines		= lf
-input_tab_size		= 4
+align_func_params	= true
+align_func_proto_span	= 2;
+align_struct_init_span	= 0
+align_var_def_colon	= true
+align_var_def_span	= 3
 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
-nl_union_brace		= remove
-nl_struct_brace		= remove
-nl_do_brace 		= remove
-nl_if_brace 		= remove
-nl_for_brace 		= remove
-nl_else_brace 		= remove
-nl_while_brace 		= remove
-nl_switch_brace 	= remove
-nl_brace_while		= remove
-nl_brace_else		= remove
-nl_func_var_def_blk	= 1
-nl_fcall_brace		= remove
-nl_fdef_brace		= add
-nl_after_semicolon	= true
+indent_paren_close	= 1
+indent_switch_case	= 4
+indent_with_tabs        = 0
+input_tab_size		= 4
+mod_full_brace_do	= add
+mod_full_brace_for	= add
+mod_full_brace_if	= add
+mod_full_brace_while	= add
+mod_paren_on_return	= remove
+mod_remove_extra_semicolon = true
+newlines		= lf
 nl_after_brace_open	= true
 nl_after_func_body	= 2
+nl_after_semicolon	= true
+nl_brace_else		= remove
+nl_brace_while		= remove
 nl_collapse_empty_body	= true
-
-mod_paren_on_return	= remove
-mod_full_brace_if	= add
-mod_full_brace_for	= add
-mod_full_brace_do	= add
-mod_full_brace_while	= add
-mod_remove_extra_semicolon = true
-
-sp_return_paren		= force	
-sp_sizeof_paren		= remove
-sp_before_sparen	= force
-sp_after_sparen		= force
+nl_do_brace 		= remove
+nl_else_brace 		= remove
+nl_end_of_file          = remove
+nl_enum_brace		= remove
+nl_fcall_brace		= remove
+nl_fdef_brace		= add
+nl_for_brace 		= remove
+nl_func_var_def_blk	= 1
+nl_if_brace 		= remove
+nl_struct_brace		= remove
+nl_switch_brace 	= remove
+nl_union_brace		= remove
+nl_while_brace 		= remove
 sp_after_cast		= remove
-sp_inside_braces	= force
-sp_inside_braces_struct	= remove
-sp_inside_braces_enum	= force
-sp_assign		= force
+sp_after_comma		= force
+sp_after_ptr_star	= remove
+sp_after_sparen		= force
 sp_arith		= force
+sp_assign		= force
+sp_assign		= force
+sp_before_ptr_star	= force
+sp_before_sparen	= force
 sp_bool			= force
 sp_compare		= force
-sp_assign		= force
-sp_after_comma		= force
-sp_before_ptr_star	= force
-sp_after_ptr_star	= remove
-sp_inside_paren		= force
-sp_inside_sparen	= force
-sp_inside_fparens	= remove
-sp_inside_fparen	= force
-sp_paren_brace		= force
-sp_sparen_brace		= force 
 sp_fparen_brace		= force 
 sp_func_call_paren	= add
 sp_func_call_paren_empty = remove
-
-align_struct_init_span	= 0
-align_func_params	= true
-align_var_def_span	= 3
-align_var_def_colon	= true
-align_func_proto_span	= 2;
\ No newline at end of file
+sp_func_def_paren	= force
+sp_inside_braces	= force
+sp_inside_braces_enum	= force
+sp_inside_braces_struct	= remove
+sp_inside_fparen	= force
+sp_inside_fparens	= remove
+sp_inside_paren		= force
+sp_inside_paren_cast	= remove
+sp_inside_sparen	= force
+sp_paren_brace		= force
+sp_return_paren		= force	
+sp_sizeof_paren		= remove
+sp_sparen_brace		= force