diff --git a/keyboards/splitkb/kyria/rev3/keymaps/bluepython508/keymap.c b/keyboards/splitkb/kyria/rev3/keymaps/bluepython508/keymap.c
index dee10e9..9fb8c0d 100644
--- a/keyboards/splitkb/kyria/rev3/keymaps/bluepython508/keymap.c
+++ b/keyboards/splitkb/kyria/rev3/keymaps/bluepython508/keymap.c
@@ -38,9 +38,13 @@ enum layers {
 #define OS_LALT OSM(MOD_LALT)
 #define OS_LCTL OSM(MOD_LCTL)
 #define OS_LSFT OSM(MOD_LSFT)
+
+#define C_SPC C(KC_SPACE)
+#define C_RET C(KC_ENTER)
 /* TODO:
-  - repeat key?
-*/
+ *   - Mouse Keys?
+ *   - Swap hand keys?
+ */
 
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -54,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
  * |        |   Z  |   X  |   C  |   D  |   V  |      |Numpad|  |F-keys|      |   K  |   H  | ,  < | . >  | /  ? |        |
  * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |      |  GUI |Shift | Enter| Sym  |  | Nav  | Space| Esc  |      | Menu |
+ *                        |      |Repeat|Shift | Enter| Sym  |  | Nav  | Space| Esc  | ARep | Menu |
  *                        |      |      |      |      |      |  |      |      |      |      |      |
  *                        `----------------------------------'  `----------------------------------'
  */
@@ -62,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      KC_TAB  , KC_Q ,  KC_W   ,  KC_F  ,   KC_P ,   KC_B ,                                      KC_J,   KC_L,  KC_U ,   KC_Y, KC_SCLN, XXXXXXX,
      XXXXXXX , KC_A ,  KC_R   ,  KC_S  ,   KC_T ,   KC_G ,                                      KC_M,   KC_N,  KC_E ,   KC_I,    KC_O, KC_QUOT,
      XXXXXXX , KC_Z ,  KC_X   ,  KC_C  ,   KC_D ,   KC_V , XXXXXXX,  NUM  ,   FUN  , XXXXXXX,   KC_K,   KC_H,KC_COMM, KC_DOT, KC_SLSH, XXXXXXX,
-                                XXXXXXX, OS_LGUI, OS_LSFT, KC_ENT ,  SYM  ,   NAV  , KC_SPC , KC_ESC,XXXXXXX, KC_APP
+                                XXXXXXX,  QK_REP, OS_LSFT, KC_ENT ,  SYM  ,   NAV  , KC_SPC , KC_ESC,QK_AREP, KC_APP
     ),
 
 /*
@@ -73,16 +77,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
  * |        |  GUI |  Alt | Ctrl | Shift|      |                              | PgDn |  ←   |   ↓  |   →  | Bspc |        |
  * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |        |
+ * |        |      |      |      |      |      |      |      |  |      |      |      | C-SPC| C-Ret|      |      |        |
  * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
  *                        |      |      |      |      |      |  |      |      |      |      |      |
  *                        |      |      |      |      |      |  |      |      |      |      |      |
  *                        `----------------------------------'  `----------------------------------'
  */
     [_NAV] = LAYOUT(
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                                     KC_PGUP, KC_HOME, KC_UP,    KC_END,  KC_DEL, XXXXXXX,
+      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                                     KC_PGUP, KC_HOME, KC_UP  ,  KC_END,  KC_DEL, XXXXXXX,
       XXXXXXX, OS_LGUI, OS_LALT, OS_LCTL, OS_LSFT, XXXXXXX,                                     KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC, XXXXXXX,
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______, XXXXXXX, C_SPC  , C_RET  , XXXXXXX, XXXXXXX, XXXXXXX,
                                  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
     ),
 
@@ -136,7 +140,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
  * |    Z   |  X   |  C   |  V   |  B   |  N   |      |Typing|  |      |      |   ;  |  '   |  ,   |  .   |  /   |   J    |
  * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |      |      |LShift|Enter |      |  | Bkspc|Space |RShift|      |      |
+ *                        |      |      |LShift|Enter |      |  | Bkspc|Space |RShift|Enter |      |
  *                        |      |      |      |      |      |  |      |      |      |      |      |
  *                        `----------------------------------'  `----------------------------------'
  */
@@ -144,7 +148,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   ,                                     KC_U   , KC_I   , KC_UP  , KC_O   , KC_P   , KC_ESC ,
       KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   ,                                     KC_K   , KC_LEFT, KC_DOWN, KC_RGHT, KC_L   , KC_M   ,
       KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , XXXXXXX, TYPING , XXXXXXX, XXXXXXX, KC_SCLN, KC_QUOT, KC_COMM, KC_DOT , KC_SLSH, KC_J,
-                                 XXXXXXX, XXXXXXX, OS_LSFT, KC_ENT , XXXXXXX, KC_BSPC, KC_SPC , KC_RSFT, XXXXXXX, XXXXXXX
+                                 XXXXXXX, XXXXXXX, OS_LSFT, KC_ENT , XXXXXXX, KC_BSPC, KC_SPC , KC_RSFT, KC_ENT, XXXXXXX
     ),
 /*
  * Numpad
diff --git a/keyboards/splitkb/kyria/rev3/keymaps/bluepython508/rules.mk b/keyboards/splitkb/kyria/rev3/keymaps/bluepython508/rules.mk
index 924478c..2db95a5 100644
--- a/keyboards/splitkb/kyria/rev3/keymaps/bluepython508/rules.mk
+++ b/keyboards/splitkb/kyria/rev3/keymaps/bluepython508/rules.mk
@@ -1,2 +1,3 @@
 CONVERT_TO = liatris
 CAPS_WORD_ENABLE = yes
+REPEAT_KEY_ENABLE = yes