8 files changed, 61 insertions, 64 deletions
diff --git a/keyboards/laser_ninja/pumpkin_pad/config.h b/keyboards/laser_ninja/pumpkin_pad/config.h
deleted file mode 100644
index f42e9c1025..0000000000
--- a/keyboards/laser_ninja/pumpkin_pad/config.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Copyright 2022 Joah Nelson (Jels)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation,   either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_COUNT 28
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
-#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#    define ENABLE_RGB_MATRIX_BREATHING
-#    define ENABLE_RGB_MATRIX_BAND_SAT
-#    define ENABLE_RGB_MATRIX_BAND_VAL
-#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#    define ENABLE_RGB_MATRIX_CYCLE_ALL
-#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#    define ENABLE_RGB_MATRIX_DUAL_BEACON
-#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-#    define ENABLE_RGB_MATRIX_RAINDROPS
-#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#    define ENABLE_RGB_MATRIX_HUE_BREATHING
-#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
-#    define ENABLE_RGB_MATRIX_HUE_WAVE
-#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
-#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
-#endif
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/laser_ninja/pumpkinpad/config.h b/keyboards/laser_ninja/pumpkinpad/config.h
new file mode 100644
index 0000000000..fbb4aaafce
--- /dev/null
+++ b/keyboards/laser_ninja/pumpkinpad/config.h
@@ -0,0 +1,22 @@
+/* Copyright 2022 Joah Nelson (Jels)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,   either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/laser_ninja/pumpkin_pad/info.json b/keyboards/laser_ninja/pumpkinpad/info.json
index cb76145388..3908e99fc2 100644
--- a/keyboards/laser_ninja/pumpkin_pad/info.json
+++ b/keyboards/laser_ninja/pumpkinpad/info.json
@@ -1,5 +1,5 @@
 {
-    "keyboard_name": "Pumpkin Pad",
+    "keyboard_name": "Pumpkinpad",
     "manufacturer": "Laser Ninja",
     "url": "",
     "maintainer": "Jels",
@@ -46,6 +46,37 @@
         }
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_fractal": true,
+            "pixel_flow": true,
+            "pixel_rain": true
+        },
         "driver": "ws2812",
         "layout": [
             {"flags": 2, "x": 36, "y": 3},
@@ -75,6 +106,7 @@
             {"flags": 2, "x": 86, "y": 61},
             {"flags": 4, "matrix": [2, 0], "x": 57, "y": 59},
             {"flags": 2, "x": 36, "y": 61}
-        ]
+        ],
+        "max_brightness": 200
     }
 }
diff --git a/keyboards/laser_ninja/pumpkin_pad/keymaps/default/keymap.c b/keyboards/laser_ninja/pumpkinpad/keymaps/default/keymap.c
index 8b60519b90..8b60519b90 100644
--- a/keyboards/laser_ninja/pumpkin_pad/keymaps/default/keymap.c
+++ b/keyboards/laser_ninja/pumpkinpad/keymaps/default/keymap.c
diff --git a/keyboards/laser_ninja/pumpkin_pad/keymaps/via/keymap.c b/keyboards/laser_ninja/pumpkinpad/keymaps/via/keymap.c
index a63a5a0047..a63a5a0047 100644
--- a/keyboards/laser_ninja/pumpkin_pad/keymaps/via/keymap.c
+++ b/keyboards/laser_ninja/pumpkinpad/keymaps/via/keymap.c
diff --git a/keyboards/laser_ninja/pumpkin_pad/keymaps/via/rules.mk b/keyboards/laser_ninja/pumpkinpad/keymaps/via/rules.mk
index 1e5b99807c..1e5b99807c 100644
--- a/keyboards/laser_ninja/pumpkin_pad/keymaps/via/rules.mk
+++ b/keyboards/laser_ninja/pumpkinpad/keymaps/via/rules.mk
diff --git a/keyboards/laser_ninja/pumpkin_pad/readme.md b/keyboards/laser_ninja/pumpkinpad/readme.md
index 452f4f6723..a5739029e7 100644
--- a/keyboards/laser_ninja/pumpkin_pad/readme.md
+++ b/keyboards/laser_ninja/pumpkinpad/readme.md
@@ -1,20 +1,20 @@
-# Pumpkin Pad
+# Pumpkinpad
 
-![pumpkin-pad](https://i.imgur.com/jFkl9rwh.jpg)
+![pumpkinpad](https://i.imgur.com/jFkl9rwh.jpg)
 
 A 60% PCB
 
 -   Keyboard Maintainer: [Jels](https://github.com/Jels02)
--   Hardware Supported: Pumpkin Pad PCB
+-   Hardware Supported: Pumpkinpad PCB
 -   Hardware Availabililty: [Laser_Ninja](https://kennui.com/w/Laser_Ninja)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make laser_ninja/pumpkin_pad:default
+    make laser_ninja/pumpkinpad:default
 
 Flashing example for this keyboard:
 
-    make laser_ninja/pumpkin_pad:default:flash
+    make laser_ninja/pumpkinpad:default:flash
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 
diff --git a/keyboards/laser_ninja/pumpkin_pad/rules.mk b/keyboards/laser_ninja/pumpkinpad/rules.mk
index 08a1c1568c..08a1c1568c 100644
--- a/keyboards/laser_ninja/pumpkin_pad/rules.mk
+++ b/keyboards/laser_ninja/pumpkinpad/rules.mk