diff --git a/keyboards/nifty_numpad/keyboard.json b/keyboards/nifty_numpad/keyboard.json
index ae6f7bd07da..3dce0cca356 100644
--- a/keyboards/nifty_numpad/keyboard.json
+++ b/keyboards/nifty_numpad/keyboard.json
@@ -19,12 +19,6 @@
     },
     "processor": "RP2040",
     "rgb_matrix": {
-        "driver": "ws2812",
-        "default": {
-            "animation": "solid_color",
-            "hue": 127,
-            "speed": 100
-        },
         "animations": {
             "band_pinwheel_sat": true,
             "band_pinwheel_val": true,
@@ -62,6 +56,12 @@
             "splash": true,
             "typing_heatmap": false
         },
+        "default": {
+            "animation": "solid_color",
+            "hue": 127,
+            "speed": 100
+        },
+        "driver": "ws2812",
         "layout": [
             {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
             {"matrix": [0, 1], "x": 43, "y": 0, "flags": 4},
@@ -147,4 +147,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/nifty_numpad/keymaps/via/keymap.c b/keyboards/nifty_numpad/keymaps/via/keymap.c
deleted file mode 100644
index 105e74d571f..00000000000
--- a/keyboards/nifty_numpad/keymaps/via/keymap.c
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright 2023 Isaac Rex (@Acliad)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-// NOTE: LAYER_RGB is defined in nifty_numpad.h
-enum LAYERS {
-    LAYER_BL = 0,
-};
-
-// Setup keymap
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /*
-     * BCK -> Backspace
-     * WIN -> Task View
-     * EXP -> Open Explorer
-     * SCN -> Screenshot
-     * ┌───┬───┐  ┌───┬───┬───┬───┐
-     * │F13│F19│  │BCK│WIN│EXP│SCN│
-     * └───┴───┘  └───┴───┴───┴───┘
-     * ┌───┬───┐  ┌───┬───┬───┬───┐
-     * │F14│F20│  │Num│ / │ * │ - │
-     * ├───┼───┤  ├───┼───┼───┼───┤
-     * │F15│F21│  │ 7 │ 8 │ 9 │   │
-     * ├───┼───┤  ├───┼───┼───┤ + │
-     * │F16│F22│  │ 4 │ 5 │ 6 │   │
-     * ├───┼───┤  ├───┼───┼───┼───┤
-     * │F17│F23│  │ 1 │ 2 │ 3 │   │
-     * ├───┼───│  ├───┴───┼───┤Ent│
-     * │F18│F24│  │ 0     │ . │   │
-     * └───┴───┘  └───────┴───┴───┘
-     */
-    [LAYER_BL] = LAYOUT_numpad_6x6(
-        KC_F13, KC_F19,    LT(LAYER_RGB, KC_BSPC), RGUI(KC_TAB), RGUI(KC_E), RGUI(RSFT(KC_S)),
-        KC_F14, KC_F20,    MT(MOD_RCTL, KC_NUM),    KC_PSLS,      KC_PAST,    KC_PMNS,
-        KC_F15, KC_F21,    KC_P7,                   KC_P8,        KC_P9,      KC_PPLS,
-        KC_F16, KC_F22,    KC_P4,                   KC_P5,        KC_P6,      
-        KC_F17, KC_F23,    KC_P1,                   KC_P2,        KC_P3,      KC_PENT,
-        KC_F18, KC_F24,    KC_P0,                                 KC_PDOT
-    ),
-
-    /*
-     * HUI -> Hue Increase
-     * HUD -> Hue Decrease
-     * 
-     * SAI -> Saturation Increase
-     * SAD -> Saturation Decrease
-     * 
-     * VAI -> Value Increase
-     * VAD -> Value Decrease
-     * 
-     * SPI -> Speed Increase
-     * SPD -> Speed Decrease
-     * 
-     * MOD -> RGB Mode (effect cycle)
-     * 
-     * ___ -> Base Layer Function
-     * ┌───┬───┐  ┌───┬───┬───┬───┐
-     * │___│___│  │___│HUI│SAI│VAI│
-     * └───┴───┘  └───┴───┴───┴───┘
-     * ┌───┬───┐  ┌───┬───┬───┬───┐
-     * │___│___│  │Num│HUD│SAD│VAD│
-     * ├───┼───┤  ├───┼───┼───┼───┤
-     * │___│___│  │___│MOD│___│   │
-     * ├───┼───┤  ├───┼───┼───┤SPI│
-     * │___│___│  │___│___│___│   │
-     * ├───┼───┤  ├───┼───┼───┼───┤
-     * │___│___│  │___│___│___│   │
-     * ├───┼───│  ├───┴───┼───┤SPD│
-     * │___│___│  │___    │___│   │
-     * └───┴───┘  └───────┴───┴───┘
-     */
-    [LAYER_RGB] = LAYOUT_numpad_6x6(
-        _______, _______,    _______, RGB_HUI, RGB_SAI, RGB_VAI,
-        _______, _______,    _______, RGB_HUD, RGB_SAD, RGB_VAD,
-        _______, _______,    _______, RGB_MOD, _______, RGB_SPI,
-        _______, _______,    _______, _______, _______, 
-        _______, _______,    _______, _______, _______, RGB_SPD,
-        _______, _______,    _______,          _______     
-    )
-};
\ No newline at end of file
diff --git a/keyboards/nifty_numpad/keymaps/via/rules.mk b/keyboards/nifty_numpad/keymaps/via/rules.mk
deleted file mode 100644
index 036bd6d1c3e..00000000000
--- a/keyboards/nifty_numpad/keymaps/via/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/nifty_numpad/nifty_numpad.h b/keyboards/nifty_numpad/nifty_numpad.h
index f625e3ef5da..08d61609ebf 100644
--- a/keyboards/nifty_numpad/nifty_numpad.h
+++ b/keyboards/nifty_numpad/nifty_numpad.h
@@ -36,7 +36,7 @@
 */
 
 enum custom_keycodes {
-    RGB_DEF = QK_KB,
+    RGB_DEF = QK_USER,
     RGB_IEF
 };
 #define LAYER_RGB (MAX_LAYER - 1)