4 files changed, 8 insertions, 7 deletions
diff --git a/keyboards/nopunin10did/jabberwocky/v1/config.h b/keyboards/nopunin10did/jabberwocky/v1/config.h
index cb9c63ac85..9c761afdcd 100644
--- a/keyboards/nopunin10did/jabberwocky/v1/config.h
+++ b/keyboards/nopunin10did/jabberwocky/v1/config.h
@@ -25,10 +25,6 @@
 #define MATRIX_ROW_PINS     { E6, B4, B5, B7, D5, C7, F1, F0, B1, B3, B2, B6 }
 #define MATRIX_COL_PINS     { F4, F5, F6, F7, D7, C6, D4, D0, D2, D3 }
 
-/* Indicator LEDs */
-#define LED_NUM_LOCK_PIN    D1
-#define LED_CAPS_LOCK_PIN   B0
-
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION     COL2ROW
 
diff --git a/keyboards/nopunin10did/jabberwocky/v1/info.json b/keyboards/nopunin10did/jabberwocky/v1/info.json
index bc6fbd9d64..bbf52486b9 100644
--- a/keyboards/nopunin10did/jabberwocky/v1/info.json
+++ b/keyboards/nopunin10did/jabberwocky/v1/info.json
@@ -8,6 +8,10 @@
         "pid": "0x4A57",
         "device_version": "0.0.1"
     },
+    "indicators": {
+        "caps_lock": "B0",
+        "num_lock": "D1"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/nopunin10did/jabberwocky/v2/config.h b/keyboards/nopunin10did/jabberwocky/v2/config.h
index 0b36fcb8bb..72c6e87eb9 100644
--- a/keyboards/nopunin10did/jabberwocky/v2/config.h
+++ b/keyboards/nopunin10did/jabberwocky/v2/config.h
@@ -27,9 +27,6 @@
 
 /* LED Configuration */
 #define BACKLIGHT_PINS          {D6}
-// To have all lights shine uniformly, add C6 and B7 to the list above, then undefine the constants below.
-#define LED_NUM_LOCK_PIN        C6
-#define LED_CAPS_LOCK_PIN       B7
 
 #define BACKLIGHT_LEVELS        6
 
diff --git a/keyboards/nopunin10did/jabberwocky/v2/info.json b/keyboards/nopunin10did/jabberwocky/v2/info.json
index d189f18126..f577c96ddb 100644
--- a/keyboards/nopunin10did/jabberwocky/v2/info.json
+++ b/keyboards/nopunin10did/jabberwocky/v2/info.json
@@ -8,6 +8,10 @@
         "pid": "0x4A58",
         "device_version": "0.2.0"
     },
+    "indicators": {
+        "caps_lock": "B7",
+        "num_lock": "C6"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {