diff --git a/keyboards/t9/config.h b/keyboards/t9/config.h
index e7b3aaa829..6e1922fcab 100644
--- a/keyboards/t9/config.h
+++ b/keyboards/t9/config.h
@@ -20,10 +20,13 @@
 //#define NO_ACTION_ONESHOT
 
 // The pin connected to the data pin of the LEDs
-#define RGB_DI_PIN D7?
+#define RGB_DI_PIN B7
 // The number of LEDs connected
 #define DRIVER_LED_TOTAL 21
 
+// Tap Num key twice in less than 200ms for RGB layer
+#define TAPPING_TERM 200
+
 /*
  * ┌───┬───┬───┬───┐
  * │ ⏮ │ ⏯ │ ■ │ ⏭ │
diff --git a/keyboards/t9/keymaps/numpad/keymap.c b/keyboards/t9/keymaps/numpad/keymap.c
index 137471eca3..47be1ffe90 100644
--- a/keyboards/t9/keymaps/numpad/keymap.c
+++ b/keyboards/t9/keymaps/numpad/keymap.c
@@ -1,11 +1,22 @@
 #include QMK_KEYBOARD_H
 
+// Tap Dance declarations
+enum {
+    TD_NUM_RGB,
+};
+
+// Tap Dance definitions
+qk_tap_dance_action_t tap_dance_actions[] = {
+    // Tap once for NumLock, twice for RGB layer
+    [TD_NUM_RGB] = ACTION_TAP_DANCE_LAYER_TOGGLE(KC_NUM, 1),
+};
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /*
      * ┌───┬───┬───┬───┐
      * │ ⏮ │ ⏯ │ ■ │ ⏭ │
      * ├───┼───┼───┼───┤
-     * │TG1│ / │ * │ - │
+     * │Num│ / │ * │ - │
      * ├───┼───┼───┼───┤
      * │ 7 │ 8 │ 9 │   │
      * ├───┼───┼───┤ + │
@@ -17,43 +28,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └───────┴───┴───┘
      */
     [0] = LAYOUT_numpad(
-        KC_MPRV, KC_MPLY, KC_MSTP, KC_MNXT,
-        TG(1),   KC_PSLS, KC_PAST, KC_PMNS, // KC_NUM
-        KC_P7,   KC_P8,   KC_P9,
-        KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
-        KC_P1,   KC_P2,   KC_P3,
-        KC_P0,            KC_PDOT, KC_PENT
-    ),
-
-    /*
-     * ┌───┬───┬───┬───┐
-     * │ ⏮ │ ⏯ │ ■ │ ⏭ │
-     * ├───┼───┼───┼───┤
-     * │TG1│ / │ * │ - │
-     * ├───┼───┼───┼───┤
-     * │Hom│ ↑ │PgU│   │
-     * ├───┼───┼───┤ + │
-     * │ ← │   │ → │   │
-     * ├───┼───┼───┼───┤
-     * │End│ ↓ │PgD│   │
-     * ├───┴───┼───┤Ent│
-     * │Insert │Del│   │
-     * └───────┴───┴───┘
-     */
-    [1] = LAYOUT_numpad(
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        KC_HOME, KC_UP,   KC_PGUP,
-        KC_LEFT, XXXXXXX, KC_RGHT, _______,
-        KC_END,  KC_DOWN, KC_PGDN,
-        KC_INS,           KC_DEL,  _______
+        KC_MPRV,         KC_MPLY, KC_MSTP, KC_MNXT,
+        TD(TD_ESC_CAPS), KC_PSLS, KC_PAST, KC_PMNS,
+        KC_P7,           KC_P8,   KC_P9,
+        KC_P4,           KC_P5,   KC_P6,   KC_PPLS,
+        KC_P1,           KC_P2,   KC_P3,
+        KC_P0,                    KC_PDOT, KC_PENT
     ),
 
     /*
      * ┌─────┬─────┬─────┬─────┐
      * │ModeR│Breat│Plain│Mode │
      * ├─────┼─────┼─────┼─────┤
-     * │▒▒▒▒▒│Rainb│Swirl│Sped-│
+     * │     │Rainb│Swirl│Sped-│
      * ├─────┼─────┼─────┼─────┤
      * │Brig+│Brig-│     │     │
      * ├─────┼─────┼─────┤Sped+│
@@ -64,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * │           │     │     │
      * └───────────┴─────┴─────┘
      */
-    [2] = LAYOUT_numpad(
+    [1] = LAYOUT_numpad(
         RGB_RMOD, RGB_M_B, RGB_M_P,  RGB_MOD,
         _______,  RGB_M_R, RGB_M_SW, RGB_SPD,
         RGB_VAI,  RGB_VAD, _______,
@@ -73,3 +60,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,           _______,  RGB_TOG,
     )
 };
+
diff --git a/keyboards/t9/rules.mk b/keyboards/t9/rules.mk
index b73f8b8237..58a0ef2290 100644
--- a/keyboards/t9/rules.mk
+++ b/keyboards/t9/rules.mk
@@ -2,3 +2,4 @@
 RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_DRIVER = WS2812  # also supports SK6812MINI
 
+TAP_DANCE_ENABLE = yes