diff --git a/bin/basic_generic.rom b/bin/basic_generic.rom
index 11b0d17c..40b293f5 100644
Binary files a/bin/basic_generic.rom and b/bin/basic_generic.rom differ
diff --git a/bin/basic_mega65.rom b/bin/basic_mega65.rom
index fe3ebcf3..d74a3c0a 100644
Binary files a/bin/basic_mega65.rom and b/bin/basic_mega65.rom differ
diff --git a/bin/basic_ultimate64.rom b/bin/basic_ultimate64.rom
index 1c579875..b63c2cb9 100644
Binary files a/bin/basic_ultimate64.rom and b/bin/basic_ultimate64.rom differ
diff --git a/bin/kernal_generic.rom b/bin/kernal_generic.rom
index 4795ba13..4c60712c 100644
Binary files a/bin/kernal_generic.rom and b/bin/kernal_generic.rom differ
diff --git a/bin/kernal_mega65.rom b/bin/kernal_mega65.rom
index 87da23d1..e7c74f77 100644
Binary files a/bin/kernal_mega65.rom and b/bin/kernal_mega65.rom differ
diff --git a/bin/kernal_ultimate64.rom b/bin/kernal_ultimate64.rom
index 48b7482a..5caf1cfb 100644
Binary files a/bin/kernal_ultimate64.rom and b/bin/kernal_ultimate64.rom differ
diff --git a/c64/,,config_generic.s b/c64/,,config_generic.s
index 20fcf7d7..9d1ac95e 100644
--- a/c64/,,config_generic.s
+++ b/c64/,,config_generic.s
@@ -51,10 +51,10 @@
 // #define CONFIG_LEGACY_SCNKEY
 #define CONFIG_KEYBOARD_C128
 // #define CONFIG_KEY_REPEAT_DEFAULT
-// #define CONFIG_KEY_REPEAT_ALWAYS
+#define CONFIG_KEY_REPEAT_ALWAYS
 #define CONFIG_KEY_FAST_SCAN
 #define CONFIG_JOY1_CURSOR
-// #define CONFIG_JOY2_CURSOR
+#define CONFIG_JOY2_CURSOR
 
 
 // Eye candy
diff --git a/c64/kernal/chrin_real.s b/c64/kernal/chrin_real.s
index 05869895..87b5ee8a 100644
--- a/c64/kernal/chrin_real.s
+++ b/c64/kernal/chrin_real.s
@@ -149,21 +149,3 @@ not_enter:
 
 	// Keep looking for input from keyboard until carriage return
 	jmp chrin_repeat
-
-pop_keyboard_buffer:
-	// Pop key out of keyboard buffer
-	// Disable interrupts while reading from keyboard buffer
-	// so that no race conditions can occur
-	sei
-	ldx #$00
-	ldy #$01
-!:	lda KEYD,y
-	sta KEYD,x
-	inx
-	iny
-	cpy XMAX
-	bne !-
-	dec NDX
-	cli
-
-	rts
diff --git a/c64/kernal/keyboard/pop_keyboard_buffer.s b/c64/kernal/keyboard/pop_keyboard_buffer.s
new file mode 100644
index 00000000..e540a221
--- /dev/null
+++ b/c64/kernal/keyboard/pop_keyboard_buffer.s
@@ -0,0 +1,20 @@
+
+// Pop key out of keyboard buffer
+// Disable interrupts while reading from keyboard buffer
+// so that no race conditions can occur
+
+
+pop_keyboard_buffer:
+
+	ldy #$01
+
+	sei
+!:	lda KEYD,y
+	sta KEYD-1,y
+	iny
+	cpy XMAX
+	bne !-
+	dec NDX
+	cli
+
+	rts