1 files changed, 6 insertions, 7 deletions
diff --git a/listbas.c b/listbas.c
index c9a6da2..d542bcd 100644
--- a/listbas.c
+++ b/listbas.c
@@ -12,8 +12,8 @@
 #include "bcdfp.h"
 #include "tokens.h"
 #include "turbo_tokens.h"
-/*
 #include "aplus_tokens.h"
+/*
 #include "bxl_tokens.h"
 #include "bxe_tokens.h"
 */
@@ -490,9 +490,11 @@ void op_color_on(unsigned char tok) {
 				color_on(color_cmd);
 				return;
 			default:
-				color_on(color_op);
+				break;
 		}
 	}
+
+	color_on(color_op);
 }
 
 CALLBACK(print_op) {
@@ -596,11 +598,8 @@ void init_bas_tables() {
 }
 
 void init_aplus_tables() {
-	die("BASIC A+ not supported yet!");
-	/*
-	memmove(cmd_tokens, aplus_commands, (last_aplus_command + 1) * sizeof(char *));
-	memmove(op_tokens, aplus_operators, (last_aplus_operator + 1) * sizeof(char *));
-	*/
+	memmove(cmd_tokens, aplus_cmds, aplus_cmd_size);
+	memmove(op_tokens, aplus_ops, aplus_ops_size);
 }
 
 void init_turbo_tables() {