Move LED indicator config to data driven (#19800)

author: Ryan <fauxpark@gmail.com> 2023-02-17 13:14:29 +1100
committer: GitHub <noreply@github.com> 2023-02-17 13:14:29 +1100
commit: f4ba17c4a0ee59603c167b04f2d6f6eee8b2cf1b (patch)
tree: 11fec680226404eb46d2c61305cf7e848450c4d9 /keyboards
parent: d784f78bd0a034c1d6085379615014fd701536ab (diff)
979 files changed, 1935 insertions, 2171 deletions
diff --git a/keyboards/0xc7/61key/config.h b/keyboards/0xc7/61key/config.h
index 96f7e02bda..5022a3f2d8 100644
--- a/keyboards/0xc7/61key/config.h
+++ b/keyboards/0xc7/61key/config.h
@@ -38,12 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/1upkeyboards/1up60hte/config.h b/keyboards/1upkeyboards/1up60hte/config.h
index 6f4fce7663..2492682ec1 100644
--- a/keyboards/1upkeyboards/1up60hte/config.h
+++ b/keyboards/1upkeyboards/1up60hte/config.h
@@ -30,9 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B6
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B7
 #ifdef BACKLIGHT_PIN
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/1upkeyboards/1up60hte/info.json b/keyboards/1upkeyboards/1up60hte/info.json
index 1c82ab9e99..3e2c34d259 100644
--- a/keyboards/1upkeyboards/1up60hte/info.json
+++ b/keyboards/1upkeyboards/1up60hte/info.json
@@ -8,6 +8,10 @@
        "pid": "0x6874",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B6",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layout_aliases": {
diff --git a/keyboards/1upkeyboards/super16v2/config.h b/keyboards/1upkeyboards/super16v2/config.h
index 6434558a8e..2fb81d1953 100644
--- a/keyboards/1upkeyboards/super16v2/config.h
+++ b/keyboards/1upkeyboards/super16v2/config.h
@@ -45,12 +45,6 @@
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 #define RGB_DI_PIN B5
 #define RGB_MATRIX_LED_COUNT 20
 #ifdef RGB_DI_PIN
diff --git a/keyboards/3keyecosystem/2key2/config.h b/keyboards/3keyecosystem/2key2/config.h
index 351658e34a..9e21647523 100644
--- a/keyboards/3keyecosystem/2key2/config.h
+++ b/keyboards/3keyecosystem/2key2/config.h
@@ -25,9 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { F6 }
 #define MATRIX_COL_PINS { F4, D7 }
-// LED on kbmount base board is on B7
-#define LED_CAPS_LOCK_PIN B7 // onboard LED for testing
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/3keyecosystem/2key2/info.json b/keyboards/3keyecosystem/2key2/info.json
index 0c1afce910..1da073d0fc 100644
--- a/keyboards/3keyecosystem/2key2/info.json
+++ b/keyboards/3keyecosystem/2key2/info.json
@@ -8,6 +8,9 @@
        "pid": "0x3304",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B7"
+    },
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "layouts": {
diff --git a/keyboards/40percentclub/sixpack/config.h b/keyboards/40percentclub/sixpack/config.h
index 079afe435d..071eecddd4 100644
--- a/keyboards/40percentclub/sixpack/config.h
+++ b/keyboards/40percentclub/sixpack/config.h
@@ -21,8 +21,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_BREATHING
 #define BACKLIGHT_LEVELS 6
 #define BACKLIGHT_PINS { F4, F5 } // Top Row, Bottom Row
-/* LED Indicators */
-#define LED_PIN_ON_STATE 0
-#define LED_CAPS_LOCK_PIN B0 // RX Led
-#define LED_NUM_LOCK_PIN D5  // TX Led
diff --git a/keyboards/40percentclub/sixpack/info.json b/keyboards/40percentclub/sixpack/info.json
index ea7e6281a9..9c3015b5dd 100644
--- a/keyboards/40percentclub/sixpack/info.json
+++ b/keyboards/40percentclub/sixpack/info.json
@@ -8,6 +8,11 @@
      "pid": "0x5350",
      "device_version": "10.0.1"
    },
+    "indicators": {
+      "caps_lock": "B0",
+      "num_lock": "D5",
+      "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "matrix_pins": {
diff --git a/keyboards/4pplet/aekiso60/rev_b/config.h b/keyboards/4pplet/aekiso60/rev_b/config.h
index 0828658de4..f6e636c526 100644
--- a/keyboards/4pplet/aekiso60/rev_b/config.h
+++ b/keyboards/4pplet/aekiso60/rev_b/config.h
@@ -48,6 +48,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define LED_CAPS_LOCK_PIN A10
 #define BACKLIGHT_LEVELS 5
diff --git a/keyboards/4pplet/aekiso60/rev_b/info.json b/keyboards/4pplet/aekiso60/rev_b/info.json
index ecaa326e51..fe2e424999 100644
--- a/keyboards/4pplet/aekiso60/rev_b/info.json
+++ b/keyboards/4pplet/aekiso60/rev_b/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0011",
        "device_version": "0.0.2"
    },
+    "indicators": {
+        "caps_lock": "A10"
+    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/config.h b/keyboards/4pplet/eagle_viper_rep/rev_b/config.h
index 016d30286c..ba94c0c5d3 100644
--- a/keyboards/4pplet/eagle_viper_rep/rev_b/config.h
+++ b/keyboards/4pplet/eagle_viper_rep/rev_b/config.h
@@ -58,9 +58,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_RESYNC_ENABLE
 /* Indicator leds */
-#define LED_CAPS_LOCK_PIN   B1
-#define LED_NUM_LOCK_PIN    B12
-#define LED_SCROLL_LOCK_PIN B13
 #define LAYER_1             B14
 #define LAYER_2             B15
 #define LAYER_3             B0
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/info.json b/keyboards/4pplet/eagle_viper_rep/rev_b/info.json
index f97a4bab9a..e6ac536f43 100644
--- a/keyboards/4pplet/eagle_viper_rep/rev_b/info.json
+++ b/keyboards/4pplet/eagle_viper_rep/rev_b/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0010",
        "device_version": "0.0.2"
    },
+    "indicators": {
+        "caps_lock": "B1",
+        "num_lock": "B12",
+        "scroll_lock": "B13"
+    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/4pplet/yakiimo/rev_a/config.h b/keyboards/4pplet/yakiimo/rev_a/config.h
index 2a64b1dde1..60716bbd7a 100644
--- a/keyboards/4pplet/yakiimo/rev_a/config.h
+++ b/keyboards/4pplet/yakiimo/rev_a/config.h
@@ -23,9 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { B10, B1, C13, C14, B14, B12, B9, B8, B5, B4, A15, B3 }
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN A6
-#define LED_SCROLL_LOCK_PIN A7
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/4pplet/yakiimo/rev_a/info.json b/keyboards/4pplet/yakiimo/rev_a/info.json
index e271095e66..b902a0d6cf 100644
--- a/keyboards/4pplet/yakiimo/rev_a/info.json
+++ b/keyboards/4pplet/yakiimo/rev_a/info.json
@@ -8,6 +8,10 @@
        "pid": "0x000A",
        "device_version": "0.0.2"
    },
+    "indicators": {
+        "caps_lock": "A6",
+        "scroll_lock": "A7"
+    },
    "processor": "STM32F411",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/acheron/athena/alpha/config.h b/keyboards/acheron/athena/alpha/config.h
index 01192025c0..2fdf4551a8 100644
--- a/keyboards/acheron/athena/alpha/config.h
+++ b/keyboards/acheron/athena/alpha/config.h
@@ -58,7 +58,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_DMA_STREAM STM32_DMA2_STREAM5
 #define WS2812_DMA_CHANNEL 6
-#define LED_CAPS_LOCK_PIN A10
 // If this is defined, the caps lock LED will turn on and off according to the state of caps lock. If not, the LED will shine like all other LEDs despite the caps lock state.
 #define CAPSLOCK_INDICATOR
diff --git a/keyboards/acheron/athena/alpha/info.json b/keyboards/acheron/athena/alpha/info.json
index 10d720983c..cc2a5249d0 100644
--- a/keyboards/acheron/athena/alpha/info.json
+++ b/keyboards/acheron/athena/alpha/info.json
@@ -4,6 +4,9 @@
        "pid": "0x6584",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "A10"
+    },
    "processor": "STM32F411",
    "bootloader": "stm32-dfu"
 }
diff --git a/keyboards/acheron/athena/beta/config.h b/keyboards/acheron/athena/beta/config.h
index 7c85861eea..65c39754c3 100644
--- a/keyboards/acheron/athena/beta/config.h
+++ b/keyboards/acheron/athena/beta/config.h
@@ -58,7 +58,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_DMA_STREAM STM32_DMA2_STREAM5
 #define WS2812_DMA_CHANNEL 6
-#define LED_CAPS_LOCK_PIN C8
 // If this is defined, the caps lock LED will turn on and off according to the state of caps lock. If not, the LED will shine like all other LEDs despite the caps lock state.
 #define CAPSLOCK_INDICATOR
diff --git a/keyboards/acheron/athena/beta/info.json b/keyboards/acheron/athena/beta/info.json
index 237c783866..51c335a850 100644
--- a/keyboards/acheron/athena/beta/info.json
+++ b/keyboards/acheron/athena/beta/info.json
@@ -4,6 +4,9 @@
        "pid": "0x6585",
        "device_version": "0.0.2"
    },
+    "indicators": {
+        "caps_lock": "C8"
+    },
    "processor": "STM32F401",
    "bootloader": "stm32-dfu"
 }
diff --git a/keyboards/acheron/elongate/beta/config.h b/keyboards/acheron/elongate/beta/config.h
index 619868ac08..ea72c59000 100644
--- a/keyboards/acheron/elongate/beta/config.h
+++ b/keyboards/acheron/elongate/beta/config.h
@@ -78,7 +78,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-#define LED_NUM_LOCK_PIN D2
-#define LED_CAPS_LOCK_PIN D1
-#define LED_SCROLL_LOCK_PIN D0
diff --git a/keyboards/acheron/elongate/beta/info.json b/keyboards/acheron/elongate/beta/info.json
index f381712a0c..1f625bca83 100644
--- a/keyboards/acheron/elongate/beta/info.json
+++ b/keyboards/acheron/elongate/beta/info.json
@@ -8,6 +8,11 @@
        "pid": "0x454C",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "D1",
+        "num_lock": "D2",
+        "scroll_lock": "D0"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/ada/infinity81/config.h b/keyboards/ada/infinity81/config.h
index f809090fcc..237d6cafeb 100644
--- a/keyboards/ada/infinity81/config.h
+++ b/keyboards/ada/infinity81/config.h
@@ -24,13 +24,6 @@
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 #define RGB_DI_PIN D0
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM 107
diff --git a/keyboards/aeboards/ext65/rev3/config.h b/keyboards/aeboards/ext65/rev3/config.h
index 8de4e44837..09a98c2b5a 100644
--- a/keyboards/aeboards/ext65/rev3/config.h
+++ b/keyboards/aeboards/ext65/rev3/config.h
@@ -16,8 +16,4 @@
 #pragma once
-// Locks
-#define LED_NUM_LOCK_PIN F5
-#define LED_CAPS_LOCK_PIN F4
-#define LED_SCROLL_LOCK_PIN F1
 #define LED_LAYERS_PIN F0
diff --git a/keyboards/aeboards/ext65/rev3/info.json b/keyboards/aeboards/ext65/rev3/info.json
index 42f2248cbc..90d59a943c 100644
--- a/keyboards/aeboards/ext65/rev3/info.json
+++ b/keyboards/aeboards/ext65/rev3/info.json
@@ -7,6 +7,11 @@
        "pid": "0xA653",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "F4",
+        "num_lock": "F5",
+        "scroll_lock": "F1"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "diode_direction": "COL2ROW",
diff --git a/keyboards/ai03/andromeda/config.h b/keyboards/ai03/andromeda/config.h
index d8f288c0d6..b36e85531e 100644
--- a/keyboards/ai03/andromeda/config.h
+++ b/keyboards/ai03/andromeda/config.h
@@ -28,7 +28,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-#define LED_CAPS_LOCK_PIN A2
-#define LED_SCROLL_LOCK_PIN A1
-#define LED_PIN_ON_STATE 0
diff --git a/keyboards/ai03/andromeda/info.json b/keyboards/ai03/andromeda/info.json
index 59eb7be579..ade4938b82 100644
--- a/keyboards/ai03/andromeda/info.json
+++ b/keyboards/ai03/andromeda/info.json
@@ -8,6 +8,11 @@
        "pid": "0x000A",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "A2",
+        "scroll_lock": "A1",
+        "on_state": 0
+    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/al1/config.h b/keyboards/al1/config.h
index 87422c9ba5..d5710af589 100644
--- a/keyboards/al1/config.h
+++ b/keyboards/al1/config.h
@@ -27,11 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define SN74X154_ADDRESS_PINS { D4, D5, D6, D7 }
 #define SN74X154_E1_PIN D3
-#define LED_NUM_LOCK_PIN D0
-#define LED_CAPS_LOCK_PIN B7
-#define LED_SCROLL_LOCK_PIN D1
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B6
 #define BACKLIGHT_LEVELS 3
 #define BACKLIGHT_BREATHING
diff --git a/keyboards/al1/info.json b/keyboards/al1/info.json
index 2dce0456c2..fe23911145 100644
--- a/keyboards/al1/info.json
+++ b/keyboards/al1/info.json
@@ -8,6 +8,12 @@
        "pid": "0x6050",
        "device_version": "1.0.4"
    },
+    "indicators": {
+        "caps_lock": "B7",
+        "num_lock": "D0",
+        "scroll_lock": "D1",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/alf/dc60/config.h b/keyboards/alf/dc60/config.h
index c5bb808dfe..2bb959c37c 100644
--- a/keyboards/alf/dc60/config.h
+++ b/keyboards/alf/dc60/config.h
@@ -38,9 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B7
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B6
 #define BACKLIGHT_BREATHING
 #define BACKLIGHT_LEVELS 5
diff --git a/keyboards/alf/dc60/info.json b/keyboards/alf/dc60/info.json
index f95b2f3892..a93d76a38d 100644
--- a/keyboards/alf/dc60/info.json
+++ b/keyboards/alf/dc60/info.json
@@ -7,6 +7,10 @@
        "pid": "0x0000",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B7",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/alf/x11/config.h b/keyboards/alf/x11/config.h
index 645ec11be0..aec8cb1270 100644
--- a/keyboards/alf/x11/config.h
+++ b/keyboards/alf/x11/config.h
@@ -38,11 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN E6
-#define LED_CAPS_LOCK_PIN C6
-#define LED_SCROLL_LOCK_PIN C7
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B7
 #define BACKLIGHT_BREATHING
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/alf/x11/info.json b/keyboards/alf/x11/info.json
index 28275c4684..5d4fdc69a6 100644
--- a/keyboards/alf/x11/info.json
+++ b/keyboards/alf/x11/info.json
@@ -8,6 +8,12 @@
    "pid": "0x0001",
    "device_version": "0.0.1"
  },
+  "indicators": {
+    "caps_lock": "C6",
+    "num_lock": "E6",
+    "scroll_lock": "C7",
+    "on_state": 0
+  },
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "layouts": {
diff --git a/keyboards/alf/x2/config.h b/keyboards/alf/x2/config.h
index 5469603656..980007dadf 100644
--- a/keyboards/alf/x2/config.h
+++ b/keyboards/alf/x2/config.h
@@ -30,9 +30,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION   COL2ROW
-#define LED_CAPS_LOCK_PIN B2
-#define LED_PIN_ON_STATE  0
 #define BACKLIGHT_PIN     B6
 #ifdef BACKLIGHT_PIN
 #    define BACKLIGHT_LEVELS 3
diff --git a/keyboards/alf/x2/info.json b/keyboards/alf/x2/info.json
index 2dbf4dcdc8..30630b3188 100644
--- a/keyboards/alf/x2/info.json
+++ b/keyboards/alf/x2/info.json
@@ -8,6 +8,10 @@
        "pid": "0x6060",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B2",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/alps64/config.h b/keyboards/alps64/config.h
index 73e163703a..41b7cd753e 100644
--- a/keyboards/alps64/config.h
+++ b/keyboards/alps64/config.h
@@ -27,8 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN C5
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/alps64/info.json b/keyboards/alps64/info.json
index ee1ad7d486..e1ea2b9b5e 100644
--- a/keyboards/alps64/info.json
+++ b/keyboards/alps64/info.json
@@ -8,6 +8,9 @@
        "pid": "0x6464",
        "device_version": "0.0.1"
    },
+  "indicators": {
+    "caps_lock": "C5",
+  },
  "bootmagic": {
      "matrix": [3, 6]
  },
diff --git a/keyboards/amjkeyboard/amj40/config.h b/keyboards/amjkeyboard/amj40/config.h
index d74978bcba..6e05148ee4 100755
--- a/keyboards/amjkeyboard/amj40/config.h
+++ b/keyboards/amjkeyboard/amj40/config.h
@@ -27,9 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { F4, F5, F6, F7}
 #define MATRIX_COL_PINS { F1, F0, E6, C7, C6, B0, D4, B1, B7, B5, B4, D7}
-#define LED_CAPS_LOCK_PIN B2
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B6
 /* COL2ROW or ROW2COL */
diff --git a/keyboards/amjkeyboard/amj40/info.json b/keyboards/amjkeyboard/amj40/info.json
index 81b0f08ef8..79848d94dc 100644
--- a/keyboards/amjkeyboard/amj40/info.json
+++ b/keyboards/amjkeyboard/amj40/info.json
@@ -8,6 +8,10 @@
        "pid": "0x6072",
        "device_version": "0.0.2"
    },
+    "indicators": {
+        "caps_lock": "B2",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/amjkeyboard/amj60/config.h b/keyboards/amjkeyboard/amj60/config.h
index fbc330f67b..8328574f36 100644
--- a/keyboards/amjkeyboard/amj60/config.h
+++ b/keyboards/amjkeyboard/amj60/config.h
@@ -38,9 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B2
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B6
 #define BACKLIGHT_LEVELS 4
 #define BACKLIGHT_BREATHING
diff --git a/keyboards/amjkeyboard/amj60/info.json b/keyboards/amjkeyboard/amj60/info.json
index e0cc144cb8..750f7bec99 100644
--- a/keyboards/amjkeyboard/amj60/info.json
+++ b/keyboards/amjkeyboard/amj60/info.json
@@ -8,6 +8,10 @@
        "pid": "0x6066",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B2",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["60_ansi", "60_hhkb", "60_iso", "60_ansi_split_bs_rshift"],
diff --git a/keyboards/amjkeyboard/amj84/config.h b/keyboards/amjkeyboard/amj84/config.h
index 4eca36c061..17e0748712 100644
--- a/keyboards/amjkeyboard/amj84/config.h
+++ b/keyboards/amjkeyboard/amj84/config.h
@@ -24,12 +24,6 @@
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B2
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 #define BACKLIGHT_PIN B6
 #define BACKLIGHT_LEVELS 3
 #define BACKLIGHT_BREATHING
diff --git a/keyboards/amjkeyboard/amjpad/config.h b/keyboards/amjkeyboard/amjpad/config.h
index c455057a7c..211bf74160 100644
--- a/keyboards/amjkeyboard/amjpad/config.h
+++ b/keyboards/amjkeyboard/amjpad/config.h
@@ -37,9 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-#define LED_NUM_LOCK_PIN D6
-#define LED_PIN_ON_STATE 0
 /* Backlight configuration
 */
 #define BACKLIGHT_LEVELS 4
diff --git a/keyboards/amjkeyboard/amjpad/info.json b/keyboards/amjkeyboard/amjpad/info.json
index 406bd992b2..60e80d0bdd 100644
--- a/keyboards/amjkeyboard/amjpad/info.json
+++ b/keyboards/amjkeyboard/amjpad/info.json
@@ -8,6 +8,10 @@
    "pid": "0x6060",
    "device_version": "0.0.3"
  },
+  "indicators": {
+    "num_lock": "D6",
+    "on_state": 0
+  },
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "community_layouts": ["numpad_6x4", "ortho_6x4"],
diff --git a/keyboards/ares/config.h b/keyboards/ares/config.h
index 8d2ccd9278..7c624433cf 100644
--- a/keyboards/ares/config.h
+++ b/keyboards/ares/config.h
@@ -28,8 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN D1
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/ares/info.json b/keyboards/ares/info.json
index 5deca5390e..0bcbf7a4d4 100644
--- a/keyboards/ares/info.json
+++ b/keyboards/ares/info.json
@@ -8,6 +8,9 @@
        "pid": "0x422D",
        "device_version": "2.0.0"
    },
+    "indicators": {
+        "caps_lock": "D1"
+    },
    "bootmagic": {
        "matrix": [4, 0]
    },
diff --git a/keyboards/atlantis/ak81_ve/config.h b/keyboards/atlantis/ak81_ve/config.h
index 4889f6c9ee..21afa1e616 100644
--- a/keyboards/atlantis/ak81_ve/config.h
+++ b/keyboards/atlantis/ak81_ve/config.h
@@ -33,10 +33,6 @@
 #define ENCODERS_CCW_KEY { { 4, 5 } } // Note:  array is { col, row )
 #define ENCODERS_CW_KEY  { { 3, 5 } } // Note:  array is { col, row )
-/* LED pins */
-#define LED_CAPS_LOCK_PIN D4
-#define LED_PIN_ON_STATE 0
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/atlantis/ak81_ve/info.json b/keyboards/atlantis/ak81_ve/info.json
index 8c3f42d6d6..052492b7ce 100644
--- a/keyboards/atlantis/ak81_ve/info.json
+++ b/keyboards/atlantis/ak81_ve/info.json
@@ -7,6 +7,10 @@
        "pid": "0x0081",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "D4",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/aves60/config.h b/keyboards/aves60/config.h
index 9c0fe39dbe..0c77d06408 100644
--- a/keyboards/aves60/config.h
+++ b/keyboards/aves60/config.h
@@ -24,12 +24,6 @@
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 #define RGB_DI_PIN D5
 #ifdef RGB_DI_PIN
 #define RGBLED_NUM 9
diff --git a/keyboards/axolstudio/foundation_gamma/config.h b/keyboards/axolstudio/foundation_gamma/config.h
index 5837db07f3..d2f399b305 100644
--- a/keyboards/axolstudio/foundation_gamma/config.h
+++ b/keyboards/axolstudio/foundation_gamma/config.h
@@ -28,6 +28,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-/* CAPS LED */
-#define LED_CAPS_LOCK_PIN B7
diff --git a/keyboards/axolstudio/foundation_gamma/info.json b/keyboards/axolstudio/foundation_gamma/info.json
index 49b2069bcf..ecc7bcad90 100644
--- a/keyboards/axolstudio/foundation_gamma/info.json
+++ b/keyboards/axolstudio/foundation_gamma/info.json
@@ -8,6 +8,9 @@
        "pid": "0xE3EB",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B7"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layout_aliases": {
diff --git a/keyboards/baion_808/config.h b/keyboards/baion_808/config.h
index 964ebe0e72..92efc6d1e5 100755
--- a/keyboards/baion_808/config.h
+++ b/keyboards/baion_808/config.h
@@ -25,8 +25,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Ensure we jump to bootloader if the RESET keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
-/* Indicator LEDs */
-#define LED_CAPS_LOCK_PIN B6
-#define LED_SCROLL_LOCK_PIN B7
-#define LED_PIN_ON_STATE 0
diff --git a/keyboards/baion_808/info.json b/keyboards/baion_808/info.json
index 456a7c7bd7..982bb67056 100755
--- a/keyboards/baion_808/info.json
+++ b/keyboards/baion_808/info.json
@@ -8,6 +8,11 @@
        "pid": "0x4238",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B6",
+        "scroll_lock": "B7",
+        "on_state": 0
+    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/bandominedoni/config.h b/keyboards/bandominedoni/config.h
index c0653f1a77..a67161f81d 100644
--- a/keyboards/bandominedoni/config.h
+++ b/keyboards/bandominedoni/config.h
@@ -49,12 +49,6 @@
 #define SPLIT_USB_DETECT
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 #define RGB_DI_PIN D3
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/barleycorn_smd/config.h b/keyboards/barleycorn_smd/config.h
index f29e518380..6dcd1d3d40 100644
--- a/keyboards/barleycorn_smd/config.h
+++ b/keyboards/barleycorn_smd/config.h
@@ -52,9 +52,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 6, 7, 8, 9, 10, 11, 12, 13, 14, 5 }
-#define LED_CAPS_LOCK_PIN B2
-#define LED_NUM_LOCK_PIN B3
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/barleycorn_smd/info.json b/keyboards/barleycorn_smd/info.json
index f21e03ddba..aca993e1a5 100644
--- a/keyboards/barleycorn_smd/info.json
+++ b/keyboards/barleycorn_smd/info.json
@@ -7,6 +7,10 @@
        "pid": "0x4749",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B2",
+        "num_lock": "B3"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/bfake/config.h b/keyboards/bfake/config.h
index 3531d882ba..72fe48339c 100644
--- a/keyboards/bfake/config.h
+++ b/keyboards/bfake/config.h
@@ -28,8 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN D1
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/bfake/info.json b/keyboards/bfake/info.json
index ff27d60a06..f390102e21 100644
--- a/keyboards/bfake/info.json
+++ b/keyboards/bfake/info.json
@@ -8,6 +8,9 @@
    "pid": "0x422D",
    "device_version": "2.0.0"
  },
+  "indicators": {
+    "caps_lock": "D1"
+  },
  "processor": "atmega32a",
  "bootloader": "bootloadhid",
  "layouts": {
diff --git a/keyboards/bioi/f60/config.h b/keyboards/bioi/f60/config.h
index 840a2604fd..17b8ceaf1b 100644
--- a/keyboards/bioi/f60/config.h
+++ b/keyboards/bioi/f60/config.h
@@ -29,9 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-/* Indicator LEDs */
-#define LED_CAPS_LOCK_PIN F0
 #define BACKLIGHT_PIN B7
 #define BACKLIGHT_LEVELS 8
 #define BACKLIGHT_BREATHING
diff --git a/keyboards/bioi/f60/info.json b/keyboards/bioi/f60/info.json
index 09513eedb3..1e95671f5d 100644
--- a/keyboards/bioi/f60/info.json
+++ b/keyboards/bioi/f60/info.json
@@ -8,6 +8,9 @@
        "pid": "0x4660",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "F0"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["60_ansi", "60_ansi_tsangan", "60_ansi_split_bs_rshift", "60_hhkb", "60_tsangan_hhkb", "60_ansi_arrow", "60_iso", "60_iso_split_bs_rshift", "60_iso_tsangan"],
diff --git a/keyboards/blank/blank01/config.h b/keyboards/blank/blank01/config.h
index d05d85bb3e..63ad3ac7cd 100644
--- a/keyboards/blank/blank01/config.h
+++ b/keyboards/blank/blank01/config.h
@@ -38,12 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-#define LED_CAPS_LOCK_PIN B7
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/blank/blank01/info.json b/keyboards/blank/blank01/info.json
index 10cf77f7a0..1370981344 100644
--- a/keyboards/blank/blank01/info.json
+++ b/keyboards/blank/blank01/info.json
@@ -8,6 +8,9 @@
        "pid": "0x4B01",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B7"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/bobpad/config.h b/keyboards/bobpad/config.h
index dbb6ab9bcb..f24ef916bd 100644
--- a/keyboards/bobpad/config.h
+++ b/keyboards/bobpad/config.h
@@ -36,20 +36,5 @@
 #define DIODE_DIRECTION COL2ROW
-// D4 D0
-// C6 E6 D7
-#define LED_NUM_LOCK_PIN    D4
-#define LED_CAPS_LOCK_PIN   D0
-#define LED_SCROLL_LOCK_PIN C6
-#define LED_COMPOSE_PIN     E6
-#define LED_KANA_PIN        D7
 #define ENCODERS_PAD_A { B3 }
 #define ENCODERS_PAD_B { B2 }
 \ No newline at end of file
diff --git a/keyboards/bobpad/info.json b/keyboards/bobpad/info.json
index 35511b2ab9..58f724fbbe 100644
--- a/keyboards/bobpad/info.json
+++ b/keyboards/bobpad/info.json
@@ -8,6 +8,13 @@
        "pid": "0x0002",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "D0",
+        "num_lock": "D4",
+        "scroll_lock": "C6",
+        "compose": "E6",
+        "kana": "D7"
+    },
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "community_layouts": ["ortho_2x3"],
diff --git a/keyboards/boston/config.h b/keyboards/boston/config.h
index c4685e9719..4f8bd2688e 100644
--- a/keyboards/boston/config.h
+++ b/keyboards/boston/config.h
@@ -65,11 +65,6 @@
 #define ENCODER_RESOLUTION 2
 #define TAP_CODE_DELAY 15
-/* Lock LEDs */
-#define LED_NUM_LOCK_PIN A0
-#define LED_CAPS_LOCK_PIN A1
-#define LED_SCROLL_LOCK_PIN A2
 /*
 * Feature disable options
 *  These options are also useful to firmware size reduction.
diff --git a/keyboards/boston/info.json b/keyboards/boston/info.json
index b51552a976..87980602ba 100644
--- a/keyboards/boston/info.json
+++ b/keyboards/boston/info.json
@@ -8,6 +8,11 @@
        "pid": "0x4176",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "A1",
+        "num_lock": "A0",
+        "scroll_lock": "A2"
+    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/bpiphany/ghost_squid/config.h b/keyboards/bpiphany/ghost_squid/config.h
index e40a2ed932..f18ee18888 100644
--- a/keyboards/bpiphany/ghost_squid/config.h
+++ b/keyboards/bpiphany/ghost_squid/config.h
@@ -24,8 +24,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_PIN_ON_STATE 0
-#define LED_NUM_LOCK_PIN C5
-#define LED_CAPS_LOCK_PIN C6
-#define LED_SCROLL_LOCK_PIN B7
diff --git a/keyboards/bpiphany/ghost_squid/info.json b/keyboards/bpiphany/ghost_squid/info.json
index 9dcba8091a..bed329ccaf 100644
--- a/keyboards/bpiphany/ghost_squid/info.json
+++ b/keyboards/bpiphany/ghost_squid/info.json
@@ -8,6 +8,12 @@
        "pid": "0x6050",
        "device_version": "1.0.4"
    },
+    "indicators": {
+        "caps_lock": "C6",
+        "num_lock": "C5",
+        "scroll_lock": "B7",
+        "on_state": 0
+    },
    "processor": "atmega32u2",
    "bootloader": "atmel-dfu",
    "community_layouts": [
diff --git a/keyboards/bpiphany/hid_liber/config.h b/keyboards/bpiphany/hid_liber/config.h
index 7c8752847b..f567c3e12a 100755
--- a/keyboards/bpiphany/hid_liber/config.h
+++ b/keyboards/bpiphany/hid_liber/config.h
@@ -25,10 +25,6 @@
 // HID Liberation Device uses custom matrix code to accomodate a 74HC238 3 to 8 decoder on pins B1, B2 and B3.
 //#define DIODE_DIRECTION
-#define LED_CAPS_LOCK_PIN B5
-#define LED_SCROLL_LOCK_PIN B6
-#define LED_PIN_ON_STATE 0
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/bpiphany/hid_liber/info.json b/keyboards/bpiphany/hid_liber/info.json
index d368b1b886..fb7ec97d19 100644
--- a/keyboards/bpiphany/hid_liber/info.json
+++ b/keyboards/bpiphany/hid_liber/info.json
@@ -8,6 +8,11 @@
        "pid": "0xB919",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B5",
+        "scroll_lock": "B6",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/bpiphany/kitten_paw/config.h b/keyboards/bpiphany/kitten_paw/config.h
index 9c682076b0..21ed9d44c7 100644
--- a/keyboards/bpiphany/kitten_paw/config.h
+++ b/keyboards/bpiphany/kitten_paw/config.h
@@ -38,11 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN B7
-#define LED_CAPS_LOCK_PIN C6
-#define LED_SCROLL_LOCK_PIN C5
-#define LED_PIN_ON_STATE 0
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/bpiphany/kitten_paw/info.json b/keyboards/bpiphany/kitten_paw/info.json
index 13de5a5fd6..03e5162481 100644
--- a/keyboards/bpiphany/kitten_paw/info.json
+++ b/keyboards/bpiphany/kitten_paw/info.json
@@ -8,6 +8,12 @@
    "pid": "0x6050",
    "device_version": "1.0.4"
  },
+  "indicators": {
+    "caps_lock": "C6",
+    "num_lock": "B7",
+    "scroll_lock": "C5",
+    "on_state": 0
+  },
  "processor": "atmega32u2",
  "bootloader": "atmel-dfu",
  "community_layouts": ["fullsize_ansi"],
diff --git a/keyboards/bpiphany/tiger_lily/config.h b/keyboards/bpiphany/tiger_lily/config.h
index dd4240ef29..cb63e867fc 100644
--- a/keyboards/bpiphany/tiger_lily/config.h
+++ b/keyboards/bpiphany/tiger_lily/config.h
@@ -38,11 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { C2, B3, B4, B2, B1, C7, B6, B5 }
 #define MATRIX_COL_PINS { NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
-#define LED_NUM_LOCK_PIN C5
-#define LED_CAPS_LOCK_PIN C6
-#define LED_SCROLL_LOCK_PIN B7
-#define LED_PIN_ON_STATE 0
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/bpiphany/tiger_lily/info.json b/keyboards/bpiphany/tiger_lily/info.json
index 8b2e19671e..75d126eb50 100644
--- a/keyboards/bpiphany/tiger_lily/info.json
+++ b/keyboards/bpiphany/tiger_lily/info.json
@@ -8,6 +8,12 @@
    "pid": "0x544C",
    "device_version": "0.0.1"
  },
+  "indicators": {
+    "caps_lock": "C6",
+    "num_lock": "C5",
+    "scroll_lock": "B7",
+    "on_state": 0
+  },
  "processor": "atmega32u2",
  "bootloader": "atmel-dfu",
  "community_layouts": ["fullsize_ansi"],
diff --git a/keyboards/bpiphany/unloved_bastard/config.h b/keyboards/bpiphany/unloved_bastard/config.h
index c27bbd5a96..af21267357 100644
--- a/keyboards/bpiphany/unloved_bastard/config.h
+++ b/keyboards/bpiphany/unloved_bastard/config.h
@@ -22,11 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 18
-#define LED_NUM_LOCK_PIN B7
-#define LED_CAPS_LOCK_PIN C5
-#define LED_SCROLL_LOCK_PIN C6
-#define LED_PIN_ON_STATE 0
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/bpiphany/unloved_bastard/info.json b/keyboards/bpiphany/unloved_bastard/info.json
index c67802caf5..7f16025525 100644
--- a/keyboards/bpiphany/unloved_bastard/info.json
+++ b/keyboards/bpiphany/unloved_bastard/info.json
@@ -7,6 +7,12 @@
    "pid": "0x1337",
    "device_version": "0.0.1"
  },
+  "indicators": {
+    "caps_lock": "C5",
+    "num_lock": "B7",
+    "scroll_lock": "C6",
+    "on_state": 0
+  },
  "processor": "atmega32u2",
  "bootloader": "atmel-dfu",
  "community_layouts": ["tkl_ansi", "tkl_iso"],
diff --git a/keyboards/cannonkeys/balance/config.h b/keyboards/cannonkeys/balance/config.h
index b2e06ee900..fba90c0628 100644
--- a/keyboards/cannonkeys/balance/config.h
+++ b/keyboards/cannonkeys/balance/config.h
@@ -25,10 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { B4, A15, A14, A0, F0 }
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B12
-#define LED_NUM_LOCK_PIN B14
-#define LED_PIN_ON_STATE 0
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/cannonkeys/balance/info.json b/keyboards/cannonkeys/balance/info.json
index ea4daaad01..13eb96a62f 100644
--- a/keyboards/cannonkeys/balance/info.json
+++ b/keyboards/cannonkeys/balance/info.json
@@ -8,6 +8,11 @@
        "pid": "0xBA77",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B12",
+        "num_lock": "B14",
+        "on_state": 0
+    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/cannonkeys/brutalv2_65/config.h b/keyboards/cannonkeys/brutalv2_65/config.h
index 66024143d7..57c691d1d6 100644
--- a/keyboards/cannonkeys/brutalv2_65/config.h
+++ b/keyboards/cannonkeys/brutalv2_65/config.h
@@ -25,9 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { C14, A1, B14, B15, A8 }
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B3
-#define LED_PIN_ON_STATE 0
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/cannonkeys/brutalv2_65/info.json b/keyboards/cannonkeys/brutalv2_65/info.json
index 54b6f40618..000e541557 100644
--- a/keyboards/cannonkeys/brutalv2_65/info.json
+++ b/keyboards/cannonkeys/brutalv2_65/info.json
@@ -8,6 +8,10 @@
        "pid": "0x0008",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B3",
+        "on_state": 0
+    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/cannonkeys/cloudline/config.h b/keyboards/cannonkeys/cloudline/config.h
index fd61a01918..a81791b0d6 100644
--- a/keyboards/cannonkeys/cloudline/config.h
+++ b/keyboards/cannonkeys/cloudline/config.h
@@ -18,10 +18,6 @@
 #define BACKLIGHT_BREATHING
 #define BREATHING_PERIOD 6
-#define LED_CAPS_LOCK_PIN B9
-#define LED_SCROLL_LOCK_PIN F0
-#define LED_PIN_ON_STATE 0
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/cannonkeys/cloudline/info.json b/keyboards/cannonkeys/cloudline/info.json
index 62cbb402a0..86d126255d 100644
--- a/keyboards/cannonkeys/cloudline/info.json
+++ b/keyboards/cannonkeys/cloudline/info.json
@@ -8,6 +8,11 @@
        "pid": "0x000A",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B9",
+        "scroll_lock": "F0",
+        "on_state": 0
+    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/cannonkeys/crin/config.h b/keyboards/cannonkeys/crin/config.h
index 4a41687813..2843df3da7 100644
--- a/keyboards/cannonkeys/crin/config.h
+++ b/keyboards/cannonkeys/crin/config.h
@@ -33,9 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_BREATHING
 #define BREATHING_PERIOD 6
-#define LED_CAPS_LOCK_PIN F1
-#define LED_PIN_ON_STATE 0
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/cannonkeys/crin/info.json b/keyboards/cannonkeys/crin/info.json
index 27eaa226d7..372eab0d48 100644
--- a/keyboards/cannonkeys/crin/info.json
+++ b/keyboards/cannonkeys/crin/info.json
@@ -8,6 +8,10 @@
        "pid": "0x0012",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "F1",
+        "on_state": 0
+    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layout_aliases": {
diff --git a/keyboards/cannonkeys/gentoo/config.h b/keyboards/cannonkeys/gentoo/config.h
index 66024143d7..57c691d1d6 100644
--- a/keyboards/cannonkeys/gentoo/config.h
+++ b/keyboards/cannonkeys/gentoo/config.h
@@ -25,9 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { C14, A1, B14, B15, A8 }
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B3
-#define LED_PIN_ON_STATE 0
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/cannonkeys/gentoo/info.json b/keyboards/cannonkeys/gentoo/info.json
index c67484efdc..6b0c9399be 100644
--- a/keyboards/cannonkeys/gentoo/info.json
+++ b/keyboards/cannonkeys/gentoo/info.json
@@ -8,6 +8,10 @@
        "pid": "0x000F",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B3",
+        "on_state": 0
+    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/cannonkeys/gentoo_hs/config.h b/keyboards/cannonkeys/gentoo_hs/config.h
index 67a264ed40..18509fede6 100644
--- a/keyboards/cannonkeys/gentoo_hs/config.h
+++ b/keyboards/cannonkeys/gentoo_hs/config.h
@@ -30,10 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-#define LED_CAPS_LOCK_PIN B14
-#define LED_PIN_ON_STATE 0
 /*
 * Feature disable options
 *  These options are also useful to firmware size reduction.
diff --git a/keyboards/cannonkeys/gentoo_hs/info.json b/keyboards/cannonkeys/gentoo_hs/info.json
index a9c0e2a66f..8595a321b2 100644
--- a/keyboards/cannonkeys/gentoo_hs/info.json
+++ b/keyboards/cannonkeys/gentoo_hs/info.json
@@ -8,6 +8,10 @@
        "pid": "0x0010",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B14",
+        "on_state": 0
+    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/cannonkeys/hoodrowg/config.h b/keyboards/cannonkeys/hoodrowg/config.h
index 475ce865c5..690f136945 100644
--- a/keyboards/cannonkeys/hoodrowg/config.h
+++ b/keyboards/cannonkeys/hoodrowg/config.h
@@ -38,9 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define LED_CAPS_LOCK_PIN B6
-#define LED_SCROLL_LOCK_PIN B2
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/cannonkeys/hoodrowg/info.json b/keyboards/cannonkeys/hoodrowg/info.json
index 45e5c0b9b2..4d0adb731a 100644
--- a/keyboards/cannonkeys/hoodrowg/info.json
+++ b/keyboards/cannonkeys/hoodrowg/info.json
@@ -8,6 +8,10 @@
        "pid": "0x0006",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B6",
+        "scroll_lock": "B2"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/cannonkeys/malicious_ergo/config.h b/keyboards/cannonkeys/malicious_ergo/config.h
index 8a653035c4..8e18a9bb94 100644
--- a/keyboards/cannonkeys/malicious_ergo/config.h
+++ b/keyboards/cannonkeys/malicious_ergo/config.h
@@ -57,14 +57,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_SPI_SCK_PAL_MODE 0
 #define WS2812_SPI_SCK_PIN B13
-// Indicator LEDs
-#define LED_CAPS_LOCK_PIN A8
-#define LED_NUM_LOCK_PIN A9
-#define LED_SCROLL_LOCK_PIN B12
-#define LED_PIN_ON_STATE 0
 // 2 bits for 4 layout options
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
diff --git a/keyboards/cannonkeys/malicious_ergo/info.json b/keyboards/cannonkeys/malicious_ergo/info.json
index b2600e866c..d9979a3462 100644
--- a/keyboards/cannonkeys/malicious_ergo/info.json
+++ b/keyboards/cannonkeys/malicious_ergo/info.json
@@ -8,6 +8,12 @@
        "pid": "0x0009",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "A8",
+        "num_lock": "A9",
+        "scroll_lock": "B12",
+        "on_state": 0
+    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/cannonkeys/sagittarius/config.h b/keyboards/cannonkeys/sagittarius/config.h
index a10b9bd822..846742d758 100644
--- a/keyboards/cannonkeys/sagittarius/config.h
+++ b/keyboards/cannonkeys/sagittarius/config.h
@@ -25,10 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { B10, B14, A8, A9, A10, C13, C14, C15, F0, F1 }
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN B4
-#define LED_CAPS_LOCK_PIN B3
-#define LED_SCROLL_LOCK_PIN A15
 #define BACKLIGHT_PIN           A6
 #define BACKLIGHT_PWM_DRIVER    PWMD3
 #define BACKLIGHT_PWM_CHANNEL   1
diff --git a/keyboards/cannonkeys/sagittarius/info.json b/keyboards/cannonkeys/sagittarius/info.json
index 17423c0fbe..76b52ab4bd 100644
--- a/keyboards/cannonkeys/sagittarius/info.json
+++ b/keyboards/cannonkeys/sagittarius/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0001",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B3",
+        "num_lock": "B4",
+        "scroll_lock": "A15"
+    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/carbo65/config.h b/keyboards/carbo65/config.h
index 684c3b9942..ae0953a2e0 100644
--- a/keyboards/carbo65/config.h
+++ b/keyboards/carbo65/config.h
@@ -30,7 +30,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
-/* Indicator LEDs */
-#define LED_CAPS_LOCK_PIN B6
-#define LED_PIN_ON_STATE 0
diff --git a/keyboards/carbo65/info.json b/keyboards/carbo65/info.json
index 749f7eeb9b..c77e3bb9e6 100644
--- a/keyboards/carbo65/info.json
+++ b/keyboards/carbo65/info.json
@@ -8,6 +8,10 @@
        "pid": "0x4336",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B6",
+        "on_state": 0
+    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/cest73/tkm/config.h b/keyboards/cest73/tkm/config.h
index 3499e3c015..37c920b2eb 100644
--- a/keyboards/cest73/tkm/config.h
+++ b/keyboards/cest73/tkm/config.h
@@ -29,10 +29,6 @@
 //NOTE: if D6 pin shows any issues in exploatation the LED on the Teensy is to be removed
-#define LED_NUM_LOCK_PIN F6
-#define LED_CAPS_LOCK_PIN F5
-#define LED_SCROLL_LOCK_PIN F7
-#define LED_PIN_ON_STATE 0
 //TODO change the E6 pin to either B5, B6, B7 or C6 to utilize hardware PWM on a future PCB revision
 #define BACKLIGHT_PIN E6
diff --git a/keyboards/cest73/tkm/info.json b/keyboards/cest73/tkm/info.json
index 03693b7ba6..671cc27d52 100644
--- a/keyboards/cest73/tkm/info.json
+++ b/keyboards/cest73/tkm/info.json
@@ -8,6 +8,12 @@
        "pid": "0xAA55",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "F5",
+        "num_lock": "F6",
+        "scroll_lock": "F7",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "halfkay",
    "layouts": {
diff --git a/keyboards/charue/charon/config.h b/keyboards/charue/charon/config.h
index 170f2e2fc3..f1ed6698d7 100644
--- a/keyboards/charue/charon/config.h
+++ b/keyboards/charue/charon/config.h
@@ -26,6 +26,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, C7 }
 #define MATRIX_COL_PINS { D3, D5, B4, D7, D6, D4, F7, F6, F5, F4, F1, F0, B5, B6, C6 }
 #define DIODE_DIRECTION COL2ROW
-/* LED config */
-#define LED_CAPS_LOCK_PIN E6
diff --git a/keyboards/charue/charon/info.json b/keyboards/charue/charon/info.json
index 44eb547b09..406b845492 100644
--- a/keyboards/charue/charon/info.json
+++ b/keyboards/charue/charon/info.json
@@ -8,6 +8,9 @@
        "pid": "0x4348",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "E6"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/charue/sunsetter/config.h b/keyboards/charue/sunsetter/config.h
index d9849aba57..9ebefba948 100644
--- a/keyboards/charue/sunsetter/config.h
+++ b/keyboards/charue/sunsetter/config.h
@@ -24,6 +24,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { B13, B12, B1, B0, A7, A6, A5, A4, A3, B9, B8, B7, B6, B5, B4, F0, B3, A15 }
 #define MATRIX_ROW_PINS { A8, B14, B11, B10, B2 }
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN F1
-#define LED_PIN_ON_STATE 0
diff --git a/keyboards/charue/sunsetter/info.json b/keyboards/charue/sunsetter/info.json
index 21fab05f17..651561f47d 100644
--- a/keyboards/charue/sunsetter/info.json
+++ b/keyboards/charue/sunsetter/info.json
@@ -8,6 +8,10 @@
        "pid": "0x5353",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "F1",
+        "on_state": 0
+    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/charue/sunsetter_r2/config.h b/keyboards/charue/sunsetter_r2/config.h
index 4dba307887..f49d709415 100644
--- a/keyboards/charue/sunsetter_r2/config.h
+++ b/keyboards/charue/sunsetter_r2/config.h
@@ -15,8 +15,6 @@
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B0
 /* RGB */
 #define RGB_DI_PIN E6
 #ifdef RGB_DI_PIN
diff --git a/keyboards/charue/sunsetter_r2/info.json b/keyboards/charue/sunsetter_r2/info.json
index fd3038356f..fcd9d0b3fe 100644
--- a/keyboards/charue/sunsetter_r2/info.json
+++ b/keyboards/charue/sunsetter_r2/info.json
@@ -8,6 +8,9 @@
        "pid": "0x5335",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B0"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/cherrybstudio/cb1800/config.h b/keyboards/cherrybstudio/cb1800/config.h
index 0ba9a8ada7..b4baf11ff7 100644
--- a/keyboards/cherrybstudio/cb1800/config.h
+++ b/keyboards/cherrybstudio/cb1800/config.h
@@ -35,12 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-/* LED Indicators */
-#define LED_CAPS_LOCK_PIN F5
-#define LED_NUM_LOCK_PIN F6
-#define LED_SCROLL_LOCK_PIN F7
-#define LED_PIN_ON_STATE 0
 #define RGB_DI_PIN E6
 #ifdef RGB_DI_PIN
 #    define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/cherrybstudio/cb1800/info.json b/keyboards/cherrybstudio/cb1800/info.json
index c14c05558a..8d96a17bcc 100644
--- a/keyboards/cherrybstudio/cb1800/info.json
+++ b/keyboards/cherrybstudio/cb1800/info.json
@@ -8,6 +8,12 @@
        "pid": "0x1818",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "F5",
+        "num_lock": "F6",
+        "scroll_lock": "F7",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/cherrybstudio/cb65/config.h b/keyboards/cherrybstudio/cb65/config.h
index 9cfa0f8806..daf3cd4fc6 100644
--- a/keyboards/cherrybstudio/cb65/config.h
+++ b/keyboards/cherrybstudio/cb65/config.h
@@ -40,10 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN F1
-#define LED_SCROLL_LOCK_PIN F4
-#define LED_PIN_ON_STATE 0
 /* RGB Lighting */
 #define RGB_DI_PIN F0
 #ifdef RGB_DI_PIN
diff --git a/keyboards/cherrybstudio/cb65/info.json b/keyboards/cherrybstudio/cb65/info.json
index eee8faed6f..223d5560d4 100644
--- a/keyboards/cherrybstudio/cb65/info.json
+++ b/keyboards/cherrybstudio/cb65/info.json
@@ -8,6 +8,11 @@
        "pid": "0x6565",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "F1",
+        "scroll_lock": "F4",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/cherrybstudio/cb87/config.h b/keyboards/cherrybstudio/cb87/config.h
index 2f9a8a8754..bbbe5311cd 100644
--- a/keyboards/cherrybstudio/cb87/config.h
+++ b/keyboards/cherrybstudio/cb87/config.h
@@ -39,10 +39,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_LEVELS 3
 #endif
-#define LED_CAPS_LOCK_PIN F0
-#define LED_SCROLL_LOCK_PIN F4
-#define LED_PIN_ON_STATE 0
 #define RGB_DI_PIN E6
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/cherrybstudio/cb87/info.json b/keyboards/cherrybstudio/cb87/info.json
index a0f229995b..3af7eff96d 100644
--- a/keyboards/cherrybstudio/cb87/info.json
+++ b/keyboards/cherrybstudio/cb87/info.json
@@ -8,6 +8,11 @@
        "pid": "0x8787",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "F0",
+        "scroll_lock": "F4",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["tkl_ansi", "tkl_iso"],
diff --git a/keyboards/cherrybstudio/cb87v2/config.h b/keyboards/cherrybstudio/cb87v2/config.h
index 55bfbab687..c85ce35a37 100644
--- a/keyboards/cherrybstudio/cb87v2/config.h
+++ b/keyboards/cherrybstudio/cb87v2/config.h
@@ -34,9 +34,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN F0
-#define LED_SCROLL_LOCK_PIN F4
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B6
 #ifdef BACKLIGHT_PIN
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/cherrybstudio/cb87v2/info.json b/keyboards/cherrybstudio/cb87v2/info.json
index 1d4b373263..3cb29e13d0 100644
--- a/keyboards/cherrybstudio/cb87v2/info.json
+++ b/keyboards/cherrybstudio/cb87v2/info.json
@@ -8,6 +8,11 @@
        "pid": "0x8788",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "F0",
+        "scroll_lock": "F4",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/chromatonemini/config.h b/keyboards/chromatonemini/config.h
index 77a7d9fa99..ef83bdad8a 100644
--- a/keyboards/chromatonemini/config.h
+++ b/keyboards/chromatonemini/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
diff --git a/keyboards/coarse/cordillera/config.h b/keyboards/coarse/cordillera/config.h
index 9d680e19bf..f648e5f15f 100644
--- a/keyboards/coarse/cordillera/config.h
+++ b/keyboards/coarse/cordillera/config.h
@@ -25,11 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { B15, B14, B13, B12, B11, B10, B2, B1, B8, B7, B6, B5, B4, B3, A15, A14 }
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN B0
-#define LED_CAPS_LOCK_PIN A1
-#define LED_SCROLL_LOCK_PIN A0
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN           A8
 #define BACKLIGHT_PWM_DRIVER    PWMD1
 #define BACKLIGHT_PWM_CHANNEL   1
diff --git a/keyboards/coarse/cordillera/info.json b/keyboards/coarse/cordillera/info.json
index 53187917a1..3d968ab84d 100644
--- a/keyboards/coarse/cordillera/info.json
+++ b/keyboards/coarse/cordillera/info.json
@@ -8,6 +8,12 @@
        "pid": "0x1401",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "A1",
+        "num_lock": "B0",
+        "scroll_lock": "A0",
+        "on_state": 0
+    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "community_layouts": ["alice", "alice_split_bs"],
diff --git a/keyboards/coarse/ixora/config.h b/keyboards/coarse/ixora/config.h
index 9efba5d221..4223dc987f 100644
--- a/keyboards/coarse/ixora/config.h
+++ b/keyboards/coarse/ixora/config.h
@@ -10,7 +10,3 @@
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN A9
-#define LED_CAPS_LOCK_PIN A10
-#define LED_SCROLL_LOCK_PIN A8
diff --git a/keyboards/coarse/ixora/info.json b/keyboards/coarse/ixora/info.json
index a408b6127f..ef7bae5129 100644
--- a/keyboards/coarse/ixora/info.json
+++ b/keyboards/coarse/ixora/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0C61",
        "device_version": "1.0.0"
    },
+    "indicators": {
+        "caps_lock": "A10",
+        "num_lock": "A9",
+        "scroll_lock": "A8"
+    },
    "processor": "STM32F042",
    "bootloader": "stm32-dfu",
    "debounce": 0,
diff --git a/keyboards/contender/config.h b/keyboards/contender/config.h
index 1d11274d30..ff1297c2a5 100644
--- a/keyboards/contender/config.h
+++ b/keyboards/contender/config.h
@@ -38,12 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 #define RGB_DI_PIN C6
 #define RGBLED_NUM 33
 #define RGBLIGHT_LED_MAP { \
diff --git a/keyboards/converter/a1200/miss1200/config.h b/keyboards/converter/a1200/miss1200/config.h
index d765d8c51c..9b29c09704 100644
--- a/keyboards/converter/a1200/miss1200/config.h
+++ b/keyboards/converter/a1200/miss1200/config.h
@@ -38,9 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
-#define LED_CAPS_LOCK_PIN B0
-#define LED_PIN_ON_STATE 0
 /* disable action features */
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
diff --git a/keyboards/converter/a1200/miss1200/info.json b/keyboards/converter/a1200/miss1200/info.json
index c979555293..326d73ec83 100644
--- a/keyboards/converter/a1200/miss1200/info.json
+++ b/keyboards/converter/a1200/miss1200/info.json
@@ -6,6 +6,10 @@
        "pid": "0x0000",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B0",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/converter/a1200/mistress1200/config.h b/keyboards/converter/a1200/mistress1200/config.h
index 45e53d6f04..bbf4d1c313 100644
--- a/keyboards/converter/a1200/mistress1200/config.h
+++ b/keyboards/converter/a1200/mistress1200/config.h
@@ -38,8 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
-#define LED_CAPS_LOCK_PIN B0
-#define LED_PIN_ON_STATE 0
 #define TAPPING_TOGGLE 3
 #undef LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/converter/a1200/mistress1200/info.json b/keyboards/converter/a1200/mistress1200/info.json
index 1ea4e27b46..dfbe75c79c 100644
--- a/keyboards/converter/a1200/mistress1200/info.json
+++ b/keyboards/converter/a1200/mistress1200/info.json
@@ -6,6 +6,10 @@
        "pid": "0x0000",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B0",
+        "on_state": 0
+    },
    "processor": "atmega16u4",
    "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/converter/a1200/teensy2pp/config.h b/keyboards/converter/a1200/teensy2pp/config.h
index b3d2c29bf3..5c4d67aa4f 100644
--- a/keyboards/converter/a1200/teensy2pp/config.h
+++ b/keyboards/converter/a1200/teensy2pp/config.h
@@ -38,9 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
-#define LED_CAPS_LOCK_PIN B6
 /* disable action features */
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
diff --git a/keyboards/converter/a1200/teensy2pp/info.json b/keyboards/converter/a1200/teensy2pp/info.json
index 9979c39b73..a69aa38278 100644
--- a/keyboards/converter/a1200/teensy2pp/info.json
+++ b/keyboards/converter/a1200/teensy2pp/info.json
@@ -6,6 +6,9 @@
        "pid": "0x0000",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B6"
+    },
    "processor": "at90usb1286",
    "bootloader": "halfkay"
 }
diff --git a/keyboards/converter/modelm101_teensy2/config.h b/keyboards/converter/modelm101_teensy2/config.h
index 1428ac390c..3c6733b42b 100644
--- a/keyboards/converter/modelm101_teensy2/config.h
+++ b/keyboards/converter/modelm101_teensy2/config.h
@@ -41,10 +41,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* The Model M has no diodes */
 #define MATRIX_HAS_GHOST
-/* Indicator LEDs */
-#define LED_CAPS_LOCK_PIN E6
-#define LED_PIN_ON_STATE 0
 /*
 * Feature disable options
 *  These options are also useful to firmware size reduction.
diff --git a/keyboards/converter/modelm101_teensy2/info.json b/keyboards/converter/modelm101_teensy2/info.json
index 8bb6a37262..12ee7274d7 100644
--- a/keyboards/converter/modelm101_teensy2/info.json
+++ b/keyboards/converter/modelm101_teensy2/info.json
@@ -8,6 +8,10 @@
        "pid": "0x0000",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "E6",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "halfkay",
    "layouts": {
diff --git a/keyboards/converter/modelm_ssk/config.h b/keyboards/converter/modelm_ssk/config.h
index 31ddadada5..5826710ba1 100644
--- a/keyboards/converter/modelm_ssk/config.h
+++ b/keyboards/converter/modelm_ssk/config.h
@@ -41,10 +41,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* The Model M does not have NKRO */
 #define MATRIX_HAS_GHOST
-#define LED_NUM_LOCK_PIN B4
-#define LED_CAPS_LOCK_PIN B6
-#define LED_SCROLL_LOCK_PIN B5
 /*
 * Feature disable options
 *  These options are also useful to firmware size reduction.
diff --git a/keyboards/converter/modelm_ssk/info.json b/keyboards/converter/modelm_ssk/info.json
index 7b474ec371..3f947eac2a 100644
--- a/keyboards/converter/modelm_ssk/info.json
+++ b/keyboards/converter/modelm_ssk/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0000",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B6",
+        "num_lock": "B4",
+        "scroll_lock": "B5"
+    },
    "processor": "at90usb1286",
    "bootloader": "halfkay",
    "layouts":
diff --git a/keyboards/cool836a/config.h b/keyboards/cool836a/config.h
index 591133c96b..09714bd069 100644
--- a/keyboards/cool836a/config.h
+++ b/keyboards/cool836a/config.h
@@ -39,12 +39,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define DIODE_DIRECTION COL2ROW
 #define DIODE_DIRECTION ROW2COL
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/crazy_keyboard_68/config.h b/keyboards/crazy_keyboard_68/config.h
index 928b1db1cc..28184bebc3 100644
--- a/keyboards/crazy_keyboard_68/config.h
+++ b/keyboards/crazy_keyboard_68/config.h
@@ -38,9 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B0
-#define LED_PIN_ON_STATE 0
 #define RGB_DI_PIN F6
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM 84
diff --git a/keyboards/crazy_keyboard_68/info.json b/keyboards/crazy_keyboard_68/info.json
index 5b8cbcacb7..740813ff4d 100644
--- a/keyboards/crazy_keyboard_68/info.json
+++ b/keyboards/crazy_keyboard_68/info.json
@@ -8,6 +8,10 @@
        "pid": "0x13DE",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B0",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["65_ansi"],
diff --git a/keyboards/crimsonkeyboards/resume1800/config.h b/keyboards/crimsonkeyboards/resume1800/config.h
index 879129e4ef..cd84feccf3 100644
--- a/keyboards/crimsonkeyboards/resume1800/config.h
+++ b/keyboards/crimsonkeyboards/resume1800/config.h
@@ -40,10 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define USB_MAX_POWER_CONSUMPTION 100
-/* Set LED indicator pins */
-#define LED_NUM_LOCK_PIN B5
-#define LED_CAPS_LOCK_PIN B6
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/crimsonkeyboards/resume1800/info.json b/keyboards/crimsonkeyboards/resume1800/info.json
index 9f67d35544..dbb1fa2ed9 100644
--- a/keyboards/crimsonkeyboards/resume1800/info.json
+++ b/keyboards/crimsonkeyboards/resume1800/info.json
@@ -8,6 +8,10 @@
        "pid": "0xC18B",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B6",
+        "num_lock": "B5"
+    },
    "processor": "atmega32a",
    "bootloader": "usbasploader",
    "layouts": {
diff --git a/keyboards/cutie_club/borsdorf/config.h b/keyboards/cutie_club/borsdorf/config.h
index b536c7a30e..8e607e77ce 100644
--- a/keyboards/cutie_club/borsdorf/config.h
+++ b/keyboards/cutie_club/borsdorf/config.h
@@ -31,8 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B13
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/cutie_club/borsdorf/info.json b/keyboards/cutie_club/borsdorf/info.json
index 5e435a1cea..c53dc5f9dd 100644
--- a/keyboards/cutie_club/borsdorf/info.json
+++ b/keyboards/cutie_club/borsdorf/info.json
@@ -8,6 +8,9 @@
        "pid": "0x6D8A",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B13"
+    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/cutie_club/keebcats/denis/config.h b/keyboards/cutie_club/keebcats/denis/config.h
index ff3ce5d644..3583561346 100644
--- a/keyboards/cutie_club/keebcats/denis/config.h
+++ b/keyboards/cutie_club/keebcats/denis/config.h
@@ -30,8 +30,6 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN F0
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/cutie_club/keebcats/denis/info.json b/keyboards/cutie_club/keebcats/denis/info.json
index 3ae5b4a667..0fe5fcf534 100644
--- a/keyboards/cutie_club/keebcats/denis/info.json
+++ b/keyboards/cutie_club/keebcats/denis/info.json
@@ -8,6 +8,9 @@
        "pid": "0xB260",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "F0"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["60_iso_tsangan", "60_iso_split_bs_rshift", "60_iso", "60_tsangan_hhkb", "60_hhkb", "60_ansi_tsangan", "60_ansi_split_bs_rshift", "60_ansi"],
diff --git a/keyboards/cutie_club/keebcats/dougal/config.h b/keyboards/cutie_club/keebcats/dougal/config.h
index dcd9bb7996..d3f08e94b3 100644
--- a/keyboards/cutie_club/keebcats/dougal/config.h
+++ b/keyboards/cutie_club/keebcats/dougal/config.h
@@ -30,8 +30,6 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN F0
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/cutie_club/keebcats/dougal/info.json b/keyboards/cutie_club/keebcats/dougal/info.json
index fd768d704f..7555611d89 100644
--- a/keyboards/cutie_club/keebcats/dougal/info.json
+++ b/keyboards/cutie_club/keebcats/dougal/info.json
@@ -8,6 +8,9 @@
        "pid": "0xB265",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "F0"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/cutie_club/wraith/config.h b/keyboards/cutie_club/wraith/config.h
index 9570742ec8..16dd6a0027 100644
--- a/keyboards/cutie_club/wraith/config.h
+++ b/keyboards/cutie_club/wraith/config.h
@@ -38,9 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B3
-#define LED_PIN_ON_STATE 0
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/cutie_club/wraith/info.json b/keyboards/cutie_club/wraith/info.json
index a5a83cc64d..4c27785468 100644
--- a/keyboards/cutie_club/wraith/info.json
+++ b/keyboards/cutie_club/wraith/info.json
@@ -8,6 +8,10 @@
        "pid": "0x0000",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B3",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/cx60/config.h b/keyboards/cx60/config.h
index 37a0a21ef5..12af2277e9 100644
--- a/keyboards/cx60/config.h
+++ b/keyboards/cx60/config.h
@@ -50,6 +50,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
 #define RGBLIGHT_VAL_STEP 17
-#define LED_CAPS_LOCK_PIN B5
-#define LED_PIN_ON_STATE 0
diff --git a/keyboards/cx60/info.json b/keyboards/cx60/info.json
index b030e1223a..e2569465df 100644
--- a/keyboards/cx60/info.json
+++ b/keyboards/cx60/info.json
@@ -8,6 +8,10 @@
        "pid": "0x3630",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B5",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/dailycraft/owl8/config.h b/keyboards/dailycraft/owl8/config.h
index e49ff33415..41efbbb6b5 100644
--- a/keyboards/dailycraft/owl8/config.h
+++ b/keyboards/dailycraft/owl8/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/dailycraft/sandbox/rev1/config.h b/keyboards/dailycraft/sandbox/rev1/config.h
index dd1aeb41ff..5d4d5c5a42 100644
--- a/keyboards/dailycraft/sandbox/rev1/config.h
+++ b/keyboards/dailycraft/sandbox/rev1/config.h
@@ -38,12 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/dailycraft/sandbox/rev2/config.h b/keyboards/dailycraft/sandbox/rev2/config.h
index 0716d6376a..fb42e45b0c 100644
--- a/keyboards/dailycraft/sandbox/rev2/config.h
+++ b/keyboards/dailycraft/sandbox/rev2/config.h
@@ -43,12 +43,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define SOFT_SERIAL_PIN D2  // or D1, D2, D3, E6
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/dailycraft/stickey4/config.h b/keyboards/dailycraft/stickey4/config.h
index e49ff33415..41efbbb6b5 100644
--- a/keyboards/dailycraft/stickey4/config.h
+++ b/keyboards/dailycraft/stickey4/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/dailycraft/wings42/rev1/config.h b/keyboards/dailycraft/wings42/rev1/config.h
index e2617bcb5b..523c853d91 100644
--- a/keyboards/dailycraft/wings42/rev1/config.h
+++ b/keyboards/dailycraft/wings42/rev1/config.h
@@ -43,12 +43,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define SOFT_SERIAL_PIN D2  // or D1, D2, D3, E6
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/dailycraft/wings42/rev1_extkeys/config.h b/keyboards/dailycraft/wings42/rev1_extkeys/config.h
index 887654a429..72c247c5c6 100644
--- a/keyboards/dailycraft/wings42/rev1_extkeys/config.h
+++ b/keyboards/dailycraft/wings42/rev1_extkeys/config.h
@@ -43,12 +43,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define SOFT_SERIAL_PIN D2  // or D1, D2, D3, E6
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/dailycraft/wings42/rev2/config.h b/keyboards/dailycraft/wings42/rev2/config.h
index 4c66d14cd1..499897d06c 100644
--- a/keyboards/dailycraft/wings42/rev2/config.h
+++ b/keyboards/dailycraft/wings42/rev2/config.h
@@ -43,12 +43,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define SOFT_SERIAL_PIN D2  // or D1, D2, D3, E6
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/deltapad/config.h b/keyboards/deltapad/config.h
index 08e4c27a2c..200110a370 100644
--- a/keyboards/deltapad/config.h
+++ b/keyboards/deltapad/config.h
@@ -38,12 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/do60/config.h b/keyboards/do60/config.h
index 2e4d6aaae4..796c5aadc8 100644
--- a/keyboards/do60/config.h
+++ b/keyboards/do60/config.h
@@ -35,9 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, F4, B4, D7, D6, B3, B0 }
-#define LED_CAPS_LOCK_PIN B2
-#define LED_PIN_ON_STATE 0
 /* Backlight Setup */
 #define BACKLIGHT_PIN B5
 #define BACKLIGHT_LEVELS 6
diff --git a/keyboards/do60/info.json b/keyboards/do60/info.json
index 781186d1ed..1f866dcc1b 100644
--- a/keyboards/do60/info.json
+++ b/keyboards/do60/info.json
@@ -8,6 +8,10 @@
        "pid": "0x6060",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B2",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["60_ansi", "60_hhkb", "60_ansi_split_bs_rshift"],
diff --git a/keyboards/doio/kb30/config.h b/keyboards/doio/kb30/config.h
index 5361523cb7..d3c876fddf 100644
--- a/keyboards/doio/kb30/config.h
+++ b/keyboards/doio/kb30/config.h
@@ -31,11 +31,6 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-// #define LED_NUM_LOCK_PIN A8
-// #define LED_CAPS_LOCK_PIN B14
-// #define LED_SCROLL_LOCK_PIN A9
-// #define LED_PIN_ON_STATE 0
 /* key encoders pins*/
 #define ENCODERS_PAD_A { B5 , A1 , A3 }
 #define ENCODERS_PAD_B { B6 , A2 , A4 }
diff --git a/keyboards/donutcables/budget96/config.h b/keyboards/donutcables/budget96/config.h
index 23f2ac5940..9ec30b81f5 100644
--- a/keyboards/donutcables/budget96/config.h
+++ b/keyboards/donutcables/budget96/config.h
@@ -28,9 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN D0
-#define LED_CAPS_LOCK_PIN D1
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/donutcables/budget96/info.json b/keyboards/donutcables/budget96/info.json
index 5285e7ee8b..13d8e8f831 100644
--- a/keyboards/donutcables/budget96/info.json
+++ b/keyboards/donutcables/budget96/info.json
@@ -8,6 +8,10 @@
        "pid": "0xB960",
        "device_version": "2.0.0"
    },
+    "indicators": {
+        "caps_lock": "D1",
+        "num_lock": "D0"
+    },
    "processor": "atmega32a",
    "bootloader": "bootloadhid",
    "layouts": {
diff --git a/keyboards/donutcables/scrabblepad/config.h b/keyboards/donutcables/scrabblepad/config.h
index 29e42f1256..eb4d25370d 100644
--- a/keyboards/donutcables/scrabblepad/config.h
+++ b/keyboards/donutcables/scrabblepad/config.h
@@ -38,12 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/doro67/multi/config.h b/keyboards/doro67/multi/config.h
index 95ca0f4566..4205a8329b 100644
--- a/keyboards/doro67/multi/config.h
+++ b/keyboards/doro67/multi/config.h
@@ -20,8 +20,5 @@
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN E6
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B7
 #define BACKLIGHT_LEVELS 7
diff --git a/keyboards/doro67/multi/info.json b/keyboards/doro67/multi/info.json
index 0f784cc7d6..12fb141666 100644
--- a/keyboards/doro67/multi/info.json
+++ b/keyboards/doro67/multi/info.json
@@ -8,6 +8,10 @@
    "pid": "0x4D4C",
    "device_version": "0.0.1"
  },
+  "indicators": {
+    "caps_lock": "E6",
+    "on_state": 0
+  },
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "community_layouts": ["65_ansi_blocker"],
diff --git a/keyboards/doro67/regular/config.h b/keyboards/doro67/regular/config.h
index bd61c718ec..e3b127918a 100644
--- a/keyboards/doro67/regular/config.h
+++ b/keyboards/doro67/regular/config.h
@@ -19,6 +19,3 @@
 #define MATRIX_COL_PINS { B0, B1, B2, B3, D4, D6, D7, B4, B5, B6, C6, C7, F5, F6, F7 }
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN E6
-#define LED_PIN_ON_STATE 0
diff --git a/keyboards/doro67/regular/info.json b/keyboards/doro67/regular/info.json
index 32b197f942..096e8e30e7 100644
--- a/keyboards/doro67/regular/info.json
+++ b/keyboards/doro67/regular/info.json
@@ -7,6 +7,10 @@
        "pid": "0x5245",
        "device_version": "0.0.1"
    },
+    "indicators": {
+      "caps_lock": "E6",
+      "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["65_ansi_blocker"],
diff --git a/keyboards/doro67/rgb/config.h b/keyboards/doro67/rgb/config.h
index 05a71a86a9..284761793e 100644
--- a/keyboards/doro67/rgb/config.h
+++ b/keyboards/doro67/rgb/config.h
@@ -38,9 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN E6
-#define LED_PIN_ON_STATE 0
 // The pin connected to the data pin of the LEDs
 #define RGB_DI_PIN B7
 // The number of LEDs connected
diff --git a/keyboards/doro67/rgb/info.json b/keyboards/doro67/rgb/info.json
index 3141873c2a..cf46ac8739 100644
--- a/keyboards/doro67/rgb/info.json
+++ b/keyboards/doro67/rgb/info.json
@@ -8,6 +8,10 @@
        "pid": "0x5247",
        "device_version": "0.0.1"
    },
+    "indicators": {
+      "caps_lock": "E6",
+      "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["65_ansi_blocker"],
diff --git a/keyboards/dtisaac/cg108/config.h b/keyboards/dtisaac/cg108/config.h
index d3d823e30d..3e77e09b3b 100644
--- a/keyboards/dtisaac/cg108/config.h
+++ b/keyboards/dtisaac/cg108/config.h
@@ -39,11 +39,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN B5
-#define LED_CAPS_LOCK_PIN B6
-#define LED_SCROLL_LOCK_PIN B7
-#define LED_PIN_ON_STATE 0
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/dtisaac/cg108/info.json b/keyboards/dtisaac/cg108/info.json
index 7a33c90cb1..d386e9148a 100644
--- a/keyboards/dtisaac/cg108/info.json
+++ b/keyboards/dtisaac/cg108/info.json
@@ -8,6 +8,12 @@
        "pid": "0x4973",
        "device_version": "0.0.2"
    },
+    "indicators": {
+        "caps_lock": "B6",
+        "num_lock": "B5",
+        "scroll_lock": "B7",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/dtisaac/dtisaac01/config.h b/keyboards/dtisaac/dtisaac01/config.h
index c5759646d2..2dabfec868 100644
--- a/keyboards/dtisaac/dtisaac01/config.h
+++ b/keyboards/dtisaac/dtisaac01/config.h
@@ -38,11 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION ROW2COL
-#define LED_CAPS_LOCK_PIN D3
-#define LED_SCROLL_LOCK_PIN D5
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B6
 #define BACKLIGHT_LEVELS 3
 #define BACKLIGHT_BREATHING
diff --git a/keyboards/dtisaac/dtisaac01/info.json b/keyboards/dtisaac/dtisaac01/info.json
index 913092f0c8..4e06790399 100644
--- a/keyboards/dtisaac/dtisaac01/info.json
+++ b/keyboards/dtisaac/dtisaac01/info.json
@@ -8,6 +8,11 @@
        "pid": "0x4973",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "D3",
+        "scroll_lock": "D5",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/durgod/dgk6x/config.h b/keyboards/durgod/dgk6x/config.h
index 17364b2af5..98b7bf0dbd 100644
--- a/keyboards/durgod/dgk6x/config.h
+++ b/keyboards/durgod/dgk6x/config.h
@@ -33,11 +33,8 @@
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 /* LED indicator pins */
-#define LED_CAPS_LOCK_PIN   C4
 #define LED_WIN_LOCK_PIN    C5
-#define LED_SCROLL_LOCK_PIN A8
 #define LED_MR_LOCK_PIN     LED_SCROLL_LOCK_PIN
-#define LED_PIN_ON_STATE    0
 #ifdef RGB_MATRIX_ENABLE
 // This is a 7-bit address, that gets left-shifted and bit 0
diff --git a/keyboards/durgod/dgk6x/info.json b/keyboards/durgod/dgk6x/info.json
index 25d2b3ba76..64f608fde3 100644
--- a/keyboards/durgod/dgk6x/info.json
+++ b/keyboards/durgod/dgk6x/info.json
@@ -1,4 +1,9 @@
 {
+    "indicators": {
+        "caps_lock": "C4",
+        "num_lock": "A8",
+        "on_state": 0
+    },
    "processor": "STM32F072", // F070
    "bootloader": "stm32-dfu",
    "board": "DURGOD_STM32_F070"
diff --git a/keyboards/durgod/k310/base/config.h b/keyboards/durgod/k310/base/config.h
index 0683b05362..f2e84528f0 100644
--- a/keyboards/durgod/k310/base/config.h
+++ b/keyboards/durgod/k310/base/config.h
@@ -38,12 +38,8 @@
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 /* LED indicator pins */
-#define LED_NUM_LOCK_PIN    C8
-#define LED_CAPS_LOCK_PIN   C9
-#define LED_SCROLL_LOCK_PIN A8
 #define LED_WIN_LOCK_PIN    A9
 #define LED_MR_LOCK_PIN     A10
-#define LED_PIN_ON_STATE    0
 /* Original hardware "reset" button on pin D2 */
 #define HARDWARE_RESET_PIN  D2
diff --git a/keyboards/durgod/k310/base/info.json b/keyboards/durgod/k310/base/info.json
index 25d2b3ba76..7e5f9aa8d3 100644
--- a/keyboards/durgod/k310/base/info.json
+++ b/keyboards/durgod/k310/base/info.json
@@ -1,4 +1,10 @@
 {
+    "indicators": {
+        "caps_lock": "C9",
+        "num_lock": "C8",
+        "scroll_lock": "A8",
+        "on_state": 0
+    },
    "processor": "STM32F072", // F070
    "bootloader": "stm32-dfu",
    "board": "DURGOD_STM32_F070"
diff --git a/keyboards/durgod/k320/base/config.h b/keyboards/durgod/k320/base/config.h
index 0eabde8232..bd9d34765f 100644
--- a/keyboards/durgod/k320/base/config.h
+++ b/keyboards/durgod/k320/base/config.h
@@ -38,11 +38,8 @@
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 /* LED indicator pins */
-#define LED_CAPS_LOCK_PIN   C9
-#define LED_SCROLL_LOCK_PIN A8
 #define LED_WIN_LOCK_PIN    A9
 #define LED_MR_LOCK_PIN     A10
-#define LED_PIN_ON_STATE    0
 /* Original hardware "reset" button on pin D2 */
 #define HARDWARE_RESET_PIN  D2
diff --git a/keyboards/durgod/k320/base/info.json b/keyboards/durgod/k320/base/info.json
index 25d2b3ba76..2fe54b1701 100644
--- a/keyboards/durgod/k320/base/info.json
+++ b/keyboards/durgod/k320/base/info.json
@@ -1,4 +1,9 @@
 {
+    "indicators": {
+        "caps_lock": "C9",
+        "scroll_lock": "A8",
+        "on_state": 0
+    },
    "processor": "STM32F072", // F070
    "bootloader": "stm32-dfu",
    "board": "DURGOD_STM32_F070"
diff --git a/keyboards/dyz/dyz60/config.h b/keyboards/dyz/dyz60/config.h
index 184e89d6f5..bd80723d92 100644
--- a/keyboards/dyz/dyz60/config.h
+++ b/keyboards/dyz/dyz60/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define LED_CAPS_LOCK_PIN F1
 #define TAP_CODE_DELAY 10 // Need this delay for some keys like VOLD/VOLU to work
 #define ENCODERS_PAD_A { D0 }
 #define ENCODERS_PAD_B { D1 }
diff --git a/keyboards/dyz/dyz60/info.json b/keyboards/dyz/dyz60/info.json
index 5f01941441..1f54c23d8e 100644
--- a/keyboards/dyz/dyz60/info.json
+++ b/keyboards/dyz/dyz60/info.json
@@ -32,6 +32,9 @@
        "pid": "0x000A",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "F1"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/dyz/dyz_tkl/config.h b/keyboards/dyz/dyz_tkl/config.h
index 06ec4ea5ab..87e057133d 100644
--- a/keyboards/dyz/dyz_tkl/config.h
+++ b/keyboards/dyz/dyz_tkl/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define LED_CAPS_LOCK_PIN D2
 #define TAP_CODE_DELAY 10 // Need this delay for some keys like VOLD/VOLU to work
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/dyz/dyz_tkl/info.json b/keyboards/dyz/dyz_tkl/info.json
index a3787a80cc..734924d407 100644
--- a/keyboards/dyz/dyz_tkl/info.json
+++ b/keyboards/dyz/dyz_tkl/info.json
@@ -29,6 +29,9 @@
        "pid": "0x000C",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "D2"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["tkl_f13_ansi", "tkl_f13_iso"],
diff --git a/keyboards/dyz/selka40/config.h b/keyboards/dyz/selka40/config.h
index cdb700c75e..d93f882fb0 100644
--- a/keyboards/dyz/selka40/config.h
+++ b/keyboards/dyz/selka40/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define LED_CAPS_LOCK_PIN B1
-#define LED_NUM_LOCK_PIN B3
-#define LED_SCROLL_LOCK_PIN B2
 #define TAP_CODE_DELAY 10 // Need this delay for some keys like VOLD/VOLU to work
 #define ENCODERS_PAD_A { D6 }
 #define ENCODERS_PAD_B { D7 }
diff --git a/keyboards/dyz/selka40/info.json b/keyboards/dyz/selka40/info.json
index d5efd04811..246473ec3d 100644
--- a/keyboards/dyz/selka40/info.json
+++ b/keyboards/dyz/selka40/info.json
@@ -32,6 +32,12 @@
        "pid": "0x0012",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B1",
+        "num_lock": "B3",
+        "scroll_lock": "B2",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/dyz/synthesis60/config.h b/keyboards/dyz/synthesis60/config.h
index 9030d42bd1..d70ad316b6 100644
--- a/keyboards/dyz/synthesis60/config.h
+++ b/keyboards/dyz/synthesis60/config.h
@@ -17,8 +17,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define LED_CAPS_LOCK_PIN D5
-#define LED_NUM_LOCK_PIN C7
-#define LED_PIN_ON_STATE 0
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/dyz/synthesis60/info.json b/keyboards/dyz/synthesis60/info.json
index c76fe96f87..a6e7fb0291 100644
--- a/keyboards/dyz/synthesis60/info.json
+++ b/keyboards/dyz/synthesis60/info.json
@@ -47,6 +47,11 @@
        "pid": "0x0017",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "D5",
+        "num_lock": "C7",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/dz60/config.h b/keyboards/dz60/config.h
index e2afe825d0..a0e8c06306 100644
--- a/keyboards/dz60/config.h
+++ b/keyboards/dz60/config.h
@@ -21,9 +21,6 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B2
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B6
 #define BACKLIGHT_LEVELS 5
diff --git a/keyboards/dz60/info.json b/keyboards/dz60/info.json
index 5678d5724c..31df22895b 100644
--- a/keyboards/dz60/info.json
+++ b/keyboards/dz60/info.json
@@ -8,6 +8,10 @@
        "pid": "0x2260",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B2",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["60_ansi", "60_ansi_arrow_split_bs_7u_spc", "60_ansi_arrow", "60_ansi_split_bs_rshift", "60_hhkb", "60_iso", "60_abnt2", "60_tsangan_hhkb"],
diff --git a/keyboards/dztech/dz96/config.h b/keyboards/dztech/dz96/config.h
index fb4fce2ff9..308452213b 100644
--- a/keyboards/dztech/dz96/config.h
+++ b/keyboards/dztech/dz96/config.h
@@ -28,10 +28,5 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN B0
-#define LED_CAPS_LOCK_PIN B2
-#define LED_SCROLL_LOCK_PIN B1
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B6
 #define BACKLIGHT_LEVELS 5
diff --git a/keyboards/dztech/dz96/info.json b/keyboards/dztech/dz96/info.json
index afb69f12aa..acfe51859e 100644
--- a/keyboards/dztech/dz96/info.json
+++ b/keyboards/dztech/dz96/info.json
@@ -8,6 +8,12 @@
    "pid": "0xDB96",
    "device_version": "0.0.1"
  },
+  "indicators": {
+    "caps_lock": "B2",
+    "num_lock": "B0",
+    "scroll_lock": "B1",
+    "on_state": 0
+  },
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "layouts": {
diff --git a/keyboards/dztech/endless80/config.h b/keyboards/dztech/endless80/config.h
index c7ec70e315..0f523067d5 100644
--- a/keyboards/dztech/endless80/config.h
+++ b/keyboards/dztech/endless80/config.h
@@ -21,9 +21,6 @@
 #define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, C6, C7, F5, F4, F1, F0 }
 #define DIODE_DIRECTION COL2ROW
-#define LED_PIN_ON_STATE 0
-#define LED_CAPS_LOCK_PIN E6
 #define RGB_DI_PIN F7
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/dztech/endless80/info.json b/keyboards/dztech/endless80/info.json
index 28daf1b97e..eb80943837 100644
--- a/keyboards/dztech/endless80/info.json
+++ b/keyboards/dztech/endless80/info.json
@@ -8,6 +8,10 @@
        "pid": "0x1015",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "E6",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["tkl_ansi", "tkl_ansi_tsangan"],
diff --git a/keyboards/eason/capsule65/config.h b/keyboards/eason/capsule65/config.h
index cf013d6684..9b922afabb 100644
--- a/keyboards/eason/capsule65/config.h
+++ b/keyboards/eason/capsule65/config.h
@@ -36,8 +36,6 @@
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN F6
 #define RGB_DI_PIN F7
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/eason/capsule65/info.json b/keyboards/eason/capsule65/info.json
index 327b9934e8..4c49f6feef 100644
--- a/keyboards/eason/capsule65/info.json
+++ b/keyboards/eason/capsule65/info.json
@@ -8,6 +8,9 @@
        "pid": "0x6E6E",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "F6"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layout_aliases": {
diff --git a/keyboards/emery65/config.h b/keyboards/emery65/config.h
index 684c3b9942..ae0953a2e0 100644
--- a/keyboards/emery65/config.h
+++ b/keyboards/emery65/config.h
@@ -30,7 +30,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
-/* Indicator LEDs */
-#define LED_CAPS_LOCK_PIN B6
-#define LED_PIN_ON_STATE 0
diff --git a/keyboards/emery65/info.json b/keyboards/emery65/info.json
index b0d25a56b0..17141fb49a 100644
--- a/keyboards/emery65/info.json
+++ b/keyboards/emery65/info.json
@@ -8,6 +8,10 @@
        "pid": "0x4536",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B6",
+        "on_state": 0
+    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/epoch80/config.h b/keyboards/epoch80/config.h
index 91aa72d9ca..497bcae547 100644
--- a/keyboards/epoch80/config.h
+++ b/keyboards/epoch80/config.h
@@ -28,8 +28,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-/* Indicator LEDs */
-#define LED_CAPS_LOCK_PIN E6
-#define LED_SCROLL_LOCK_PIN B7
-#define LED_PIN_ON_STATE 0
diff --git a/keyboards/epoch80/info.json b/keyboards/epoch80/info.json
index 63d9a5eb0f..d8b83f8882 100644
--- a/keyboards/epoch80/info.json
+++ b/keyboards/epoch80/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0000",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "E6",
+        "scroll_lock": "B7",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["tkl_ansi", "tkl_iso"],
diff --git a/keyboards/eternal_keypad/config.h b/keyboards/eternal_keypad/config.h
index f04585fdf4..a6a34abdfc 100644
--- a/keyboards/eternal_keypad/config.h
+++ b/keyboards/eternal_keypad/config.h
@@ -38,12 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 #define RGB_DI_PIN D3
 #define RGBLED_NUM 8
 #define RGBLIGHT_SLEEP
diff --git a/keyboards/eve/meteor/config.h b/keyboards/eve/meteor/config.h
index 8933a8acad..cf379eef3e 100644
--- a/keyboards/eve/meteor/config.h
+++ b/keyboards/eve/meteor/config.h
@@ -27,7 +27,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN D1
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/eve/meteor/info.json b/keyboards/eve/meteor/info.json
index d2b65ed370..ec37d1403e 100644
--- a/keyboards/eve/meteor/info.json
+++ b/keyboards/eve/meteor/info.json
@@ -8,6 +8,9 @@
        "pid": "0x4D54",
        "device_version": "2.0.0"
    },
+    "indicators": {
+        "caps_lock": "D1"
+    },
    "processor": "atmega32a",
    "bootloader": "bootloadhid",
    "layouts": {
diff --git a/keyboards/evil80/config.h b/keyboards/evil80/config.h
index 5bb9f31021..62145482a4 100644
--- a/keyboards/evil80/config.h
+++ b/keyboards/evil80/config.h
@@ -12,9 +12,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B6
-#define LED_SCROLL_LOCK_PIN B7
 #define BACKLIGHT_PIN B5
 #define BACKLIGHT_BREATHING
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/evil80/info.json b/keyboards/evil80/info.json
index 18be417d0c..1d11e37ae6 100644
--- a/keyboards/evil80/info.json
+++ b/keyboards/evil80/info.json
@@ -8,6 +8,10 @@
        "pid": "0x6060",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B6",
+        "scroll_lock": "B7"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/evyd13/atom47/rev2/config.h b/keyboards/evyd13/atom47/rev2/config.h
index 9791231588..2f09e7d1d0 100644
--- a/keyboards/evyd13/atom47/rev2/config.h
+++ b/keyboards/evyd13/atom47/rev2/config.h
@@ -42,9 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_BREATHING
 #define BACKLIGHT_LEVELS 4
-#define LED_CAPS_LOCK_PIN F5
-#define LED_PIN_ON_STATE 1
 #define RGB_DI_PIN D0    // The pin the LED strip is connected to
 #define RGBLED_NUM 1     // Number of LEDs in your strip
diff --git a/keyboards/evyd13/atom47/rev2/info.json b/keyboards/evyd13/atom47/rev2/info.json
index cde77bee0c..2083187e07 100644
--- a/keyboards/evyd13/atom47/rev2/info.json
+++ b/keyboards/evyd13/atom47/rev2/info.json
@@ -8,6 +8,9 @@
        "pid": "0x8E66",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "F5"
+    },
    "processor": "atmega32u4",
    "bootloader": "qmk-dfu",
    "layouts": {
diff --git a/keyboards/evyd13/atom47/rev3/config.h b/keyboards/evyd13/atom47/rev3/config.h
index 79813e1a14..69814659e6 100644
--- a/keyboards/evyd13/atom47/rev3/config.h
+++ b/keyboards/evyd13/atom47/rev3/config.h
@@ -37,9 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_BREATHING
 #define BACKLIGHT_LEVELS 5
-#define LED_CAPS_LOCK_PIN E6
-#define LED_PIN_ON_STATE 0
 #define RGB_DI_PIN F5    // The pin the LED strip is connected to
 #define RGBLED_NUM 6     // Number of LEDs in your strip
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/evyd13/atom47/rev3/info.json b/keyboards/evyd13/atom47/rev3/info.json
index 95d8b998b9..ee044a58e7 100644
--- a/keyboards/evyd13/atom47/rev3/info.json
+++ b/keyboards/evyd13/atom47/rev3/info.json
@@ -8,6 +8,10 @@
        "pid": "0x0E6D",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "E6",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "qmk-dfu",
    "layouts": {
diff --git a/keyboards/evyd13/atom47/rev4/config.h b/keyboards/evyd13/atom47/rev4/config.h
index 9b7c8da894..de068ee8c4 100644
--- a/keyboards/evyd13/atom47/rev4/config.h
+++ b/keyboards/evyd13/atom47/rev4/config.h
@@ -39,6 +39,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define QMK_ESC_OUTPUT C4 // usually COL
 #define QMK_ESC_INPUT C6 // usually ROW
 #define QMK_LED D1
-#define LED_CAPS_LOCK_PIN D1
-#define LED_PIN_ON_STATE 0
diff --git a/keyboards/evyd13/atom47/rev4/info.json b/keyboards/evyd13/atom47/rev4/info.json
index afccbb73b7..8bdeb751ae 100644
--- a/keyboards/evyd13/atom47/rev4/info.json
+++ b/keyboards/evyd13/atom47/rev4/info.json
@@ -8,6 +8,10 @@
        "pid": "0x8446",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "D1",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "qmk-dfu",
    "layouts": {
diff --git a/keyboards/evyd13/atom47/rev5/config.h b/keyboards/evyd13/atom47/rev5/config.h
index 8968e0bae3..e965023763 100644
--- a/keyboards/evyd13/atom47/rev5/config.h
+++ b/keyboards/evyd13/atom47/rev5/config.h
@@ -38,12 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/evyd13/eon75/config.h b/keyboards/evyd13/eon75/config.h
index 14826d4e72..49533c41f2 100644
--- a/keyboards/evyd13/eon75/config.h
+++ b/keyboards/evyd13/eon75/config.h
@@ -37,11 +37,6 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN B7
-#define LED_CAPS_LOCK_PIN D5
-#define LED_SCROLL_LOCK_PIN B0
-#define LED_PIN_ON_STATE 0
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/evyd13/eon75/info.json b/keyboards/evyd13/eon75/info.json
index aa0ee3f605..55d92273b8 100644
--- a/keyboards/evyd13/eon75/info.json
+++ b/keyboards/evyd13/eon75/info.json
@@ -8,6 +8,12 @@
        "pid": "0x5C62",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "D5",
+        "num_lock": "B7",
+        "scroll_lock": "B0",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/evyd13/eon95/config.h b/keyboards/evyd13/eon95/config.h
index e2bcb64cbb..f7faefe9a5 100644
--- a/keyboards/evyd13/eon95/config.h
+++ b/keyboards/evyd13/eon95/config.h
@@ -37,11 +37,6 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN B7
-#define LED_CAPS_LOCK_PIN D5
-#define LED_SCROLL_LOCK_PIN B0
-#define LED_PIN_ON_STATE 0
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/evyd13/eon95/info.json b/keyboards/evyd13/eon95/info.json
index 2f5c0a5518..e0d2736341 100644
--- a/keyboards/evyd13/eon95/info.json
+++ b/keyboards/evyd13/eon95/info.json
@@ -8,6 +8,12 @@
        "pid": "0x8A18",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "D5",
+        "num_lock": "B7",
+        "scroll_lock": "B0",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/evyd13/gh80_1800/config.h b/keyboards/evyd13/gh80_1800/config.h
index fa90c9baa6..8664c63af0 100644
--- a/keyboards/evyd13/gh80_1800/config.h
+++ b/keyboards/evyd13/gh80_1800/config.h
@@ -37,11 +37,6 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN D6
-#define LED_CAPS_LOCK_PIN D7
-#define LED_SCROLL_LOCK_PIN D4
-#define LED_PIN_ON_STATE 0
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/evyd13/gh80_1800/info.json b/keyboards/evyd13/gh80_1800/info.json
index 10f9d1c593..9bc3349db9 100644
--- a/keyboards/evyd13/gh80_1800/info.json
+++ b/keyboards/evyd13/gh80_1800/info.json
@@ -8,6 +8,12 @@
        "pid": "0x8B23",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "D7",
+        "num_lock": "D6",
+        "scroll_lock": "D4",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "qmk-dfu",
    "layouts": {
diff --git a/keyboards/evyd13/gud70/config.h b/keyboards/evyd13/gud70/config.h
index 0356b5fa90..6db718c7d8 100644
--- a/keyboards/evyd13/gud70/config.h
+++ b/keyboards/evyd13/gud70/config.h
@@ -37,11 +37,6 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN B2
-#define LED_CAPS_LOCK_PIN B1
-#define LED_SCROLL_LOCK_PIN B0
-#define LED_PIN_ON_STATE 0
 /*
 * Feature disable options
 *  These options are also useful to firmware size reduction.
diff --git a/keyboards/evyd13/gud70/info.json b/keyboards/evyd13/gud70/info.json
index 824634027f..2ce63fa082 100644
--- a/keyboards/evyd13/gud70/info.json
+++ b/keyboards/evyd13/gud70/info.json
@@ -8,6 +8,12 @@
        "pid": "0x198B",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B1",
+        "num_lock": "B2",
+        "scroll_lock": "B0",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "qmk-dfu",
    "layouts": {
diff --git a/keyboards/evyd13/minitomic/config.h b/keyboards/evyd13/minitomic/config.h
index 8900b1aed8..b0374d6a5f 100644
--- a/keyboards/evyd13/minitomic/config.h
+++ b/keyboards/evyd13/minitomic/config.h
@@ -37,9 +37,6 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN C7
-#define LED_PIN_ON_STATE 0
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/evyd13/minitomic/info.json b/keyboards/evyd13/minitomic/info.json
index b4d84849a8..f1f9d20f8b 100644
--- a/keyboards/evyd13/minitomic/info.json
+++ b/keyboards/evyd13/minitomic/info.json
@@ -8,6 +8,10 @@
    "pid": "0x0145",
    "device_version": "0.0.1"
  },
+  "indicators": {
+    "caps_lock": "C7",
+    "on_state": 0
+  },
  "processor": "atmega32u4",
  "bootloader": "qmk-dfu",
  "layouts": {
diff --git a/keyboards/evyd13/mx5160/config.h b/keyboards/evyd13/mx5160/config.h
index f545dae2c5..3686b1fd60 100644
--- a/keyboards/evyd13/mx5160/config.h
+++ b/keyboards/evyd13/mx5160/config.h
@@ -42,11 +42,6 @@
 #define QMK_ESC_INPUT D1
 #define QMK_LED B1
-#define LED_NUM_LOCK_PIN B2
-#define LED_CAPS_LOCK_PIN B1
-#define LED_SCROLL_LOCK_PIN B3
-#define LED_PIN_ON_STATE 0
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/evyd13/mx5160/info.json b/keyboards/evyd13/mx5160/info.json
index 7fe13e618b..c554429556 100644
--- a/keyboards/evyd13/mx5160/info.json
+++ b/keyboards/evyd13/mx5160/info.json
@@ -8,6 +8,12 @@
        "pid": "0x5160",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B1",
+        "num_lock": "B2",
+        "scroll_lock": "B3",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "qmk-dfu",
    "layouts": {
diff --git a/keyboards/evyd13/nt650/config.h b/keyboards/evyd13/nt650/config.h
deleted file mode 100644
index 91cf8ceccb..0000000000
--- a/keyboards/evyd13/nt650/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2022 Evelien Dekkers (@evyd13)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-#define LED_PIN_ON_STATE 0
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-/* disable debug print */
-//#define NO_DEBUG
-/* disable print */
-//#define NO_PRINT
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/evyd13/nt650/info.json b/keyboards/evyd13/nt650/info.json
index ca134daa2b..3cb5cf6286 100644
--- a/keyboards/evyd13/nt650/info.json
+++ b/keyboards/evyd13/nt650/info.json
@@ -14,7 +14,8 @@
    },
    "indicators": {
        "caps_lock": "E6",
-        "scroll_lock": "E2"
+        "scroll_lock": "E2",
+        "on_state": 0
    },
    "matrix_pins": {
        "cols": ["F4", "F5", "F6", "C7", "C6", "B3", "B1", "B2", "B7", "D7", "B5", "B4", "D0", "B6", "D1"],
diff --git a/keyboards/evyd13/nt660/config.h b/keyboards/evyd13/nt660/config.h
index be29373bc2..1dd6c943b2 100644
--- a/keyboards/evyd13/nt660/config.h
+++ b/keyboards/evyd13/nt660/config.h
@@ -38,8 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN D0
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/evyd13/nt660/info.json b/keyboards/evyd13/nt660/info.json
index 47fe1d64d1..9953112fda 100644
--- a/keyboards/evyd13/nt660/info.json
+++ b/keyboards/evyd13/nt660/info.json
@@ -8,6 +8,9 @@
        "pid": "0x1F02",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "D0"
+    },
    "processor": "atmega32u4",
    "bootloader": "qmk-dfu",
    "community_layouts": ["66_ansi", "66_iso"],
diff --git a/keyboards/evyd13/nt750/config.h b/keyboards/evyd13/nt750/config.h
index de75669121..904902c2f4 100644
--- a/keyboards/evyd13/nt750/config.h
+++ b/keyboards/evyd13/nt750/config.h
@@ -38,9 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN D5
-#define LED_PIN_ON_STATE 0
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/evyd13/nt750/info.json b/keyboards/evyd13/nt750/info.json
index 84d0a75c16..032e31285f 100644
--- a/keyboards/evyd13/nt750/info.json
+++ b/keyboards/evyd13/nt750/info.json
@@ -8,6 +8,10 @@
        "pid": "0x3320",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "D5",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/evyd13/nt980/config.h b/keyboards/evyd13/nt980/config.h
index b39704b3c5..8d06edcc23 100644
--- a/keyboards/evyd13/nt980/config.h
+++ b/keyboards/evyd13/nt980/config.h
@@ -38,11 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN B2
-#define LED_CAPS_LOCK_PIN B3
-#define LED_SCROLL_LOCK_PIN B7
-#define LED_PIN_ON_STATE 0
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/evyd13/nt980/info.json b/keyboards/evyd13/nt980/info.json
index 9f33ce17e5..48c65e6f30 100644
--- a/keyboards/evyd13/nt980/info.json
+++ b/keyboards/evyd13/nt980/info.json
@@ -8,6 +8,12 @@
        "pid": "0xAAF8",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B3",
+        "num_lock": "B2",
+        "scroll_lock": "B7",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/evyd13/quackfire/config.h b/keyboards/evyd13/quackfire/config.h
index aac834fbf8..13cd48fc5d 100644
--- a/keyboards/evyd13/quackfire/config.h
+++ b/keyboards/evyd13/quackfire/config.h
@@ -38,10 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
-#define LED_CAPS_LOCK_PIN F7
-#define LED_SCROLL_LOCK_PIN F6
-#define LED_PIN_ON_STATE 0
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/evyd13/quackfire/info.json b/keyboards/evyd13/quackfire/info.json
index 00741b0aae..b64616a588 100644
--- a/keyboards/evyd13/quackfire/info.json
+++ b/keyboards/evyd13/quackfire/info.json
@@ -8,6 +8,11 @@
        "pid": "0x87C9",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "F7",
+        "scroll_lock": "F6",
+        "on_state": 0
+    },
    "bootmagic": {
        "matrix": [6, 5]
    },
diff --git a/keyboards/evyd13/wasdat/config.h b/keyboards/evyd13/wasdat/config.h
index 225005fea3..78e619874c 100644
--- a/keyboards/evyd13/wasdat/config.h
+++ b/keyboards/evyd13/wasdat/config.h
@@ -37,8 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define SN74X138_ADDRESS_PINS { D2, D1, D0 }
-#define LED_PIN_ON_STATE 0
 /*
 * Feature disable options
 *  These options are also useful to firmware size reduction.
diff --git a/keyboards/evyd13/wasdat/info.json b/keyboards/evyd13/wasdat/info.json
index f989107a84..59516f2325 100644
--- a/keyboards/evyd13/wasdat/info.json
+++ b/keyboards/evyd13/wasdat/info.json
@@ -26,7 +26,8 @@
    "indicators": {
        "num_lock": "B2",
        "caps_lock": "B0",
-        "scroll_lock": "B1"
+        "scroll_lock": "B1",
+        "on_state": 0
    },
    "community_layouts": [
        "fullsize_ansi",
diff --git a/keyboards/evyd13/wasdat_code/config.h b/keyboards/evyd13/wasdat_code/config.h
index ea58609de1..818147e5b0 100644
--- a/keyboards/evyd13/wasdat_code/config.h
+++ b/keyboards/evyd13/wasdat_code/config.h
@@ -43,11 +43,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define QMK_ESC_INPUT F0
 #define QMK_LED B1
-#define LED_NUM_LOCK_PIN B3
-#define LED_CAPS_LOCK_PIN B1
-#define LED_SCROLL_LOCK_PIN B2
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B7
 #define BACKLIGHT_BREATHING
 #define BACKLIGHT_LEVELS 5
diff --git a/keyboards/evyd13/wasdat_code/info.json b/keyboards/evyd13/wasdat_code/info.json
index 2d27a79f30..d0a0af9b81 100644
--- a/keyboards/evyd13/wasdat_code/info.json
+++ b/keyboards/evyd13/wasdat_code/info.json
@@ -8,6 +8,12 @@
        "pid": "0xB00E",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B1",
+        "num_lock": "B3",
+        "scroll_lock": "B2",
+        "on_state": 0
+    },
    "bootmagic": {
        "matrix": [2, 3]
    },
diff --git a/keyboards/evyd13/wonderland/config.h b/keyboards/evyd13/wonderland/config.h
index d1a5d43d63..972a0e2e5f 100644
--- a/keyboards/evyd13/wonderland/config.h
+++ b/keyboards/evyd13/wonderland/config.h
@@ -31,11 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN B1
-#define LED_CAPS_LOCK_PIN B2
-#define LED_SCROLL_LOCK_PIN B3
-#define LED_PIN_ON_STATE 0
 /* Backlight configuration
 */
 #define RGB_DI_PIN B7
diff --git a/keyboards/evyd13/wonderland/info.json b/keyboards/evyd13/wonderland/info.json
index 34aee4c6c9..99672acb74 100644
--- a/keyboards/evyd13/wonderland/info.json
+++ b/keyboards/evyd13/wonderland/info.json
@@ -8,6 +8,12 @@
        "pid": "0xA71C",
        "device_version": "0.0.3"
    },
+    "indicators": {
+        "caps_lock": "B2",
+        "num_lock": "B1",
+        "scroll_lock": "B3",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "qmk-dfu",
    "community_layouts": ["alice", "alice_split_bs"],
diff --git a/keyboards/exclusive/e65/config.h b/keyboards/exclusive/e65/config.h
index 615651d513..30c350f610 100644
--- a/keyboards/exclusive/e65/config.h
+++ b/keyboards/exclusive/e65/config.h
@@ -30,9 +30,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B6
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B7
 #ifdef BACKLIGHT_PIN
 #    define BACKLIGHT_LEVELS 6
diff --git a/keyboards/exclusive/e65/info.json b/keyboards/exclusive/e65/info.json
index 7b3d5102d7..cee3259107 100644
--- a/keyboards/exclusive/e65/info.json
+++ b/keyboards/exclusive/e65/info.json
@@ -8,6 +8,10 @@
        "pid": "0xE605",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B6",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["65_ansi_blocker"],
diff --git a/keyboards/exclusive/e6v2/le/config.h b/keyboards/exclusive/e6v2/le/config.h
index 9e00b2a822..0e28661dac 100644
--- a/keyboards/exclusive/e6v2/le/config.h
+++ b/keyboards/exclusive/e6v2/le/config.h
@@ -26,9 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
 #define MATRIX_COL_PINS { B5, D0, D1, D2, D3, D4, D5, D6, D7, C6, C7, F4, F5, F6, F7 }
-#define LED_CAPS_LOCK_PIN B7
-#define LED_PIN_ON_STATE 0
 #define RGB_DI_PIN E6
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/exclusive/e6v2/le/info.json b/keyboards/exclusive/e6v2/le/info.json
index ee88febe1d..a427b9de1b 100644
--- a/keyboards/exclusive/e6v2/le/info.json
+++ b/keyboards/exclusive/e6v2/le/info.json
@@ -8,6 +8,10 @@
        "pid": "0x6060",
        "device_version": "0.0.2"
    },
+    "indicators": {
+        "caps_lock": "B7",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["60_ansi"],
diff --git a/keyboards/exclusive/e6v2/le_bmc/config.h b/keyboards/exclusive/e6v2/le_bmc/config.h
index e7aa833a55..8fd78d889e 100644
--- a/keyboards/exclusive/e6v2/le_bmc/config.h
+++ b/keyboards/exclusive/e6v2/le_bmc/config.h
@@ -37,8 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, C2, C3, C4, C5, D7 }
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN D1
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/exclusive/e6v2/le_bmc/info.json b/keyboards/exclusive/e6v2/le_bmc/info.json
index b88cf36004..5b34e2f413 100644
--- a/keyboards/exclusive/e6v2/le_bmc/info.json
+++ b/keyboards/exclusive/e6v2/le_bmc/info.json
@@ -7,6 +7,9 @@
        "pid": "0xE62D",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "D1"
+    },
    "processor": "atmega32a",
    "bootloader": "bootloadhid",
    "layouts": {
diff --git a/keyboards/exclusive/e6v2/oe_bmc/config.h b/keyboards/exclusive/e6v2/oe_bmc/config.h
index e7aa833a55..8fd78d889e 100644
--- a/keyboards/exclusive/e6v2/oe_bmc/config.h
+++ b/keyboards/exclusive/e6v2/oe_bmc/config.h
@@ -37,8 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, C2, C3, C4, C5, D7 }
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN D1
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/exclusive/e6v2/oe_bmc/info.json b/keyboards/exclusive/e6v2/oe_bmc/info.json
index 9b0330730b..c5719f48fd 100644
--- a/keyboards/exclusive/e6v2/oe_bmc/info.json
+++ b/keyboards/exclusive/e6v2/oe_bmc/info.json
@@ -7,6 +7,9 @@
        "pid": "0xE62B",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "D1"
+    },
    "processor": "atmega32a",
    "bootloader": "bootloadhid",
    "layouts": {
diff --git a/keyboards/exclusive/e7v1/config.h b/keyboards/exclusive/e7v1/config.h
index 5344996c6c..7dcf907a04 100644
--- a/keyboards/exclusive/e7v1/config.h
+++ b/keyboards/exclusive/e7v1/config.h
@@ -12,8 +12,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN F0
 #define BACKLIGHT_PIN B7
 #ifdef BACKLIGHT_PIN
 #define BACKLIGHT_LEVELS 6
diff --git a/keyboards/exclusive/e7v1/info.json b/keyboards/exclusive/e7v1/info.json
index e9bab64503..88a7563b47 100644
--- a/keyboards/exclusive/e7v1/info.json
+++ b/keyboards/exclusive/e7v1/info.json
@@ -8,6 +8,9 @@
        "pid": "0xE701",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "F0"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/exent/config.h b/keyboards/exent/config.h
index 6f648d9745..317714e0f7 100644
--- a/keyboards/exent/config.h
+++ b/keyboards/exent/config.h
@@ -37,10 +37,6 @@
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN D0
-#define LED_CAPS_LOCK_PIN D1
-#define LED_SCROLL_LOCK_PIN D6
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/exent/info.json b/keyboards/exent/info.json
index 3afe2458a1..985da4fbc4 100644
--- a/keyboards/exent/info.json
+++ b/keyboards/exent/info.json
@@ -8,6 +8,11 @@
        "pid": "0x4558",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "D1",
+        "num_lock": "D0",
+        "scroll_lock": "D6"
+    },
    "processor": "atmega32a",
    "bootloader": "bootloadhid",
    "community_layouts": ["65_ansi", "65_iso"],
diff --git a/keyboards/facew/config.h b/keyboards/facew/config.h
index 3ead735bd5..72fe48339c 100644
--- a/keyboards/facew/config.h
+++ b/keyboards/facew/config.h
@@ -28,9 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN D0
-#define LED_CAPS_LOCK_PIN D1
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/facew/info.json b/keyboards/facew/info.json
index 32ea264adc..28813e660c 100644
--- a/keyboards/facew/info.json
+++ b/keyboards/facew/info.json
@@ -8,6 +8,10 @@
    "pid": "0x422D",
    "device_version": "2.0.0"
  },
+  "indicators": {
+    "caps_lock": "D1",
+    "num_lock": "D0"
+  },
  "processor": "atmega32a",
  "bootloader": "bootloadhid",
  "community_layouts": ["60_ansi"],
diff --git a/keyboards/fc660c/config.h b/keyboards/fc660c/config.h
index bed9a900ee..670b0f8e38 100644
--- a/keyboards/fc660c/config.h
+++ b/keyboards/fc660c/config.h
@@ -24,9 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define DIODE_DIRECTION
-#define LED_CAPS_LOCK_PIN B6
-#define LED_PIN_ON_STATE 0
 #define TAPPING_TERM      175
 /*
diff --git a/keyboards/fc660c/info.json b/keyboards/fc660c/info.json
index 23d13df0d6..ff58c4e23c 100644
--- a/keyboards/fc660c/info.json
+++ b/keyboards/fc660c/info.json
@@ -8,6 +8,10 @@
        "pid": "0x660C",
        "device_version": "1.0.0"
    },
+    "indicators": {
+        "caps_lock": "B6",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "debounce": 0,
diff --git a/keyboards/fc980c/config.h b/keyboards/fc980c/config.h
index 88ebaf770c..6356dd64ee 100644
--- a/keyboards/fc980c/config.h
+++ b/keyboards/fc980c/config.h
@@ -30,10 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define DIODE_DIRECTION
-#define LED_NUM_LOCK_PIN B4
-#define LED_CAPS_LOCK_PIN B5
-#define LED_SCROLL_LOCK_PIN B6
 /*
 * Feature disable options
 *  These options are also useful to firmware size reduction.
diff --git a/keyboards/fc980c/info.json b/keyboards/fc980c/info.json
index 7cd3a51b10..50cd3b9b27 100644
--- a/keyboards/fc980c/info.json
+++ b/keyboards/fc980c/info.json
@@ -8,6 +8,11 @@
    "pid": "0x980C",
    "device_version": "1.0.0"
  },
+  "indicators": {
+    "caps_lock": "B5",
+    "num_lock": "B4",
+    "scroll_lock": "B6"
+  },
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "debounce": 0,
diff --git a/keyboards/fjlabs/ad65/config.h b/keyboards/fjlabs/ad65/config.h
index d74bbf2e45..96974c69a5 100644
--- a/keyboards/fjlabs/ad65/config.h
+++ b/keyboards/fjlabs/ad65/config.h
@@ -45,9 +45,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-/* Define Indicator LED's */
-#define LED_CAPS_LOCK_PIN C7
 /* Define less important options */
 /*
diff --git a/keyboards/fjlabs/ad65/info.json b/keyboards/fjlabs/ad65/info.json
index 68a671fc93..5b6c320bd3 100644
--- a/keyboards/fjlabs/ad65/info.json
+++ b/keyboards/fjlabs/ad65/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0010",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C7"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/fjlabs/avalon/config.h b/keyboards/fjlabs/avalon/config.h
index 40ded16c0a..8749508112 100644
--- a/keyboards/fjlabs/avalon/config.h
+++ b/keyboards/fjlabs/avalon/config.h
@@ -45,9 +45,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-/* Define Indicator LED's */
-#define LED_CAPS_LOCK_PIN C7
 /* Define RGB Underglow */
 #define RGB_DI_PIN D6
 #define RGBLED_NUM 6
diff --git a/keyboards/fjlabs/avalon/info.json b/keyboards/fjlabs/avalon/info.json
index c689e71fc5..2590221b60 100644
--- a/keyboards/fjlabs/avalon/info.json
+++ b/keyboards/fjlabs/avalon/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0015",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C7"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/fjlabs/bks65/config.h b/keyboards/fjlabs/bks65/config.h
index 6a77457f83..4bed328314 100644
--- a/keyboards/fjlabs/bks65/config.h
+++ b/keyboards/fjlabs/bks65/config.h
@@ -60,9 +60,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_TWINKLE
 /* #define RGBLIGHT_LAYER_BLINK*/
-/* Define Indicator LED's */
-#define LED_CAPS_LOCK_PIN C7
 /* Define less important options */
 /*
diff --git a/keyboards/fjlabs/bks65/info.json b/keyboards/fjlabs/bks65/info.json
index c096ceda5d..6b4ef9e95f 100644
--- a/keyboards/fjlabs/bks65/info.json
+++ b/keyboards/fjlabs/bks65/info.json
@@ -8,6 +8,9 @@
        "pid": "0x1001",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C7"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["65_ansi"],
diff --git a/keyboards/fjlabs/kf87/config.h b/keyboards/fjlabs/kf87/config.h
index 875af4b45b..469cd59a70 100644
--- a/keyboards/fjlabs/kf87/config.h
+++ b/keyboards/fjlabs/kf87/config.h
@@ -45,10 +45,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-/* Define Indicator LED's */
-#define LED_CAPS_LOCK_PIN C4
-#define LED_SCROLL_LOCK_PIN C6
 /* Define RGB */
 #define RGB_DI_PIN C2
 #define RGBLED_NUM 87
diff --git a/keyboards/fjlabs/kf87/info.json b/keyboards/fjlabs/kf87/info.json
index db77a1f088..6f783e6476 100644
--- a/keyboards/fjlabs/kf87/info.json
+++ b/keyboards/fjlabs/kf87/info.json
@@ -8,6 +8,10 @@
        "pid": "0x0006",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C4",
+        "scroll_lock": "C6"
+    },
    "processor": "at90usb646",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/fjlabs/ldk65/config.h b/keyboards/fjlabs/ldk65/config.h
index 225eab1c6a..b1fc54293b 100644
--- a/keyboards/fjlabs/ldk65/config.h
+++ b/keyboards/fjlabs/ldk65/config.h
@@ -45,9 +45,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-/* Define Indicator LED's */
-#define LED_CAPS_LOCK_PIN C7
 /* Define less important options */
 /*
diff --git a/keyboards/fjlabs/ldk65/info.json b/keyboards/fjlabs/ldk65/info.json
index ac7d24c54b..4674959220 100644
--- a/keyboards/fjlabs/ldk65/info.json
+++ b/keyboards/fjlabs/ldk65/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0002",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C7"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["65_ansi"],
diff --git a/keyboards/fjlabs/midway60/config.h b/keyboards/fjlabs/midway60/config.h
index c56643d175..30178481bf 100644
--- a/keyboards/fjlabs/midway60/config.h
+++ b/keyboards/fjlabs/midway60/config.h
@@ -45,9 +45,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-/* Define Indicator LED's */
-#define LED_CAPS_LOCK_PIN C7
 /* Define less important options */
 /*
diff --git a/keyboards/fjlabs/midway60/info.json b/keyboards/fjlabs/midway60/info.json
index 6304edb1df..de55690bfc 100644
--- a/keyboards/fjlabs/midway60/info.json
+++ b/keyboards/fjlabs/midway60/info.json
@@ -8,6 +8,9 @@
        "pid": "0x1002",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C7"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/fjlabs/polaris/config.h b/keyboards/fjlabs/polaris/config.h
index 88274ccdf4..d135de12f4 100644
--- a/keyboards/fjlabs/polaris/config.h
+++ b/keyboards/fjlabs/polaris/config.h
@@ -45,9 +45,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-/* Define Indicator LED's */
-#define LED_CAPS_LOCK_PIN C7
 /* Define less important options */
 /*
diff --git a/keyboards/fjlabs/polaris/info.json b/keyboards/fjlabs/polaris/info.json
index 59eb599510..730798ac06 100644
--- a/keyboards/fjlabs/polaris/info.json
+++ b/keyboards/fjlabs/polaris/info.json
@@ -8,6 +8,9 @@
        "pid": "0x9001",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C7"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/fjlabs/sinanju/config.h b/keyboards/fjlabs/sinanju/config.h
index 5528266611..f98831f583 100644
--- a/keyboards/fjlabs/sinanju/config.h
+++ b/keyboards/fjlabs/sinanju/config.h
@@ -45,9 +45,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-/* Define Indicator LED's */
-#define LED_CAPS_LOCK_PIN C7
 /* Define less important options */
 /*
diff --git a/keyboards/fjlabs/sinanju/info.json b/keyboards/fjlabs/sinanju/info.json
index ded3ab705e..739fb32884 100644
--- a/keyboards/fjlabs/sinanju/info.json
+++ b/keyboards/fjlabs/sinanju/info.json
@@ -8,6 +8,9 @@
        "pid": "0x1022",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C7"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/fjlabs/sinanjuwk/config.h b/keyboards/fjlabs/sinanjuwk/config.h
index 5528266611..f98831f583 100644
--- a/keyboards/fjlabs/sinanjuwk/config.h
+++ b/keyboards/fjlabs/sinanjuwk/config.h
@@ -45,9 +45,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-/* Define Indicator LED's */
-#define LED_CAPS_LOCK_PIN C7
 /* Define less important options */
 /*
diff --git a/keyboards/fjlabs/sinanjuwk/info.json b/keyboards/fjlabs/sinanjuwk/info.json
index ccefe4877e..3a5fcbec19 100644
--- a/keyboards/fjlabs/sinanjuwk/info.json
+++ b/keyboards/fjlabs/sinanjuwk/info.json
@@ -8,6 +8,9 @@
        "pid": "0x1023",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C7"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/foxlab/key65/hotswap/config.h b/keyboards/foxlab/key65/hotswap/config.h
index 393a5ae161..45c808c34b 100644
--- a/keyboards/foxlab/key65/hotswap/config.h
+++ b/keyboards/foxlab/key65/hotswap/config.h
@@ -37,9 +37,6 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_SCROLL_LOCK_PIN E6
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B7
 #define BACKLIGHT_LEVELS 5
diff --git a/keyboards/foxlab/key65/hotswap/info.json b/keyboards/foxlab/key65/hotswap/info.json
index b54374fa0a..59e75d4538 100644
--- a/keyboards/foxlab/key65/hotswap/info.json
+++ b/keyboards/foxlab/key65/hotswap/info.json
@@ -8,6 +8,10 @@
        "pid": "0x0003",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "scroll_lock": "E6",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/foxlab/key65/universal/config.h b/keyboards/foxlab/key65/universal/config.h
index 3a24bc57b1..13aba04274 100644
--- a/keyboards/foxlab/key65/universal/config.h
+++ b/keyboards/foxlab/key65/universal/config.h
@@ -37,9 +37,6 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_SCROLL_LOCK_PIN E6
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B7
 #define BACKLIGHT_LEVELS 5
diff --git a/keyboards/foxlab/key65/universal/info.json b/keyboards/foxlab/key65/universal/info.json
index bb970bbb81..1f19916693 100644
--- a/keyboards/foxlab/key65/universal/info.json
+++ b/keyboards/foxlab/key65/universal/info.json
@@ -8,6 +8,10 @@
        "pid": "0x0004",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "scroll_lock": "E6",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["65_ansi_blocker_split_bs"],
diff --git a/keyboards/foxlab/leaf60/hotswap/config.h b/keyboards/foxlab/leaf60/hotswap/config.h
index 257b216c2e..5c1e2186cd 100644
--- a/keyboards/foxlab/leaf60/hotswap/config.h
+++ b/keyboards/foxlab/leaf60/hotswap/config.h
@@ -38,9 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN E6
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B7
 #define BACKLIGHT_BREATHING
 #define BACKLIGHT_LEVELS 4
diff --git a/keyboards/foxlab/leaf60/hotswap/info.json b/keyboards/foxlab/leaf60/hotswap/info.json
index a93938973e..0425a64bfb 100644
--- a/keyboards/foxlab/leaf60/hotswap/info.json
+++ b/keyboards/foxlab/leaf60/hotswap/info.json
@@ -8,6 +8,10 @@
        "pid": "0x0001",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "E6",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/foxlab/leaf60/universal/config.h b/keyboards/foxlab/leaf60/universal/config.h
index 43b6ecb6d2..547295e2b0 100644
--- a/keyboards/foxlab/leaf60/universal/config.h
+++ b/keyboards/foxlab/leaf60/universal/config.h
@@ -38,9 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN E6
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B7
 #define BACKLIGHT_BREATHING
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/foxlab/leaf60/universal/info.json b/keyboards/foxlab/leaf60/universal/info.json
index 4aa6b72d62..d1abab386d 100644
--- a/keyboards/foxlab/leaf60/universal/info.json
+++ b/keyboards/foxlab/leaf60/universal/info.json
@@ -8,6 +8,10 @@
        "pid": "0x0002",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "E6",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["60_ansi", "60_hhkb"],
diff --git a/keyboards/foxlab/time_re/hotswap/config.h b/keyboards/foxlab/time_re/hotswap/config.h
index baa826fa44..9d9adb4c29 100644
--- a/keyboards/foxlab/time_re/hotswap/config.h
+++ b/keyboards/foxlab/time_re/hotswap/config.h
@@ -40,9 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PIN B7
 #define BACKLIGHT_LEVELS 3
-#define LED_CAPS_LOCK_PIN E6
-#define LED_PIN_ON_STATE 0
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
diff --git a/keyboards/foxlab/time_re/hotswap/info.json b/keyboards/foxlab/time_re/hotswap/info.json
index 300775a377..35eeafd2e9 100644
--- a/keyboards/foxlab/time_re/hotswap/info.json
+++ b/keyboards/foxlab/time_re/hotswap/info.json
@@ -8,6 +8,10 @@
        "pid": "0x0006",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "E6",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/foxlab/time_re/universal/config.h b/keyboards/foxlab/time_re/universal/config.h
index baa826fa44..9d9adb4c29 100644
--- a/keyboards/foxlab/time_re/universal/config.h
+++ b/keyboards/foxlab/time_re/universal/config.h
@@ -40,9 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PIN B7
 #define BACKLIGHT_LEVELS 3
-#define LED_CAPS_LOCK_PIN E6
-#define LED_PIN_ON_STATE 0
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
diff --git a/keyboards/foxlab/time_re/universal/info.json b/keyboards/foxlab/time_re/universal/info.json
index 300775a377..35eeafd2e9 100644
--- a/keyboards/foxlab/time_re/universal/info.json
+++ b/keyboards/foxlab/time_re/universal/info.json
@@ -8,6 +8,10 @@
        "pid": "0x0006",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "E6",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/friedrich/config.h b/keyboards/friedrich/config.h
index a5c80b54ce..3b845817dd 100644
--- a/keyboards/friedrich/config.h
+++ b/keyboards/friedrich/config.h
@@ -28,6 +28,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-/* CAPS LED */
-#define LED_CAPS_LOCK_PIN B1
diff --git a/keyboards/friedrich/info.json b/keyboards/friedrich/info.json
index 297540f03a..6f90a896a9 100644
--- a/keyboards/friedrich/info.json
+++ b/keyboards/friedrich/info.json
@@ -8,6 +8,9 @@
        "pid": "0xB4A2",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B1"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/ft/mars80/config.h b/keyboards/ft/mars80/config.h
index 3e09d2df62..b33cb517ca 100644
--- a/keyboards/ft/mars80/config.h
+++ b/keyboards/ft/mars80/config.h
@@ -28,9 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN D1
-#define LED_SCROLL_LOCK_PIN D6
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/ft/mars80/info.json b/keyboards/ft/mars80/info.json
index ff8760f955..1ad63c0aaa 100644
--- a/keyboards/ft/mars80/info.json
+++ b/keyboards/ft/mars80/info.json
@@ -8,6 +8,10 @@
        "pid": "0x422D",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "D1",
+        "scroll_lock": "D6"
+    },
    "processor": "atmega32a",
    "bootloader": "bootloadhid",
    "community_layouts": ["tkl_ansi", "tkl_iso"],
diff --git a/keyboards/gh60/revc/config.h b/keyboards/gh60/revc/config.h
index e242e34ad6..a06fdcb652 100644
--- a/keyboards/gh60/revc/config.h
+++ b/keyboards/gh60/revc/config.h
@@ -41,9 +41,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B2
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_LEVELS 3
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/gh60/revc/info.json b/keyboards/gh60/revc/info.json
index 9c9d96b791..052eaea8a3 100644
--- a/keyboards/gh60/revc/info.json
+++ b/keyboards/gh60/revc/info.json
@@ -8,6 +8,10 @@
        "pid": "0x0001",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B2",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["60_ansi", "60_iso", "60_ansi_split_bs_rshift", "60_tsangan_hhkb"],
diff --git a/keyboards/gh60/satan/config.h b/keyboards/gh60/satan/config.h
index 0a5b6ddf26..9b6d8b31f5 100644
--- a/keyboards/gh60/satan/config.h
+++ b/keyboards/gh60/satan/config.h
@@ -27,9 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3 }
-#define LED_CAPS_LOCK_PIN B2
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B6
 /* COL2ROW or ROW2COL */
diff --git a/keyboards/gh60/satan/info.json b/keyboards/gh60/satan/info.json
index 706d3ed4ce..3a64d5a6ff 100644
--- a/keyboards/gh60/satan/info.json
+++ b/keyboards/gh60/satan/info.json
@@ -8,6 +8,10 @@
    "pid": "0x0002",
    "device_version": "0.0.3"
  },
+  "indicators": {
+    "caps_lock": "B2",
+    "on_state": 0
+  },
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "community_layouts": ["60_ansi", "60_iso", "60_ansi_split_bs_rshift", "60_hhkb"],
diff --git a/keyboards/gkeyboard/gkb_m16/config.h b/keyboards/gkeyboard/gkb_m16/config.h
index 0ad351a128..eb5961c2f7 100644
--- a/keyboards/gkeyboard/gkb_m16/config.h
+++ b/keyboards/gkeyboard/gkb_m16/config.h
@@ -38,12 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 #define RGB_DI_PIN F1
 #ifdef RGB_DI_PIN
    #define RGBLED_NUM 4
diff --git a/keyboards/gorthage_truck/config.h b/keyboards/gorthage_truck/config.h
index 6d5bafc0d6..4e010b280e 100644
--- a/keyboards/gorthage_truck/config.h
+++ b/keyboards/gorthage_truck/config.h
@@ -38,11 +38,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-// LEFT -> RIGHT
-// D5, D3, D2
-#define LED_NUM_LOCK_PIN D5
-#define LED_CAPS_LOCK_PIN D3
-#define LED_SCROLL_LOCK_PIN D2
 #define ENCODERS_PAD_A { F5 }
 #define ENCODERS_PAD_B { F6 }
diff --git a/keyboards/gorthage_truck/info.json b/keyboards/gorthage_truck/info.json
index 527557002d..34ba7b23a0 100644
--- a/keyboards/gorthage_truck/info.json
+++ b/keyboards/gorthage_truck/info.json
@@ -8,6 +8,11 @@
        "pid": "0x58E4",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "D3",
+        "num_lock": "D5",
+        "scroll_lock": "D2"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/gray_studio/apollo80/config.h b/keyboards/gray_studio/apollo80/config.h
index 936b38ddc2..eee3c74b6f 100644
--- a/keyboards/gray_studio/apollo80/config.h
+++ b/keyboards/gray_studio/apollo80/config.h
@@ -35,9 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D4, D6, D2, D3, D5 }
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN E6
-#define LED_PIN_ON_STATE 0
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
    #define RGBLED_NUM 22
diff --git a/keyboards/gray_studio/apollo80/info.json b/keyboards/gray_studio/apollo80/info.json
index 0d90a72912..2f090ef342 100644
--- a/keyboards/gray_studio/apollo80/info.json
+++ b/keyboards/gray_studio/apollo80/info.json
@@ -8,6 +8,10 @@
        "pid": "0x3001",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "E6",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/gray_studio/hb85/config.h b/keyboards/gray_studio/hb85/config.h
index 362513ae07..8a8bacec3d 100644
--- a/keyboards/gray_studio/hb85/config.h
+++ b/keyboards/gray_studio/hb85/config.h
@@ -37,9 +37,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define LED_NUM_LOCK_PIN D0
-#define LED_CAPS_LOCK_PIN D1
-#define LED_SCROLL_LOCK_PIN D6
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/gray_studio/hb85/info.json b/keyboards/gray_studio/hb85/info.json
index 62f03444cc..84ce359d80 100644
--- a/keyboards/gray_studio/hb85/info.json
+++ b/keyboards/gray_studio/hb85/info.json
@@ -8,6 +8,11 @@
        "pid": "0x2000",
        "device_version": "2.0.0"
    },
+    "indicators": {
+        "caps_lock": "D1",
+        "num_lock": "D0",
+        "scroll_lock": "D6"
+    },
    "processor": "atmega32a",
    "bootloader": "bootloadhid",
    "layouts": {
diff --git a/keyboards/gray_studio/space65/config.h b/keyboards/gray_studio/space65/config.h
index 94f6406fe4..f7d3ff5d54 100644
--- a/keyboards/gray_studio/space65/config.h
+++ b/keyboards/gray_studio/space65/config.h
@@ -38,9 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN E6
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B7
 #define BACKLIGHT_BREATHING
 #define BACKLIGHT_LEVELS 5
diff --git a/keyboards/gray_studio/space65/info.json b/keyboards/gray_studio/space65/info.json
index f6b9c2ea97..42af34add6 100644
--- a/keyboards/gray_studio/space65/info.json
+++ b/keyboards/gray_studio/space65/info.json
@@ -8,6 +8,10 @@
        "pid": "0x3000",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "E6",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["65_ansi_blocker", "65_iso_blocker"],
diff --git a/keyboards/gray_studio/think65/hotswap/config.h b/keyboards/gray_studio/think65/hotswap/config.h
index 622d981c35..f33e23c4ee 100644
--- a/keyboards/gray_studio/think65/hotswap/config.h
+++ b/keyboards/gray_studio/think65/hotswap/config.h
@@ -37,11 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN C6
-#define LED_CAPS_LOCK_PIN C7
-#define LED_SCROLL_LOCK_PIN F7
-#define LED_PIN_ON_STATE 0
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
    #define RGBLED_NUM 22
diff --git a/keyboards/gray_studio/think65/hotswap/info.json b/keyboards/gray_studio/think65/hotswap/info.json
index 252a34a286..1ec54ad748 100644
--- a/keyboards/gray_studio/think65/hotswap/info.json
+++ b/keyboards/gray_studio/think65/hotswap/info.json
@@ -8,6 +8,12 @@
        "pid": "0x4001",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C7",
+        "num_lock": "C6",
+        "scroll_lock": "F7",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["65_ansi_blocker"],
diff --git a/keyboards/h0oni/hotduck/config.h b/keyboards/h0oni/hotduck/config.h
index 725072de49..a07fae7e08 100644
--- a/keyboards/h0oni/hotduck/config.h
+++ b/keyboards/h0oni/hotduck/config.h
@@ -34,9 +34,6 @@
 #define MATRIX_ROW_PINS { B6, B2, B3, B1, F7, F6, F5 }
 #define MATRIX_COL_PINS { B5, B4, E6, D7, C6, D4, D0, D1, D2, D3}
-// #define LED_CAPS_LOCK_PIN B2
-// #define LED_PIN_ON_STATE 0
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/han60/config.h b/keyboards/han60/config.h
index 12de440607..8432c4e703 100644
--- a/keyboards/han60/config.h
+++ b/keyboards/han60/config.h
@@ -38,12 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/hand88/config.h b/keyboards/hand88/config.h
index cdfd328c11..f3c85ebbe4 100755
--- a/keyboards/hand88/config.h
+++ b/keyboards/hand88/config.h
@@ -30,7 +30,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
-/* Indicator LEDs */
-#define LED_CAPS_LOCK_PIN B6
-#define LED_PIN_ON_STATE 0
diff --git a/keyboards/hand88/info.json b/keyboards/hand88/info.json
index 26390f614c..b0e00e7f30 100755
--- a/keyboards/hand88/info.json
+++ b/keyboards/hand88/info.json
@@ -8,6 +8,10 @@
        "pid": "0x3838",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B6",
+        "on_state": 0
+    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/handwired/aim65/config.h b/keyboards/handwired/aim65/config.h
index 3ef2064ade..5ff4263ecd 100644
--- a/keyboards/handwired/aim65/config.h
+++ b/keyboards/handwired/aim65/config.h
@@ -35,6 +35,3 @@
 #define MATRIX_COL_PINS { D1, C6, B6, B2, F7, F6, F5, F4 }
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B0
-#define LED_PIN_ON_STATE 0
diff --git a/keyboards/handwired/aim65/info.json b/keyboards/handwired/aim65/info.json
index f7671ea318..de4263d1cd 100644
--- a/keyboards/handwired/aim65/info.json
+++ b/keyboards/handwired/aim65/info.json
@@ -8,6 +8,10 @@
        "pid": "0x0F34",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B0",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "layouts": {
diff --git a/keyboards/handwired/bolek/config.h b/keyboards/handwired/bolek/config.h
index 645e05039e..de1a49da1c 100644
--- a/keyboards/handwired/bolek/config.h
+++ b/keyboards/handwired/bolek/config.h
@@ -38,12 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/bstk100/config.h b/keyboards/handwired/bstk100/config.h
index 31a2d42769..373f0b461b 100644
--- a/keyboards/handwired/bstk100/config.h
+++ b/keyboards/handwired/bstk100/config.h
@@ -39,15 +39,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-// The state of the indicator pins when the LED is "on" - 1 for high
-#define LED_PIN_ON_STATE 0
-#define LED_NUM_LOCK_PIN D4
-#define LED_CAPS_LOCK_PIN D5
-#define LED_SCROLL_LOCK_PIN B0
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/bstk100/info.json b/keyboards/handwired/bstk100/info.json
index 093fde872c..03580c3332 100644
--- a/keyboards/handwired/bstk100/info.json
+++ b/keyboards/handwired/bstk100/info.json
@@ -8,6 +8,12 @@
        "pid": "0xB100",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "D5",
+        "num_lock": "D4",
+        "scroll_lock": "B0",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/handwired/dqz11n1g/config.h b/keyboards/handwired/dqz11n1g/config.h
index cd12f0d250..bd609c9082 100644
--- a/keyboards/handwired/dqz11n1g/config.h
+++ b/keyboards/handwired/dqz11n1g/config.h
@@ -31,10 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Column read via SPI (shift register) */
 /* #define MATRIX_COL_PINS { } */
-#define LED_CAPS_LOCK_PIN F7 /* A0 */
-#define LED_NUM_LOCK_PIN F5 /*A2 */
-#define LED_SCROLL_LOCK_PIN F4 /*A3 */
 #define LED_FUN_LOCK_PIN F6 /* A1 (handled in layer_state_set_user()) */
 /* audio config */
diff --git a/keyboards/handwired/dqz11n1g/info.json b/keyboards/handwired/dqz11n1g/info.json
index 039362f5b8..c72310a1e8 100644
--- a/keyboards/handwired/dqz11n1g/info.json
+++ b/keyboards/handwired/dqz11n1g/info.json
@@ -8,6 +8,11 @@
        "pid": "0x4451",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "F7",
+        "num_lock": "F5",
+        "scroll_lock": "F4"
+    },
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "layouts": {
diff --git a/keyboards/handwired/evk/v1_3/config.h b/keyboards/handwired/evk/v1_3/config.h
index 817473a125..ccd23ad45a 100644
--- a/keyboards/handwired/evk/v1_3/config.h
+++ b/keyboards/handwired/evk/v1_3/config.h
@@ -38,9 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL // the positive current flows into the rows and then out of the columns negative.
-/* define whiche Pins to use for the status LEDs*/
-#define LED_CAPS_LOCK_PIN D4
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/evk/v1_3/info.json b/keyboards/handwired/evk/v1_3/info.json
index 8ac987e2db..bc6a522003 100644
--- a/keyboards/handwired/evk/v1_3/info.json
+++ b/keyboards/handwired/evk/v1_3/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0000",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "D4"
+    },
    "processor": "atmega32u4",
    "bootloader": "halfkay",
    "layouts": {
diff --git a/keyboards/handwired/frankie_macropad/config.h b/keyboards/handwired/frankie_macropad/config.h
index 6d0aa48c7c..03fe3ecdb7 100644
--- a/keyboards/handwired/frankie_macropad/config.h
+++ b/keyboards/handwired/frankie_macropad/config.h
@@ -38,12 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 /*
 * Feature disable options
 *  These options are also useful to firmware size reduction.
diff --git a/keyboards/handwired/hwpm87/config.h b/keyboards/handwired/hwpm87/config.h
index be662d4bf6..c8275d9dc6 100644
--- a/keyboards/handwired/hwpm87/config.h
+++ b/keyboards/handwired/hwpm87/config.h
@@ -23,6 +23,3 @@
 
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5 }
 #define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B7, F0, F1, D6, C7, B6, F7, F6, F5, F4 }
-#define LED_CAPS_LOCK_PIN D5
-#define LED_PIN_ON_STATE 0
diff --git a/keyboards/handwired/hwpm87/info.json b/keyboards/handwired/hwpm87/info.json
index 3560bac95f..8654ea7561 100644
--- a/keyboards/handwired/hwpm87/info.json
+++ b/keyboards/handwired/hwpm87/info.json
@@ -8,6 +8,10 @@
        "pid": "0x0001",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "D5",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/handwired/kbod/config.h b/keyboards/handwired/kbod/config.h
index 4bc9154f38..5e01f4093e 100644
--- a/keyboards/handwired/kbod/config.h
+++ b/keyboards/handwired/kbod/config.h
@@ -27,8 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B0
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/kbod/info.json b/keyboards/handwired/kbod/info.json
index 398dbcd5ed..6ce0f46f2c 100644
--- a/keyboards/handwired/kbod/info.json
+++ b/keyboards/handwired/kbod/info.json
@@ -8,6 +8,9 @@
        "pid": "0x6060",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B0"
+    },
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "layouts": {
diff --git a/keyboards/handwired/lagrange/config.h b/keyboards/handwired/lagrange/config.h
index 7a54cd0460..59a366cdb6 100644
--- a/keyboards/handwired/lagrange/config.h
+++ b/keyboards/handwired/lagrange/config.h
@@ -32,6 +32,3 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
-#define LED_CAPS_LOCK_PIN D1
-#define LED_SCROLL_LOCK_PIN D2
diff --git a/keyboards/handwired/lagrange/info.json b/keyboards/handwired/lagrange/info.json
index 9eb68abdf3..7d1179e1f4 100644
--- a/keyboards/handwired/lagrange/info.json
+++ b/keyboards/handwired/lagrange/info.json
@@ -8,6 +8,10 @@
        "pid": "0x2718",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "D1",
+        "scroll_lock": "D2"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/handwired/meck_tkl/blackpill_f401/config.h b/keyboards/handwired/meck_tkl/blackpill_f401/config.h
index eff5d5d81f..dcf0a27d21 100644
--- a/keyboards/handwired/meck_tkl/blackpill_f401/config.h
+++ b/keyboards/handwired/meck_tkl/blackpill_f401/config.h
@@ -7,6 +7,3 @@
    { B15, A8, A9, B14, A15, B3 }
 #define MATRIX_COL_PINS \
    { B4, B5, B6, B7, B8, B9, A1, A2, A3, A4, A5, A6, A7, B0, B1, A0, B10 }
-#define LED_CAPS_LOCK_PIN C13
-#define LED_PIN_ON_STATE 0
diff --git a/keyboards/handwired/meck_tkl/blackpill_f401/info.json b/keyboards/handwired/meck_tkl/blackpill_f401/info.json
index acd7e83f77..68df328ac7 100644
--- a/keyboards/handwired/meck_tkl/blackpill_f401/info.json
+++ b/keyboards/handwired/meck_tkl/blackpill_f401/info.json
@@ -1,4 +1,8 @@
 {
+    "indicators": {
+        "caps_lock": "C13",
+        "on_state": 0
+    },
    "processor": "STM32F401",
    "bootloader": "stm32-dfu",
    "board": "BLACKPILL_STM32_F401"
diff --git a/keyboards/handwired/oem_ansi_fullsize/config.h b/keyboards/handwired/oem_ansi_fullsize/config.h
index 3687ae6994..bce35ad928 100644
--- a/keyboards/handwired/oem_ansi_fullsize/config.h
+++ b/keyboards/handwired/oem_ansi_fullsize/config.h
@@ -45,12 +45,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/oem_iso_fullsize/config.h b/keyboards/handwired/oem_iso_fullsize/config.h
index 88925e58d3..00421d2705 100644
--- a/keyboards/handwired/oem_iso_fullsize/config.h
+++ b/keyboards/handwired/oem_iso_fullsize/config.h
@@ -40,9 +40,6 @@
 *Row 3, R129, Pin A2
 *Row 4, R128, Pin E5
 *Row 5, R127, Pin A7
-#define LED_CAPS_LOCK_PIN C7
-#define LED_SCROLL_LOCK_PIN A3
-#define LED_NUM_LOCK_PIN C6
 #define BACKLIGHT_PINS { B5, E5, E4, A7, A1, A2 }
 #define BACKLIGHT_LEVELS 1*/
diff --git a/keyboards/handwired/snatchpad/config.h b/keyboards/handwired/snatchpad/config.h
index 6bb7b1c82a..f38f90a651 100644
--- a/keyboards/handwired/snatchpad/config.h
+++ b/keyboards/handwired/snatchpad/config.h
@@ -29,12 +29,6 @@
 #define ENCODERS_PAD_A { D3, D0 }
 #define ENCODERS_PAD_B { D2, D1 }
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/sono1/stm32f103/config.h b/keyboards/handwired/sono1/stm32f103/config.h
index ec0ddfbe05..b961eaffd6 100644
--- a/keyboards/handwired/sono1/stm32f103/config.h
+++ b/keyboards/handwired/sono1/stm32f103/config.h
@@ -21,11 +21,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { A5, B3, A9, A10, B13, B14, B15, A8, B7, B8, B9, C13, A15, A0, A1 }
 #define MATRIX_COL_PINS { A4, A3, B11, B10, B1, B0, A7, A6 }
-#define LED_KANA_PIN A2
-#define LED_CAPS_LOCK_PIN B5
 #define LED_CTRL_XFER_PIN B6
-#define LED_NUM_LOCK_PIN B4
 #define LED_KB_LOCK_PIN B12
-#define LED_PIN_ON_STATE 0
diff --git a/keyboards/handwired/sono1/stm32f103/info.json b/keyboards/handwired/sono1/stm32f103/info.json
index 241cf5e9a2..b25392382a 100644
--- a/keyboards/handwired/sono1/stm32f103/info.json
+++ b/keyboards/handwired/sono1/stm32f103/info.json
@@ -2,6 +2,12 @@
    "usb": {
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B5",
+        "num_lock": "B4",
+        "kana": "A2",
+        "on_state": 0
+    },
    "processor": "STM32F103",
    "bootloader": "stm32duino"
 }
diff --git a/keyboards/handwired/sono1/t2pp/config.h b/keyboards/handwired/sono1/t2pp/config.h
index 4097132e86..15bea036a2 100644
--- a/keyboards/handwired/sono1/t2pp/config.h
+++ b/keyboards/handwired/sono1/t2pp/config.h
@@ -21,11 +21,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { F7, F6, F5, F4, F3, F2, F1, F0, D7, B7, D0, D1, D2, D3, D4 }
 #define MATRIX_COL_PINS { C6, C5, C4, C3, C2, C1, C0, E1 }
-#define LED_KANA_PIN D5
-#define LED_CAPS_LOCK_PIN B3
 #define LED_CTRL_XFER_PIN B4
-#define LED_NUM_LOCK_PIN B2
 #define LED_KB_LOCK_PIN B1
-#define LED_PIN_ON_STATE 0
diff --git a/keyboards/handwired/sono1/t2pp/info.json b/keyboards/handwired/sono1/t2pp/info.json
index 69ccef72ae..3e637c3e94 100644
--- a/keyboards/handwired/sono1/t2pp/info.json
+++ b/keyboards/handwired/sono1/t2pp/info.json
@@ -2,6 +2,12 @@
    "usb": {
        "device_version": "0.0.2"
    },
+    "indicators": {
+        "caps_lock": "B3",
+        "num_lock": "B2",
+        "kana": "D5",
+        "on_state": 0
+    },
    "processor": "at90usb1286",
    "bootloader": "halfkay"
 }
diff --git a/keyboards/handwired/split89/config.h b/keyboards/handwired/split89/config.h
index 3f4934dd8b..c720ab30a4 100644
--- a/keyboards/handwired/split89/config.h
+++ b/keyboards/handwired/split89/config.h
@@ -54,12 +54,6 @@ COLS = number of cols per side which curently needs to be equal so there are bla
 */
 #define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/tritium_numpad/config.h b/keyboards/handwired/tritium_numpad/config.h
index d7b9998964..f1f52a56f0 100644
--- a/keyboards/handwired/tritium_numpad/config.h
+++ b/keyboards/handwired/tritium_numpad/config.h
@@ -27,9 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { D1, D0, D4, C6, D7, E6 }
 #define MATRIX_COL_PINS { F4, F6, B1, B2 }
-#define LED_NUM_LOCK_PIN D5
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B6
 /* COL2ROW or ROW2COL */
diff --git a/keyboards/handwired/tritium_numpad/info.json b/keyboards/handwired/tritium_numpad/info.json
index 97362a0665..8dc967df96 100644
--- a/keyboards/handwired/tritium_numpad/info.json
+++ b/keyboards/handwired/tritium_numpad/info.json
@@ -8,6 +8,10 @@
    "pid": "0x6060",
    "device_version": "0.0.3"
  },
+  "indicators": {
+    "num_lock": "D5",
+    "on_state": 0
+  },
  "processor": "atmega32u4",
  "bootloader": "caterina",
  "community_layouts": ["numpad_6x4", "ortho_6x4"],
diff --git a/keyboards/handwired/unicomp_mini_m/config.h b/keyboards/handwired/unicomp_mini_m/config.h
index df916c9b86..ef38f37c70 100644
--- a/keyboards/handwired/unicomp_mini_m/config.h
+++ b/keyboards/handwired/unicomp_mini_m/config.h
@@ -35,11 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { F7, F6, F5, F4, F3, F2, F1, F0, E6, E7, B0, B1 }
 #define MATRIX_COL_PINS { C7, C6, C5, C4, C3, C2, C1, C0, E1, E0, D7, B7, D5, D4, D3, D2 }
-#define LED_PIN_ON_STATE 0
-#define LED_NUM_LOCK_PIN B6
-#define LED_CAPS_LOCK_PIN B5
-#define LED_SCROLL_LOCK_PIN B4
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/handwired/unicomp_mini_m/info.json b/keyboards/handwired/unicomp_mini_m/info.json
index af9b90cc24..7216203ba8 100644
--- a/keyboards/handwired/unicomp_mini_m/info.json
+++ b/keyboards/handwired/unicomp_mini_m/info.json
@@ -8,6 +8,12 @@
        "pid": "0x0000",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B5",
+        "num_lock": "B6",
+        "scroll_lock": "B4",
+        "on_state": 0
+    },
    "processor": "at90usb1286",
    "bootloader": "halfkay",
    "layouts": {
diff --git a/keyboards/hardlineworks/otd_plus/config.h b/keyboards/hardlineworks/otd_plus/config.h
index eae3e8dda4..cff856e895 100644
--- a/keyboards/hardlineworks/otd_plus/config.h
+++ b/keyboards/hardlineworks/otd_plus/config.h
@@ -11,9 +11,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN F4
-#define LED_SCROLL_LOCK_PIN D5
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/hardlineworks/otd_plus/info.json b/keyboards/hardlineworks/otd_plus/info.json
index c097e0de38..2a9f5c28d7 100644
--- a/keyboards/hardlineworks/otd_plus/info.json
+++ b/keyboards/hardlineworks/otd_plus/info.json
@@ -8,6 +8,10 @@
        "pid": "0x0087",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "F4",
+        "scroll_lock": "D5"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/hhkb/yang/config.h b/keyboards/hhkb/yang/config.h
index f421e51d75..e1f24c8c25 100644
--- a/keyboards/hhkb/yang/config.h
+++ b/keyboards/hhkb/yang/config.h
@@ -28,8 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_POWER_SAVE_TIMEOUT_L2_MS 1800000
 #define MATRIX_POWER_SAVE_TIMEOUT_L3_MS 7200000
-#define LED_CAPS_LOCK_PIN F4
 #ifdef BLUETOOTH_ENABLE
 #    define OUTPUT_DEFAULT OUTPUT_AUTO
diff --git a/keyboards/hhkb/yang/info.json b/keyboards/hhkb/yang/info.json
index 6c5bdcf1f6..dc465cea96 100644
--- a/keyboards/hhkb/yang/info.json
+++ b/keyboards/hhkb/yang/info.json
@@ -8,6 +8,9 @@
    "pid": "0x0001",
    "device_version": "1.0.4"
  },
+  "indicators": {
+    "caps_lock": "F4"
+  },
  "processor": "atmega32u4",
  "bootloader": "lufa-ms",
  "debounce": 0,
diff --git a/keyboards/hineybush/h08_ocelot/config.h b/keyboards/hineybush/h08_ocelot/config.h
index a9e3f566d7..9c0268da99 100644
--- a/keyboards/hineybush/h08_ocelot/config.h
+++ b/keyboards/hineybush/h08_ocelot/config.h
@@ -38,12 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 #define RGB_DI_PIN F1
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM 7
diff --git a/keyboards/hineybush/h65/config.h b/keyboards/hineybush/h65/config.h
index bec8300070..8b8309e423 100644
--- a/keyboards/hineybush/h65/config.h
+++ b/keyboards/hineybush/h65/config.h
@@ -38,12 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-#define LED_CAPS_LOCK_PIN E6
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 #define BACKLIGHT_PIN B7
 #define BACKLIGHT_LEVELS 3
 #define BACKLIGHT_BREATHING
diff --git a/keyboards/hineybush/h65/info.json b/keyboards/hineybush/h65/info.json
index 148fedec1b..7a6658bf89 100644
--- a/keyboards/hineybush/h65/info.json
+++ b/keyboards/hineybush/h65/info.json
@@ -8,6 +8,9 @@
        "pid": "0xE9E4",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "E6"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_ansi_blocker_tsangan", "65_iso_blocker", "65_iso_blocker_split_bs"],
diff --git a/keyboards/hineybush/h65_hotswap/config.h b/keyboards/hineybush/h65_hotswap/config.h
index bec8300070..8b8309e423 100644
--- a/keyboards/hineybush/h65_hotswap/config.h
+++ b/keyboards/hineybush/h65_hotswap/config.h
@@ -38,12 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-#define LED_CAPS_LOCK_PIN E6
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 #define BACKLIGHT_PIN B7
 #define BACKLIGHT_LEVELS 3
 #define BACKLIGHT_BREATHING
diff --git a/keyboards/hineybush/h65_hotswap/info.json b/keyboards/hineybush/h65_hotswap/info.json
index 1d5d283fd7..c69a6c1491 100644
--- a/keyboards/hineybush/h65_hotswap/info.json
+++ b/keyboards/hineybush/h65_hotswap/info.json
@@ -8,6 +8,9 @@
        "pid": "0xE8B7",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "E6"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layout_aliases": {
diff --git a/keyboards/hineybush/hineyg80/config.h b/keyboards/hineybush/hineyg80/config.h
index f92969440e..2e5e11eea5 100644
--- a/keyboards/hineybush/hineyg80/config.h
+++ b/keyboards/hineybush/hineyg80/config.h
@@ -12,11 +12,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN C6
-#define LED_CAPS_LOCK_PIN B6
-#define LED_SCROLL_LOCK_PIN B5
 #ifdef BACKLIGHT_PIN
 #define BACKLIGHT_LEVELS 3
 #endif
diff --git a/keyboards/hineybush/hineyg80/info.json b/keyboards/hineybush/hineyg80/info.json
index b16f445efe..dcc3aa5f29 100644
--- a/keyboards/hineybush/hineyg80/info.json
+++ b/keyboards/hineybush/hineyg80/info.json
@@ -8,6 +8,11 @@
        "pid": "0x6060",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B6",
+        "num_lock": "C6",
+        "scroll_lock": "B5"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/hnahkb/freyr/config.h b/keyboards/hnahkb/freyr/config.h
index 34bab3085f..8f716f010b 100644
--- a/keyboards/hnahkb/freyr/config.h
+++ b/keyboards/hnahkb/freyr/config.h
@@ -38,10 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B3
-#define LED_SCROLL_LOCK_PIN B7
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B6
 #define BACKLIGHT_LEVELS 3
 #define BACKLIGHT_BREATHING
diff --git a/keyboards/hnahkb/freyr/info.json b/keyboards/hnahkb/freyr/info.json
index 0fce74f0cc..547aabaade 100644
--- a/keyboards/hnahkb/freyr/info.json
+++ b/keyboards/hnahkb/freyr/info.json
@@ -8,6 +8,11 @@
        "pid": "0x1895",
        "device_version": "0.0.2"
    },
+    "indicators": {
+        "caps_lock": "B3",
+        "scroll_lock": "B7",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["tkl_ansi", "tkl_iso"],
diff --git a/keyboards/hnahkb/stella/config.h b/keyboards/hnahkb/stella/config.h
index 027c11d747..58a7688daf 100644
--- a/keyboards/hnahkb/stella/config.h
+++ b/keyboards/hnahkb/stella/config.h
@@ -38,10 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B3
-#define LED_SCROLL_LOCK_PIN B7
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B6
 #define BACKLIGHT_LEVELS 3
 #define BACKLIGHT_BREATHING
diff --git a/keyboards/hnahkb/stella/info.json b/keyboards/hnahkb/stella/info.json
index f3e6550f8e..59465e3be9 100644
--- a/keyboards/hnahkb/stella/info.json
+++ b/keyboards/hnahkb/stella/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0AB7",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B3",
+        "scroll_lock": "B7",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["tkl_ansi", "tkl_iso"],
diff --git a/keyboards/hnahkb/vn66/config.h b/keyboards/hnahkb/vn66/config.h
index 90e9b02ae1..83909b077e 100644
--- a/keyboards/hnahkb/vn66/config.h
+++ b/keyboards/hnahkb/vn66/config.h
@@ -38,9 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN E6
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B6
 #define BACKLIGHT_LEVELS 4
 #define BACKLIGHT_BREATHING
diff --git a/keyboards/hnahkb/vn66/info.json b/keyboards/hnahkb/vn66/info.json
index ce2124fe5c..a85d29b644 100644
--- a/keyboards/hnahkb/vn66/info.json
+++ b/keyboards/hnahkb/vn66/info.json
@@ -8,6 +8,10 @@
        "pid": "0xCA2C",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "E6",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["66_ansi", "66_iso"],
diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/config.h b/keyboards/horrortroll/chinese_pcb/black_e65/config.h
index 17b48b9766..715642409e 100644
--- a/keyboards/horrortroll/chinese_pcb/black_e65/config.h
+++ b/keyboards/horrortroll/chinese_pcb/black_e65/config.h
@@ -31,9 +31,6 @@
 /* Forcing to use NKRO instead 6KRO */
 #define FORCE_NKRO
-/* LED Indicator */
-#define LED_CAPS_LOCK_PIN C7
 #ifdef BACKLIGHT_ENABLE
    /* Backlight config */
    #define BACKLIGHT_PIN B6
diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/info.json b/keyboards/horrortroll/chinese_pcb/black_e65/info.json
index f5eff6caa6..c1927fc3d1 100644
--- a/keyboards/horrortroll/chinese_pcb/black_e65/info.json
+++ b/keyboards/horrortroll/chinese_pcb/black_e65/info.json
@@ -8,6 +8,9 @@
        "pid": "0x7000",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C7"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/hp69/config.h b/keyboards/hp69/config.h
index 7ec7ca192d..57233869ee 100644
--- a/keyboards/hp69/config.h
+++ b/keyboards/hp69/config.h
@@ -53,6 +53,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define AUDIO_PIN A5
 #define AUDIO_PIN_ALT A4
 #define AUDIO_PIN_ALT_AS_NEGATIVE
-#define LED_CAPS_LOCK_PIN A6
-#define LED_SCROLL_LOCK_PIN A7
diff --git a/keyboards/hp69/info.json b/keyboards/hp69/info.json
index cec2abf977..d411fae52b 100644
--- a/keyboards/hp69/info.json
+++ b/keyboards/hp69/info.json
@@ -8,6 +8,10 @@
        "pid": "0x0001",
        "device_version": "0.1.1"
    },
+    "indicators": {
+        "caps_lock": "A6",
+        "scroll_lock": "A7"
+    },
    "processor": "STM32F303",
    "bootloader": "stm32-dfu",
    "board": "QMK_PROTON_C",
diff --git a/keyboards/huytbt/h50/config.h b/keyboards/huytbt/h50/config.h
index c28e3ae238..1e1cd69525 100644
--- a/keyboards/huytbt/h50/config.h
+++ b/keyboards/huytbt/h50/config.h
@@ -29,7 +29,5 @@
 #define MATRIX_ROW_PINS { D1, D0, D4, C6 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D7, E6, B4, B5, D2, D3 }
-#define LED_CAPS_LOCK_PIN D5
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/huytbt/h50/info.json b/keyboards/huytbt/h50/info.json
index 095740b3db..166d367b48 100644
--- a/keyboards/huytbt/h50/info.json
+++ b/keyboards/huytbt/h50/info.json
@@ -8,6 +8,9 @@
    "pid": "0x0002",
    "device_version": "0.0.1"
  },
+  "indicators": {
+    "caps_lock": "D5"
+  },
  "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
  "layouts": {
diff --git a/keyboards/ianklug/grooveboard/config.h b/keyboards/ianklug/grooveboard/config.h
index c88aadfd8a..12ff57c16b 100644
--- a/keyboards/ianklug/grooveboard/config.h
+++ b/keyboards/ianklug/grooveboard/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/config.h b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/config.h
index 8088fc8368..64a26b0701 100644
--- a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/config.h
+++ b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/config.h
@@ -58,8 +58,3 @@
 #define SOLENOID_MIN_DWELL 4
 #define HAPTIC_OFF_IN_LOW_POWER 1
 #define NO_HAPTIC_MOD
-#define LED_NUM_LOCK_PIN C12
-#define LED_CAPS_LOCK_PIN C11
-#define LED_SCROLL_LOCK_PIN C10
-#define LED_ON_STATE 1
diff --git a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json
index b8e0bf00f1..2aebd925ee 100644
--- a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json
+++ b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json
@@ -8,6 +8,11 @@
        "pid": "0x27DB",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C11",
+        "num_lock": "C12",
+        "scroll_lock": "C10"
+    },
    "processor": "STM32F446", // RET6
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/idobao/id80/v2/config.h b/keyboards/idobao/id80/v2/config.h
index edb3fc8a3f..3306dd3097 100644
--- a/keyboards/idobao/id80/v2/config.h
+++ b/keyboards/idobao/id80/v2/config.h
@@ -58,9 +58,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    #define BACKLIGHT_LEVELS 3
 #endif
-#define LED_CAPS_LOCK_PIN C7
-#define LED_PIN_ON_STATE 0
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
    #define RGBLED_NUM 20       /* 16 underglow LEDs, 4 top LEDs */
diff --git a/keyboards/idobao/id80/v2/info.json b/keyboards/idobao/id80/v2/info.json
index 770242c95d..0fd9def9de 100644
--- a/keyboards/idobao/id80/v2/info.json
+++ b/keyboards/idobao/id80/v2/info.json
@@ -6,6 +6,10 @@
        "vid": "0x6964",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C7",
+        "on_state": 0
+    },
    "bootmagic": {
        "matrix": [0, 5]
    },
diff --git a/keyboards/idobao/id87/v1/config.h b/keyboards/idobao/id87/v1/config.h
index 4684551dd9..eefdc2dbcc 100644
--- a/keyboards/idobao/id87/v1/config.h
+++ b/keyboards/idobao/id87/v1/config.h
@@ -42,8 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_LEVELS 3
 #endif
-#define LED_CAPS_LOCK_PIN C7
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
    #define RGBLIGHT_EFFECT_ALTERNATING
diff --git a/keyboards/idobao/id87/v1/info.json b/keyboards/idobao/id87/v1/info.json
index eeba492e84..6d96abf860 100644
--- a/keyboards/idobao/id87/v1/info.json
+++ b/keyboards/idobao/id87/v1/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0087",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C7"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["tkl_ansi"],
diff --git a/keyboards/idobao/id96/config.h b/keyboards/idobao/id96/config.h
index 3d0baa4676..e9be8711e1 100644
--- a/keyboards/idobao/id96/config.h
+++ b/keyboards/idobao/id96/config.h
@@ -30,10 +30,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
-#define LED_NUM_LOCK_PIN C6
-#define LED_CAPS_LOCK_PIN C7
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B6
 #ifdef BACKLIGHT_PIN
  #define BACKLIGHT_LEVELS 7
diff --git a/keyboards/idobao/id96/info.json b/keyboards/idobao/id96/info.json
index e2bc4ea581..2e09232dae 100644
--- a/keyboards/idobao/id96/info.json
+++ b/keyboards/idobao/id96/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0096",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C7",
+        "num_lock": "C6",
+        "on_state": 0
+    },
    "bootmagic": {
        "matrix": [5, 0]
    },
diff --git a/keyboards/illusion/rosa/config.h b/keyboards/illusion/rosa/config.h
index 03e33c4e7f..305c216369 100644
--- a/keyboards/illusion/rosa/config.h
+++ b/keyboards/illusion/rosa/config.h
@@ -28,9 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B3
-#define LED_PIN_ON_STATE 0
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/illusion/rosa/info.json b/keyboards/illusion/rosa/info.json
index adc7d51a20..bb533bfb2f 100644
--- a/keyboards/illusion/rosa/info.json
+++ b/keyboards/illusion/rosa/info.json
@@ -8,6 +8,10 @@
        "pid": "0x6952",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B3",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["60_ansi_tsangan"],
diff --git a/keyboards/ilumkb/primus75/config.h b/keyboards/ilumkb/primus75/config.h
index daedc37885..ea2cafd51a 100644
--- a/keyboards/ilumkb/primus75/config.h
+++ b/keyboards/ilumkb/primus75/config.h
@@ -27,11 +27,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B2
-#define LED_NUM_LOCK_PIN E2
-#define LED_SCROLL_LOCK_PIN F7
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B6
 #ifdef BACKLIGHT_PIN
 #define BACKLIGHT_LEVELS 5
diff --git a/keyboards/ilumkb/primus75/info.json b/keyboards/ilumkb/primus75/info.json
index 7ee6a7177a..ac5f0280a1 100644
--- a/keyboards/ilumkb/primus75/info.json
+++ b/keyboards/ilumkb/primus75/info.json
@@ -8,6 +8,12 @@
        "pid": "0x1014",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B2",
+        "num_lock": "E2",
+        "scroll_lock": "F7",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/irene/config.h b/keyboards/irene/config.h
index e58f34b2ae..15cbcb511b 100644
--- a/keyboards/irene/config.h
+++ b/keyboards/irene/config.h
@@ -38,12 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 #define RGB_DI_PIN F1
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM 23
diff --git a/keyboards/iriskeyboards/config.h b/keyboards/iriskeyboards/config.h
index 588bf93e0a..b6ba7d3a19 100644
--- a/keyboards/iriskeyboards/config.h
+++ b/keyboards/iriskeyboards/config.h
@@ -40,12 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/j80/config.h b/keyboards/j80/config.h
index 9c94cb7153..bd4ee4ca21 100644
--- a/keyboards/j80/config.h
+++ b/keyboards/j80/config.h
@@ -26,9 +26,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN D0
-#define LED_CAPS_LOCK_PIN D1
-#define LED_SCROLL_LOCK_PIN D6
 #define BACKLIGHT_LEVELS 3
 #define BACKLIGHT_PIN D4
diff --git a/keyboards/j80/info.json b/keyboards/j80/info.json
index 48553be0e0..a802143866 100644
--- a/keyboards/j80/info.json
+++ b/keyboards/j80/info.json
@@ -8,6 +8,11 @@
    "pid": "0x422D",
    "device_version": "0.0.1"
  },
+  "indicators": {
+    "caps_lock": "D1",
+    "num_lock": "D0",
+    "scroll_lock": "D6"
+  },
  "processor": "atmega32a",
  "bootloader": "bootloadhid",
  "layouts": {
diff --git a/keyboards/jacky_studio/bear_65/config.h b/keyboards/jacky_studio/bear_65/config.h
index 9b9f7b7cab..2f14c89b27 100644
--- a/keyboards/jacky_studio/bear_65/config.h
+++ b/keyboards/jacky_studio/bear_65/config.h
@@ -24,9 +24,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
-#define LED_CAPS_LOCK_PIN C7
-#define LED_PIN_ON_STATE 0
 /* number of backlight levels */
 #define BACKLIGHT_PIN B6
 #ifdef BACKLIGHT_PIN
diff --git a/keyboards/jacky_studio/bear_65/rev1/info.json b/keyboards/jacky_studio/bear_65/rev1/info.json
index e87eeb5484..82e7d33eb5 100644
--- a/keyboards/jacky_studio/bear_65/rev1/info.json
+++ b/keyboards/jacky_studio/bear_65/rev1/info.json
@@ -10,6 +10,10 @@
        "pid": "0x000A",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C7",
+        "on_state": 0
+    },
    "layouts": {
        "LAYOUT_all": {
            "layout": [
diff --git a/keyboards/jacky_studio/bear_65/rev2/info.json b/keyboards/jacky_studio/bear_65/rev2/info.json
index e3d3a31132..43200ec5d5 100644
--- a/keyboards/jacky_studio/bear_65/rev2/info.json
+++ b/keyboards/jacky_studio/bear_65/rev2/info.json
@@ -10,6 +10,10 @@
        "pid": "0x0428",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C7",
+        "on_state": 0
+    },
    "layout_aliases": {
        "LAYOUT_all": "LAYOUT_wkl_full",
        "LAYOUT_full_bs": "LAYOUT_wkl_bs"
diff --git a/keyboards/jc65/v32a/config.h b/keyboards/jc65/v32a/config.h
index 01581d1041..586ba437a0 100644
--- a/keyboards/jc65/v32a/config.h
+++ b/keyboards/jc65/v32a/config.h
@@ -25,8 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN D1
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/jc65/v32a/info.json b/keyboards/jc65/v32a/info.json
index 80c6d6d7b8..b03bb73a6e 100644
--- a/keyboards/jc65/v32a/info.json
+++ b/keyboards/jc65/v32a/info.json
@@ -8,6 +8,9 @@
    "pid": "0x5679",
    "device_version": "2.0.0"
  },
+  "indicators": {
+    "caps_lock": "D1"
+  },
  "processor": "atmega32a",
  "bootloader": "bootloadhid",
  "layouts": {
diff --git a/keyboards/jc65/v32u4/config.h b/keyboards/jc65/v32u4/config.h
index 9801abe7d1..a61742cf39 100644
--- a/keyboards/jc65/v32u4/config.h
+++ b/keyboards/jc65/v32u4/config.h
@@ -26,9 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3, F4, F5 }
-#define LED_CAPS_LOCK_PIN B2
-#define LED_PIN_ON_STATE 0
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/jc65/v32u4/info.json b/keyboards/jc65/v32u4/info.json
index 5a387a5807..76adb227c7 100644
--- a/keyboards/jc65/v32u4/info.json
+++ b/keyboards/jc65/v32u4/info.json
@@ -8,6 +8,10 @@
    "pid": "0x6060",
    "device_version": "0.0.2"
  },
+  "indicators": {
+    "caps_lock": "B2",
+    "on_state": 0
+  },
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "layouts": {
diff --git a/keyboards/jels/jels60/config.h b/keyboards/jels/jels60/config.h
index e154ea16be..66f0e3dfa0 100644
--- a/keyboards/jels/jels60/config.h
+++ b/keyboards/jels/jels60/config.h
@@ -25,9 +25,6 @@
 #define MATRIX_ROW_PINS {B3, D2, F0, F4, F1}
 #define MATRIX_COL_PINS {E6, C7, B4, D7, D6, D4, D5, D3, F5, F6, F7, C6, B6, B5}
-// Caps lock Pin
-#define LED_CAPS_LOCK_PIN B7
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/jels/jels60/info.json b/keyboards/jels/jels60/info.json
index dc2b234f16..3d3b59ca7e 100644
--- a/keyboards/jels/jels60/info.json
+++ b/keyboards/jels/jels60/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0060",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B7"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/jolofsor/denial75/config.h b/keyboards/jolofsor/denial75/config.h
index 8eb2511a49..72c3ca28ea 100644
--- a/keyboards/jolofsor/denial75/config.h
+++ b/keyboards/jolofsor/denial75/config.h
@@ -27,10 +27,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-/* Caps Lock Definition */
-#define LED_CAPS_LOCK_PIN B6
-#define LED_PIN_ON_STATE 0
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/jolofsor/denial75/info.json b/keyboards/jolofsor/denial75/info.json
index fd5dc464ea..f101a02f52 100644
--- a/keyboards/jolofsor/denial75/info.json
+++ b/keyboards/jolofsor/denial75/info.json
@@ -8,6 +8,10 @@
        "pid": "0x0001",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B6",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/kb58/config.h b/keyboards/kb58/config.h
index a3fc5f697e..e769408486 100644
--- a/keyboards/kb58/config.h
+++ b/keyboards/kb58/config.h
@@ -45,12 +45,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define SOFT_SERIAL_PIN D2  // or D0, D1, D3, E6
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/kb_elmo/67mk_e/config.h b/keyboards/kb_elmo/67mk_e/config.h
index 1da36b7259..34d18546e1 100644
--- a/keyboards/kb_elmo/67mk_e/config.h
+++ b/keyboards/kb_elmo/67mk_e/config.h
@@ -28,6 +28,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-/* Indicator LEDs */
-#define LED_CAPS_LOCK_PIN B7
diff --git a/keyboards/kb_elmo/67mk_e/info.json b/keyboards/kb_elmo/67mk_e/info.json
index 1035b0ba0b..b1a69ac79b 100644
--- a/keyboards/kb_elmo/67mk_e/info.json
+++ b/keyboards/kb_elmo/67mk_e/info.json
@@ -8,6 +8,9 @@
        "pid": "0xD03E",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B7"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_ansi_blocker_tsangan", "65_iso_blocker", "65_iso_blocker_split_bs"],
diff --git a/keyboards/kb_elmo/aek2_usb/config.h b/keyboards/kb_elmo/aek2_usb/config.h
index 415705b7e8..66de926a80 100644
--- a/keyboards/kb_elmo/aek2_usb/config.h
+++ b/keyboards/kb_elmo/aek2_usb/config.h
@@ -31,10 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN B2
-#define LED_CAPS_LOCK_PIN B1
-#define LED_SCROLL_LOCK_PIN B0
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/kb_elmo/aek2_usb/info.json b/keyboards/kb_elmo/aek2_usb/info.json
index dfce0e1c7d..457762992b 100644
--- a/keyboards/kb_elmo/aek2_usb/info.json
+++ b/keyboards/kb_elmo/aek2_usb/info.json
@@ -8,6 +8,11 @@
        "pid": "0xDB52",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B1",
+        "num_lock": "B2",
+        "scroll_lock": "B0"
+    },
    "processor": "atmega32a",
    "bootloader": "usbasploader",
    "layouts": {
diff --git a/keyboards/kb_elmo/noah_avr/config.h b/keyboards/kb_elmo/noah_avr/config.h
index 1b97cec600..5d038a9e43 100644
--- a/keyboards/kb_elmo/noah_avr/config.h
+++ b/keyboards/kb_elmo/noah_avr/config.h
@@ -29,9 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-/* Caps LED */
-#define LED_CAPS_LOCK_PIN D6
 /* RGB */
 #define RGB_DI_PIN B5
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/kb_elmo/noah_avr/info.json b/keyboards/kb_elmo/noah_avr/info.json
index 42c795888a..151eda35b4 100644
--- a/keyboards/kb_elmo/noah_avr/info.json
+++ b/keyboards/kb_elmo/noah_avr/info.json
@@ -8,6 +8,9 @@
        "pid": "0x1DB0",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "D6"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layout_aliases": {
diff --git a/keyboards/kb_elmo/qez/config.h b/keyboards/kb_elmo/qez/config.h
index 9fdc2ad825..df9475ff2d 100644
--- a/keyboards/kb_elmo/qez/config.h
+++ b/keyboards/kb_elmo/qez/config.h
@@ -28,6 +28,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-/* Indicator LEDs */
-#define LED_CAPS_LOCK_PIN C5
diff --git a/keyboards/kb_elmo/qez/info.json b/keyboards/kb_elmo/qez/info.json
index 54051e89fe..ee52b8311b 100644
--- a/keyboards/kb_elmo/qez/info.json
+++ b/keyboards/kb_elmo/qez/info.json
@@ -8,6 +8,9 @@
        "pid": "0x675F",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C5"
+    },
    "processor": "atmega32u2",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/kbdfans/baguette66/soldered/config.h b/keyboards/kbdfans/baguette66/soldered/config.h
index 909d8321c7..96a396455d 100644
--- a/keyboards/kbdfans/baguette66/soldered/config.h
+++ b/keyboards/kbdfans/baguette66/soldered/config.h
@@ -28,6 +28,3 @@
 /* disable these deprecated features by default */
 #define USB_SUSPEND_WAKEUP_DELAY 5000
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
-#define LED_CAPS_LOCK_PIN B7
-#define LED_PIN_ON_STATE 0
diff --git a/keyboards/kbdfans/baguette66/soldered/info.json b/keyboards/kbdfans/baguette66/soldered/info.json
index 03b430da04..29492bb959 100644
--- a/keyboards/kbdfans/baguette66/soldered/info.json
+++ b/keyboards/kbdfans/baguette66/soldered/info.json
@@ -7,6 +7,10 @@
        "pid": "0x0107",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B7",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/kbdfans/bounce/75/hotswap/config.h b/keyboards/kbdfans/bounce/75/hotswap/config.h
index 7476fdbcd8..284e215210 100644
--- a/keyboards/kbdfans/bounce/75/hotswap/config.h
+++ b/keyboards/kbdfans/bounce/75/hotswap/config.h
@@ -26,9 +26,6 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN C6
-#define LED_PIN_ON_STATE 0
 #define RGB_DI_PIN F0
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/kbdfans/bounce/75/hotswap/info.json b/keyboards/kbdfans/bounce/75/hotswap/info.json
index d1f6186627..fd47cfdd7f 100644
--- a/keyboards/kbdfans/bounce/75/hotswap/info.json
+++ b/keyboards/kbdfans/bounce/75/hotswap/info.json
@@ -7,6 +7,10 @@
        "pid": "0x7001",
        "device_version": "0.0.3"
    },
+    "indicators": {
+        "caps_lock": "C6",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/kbdfans/bounce/75/soldered/config.h b/keyboards/kbdfans/bounce/75/soldered/config.h
index d3dd5bf565..72d253d939 100644
--- a/keyboards/kbdfans/bounce/75/soldered/config.h
+++ b/keyboards/kbdfans/bounce/75/soldered/config.h
@@ -26,9 +26,6 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN C6
-#define LED_PIN_ON_STATE 0
 #define RGB_DI_PIN B7
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/kbdfans/bounce/75/soldered/info.json b/keyboards/kbdfans/bounce/75/soldered/info.json
index ab2ca4ba7a..e4ee498ee7 100644
--- a/keyboards/kbdfans/bounce/75/soldered/info.json
+++ b/keyboards/kbdfans/bounce/75/soldered/info.json
@@ -8,6 +8,10 @@
        "pid": "0x7000",
        "device_version": "0.0.3"
    },
+    "indicators": {
+        "caps_lock": "C6",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/kbdfans/bounce/pad/config.h b/keyboards/kbdfans/bounce/pad/config.h
index 45d77c70dc..811fe26c12 100644
--- a/keyboards/kbdfans/bounce/pad/config.h
+++ b/keyboards/kbdfans/bounce/pad/config.h
@@ -21,7 +21,6 @@
 #define MATRIX_ROW_PINS { C7, B7, B6, B0, B1, B2 }
 #define MATRIX_COL_PINS { B5, B4, D0, C2 }
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN C6
-#define LED_PIN_ON_STATE 1
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/kbdfans/bounce/pad/info.json b/keyboards/kbdfans/bounce/pad/info.json
index d431567c24..894bd0ed70 100644
--- a/keyboards/kbdfans/bounce/pad/info.json
+++ b/keyboards/kbdfans/bounce/pad/info.json
@@ -7,6 +7,9 @@
        "pid": "0x7002",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "num_lock": "C6"
+    },
    "processor": "atmega32u2",
    "bootloader": "atmel-dfu",
    "community_layouts": ["numpad_6x4"],
diff --git a/keyboards/kbdfans/kbd19x/config.h b/keyboards/kbdfans/kbd19x/config.h
index e659c74943..65e77d1942 100644
--- a/keyboards/kbdfans/kbd19x/config.h
+++ b/keyboards/kbdfans/kbd19x/config.h
@@ -38,11 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN B2
-#define LED_CAPS_LOCK_PIN B0
-#define LED_SCROLL_LOCK_PIN B1
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B6
 #ifdef BACKLIGHT_PIN
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/kbdfans/kbd19x/info.json b/keyboards/kbdfans/kbd19x/info.json
index cbf3fbfe23..f7cdb23dfa 100644
--- a/keyboards/kbdfans/kbd19x/info.json
+++ b/keyboards/kbdfans/kbd19x/info.json
@@ -8,6 +8,12 @@
        "pid": "0x0191",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B0",
+        "num_lock": "B2",
+        "scroll_lock": "B1",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/kbdfans/kbd67/rev1/config.h b/keyboards/kbdfans/kbd67/rev1/config.h
index cc2d669448..03d1f47c2c 100644
--- a/keyboards/kbdfans/kbd67/rev1/config.h
+++ b/keyboards/kbdfans/kbd67/rev1/config.h
@@ -38,9 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B2
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B6
 #ifdef BACKLIGHT_PIN
 #define BACKLIGHT_BREATHING
diff --git a/keyboards/kbdfans/kbd67/rev1/info.json b/keyboards/kbdfans/kbd67/rev1/info.json
index dec2a09e94..0c0e80ee2d 100644
--- a/keyboards/kbdfans/kbd67/rev1/info.json
+++ b/keyboards/kbdfans/kbd67/rev1/info.json
@@ -8,6 +8,10 @@
    "pid": "0x6066",
    "device_version": "0.0.1"
  },
+  "indicators": {
+    "caps_lock": "B2",
+    "on_state": 0
+  },
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "community_layouts": ["65_ansi"],
diff --git a/keyboards/kbdfans/kbd67/rev2/config.h b/keyboards/kbdfans/kbd67/rev2/config.h
index 3163ae0b99..cd533b722b 100644
--- a/keyboards/kbdfans/kbd67/rev2/config.h
+++ b/keyboards/kbdfans/kbd67/rev2/config.h
@@ -28,10 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-/* indicators */
-#define LED_CAPS_LOCK_PIN D4
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B5
 #ifdef BACKLIGHT_PIN
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/kbdfans/kbd67/rev2/info.json b/keyboards/kbdfans/kbd67/rev2/info.json
index c6da451c5a..108d462993 100644
--- a/keyboards/kbdfans/kbd67/rev2/info.json
+++ b/keyboards/kbdfans/kbd67/rev2/info.json
@@ -8,6 +8,10 @@
        "pid": "0x6067",
        "device_version": "0.0.2"
    },
+    "indicators": {
+        "caps_lock": "D4",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layout_aliases": {
diff --git a/keyboards/kbdfans/kbd6x/config.h b/keyboards/kbdfans/kbd6x/config.h
index 9dcf4a457d..34b64888c4 100644
--- a/keyboards/kbdfans/kbd6x/config.h
+++ b/keyboards/kbdfans/kbd6x/config.h
@@ -38,8 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B6
 #define BACKLIGHT_PIN B7
 #ifdef BACKLIGHT_PIN
 #define BACKLIGHT_BREATHING
diff --git a/keyboards/kbdfans/kbd6x/info.json b/keyboards/kbdfans/kbd6x/info.json
index 7ec9838d2a..7c64c7e789 100644
--- a/keyboards/kbdfans/kbd6x/info.json
+++ b/keyboards/kbdfans/kbd6x/info.json
@@ -8,6 +8,9 @@
        "pid": "0x3658",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B6"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/kbdfans/kbd75/config.h b/keyboards/kbdfans/kbd75/config.h
index 6868ac5728..1b82caba02 100644
--- a/keyboards/kbdfans/kbd75/config.h
+++ b/keyboards/kbdfans/kbd75/config.h
@@ -15,9 +15,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B2
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B6
 #ifdef BACKLIGHT_PIN
 #define BACKLIGHT_LEVELS 5
diff --git a/keyboards/kbdfans/kbd75/rev1/info.json b/keyboards/kbdfans/kbd75/rev1/info.json
index d9a14dc7a4..4193137ff2 100644
--- a/keyboards/kbdfans/kbd75/rev1/info.json
+++ b/keyboards/kbdfans/kbd75/rev1/info.json
@@ -8,6 +8,10 @@
        "pid": "0x6060",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B2",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layout_aliases": {
diff --git a/keyboards/kbdfans/kbd75/rev2/info.json b/keyboards/kbdfans/kbd75/rev2/info.json
index 4a6b902925..d76879ded0 100644
--- a/keyboards/kbdfans/kbd75/rev2/info.json
+++ b/keyboards/kbdfans/kbd75/rev2/info.json
@@ -8,6 +8,10 @@
        "pid": "0x6061",
        "device_version": "0.0.2"
    },
+    "indicators": {
+        "caps_lock": "B2",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layout_aliases": {
diff --git a/keyboards/kbdfans/kbd75hs/config.h b/keyboards/kbdfans/kbd75hs/config.h
index 11aa5d4023..4f26e61b5c 100644
--- a/keyboards/kbdfans/kbd75hs/config.h
+++ b/keyboards/kbdfans/kbd75hs/config.h
@@ -28,9 +28,6 @@
 #define FORCE_NKRO
-#define LED_CAPS_LOCK_PIN C6
-#define LED_PIN_ON_STATE 1
 #define RGB_DI_PIN F0
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/kbdfans/kbd75hs/info.json b/keyboards/kbdfans/kbd75hs/info.json
index 460dca30d1..9af7103b3b 100644
--- a/keyboards/kbdfans/kbd75hs/info.json
+++ b/keyboards/kbdfans/kbd75hs/info.json
@@ -7,6 +7,9 @@
        "pid": "0x6062",
        "device_version": "0.0.3"
    },
+    "indicators": {
+        "caps_lock": "C6"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["75_ansi"],
diff --git a/keyboards/kbdfans/kbd8x/config.h b/keyboards/kbdfans/kbd8x/config.h
index 7ae86d8781..419584b79d 100644
--- a/keyboards/kbdfans/kbd8x/config.h
+++ b/keyboards/kbdfans/kbd8x/config.h
@@ -38,10 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN B1
-#define LED_CAPS_LOCK_PIN B3
-#define LED_SCROLL_LOCK_PIN B2
 #define BACKLIGHT_PIN B6
 #ifdef BACKLIGHT_PIN
 #define BACKLIGHT_BREATHING
diff --git a/keyboards/kbdfans/kbd8x/info.json b/keyboards/kbdfans/kbd8x/info.json
index adf2f98b52..53c2c5f17a 100644
--- a/keyboards/kbdfans/kbd8x/info.json
+++ b/keyboards/kbdfans/kbd8x/info.json
@@ -8,6 +8,11 @@
    "pid": "0x0000",
    "device_version": "0.0.1"
  },
+  "indicators": {
+    "caps_lock": "B3",
+    "num_lock": "B1",
+    "scroll_lock": "B2"
+  },
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "layouts": {
diff --git a/keyboards/kbdfans/kbd8x_mk2/config.h b/keyboards/kbdfans/kbd8x_mk2/config.h
index b13e23eb00..d2b92dd29d 100644
--- a/keyboards/kbdfans/kbd8x_mk2/config.h
+++ b/keyboards/kbdfans/kbd8x_mk2/config.h
@@ -38,10 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN E6
-#define LED_SCROLL_LOCK_PIN B2
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B7
 #ifdef BACKLIGHT_PIN
 #define BACKLIGHT_BREATHING
diff --git a/keyboards/kbdfans/kbd8x_mk2/info.json b/keyboards/kbdfans/kbd8x_mk2/info.json
index 8530aaf773..236aefeb3f 100644
--- a/keyboards/kbdfans/kbd8x_mk2/info.json
+++ b/keyboards/kbdfans/kbd8x_mk2/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0005",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "E6",
+        "scroll_lock": "B2",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["tkl_ansi", "tkl_iso"],
diff --git a/keyboards/kbdfans/kbdpad/mk1/config.h b/keyboards/kbdfans/kbdpad/mk1/config.h
index 92e66f7af6..80fd5292b8 100644
--- a/keyboards/kbdfans/kbdpad/mk1/config.h
+++ b/keyboards/kbdfans/kbdpad/mk1/config.h
@@ -26,8 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN D0
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_BREATHING
diff --git a/keyboards/kbdfans/kbdpad/mk1/info.json b/keyboards/kbdfans/kbdpad/mk1/info.json
index 9e7fdb2b83..dcd35e62f2 100644
--- a/keyboards/kbdfans/kbdpad/mk1/info.json
+++ b/keyboards/kbdfans/kbdpad/mk1/info.json
@@ -8,6 +8,9 @@
        "pid": "0x422D",
        "device_version": "2.0.0"
    },
+    "indicators": {
+        "num_lock": "D0"
+    },
    "processor": "atmega32a",
    "bootloader": "bootloadhid",
    "community_layouts": ["ortho_6x4", "numpad_6x4"],
diff --git a/keyboards/kbdfans/kbdpad/mk2/config.h b/keyboards/kbdfans/kbdpad/mk2/config.h
index f4f8b2aef3..c9a2ff6173 100644
--- a/keyboards/kbdfans/kbdpad/mk2/config.h
+++ b/keyboards/kbdfans/kbdpad/mk2/config.h
@@ -38,9 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN B4
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B7
 #ifdef BACKLIGHT_PIN
 #define BACKLIGHT_BREATHING
diff --git a/keyboards/kbdfans/kbdpad/mk2/info.json b/keyboards/kbdfans/kbdpad/mk2/info.json
index 74ff3cbeaa..c82e825551 100644
--- a/keyboards/kbdfans/kbdpad/mk2/info.json
+++ b/keyboards/kbdfans/kbdpad/mk2/info.json
@@ -8,6 +8,10 @@
        "pid": "0x0006",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "num_lock": "B4",
+        "on_state": 0
+    },
    "processor": "atmega32u2",
    "bootloader": "atmel-dfu",
    "community_layouts": ["ortho_6x4"],
diff --git a/keyboards/kbdfans/odin/soldered/config.h b/keyboards/kbdfans/odin/soldered/config.h
index 78c313e313..4a65d6f23f 100644
--- a/keyboards/kbdfans/odin/soldered/config.h
+++ b/keyboards/kbdfans/odin/soldered/config.h
@@ -20,10 +20,6 @@
 #define MATRIX_ROW_PINS { A10, A9, A8, B14, B13, A2 }
 #define MATRIX_COL_PINS { A3, A4, A5, A6, A7, B0, B1, B2, B12, A15, B3, B4, B5, B6, B7, B8, C13, C14, C15, A0}
-#define LED_NUM_LOCK_PIN B9
-#define LED_CAPS_LOCK_PIN B10
-#define LED_PIN_ON_STATE 0
 #define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN B15
diff --git a/keyboards/kbdfans/odin/soldered/info.json b/keyboards/kbdfans/odin/soldered/info.json
index c806c29481..7189d537fe 100644
--- a/keyboards/kbdfans/odin/soldered/info.json
+++ b/keyboards/kbdfans/odin/soldered/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0101",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B10",
+        "num_lock": "B9",
+        "on_state": 0
+    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "debounce": 15,
diff --git a/keyboards/kbdfans/odin/v2/config.h b/keyboards/kbdfans/odin/v2/config.h
index 786ae9131b..a8956b5ffb 100644
--- a/keyboards/kbdfans/odin/v2/config.h
+++ b/keyboards/kbdfans/odin/v2/config.h
@@ -23,10 +23,6 @@
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN B9
-#define LED_CAPS_LOCK_PIN B10
-#define LED_PIN_ON_STATE 0
 #define RGB_DI_PIN B15
 #ifdef RGB_DI_PIN
diff --git a/keyboards/kbdfans/odin/v2/info.json b/keyboards/kbdfans/odin/v2/info.json
index f6644bb293..29a96330f6 100644
--- a/keyboards/kbdfans/odin/v2/info.json
+++ b/keyboards/kbdfans/odin/v2/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0101",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B10",
+        "num_lock": "B9",
+        "on_state": 0
+    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/kbdfans/phaseone/config.h b/keyboards/kbdfans/phaseone/config.h
index b660f3cac9..042db62e63 100644
--- a/keyboards/kbdfans/phaseone/config.h
+++ b/keyboards/kbdfans/phaseone/config.h
@@ -21,9 +21,7 @@
 #define MATRIX_COLS 15
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
 #define MATRIX_COL_PINS { B5, C6, C7, F7, F6, F5, F4, F1, E6, B7, D0, D1, D2, D3, D5 }
-#define LED_NUM_LOCK_PIN D7
-#define LED_CAPS_LOCK_PIN D6
-#define LED_PIN_ON_STATE 0
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/kbdfans/phaseone/info.json b/keyboards/kbdfans/phaseone/info.json
index 567f6aa68b..57cf6a1c62 100644
--- a/keyboards/kbdfans/phaseone/info.json
+++ b/keyboards/kbdfans/phaseone/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0103",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "D6",
+        "num_lock": "D7",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layout_aliases": {
diff --git a/keyboards/kbdfans/tiger80/config.h b/keyboards/kbdfans/tiger80/config.h
index 0ff1ddb711..2dbbc91a76 100644
--- a/keyboards/kbdfans/tiger80/config.h
+++ b/keyboards/kbdfans/tiger80/config.h
@@ -27,10 +27,6 @@
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
-#define LED_CAPS_LOCK_PIN C7
-#define LED_SCROLL_LOCK_PIN B2
-#define LED_PIN_ON_STATE 1
 #define RGB_DI_PIN B3
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/kbdfans/tiger80/info.json b/keyboards/kbdfans/tiger80/info.json
index 40a32fdc01..916fd1c6db 100644
--- a/keyboards/kbdfans/tiger80/info.json
+++ b/keyboards/kbdfans/tiger80/info.json
@@ -8,6 +8,10 @@
        "pid": "0x0011",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C7",
+        "scroll_lock": "B2"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layout_aliases": {
diff --git a/keyboards/keebsforall/coarse60/config.h b/keyboards/keebsforall/coarse60/config.h
index 079106f18d..8e1dce9ecb 100644
--- a/keyboards/keebsforall/coarse60/config.h
+++ b/keyboards/keebsforall/coarse60/config.h
@@ -55,12 +55,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define LED_NUM_LOCK_PIN B2
-#define LED_CAPS_LOCK_PIN B10
-#define LED_SCROLL_LOCK_PIN B11
-#define LED_PIN_ON_STATE 0
 #define ENCODERS_PAD_A { A8 }
 #define ENCODERS_PAD_B { A1 }
 #define ENCODER_RESOLUTION 2
diff --git a/keyboards/keebsforall/coarse60/info.json b/keyboards/keebsforall/coarse60/info.json
index 3f31eaf65f..29a7850fc8 100644
--- a/keyboards/keebsforall/coarse60/info.json
+++ b/keyboards/keebsforall/coarse60/info.json
@@ -8,6 +8,12 @@
        "pid": "0x5341",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B10",
+        "num_lock": "B2",
+        "scroll_lock": "B11",
+        "on_state": 0
+    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "community_layouts": ["alice", "alice_split_bs"],
diff --git a/keyboards/keyprez/bison/config.h b/keyboards/keyprez/bison/config.h
index 48b231bc69..3a4a368800 100644
--- a/keyboards/keyprez/bison/config.h
+++ b/keyboards/keyprez/bison/config.h
@@ -43,12 +43,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 #define ENCODERS_PAD_A { B6 }
 #define ENCODERS_PAD_B { B5 }
 #define ENCODERS_PAD_A_RIGHT { B5 }
diff --git a/keyboards/keyprez/unicorn/config.h b/keyboards/keyprez/unicorn/config.h
index 5705f25e28..0756b67f7c 100644
--- a/keyboards/keyprez/unicorn/config.h
+++ b/keyboards/keyprez/unicorn/config.h
@@ -32,12 +32,6 @@
 */
 #define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/keyten/kt3700/config.h b/keyboards/keyten/kt3700/config.h
index ae11d65f2c..d4ad24caf5 100644
--- a/keyboards/keyten/kt3700/config.h
+++ b/keyboards/keyten/kt3700/config.h
@@ -33,5 +33,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN B6
diff --git a/keyboards/keyten/kt3700/info.json b/keyboards/keyten/kt3700/info.json
index fe33c49fa8..0e4855e1e8 100644
--- a/keyboards/keyten/kt3700/info.json
+++ b/keyboards/keyten/kt3700/info.json
@@ -8,6 +8,9 @@
        "pid": "0x3700",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "num_lock": "B6"
+    },
    "processor": "STM32F401",
    "bootloader": "stm32-dfu",
        "layout_aliases": {
diff --git a/keyboards/kin80/blackpill103/config.h b/keyboards/kin80/blackpill103/config.h
index 052828fb83..4dd744162d 100644
--- a/keyboards/kin80/blackpill103/config.h
+++ b/keyboards/kin80/blackpill103/config.h
@@ -26,8 +26,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { B8, B9, C13, B7, B6, B5, B4 }
 #define MATRIX_COL_PINS { A6, A7, B0, B1, B10, B11, A0, A1, A2, A3, A4, A5 }
-#define LED_PIN_ON_STATE 0
-#define LED_NUM_LOCK_PIN B14
-#define LED_CAPS_LOCK_PIN B13
-#define LED_SCROLL_LOCK_PIN B15
 #define LED4_PIN A8
diff --git a/keyboards/kin80/blackpill103/info.json b/keyboards/kin80/blackpill103/info.json
index 63c9650579..c1df5ed549 100644
--- a/keyboards/kin80/blackpill103/info.json
+++ b/keyboards/kin80/blackpill103/info.json
@@ -2,6 +2,12 @@
    "usb": {
        "device_version": "0.0.2"
    },
+    "indicators": {
+        "caps_lock": "B13",
+        "num_lock": "B14",
+        "scroll_lock": "B15",
+        "on_state": 0
+    },
    "processor": "STM32F103",
    "bootloader": "stm32duino"
 }
diff --git a/keyboards/kin80/blackpill401/config.h b/keyboards/kin80/blackpill401/config.h
index 2cbca43a08..f1b9307f24 100644
--- a/keyboards/kin80/blackpill401/config.h
+++ b/keyboards/kin80/blackpill401/config.h
@@ -23,8 +23,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { A4, B12, B13, B14, B15, A8, B5 }
 #define MATRIX_COL_PINS { C14, C15, A0, A1, A2, A3, A5, A6, A7, B0, B1, B10 }
-#define LED_PIN_ON_STATE 0
-#define LED_NUM_LOCK_PIN B4
-#define LED_CAPS_LOCK_PIN C13
-#define LED_SCROLL_LOCK_PIN B3
 #define LED4_PIN A15
diff --git a/keyboards/kin80/blackpill401/info.json b/keyboards/kin80/blackpill401/info.json
index 7d4ec1294e..8098ac1a2f 100644
--- a/keyboards/kin80/blackpill401/info.json
+++ b/keyboards/kin80/blackpill401/info.json
@@ -2,6 +2,12 @@
    "usb": {
        "device_version": "0.0.3"
    },
+    "indicators": {
+        "caps_lock": "C13",
+        "num_lock": "B4",
+        "scroll_lock": "B3",
+        "on_state": 0
+    },
    "processor": "STM32F401",
    "bootloader": "stm32-dfu",
    "board": "BLACKPILL_STM32_F401"
diff --git a/keyboards/kin80/blackpill411/config.h b/keyboards/kin80/blackpill411/config.h
index 2cbca43a08..f1b9307f24 100644
--- a/keyboards/kin80/blackpill411/config.h
+++ b/keyboards/kin80/blackpill411/config.h
@@ -23,8 +23,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { A4, B12, B13, B14, B15, A8, B5 }
 #define MATRIX_COL_PINS { C14, C15, A0, A1, A2, A3, A5, A6, A7, B0, B1, B10 }
-#define LED_PIN_ON_STATE 0
-#define LED_NUM_LOCK_PIN B4
-#define LED_CAPS_LOCK_PIN C13
-#define LED_SCROLL_LOCK_PIN B3
 #define LED4_PIN A15
diff --git a/keyboards/kin80/blackpill411/info.json b/keyboards/kin80/blackpill411/info.json
index 6ad9e67e04..3ad449e464 100644
--- a/keyboards/kin80/blackpill411/info.json
+++ b/keyboards/kin80/blackpill411/info.json
@@ -2,6 +2,12 @@
    "usb": {
        "device_version": "0.0.3"
    },
+    "indicators": {
+        "caps_lock": "C13",
+        "num_lock": "B4",
+        "scroll_lock": "B3",
+        "on_state": 0
+    },
    "processor": "STM32F411",
    "bootloader": "stm32-dfu",
    "board": "BLACKPILL_STM32_F411"
diff --git a/keyboards/kin80/micro/config.h b/keyboards/kin80/micro/config.h
index 5c9369a077..c55fffe1e0 100644
--- a/keyboards/kin80/micro/config.h
+++ b/keyboards/kin80/micro/config.h
@@ -20,8 +20,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { B6, B3, B1, D6, B7, B5, D1 }
 #define MATRIX_COL_PINS { B4, E6, D7, C6, D4, D0, F7, F6, F5, F4, F1, F0 }
-#define LED_PIN_ON_STATE 0
-#define NUM_LOCK_LED_PIN D2
-#define SCROLL_LOCK_LED_PIN D3
-#define CAPS_LOCK_LED_PIN B0
 #define LED4_PIN B2
diff --git a/keyboards/kin80/micro/info.json b/keyboards/kin80/micro/info.json
index 7818e74537..173b5eff4d 100644
--- a/keyboards/kin80/micro/info.json
+++ b/keyboards/kin80/micro/info.json
@@ -2,6 +2,12 @@
    "usb": {
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B0",
+        "num_lock": "D2",
+        "scroll_lock": "D3",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "lufa-dfu"
 }
diff --git a/keyboards/kindakeyboards/conone65/config.h b/keyboards/kindakeyboards/conone65/config.h
index eeaf32a219..1f02e3148c 100644
--- a/keyboards/kindakeyboards/conone65/config.h
+++ b/keyboards/kindakeyboards/conone65/config.h
@@ -38,12 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/kinesis/kint2pp/config.h b/keyboards/kinesis/kint2pp/config.h
index 7dad99db7a..2f9473e391 100644
--- a/keyboards/kinesis/kint2pp/config.h
+++ b/keyboards/kinesis/kint2pp/config.h
@@ -21,12 +21,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN C5
-#define LED_CAPS_LOCK_PIN C1
-#define LED_SCROLL_LOCK_PIN C4
-#define LED_COMPOSE_PIN C3
-#define LED_PIN_ON_STATE 0
 #define IGNORE_MOD_TAP_INTERRUPT
 // The Teensy 2++ consumes about 60 mA of current at its full speed of 16 MHz as
diff --git a/keyboards/kinesis/kint2pp/info.json b/keyboards/kinesis/kint2pp/info.json
index e31d3490a0..9619fe05b6 100644
--- a/keyboards/kinesis/kint2pp/info.json
+++ b/keyboards/kinesis/kint2pp/info.json
@@ -6,6 +6,13 @@
        "pid": "0x6060",
        "device_version": "0.0.2"
    },
+    "indicators": {
+        "caps_lock": "C1",
+        "num_lock": "C5",
+        "scroll_lock": "C4",
+        "compose": "C3",
+        "on_state": 0
+    },
    "processor": "at90usb1286",
    "bootloader": "halfkay",
    "debounce": 20
diff --git a/keyboards/kinesis/kint36/config.h b/keyboards/kinesis/kint36/config.h
index 76d3ff31ae..8553ed4912 100644
--- a/keyboards/kinesis/kint36/config.h
+++ b/keyboards/kinesis/kint36/config.h
@@ -43,10 +43,4 @@
 // https://forum.pjrc.com/threads/47256-What-is-the-power-consumption-of-the-Teensy-3-6
 #define USB_MAX_POWER_CONSUMPTION 100
-#define LED_PIN_ON_STATE 0
-#define LED_NUM_LOCK_PIN A14
-#define LED_CAPS_LOCK_PIN C7
-#define LED_SCROLL_LOCK_PIN A5
-#define LED_COMPOSE_PIN E26
 #define EEPROM_SIZE 4096
diff --git a/keyboards/kinesis/kint36/info.json b/keyboards/kinesis/kint36/info.json
index fca353504f..8224abbe98 100644
--- a/keyboards/kinesis/kint36/info.json
+++ b/keyboards/kinesis/kint36/info.json
@@ -6,6 +6,13 @@
        "pid": "0x345C",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C7",
+        "num_lock": "A14",
+        "scroll_lock": "A5",
+        "compose": "E26",
+        "on_state": 0
+    },
    "processor": "MK66FX1M0",
    "bootloader": "halfkay",
    "debounce": 20
diff --git a/keyboards/kinesis/kint41/config.h b/keyboards/kinesis/kint41/config.h
index 7050eadd41..7d7ea630fc 100644
--- a/keyboards/kinesis/kint41/config.h
+++ b/keyboards/kinesis/kint41/config.h
@@ -77,9 +77,3 @@
 // in clock cycles
 #define GPIO_INPUT_PIN_DELAY 0
-#define LED_PIN_ON_STATE 0
-#define LED_NUM_LOCK_PIN LINE_PIN26
-#define LED_CAPS_LOCK_PIN LINE_PIN12
-#define LED_SCROLL_LOCK_PIN LINE_PIN25
-#define LED_COMPOSE_PIN LINE_PIN24
diff --git a/keyboards/kinesis/kint41/info.json b/keyboards/kinesis/kint41/info.json
index 70ee14bad3..716275ad3a 100644
--- a/keyboards/kinesis/kint41/info.json
+++ b/keyboards/kinesis/kint41/info.json
@@ -6,5 +6,12 @@
        "pid": "0x345C",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "LINE_PIN12",
+        "num_lock": "LINE_PIN26",
+        "scroll_lock": "LINE_PIN25",
+        "compose": "LINE_PIN24",
+        "on_state": 0
+    },
    "debounce": 20
 }
diff --git a/keyboards/kinesis/kintlc/config.h b/keyboards/kinesis/kintlc/config.h
index 537cb399d8..d36555ce4a 100644
--- a/keyboards/kinesis/kintlc/config.h
+++ b/keyboards/kinesis/kintlc/config.h
@@ -78,17 +78,3 @@
 // in clock cycles
 #define GPIO_INPUT_PIN_DELAY 0
-// The default "1" results in LEDs being on when they should be off and
-// the other way around.
-#define LED_PIN_ON_STATE 0
-// Discussion about which Teensy LC pins can be used for driving staus LEDs:
-//   https://github.com/kinx-project/kint/issues/55
-// Discussion about using Neopixel LEDs:
-//   https://github.com/kinx-project/kint/issues/32
-// Available pins can be seen in:
-//   /lib/chibios-contrib/os/hal/boards/PJRC_TEENSY_LC/board.h
-#define LED_CAPS_LOCK_PIN LINE_PIN12
-#define LED_SCROLL_LOCK_PIN LINE_PIN25
-#define LED_COMPOSE_PIN LINE_PIN24
diff --git a/keyboards/kinesis/kintlc/info.json b/keyboards/kinesis/kintlc/info.json
index d05b01ec09..7309fc778f 100644
--- a/keyboards/kinesis/kintlc/info.json
+++ b/keyboards/kinesis/kintlc/info.json
@@ -6,6 +6,12 @@
        "pid": "0x345C",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "LINE_PIN12",
+        "scroll_lock": "LINE_PIN25",
+        "compose": "LINE_PIN24",
+        "on_state": 0
+    },
    "processor": "MKL26Z64",
    "bootloader": "halfkay",
    "debounce": 20
diff --git a/keyboards/kinesis/nguyenvietyen/config.h b/keyboards/kinesis/nguyenvietyen/config.h
index 399d10e81d..c6798eb951 100644
--- a/keyboards/kinesis/nguyenvietyen/config.h
+++ b/keyboards/kinesis/nguyenvietyen/config.h
@@ -20,9 +20,3 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN D4
-#define LED_CAPS_LOCK_PIN E6
-#define LED_SCROLL_LOCK_PIN C6
-#define LED_COMPOSE_PIN D7
-#define LED_PIN_ON_STATE 0
diff --git a/keyboards/kinesis/nguyenvietyen/info.json b/keyboards/kinesis/nguyenvietyen/info.json
index 7a48682684..1cbb042b83 100644
--- a/keyboards/kinesis/nguyenvietyen/info.json
+++ b/keyboards/kinesis/nguyenvietyen/info.json
@@ -6,6 +6,13 @@
        "pid": "0x6060",
        "device_version": "0.0.3"
    },
+    "indicators": {
+        "caps_lock": "E6",
+        "num_lock": "D4",
+        "scroll_lock": "C6",
+        "compose": "D7",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "caterina"
 }
diff --git a/keyboards/kinesis/stapelberg/config.h b/keyboards/kinesis/stapelberg/config.h
index 01108b8e89..0e1e6bcbee 100644
--- a/keyboards/kinesis/stapelberg/config.h
+++ b/keyboards/kinesis/stapelberg/config.h
@@ -22,12 +22,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN F2
-#define LED_CAPS_LOCK_PIN F3
-#define LED_SCROLL_LOCK_PIN F1
-#define LED_COMPOSE_PIN F0
-#define LED_PIN_ON_STATE 0
 /* don't know if this should be defined at the board or top level. Assuming board 
 #define MOUSEKEY_DELAY          100
 #define MOUSEKEY_INTERVAL       20
diff --git a/keyboards/kinesis/stapelberg/info.json b/keyboards/kinesis/stapelberg/info.json
index ba14567443..37f05a49f4 100644
--- a/keyboards/kinesis/stapelberg/info.json
+++ b/keyboards/kinesis/stapelberg/info.json
@@ -6,6 +6,13 @@
        "pid": "0x6060",
        "device_version": "0.0.2"
    },
+    "indicators": {
+        "caps_lock": "F3",
+        "num_lock": "F2",
+        "scroll_lock": "F1",
+        "compose": "F0",
+        "on_state": 0
+    },
    "processor": "at90usb1286",
    "bootloader": "halfkay"
 }
diff --git a/keyboards/kira80/config.h b/keyboards/kira80/config.h
index be36ac2a82..eb9bcb29a2 100644
--- a/keyboards/kira80/config.h
+++ b/keyboards/kira80/config.h
@@ -28,9 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN D1
-#define LED_SCROLL_LOCK_PIN D6
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_BREATHING
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/kira80/info.json b/keyboards/kira80/info.json
index 1ed50c668a..47cf842b3d 100644
--- a/keyboards/kira80/info.json
+++ b/keyboards/kira80/info.json
@@ -8,6 +8,10 @@
        "pid": "0xC583",
        "device_version": "1.0.2"
    },
+    "indicators": {
+        "caps_lock": "D1",
+        "scroll_lock": "D6"
+    },
    "processor": "atmega32a",
    "bootloader": "bootloadhid",
    "layouts": {
diff --git a/keyboards/kiwikey/wanderland/config.h b/keyboards/kiwikey/wanderland/config.h
index 0aaf536bc7..200c701787 100644
--- a/keyboards/kiwikey/wanderland/config.h
+++ b/keyboards/kiwikey/wanderland/config.h
@@ -38,11 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-/* Indicator LEDs Assignments */
-#define LED_NUM_LOCK_PIN C6
-#define LED_CAPS_LOCK_PIN B6
-#define LED_SCROLL_LOCK_PIN B5
 #define BACKLIGHT_PIN B7
 #define BACKLIGHT_LEVELS 3
 #define BACKLIGHT_BREATHING
diff --git a/keyboards/kiwikey/wanderland/info.json b/keyboards/kiwikey/wanderland/info.json
index 92346d4f56..1dfe8fa415 100644
--- a/keyboards/kiwikey/wanderland/info.json
+++ b/keyboards/kiwikey/wanderland/info.json
@@ -8,6 +8,11 @@
        "pid": "0x574C",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B6",
+        "num_lock": "C6",
+        "scroll_lock": "B5"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/kmac/config.h b/keyboards/kmac/config.h
index 5db54daf43..bc647193ca 100644
--- a/keyboards/kmac/config.h
+++ b/keyboards/kmac/config.h
@@ -35,10 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 //#define DIODE_DIRECTION
-#define LED_CAPS_LOCK_PIN B0
-#define LED_SCROLL_LOCK_PIN E6
-#define LED_PIN_ON_STATE 0
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/kmac/info.json b/keyboards/kmac/info.json
index b8e5497e28..e22708713a 100644
--- a/keyboards/kmac/info.json
+++ b/keyboards/kmac/info.json
@@ -7,6 +7,11 @@
    "pid": "0x4143",
    "device_version": "1.0.4"
  },
+  "indicators": {
+    "caps_lock": "B0",
+    "scroll_lock": "E6",
+    "on_state": 0
+  },
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "community_layouts": ["tkl_ansi"],
diff --git a/keyboards/kmac_pad/config.h b/keyboards/kmac_pad/config.h
index a2414a6abb..aaffc6c987 100644
--- a/keyboards/kmac_pad/config.h
+++ b/keyboards/kmac_pad/config.h
@@ -33,10 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 // #define DIODE_DIRECTION COL2ROW
-// #define LED_CAPS_LOCK_PIN B0
-// #define LED_SCROLL_LOCK_PIN E6
-// #define LED_PIN_ON_STATE 0
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/kopibeng/mnk65/config.h b/keyboards/kopibeng/mnk65/config.h
index fce9cee122..be3be08c1d 100644
--- a/keyboards/kopibeng/mnk65/config.h
+++ b/keyboards/kopibeng/mnk65/config.h
@@ -35,8 +35,6 @@
 #define MATRIX_ROW_PINS { B3, D0, F6, F4, F1 }
 #define MATRIX_COL_PINS { B7, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, F5 }
-#define LED_CAPS_LOCK_PIN F0
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kopibeng/mnk65/info.json b/keyboards/kopibeng/mnk65/info.json
index df261b8951..173537922b 100644
--- a/keyboards/kopibeng/mnk65/info.json
+++ b/keyboards/kopibeng/mnk65/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0651",
        "device_version": "1.0.0"
    },
+    "indicators": {
+        "caps_lock": "F0"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/kopibeng/mnk65_stm32/config.h b/keyboards/kopibeng/mnk65_stm32/config.h
index 2fbf5a9e69..d4c42e57ee 100644
--- a/keyboards/kopibeng/mnk65_stm32/config.h
+++ b/keyboards/kopibeng/mnk65_stm32/config.h
@@ -35,8 +35,6 @@
 #define MATRIX_ROW_PINS { A10, B9, A1, B11, A3 }
 #define MATRIX_COL_PINS { A9, B8, F0, C15, C14, C13, B10, B2, B1, B0, A7, A6, A5, A4, A2 }
-#define LED_CAPS_LOCK_PIN A8
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kopibeng/mnk65_stm32/info.json b/keyboards/kopibeng/mnk65_stm32/info.json
index 77ace62e36..9959b7f3dd 100644
--- a/keyboards/kopibeng/mnk65_stm32/info.json
+++ b/keyboards/kopibeng/mnk65_stm32/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0652",
        "device_version": "1.0.0"
    },
+    "indicators": {
+        "caps_lock": "A8"
+    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/kopibeng/mnk88/config.h b/keyboards/kopibeng/mnk88/config.h
index 0641928a52..bcb24b3c10 100644
--- a/keyboards/kopibeng/mnk88/config.h
+++ b/keyboards/kopibeng/mnk88/config.h
@@ -37,9 +37,6 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B3
-#define LED_SCROLL_LOCK_PIN A15
 #define RGB_DI_PIN A10
 #ifdef RGB_DI_PIN
    #define RGBLED_NUM 20
diff --git a/keyboards/kopibeng/mnk88/info.json b/keyboards/kopibeng/mnk88/info.json
index d8cc599891..813767a89a 100644
--- a/keyboards/kopibeng/mnk88/info.json
+++ b/keyboards/kopibeng/mnk88/info.json
@@ -8,6 +8,10 @@
        "pid": "0x8800",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B3",
+        "scroll_lock": "A15"
+    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "community_layouts": ["tkl_f13_ansi", "tkl_f13_ansi_tsangan", "tkl_f13_iso", "tkl_f13_iso_tsangan"],
diff --git a/keyboards/kopibeng/typ65/config.h b/keyboards/kopibeng/typ65/config.h
index e9eac78bf1..082a56caac 100644
--- a/keyboards/kopibeng/typ65/config.h
+++ b/keyboards/kopibeng/typ65/config.h
@@ -34,7 +34,6 @@
 #define MATRIX_ROW_PINS { D0, D1, D2, F6, B0 }
 #define MATRIX_COL_PINS { D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F5, F4, F1, F0, E6 }
-#define LED_CAPS_LOCK_PIN B1
 #define INDICATOR_0 B2
 #define INDICATOR_1 B7
 #define INDICATOR_2 B3
diff --git a/keyboards/kopibeng/typ65/info.json b/keyboards/kopibeng/typ65/info.json
index c70704af27..258acfee65 100644
--- a/keyboards/kopibeng/typ65/info.json
+++ b/keyboards/kopibeng/typ65/info.json
@@ -8,6 +8,9 @@
        "pid": "0x065E",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B1"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layout_aliases": {
diff --git a/keyboards/kopibeng/xt60/config.h b/keyboards/kopibeng/xt60/config.h
index 605808ea03..dde02894c2 100644
--- a/keyboards/kopibeng/xt60/config.h
+++ b/keyboards/kopibeng/xt60/config.h
@@ -34,8 +34,6 @@
 #define MATRIX_ROW_PINS { F7, F4, D0, B3, B7 }
 #define MATRIX_COL_PINS { C7, F5, F1, F0, C6, B6, B5, B4, D7, D6, D5, D3, D2, D1 }
-#define LED_CAPS_LOCK_PIN D4
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kopibeng/xt60/info.json b/keyboards/kopibeng/xt60/info.json
index 7334cf1276..62da3ebf2f 100644
--- a/keyboards/kopibeng/xt60/info.json
+++ b/keyboards/kopibeng/xt60/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0600",
        "device_version": "0.0.2"
    },
+    "indicators": {
+        "caps_lock": "D4"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/kopibeng/xt60_singa/config.h b/keyboards/kopibeng/xt60_singa/config.h
index 605808ea03..dde02894c2 100644
--- a/keyboards/kopibeng/xt60_singa/config.h
+++ b/keyboards/kopibeng/xt60_singa/config.h
@@ -34,8 +34,6 @@
 #define MATRIX_ROW_PINS { F7, F4, D0, B3, B7 }
 #define MATRIX_COL_PINS { C7, F5, F1, F0, C6, B6, B5, B4, D7, D6, D5, D3, D2, D1 }
-#define LED_CAPS_LOCK_PIN D4
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kopibeng/xt60_singa/info.json b/keyboards/kopibeng/xt60_singa/info.json
index 9d46fe49da..9b156ebbf5 100644
--- a/keyboards/kopibeng/xt60_singa/info.json
+++ b/keyboards/kopibeng/xt60_singa/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0601",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "D4"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/kopibeng/xt8x/config.h b/keyboards/kopibeng/xt8x/config.h
index 34aec8f8ca..50a0ac9833 100644
--- a/keyboards/kopibeng/xt8x/config.h
+++ b/keyboards/kopibeng/xt8x/config.h
@@ -37,8 +37,6 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B3
-#define LED_SCROLL_LOCK_PIN A15
 #define INDICATOR_PIN_0 B13
 #define RGB_DI_PIN A10
diff --git a/keyboards/kopibeng/xt8x/info.json b/keyboards/kopibeng/xt8x/info.json
index efda8a48ef..61c8edb509 100644
--- a/keyboards/kopibeng/xt8x/info.json
+++ b/keyboards/kopibeng/xt8x/info.json
@@ -8,6 +8,10 @@
        "pid": "0x8788",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B3",
+        "scroll_lock": "A15"
+    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/kprepublic/bm80hsrgb/config.h b/keyboards/kprepublic/bm80hsrgb/config.h
index e5139791fb..4e2984f31d 100644
--- a/keyboards/kprepublic/bm80hsrgb/config.h
+++ b/keyboards/kprepublic/bm80hsrgb/config.h
@@ -38,13 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN E6
-#define LED_PIN_ON_STATE 0
 #define RGB_DI_PIN E2
 // The number of LEDs connected
 #define RGB_MATRIX_LED_COUNT 87
diff --git a/keyboards/kprepublic/bm80hsrgb/info.json b/keyboards/kprepublic/bm80hsrgb/info.json
index 2e025c1f92..1cd8c7cc87 100644
--- a/keyboards/kprepublic/bm80hsrgb/info.json
+++ b/keyboards/kprepublic/bm80hsrgb/info.json
@@ -8,6 +8,10 @@
        "pid": "0xEF83",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "E6",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["tkl_ansi"],
diff --git a/keyboards/kprepublic/bm980hsrgb/config.h b/keyboards/kprepublic/bm980hsrgb/config.h
index 030d504a50..8c951e6683 100644
--- a/keyboards/kprepublic/bm980hsrgb/config.h
+++ b/keyboards/kprepublic/bm980hsrgb/config.h
@@ -38,16 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN C6
-#define LED_CAPS_LOCK_PIN C7
-#define LED_SCROLL_LOCK_PIN E2
-#define LED_PIN_ON_STATE 0
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 #define RGB_DI_PIN B0
 // The number of LEDs connected
diff --git a/keyboards/kprepublic/bm980hsrgb/info.json b/keyboards/kprepublic/bm980hsrgb/info.json
index c7dde26d23..cae17f2ce4 100644
--- a/keyboards/kprepublic/bm980hsrgb/info.json
+++ b/keyboards/kprepublic/bm980hsrgb/info.json
@@ -8,6 +8,12 @@
        "pid": "0xEF61",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C7",
+        "num_lock": "C6",
+        "scroll_lock": "E2",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/kprepublic/cospad/config.h b/keyboards/kprepublic/cospad/config.h
index ffa6a30354..9b2957d620 100644
--- a/keyboards/kprepublic/cospad/config.h
+++ b/keyboards/kprepublic/cospad/config.h
@@ -38,9 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN B2
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN F7
 #define BACKLIGHT_LEVELS 3
 #define BACKLIGHT_ON_STATE 0
diff --git a/keyboards/kprepublic/cospad/info.json b/keyboards/kprepublic/cospad/info.json
index 92eb7c0ae9..805f697743 100644
--- a/keyboards/kprepublic/cospad/info.json
+++ b/keyboards/kprepublic/cospad/info.json
@@ -8,6 +8,10 @@
        "pid": "0xB1E5",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "num_lock": "B2",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["numpad_6x4", "ortho_6x4"],
diff --git a/keyboards/ktec/daisy/config.h b/keyboards/ktec/daisy/config.h
index db86f3b508..80ce9d64e0 100644
--- a/keyboards/ktec/daisy/config.h
+++ b/keyboards/ktec/daisy/config.h
@@ -38,9 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN C6
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN D0
 #define BACKLIGHT_LEVELS 6
diff --git a/keyboards/ktec/daisy/info.json b/keyboards/ktec/daisy/info.json
index 832f5021f1..50c5dd78b0 100644
--- a/keyboards/ktec/daisy/info.json
+++ b/keyboards/ktec/daisy/info.json
@@ -8,6 +8,10 @@
        "pid": "0xD7DC",
        "device_version": "5.0.1"
    },
+    "indicators": {
+        "caps_lock": "C6",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/lazydesigners/dimple/staggered/rev1/config.h b/keyboards/lazydesigners/dimple/staggered/rev1/config.h
deleted file mode 100644
index b62f3c4195..0000000000
--- a/keyboards/lazydesigners/dimple/staggered/rev1/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2021 LAZYDESIGNERS
- *
- * 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
-#define LED_CAPS_LOCK_PIN E6
-#define LED_PIN_ON_STATE 0
diff --git a/keyboards/lazydesigners/dimple/staggered/rev1/info.json b/keyboards/lazydesigners/dimple/staggered/rev1/info.json
index 7fe8c59ccb..ed2219805a 100644
--- a/keyboards/lazydesigners/dimple/staggered/rev1/info.json
+++ b/keyboards/lazydesigners/dimple/staggered/rev1/info.json
@@ -1,4 +1,8 @@
 {
+    "indicators": {
+        "caps_lock": "E6",
+        "on_state": 0
+    },
    "layouts": {
        "LAYOUT": {
            "layout": [
diff --git a/keyboards/linworks/dolice/config.h b/keyboards/linworks/dolice/config.h
index 495b6d72aa..a4485d4727 100644
--- a/keyboards/linworks/dolice/config.h
+++ b/keyboards/linworks/dolice/config.h
@@ -32,9 +32,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PIN B5 // Timer 1 on mega32u4
 #define BACKLIGHT_BREATHING
 #define BACKLIGHT_ON_STATE 1
-/* Indicator LEDs */
-#define LED_NUM_LOCK_PIN B6
-#define LED_CAPS_LOCK_PIN C7
-#define LED_SCROLL_LOCK_PIN C6
-#define LED_PIN_ON_STATE 0
-\ No newline at end of file
diff --git a/keyboards/linworks/dolice/info.json b/keyboards/linworks/dolice/info.json
index be1decf4f5..649dc85d02 100644
--- a/keyboards/linworks/dolice/info.json
+++ b/keyboards/linworks/dolice/info.json
@@ -7,6 +7,12 @@
      "pid": "0x0005",
      "device_version": "0.0.1"
    },
+    "indicators": {
+      "caps_lock": "C7",
+      "num_lock": "B6",
+      "scroll_lock": "C6",
+      "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/linworks/fave104/config.h b/keyboards/linworks/fave104/config.h
index 80d6f7ade6..464396ae19 100644
--- a/keyboards/linworks/fave104/config.h
+++ b/keyboards/linworks/fave104/config.h
@@ -25,11 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { B11, B10, B2,  B1,  B0, A7, A6,  A5,  A4,  A3,  A2, A0 }
 #define MATRIX_COL_PINS { B12, B13, B14, B15, A8, A9, A10, A13, A14, A15, B3     }
-#define LED_NUM_LOCK_PIN B6
-#define LED_CAPS_LOCK_PIN B5
-#define LED_SCROLL_LOCK_PIN B4
-#define LED_PIN_ON_STATE 0
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/linworks/fave104/info.json b/keyboards/linworks/fave104/info.json
index 8e64093fa4..0eeda7d97d 100644
--- a/keyboards/linworks/fave104/info.json
+++ b/keyboards/linworks/fave104/info.json
@@ -8,6 +8,12 @@
        "pid": "0x000A",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B5",
+        "num_lock": "B6",
+        "scroll_lock": "B4",
+        "on_state": 0
+    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/linworks/whale75/config.h b/keyboards/linworks/whale75/config.h
index 7243a2a280..80eebcd301 100644
--- a/keyboards/linworks/whale75/config.h
+++ b/keyboards/linworks/whale75/config.h
@@ -28,11 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN A8
-#define LED_CAPS_LOCK_PIN A9
-#define LED_SCROLL_LOCK_PIN A13
-#define LED_PIN_ON_STATE 0
 /* Backlight */
 #define BACKLIGHT_PIN A10
 #define BACKLIGHT_BREATHING
diff --git a/keyboards/linworks/whale75/info.json b/keyboards/linworks/whale75/info.json
index 30d9352f73..7de9e12764 100644
--- a/keyboards/linworks/whale75/info.json
+++ b/keyboards/linworks/whale75/info.json
@@ -7,6 +7,12 @@
        "pid": "0x0001",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "A9",
+        "num_lock": "A8",
+        "scroll_lock": "A13",
+        "on_state": 0
+    },
    "processor": "STM32F303",
    "bootloader": "stm32-dfu",
    "board": "QMK_PROTON_C",
diff --git a/keyboards/lizard_trick/tenkey_plusplus/config.h b/keyboards/lizard_trick/tenkey_plusplus/config.h
index 8cb90474f5..15268a9207 100644
--- a/keyboards/lizard_trick/tenkey_plusplus/config.h
+++ b/keyboards/lizard_trick/tenkey_plusplus/config.h
@@ -44,12 +44,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/lm_keyboard/lm60n/config.h b/keyboards/lm_keyboard/lm60n/config.h
index 616dc9a955..74f2cb6365 100644
--- a/keyboards/lm_keyboard/lm60n/config.h
+++ b/keyboards/lm_keyboard/lm60n/config.h
@@ -38,12 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN B7
-#define LED_CAPS_LOCK_PIN C7
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4s
 #define RGB_DI_PIN B0
 #ifdef RGB_DI_PIN
    #define RGBLED_NUM 41
diff --git a/keyboards/lm_keyboard/lm60n/info.json b/keyboards/lm_keyboard/lm60n/info.json
index c999616117..cfbce23c2e 100644
--- a/keyboards/lm_keyboard/lm60n/info.json
+++ b/keyboards/lm_keyboard/lm60n/info.json
@@ -8,6 +8,10 @@
        "pid": "0x4B01",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C7",
+        "num_lock": "B7"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/loki65/config.h b/keyboards/loki65/config.h
index 6fecc6a9a0..d84f9c495a 100644
--- a/keyboards/loki65/config.h
+++ b/keyboards/loki65/config.h
@@ -31,10 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
-/* Indicator LEDs */
-#define LED_CAPS_LOCK_PIN B6
-#define LED_PIN_ON_STATE 0
 /* RGB Light */
 #define WS2812_PWM_DRIVER PWMD1
 #define WS2812_PWM_CHANNEL 2
diff --git a/keyboards/loki65/info.json b/keyboards/loki65/info.json
index 66e908268c..f2639713a5 100644
--- a/keyboards/loki65/info.json
+++ b/keyboards/loki65/info.json
@@ -8,6 +8,10 @@
        "pid": "0x4C36",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B6",
+        "on_state": 0
+    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/lucid/alexa/config.h b/keyboards/lucid/alexa/config.h
index 8aba7bc462..b6dd61f1ad 100644
--- a/keyboards/lucid/alexa/config.h
+++ b/keyboards/lucid/alexa/config.h
@@ -45,9 +45,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-/* Define Indicator LED's */
-#define LED_CAPS_LOCK_PIN C7
 /* Define less important options */
 /*
diff --git a/keyboards/lucid/alexa/info.json b/keyboards/lucid/alexa/info.json
index 256bf2821a..72ebafad5b 100644
--- a/keyboards/lucid/alexa/info.json
+++ b/keyboards/lucid/alexa/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0005",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C7"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs"],
diff --git a/keyboards/lucid/alexa_solder/config.h b/keyboards/lucid/alexa_solder/config.h
index 23b8b4428e..5ec47879d4 100644
--- a/keyboards/lucid/alexa_solder/config.h
+++ b/keyboards/lucid/alexa_solder/config.h
@@ -45,9 +45,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-/* Define Indicator LED's */
-#define LED_CAPS_LOCK_PIN C7
 /* Define less important options */
 /*
diff --git a/keyboards/lucid/alexa_solder/info.json b/keyboards/lucid/alexa_solder/info.json
index 1d527d4469..849a681179 100644
--- a/keyboards/lucid/alexa_solder/info.json
+++ b/keyboards/lucid/alexa_solder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0006",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C7"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/lucid/kbd8x_hs/config.h b/keyboards/lucid/kbd8x_hs/config.h
index 1d7b40e970..855df44e82 100644
--- a/keyboards/lucid/kbd8x_hs/config.h
+++ b/keyboards/lucid/kbd8x_hs/config.h
@@ -45,9 +45,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-/* Define Indicator LED's */
-#define LED_CAPS_LOCK_PIN B7
 /* Define less important options */
 /*
diff --git a/keyboards/lucid/kbd8x_hs/info.json b/keyboards/lucid/kbd8x_hs/info.json
index f154991732..70c22a5dd2 100644
--- a/keyboards/lucid/kbd8x_hs/info.json
+++ b/keyboards/lucid/kbd8x_hs/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0003",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B7"
+    },
    "processor": "at90usb646",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/lucid/phantom_hs/config.h b/keyboards/lucid/phantom_hs/config.h
index 237ab66225..c77adb42fc 100644
--- a/keyboards/lucid/phantom_hs/config.h
+++ b/keyboards/lucid/phantom_hs/config.h
@@ -45,9 +45,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-/* Define Indicator LED's */
-#define LED_CAPS_LOCK_PIN C7
 /* Define less important options */
 /*
diff --git a/keyboards/lucid/phantom_hs/info.json b/keyboards/lucid/phantom_hs/info.json
index cff92a3b8e..569f05d414 100644
--- a/keyboards/lucid/phantom_hs/info.json
+++ b/keyboards/lucid/phantom_hs/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0001",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C7"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["65_ansi_blocker"],
diff --git a/keyboards/lucid/phantom_solder/config.h b/keyboards/lucid/phantom_solder/config.h
index c3681ace49..539ce2bb33 100644
--- a/keyboards/lucid/phantom_solder/config.h
+++ b/keyboards/lucid/phantom_solder/config.h
@@ -45,9 +45,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-/* Define Indicator LED's */
-#define LED_CAPS_LOCK_PIN C7
 /* Define less important options */
 /*
diff --git a/keyboards/lucid/phantom_solder/info.json b/keyboards/lucid/phantom_solder/info.json
index 4bd9a953a8..15cf74a8eb 100644
--- a/keyboards/lucid/phantom_solder/info.json
+++ b/keyboards/lucid/phantom_solder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0002",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C7"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/lz/erghost/config.h b/keyboards/lz/erghost/config.h
index 1bd17f3e18..0588729344 100644
--- a/keyboards/lz/erghost/config.h
+++ b/keyboards/lz/erghost/config.h
@@ -37,11 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
-#define LED_NUM_LOCK_PIN D7
-#define LED_CAPS_LOCK_PIN D6
-#define LED_SCROLL_LOCK_PIN B4
-#define LED_PIN_ON_STATE 1
 #define BACKLIGHT_PIN B6
 #define BACKLIGHT_LEVELS 3
 #define BACKLIGHT_BREATHING
diff --git a/keyboards/lz/erghost/info.json b/keyboards/lz/erghost/info.json
index db5130b4fb..f5ab6490b9 100644
--- a/keyboards/lz/erghost/info.json
+++ b/keyboards/lz/erghost/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0002",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "D6",
+        "num_lock": "D7",
+        "scroll_lock": "B4"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/machine_industries/m4_a/config.h b/keyboards/machine_industries/m4_a/config.h
index 2e8c30c878..a8eee7a2b4 100644
--- a/keyboards/machine_industries/m4_a/config.h
+++ b/keyboards/machine_industries/m4_a/config.h
@@ -24,12 +24,6 @@
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION ROW2COL
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/matrix/falcon/config.h b/keyboards/matrix/falcon/config.h
index 79eb536d14..8e572338d6 100644
--- a/keyboards/matrix/falcon/config.h
+++ b/keyboards/matrix/falcon/config.h
@@ -54,7 +54,6 @@
 #define RGBLIGHT_VAL_STEP 8
 //pin setting
-#define LED_CAPS_LOCK_PIN E2
 #define LED_POWER_PIN       D5
 #define CHG_EN_PIN          E6
 #define BATTERY_LEVEL_PIN   F0
diff --git a/keyboards/matrix/falcon/info.json b/keyboards/matrix/falcon/info.json
index b5f58bc26c..e52ffa1c74 100644
--- a/keyboards/matrix/falcon/info.json
+++ b/keyboards/matrix/falcon/info.json
@@ -8,6 +8,9 @@
        "pid": "0x474E",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "E2"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["60_hhkb"],
diff --git a/keyboards/matrix/m12og/rev1/config.h b/keyboards/matrix/m12og/rev1/config.h
index cf109f852e..7388b0ccd8 100644
--- a/keyboards/matrix/m12og/rev1/config.h
+++ b/keyboards/matrix/m12og/rev1/config.h
@@ -30,10 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-/* Status LEDs */
-#define LED_CAPS_LOCK_PIN B6
-#define LED_SCROLL_LOCK_PIN B5
 /* RGB */
 #define RGB_DI_PIN B8
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/matrix/m12og/rev1/info.json b/keyboards/matrix/m12og/rev1/info.json
index 3406beab76..434b28fbf2 100644
--- a/keyboards/matrix/m12og/rev1/info.json
+++ b/keyboards/matrix/m12og/rev1/info.json
@@ -8,6 +8,10 @@
        "pid": "0x0369",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B6",
+        "scroll_lock": "B5"
+    },
    "layouts": {
        "LAYOUT_all": {
            "layout": [
diff --git a/keyboards/matrix/me/config.h b/keyboards/matrix/me/config.h
index 7291a6dcbc..3bc1753d64 100644
--- a/keyboards/matrix/me/config.h
+++ b/keyboards/matrix/me/config.h
@@ -50,7 +50,3 @@
 #define RGBLIGHT_HUE_STEP   8
 #define RGBLIGHT_SAT_STEP   8
 #define RGBLIGHT_VAL_STEP   8
-// led pins
-#define LED_CAPS_LOCK_PIN   E6
-#define LED_SCROLL_LOCK_PIN D2
diff --git a/keyboards/matrix/me/info.json b/keyboards/matrix/me/info.json
index e99f6f4146..cfe0ad22d4 100644
--- a/keyboards/matrix/me/info.json
+++ b/keyboards/matrix/me/info.json
@@ -8,6 +8,10 @@
    "pid": "0x454D",
    "device_version": "0.0.1"
  },
+  "indicators": {
+    "caps_lock": "E6",
+    "scroll_lock": "D2"
+  },
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "layouts": {
diff --git a/keyboards/mechbrewery/mb65s/config.h b/keyboards/mechbrewery/mb65s/config.h
index 624d075922..8110b04685 100644
--- a/keyboards/mechbrewery/mb65s/config.h
+++ b/keyboards/mechbrewery/mb65s/config.h
@@ -28,10 +28,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-/* indicators */
-#define LED_CAPS_LOCK_PIN D4
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B5
 #ifdef BACKLIGHT_PIN
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/mechbrewery/mb65s/info.json b/keyboards/mechbrewery/mb65s/info.json
index 18c749f592..7692ac996c 100644
--- a/keyboards/mechbrewery/mb65s/info.json
+++ b/keyboards/mechbrewery/mb65s/info.json
@@ -8,6 +8,10 @@
        "pid": "0x3635",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "D4",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": [
diff --git a/keyboards/mechkeys/acr60/config.h b/keyboards/mechkeys/acr60/config.h
index a886486078..db01ff5f01 100644
--- a/keyboards/mechkeys/acr60/config.h
+++ b/keyboards/mechkeys/acr60/config.h
@@ -28,9 +28,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B2
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B6
 #define BACKLIGHT_LEVELS 5
diff --git a/keyboards/mechkeys/acr60/info.json b/keyboards/mechkeys/acr60/info.json
index de4f96707b..216d8639a3 100644
--- a/keyboards/mechkeys/acr60/info.json
+++ b/keyboards/mechkeys/acr60/info.json
@@ -8,6 +8,10 @@
        "pid": "0xCA60",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B2",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layout_aliases": {
diff --git a/keyboards/mechkeys/espectro/config.h b/keyboards/mechkeys/espectro/config.h
index 9f8c8ebf92..be41a72e9f 100755
--- a/keyboards/mechkeys/espectro/config.h
+++ b/keyboards/mechkeys/espectro/config.h
@@ -28,11 +28,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN B0
-#define LED_CAPS_LOCK_PIN B2
-#define LED_SCROLL_LOCK_PIN B1
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B6
 #define BACKLIGHT_LEVELS 5
diff --git a/keyboards/mechkeys/espectro/info.json b/keyboards/mechkeys/espectro/info.json
index 698b7b7b34..6877f1c316 100644
--- a/keyboards/mechkeys/espectro/info.json
+++ b/keyboards/mechkeys/espectro/info.json
@@ -8,6 +8,12 @@
    "pid": "0xCA96",
    "device_version": "0.0.1"
  },
+  "indicators": {
+    "caps_lock": "B2",
+    "num_lock": "B0",
+    "scroll_lock": "B1",
+    "on_state": 0
+  },
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "layouts": {
diff --git a/keyboards/mechkeys/mk60/config.h b/keyboards/mechkeys/mk60/config.h
index 2a32fcb700..a48c503557 100644
--- a/keyboards/mechkeys/mk60/config.h
+++ b/keyboards/mechkeys/mk60/config.h
@@ -38,9 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B7
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B6
 #define BACKLIGHT_BREATHING
 #define BACKLIGHT_LEVELS 6
diff --git a/keyboards/mechkeys/mk60/info.json b/keyboards/mechkeys/mk60/info.json
index 909215662e..b78e144988 100644
--- a/keyboards/mechkeys/mk60/info.json
+++ b/keyboards/mechkeys/mk60/info.json
@@ -8,6 +8,10 @@
      "pid": "0x0000",
      "device_version": "0.0.1"
    },
+    "indicators": {
+      "caps_lock": "B7",
+      "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/config.h b/keyboards/mechlovin/adelais/rgb_led/rev1/config.h
index cb8a0687f8..f668bd88ed 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev1/config.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev1/config.h
@@ -61,7 +61,3 @@
 #    define ENABLE_RGB_MATRIX_MULTISPLASH
 #    define ENABLE_RGB_MATRIX_SOLID_SPLASH
 #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-#define LED_NUM_LOCK_PIN C15
-#define LED_CAPS_LOCK_PIN B2
-#define LED_SCROLL_LOCK_PIN B9
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json
index 92ee67be74..e93c3b77b8 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json
+++ b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json
@@ -2,5 +2,10 @@
    "keyboard_name": "Adelais En Ciel",
    "usb": {
        "pid": "0xAEC1"
+    },
+    "indicators": {
+        "caps_lock": "B2",
+        "num_lock": "C15",
+        "scroll_lock": "B9"
    }
 }
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
index 6a50274f58..9611ed6744 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
@@ -96,8 +96,3 @@
 #define ENCODER_RESOLUTION 4
 #define TAP_CODE_DELAY 10
-#define LED_NUM_LOCK_PIN C15
-#define LED_CAPS_LOCK_PIN B2
-#define LED_SCROLL_LOCK_PIN B9
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json
index 8af90a2c55..556c8bf7e5 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json
+++ b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json
@@ -2,5 +2,10 @@
    "keyboard_name": "Adelais En Ciel Rev2",
    "usb": {
        "pid": "0xAEC2"
+    },
+    "indicators": {
+        "caps_lock": "B2",
+        "num_lock": "C15",
+        "scroll_lock": "B9"
    }
 }
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
index 92fa229523..faf032647f 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
@@ -119,7 +119,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODER_RESOLUTION 4
 #define TAP_CODE_DELAY 10
 #endif
-#define LED_NUM_LOCK_PIN A0
-#define LED_CAPS_LOCK_PIN C14
-#define LED_SCROLL_LOCK_PIN C15
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json
index 2f963ec895..d49fd7970a 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json
@@ -2,5 +2,10 @@
    "keyboard_name": "Adelais En Ciel Rev3",
    "usb": {
        "pid": "0xAEC3"
+    },
+    "indicators": {
+        "caps_lock": "C14",
+        "num_lock": "A0",
+        "scroll_lock": "C15"
    }
 }
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/config.h b/keyboards/mechlovin/adelais/standard_led/arm/config.h
index ef69fd27d1..90a5cf6575 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/config.h
+++ b/keyboards/mechlovin/adelais/standard_led/arm/config.h
@@ -41,7 +41,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define LED_NUM_LOCK_PIN C15
-#define LED_CAPS_LOCK_PIN B2
-#define LED_SCROLL_LOCK_PIN B9
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/info.json b/keyboards/mechlovin/adelais/standard_led/arm/info.json
index 68e7b3d144..3835f71f94 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/arm/info.json
@@ -1,3 +1,8 @@
 {
-    "keyboard_name": "Adelais"
+    "keyboard_name": "Adelais",
+    "indicators": {
+        "caps_lock": "B2",
+        "num_lock": "C15",
+        "scroll_lock": "B9"
+    }
 }
diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h b/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h
index c44559c3ca..abd17c2b2f 100644
--- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h
+++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h
@@ -31,11 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
-#define LED_NUM_LOCK_PIN D7
-#define LED_CAPS_LOCK_PIN E6
-#define LED_SCROLL_LOCK_PIN F7
-#define LED_PIN_ON_STATE 1
 #define BACKLIGHT_PIN B5
 #define BACKLIGHT_LEVELS 3
 #define BACKLIGHT_BREATHING
diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json b/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json
index d827607b81..0103bf09b6 100644
--- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json
@@ -2,5 +2,10 @@
    "keyboard_name": "Adelais AVR",
    "usb": {
        "pid": "0xAD04"
+    },
+    "indicators": {
+        "caps_lock": "E6",
+        "num_lock": "D7",
+        "scroll_lock": "F7"
    }
 }
diff --git a/keyboards/mechlovin/delphine/config.h b/keyboards/mechlovin/delphine/config.h
index 21b8ab654d..de0fbbfe8c 100644
--- a/keyboards/mechlovin/delphine/config.h
+++ b/keyboards/mechlovin/delphine/config.h
@@ -36,5 +36,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { F7, D7, D6, D2 }
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN B5
diff --git a/keyboards/mechlovin/delphine/info.json b/keyboards/mechlovin/delphine/info.json
index 5958db55d0..4495943544 100644
--- a/keyboards/mechlovin/delphine/info.json
+++ b/keyboards/mechlovin/delphine/info.json
@@ -6,6 +6,9 @@
    "usb": {
        "vid": "0x4D4C"
    },
+    "indicators": {
+        "num_lock": "B5"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["numpad_6x4", "ortho_6x4"],
diff --git a/keyboards/mechlovin/foundation/config.h b/keyboards/mechlovin/foundation/config.h
index 2e8c992d10..e2d846cfed 100644
--- a/keyboards/mechlovin/foundation/config.h
+++ b/keyboards/mechlovin/foundation/config.h
@@ -39,11 +39,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_PIN_ON_STATE 0
-#define LED_CAPS_LOCK_PIN A1
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 #define RGB_DI_PIN B15
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM 22
diff --git a/keyboards/mechlovin/foundation/info.json b/keyboards/mechlovin/foundation/info.json
index 2ed9cbdc06..38f9cace08 100644
--- a/keyboards/mechlovin/foundation/info.json
+++ b/keyboards/mechlovin/foundation/info.json
@@ -8,6 +8,10 @@
        "pid": "0x0180",
        "device_version": "0.0.2"
    },
+    "indicators": {
+        "caps_lock": "A1",
+        "on_state": 0
+    },
    "processor": "STM32F103",
    "bootloader": "stm32duino",
    "layout_aliases": {
diff --git a/keyboards/mechlovin/hannah65/config.h b/keyboards/mechlovin/hannah65/config.h
index a11338a5e1..2e39b676c7 100644
--- a/keyboards/mechlovin/hannah65/config.h
+++ b/keyboards/mechlovin/hannah65/config.h
@@ -36,9 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B9
-#define LED_PIN_ON_STATE  0
 #define BACKLIGHT_PIN B8
 #define BACKLIGHT_BREATHING
 #define BACKLIGHT_PWM_DRIVER PWMD4
diff --git a/keyboards/mechlovin/hannah65/info.json b/keyboards/mechlovin/hannah65/info.json
index c06ffbaf06..8ec49a784e 100644
--- a/keyboards/mechlovin/hannah65/info.json
+++ b/keyboards/mechlovin/hannah65/info.json
@@ -1,4 +1,8 @@
 {
+    "indicators": {
+        "caps_lock": "B9",
+        "on_state": 0
+    },
    "processor": "STM32F303",
    "bootloader": "stm32-dfu",
    "board": "QMK_PROTON_C"
diff --git a/keyboards/mechlovin/hex4b/config.h b/keyboards/mechlovin/hex4b/config.h
index 97e768fa61..ec84279b82 100644
--- a/keyboards/mechlovin/hex4b/config.h
+++ b/keyboards/mechlovin/hex4b/config.h
@@ -35,5 +35,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_PIN_ON_STATE 0
diff --git a/keyboards/mechlovin/hex4b/rev1/config.h b/keyboards/mechlovin/hex4b/rev1/config.h
index c4e588e678..abd2a73e0e 100644
--- a/keyboards/mechlovin/hex4b/rev1/config.h
+++ b/keyboards/mechlovin/hex4b/rev1/config.h
@@ -32,12 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { B7, A2, A1, A3, A4, A5 }
 #define MATRIX_COL_PINS { B6, B5, B3, B2, B1, B0, A0, A6, A7, C7, C6, C5, C4, D1, D0 }
-#define LED_NUM_LOCK_PIN D6
-#define LED_CAPS_LOCK_PIN D7
-#define LED_SCROLL_LOCK_PIN D5
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 5
 #define BACKLIGHT_BREATHING
diff --git a/keyboards/mechlovin/hex4b/rev1/info.json b/keyboards/mechlovin/hex4b/rev1/info.json
index be59552b33..79bef8e9a7 100644
--- a/keyboards/mechlovin/hex4b/rev1/info.json
+++ b/keyboards/mechlovin/hex4b/rev1/info.json
@@ -3,6 +3,12 @@
    "usb": {
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "D7",
+        "num_lock": "D6",
+        "scroll_lock": "D5",
+        "on_state": 0
+    },
    "processor": "atmega32a",
    "bootloader": "usbasploader"
 }
diff --git a/keyboards/mechlovin/hex4b/rev2/config.h b/keyboards/mechlovin/hex4b/rev2/config.h
index db994638c8..cff2b7f915 100644
--- a/keyboards/mechlovin/hex4b/rev2/config.h
+++ b/keyboards/mechlovin/hex4b/rev2/config.h
@@ -32,12 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { A4, B12, B13, B14, B15, A1 }
 #define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A5, A3, C13, B7, B6, B5, B4, B3 }
-#define LED_NUM_LOCK_PIN C15
-#define LED_CAPS_LOCK_PIN B9
-#define LED_SCROLL_LOCK_PIN A15
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 #define BACKLIGHT_PIN B8
 #define BACKLIGHT_LEVELS 5
 #define BACKLIGHT_PWM_DRIVER PWMD4
diff --git a/keyboards/mechlovin/hex4b/rev2/info.json b/keyboards/mechlovin/hex4b/rev2/info.json
index 040f96b010..6f5ddff9f7 100644
--- a/keyboards/mechlovin/hex4b/rev2/info.json
+++ b/keyboards/mechlovin/hex4b/rev2/info.json
@@ -3,6 +3,12 @@
    "usb": {
        "device_version": "0.0.2"
    },
+    "indicators": {
+        "caps_lock": "B9",
+        "num_lock": "C15",
+        "scroll_lock": "A15",
+        "on_state": 0
+    },
    "processor": "STM32F103",
    "bootloader": "stm32duino"
 }
diff --git a/keyboards/mechlovin/hex6c/config.h b/keyboards/mechlovin/hex6c/config.h
index f32a0d4b5d..88f115fe8f 100644
--- a/keyboards/mechlovin/hex6c/config.h
+++ b/keyboards/mechlovin/hex6c/config.h
@@ -38,11 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN A3
-#define LED_CAPS_LOCK_PIN A4
-#define LED_SCROLL_LOCK_PIN A8
-#define LED_PIN_ON_STATE 0 
 #define BACKLIGHT_PIN B0
 #define BACKLIGHT_BREATHING
 #define BACKLIGHT_PWM_DRIVER PWMD3
diff --git a/keyboards/mechlovin/hex6c/info.json b/keyboards/mechlovin/hex6c/info.json
index 990dbfd48c..c076b7198b 100644
--- a/keyboards/mechlovin/hex6c/info.json
+++ b/keyboards/mechlovin/hex6c/info.json
@@ -8,6 +8,12 @@
        "pid": "0x6C01",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "A4",
+        "num_lock": "A3",
+        "scroll_lock": "A8",
+        "on_state": 0
+    },
    "processor": "STM32F303",
    "bootloader": "stm32-dfu",
    "board": "QMK_PROTON_C",
diff --git a/keyboards/mechlovin/infinity87/rev1/config.h b/keyboards/mechlovin/infinity87/rev1/config.h
index 467d47c6f4..7de2a2cc79 100644
--- a/keyboards/mechlovin/infinity87/rev1/config.h
+++ b/keyboards/mechlovin/infinity87/rev1/config.h
@@ -24,8 +24,4 @@
 #define BACKLIGHT_PWM_DRIVER PWMD3
 #define BACKLIGHT_PWM_CHANNEL 3
-#define LED_CAPS_LOCK_PIN A4
-#define LED_SCROLL_LOCK_PIN A8
 #define DIODE_DIRECTION COL2ROW
 \ No newline at end of file
diff --git a/keyboards/mechlovin/infinity87/rev1/info.json b/keyboards/mechlovin/infinity87/rev1/info.json
index c06ffbaf06..0bcf668f11 100644
--- a/keyboards/mechlovin/infinity87/rev1/info.json
+++ b/keyboards/mechlovin/infinity87/rev1/info.json
@@ -1,4 +1,8 @@
 {
+    "indicators": {
+        "caps_lock": "A4",
+        "scroll_lock": "A8"
+    },
    "processor": "STM32F303",
    "bootloader": "stm32-dfu",
    "board": "QMK_PROTON_C"
diff --git a/keyboards/mechlovin/infinity87/rev2/config.h b/keyboards/mechlovin/infinity87/rev2/config.h
index e619e818de..5d0d064e28 100644
--- a/keyboards/mechlovin/infinity87/rev2/config.h
+++ b/keyboards/mechlovin/infinity87/rev2/config.h
@@ -31,11 +31,6 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
-#define LED_NUM_LOCK_PIN D7
-#define LED_CAPS_LOCK_PIN D6
-#define LED_SCROLL_LOCK_PIN B4
-#define LED_PIN_ON_STATE 1
 #define BACKLIGHT_PIN B6
 #define BACKLIGHT_LEVELS 3
 #define BACKLIGHT_BREATHING
diff --git a/keyboards/mechlovin/infinity87/rev2/info.json b/keyboards/mechlovin/infinity87/rev2/info.json
index 858f906ed2..548e55f563 100644
--- a/keyboards/mechlovin/infinity87/rev2/info.json
+++ b/keyboards/mechlovin/infinity87/rev2/info.json
@@ -8,6 +8,11 @@
        "pid": "0x8702",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "D6",
+        "num_lock": "D7",
+        "scroll_lock": "B4"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/mechlovin/infinity875/config.h b/keyboards/mechlovin/infinity875/config.h
index 385774b876..697ef34ccb 100644
--- a/keyboards/mechlovin/infinity875/config.h
+++ b/keyboards/mechlovin/infinity875/config.h
@@ -38,10 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
-#define LED_CAPS_LOCK_PIN D6
-#define LED_SCROLL_LOCK_PIN B4
-#define LED_PIN_ON_STATE 1
 #ifdef RGB_MATRIX_ENABLE
 #define RGB_DI_PIN E2
 #define RGB_MATRIX_LED_COUNT 42
diff --git a/keyboards/mechlovin/infinity875/info.json b/keyboards/mechlovin/infinity875/info.json
index 3b31aee81a..f27235b8c5 100644
--- a/keyboards/mechlovin/infinity875/info.json
+++ b/keyboards/mechlovin/infinity875/info.json
@@ -8,6 +8,10 @@
        "pid": "0x0875",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "D6",
+        "scroll_lock": "B4"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/mechlovin/infinity88/config.h b/keyboards/mechlovin/infinity88/config.h
index a0ffad2658..6b6a992116 100644
--- a/keyboards/mechlovin/infinity88/config.h
+++ b/keyboards/mechlovin/infinity88/config.h
@@ -37,9 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN A3
-#define LED_CAPS_LOCK_PIN A4
 #define BACKLIGHT_PIN B0
 #define BACKLIGHT_BREATHING
 #define BACKLIGHT_PWM_DRIVER PWMD3
diff --git a/keyboards/mechlovin/infinity88/info.json b/keyboards/mechlovin/infinity88/info.json
index 975d40a8a9..8fd53b54cd 100644
--- a/keyboards/mechlovin/infinity88/info.json
+++ b/keyboards/mechlovin/infinity88/info.json
@@ -8,6 +8,10 @@
        "pid": "0x8802",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "A4",
+        "num_lock": "A3"
+    },
    "processor": "STM32F303",
    "bootloader": "stm32-dfu",
    "board": "QMK_PROTON_C",
diff --git a/keyboards/mechlovin/jay60/config.h b/keyboards/mechlovin/jay60/config.h
index e294c09bee..bc8171f9e2 100644
--- a/keyboards/mechlovin/jay60/config.h
+++ b/keyboards/mechlovin/jay60/config.h
@@ -38,12 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-#define LED_CAPS_LOCK_PIN  D4
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/mechlovin/jay60/info.json b/keyboards/mechlovin/jay60/info.json
index f95f0654eb..f64b25c9e7 100644
--- a/keyboards/mechlovin/jay60/info.json
+++ b/keyboards/mechlovin/jay60/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0600",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "D4"
+    },
    "processor": "atmega32a",
    "bootloader": "usbasploader",
    "layouts": {
diff --git a/keyboards/mechlovin/kay60/config.h b/keyboards/mechlovin/kay60/config.h
index 815392505a..40d0dc8c35 100644
--- a/keyboards/mechlovin/kay60/config.h
+++ b/keyboards/mechlovin/kay60/config.h
@@ -38,12 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-#define LED_CAPS_LOCK_PIN  B0
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM 22
diff --git a/keyboards/mechlovin/kay60/info.json b/keyboards/mechlovin/kay60/info.json
index 38bbb3c65a..a12cb83719 100644
--- a/keyboards/mechlovin/kay60/info.json
+++ b/keyboards/mechlovin/kay60/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0601",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B0"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/mechlovin/kay65/config.h b/keyboards/mechlovin/kay65/config.h
index 01c35c91ef..a5265204ef 100644
--- a/keyboards/mechlovin/kay65/config.h
+++ b/keyboards/mechlovin/kay65/config.h
@@ -37,13 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-#define LED_CAPS_LOCK_PIN D6
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
-#define LED_PIN_ON_STATE 0
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM 24
diff --git a/keyboards/mechlovin/kay65/info.json b/keyboards/mechlovin/kay65/info.json
index 209e1a076d..3bfc5c66e5 100644
--- a/keyboards/mechlovin/kay65/info.json
+++ b/keyboards/mechlovin/kay65/info.json
@@ -8,6 +8,10 @@
        "pid": "0x6502",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "D6",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["65_ansi_blocker", "65_iso_blocker"],
diff --git a/keyboards/mechlovin/mechlovin9/rev1/config.h b/keyboards/mechlovin/mechlovin9/rev1/config.h
index 236529e243..eca0a5236b 100644
--- a/keyboards/mechlovin/mechlovin9/rev1/config.h
+++ b/keyboards/mechlovin/mechlovin9/rev1/config.h
@@ -30,8 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { A4, A5, A3, A2, A1 }
 #define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A0, C15, B4, B5, B3, C13, C14, A13 }
-#define LED_CAPS_LOCK_PIN B9
 #define BACKLIGHT_PIN B8
 #define BACKLIGHT_BREATHING
 #define BACKLIGHT_PWM_DRIVER PWMD3
diff --git a/keyboards/mechlovin/mechlovin9/rev1/info.json b/keyboards/mechlovin/mechlovin9/rev1/info.json
index e079a7a403..c955b37fc2 100644
--- a/keyboards/mechlovin/mechlovin9/rev1/info.json
+++ b/keyboards/mechlovin/mechlovin9/rev1/info.json
@@ -4,6 +4,9 @@
        "pid": "0x6509",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B9"
+    },
    "processor": "STM32F303",
    "bootloader": "stm32-dfu",
    "board": "QMK_PROTON_C"
diff --git a/keyboards/mechlovin/mechlovin9/rev2/config.h b/keyboards/mechlovin/mechlovin9/rev2/config.h
index 2fedbcaa0d..aa8c9db9f3 100644
--- a/keyboards/mechlovin/mechlovin9/rev2/config.h
+++ b/keyboards/mechlovin/mechlovin9/rev2/config.h
@@ -30,7 +30,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { A0, A1, A2, A3, A4 }
 #define MATRIX_COL_PINS { B2, B1, B0, B3, B4, B5, D0, D1, D5, D6, D7, C0, C3, C2, C1 }
-#define LED_CAPS_LOCK_PIN A7
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_BREATHING
diff --git a/keyboards/mechlovin/mechlovin9/rev2/info.json b/keyboards/mechlovin/mechlovin9/rev2/info.json
index 34d878de82..47fdf4973d 100644
--- a/keyboards/mechlovin/mechlovin9/rev2/info.json
+++ b/keyboards/mechlovin/mechlovin9/rev2/info.json
@@ -4,6 +4,9 @@
        "pid": "0x6509",
        "device_version": "0.0.2"
    },
+    "indicators": {
+        "caps_lock": "A7"
+    },
    "bootmagic": {
        "matrix": [0, 13]
    },
diff --git a/keyboards/mechlovin/olly/bb/config.h b/keyboards/mechlovin/olly/bb/config.h
index 42e6f7e2e4..f58cbef78e 100644
--- a/keyboards/mechlovin/olly/bb/config.h
+++ b/keyboards/mechlovin/olly/bb/config.h
@@ -37,11 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_BREATHING
-#define LED_NUM_LOCK_PIN B1
-#define LED_CAPS_LOCK_PIN B0
-#define LED_SCROLL_LOCK_PIN B2
-#define LED_PIN_ON_STATE 1
 #ifdef RGBLIGHT_ENABLE
 #define RGB_DI_PIN B3
 #define RGBLED_NUM 24
diff --git a/keyboards/mechlovin/olly/bb/info.json b/keyboards/mechlovin/olly/bb/info.json
index 87d2f3a1a6..e5a55c5add 100644
--- a/keyboards/mechlovin/olly/bb/info.json
+++ b/keyboards/mechlovin/olly/bb/info.json
@@ -8,6 +8,11 @@
        "pid": "0xD181",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B0",
+        "num_lock": "B1",
+        "scroll_lock": "B2"
+    },
    "processor": "atmega32a",
    "bootloader": "usbasploader",
    "layouts": {
diff --git a/keyboards/mechlovin/olly/jf/config.h b/keyboards/mechlovin/olly/jf/config.h
index b0f8318b8e..7d29b1901e 100644
--- a/keyboards/mechlovin/olly/jf/config.h
+++ b/keyboards/mechlovin/olly/jf/config.h
@@ -40,11 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_BREATHING
-#define LED_NUM_LOCK_PIN B1
-#define LED_CAPS_LOCK_PIN B0
-#define LED_SCROLL_LOCK_PIN B2
-#define LED_PIN_ON_STATE 1
 #define RGB_DI_PIN B3
 #define RGBLED_NUM 27
 #define RGBLIGHT_LIMIT_VAL 255
diff --git a/keyboards/mechlovin/olly/jf/info.json b/keyboards/mechlovin/olly/jf/info.json
index 7b353ee3d8..fdfe0dda91 100644
--- a/keyboards/mechlovin/olly/jf/info.json
+++ b/keyboards/mechlovin/olly/jf/info.json
@@ -8,6 +8,11 @@
        "pid": "0xD180",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B0",
+        "num_lock": "B1",
+        "scroll_lock": "B2"
+    },
    "bootmagic": {
        "matrix": [1, 14]
    },
diff --git a/keyboards/mechlovin/olly/orion/config.h b/keyboards/mechlovin/olly/orion/config.h
index 79008bdcad..64bc441555 100644
--- a/keyboards/mechlovin/olly/orion/config.h
+++ b/keyboards/mechlovin/olly/orion/config.h
@@ -37,11 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
-#define LED_CAPS_LOCK_PIN B10
-#define LED_NUM_LOCK_PIN A13
-#define LED_SCROLL_LOCK_PIN A14
-#define LED_PIN_ON_STATE 1
 #ifdef RGBLIGHT_ENABLE
 #    define RGB_DI_PIN B15
 #    define RGBLED_NUM 24
diff --git a/keyboards/mechlovin/olly/orion/info.json b/keyboards/mechlovin/olly/orion/info.json
index 864fd7ff46..89433dfd1b 100644
--- a/keyboards/mechlovin/olly/orion/info.json
+++ b/keyboards/mechlovin/olly/orion/info.json
@@ -8,6 +8,11 @@
        "pid": "0xD870",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B10",
+        "num_lock": "A13",
+        "scroll_lock": "A14"
+    },
    "processor": "STM32F103",
    "bootloader": "stm32duino",
    "layouts": {
diff --git a/keyboards/mechlovin/pisces/config.h b/keyboards/mechlovin/pisces/config.h
index 96e6125316..31fee6625c 100644
--- a/keyboards/mechlovin/pisces/config.h
+++ b/keyboards/mechlovin/pisces/config.h
@@ -37,8 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B2
 #define BACKLIGHT_PIN B7
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/mechlovin/pisces/info.json b/keyboards/mechlovin/pisces/info.json
index 7a057d15c3..f88f37c23c 100644
--- a/keyboards/mechlovin/pisces/info.json
+++ b/keyboards/mechlovin/pisces/info.json
@@ -8,6 +8,9 @@
        "pid": "0x6501",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B2"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/mechlovin/serratus/config.h b/keyboards/mechlovin/serratus/config.h
index 385f318b22..c4122f7e8b 100644
--- a/keyboards/mechlovin/serratus/config.h
+++ b/keyboards/mechlovin/serratus/config.h
@@ -38,11 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
-#define LED_NUM_LOCK_PIN D7
-#define LED_CAPS_LOCK_PIN D6
-#define LED_SCROLL_LOCK_PIN B4
-#define LED_PIN_ON_STATE 1
 #define BACKLIGHT_PIN B6
 #define BACKLIGHT_LEVELS 3
 #define BACKLIGHT_BREATHING
diff --git a/keyboards/mechlovin/serratus/info.json b/keyboards/mechlovin/serratus/info.json
index d3ba633cf2..98fc8af770 100644
--- a/keyboards/mechlovin/serratus/info.json
+++ b/keyboards/mechlovin/serratus/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0870",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "D6",
+        "num_lock": "D7",
+        "scroll_lock": "B4"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/mechlovin/th1800/config.h b/keyboards/mechlovin/th1800/config.h
index 533c97e3b9..5999b54455 100644
--- a/keyboards/mechlovin/th1800/config.h
+++ b/keyboards/mechlovin/th1800/config.h
@@ -37,8 +37,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN A2
-#define LED_CAPS_LOCK_PIN A0
-#define LED_SCROLL_LOCK_PIN A1
-#define LED_PIN_ON_STATE 0
diff --git a/keyboards/mechlovin/th1800/info.json b/keyboards/mechlovin/th1800/info.json
index 52a00d5c9c..02efb8dc03 100644
--- a/keyboards/mechlovin/th1800/info.json
+++ b/keyboards/mechlovin/th1800/info.json
@@ -8,6 +8,12 @@
        "pid": "0x1800",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "A0",
+        "num_lock": "A2",
+        "scroll_lock": "A1",
+        "on_state": 0
+    },
    "processor": "atmega32a",
    "bootloader": "usbasploader",
    "layouts": {
diff --git a/keyboards/mechlovin/tmkl/config.h b/keyboards/mechlovin/tmkl/config.h
index e3dcaa821c..a16685f034 100644
--- a/keyboards/mechlovin/tmkl/config.h
+++ b/keyboards/mechlovin/tmkl/config.h
@@ -44,7 +44,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_LEVELS 3
-#define LED_CAPS_LOCK_PIN B9
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/mechlovin/tmkl/info.json b/keyboards/mechlovin/tmkl/info.json
index 163b4de6d1..f49d274979 100644
--- a/keyboards/mechlovin/tmkl/info.json
+++ b/keyboards/mechlovin/tmkl/info.json
@@ -7,6 +7,9 @@
        "pid": "0xC601",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B9"
+    },
    "processor": "STM32F303",
    "bootloader": "stm32-dfu",
    "board": "QMK_PROTON_C",
diff --git a/keyboards/mechlovin/zed60/config.h b/keyboards/mechlovin/zed60/config.h
index 83f2202b20..c70512111c 100644
--- a/keyboards/mechlovin/zed60/config.h
+++ b/keyboards/mechlovin/zed60/config.h
@@ -38,8 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN A4
 #ifdef RGBLIGHT_ENABLE
 #define RGB_DI_PIN A7
 #define RGBLED_NUM 22
diff --git a/keyboards/mechlovin/zed60/info.json b/keyboards/mechlovin/zed60/info.json
index 0208f48349..3c0c450c69 100644
--- a/keyboards/mechlovin/zed60/info.json
+++ b/keyboards/mechlovin/zed60/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0602",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "A4"
+    },
    "processor": "STM32F103",
    "bootloader": "stm32duino",
    "layout_aliases": {
diff --git a/keyboards/mechlovin/zed65/config.h b/keyboards/mechlovin/zed65/config.h
index d474e6e3b6..40392b609a 100644
--- a/keyboards/mechlovin/zed65/config.h
+++ b/keyboards/mechlovin/zed65/config.h
@@ -31,11 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 /*
 * Feature disable options
 *  These options are also useful to firmware size reduction.
diff --git a/keyboards/mechlovin/zed65/no_backlight/cor65/config.h b/keyboards/mechlovin/zed65/no_backlight/cor65/config.h
index 93986f2973..34cc84c10c 100644
--- a/keyboards/mechlovin/zed65/no_backlight/cor65/config.h
+++ b/keyboards/mechlovin/zed65/no_backlight/cor65/config.h
@@ -24,6 +24,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { B12, B13, B14, B15, A1 }
 #define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A6, A5, A4, A3, A2, C13, B7, B6, B5, B4, B3 }
-#define LED_CAPS_LOCK_PIN B9
-#define LED_PIN_ON_STATE 0
-\ No newline at end of file
diff --git a/keyboards/mechlovin/zed65/no_backlight/cor65/info.json b/keyboards/mechlovin/zed65/no_backlight/cor65/info.json
index 63a324e220..2f0ea4817f 100644
--- a/keyboards/mechlovin/zed65/no_backlight/cor65/info.json
+++ b/keyboards/mechlovin/zed65/no_backlight/cor65/info.json
@@ -8,6 +8,10 @@
        "pid": "0x6504",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B9",
+        "on_state": 0
+    },
    "layouts": {
        "LAYOUT_all": {
            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1.25, "y":0}, {"label":"0,2", "x":2.25, "y":0}, {"label":"0,3", "x":3.25, "y":0}, {"label":"0,4", "x":4.25, "y":0}, {"label":"0,5", "x":5.25, "y":0}, {"label":"0,6", "x":6.25, "y":0}, {"label":"0,7", "x":7.25, "y":0}, {"label":"0,8", "x":8.25, "y":0}, {"label":"0,9", "x":9.25, "y":0}, {"label":"0,10", "x":10.25, "y":0}, {"label":"0,11", "x":11.25, "y":0}, {"label":"0,12", "x":12.25, "y":0}, {"label":"0,13", "x":13.25, "y":0}, {"label":"0,14", "x":14.25, "y":0}, {"label":"2,13", "x":15.25, "y":0}, {"label":"0,15", "x":16.75, "y":0}, {"label":"1,0", "x":0, "y":1}, {"label":"1,1", "x":1.25, "y":1, "w":1.5}, {"label":"1,2", "x":2.75, "y":1}, {"label":"1,3", "x":3.75, "y":1}, {"label":"1,4", "x":4.75, "y":1}, {"label":"1,5", "x":5.75, "y":1}, {"label":"1,6", "x":6.75, "y":1}, {"label":"1,7", "x":7.75, "y":1}, {"label":"1,8", "x":8.75, "y":1}, {"label":"1,9", "x":9.75, "y":1}, {"label":"1,10", "x":10.75, "y":1}, {"label":"1,11", "x":11.75, "y":1}, {"label":"1,12", "x":12.75, "y":1}, {"label":"1,13", "x":13.75, "y":1}, {"label":"1,14", "x":14.75, "y":1, "w":1.5}, {"label":"1,15", "x":16.75, "y":1}, {"label":"2,0", "x":0, "y":2}, {"label":"2,1", "x":1.25, "y":2, "w":1.75}, {"label":"2,2", "x":3, "y":2}, {"label":"2,3", "x":4, "y":2}, {"label":"2,4", "x":5, "y":2}, {"label":"2,5", "x":6, "y":2}, {"label":"2,6", "x":7, "y":2}, {"label":"2,7", "x":8, "y":2}, {"label":"2,8", "x":9, "y":2}, {"label":"2,9", "x":10, "y":2}, {"label":"2,10", "x":11, "y":2}, {"label":"2,11", "x":12, "y":2}, {"label":"2,12", "x":13, "y":2}, {"label":"2,14", "x":14, "y":2, "w":2.25}, {"label":"2,15", "x":16.75, "y":2}, {"label":"3,0", "x":0, "y":3}, {"label":"3,1", "x":1.25, "y":3, "w":2.25}, {"label":"3,3", "x":3.5, "y":3}, {"label":"3,4", "x":4.5, "y":3}, {"label":"3,5", "x":5.5, "y":3}, {"label":"3,6", "x":6.5, "y":3}, {"label":"3,7", "x":7.5, "y":3}, {"label":"3,8", "x":8.5, "y":3}, {"label":"3,9", "x":9.5, "y":3}, {"label":"3,10", "x":10.5, "y":3}, {"label":"3,11", "x":11.5, "y":3}, {"label":"3,12", "x":12.5, "y":3}, {"label":"3,13", "x":13.5, "y":3, "w":1.75}, {"label":"3,15", "x":16.75, "y":3}, {"label":"3,14", "x":15.5, "y":3.25}, {"label":"4,0", "x":0, "y":4}, {"label":"4,1", "x":1.25, "y":4, "w":1.25}, {"label":"4,2", "x":2.5, "y":4, "w":1.25}, {"label":"4,3", "x":3.75, "y":4, "w":1.25}, {"label":"4,7", "x":5, "y":4, "w":6.25}, {"label":"4,10", "x":11.25, "y":4, "w":1.25}, {"label":"4,11", "x":12.5, "y":4, "w":1.25}, {"label":"4,13", "x":14.5, "y":4.25}, {"label":"4,14", "x":15.5, "y":4.25}, {"label":"4,15", "x":16.5, "y":4.25}]       
diff --git a/keyboards/mechlovin/zed65/no_backlight/retro66/config.h b/keyboards/mechlovin/zed65/no_backlight/retro66/config.h
index 758fff0259..7354aa914d 100644
--- a/keyboards/mechlovin/zed65/no_backlight/retro66/config.h
+++ b/keyboards/mechlovin/zed65/no_backlight/retro66/config.h
@@ -25,8 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { B13, B14, A8, A1, A0 }
 #define MATRIX_COL_PINS { B11, B12, B10, B2, B1, B0, A7, A6, A5, A4, A3, A2, B3, A15, B5 }
-#define LED_CAPS_LOCK_PIN C14
 // Number of encoders
 #define ENCODERS_PAD_A { B4, B6 }
diff --git a/keyboards/mechlovin/zed65/no_backlight/retro66/info.json b/keyboards/mechlovin/zed65/no_backlight/retro66/info.json
index a40bee98dd..d2e9604146 100644
--- a/keyboards/mechlovin/zed65/no_backlight/retro66/info.json
+++ b/keyboards/mechlovin/zed65/no_backlight/retro66/info.json
@@ -8,6 +8,9 @@
        "pid": "0x6601",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C14"
+    },
    "layouts": {
        "LAYOUT_all": {
            "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Insert", "x":15.75, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Delete", "x":15.75, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.25}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.25}, {"label":"\u2191", "x":14.75, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.5}, {"label":"Ctrl", "x":11.5, "y":4, "w":1.25}, {"label":"\u2190", "x":13.75, "y":4}, {"label":"\u2193", "x":14.75, "y":4}, {"label":"\u2192", "x":15.75, "y":4}]        
diff --git a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/config.h b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/config.h
index c3e287c7a4..fa729b9286 100644
--- a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/config.h
+++ b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/config.h
@@ -33,8 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_SPI SPID2 // default: SPID1
 #define WS2812_SPI_MOSI_PAL_MODE 0 // MOSI pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 5
-#define LED_CAPS_LOCK_PIN C14
 //#define RGB_DI_PIN E2
 //#ifdef RGB_DI_PIN
 #    define RGBLIGHT_HUE_STEP 8
diff --git a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json
index 4d71686d33..e023f83396 100644
--- a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json
+++ b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json
@@ -8,6 +8,9 @@
        "pid": "0x6602",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C14"
+    },
    "layout_aliases": {
        "LAYOUT_65_ansi_blocker": "LAYOUT_ansi_blocker",
        "LAYOUT_65_iso_blocker": "LAYOUT_iso_blocker"
diff --git a/keyboards/mechwild/bbs/config.h b/keyboards/mechwild/bbs/config.h
index 2bc6e9b587..3db3d087cc 100644
--- a/keyboards/mechwild/bbs/config.h
+++ b/keyboards/mechwild/bbs/config.h
@@ -11,10 +11,6 @@
 /* allows the "key" button on the blackpill to toggle caps lock for user testing before soldering */
 #define DIP_SWITCH_PINS { A0 }
-/* status light pins using the on board LED for the blackpill */
-#define LED_CAPS_LOCK_PIN C13
-#define LED_PIN_ON_STATE 0
 /*
 * Keyboard Matrix Assignments
 *
diff --git a/keyboards/mechwild/bbs/info.json b/keyboards/mechwild/bbs/info.json
index 97fc709de9..0adaf90bf7 100644
--- a/keyboards/mechwild/bbs/info.json
+++ b/keyboards/mechwild/bbs/info.json
@@ -8,6 +8,10 @@
        "pid": "0x170E",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C13",
+        "on_state": 0
+    },
    "processor": "STM32F401",
    "bootloader": "stm32-dfu",
    "board": "BLACKPILL_STM32_F401",
diff --git a/keyboards/mechwild/obe/config.h b/keyboards/mechwild/obe/config.h
index d3117e1853..ba119cd36f 100644
--- a/keyboards/mechwild/obe/config.h
+++ b/keyboards/mechwild/obe/config.h
@@ -46,10 +46,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-/* status light pins */
-#define LED_NUM_LOCK_PIN B8
-#define LED_CAPS_LOCK_PIN B9
 /* RGB settings, uncomment this define to enable RGB */
 #define RGB_DI_PIN A0
 #ifdef RGB_DI_PIN
diff --git a/keyboards/mechwild/obe/info.json b/keyboards/mechwild/obe/info.json
index c9dc4add4d..806333a0fa 100644
--- a/keyboards/mechwild/obe/info.json
+++ b/keyboards/mechwild/obe/info.json
@@ -8,6 +8,10 @@
        "pid": "0x1707",
        "device_version": "2.0.1"
    },
+    "indicators": {
+        "caps_lock": "B9",
+        "num_lock": "B8"
+    },
    "bootmagic": {
        "matrix": [5, 4]
    },
diff --git a/keyboards/mechwild/puckbuddy/config.h b/keyboards/mechwild/puckbuddy/config.h
index bb14fdfb68..306e5b8eef 100644
--- a/keyboards/mechwild/puckbuddy/config.h
+++ b/keyboards/mechwild/puckbuddy/config.h
@@ -14,10 +14,6 @@
 /* allows the "key" button on the blackpill to toggle caps lock for user testing before soldering */
 #define DIP_SWITCH_PINS { A0 }
-/* status light pins using the on board LED for the blackpill */
-#define LED_CAPS_LOCK_PIN C13
-#define LED_PIN_ON_STATE 0
 /* set the tapping term for glidepoint pad to register a tap click */
 //#define CIRQUE_PINNACLE_TAPPING_TERM 0 // This is set to 0 to disable it
diff --git a/keyboards/mechwild/puckbuddy/info.json b/keyboards/mechwild/puckbuddy/info.json
index d8ae46caf3..d0af030ff3 100644
--- a/keyboards/mechwild/puckbuddy/info.json
+++ b/keyboards/mechwild/puckbuddy/info.json
@@ -8,6 +8,10 @@
        "pid": "0x170F",
        "device_version": "1.0.0"
    },
+    "indicators": {
+        "caps_lock": "C13",
+        "on_state": 0
+    },
    "processor": "STM32F401",
    "bootloader": "stm32-dfu",
    "board": "BLACKPILL_STM32_F401",
diff --git a/keyboards/mehkee96/config.h b/keyboards/mehkee96/config.h
index a2739dfe27..36573b2683 100644
--- a/keyboards/mehkee96/config.h
+++ b/keyboards/mehkee96/config.h
@@ -8,9 +8,6 @@
 #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN D0
-#define LED_CAPS_LOCK_PIN D1
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/mehkee96/info.json b/keyboards/mehkee96/info.json
index d33d458f78..82f8ef6717 100644
--- a/keyboards/mehkee96/info.json
+++ b/keyboards/mehkee96/info.json
@@ -8,6 +8,10 @@
        "pid": "0x422D",
        "device_version": "2.0.0"
    },
+    "indicators": {
+        "caps_lock": "D1",
+        "num_lock": "D0"
+    },
    "processor": "atmega32a",
    "bootloader": "bootloadhid",
    "layouts": {
diff --git a/keyboards/meletrix/zoom65/config.h b/keyboards/meletrix/zoom65/config.h
index 0e6168f6d5..c85c6e581f 100644
--- a/keyboards/meletrix/zoom65/config.h
+++ b/keyboards/meletrix/zoom65/config.h
@@ -37,7 +37,3 @@
 // Note:  array is { col, row )
 #define ENCODERS_CW_KEY  { { 5, 4 } }
 #define ENCODERS_CCW_KEY { { 3, 4 } }
-#define LED_CAPS_LOCK_PIN F7
-#define LED_PIN_ON_STATE 0
diff --git a/keyboards/meletrix/zoom65/info.json b/keyboards/meletrix/zoom65/info.json
index 3304b1cd33..18be91ee26 100644
--- a/keyboards/meletrix/zoom65/info.json
+++ b/keyboards/meletrix/zoom65/info.json
@@ -8,6 +8,10 @@
        "pid": "0x0004",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "F7",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["65_ansi_blocker", "65_iso_blocker", "65_ansi_blocker_split_bs", "65_iso_blocker_split_bs"],
diff --git a/keyboards/meletrix/zoom65_lite/config.h b/keyboards/meletrix/zoom65_lite/config.h
index 0e6168f6d5..c85c6e581f 100644
--- a/keyboards/meletrix/zoom65_lite/config.h
+++ b/keyboards/meletrix/zoom65_lite/config.h
@@ -37,7 +37,3 @@
 // Note:  array is { col, row )
 #define ENCODERS_CW_KEY  { { 5, 4 } }
 #define ENCODERS_CCW_KEY { { 3, 4 } }
-#define LED_CAPS_LOCK_PIN F7
-#define LED_PIN_ON_STATE 0
diff --git a/keyboards/meletrix/zoom65_lite/info.json b/keyboards/meletrix/zoom65_lite/info.json
index d1f598c140..f3839d2e88 100644
--- a/keyboards/meletrix/zoom65_lite/info.json
+++ b/keyboards/meletrix/zoom65_lite/info.json
@@ -8,6 +8,10 @@
        "pid": "0x0005",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "F7",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["65_ansi_blocker", "65_iso_blocker", "65_ansi_blocker_split_bs", "65_iso_blocker_split_bs"],
diff --git a/keyboards/meletrix/zoom87/config.h b/keyboards/meletrix/zoom87/config.h
index 533f7badcc..b9c0cfc2c2 100644
--- a/keyboards/meletrix/zoom87/config.h
+++ b/keyboards/meletrix/zoom87/config.h
@@ -26,9 +26,6 @@
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN F6
-#define LED_PIN_ON_STATE 0
 #define RGB_DI_PIN D2
 #ifdef RGB_DI_PIN
    #define RGBLED_NUM 20
diff --git a/keyboards/meletrix/zoom87/info.json b/keyboards/meletrix/zoom87/info.json
index 4fb5b83f4b..c60f7f8799 100644
--- a/keyboards/meletrix/zoom87/info.json
+++ b/keyboards/meletrix/zoom87/info.json
@@ -8,6 +8,10 @@
        "pid": "0x0007",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "F6",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layout_aliases": {
diff --git a/keyboards/melgeek/mj6xy/info.json b/keyboards/melgeek/mj6xy/info.json
index b0783663cc..ec54bbf7f7 100755
--- a/keyboards/melgeek/mj6xy/info.json
+++ b/keyboards/melgeek/mj6xy/info.json
@@ -8,6 +8,10 @@
        "pid": "0x6060",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C7",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "debounce": 3,
diff --git a/keyboards/melgeek/mj6xy/rev3/config.h b/keyboards/melgeek/mj6xy/rev3/config.h
index 58b844c7aa..47cc710f5a 100755
--- a/keyboards/melgeek/mj6xy/rev3/config.h
+++ b/keyboards/melgeek/mj6xy/rev3/config.h
@@ -26,9 +26,6 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN C7
-#define LED_PIN_ON_STATE  0
 #define BACKLIGHT_PIN B7
 #define RGB_DI_PIN    C6
diff --git a/keyboards/meow65/config.h b/keyboards/meow65/config.h
index 9dfef2d039..3172e08194 100644
--- a/keyboards/meow65/config.h
+++ b/keyboards/meow65/config.h
@@ -38,12 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/mincedshon/ecila/config.h b/keyboards/mincedshon/ecila/config.h
index b6f4feeb28..915b3fccb4 100644
--- a/keyboards/mincedshon/ecila/config.h
+++ b/keyboards/mincedshon/ecila/config.h
@@ -9,9 +9,6 @@
 //#define ENCODERS_PAD_B { D2 }
 //#define ENCODER_RESOLUTION 1
-//#define LED_NUM_LOCK_PIN  D4
-//#define LED_CAPS_LOCK_PIN D6
 #define RGB_DI_PIN B0
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/mlego/m48/rev1/config.h b/keyboards/mlego/m48/rev1/config.h
index d443d9b110..ab6ad48938 100644
--- a/keyboards/mlego/m48/rev1/config.h
+++ b/keyboards/mlego/m48/rev1/config.h
@@ -29,10 +29,6 @@
 #define ENCODER_RESOLUTION 4
 #endif
-#define LED_NUM_LOCK_PIN B12
-#define LED_SCROLL_LOCK_PIN B13
-#define LED_CAPS_LOCK_PIN C13
 #ifdef RGBLIGHT_ENABLE
 #define RGBLIGHT_LAYERS
 #define RGB_DI_PIN B15
diff --git a/keyboards/mlego/m48/rev1/info.json b/keyboards/mlego/m48/rev1/info.json
index 24b283fc26..83eda36107 100644
--- a/keyboards/mlego/m48/rev1/info.json
+++ b/keyboards/mlego/m48/rev1/info.json
@@ -3,6 +3,11 @@
        "pid": "0x6261",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C13",
+        "num_lock": "B12",
+        "scroll_lock": "B13"
+    },
    "processor": "STM32F401",
    "bootloader": "tinyuf2",
    "board": "BLACKPILL_STM32_F401"
diff --git a/keyboards/mlego/m60/rev1/config.h b/keyboards/mlego/m60/rev1/config.h
index 0d504568cb..5931171440 100644
--- a/keyboards/mlego/m60/rev1/config.h
+++ b/keyboards/mlego/m60/rev1/config.h
@@ -15,11 +15,6 @@
 */
 #pragma once
-#define LED_NUM_LOCK_PIN B12
-#define LED_SCROLL_LOCK_PIN B13
-#define LED_CAPS_LOCK_PIN C13
 #ifdef ENCODER_ENABLE
 #define MATRIX_ROW_PINS \
    { A6, A7, B0, B1, B10 }
diff --git a/keyboards/mlego/m60/rev1/info.json b/keyboards/mlego/m60/rev1/info.json
index dc653ed762..9363527fe9 100644
--- a/keyboards/mlego/m60/rev1/info.json
+++ b/keyboards/mlego/m60/rev1/info.json
@@ -3,6 +3,11 @@
        "pid": "0x6161",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C13",
+        "num_lock": "B12",
+        "scroll_lock": "B13"
+    },
    "processor": "STM32F401",
    "bootloader": "tinyuf2",
    "board": "BLACKPILL_STM32_F401"
diff --git a/keyboards/mlego/m60_split/rev1/config.h b/keyboards/mlego/m60_split/rev1/config.h
index 5e376563fc..adb8bd0783 100644
--- a/keyboards/mlego/m60_split/rev1/config.h
+++ b/keyboards/mlego/m60_split/rev1/config.h
@@ -36,10 +36,6 @@
    { 4 }
 #endif
-#define LED_NUM_LOCK_PIN B12
-#define LED_SCROLL_LOCK_PIN B13
-#define LED_CAPS_LOCK_PIN C13
 #define SPLIT_LAYER_STATE_ENABLE
 #define SPLIT_LED_STATE_ENABLE
diff --git a/keyboards/mlego/m60_split/rev1/info.json b/keyboards/mlego/m60_split/rev1/info.json
index e306bb804f..fc9a608c9e 100644
--- a/keyboards/mlego/m60_split/rev1/info.json
+++ b/keyboards/mlego/m60_split/rev1/info.json
@@ -3,6 +3,11 @@
        "pid": "0x6361",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C13",
+        "num_lock": "B12",
+        "scroll_lock": "B13"
+    },
    "split": {
        "bootmagic": {
            "matrix": [5, 0]
diff --git a/keyboards/mlego/m60_split/rev2/config.h b/keyboards/mlego/m60_split/rev2/config.h
index 524bb9daa1..e5ebf93438 100644
--- a/keyboards/mlego/m60_split/rev2/config.h
+++ b/keyboards/mlego/m60_split/rev2/config.h
@@ -38,9 +38,6 @@
 #endif
-#define LED_NUM_LOCK_PIN B12
-#define LED_SCROLL_LOCK_PIN B13
-#define LED_CAPS_LOCK_PIN C13
 #define SPLIT_LAYER_STATE_ENABLE
 #define SPLIT_LED_STATE_ENABLE
diff --git a/keyboards/mlego/m60_split/rev2/info.json b/keyboards/mlego/m60_split/rev2/info.json
index f51c758847..b2b49279c1 100644
--- a/keyboards/mlego/m60_split/rev2/info.json
+++ b/keyboards/mlego/m60_split/rev2/info.json
@@ -3,6 +3,11 @@
        "pid": "0x6362",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C13",
+        "num_lock": "B12",
+        "scroll_lock": "B13"
+    },
    "split": {
        "bootmagic": {
            "matrix": [5, 0]
diff --git a/keyboards/mlego/m65/rev1/config.h b/keyboards/mlego/m65/rev1/config.h
index d296bf9954..ac1f935350 100644
--- a/keyboards/mlego/m65/rev1/config.h
+++ b/keyboards/mlego/m65/rev1/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define LED_NUM_LOCK_PIN B12
-#define LED_SCROLL_LOCK_PIN B13
-#define LED_CAPS_LOCK_PIN C13
 //                          0   1   2    3   4
 #define MATRIX_ROW_PINS \
    { B11, B0, B1, A2, A3 }
diff --git a/keyboards/mlego/m65/rev1/info.json b/keyboards/mlego/m65/rev1/info.json
index 553fe3b7d2..9635b31e59 100644
--- a/keyboards/mlego/m65/rev1/info.json
+++ b/keyboards/mlego/m65/rev1/info.json
@@ -3,6 +3,11 @@
        "pid": "0x6061",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C13",
+        "num_lock": "B12",
+        "scroll_lock": "B13"
+    },
    "processor": "STM32F103",
    "bootloader": "stm32duino"
 }
diff --git a/keyboards/mlego/m65/rev2/config.h b/keyboards/mlego/m65/rev2/config.h
index d5575d24a9..3c2e877550 100644
--- a/keyboards/mlego/m65/rev2/config.h
+++ b/keyboards/mlego/m65/rev2/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define LED_NUM_LOCK_PIN B12
-#define LED_SCROLL_LOCK_PIN B13
-#define LED_CAPS_LOCK_PIN B2
 //                          0   1   2    3   4
 #define MATRIX_ROW_PINS \
    { B11, B0, B1, A2, A3 }
diff --git a/keyboards/mlego/m65/rev2/info.json b/keyboards/mlego/m65/rev2/info.json
index 3e6ef2d0bc..2bde6bdef1 100644
--- a/keyboards/mlego/m65/rev2/info.json
+++ b/keyboards/mlego/m65/rev2/info.json
@@ -3,6 +3,11 @@
        "pid": "0x6061",
        "device_version": "0.0.2"
    },
+    "indicators": {
+        "caps_lock": "B2",
+        "num_lock": "B12",
+        "scroll_lock": "B13"
+    },
    "processor": "STM32F103", // GD32F303CCT6
    "bootloader": "stm32duino"
 }
diff --git a/keyboards/mlego/m65/rev3/config.h b/keyboards/mlego/m65/rev3/config.h
index e58a84f3d8..abeaeffc88 100644
--- a/keyboards/mlego/m65/rev3/config.h
+++ b/keyboards/mlego/m65/rev3/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define LED_NUM_LOCK_PIN B12
-#define LED_SCROLL_LOCK_PIN B13
-#define LED_CAPS_LOCK_PIN C13
 //                          0   1   2   3   4
 #define MATRIX_ROW_PINS \
    { B10, A5, A6, A7, B0 }
diff --git a/keyboards/mlego/m65/rev3/info.json b/keyboards/mlego/m65/rev3/info.json
index cf330be7c9..8240ae7ace 100644
--- a/keyboards/mlego/m65/rev3/info.json
+++ b/keyboards/mlego/m65/rev3/info.json
@@ -3,6 +3,11 @@
        "pid": "0x6062",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C13",
+        "num_lock": "B12",
+        "scroll_lock": "B13"
+    },
    "processor": "STM32F401",
    "bootloader": "tinyuf2",
    "board": "BLACKPILL_STM32_F401"
diff --git a/keyboards/mlego/m65/rev4/config.h b/keyboards/mlego/m65/rev4/config.h
index afd8c86bcc..c2bd69f363 100644
--- a/keyboards/mlego/m65/rev4/config.h
+++ b/keyboards/mlego/m65/rev4/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define LED_NUM_LOCK_PIN B12
-#define LED_SCROLL_LOCK_PIN B13
-#define LED_CAPS_LOCK_PIN C13
 //                          0   1   2   3   4
 #define MATRIX_ROW_PINS \
    { B10, A5, A6, A7, B0 }
diff --git a/keyboards/mlego/m65/rev4/info.json b/keyboards/mlego/m65/rev4/info.json
index dee2b86933..465b61f2aa 100644
--- a/keyboards/mlego/m65/rev4/info.json
+++ b/keyboards/mlego/m65/rev4/info.json
@@ -3,6 +3,11 @@
        "pid": "0x6062",
        "device_version": "0.0.2"
    },
+    "indicators": {
+        "caps_lock": "C13",
+        "num_lock": "B12",
+        "scroll_lock": "B13"
+    },
    "processor": "STM32F401",
    "bootloader": "tinyuf2",
    "board": "BLACKPILL_STM32_F401"
diff --git a/keyboards/mode/m65ha_alpha/config.h b/keyboards/mode/m65ha_alpha/config.h
index 0901b701e4..8bc75d0616 100644
--- a/keyboards/mode/m65ha_alpha/config.h
+++ b/keyboards/mode/m65ha_alpha/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 #define OPENDRAIN_INDICATORS
-#define LED_CAPS_LOCK_PIN A6
 /*
 * Feature disable options
diff --git a/keyboards/mode/m65ha_alpha/info.json b/keyboards/mode/m65ha_alpha/info.json
index e856d0a7b6..4d27f46223 100644
--- a/keyboards/mode/m65ha_alpha/info.json
+++ b/keyboards/mode/m65ha_alpha/info.json
@@ -8,6 +8,9 @@
    "pid": "0x6566",
    "device_version": "0.6.5"
  },
+  "indicators": {
+    "caps_lock": "A6"
+  },
  "processor": "STM32F401",
    "bootloader": "stm32-dfu",
  "layout_aliases": {
diff --git a/keyboards/mode/m65hi_alpha/config.h b/keyboards/mode/m65hi_alpha/config.h
index f7f3c78e41..aab8942456 100644
--- a/keyboards/mode/m65hi_alpha/config.h
+++ b/keyboards/mode/m65hi_alpha/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 #define OPENDRAIN_INDICATORS
-#define LED_CAPS_LOCK_PIN A6
 /*
 * Feature disable options
diff --git a/keyboards/mode/m65hi_alpha/info.json b/keyboards/mode/m65hi_alpha/info.json
index 3adafce6f0..c6ea41bee0 100644
--- a/keyboards/mode/m65hi_alpha/info.json
+++ b/keyboards/mode/m65hi_alpha/info.json
@@ -8,6 +8,9 @@
    "pid": "0x6574",
    "device_version": "0.6.5"
  },
+  "indicators": {
+    "caps_lock": "A6"
+  },
  "processor": "STM32F401",
    "bootloader": "stm32-dfu",
  "layout_aliases": {
diff --git a/keyboards/mode/m65s/config.h b/keyboards/mode/m65s/config.h
index caa263cf80..a00b5d7e82 100644
--- a/keyboards/mode/m65s/config.h
+++ b/keyboards/mode/m65s/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 #define OPENDRAIN_INDICATORS
-#define LED_CAPS_LOCK_PIN C8
 /*
 * Feature disable options
diff --git a/keyboards/mode/m65s/info.json b/keyboards/mode/m65s/info.json
index 60ee66db88..53c7ccace4 100644
--- a/keyboards/mode/m65s/info.json
+++ b/keyboards/mode/m65s/info.json
@@ -8,6 +8,9 @@
        "pid": "0x6583",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C8"
+    },
    "processor": "STM32F401",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/mode/m80v2/config.h b/keyboards/mode/m80v2/config.h
index e78b490b31..def4e84ab5 100644
--- a/keyboards/mode/m80v2/config.h
+++ b/keyboards/mode/m80v2/config.h
@@ -30,6 +30,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-#define LED_CAPS_LOCK_PIN A0
-#define LED_PIN_ON_STATE 0
diff --git a/keyboards/mode/m80v2/m80v2h/info.json b/keyboards/mode/m80v2/m80v2h/info.json
index fdbd5c88d1..51788340ca 100644
--- a/keyboards/mode/m80v2/m80v2h/info.json
+++ b/keyboards/mode/m80v2/m80v2h/info.json
@@ -8,6 +8,10 @@
        "pid": "0x0083",
        "device_version": "0.0.2"
    },
+    "indicators": {
+        "caps_lock": "A0",
+        "on_state": 0
+    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
        "community_layouts": [ "tkl_ansi" ],
diff --git a/keyboards/mode/m80v2/m80v2s/info.json b/keyboards/mode/m80v2/m80v2s/info.json
index 0304354325..d7f5dd663b 100644
--- a/keyboards/mode/m80v2/m80v2s/info.json
+++ b/keyboards/mode/m80v2/m80v2s/info.json
@@ -8,6 +8,10 @@
        "pid": "0x0082",
        "device_version": "0.0.2"
    },
+    "indicators": {
+        "caps_lock": "A0",
+        "on_state": 0
+    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/moon/config.h b/keyboards/moon/config.h
index 77225a4115..b917e864e7 100644
--- a/keyboards/moon/config.h
+++ b/keyboards/moon/config.h
@@ -22,9 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 11
-#define LED_CAPS_LOCK_PIN B5
-#define LED_SCROLL_LOCK_PIN B6
 /* Backlight */
 #define BACKLIGHT_PIN C6
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/moon/info.json b/keyboards/moon/info.json
index 7bc7228cf9..5ad57b3867 100644
--- a/keyboards/moon/info.json
+++ b/keyboards/moon/info.json
@@ -8,6 +8,10 @@
        "pid": "0xFCB8",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B5",
+        "scroll_lock": "B6"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["tkl_ansi", "tkl_iso"],
diff --git a/keyboards/mt/mt980/config.h b/keyboards/mt/mt980/config.h
index c4693ff3db..ce455b4f78 100644
--- a/keyboards/mt/mt980/config.h
+++ b/keyboards/mt/mt980/config.h
@@ -12,11 +12,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
-#define LED_NUM_LOCK_PIN C6
-#define LED_CAPS_LOCK_PIN C7
-#define LED_SCROLL_LOCK_PIN B5
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B6
 #ifdef BACKLIGHT_PIN
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/mt/mt980/info.json b/keyboards/mt/mt980/info.json
index 4a29ee943d..e1c9f2758f 100644
--- a/keyboards/mt/mt980/info.json
+++ b/keyboards/mt/mt980/info.json
@@ -8,6 +8,12 @@
    "pid": "0x6060",
    "device_version": "0.0.1"
  },
+  "indicators": {
+    "caps_lock": "C7",
+    "num_lock": "C6",
+    "scroll_lock": "B5",
+    "on_state": 0
+  },
  "bootmagic": {
    "matrix": [5, 0]
  },
diff --git a/keyboards/mt/ncr80/hotswap/config.h b/keyboards/mt/ncr80/hotswap/config.h
index 6b583da4dd..2f7de9f066 100644
--- a/keyboards/mt/ncr80/hotswap/config.h
+++ b/keyboards/mt/ncr80/hotswap/config.h
@@ -36,11 +36,6 @@
 #define DIODE_DIRECTION ROW2COL
-#define LED_CAPS_LOCK_PIN C6
-#define LED_SCROLL_LOCK_PIN C7
-#define LED_NUM_LOCK_PIN B5
-#define LED_PIN_ON_STATE 0
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/mt/ncr80/hotswap/info.json b/keyboards/mt/ncr80/hotswap/info.json
index 7a6a97c726..89f38c9588 100644
--- a/keyboards/mt/ncr80/hotswap/info.json
+++ b/keyboards/mt/ncr80/hotswap/info.json
@@ -8,6 +8,12 @@
        "pid": "0x2002",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C6",
+        "num_lock": "B5",
+        "scroll_lock": "C7",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/mt/ncr80/solder/config.h b/keyboards/mt/ncr80/solder/config.h
index 6c672f914a..a2677907ef 100644
--- a/keyboards/mt/ncr80/solder/config.h
+++ b/keyboards/mt/ncr80/solder/config.h
@@ -36,10 +36,6 @@
 #define DIODE_DIRECTION ROW2COL
-#define LED_CAPS_LOCK_PIN C6
-#define LED_SCROLL_LOCK_PIN C7
-#define LED_NUM_LOCK_PIN B5
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B6
 #define BACKLIGHT_LEVELS 5
diff --git a/keyboards/mt/ncr80/solder/info.json b/keyboards/mt/ncr80/solder/info.json
index 2fcc0c1af1..a01b13dd3b 100644
--- a/keyboards/mt/ncr80/solder/info.json
+++ b/keyboards/mt/ncr80/solder/info.json
@@ -8,6 +8,12 @@
        "pid": "0x2001",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C6",
+        "num_lock": "B5",
+        "scroll_lock": "C7",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/mt/split75/config.h b/keyboards/mt/split75/config.h
index 08b40f11ed..0f18e23646 100644
--- a/keyboards/mt/split75/config.h
+++ b/keyboards/mt/split75/config.h
@@ -7,10 +7,6 @@
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 14
-#define LED_NUM_LOCK_PIN D0
-#define LED_CAPS_LOCK_PIN D1
-#define LED_SCROLL_LOCK_PIN D6
 #define RGBLED_NUM 8
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/mt/split75/info.json b/keyboards/mt/split75/info.json
index 77559a1705..13f3e32c6f 100644
--- a/keyboards/mt/split75/info.json
+++ b/keyboards/mt/split75/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0001",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "D1",
+        "num_lock": "D0",
+        "scroll_lock": "D6"
+    },
    "processor": "atmega32a",
    "bootloader": "bootloadhid",
    "layouts": {
diff --git a/keyboards/nasu/config.h b/keyboards/nasu/config.h
index 9347e529c6..cc8484b7a9 100644
--- a/keyboards/nasu/config.h
+++ b/keyboards/nasu/config.h
@@ -30,8 +30,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
-/* Indicator LEDs */
-#define LED_CAPS_LOCK_PIN B1
-#define LED_NUM_LOCK_PIN B0
-#define LED_SCROLL_LOCK_PIN A7
diff --git a/keyboards/nasu/info.json b/keyboards/nasu/info.json
index 72bc5f2fe2..363d8a3052 100644
--- a/keyboards/nasu/info.json
+++ b/keyboards/nasu/info.json
@@ -8,6 +8,11 @@
        "pid": "0x4E53",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B1",
+        "num_lock": "B0",
+        "scroll_lock": "A7"
+    },
    "bootmagic": {
        "matrix": [1, 0]
    },
diff --git a/keyboards/neito/config.h b/keyboards/neito/config.h
index 8c0f83f245..c7b9d0b06d 100644
--- a/keyboards/neito/config.h
+++ b/keyboards/neito/config.h
@@ -25,7 +25,6 @@
 #define ENCODERS_PAD_B { B0 }
 #define ENCODER_RESOLUTION 4
-#define LED_CAPS_LOCK_PIN B6
 #define BACKLIGHT_ON_STATE  0
 #define BACKLIGHT_PIN B5
diff --git a/keyboards/neito/info.json b/keyboards/neito/info.json
index a62445996d..999c42b0ed 100644
--- a/keyboards/neito/info.json
+++ b/keyboards/neito/info.json
@@ -8,6 +8,9 @@
        "pid": "0xB44C",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B6"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/neson_design/700e/config.h b/keyboards/neson_design/700e/config.h
index 5d9390b573..ef638a7f92 100644
--- a/keyboards/neson_design/700e/config.h
+++ b/keyboards/neson_design/700e/config.h
@@ -45,8 +45,6 @@
 #define DRIVER_COUNT 2
 #define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL+DRIVER_2_LED_TOTAL)
-#define LED_CAPS_LOCK_PIN   F5
 //rgb light setting
 #define RGBLED_NUM          68
 #define RGB_DI_PIN          D5
diff --git a/keyboards/neson_design/700e/info.json b/keyboards/neson_design/700e/info.json
index 2c2a3126c6..29f5c0c2f4 100644
--- a/keyboards/neson_design/700e/info.json
+++ b/keyboards/neson_design/700e/info.json
@@ -8,6 +8,9 @@
        "pid": "0x700E",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "F5"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/neson_design/n6/config.h b/keyboards/neson_design/n6/config.h
index bb447ece39..ec8bfa5115 100644
--- a/keyboards/neson_design/n6/config.h
+++ b/keyboards/neson_design/n6/config.h
@@ -45,8 +45,6 @@
 #define DRIVER_COUNT 2
 #define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL+DRIVER_2_LED_TOTAL)
-#define LED_CAPS_LOCK_PIN   F5
 //rgb light setting
 #define RGBLED_NUM          65
 #define RGB_DI_PIN          B3
diff --git a/keyboards/neson_design/n6/info.json b/keyboards/neson_design/n6/info.json
index c916f1f4c0..19de748afb 100644
--- a/keyboards/neson_design/n6/info.json
+++ b/keyboards/neson_design/n6/info.json
@@ -8,6 +8,9 @@
        "pid": "0x4E36",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "F5"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layout_aliases": {
diff --git a/keyboards/nightly_boards/alter/rev1/config.h b/keyboards/nightly_boards/alter/rev1/config.h
index c6fd463ddb..e410706776 100644
--- a/keyboards/nightly_boards/alter/rev1/config.h
+++ b/keyboards/nightly_boards/alter/rev1/config.h
@@ -35,10 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN D7
-#define LED_CAPS_LOCK_PIN D6
-#define LED_SCROLL_LOCK_PIN B4
 #define RGB_DI_PIN F1
 #ifdef RGB_DI_PIN
 #define RGBLED_NUM 18
diff --git a/keyboards/nightly_boards/alter/rev1/info.json b/keyboards/nightly_boards/alter/rev1/info.json
index 122f7fb38f..21efb61c29 100644
--- a/keyboards/nightly_boards/alter/rev1/info.json
+++ b/keyboards/nightly_boards/alter/rev1/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0002",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "D6",
+        "num_lock": "D7",
+        "scroll_lock": "B4"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["alice_split_bs"],
diff --git a/keyboards/nightly_boards/alter_lite/config.h b/keyboards/nightly_boards/alter_lite/config.h
index 9c70ef3501..8e6af9d62b 100644
--- a/keyboards/nightly_boards/alter_lite/config.h
+++ b/keyboards/nightly_boards/alter_lite/config.h
@@ -19,11 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16  
-#define LED_NUM_LOCK_PIN D6
-#define LED_CAPS_LOCK_PIN D7
-#define LED_SCROLL_LOCK_PIN D4
-#define LED_PIN_ON_STATE 0
 /*
 * Keyboard Matrix Assignments
 *
diff --git a/keyboards/nightly_boards/alter_lite/info.json b/keyboards/nightly_boards/alter_lite/info.json
index 72fea11f33..d76a278a75 100644
--- a/keyboards/nightly_boards/alter_lite/info.json
+++ b/keyboards/nightly_boards/alter_lite/info.json
@@ -8,6 +8,12 @@
        "pid": "0x0013",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "D7",
+        "num_lock": "D6",
+        "scroll_lock": "D4",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/nix_studio/oxalys80/config.h b/keyboards/nix_studio/oxalys80/config.h
index bf83d408c8..e12f285908 100644
--- a/keyboards/nix_studio/oxalys80/config.h
+++ b/keyboards/nix_studio/oxalys80/config.h
@@ -64,7 +64,3 @@
 #define RGBLIGHT_LIMIT_VAL 200
 #define RGBLIGHT_SLEEP // RGB will turn off when PC is put to sleep
 #endif
-#define LED_CAPS_LOCK_PIN E6
-#define LED_SCROLL_LOCK_PIN B2
-#define LED_PIN_ON_STATE 0
diff --git a/keyboards/nix_studio/oxalys80/info.json b/keyboards/nix_studio/oxalys80/info.json
index 7c402260c9..aa37b150f7 100644
--- a/keyboards/nix_studio/oxalys80/info.json
+++ b/keyboards/nix_studio/oxalys80/info.json
@@ -8,6 +8,11 @@
        "pid": "0x3830",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "E6",
+        "scroll_lock": "B2",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["tkl_ansi", "tkl_iso"],
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": {
diff --git a/keyboards/novelkeys/nk65b/config.h b/keyboards/novelkeys/nk65b/config.h
index 16c202c064..805d356bba 100755
--- a/keyboards/novelkeys/nk65b/config.h
+++ b/keyboards/novelkeys/nk65b/config.h
@@ -28,10 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-/* Indicator LEDs */
-#define LED_CAPS_LOCK_PIN A14
-#define LED_PIN_ON_STATE 0
 /* RGB options */
 #define RGB_DI_PIN B4
diff --git a/keyboards/novelkeys/nk65b/info.json b/keyboards/novelkeys/nk65b/info.json
index 2b8beefd6c..3e60bfd3a4 100755
--- a/keyboards/novelkeys/nk65b/info.json
+++ b/keyboards/novelkeys/nk65b/info.json
@@ -8,6 +8,10 @@
        "pid": "0x4E4F",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "A14",
+        "on_state": 0
+    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/novelkeys/nk87b/config.h b/keyboards/novelkeys/nk87b/config.h
index 38374b7c4b..4ffa07a1e8 100644
--- a/keyboards/novelkeys/nk87b/config.h
+++ b/keyboards/novelkeys/nk87b/config.h
@@ -28,10 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-/* Indicator LEDs */
-#define LED_CAPS_LOCK_PIN A2
-#define LED_PIN_ON_STATE 0
 /* RGB options */
 #define RGB_DI_PIN B0
diff --git a/keyboards/novelkeys/nk87b/info.json b/keyboards/novelkeys/nk87b/info.json
index a7d0eb4d36..6bcc03d93b 100755
--- a/keyboards/novelkeys/nk87b/info.json
+++ b/keyboards/novelkeys/nk87b/info.json
@@ -8,6 +8,10 @@
        "pid": "0x4E50",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "A2",
+        "on_state": 0
+    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/noxary/260/config.h b/keyboards/noxary/260/config.h
index 8696d18708..45143df3fb 100644
--- a/keyboards/noxary/260/config.h
+++ b/keyboards/noxary/260/config.h
@@ -38,9 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B1
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B7
 #define BACKLIGHT_BREATHING
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/noxary/260/info.json b/keyboards/noxary/260/info.json
index 08f4699b90..54328d3165 100644
--- a/keyboards/noxary/260/info.json
+++ b/keyboards/noxary/260/info.json
@@ -8,6 +8,10 @@
        "pid": "0x0A29",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B1",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["60_ansi", "60_iso", "60_hhkb", "60_tsangan_hhkb"],
diff --git a/keyboards/noxary/268_2_rgb/config.h b/keyboards/noxary/268_2_rgb/config.h
index a6d9cdc779..3baa32ac52 100644
--- a/keyboards/noxary/268_2_rgb/config.h
+++ b/keyboards/noxary/268_2_rgb/config.h
@@ -35,8 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B0
 #define BACKLIGHT_PIN B7
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/noxary/268_2_rgb/info.json b/keyboards/noxary/268_2_rgb/info.json
index 38fc324f55..7b52a82966 100644
--- a/keyboards/noxary/268_2_rgb/info.json
+++ b/keyboards/noxary/268_2_rgb/info.json
@@ -8,6 +8,9 @@
      "pid": "0x0A7C",
      "device_version": "0.0.1"
    },
+    "indicators": {
+      "caps_lock": "B0"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/oddforge/vea/config.h b/keyboards/oddforge/vea/config.h
index 8cc2bd971e..31d75a7690 100644
--- a/keyboards/oddforge/vea/config.h
+++ b/keyboards/oddforge/vea/config.h
@@ -40,7 +40,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_SLEEP
 #define RGBLIGHT_EFFECT_KNIGHT_OFFSET 9
-#define LED_NUM_LOCK_PIN D0
-#define LED_CAPS_LOCK_PIN D1
-#define LED_SCROLL_LOCK_PIN D6
 #define BACKLIGHT_PIN D4
diff --git a/keyboards/oddforge/vea/info.json b/keyboards/oddforge/vea/info.json
index 699758f916..97d6b19265 100644
--- a/keyboards/oddforge/vea/info.json
+++ b/keyboards/oddforge/vea/info.json
@@ -8,6 +8,11 @@
        "pid": "0x4155",
        "device_version": "1.0.0"
    },
+    "indicators": {
+        "caps_lock": "D1",
+        "num_lock": "D0",
+        "scroll_lock": "D6"
+    },
    "processor": "atmega32a",
    "bootloader": "bootloadhid",
    "layouts": {
diff --git a/keyboards/omnikeyish/config.h b/keyboards/omnikeyish/config.h
index 2a9f737926..63f7b08aed 100644
--- a/keyboards/omnikeyish/config.h
+++ b/keyboards/omnikeyish/config.h
@@ -15,10 +15,6 @@
 #endif
 #define MATRIX_COL_PINS { F0, F1, F2, F3, F4, F5, F6, F7, C7, C6, C5, C4, C3, C2, C1, C0, B0, B1, B2, B3, B4, B5, B6 }
-#define LED_NUM_LOCK_PIN E0
-#define LED_CAPS_LOCK_PIN E1
-#define LED_SCROLL_LOCK_PIN B7
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/omnikeyish/info.json b/keyboards/omnikeyish/info.json
index 27c0419a7d..c7cf6ef7e3 100644
--- a/keyboards/omnikeyish/info.json
+++ b/keyboards/omnikeyish/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0666",
        "device_version": "13.3.7"
    },
+    "indicators": {
+        "caps_lock": "E1",
+        "num_lock": "E0",
+        "scroll_lock": "B7"
+    },
    "processor": "at90usb1286",
    "bootloader": "halfkay",
    "layouts": {
diff --git a/keyboards/panc60/config.h b/keyboards/panc60/config.h
index 5a6e374a20..3d2f0c71c0 100644
--- a/keyboards/panc60/config.h
+++ b/keyboards/panc60/config.h
@@ -28,8 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN D1
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/panc60/info.json b/keyboards/panc60/info.json
index 6ee1bfa3bd..05f916f248 100644
--- a/keyboards/panc60/info.json
+++ b/keyboards/panc60/info.json
@@ -8,6 +8,9 @@
    "pid": "0x422D",
    "device_version": "2.0.0"
  },
+  "indicators": {
+    "caps_lock": "D1"
+  },
  "processor": "atmega32a",
  "bootloader": "bootloadhid",
  "community_layouts": ["60_ansi", "60_hhkb"],
diff --git a/keyboards/papercranekeyboards/gerald65/config.h b/keyboards/papercranekeyboards/gerald65/config.h
index 8e3c51ea89..eae03cd593 100644
--- a/keyboards/papercranekeyboards/gerald65/config.h
+++ b/keyboards/papercranekeyboards/gerald65/config.h
@@ -24,12 +24,6 @@
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION ROW2COL
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/pearl/config.h b/keyboards/pearl/config.h
index e268e1ce0e..c2ba5745e2 100644
--- a/keyboards/pearl/config.h
+++ b/keyboards/pearl/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define LED_NUM_LOCK_PIN D0
-#define LED_CAPS_LOCK_PIN D1
-#define LED_SCROLL_LOCK_PIN D6
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/pearl/info.json b/keyboards/pearl/info.json
index 08ab8db4d4..3808bdecf4 100644
--- a/keyboards/pearl/info.json
+++ b/keyboards/pearl/info.json
@@ -7,6 +7,11 @@
    "pid": "0x0348",
    "device_version": "2.0.0"
  },
+  "indicators": {
+    "caps_lock": "D1",
+    "num_lock": "D0",
+    "scroll_lock": "D6"
+  },
  "processor": "atmega32a",
  "bootloader": "bootloadhid",
  "layouts": {
diff --git a/keyboards/pearlboards/atlas/config.h b/keyboards/pearlboards/atlas/config.h
index 5a5c2b5fdf..0414097f31 100644
--- a/keyboards/pearlboards/atlas/config.h
+++ b/keyboards/pearlboards/atlas/config.h
@@ -76,11 +76,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_SLEEP
 #endif
-/* Indicator Led's*/
-#define LED_CAPS_LOCK_PIN F4
-#define LED_NUM_LOCK_PIN F5
-#define LED_SCROLL_LOCK_PIN F6
-#define LED_PIN_ON_STATE 0
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/pearlboards/atlas/info.json b/keyboards/pearlboards/atlas/info.json
index 9c28399c90..31cf97aa4e 100644
--- a/keyboards/pearlboards/atlas/info.json
+++ b/keyboards/pearlboards/atlas/info.json
@@ -8,6 +8,12 @@
        "pid": "0x6964",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "F4",
+        "num_lock": "F5",
+        "scroll_lock": "F6",
+        "on_state": 0
+    },
    "processor": "at90usb1286",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/pearlboards/pandora/config.h b/keyboards/pearlboards/pandora/config.h
index abb3f1d27e..e13df1e11d 100644
--- a/keyboards/pearlboards/pandora/config.h
+++ b/keyboards/pearlboards/pandora/config.h
@@ -65,9 +65,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_SLEEP
 #endif
-/* Indicator Led's*/
-#define LED_CAPS_LOCK_PIN E6
-#define LED_PIN_ON_STATE 0
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/pearlboards/pandora/info.json b/keyboards/pearlboards/pandora/info.json
index 39ec8d1089..592fecff65 100644
--- a/keyboards/pearlboards/pandora/info.json
+++ b/keyboards/pearlboards/pandora/info.json
@@ -8,6 +8,10 @@
        "pid": "0x6963",
        "device_version": "0.0.2"
    },
+    "indicators": {
+        "caps_lock": "E6",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/pearlboards/pearl/config.h b/keyboards/pearlboards/pearl/config.h
index dc79825104..7b10ff7fab 100644
--- a/keyboards/pearlboards/pearl/config.h
+++ b/keyboards/pearlboards/pearl/config.h
@@ -71,11 +71,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_SLEEP
 #endif
-/* Indicator Led's*/
-#define LED_CAPS_LOCK_PIN B0
-#define LED_NUM_LOCK_PIN B1
-#define LED_SCROLL_LOCK_PIN B2
-#define LED_PIN_ON_STATE 0
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/pearlboards/pearl/info.json b/keyboards/pearlboards/pearl/info.json
index b7d6d2a591..f6082c1d37 100644
--- a/keyboards/pearlboards/pearl/info.json
+++ b/keyboards/pearlboards/pearl/info.json
@@ -8,6 +8,12 @@
        "pid": "0x6965",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B0",
+        "num_lock": "B1",
+        "scroll_lock": "B2",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "debounce": 4,
diff --git a/keyboards/pearlboards/zeus/config.h b/keyboards/pearlboards/zeus/config.h
index b191a09ff3..09930b8492 100644
--- a/keyboards/pearlboards/zeus/config.h
+++ b/keyboards/pearlboards/zeus/config.h
@@ -80,11 +80,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_SLEEP
 #endif
-/* Indicator Led's*/
-#define LED_CAPS_LOCK_PIN C5
-#define LED_NUM_LOCK_PIN C4
-#define LED_SCROLL_LOCK_PIN C3
-#define LED_PIN_ON_STATE 0
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/pearlboards/zeus/info.json b/keyboards/pearlboards/zeus/info.json
index e589b534fb..c5b1fb640c 100644
--- a/keyboards/pearlboards/zeus/info.json
+++ b/keyboards/pearlboards/zeus/info.json
@@ -8,6 +8,12 @@
        "pid": "0x6966",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C5",
+        "num_lock": "C4",
+        "scroll_lock": "C3",
+        "on_state": 0
+    },
    "processor": "at90usb1286",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/peranekofactory/tone/rev1/config.h b/keyboards/peranekofactory/tone/rev1/config.h
index 58c014f26a..9429a2261f 100644
--- a/keyboards/peranekofactory/tone/rev1/config.h
+++ b/keyboards/peranekofactory/tone/rev1/config.h
@@ -22,12 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODERS_PAD_B { B4 }
 #define TAP_CODE_DELAY 100
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/peranekofactory/tone/rev2/config.h b/keyboards/peranekofactory/tone/rev2/config.h
index 58c014f26a..9429a2261f 100644
--- a/keyboards/peranekofactory/tone/rev2/config.h
+++ b/keyboards/peranekofactory/tone/rev2/config.h
@@ -22,12 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODERS_PAD_B { B4 }
 #define TAP_CODE_DELAY 100
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/percent/canoe/config.h b/keyboards/percent/canoe/config.h
index b91921ebcb..9fc0fd0014 100644
--- a/keyboards/percent/canoe/config.h
+++ b/keyboards/percent/canoe/config.h
@@ -28,8 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN D1
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/percent/canoe/info.json b/keyboards/percent/canoe/info.json
index 0c0af65e8c..18d57bce99 100644
--- a/keyboards/percent/canoe/info.json
+++ b/keyboards/percent/canoe/info.json
@@ -8,6 +8,9 @@
    "pid": "0x434E",
    "device_version": "2.0.0"
  },
+  "indicators": {
+    "caps_lock": "D1"
+  },
  "processor": "atmega32a",
  "bootloader": "bootloadhid",
  "community_layouts": ["65_ansi_blocker", "65_iso_blocker"],
diff --git a/keyboards/percent/skog/config.h b/keyboards/percent/skog/config.h
index b8abcab227..629e04b94e 100644
--- a/keyboards/percent/skog/config.h
+++ b/keyboards/percent/skog/config.h
@@ -25,9 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2 }
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN D1
-#define LED_SCROLL_LOCK_PIN D6
 #define RGBLED_NUM 2
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/percent/skog/info.json b/keyboards/percent/skog/info.json
index 39a36d4042..5d461b67a4 100644
--- a/keyboards/percent/skog/info.json
+++ b/keyboards/percent/skog/info.json
@@ -8,6 +8,10 @@
      "pid": "0x422D",
      "device_version": "2.0.0"
    },
+    "indicators": {
+      "caps_lock": "D1",
+      "scroll_lock": "D6"
+    },
    "processor": "atmega32a",
    "bootloader": "bootloadhid",
    "layouts": {
diff --git a/keyboards/percent/skog_lite/config.h b/keyboards/percent/skog_lite/config.h
index 7e74ab9fcc..74217b74e5 100644
--- a/keyboards/percent/skog_lite/config.h
+++ b/keyboards/percent/skog_lite/config.h
@@ -29,9 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN D1
-#define LED_SCROLL_LOCK_PIN D6
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/percent/skog_lite/info.json b/keyboards/percent/skog_lite/info.json
index f405a83974..8b126296e6 100644
--- a/keyboards/percent/skog_lite/info.json
+++ b/keyboards/percent/skog_lite/info.json
@@ -8,6 +8,10 @@
        "pid": "0x422D",
        "device_version": "2.0.0"
    },
+    "indicators": {
+        "caps_lock": "D1",
+        "scroll_lock": "D6"
+    },
    "processor": "atmega32a",
    "bootloader": "bootloadhid",
    "community_layouts": ["tkl_ansi"],
diff --git a/keyboards/phage_studio/pila87/config.h b/keyboards/phage_studio/pila87/config.h
index 3d08cb262a..391ebae817 100644
--- a/keyboards/phage_studio/pila87/config.h
+++ b/keyboards/phage_studio/pila87/config.h
@@ -29,10 +29,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-/* LED Indicator */
-#define LED_CAPS_LOCK_PIN C14
-#define LED_SCROLL_LOCK_PIN A0
 #ifdef RGB_MATRIX_ENABLE
    #define RGB_MATRIX_LED_COUNT 91
    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
diff --git a/keyboards/phage_studio/pila87/info.json b/keyboards/phage_studio/pila87/info.json
index 03e53e33b4..5bba67c683 100644
--- a/keyboards/phage_studio/pila87/info.json
+++ b/keyboards/phage_studio/pila87/info.json
@@ -8,6 +8,10 @@
        "pid": "0x5887",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C14",
+        "scroll_lock": "A0"
+    },
    "community_layouts": ["tkl_ansi"],
    "layouts": {
        "LAYOUT_tkl_ansi": {
diff --git a/keyboards/phantom/config.h b/keyboards/phantom/config.h
index d811e2b8b4..76e94df0c6 100644
--- a/keyboards/phantom/config.h
+++ b/keyboards/phantom/config.h
@@ -38,9 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION ROW2COL
-#define LED_CAPS_LOCK_PIN B6
-#define LED_SCROLL_LOCK_PIN B7
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM 20
diff --git a/keyboards/phantom/info.json b/keyboards/phantom/info.json
index 5ed053be67..b246ac36fe 100644
--- a/keyboards/phantom/info.json
+++ b/keyboards/phantom/info.json
@@ -8,6 +8,10 @@
        "pid": "0x5B50",
        "device_version": "0.0.3"
    },
+    "indicators": {
+        "caps_lock": "B6",
+        "scroll_lock": "B7"
+    },
    "processor": "atmega32u4",
    "bootloader": "halfkay",
    "community_layouts": ["tkl_ansi", "tkl_iso"],
diff --git a/keyboards/phrygian/ph100/config.h b/keyboards/phrygian/ph100/config.h
index d3d8d204a8..ed88ef143b 100644
--- a/keyboards/phrygian/ph100/config.h
+++ b/keyboards/phrygian/ph100/config.h
@@ -26,7 +26,3 @@
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-/* Define capslock and numlock */
-#define LED_NUM_LOCK_PIN  B14
-#define LED_CAPS_LOCK_PIN B15
diff --git a/keyboards/phrygian/ph100/info.json b/keyboards/phrygian/ph100/info.json
index 0046f260d7..961488898a 100644
--- a/keyboards/phrygian/ph100/info.json
+++ b/keyboards/phrygian/ph100/info.json
@@ -8,6 +8,10 @@
        "pid": "0x0C61",
        "device_version": "1.0.0"
    },
+    "indicators": {
+        "caps_lock": "B15",
+        "num_lock": "B14"
+    },
    "processor": "STM32F042",
    "bootloader": "stm32-dfu",
    "debounce": 10,
diff --git a/keyboards/pixelspace/capsule65i/config.h b/keyboards/pixelspace/capsule65i/config.h
index bce7c917ee..0839c054a9 100644
--- a/keyboards/pixelspace/capsule65i/config.h
+++ b/keyboards/pixelspace/capsule65i/config.h
@@ -36,8 +36,6 @@
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN F6
 #define RGB_DI_PIN F7
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/pixelspace/capsule65i/info.json b/keyboards/pixelspace/capsule65i/info.json
index ef1c6db09b..f63ec17aee 100644
--- a/keyboards/pixelspace/capsule65i/info.json
+++ b/keyboards/pixelspace/capsule65i/info.json
@@ -8,6 +8,9 @@
        "pid": "0xE66E",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "F6"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layout_aliases": {
diff --git a/keyboards/pjb/eros/config.h b/keyboards/pjb/eros/config.h
index 784e044071..cceef3dc82 100644
--- a/keyboards/pjb/eros/config.h
+++ b/keyboards/pjb/eros/config.h
@@ -24,7 +24,3 @@
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, D4, D5, B4, D3, D2, E6, B3 }
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN D6
-#define LED_SCROLL_LOCK_PIN D0
-#define LED_PIN_ON_STATE 0
diff --git a/keyboards/pjb/eros/info.json b/keyboards/pjb/eros/info.json
index 0da1a7db5b..cbba6dcecc 100644
--- a/keyboards/pjb/eros/info.json
+++ b/keyboards/pjb/eros/info.json
@@ -8,6 +8,11 @@
        "pid": "0x4552",
        "device_version": "2.0.0"
    },
+    "indicators": {
+        "caps_lock": "D6",
+        "scroll_lock": "D0",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layout_aliases": {
diff --git a/keyboards/playkbtw/ca66/config.h b/keyboards/playkbtw/ca66/config.h
index d92334a386..0ed9554e3f 100644
--- a/keyboards/playkbtw/ca66/config.h
+++ b/keyboards/playkbtw/ca66/config.h
@@ -12,8 +12,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN D1
 #define BACKLIGHT_PIN F0
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/playkbtw/ca66/info.json b/keyboards/playkbtw/ca66/info.json
index 3240422151..8537254d54 100644
--- a/keyboards/playkbtw/ca66/info.json
+++ b/keyboards/playkbtw/ca66/info.json
@@ -8,6 +8,9 @@
        "pid": "0x6060",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "D1"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/playkbtw/helen80/config.h b/keyboards/playkbtw/helen80/config.h
index 248d8d1e3a..0b025785c1 100644
--- a/keyboards/playkbtw/helen80/config.h
+++ b/keyboards/playkbtw/helen80/config.h
@@ -58,7 +58,3 @@
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 #endif
-#define LED_CAPS_LOCK_PIN B3
-#define LED_SCROLL_LOCK_PIN B2
-#define LED_PIN_ON_STATE 0
diff --git a/keyboards/playkbtw/helen80/info.json b/keyboards/playkbtw/helen80/info.json
index 5968f4f6e9..2efe949d75 100644
--- a/keyboards/playkbtw/helen80/info.json
+++ b/keyboards/playkbtw/helen80/info.json
@@ -8,6 +8,11 @@
    "pid": "0x4845",
    "device_version": "0.0.1"
  },
+  "indicators": {
+    "caps_lock": "B3",
+    "scroll_lock": "B2",
+    "on_state": 0
+  },
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "community_layouts": ["tkl_ansi"],
diff --git a/keyboards/playkbtw/pk60/config.h b/keyboards/playkbtw/pk60/config.h
index 9973912506..693df06173 100644
--- a/keyboards/playkbtw/pk60/config.h
+++ b/keyboards/playkbtw/pk60/config.h
@@ -12,9 +12,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN F4
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B7
 #ifdef BACKLIGHT_PIN
 #define BACKLIGHT_LEVELS 5
diff --git a/keyboards/playkbtw/pk60/info.json b/keyboards/playkbtw/pk60/info.json
index f8048ded55..6c9094d253 100644
--- a/keyboards/playkbtw/pk60/info.json
+++ b/keyboards/playkbtw/pk60/info.json
@@ -8,6 +8,10 @@
    "pid": "0x6060",
    "device_version": "0.0.1"
  },
+  "indicators": {
+    "caps_lock": "F4",
+    "on_state": 0
+  },
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "community_layouts": ["60_ansi_split_bs_rshift"],
diff --git a/keyboards/poker87c/config.h b/keyboards/poker87c/config.h
index 2c95af9a7a..d68c810ae2 100644
--- a/keyboards/poker87c/config.h
+++ b/keyboards/poker87c/config.h
@@ -58,7 +58,3 @@
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 #endif
-#define LED_NUM_LOCK_PIN B1
-#define LED_CAPS_LOCK_PIN B3
-#define LED_SCROLL_LOCK_PIN B2
diff --git a/keyboards/poker87c/info.json b/keyboards/poker87c/info.json
index 27adbb74e3..247436cc11 100644
--- a/keyboards/poker87c/info.json
+++ b/keyboards/poker87c/info.json
@@ -8,6 +8,11 @@
        "pid": "0x087C",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B3",
+        "num_lock": "B1",
+        "scroll_lock": "B2"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layout_aliases": {
diff --git a/keyboards/poker87d/config.h b/keyboards/poker87d/config.h
index bc48396fc8..63cb5cce9b 100644
--- a/keyboards/poker87d/config.h
+++ b/keyboards/poker87d/config.h
@@ -58,7 +58,3 @@
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 #endif
-#define LED_NUM_LOCK_PIN B1
-#define LED_CAPS_LOCK_PIN B3
-#define LED_SCROLL_LOCK_PIN B2
diff --git a/keyboards/poker87d/info.json b/keyboards/poker87d/info.json
index 82d72f091c..20e85800d8 100644
--- a/keyboards/poker87d/info.json
+++ b/keyboards/poker87d/info.json
@@ -8,6 +8,11 @@
        "pid": "0x087D",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B3",
+        "num_lock": "B1",
+        "scroll_lock": "B2"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layout_aliases": {
diff --git a/keyboards/pos78/config.h b/keyboards/pos78/config.h
index 608565adf6..bae2a91131 100644
--- a/keyboards/pos78/config.h
+++ b/keyboards/pos78/config.h
@@ -42,11 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-/* Hardware LED pins*/
-#define LED_CAPS_LOCK_PIN D4
-#define LED_NUM_LOCK_PIN D2
-#define LED_PIN_ON_STATE 1
 /*
 * Feature disable options
 *  These options are also useful to firmware size reduction.
diff --git a/keyboards/pos78/info.json b/keyboards/pos78/info.json
index cca5c4ac89..6e8788300f 100644
--- a/keyboards/pos78/info.json
+++ b/keyboards/pos78/info.json
@@ -8,6 +8,10 @@
        "pid": "0x7878",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "D4",
+        "num_lock": "D2"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/primekb/meridian_rgb/config.h b/keyboards/primekb/meridian_rgb/config.h
index 9b056dece5..38162cc959 100644
--- a/keyboards/primekb/meridian_rgb/config.h
+++ b/keyboards/primekb/meridian_rgb/config.h
@@ -41,10 +41,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_LIMIT_VAL 200
-#define LED_NUM_LOCK_PIN B0
-#define LED_CAPS_LOCK_PIN B1
-#define LED_SCROLL_LOCK_PIN B2
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/primekb/meridian_rgb/info.json b/keyboards/primekb/meridian_rgb/info.json
index 5e04483018..c3dcca05e8 100644
--- a/keyboards/primekb/meridian_rgb/info.json
+++ b/keyboards/primekb/meridian_rgb/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0042",
        "device_version": "0.0.2"
    },
+    "indicators": {
+        "caps_lock": "B1",
+        "num_lock": "B0",
+        "scroll_lock": "B2"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/projectcain/vault35/config.h b/keyboards/projectcain/vault35/config.h
index 93192ba1ba..78b8c6536b 100644
--- a/keyboards/projectcain/vault35/config.h
+++ b/keyboards/projectcain/vault35/config.h
@@ -39,12 +39,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODERS_PAD_B { D7 }
 #define ENCODER_RESOLUTION 2
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/projectcain/vault45/config.h b/keyboards/projectcain/vault45/config.h
index 179d3bb95e..2a51fbc03e 100644
--- a/keyboards/projectcain/vault45/config.h
+++ b/keyboards/projectcain/vault45/config.h
@@ -42,12 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODERS_PAD_B { B2, D2 }
 #define ENCODER_RESOLUTION 2
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/protozoa/cassini/config.h b/keyboards/protozoa/cassini/config.h
index 2205304bd8..18da2b20c6 100644
--- a/keyboards/protozoa/cassini/config.h
+++ b/keyboards/protozoa/cassini/config.h
@@ -30,7 +30,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
-/* Indicator LEDs */
-#define LED_CAPS_LOCK_PIN B6
-#define LED_PIN_ON_STATE 0
diff --git a/keyboards/protozoa/cassini/info.json b/keyboards/protozoa/cassini/info.json
index 6cce88c9bf..422bb0ac71 100644
--- a/keyboards/protozoa/cassini/info.json
+++ b/keyboards/protozoa/cassini/info.json
@@ -8,6 +8,10 @@
        "pid": "0x4341",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B6",
+        "on_state": 0
+    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/pteron36/config.h b/keyboards/pteron36/config.h
index aa999ef9d4..b30c0ac383 100644
--- a/keyboards/pteron36/config.h
+++ b/keyboards/pteron36/config.h
@@ -43,12 +43,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define SOFT_SERIAL_PIN D3  // or D1, D2, D3, E6
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/qpockets/wanten/config.h b/keyboards/qpockets/wanten/config.h
index 20062e3484..88441aa7a2 100644
--- a/keyboards/qpockets/wanten/config.h
+++ b/keyboards/qpockets/wanten/config.h
@@ -45,12 +45,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODER_RESOLUTION 4
 //#define ENCODER_DIRECTION_FLIP
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 /*
 * Feature disable options
 *  These options are also useful to firmware size reduction.
diff --git a/keyboards/qwertlekeys/calice/config.h b/keyboards/qwertlekeys/calice/config.h
index 84563fbc21..ba9cb5b015 100644
--- a/keyboards/qwertlekeys/calice/config.h
+++ b/keyboards/qwertlekeys/calice/config.h
@@ -25,8 +25,6 @@
 #define MATRIX_ROW_PINS {F0, F1, F5, F4, C6, C7, B5, B6, D4, D2, D5, D3}
 #define MATRIX_COL_PINS {D7, B4, F7, F6, D1, B7, B3, B2} 
-#define LED_CAPS_LOCK_PIN D6
 /* Envoder */
 #define ENCODERS_PAD_A {B0}
 #define ENCODERS_PAD_B {B1}
diff --git a/keyboards/qwertlekeys/calice/info.json b/keyboards/qwertlekeys/calice/info.json
index 5ae9eefc11..1d3f5cb90a 100644
--- a/keyboards/qwertlekeys/calice/info.json
+++ b/keyboards/qwertlekeys/calice/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0001",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "D6"
+    },
    "bootmagic": {
        "matrix": [1, 0]
    },
diff --git a/keyboards/rart/rart45/config.h b/keyboards/rart/rart45/config.h
index 7b3ba660c4..c3e3f80f97 100644
--- a/keyboards/rart/rart45/config.h
+++ b/keyboards/rart/rart45/config.h
@@ -26,9 +26,6 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN D5
-#define LED_PIN_ON_STATE 0
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/rart/rart45/info.json b/keyboards/rart/rart45/info.json
index 13c8c8e704..3a3b42f1f6 100644
--- a/keyboards/rart/rart45/info.json
+++ b/keyboards/rart/rart45/info.json
@@ -8,6 +8,10 @@
    "pid": "0x0045",
    "device_version": "0.0.1"
  },
+  "indicators": {
+    "caps_lock": "D5",
+    "on_state": 0
+  },
  "processor": "atmega328p",
  "bootloader": "usbasploader",
  "layouts": {
diff --git a/keyboards/rart/rart60/config.h b/keyboards/rart/rart60/config.h
index 643ce3d657..410fd3bd95 100644
--- a/keyboards/rart/rart60/config.h
+++ b/keyboards/rart/rart60/config.h
@@ -23,9 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-#define LED_CAPS_LOCK_PIN GP19
-#define LED_PIN_ON_STATE 0
 /* disable debug print */
 //#define NO_DEBUG
diff --git a/keyboards/rart/rart60/info.json b/keyboards/rart/rart60/info.json
index 91e8eef9ee..44e795b54f 100644
--- a/keyboards/rart/rart60/info.json
+++ b/keyboards/rart/rart60/info.json
@@ -23,6 +23,10 @@
        "pid": "0x0060",
        "vid": "0x414C"
    },
+    "indicators": {
+        "caps_lock": "GP19",
+        "on_state": 0
+    },
    "bootmagic": {
        "matrix": [0, 1]
    },
diff --git a/keyboards/rart/rart75hs/config.h b/keyboards/rart/rart75hs/config.h
index 92592a007d..ff9647ef6a 100644
--- a/keyboards/rart/rart75hs/config.h
+++ b/keyboards/rart/rart75hs/config.h
@@ -35,9 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-#define LED_CAPS_LOCK_PIN D4
-#define LED_PIN_ON_STATE 0
 #define ENCODERS_PAD_A { C1 }
 #define ENCODERS_PAD_B { C2 }
 #define ENCODER_RESOLUTION 4 //default/suggested
diff --git a/keyboards/rart/rart75hs/info.json b/keyboards/rart/rart75hs/info.json
index 8056508f6f..a7ac977112 100644
--- a/keyboards/rart/rart75hs/info.json
+++ b/keyboards/rart/rart75hs/info.json
@@ -8,6 +8,10 @@
        "pid": "0x5575",
        "device_version": "0.0.3"
    },
+    "indicators": {
+        "caps_lock": "D4",
+        "on_state": 0
+    },
    "bootmagic": {
        "matrix": [0, 1]
    },
diff --git a/keyboards/rart/rart80/config.h b/keyboards/rart/rart80/config.h
index 7657051e01..9049fdf2d7 100644
--- a/keyboards/rart/rart80/config.h
+++ b/keyboards/rart/rart80/config.h
@@ -35,9 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-#define LED_CAPS_LOCK_PIN D4
-#define LED_PIN_ON_STATE 0
 #define RGB_DI_PIN D5
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/rart/rart80/info.json b/keyboards/rart/rart80/info.json
index 47d54cc7ec..28775d7b51 100644
--- a/keyboards/rart/rart80/info.json
+++ b/keyboards/rart/rart80/info.json
@@ -8,6 +8,10 @@
        "pid": "0x0080",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "D4",
+        "on_state": 0
+    },
    "bootmagic": {
        "matrix": [0, 1]
    },
diff --git a/keyboards/rart/rartand/config.h b/keyboards/rart/rartand/config.h
index 06f7d7ad4a..1fc613b05b 100644
--- a/keyboards/rart/rartand/config.h
+++ b/keyboards/rart/rartand/config.h
@@ -26,9 +26,6 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN D5
-#define LED_PIN_ON_STATE 0
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/rart/rartand/info.json b/keyboards/rart/rartand/info.json
index 621d7b61bf..eeb99a3cd4 100644
--- a/keyboards/rart/rartand/info.json
+++ b/keyboards/rart/rartand/info.json
@@ -8,6 +8,10 @@
    "pid": "0x5050",
    "device_version": "0.0.1"
  },
+  "indicators": {
+    "caps_lock": "D5",
+    "on_state": 0
+  },
  "processor": "atmega328p",
  "bootloader": "usbasploader",
  "layouts": {
diff --git a/keyboards/rart/rartland/config.h b/keyboards/rart/rartland/config.h
index 5bfa892a47..4681f2c38e 100644
--- a/keyboards/rart/rartland/config.h
+++ b/keyboards/rart/rartland/config.h
@@ -35,9 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { B4, A7, A5, A6, C3 }
 #define MATRIX_COL_PINS { B0, A1, B1, A2, B2, A3, B3, A4, C7, C6, D0, C5, D1, C4 }
-#define LED_CAPS_LOCK_PIN A0
-#define LED_PIN_ON_STATE 0
 #define ENCODERS_PAD_B { D5 }
 #define ENCODERS_PAD_A { C2 }
 #define ENCODER_RESOLUTION 2 //default/suggested
diff --git a/keyboards/rart/rartland/info.json b/keyboards/rart/rartland/info.json
index 67e77b90c4..8dbc85f13f 100644
--- a/keyboards/rart/rartland/info.json
+++ b/keyboards/rart/rartland/info.json
@@ -8,6 +8,10 @@
        "pid": "0x6065",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "A0",
+        "on_state": 0
+    },
    "processor": "atmega32a",
    "bootloader": "usbasploader",
    "community_layouts": ["65_ansi", "65_iso"],
diff --git a/keyboards/rart/rartlice/config.h b/keyboards/rart/rartlice/config.h
index 72746ddeef..f4ab10d564 100644
--- a/keyboards/rart/rartlice/config.h
+++ b/keyboards/rart/rartlice/config.h
@@ -30,11 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-#define LED_NUM_LOCK_PIN A8
-#define LED_CAPS_LOCK_PIN B14
-#define LED_SCROLL_LOCK_PIN A9
-#define LED_PIN_ON_STATE 0
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/rart/rartlice/info.json b/keyboards/rart/rartlice/info.json
index 3e06116c80..dccdcf2132 100644
--- a/keyboards/rart/rartlice/info.json
+++ b/keyboards/rart/rartlice/info.json
@@ -8,6 +8,12 @@
        "pid": "0x0065",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B14",
+        "num_lock": "A8",
+        "scroll_lock": "A9",
+        "on_state": 0
+    },
    "processor": "STM32F103",
    "bootloader": "stm32duino",
    "layouts": {
diff --git a/keyboards/rart/rartlite/config.h b/keyboards/rart/rartlite/config.h
index 5fc55cdc71..b4b77bf6a6 100644
--- a/keyboards/rart/rartlite/config.h
+++ b/keyboards/rart/rartlite/config.h
@@ -29,11 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN F5
-#define LED_NUM_LOCK_PIN F6
-#define LED_PIN_ON_STATE 0
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/rart/rartlite/info.json b/keyboards/rart/rartlite/info.json
index 44a535aac5..1bbde23999 100644
--- a/keyboards/rart/rartlite/info.json
+++ b/keyboards/rart/rartlite/info.json
@@ -8,6 +8,11 @@
        "pid": "0x4040",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "F5",
+        "num_lock": "F6",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "layouts": {
diff --git a/keyboards/rart/rartpad/config.h b/keyboards/rart/rartpad/config.h
index 06e52d0b12..0f7907bd6e 100644
--- a/keyboards/rart/rartpad/config.h
+++ b/keyboards/rart/rartpad/config.h
@@ -29,9 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN D7
-#define LED_PIN_ON_STATE 1
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/rart/rartpad/info.json b/keyboards/rart/rartpad/info.json
index bf1b231544..03918a6886 100644
--- a/keyboards/rart/rartpad/info.json
+++ b/keyboards/rart/rartpad/info.json
@@ -8,6 +8,9 @@
      "pid": "0x0050",
      "device_version": "0.0.1"
  },
+  "indicators": {
+      "caps_lock": "D7"
+  },
  "processor": "atmega32u4",
  "bootloader": "caterina",
  "community_layouts": ["ortho_5x4", "numpad_5x4"],
diff --git a/keyboards/redscarf_iiplus/verb/config.h b/keyboards/redscarf_iiplus/verb/config.h
index af28efba48..58177ba51b 100755
--- a/keyboards/redscarf_iiplus/verb/config.h
+++ b/keyboards/redscarf_iiplus/verb/config.h
@@ -39,10 +39,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN E6
-#define LED_CAPS_LOCK_PIN C7
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B7
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/redscarf_iiplus/verb/info.json b/keyboards/redscarf_iiplus/verb/info.json
index 45096a152f..42879d8ee5 100644
--- a/keyboards/redscarf_iiplus/verb/info.json
+++ b/keyboards/redscarf_iiplus/verb/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0000",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C7",
+        "num_lock": "E6",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "qmk-dfu",
    "layouts": {
diff --git a/keyboards/redscarf_iiplus/verc/config.h b/keyboards/redscarf_iiplus/verc/config.h
index af28efba48..58177ba51b 100755
--- a/keyboards/redscarf_iiplus/verc/config.h
+++ b/keyboards/redscarf_iiplus/verc/config.h
@@ -39,10 +39,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN E6
-#define LED_CAPS_LOCK_PIN C7
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B7
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/redscarf_iiplus/verc/info.json b/keyboards/redscarf_iiplus/verc/info.json
index 0a951ade69..fa425fa85d 100644
--- a/keyboards/redscarf_iiplus/verc/info.json
+++ b/keyboards/redscarf_iiplus/verc/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0000",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C7",
+        "num_lock": "E6",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "qmk-dfu",
    "community_layouts": ["65_ansi"],
diff --git a/keyboards/redscarf_iiplus/verd/config.h b/keyboards/redscarf_iiplus/verd/config.h
index 27d02b108f..d770eaf812 100644
--- a/keyboards/redscarf_iiplus/verd/config.h
+++ b/keyboards/redscarf_iiplus/verd/config.h
@@ -38,10 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN E6
-#define LED_CAPS_LOCK_PIN C6
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B7
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/redscarf_iiplus/verd/info.json b/keyboards/redscarf_iiplus/verd/info.json
index 33d210a4f6..74c63bc54f 100644
--- a/keyboards/redscarf_iiplus/verd/info.json
+++ b/keyboards/redscarf_iiplus/verd/info.json
@@ -8,6 +8,11 @@
    "pid": "0x7778",
    "device_version": "0.0.1"
  },
+  "indicators": {
+    "caps_lock": "C6",
+    "num_lock": "E6",
+    "on_state": 0
+  },
  "processor": "atmega32u4",
  "bootloader": "halfkay",
  "layouts": {  
diff --git a/keyboards/reversestudio/decadepad/config.h b/keyboards/reversestudio/decadepad/config.h
index 22fd58adc2..ca7da08e64 100644
--- a/keyboards/reversestudio/decadepad/config.h
+++ b/keyboards/reversestudio/decadepad/config.h
@@ -29,9 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN D4
-#define LED_PIN_ON_STATE 0
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/reversestudio/decadepad/info.json b/keyboards/reversestudio/decadepad/info.json
index ef3d026c64..11a57ea4fd 100644
--- a/keyboards/reversestudio/decadepad/info.json
+++ b/keyboards/reversestudio/decadepad/info.json
@@ -8,6 +8,10 @@
        "pid": "0x4450",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "num_lock": "D4",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["numpad_6x4"],
diff --git a/keyboards/reviung/reviung53/config.h b/keyboards/reviung/reviung53/config.h
index c205e24369..1b4c0ceff8 100644
--- a/keyboards/reviung/reviung53/config.h
+++ b/keyboards/reviung/reviung53/config.h
@@ -24,12 +24,6 @@
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 #define RGB_DI_PIN D3
 #ifdef RGB_DI_PIN
 #define RGBLED_NUM 10
diff --git a/keyboards/rmi_kb/mona/v1_1/config.h b/keyboards/rmi_kb/mona/v1_1/config.h
index 2d7b5e33e4..cc1173b3e4 100644
--- a/keyboards/rmi_kb/mona/v1_1/config.h
+++ b/keyboards/rmi_kb/mona/v1_1/config.h
@@ -37,6 +37,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-/* indicator LEDs */
-#define LED_CAPS_LOCK_PIN B3
diff --git a/keyboards/rmi_kb/mona/v1_1/info.json b/keyboards/rmi_kb/mona/v1_1/info.json
index 77488da230..f59541cd83 100644
--- a/keyboards/rmi_kb/mona/v1_1/info.json
+++ b/keyboards/rmi_kb/mona/v1_1/info.json
@@ -8,6 +8,9 @@
        "pid": "0x404B",
        "device_version": "0.1.1"
    },
+    "indicators": {
+        "caps_lock": "B3"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/rmi_kb/mona/v32a/config.h b/keyboards/rmi_kb/mona/v32a/config.h
index 1363c8635a..e1b162e93b 100644
--- a/keyboards/rmi_kb/mona/v32a/config.h
+++ b/keyboards/rmi_kb/mona/v32a/config.h
@@ -37,6 +37,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-/* indicator LEDs */
-#define LED_CAPS_LOCK_PIN C1
diff --git a/keyboards/rmi_kb/mona/v32a/info.json b/keyboards/rmi_kb/mona/v32a/info.json
index 3e802d1a4e..03d2dfa9f6 100644
--- a/keyboards/rmi_kb/mona/v32a/info.json
+++ b/keyboards/rmi_kb/mona/v32a/info.json
@@ -8,6 +8,9 @@
        "pid": "0x4032",
        "device_version": "0.1.1"
    },
+    "indicators": {
+        "caps_lock": "C1"
+    },
    "processor": "atmega32a",
    "bootloader": "usbasploader",
    "layouts": {
diff --git a/keyboards/rmi_kb/squishyfrl/config.h b/keyboards/rmi_kb/squishyfrl/config.h
index 4997395a45..130c531c56 100644
--- a/keyboards/rmi_kb/squishyfrl/config.h
+++ b/keyboards/rmi_kb/squishyfrl/config.h
@@ -39,12 +39,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 #define RGB_DI_PIN C15
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM 16
diff --git a/keyboards/rmi_kb/squishytkl/config.h b/keyboards/rmi_kb/squishytkl/config.h
index 8fa3a43667..c57f9f8591 100644
--- a/keyboards/rmi_kb/squishytkl/config.h
+++ b/keyboards/rmi_kb/squishytkl/config.h
@@ -39,12 +39,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 #define RGB_DI_PIN C15
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM 16
diff --git a/keyboards/rmi_kb/tkl_ff/config.h b/keyboards/rmi_kb/tkl_ff/config.h
index 2aeec8d58c..b8ed645cb2 100644
--- a/keyboards/rmi_kb/tkl_ff/config.h
+++ b/keyboards/rmi_kb/tkl_ff/config.h
@@ -38,12 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/rmi_kb/wete/v2/config.h b/keyboards/rmi_kb/wete/v2/config.h
index 7edcb3f1ea..d5c58f8f05 100644
--- a/keyboards/rmi_kb/wete/v2/config.h
+++ b/keyboards/rmi_kb/wete/v2/config.h
@@ -42,12 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODERS_PAD_A { D2 }
 #define ENCODERS_PAD_B { D1 }
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 #define RGBLIGHT_LAYERS
 #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
diff --git a/keyboards/rmkeebs/rm_numpad/config.h b/keyboards/rmkeebs/rm_numpad/config.h
index 55426b7a73..9281b18af4 100644
--- a/keyboards/rmkeebs/rm_numpad/config.h
+++ b/keyboards/rmkeebs/rm_numpad/config.h
@@ -44,12 +44,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODERS_PAD_A { D7 }
 #define ENCODERS_PAD_B { D4 }
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 /*
 * Feature disable options
 *  These options are also useful to firmware size reduction.
diff --git a/keyboards/runes/vaengr/config.h b/keyboards/runes/vaengr/config.h
index 81bc45fbf2..0042118b86 100644
--- a/keyboards/runes/vaengr/config.h
+++ b/keyboards/runes/vaengr/config.h
@@ -38,12 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 #define RGB_DI_PIN C7
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/sam/sg81m/config.h b/keyboards/sam/sg81m/config.h
index 89aadb413a..2c9af98a10 100644
--- a/keyboards/sam/sg81m/config.h
+++ b/keyboards/sam/sg81m/config.h
@@ -20,7 +20,7 @@
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 14
-#define LED_CAPS_LOCK_PIN B0
 /*
 * Keyboard Matrix Assignments
 *
diff --git a/keyboards/sam/sg81m/info.json b/keyboards/sam/sg81m/info.json
index 0747be0657..ebf5dda947 100644
--- a/keyboards/sam/sg81m/info.json
+++ b/keyboards/sam/sg81m/info.json
@@ -8,6 +8,9 @@
        "pid": "0x3831",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B0"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/sandwich/keeb68/config.h b/keyboards/sandwich/keeb68/config.h
index c165a6acd4..8b3a3c4ccd 100644
--- a/keyboards/sandwich/keeb68/config.h
+++ b/keyboards/sandwich/keeb68/config.h
@@ -38,12 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 #define BACKLIGHT_PIN C7
 #define BACKLIGHT_LEVELS 5
 #define BACKLIGHT_BREATHING
diff --git a/keyboards/sauce/mild/config.h b/keyboards/sauce/mild/config.h
index a9de3f4545..500c9aa14b 100644
--- a/keyboards/sauce/mild/config.h
+++ b/keyboards/sauce/mild/config.h
@@ -41,6 +41,3 @@
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-#define LED_CAPS_LOCK_PIN A6
-#define LED_SCROLL_LOCK_PIN B14
diff --git a/keyboards/sauce/mild/info.json b/keyboards/sauce/mild/info.json
index 623a75dbc0..90b36d48f8 100644
--- a/keyboards/sauce/mild/info.json
+++ b/keyboards/sauce/mild/info.json
@@ -8,6 +8,10 @@
    "pid": "0x7783",
    "device_version": "0.0.1"
  },
+  "indicators": {
+    "caps_lock": "A6",
+    "scroll_lock": "B14"
+  },
  "processor": "STM32F072",
  "bootloader": "stm32-dfu",
  "layouts": {
diff --git a/keyboards/sawnsprojects/amber80/solder/config.h b/keyboards/sawnsprojects/amber80/solder/config.h
index 0e26624079..9f4e397b2a 100644
--- a/keyboards/sawnsprojects/amber80/solder/config.h
+++ b/keyboards/sawnsprojects/amber80/solder/config.h
@@ -21,10 +21,6 @@
 #define MATRIX_ROWS 12
 #define MATRIX_COLS 9
-/* Indicator */
-#define LED_CAPS_LOCK_PIN F5
-#define LED_SCROLL_LOCK_PIN B0
-#define LED_PIN_ON_STATE 0
 /*
 * Keyboard Matrix Assignments
 *
diff --git a/keyboards/sawnsprojects/amber80/solder/info.json b/keyboards/sawnsprojects/amber80/solder/info.json
index dabfc538f8..1e9870fa90 100644
--- a/keyboards/sawnsprojects/amber80/solder/info.json
+++ b/keyboards/sawnsprojects/amber80/solder/info.json
@@ -8,6 +8,11 @@
        "pid": "0xA801",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "F5",
+        "scroll_lock": "B0",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/config.h b/keyboards/sawnsprojects/krush/krush60/solder/config.h
index be5df82e9b..84a53e5615 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/config.h
+++ b/keyboards/sawnsprojects/krush/krush60/solder/config.h
@@ -26,9 +26,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-/* Caps Lock */
-#define LED_CAPS_LOCK_PIN F0
-#define LED_PIN_ON_STATE 0
 #define RGB_DI_PIN F1
 #ifdef RGB_DI_PIN
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/info.json b/keyboards/sawnsprojects/krush/krush60/solder/info.json
index 36ff901d04..a54172480d 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/info.json
+++ b/keyboards/sawnsprojects/krush/krush60/solder/info.json
@@ -8,6 +8,10 @@
        "pid": "0x6B32",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "F0",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layout_aliases": {
diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/config.h b/keyboards/sawnsprojects/krush/krush65/hotswap/config.h
index 3f102ba5e7..5ed50a5bcd 100644
--- a/keyboards/sawnsprojects/krush/krush65/hotswap/config.h
+++ b/keyboards/sawnsprojects/krush/krush65/hotswap/config.h
@@ -26,9 +26,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-/* Caps Lock */
-#define LED_CAPS_LOCK_PIN B0
-#define LED_PIN_ON_STATE 0
 /* Encoders */
diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/info.json b/keyboards/sawnsprojects/krush/krush65/hotswap/info.json
index 1e60b0743b..43faca4437 100644
--- a/keyboards/sawnsprojects/krush/krush65/hotswap/info.json
+++ b/keyboards/sawnsprojects/krush/krush65/hotswap/info.json
@@ -8,6 +8,10 @@
        "pid": "0x5B31",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B0",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/sawnsprojects/krush/krush65/solder/config.h b/keyboards/sawnsprojects/krush/krush65/solder/config.h
index 7519de6544..d5c0877c68 100644
--- a/keyboards/sawnsprojects/krush/krush65/solder/config.h
+++ b/keyboards/sawnsprojects/krush/krush65/solder/config.h
@@ -24,14 +24,8 @@
 #define MATRIX_ROW_PINS { B1, B2, D1, D2, D4, D6, F6, F7, F5, F4 }
 #define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D5, D3 }
-/* indicator */
-//  #define LED_CAPS_LOCK_PIN F0
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-/* Caps Lock */
-#define LED_CAPS_LOCK_PIN F0
-#define LED_PIN_ON_STATE 0
 /* rotary */
 #define ENCODERS_PAD_A { D0 }
diff --git a/keyboards/sawnsprojects/krush/krush65/solder/info.json b/keyboards/sawnsprojects/krush/krush65/solder/info.json
index cabe517724..a0661b715a 100644
--- a/keyboards/sawnsprojects/krush/krush65/solder/info.json
+++ b/keyboards/sawnsprojects/krush/krush65/solder/info.json
@@ -8,6 +8,10 @@
        "pid": "0x6B31",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "F0",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layout_aliases": {
diff --git a/keyboards/sawnsprojects/vcl65/solder/config.h b/keyboards/sawnsprojects/vcl65/solder/config.h
index 2477e07f76..14770d6942 100644
--- a/keyboards/sawnsprojects/vcl65/solder/config.h
+++ b/keyboards/sawnsprojects/vcl65/solder/config.h
@@ -24,15 +24,8 @@
 #define MATRIX_ROW_PINS { F6, F7, F0, F4, B1 }
 #define MATRIX_COL_PINS { B2, B5, F5, C7, B4, C6, D7, D6, D4, D5, D3, D2, B6, D1, D0 }
-/* indicator */
-//  #define LED_CAPS_LOCK_PIN F0
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-/* Caps Lock */
-#define LED_CAPS_LOCK_PIN F1
-#define LED_PIN_ON_STATE 0
-/* rotary */
 #define RGB_DI_PIN B7
 #ifdef RGB_DI_PIN
diff --git a/keyboards/sawnsprojects/vcl65/solder/info.json b/keyboards/sawnsprojects/vcl65/solder/info.json
index aa5c326c7d..1b0c638ecc 100644
--- a/keyboards/sawnsprojects/vcl65/solder/info.json
+++ b/keyboards/sawnsprojects/vcl65/solder/info.json
@@ -8,6 +8,10 @@
        "pid": "0x1727",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "F1",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/sck/osa/config.h b/keyboards/sck/osa/config.h
index 754bdea88d..afb3ad25f6 100644
--- a/keyboards/sck/osa/config.h
+++ b/keyboards/sck/osa/config.h
@@ -48,10 +48,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
   #endif
-#define LED_NUM_LOCK_PIN C7
-#define LED_CAPS_LOCK_PIN C6
-#define LED_SCROLL_LOCK_PIN B6
 /*
 * Feature disable options
 *  These options are also useful to firmware size reduction.
diff --git a/keyboards/sck/osa/info.json b/keyboards/sck/osa/info.json
index dafee91cd2..c919d3b6e8 100644
--- a/keyboards/sck/osa/info.json
+++ b/keyboards/sck/osa/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0001",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C6",
+        "num_lock": "C7",
+        "scroll_lock": "B6"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["alice", "alice_split_bs"],
diff --git a/keyboards/sentraq/s65_plus/config.h b/keyboards/sentraq/s65_plus/config.h
index 4354341c26..0d1756136e 100644
--- a/keyboards/sentraq/s65_plus/config.h
+++ b/keyboards/sentraq/s65_plus/config.h
@@ -9,9 +9,6 @@
 #define MATRIX_ROW_PINS { C7, C6, B6, B5, B4 }
 #define MATRIX_COL_PINS { F6, F5, F4, F1, F0, E6, B0, B1, D5, B2, B3, D0, D1, D2, D4, D6, D7, F7 }
-#define LED_CAPS_LOCK_PIN B7
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B7
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/sentraq/s65_plus/info.json b/keyboards/sentraq/s65_plus/info.json
index 5e5f2d3303..0e9f0fce75 100644
--- a/keyboards/sentraq/s65_plus/info.json
+++ b/keyboards/sentraq/s65_plus/info.json
@@ -8,6 +8,10 @@
    "pid": "0x6060",
    "device_version": "0.0.1"
  },
+  "indicators": {
+    "caps_lock": "B7",
+    "on_state": 0
+  },
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "layouts": {
diff --git a/keyboards/singa/config.h b/keyboards/singa/config.h
index 9ffc729c9d..e87cc7dd9f 100644
--- a/keyboards/singa/config.h
+++ b/keyboards/singa/config.h
@@ -28,8 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN D1
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/singa/info.json b/keyboards/singa/info.json
index b97720d784..6a1271e237 100644
--- a/keyboards/singa/info.json
+++ b/keyboards/singa/info.json
@@ -8,6 +8,9 @@
      "pid": "0x7575",
      "device_version": "2.0.0"
    },
+    "indicators": {
+      "caps_lock": "D1"
+    },
    "processor": "atmega32a",
    "bootloader": "bootloadhid",
    "layouts": {
diff --git a/keyboards/skeletn87/hotswap/config.h b/keyboards/skeletn87/hotswap/config.h
index 2421d40791..1e8f5d9e5e 100644
--- a/keyboards/skeletn87/hotswap/config.h
+++ b/keyboards/skeletn87/hotswap/config.h
@@ -29,9 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN E6
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B7
 #define BACKLIGHT_LEVELS 8
 #define BACKLIGHT_BREATHING
diff --git a/keyboards/skeletn87/hotswap/info.json b/keyboards/skeletn87/hotswap/info.json
index 39b7461521..cf326cff80 100644
--- a/keyboards/skeletn87/hotswap/info.json
+++ b/keyboards/skeletn87/hotswap/info.json
@@ -8,6 +8,10 @@
        "pid": "0xB5E9",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "E6",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["tkl_ansi"],
diff --git a/keyboards/skeletn87/soldered/config.h b/keyboards/skeletn87/soldered/config.h
index 3e4d612ad3..0998c35cfb 100644
--- a/keyboards/skeletn87/soldered/config.h
+++ b/keyboards/skeletn87/soldered/config.h
@@ -29,9 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN E6
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B7
 #define BACKLIGHT_LEVELS 8
 #define BACKLIGHT_BREATHING
diff --git a/keyboards/skeletn87/soldered/info.json b/keyboards/skeletn87/soldered/info.json
index 702cefed6c..20c94f4625 100644
--- a/keyboards/skeletn87/soldered/info.json
+++ b/keyboards/skeletn87/soldered/info.json
@@ -8,6 +8,10 @@
        "pid": "0xB5E8",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "E6",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["tkl_ansi", "tkl_iso"],
diff --git a/keyboards/skeletonkbd/skeletonnumpad/config.h b/keyboards/skeletonkbd/skeletonnumpad/config.h
index 8e908e9c82..3c4af7e72f 100644
--- a/keyboards/skeletonkbd/skeletonnumpad/config.h
+++ b/keyboards/skeletonkbd/skeletonnumpad/config.h
@@ -38,12 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 #define RGB_DI_PIN D4
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM 17
diff --git a/keyboards/smithrune/iron165r2/config.h b/keyboards/smithrune/iron165r2/config.h
index a25c61d85b..1809e9dab3 100644
--- a/keyboards/smithrune/iron165r2/config.h
+++ b/keyboards/smithrune/iron165r2/config.h
@@ -26,8 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN A4
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/smithrune/iron165r2/info.json b/keyboards/smithrune/iron165r2/info.json
index 4d093a3350..ed24e0e63c 100644
--- a/keyboards/smithrune/iron165r2/info.json
+++ b/keyboards/smithrune/iron165r2/info.json
@@ -8,6 +8,9 @@
        "pid": "0x1652",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "A4"
+    },
    "layouts": {
        "LAYOUT_all": {
            "layout": [
diff --git a/keyboards/sneakbox/aliceclonergb/config.h b/keyboards/sneakbox/aliceclonergb/config.h
index 3fc0e22758..602a43d961 100644
--- a/keyboards/sneakbox/aliceclonergb/config.h
+++ b/keyboards/sneakbox/aliceclonergb/config.h
@@ -35,10 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN  D4
-#define LED_CAPS_LOCK_PIN D6
-#define LED_SCROLL_LOCK_PIN D7
 #define RGB_DI_PIN D5
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/sneakbox/aliceclonergb/info.json b/keyboards/sneakbox/aliceclonergb/info.json
index 69c7c7673f..02bf2c5e95 100644
--- a/keyboards/sneakbox/aliceclonergb/info.json
+++ b/keyboards/sneakbox/aliceclonergb/info.json
@@ -8,6 +8,11 @@
    "pid": "0x0006",
    "device_version": "0.0.1"
  },
+  "indicators": {
+    "caps_lock": "D6",
+    "num_lock": "D4",
+    "scroll_lock": "D7"
+  },
  "bootmagic": {
    "matrix": [2, 0]
  },
diff --git a/keyboards/sneakbox/ava/config.h b/keyboards/sneakbox/ava/config.h
index f3e63d974e..0cb1cf0a97 100644
--- a/keyboards/sneakbox/ava/config.h
+++ b/keyboards/sneakbox/ava/config.h
@@ -34,9 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN  D4
-#define LED_CAPS_LOCK_PIN D6
 #define RGB_DI_PIN F7
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/sneakbox/ava/info.json b/keyboards/sneakbox/ava/info.json
index 308a79fa3c..2d07121a7a 100644
--- a/keyboards/sneakbox/ava/info.json
+++ b/keyboards/sneakbox/ava/info.json
@@ -8,6 +8,10 @@
    "pid": "0x0004",
    "device_version": "0.0.1"
  },
+  "indicators": {
+    "caps_lock": "D6",
+    "num_lock": "D4"
+  },
  "bootmagic": {
    "matrix": [2, 0]
  },
diff --git a/keyboards/sneakbox/disarray/ortho/config.h b/keyboards/sneakbox/disarray/ortho/config.h
index 226e6ed2c4..6ce65b9816 100644
--- a/keyboards/sneakbox/disarray/ortho/config.h
+++ b/keyboards/sneakbox/disarray/ortho/config.h
@@ -41,10 +41,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-/* Define LED Indicator Pin */
-#define LED_NUM_LOCK_PIN B1
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/sneakbox/disarray/ortho/info.json b/keyboards/sneakbox/disarray/ortho/info.json
index 34fcd1a65e..894e61c256 100644
--- a/keyboards/sneakbox/disarray/ortho/info.json
+++ b/keyboards/sneakbox/disarray/ortho/info.json
@@ -8,6 +8,9 @@
    "pid": "0x0003",
    "device_version": "0.0.1"
  },
+  "indicators": {
+    "num_lock": "B1"
+  },
  "bootmagic": {
    "matrix": [1, 0]
  },
diff --git a/keyboards/sneakbox/disarray/staggered/config.h b/keyboards/sneakbox/disarray/staggered/config.h
index ee3d5b5624..a312757135 100644
--- a/keyboards/sneakbox/disarray/staggered/config.h
+++ b/keyboards/sneakbox/disarray/staggered/config.h
@@ -40,9 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-/* Define LED Indicator Pin */
-#define LED_NUM_LOCK_PIN B1
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/sneakbox/disarray/staggered/info.json b/keyboards/sneakbox/disarray/staggered/info.json
index 3c635f7bd1..536ae84ea7 100644
--- a/keyboards/sneakbox/disarray/staggered/info.json
+++ b/keyboards/sneakbox/disarray/staggered/info.json
@@ -8,6 +8,9 @@
    "pid": "0x0002",
    "device_version": "0.0.1"
  },
+  "indicators": {
+    "num_lock": "B1"
+  },
  "bootmagic": {
    "matrix": [1, 0]
  },
diff --git a/keyboards/soup10/config.h b/keyboards/soup10/config.h
index 20754fa2b3..2df0bcd384 100644
--- a/keyboards/soup10/config.h
+++ b/keyboards/soup10/config.h
@@ -39,12 +39,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/spacey/config.h b/keyboards/spacey/config.h
index ff0786b0bf..7bbd3d43d3 100644
--- a/keyboards/spacey/config.h
+++ b/keyboards/spacey/config.h
@@ -41,9 +41,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
diff --git a/keyboards/specskeys/config.h b/keyboards/specskeys/config.h
index b2c3443487..9952782471 100644
--- a/keyboards/specskeys/config.h
+++ b/keyboards/specskeys/config.h
@@ -37,12 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-#define LED_CAPS_LOCK_PIN C7
-#define LED_SCROLL_LOCK_PIN C6
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 #define BACKLIGHT_PIN B7
 #define BACKLIGHT_LEVELS 1
diff --git a/keyboards/specskeys/info.json b/keyboards/specskeys/info.json
index e38b64339c..57e0b92d51 100644
--- a/keyboards/specskeys/info.json
+++ b/keyboards/specskeys/info.json
@@ -8,6 +8,10 @@
        "pid": "0x0080",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C7",
+        "scroll_lock": "C6"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layout_aliases": {
diff --git a/keyboards/stello65/beta/config.h b/keyboards/stello65/beta/config.h
index 45d2047d4a..6439ebd80f 100644
--- a/keyboards/stello65/beta/config.h
+++ b/keyboards/stello65/beta/config.h
@@ -34,14 +34,6 @@
 #define ENCODERS_CCW_KEY { { 4, 6 } }
 #endif
-#define LED_CAPS_LOCK_PIN B3
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/stello65/beta/info.json b/keyboards/stello65/beta/info.json
index 364298d485..b38ff6e3f3 100644
--- a/keyboards/stello65/beta/info.json
+++ b/keyboards/stello65/beta/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0003",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B3"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/stello65/hs_rev1/config.h b/keyboards/stello65/hs_rev1/config.h
index 5a6e2249c1..9cdba1eeda 100644
--- a/keyboards/stello65/hs_rev1/config.h
+++ b/keyboards/stello65/hs_rev1/config.h
@@ -24,12 +24,6 @@
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 #define RGB_DI_PIN D0
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM 4
diff --git a/keyboards/stello65/sl_rev1/config.h b/keyboards/stello65/sl_rev1/config.h
index 7f50b5838b..a8f98dd8ea 100644
--- a/keyboards/stello65/sl_rev1/config.h
+++ b/keyboards/stello65/sl_rev1/config.h
@@ -24,12 +24,6 @@
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 #define RGB_DI_PIN B7
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM 4
diff --git a/keyboards/studiokestra/galatea/config.h b/keyboards/studiokestra/galatea/config.h
index ec1725fd6b..74ba4632a6 100644
--- a/keyboards/studiokestra/galatea/config.h
+++ b/keyboards/studiokestra/galatea/config.h
@@ -25,10 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { D1, D0, B0, B7, E6, B3, B6, C6, D6, D7, B4, D3 }
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B5
-#define LED_SCROLL_LOCK_PIN D2
-#define LED_PIN_ON_STATE 0
 #if defined(KEYBOARD_studiokestra_galatea_rev2)
  #define RGB_DI_PIN D4
  #define RGBLED_NUM 24
diff --git a/keyboards/studiokestra/galatea/rev1/info.json b/keyboards/studiokestra/galatea/rev1/info.json
index ee90d256a1..ce1b7f5816 100644
--- a/keyboards/studiokestra/galatea/rev1/info.json
+++ b/keyboards/studiokestra/galatea/rev1/info.json
@@ -8,6 +8,11 @@
        "pid": "0x8801",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B5",
+        "scroll_lock": "D2",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/studiokestra/galatea/rev2/info.json b/keyboards/studiokestra/galatea/rev2/info.json
index d79ab68c40..dc3865c584 100644
--- a/keyboards/studiokestra/galatea/rev2/info.json
+++ b/keyboards/studiokestra/galatea/rev2/info.json
@@ -8,6 +8,11 @@
        "pid": "0x8802",
        "device_version": "0.0.2"
    },
+    "indicators": {
+        "caps_lock": "B5",
+        "scroll_lock": "D2",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/studiokestra/nascent/config.h b/keyboards/studiokestra/nascent/config.h
index 4ce9f6230f..d70b85bf99 100644
--- a/keyboards/studiokestra/nascent/config.h
+++ b/keyboards/studiokestra/nascent/config.h
@@ -25,9 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { F5, F4, F7, F6, C6, C7, B4, B5, D0, D1 }
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B6
-#define LED_PIN_ON_STATE 0
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/studiokestra/nascent/info.json b/keyboards/studiokestra/nascent/info.json
index d9c5d2b785..43aba81924 100644
--- a/keyboards/studiokestra/nascent/info.json
+++ b/keyboards/studiokestra/nascent/info.json
@@ -8,6 +8,10 @@
        "pid": "0x0165",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B6",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": [
diff --git a/keyboards/suavity/ehan/config.h b/keyboards/suavity/ehan/config.h
index c3422f9b50..650955fcc8 100644
--- a/keyboards/suavity/ehan/config.h
+++ b/keyboards/suavity/ehan/config.h
@@ -28,10 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 // Current flow out of the diodes are from rows to columns
-#define LED_CAPS_LOCK_PIN B11 // LED for Step Caps
-#define LED_SCROLL_LOCK_PIN F1 // LED Indicator for Scroll Lock
-#define LED_PIN_ON_STATE 1
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/suavity/ehan/info.json b/keyboards/suavity/ehan/info.json
index d89669603d..350202f29f 100755
--- a/keyboards/suavity/ehan/info.json
+++ b/keyboards/suavity/ehan/info.json
@@ -8,6 +8,10 @@
        "pid": "0x4548",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B11",
+        "scroll_lock": "F1"
+    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/superuser/ext/config.h b/keyboards/superuser/ext/config.h
index 6ff087efac..9327d9a927 100644
--- a/keyboards/superuser/ext/config.h
+++ b/keyboards/superuser/ext/config.h
@@ -37,5 +37,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B7
diff --git a/keyboards/superuser/ext/info.json b/keyboards/superuser/ext/info.json
index 0057690f68..57d4ccbb18 100644
--- a/keyboards/superuser/ext/info.json
+++ b/keyboards/superuser/ext/info.json
@@ -8,6 +8,9 @@
        "pid": "0x4558",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B7"
+    },
    "processor": "atmega32u4",
    "bootloader": "qmk-dfu",
    "layout_aliases": {
diff --git a/keyboards/superuser/frl/config.h b/keyboards/superuser/frl/config.h
index fedbdb32f4..d29fd72da6 100644
--- a/keyboards/superuser/frl/config.h
+++ b/keyboards/superuser/frl/config.h
@@ -37,5 +37,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B7
diff --git a/keyboards/superuser/frl/info.json b/keyboards/superuser/frl/info.json
index 6d108dd971..14c7b1e54f 100644
--- a/keyboards/superuser/frl/info.json
+++ b/keyboards/superuser/frl/info.json
@@ -8,6 +8,9 @@
        "pid": "0x4652",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B7"
+    },
    "processor": "atmega32u4",
    "bootloader": "qmk-dfu",
    "layouts": {
diff --git a/keyboards/superuser/tkl/config.h b/keyboards/superuser/tkl/config.h
index edc831c747..af91392de1 100644
--- a/keyboards/superuser/tkl/config.h
+++ b/keyboards/superuser/tkl/config.h
@@ -37,5 +37,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B7
diff --git a/keyboards/superuser/tkl/info.json b/keyboards/superuser/tkl/info.json
index ebaeb95a5c..6e94c7a28e 100644
--- a/keyboards/superuser/tkl/info.json
+++ b/keyboards/superuser/tkl/info.json
@@ -8,6 +8,9 @@
        "pid": "0x544B",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B7"
+    },
    "processor": "atmega32u4",
    "bootloader": "qmk-dfu",
    "layout_aliases": {
diff --git a/keyboards/sx60/config.h b/keyboards/sx60/config.h
index 82a0b146dc..7666dc165e 100755
--- a/keyboards/sx60/config.h
+++ b/keyboards/sx60/config.h
@@ -32,11 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-/* indicator LEDs */
-#define LED_NUM_LOCK_PIN F5
-#define LED_CAPS_LOCK_PIN F4
-#define LED_SCROLL_LOCK_PIN F1
 #define BACKLIGHT_PIN B7
 #ifdef BACKLIGHT_PIN
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/sx60/info.json b/keyboards/sx60/info.json
index b88cb070fd..b4b93b2cad 100644
--- a/keyboards/sx60/info.json
+++ b/keyboards/sx60/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0010",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "F4",
+        "num_lock": "F5",
+        "scroll_lock": "F1"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/tada68/config.h b/keyboards/tada68/config.h
index 2feee42cb9..14e2d3d712 100755
--- a/keyboards/tada68/config.h
+++ b/keyboards/tada68/config.h
@@ -35,9 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-#define LED_CAPS_LOCK_PIN B2
-#define LED_PIN_ON_STATE 0
 /* Backlight configuration */
 #define BACKLIGHT_PIN B6
 #define BACKLIGHT_BREATHING
diff --git a/keyboards/tada68/info.json b/keyboards/tada68/info.json
index d4e7577689..53ac1a5bfc 100644
--- a/keyboards/tada68/info.json
+++ b/keyboards/tada68/info.json
@@ -8,6 +8,10 @@
        "pid": "0x0001",
        "device_version": "0.0.3"
    },
+    "indicators": {
+        "caps_lock": "B2",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "lufa-ms",
    "community_layouts": ["65_ansi", "65_iso"],
diff --git a/keyboards/takashicompany/center_enter/config.h b/keyboards/takashicompany/center_enter/config.h
index 3d9baf7e8f..b4a5428e00 100644
--- a/keyboards/takashicompany/center_enter/config.h
+++ b/keyboards/takashicompany/center_enter/config.h
@@ -42,12 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODERS_PAD_A { D2 }
 #define ENCODERS_PAD_B { D1 }
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 #define RGB_DI_PIN D3
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM 6
diff --git a/keyboards/takashicompany/compacx/config.h b/keyboards/takashicompany/compacx/config.h
index b331150f6a..3b180f9c58 100644
--- a/keyboards/takashicompany/compacx/config.h
+++ b/keyboards/takashicompany/compacx/config.h
@@ -47,12 +47,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define SOFT_SERIAL_PIN D2  // or D1, D2, D3, E6
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 #define RGB_DI_PIN D3
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM 12
diff --git a/keyboards/takashicompany/dogtag/config.h b/keyboards/takashicompany/dogtag/config.h
index a5dac88437..b4106acd61 100644
--- a/keyboards/takashicompany/dogtag/config.h
+++ b/keyboards/takashicompany/dogtag/config.h
@@ -50,12 +50,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define SOFT_SERIAL_PIN D2 // or D1, D2, D3, E6
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 #define RGB_DI_PIN D3
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM 4 * 2
diff --git a/keyboards/takashicompany/endzone34/config.h b/keyboards/takashicompany/endzone34/config.h
index 56bc8ccff1..b45d94cb81 100644
--- a/keyboards/takashicompany/endzone34/config.h
+++ b/keyboards/takashicompany/endzone34/config.h
@@ -38,12 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 #define RGB_DI_PIN D3
 #ifdef RGB_DI_PIN
    #define RGBLED_NUM 9
diff --git a/keyboards/takashicompany/heavy_left/config.h b/keyboards/takashicompany/heavy_left/config.h
index 0837c946c2..a494835e12 100644
--- a/keyboards/takashicompany/heavy_left/config.h
+++ b/keyboards/takashicompany/heavy_left/config.h
@@ -43,12 +43,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define SOFT_SERIAL_PIN D2  // or D1, D2, D3, E6
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 #define RGB_DI_PIN D3
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM 6 * 2
diff --git a/keyboards/takashicompany/minizone/config.h b/keyboards/takashicompany/minizone/config.h
index 4a66d73747..834cfa9da7 100644
--- a/keyboards/takashicompany/minizone/config.h
+++ b/keyboards/takashicompany/minizone/config.h
@@ -24,12 +24,6 @@
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 #define RGB_DI_PIN D3
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM 11
diff --git a/keyboards/takashicompany/qoolee/config.h b/keyboards/takashicompany/qoolee/config.h
index 84ded60162..8634ed4467 100644
--- a/keyboards/takashicompany/qoolee/config.h
+++ b/keyboards/takashicompany/qoolee/config.h
@@ -42,12 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODERS_PAD_A { D2 }
 #define ENCODERS_PAD_B { D1 }
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 #define RGB_DI_PIN D3
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM 6
diff --git a/keyboards/takashicompany/radialex/config.h b/keyboards/takashicompany/radialex/config.h
index e021bf22de..1106234868 100644
--- a/keyboards/takashicompany/radialex/config.h
+++ b/keyboards/takashicompany/radialex/config.h
@@ -38,12 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 #define RGB_DI_PIN D3
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM 12
diff --git a/keyboards/technika/config.h b/keyboards/technika/config.h
index 0fda985b1c..31c0cda892 100644
--- a/keyboards/technika/config.h
+++ b/keyboards/technika/config.h
@@ -45,11 +45,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define LED_NUM_LOCK_PIN A15
-#define LED_CAPS_LOCK_PIN B3
-#define LED_SCROLL_LOCK_PIN B4
 /*
 * Feature disable options
 *  These options are also useful to firmware size reduction.
diff --git a/keyboards/technika/info.json b/keyboards/technika/info.json
index 6edc027f66..b20ebe6c7c 100644
--- a/keyboards/technika/info.json
+++ b/keyboards/technika/info.json
@@ -8,6 +8,11 @@
        "pid": "0x6049",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B3",
+        "num_lock": "A15",
+        "scroll_lock": "B4"
+    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/tgr/910/config.h b/keyboards/tgr/910/config.h
index 8571cfab11..68dc213ff5 100644
--- a/keyboards/tgr/910/config.h
+++ b/keyboards/tgr/910/config.h
@@ -29,10 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN D0
-#define LED_CAPS_LOCK_PIN D1
-#define LED_SCROLL_LOCK_PIN D6
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/tgr/910/info.json b/keyboards/tgr/910/info.json
index bf9d895b4d..3c4de6fe39 100644
--- a/keyboards/tgr/910/info.json
+++ b/keyboards/tgr/910/info.json
@@ -8,6 +8,11 @@
        "pid": "0x9100",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "D1",
+        "num_lock": "D0",
+        "scroll_lock": "D6"
+    },
    "processor": "atmega32a",
    "bootloader": "bootloadhid",
    "layouts": {
diff --git a/keyboards/tgr/910ce/config.h b/keyboards/tgr/910ce/config.h
index 478db04a54..209dabc0a9 100644
--- a/keyboards/tgr/910ce/config.h
+++ b/keyboards/tgr/910ce/config.h
@@ -29,8 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN D1
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/tgr/910ce/info.json b/keyboards/tgr/910ce/info.json
index d38a4720f3..77655f52af 100644
--- a/keyboards/tgr/910ce/info.json
+++ b/keyboards/tgr/910ce/info.json
@@ -8,6 +8,9 @@
        "pid": "0x910C",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "D1"
+    },
    "processor": "atmega32a",
    "bootloader": "bootloadhid",
    "community_layouts": ["65_ansi_blocker", "65_iso_blocker"],
diff --git a/keyboards/tgr/alice/config.h b/keyboards/tgr/alice/config.h
index 9373bb2b9c..df60d2cab4 100644
--- a/keyboards/tgr/alice/config.h
+++ b/keyboards/tgr/alice/config.h
@@ -25,10 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN D0
-#define LED_CAPS_LOCK_PIN D1
-#define LED_SCROLL_LOCK_PIN D6
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/tgr/alice/info.json b/keyboards/tgr/alice/info.json
index cd1d330103..3586e49367 100644
--- a/keyboards/tgr/alice/info.json
+++ b/keyboards/tgr/alice/info.json
@@ -8,6 +8,11 @@
    "pid": "0x422E",
    "device_version": "2.0.0"
  },
+  "indicators": {
+    "caps_lock": "D1",
+    "num_lock": "D0",
+    "scroll_lock": "D6"
+  },
  "processor": "atmega32a",
  "bootloader": "bootloadhid",
  "community_layouts": ["alice_split_bs"],
diff --git a/keyboards/tgr/jane/v2/config.h b/keyboards/tgr/jane/v2/config.h
index 409afd6737..60d1644a2f 100644
--- a/keyboards/tgr/jane/v2/config.h
+++ b/keyboards/tgr/jane/v2/config.h
@@ -27,8 +27,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN D1
-#define LED_SCROLL_LOCK_PIN D6
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/tgr/jane/v2/info.json b/keyboards/tgr/jane/v2/info.json
index 89949c886f..f43d27c84f 100644
--- a/keyboards/tgr/jane/v2/info.json
+++ b/keyboards/tgr/jane/v2/info.json
@@ -8,6 +8,10 @@
    "pid": "0x4A4E",
    "device_version": "2.0.0"
  },
+  "indicators": {
+    "caps_lock": "D1",
+    "scroll_lock": "D6"
+  },
  "processor": "atmega32a",
  "bootloader": "bootloadhid",
  "community_layouts": ["tkl_ansi", "tkl_iso"],
diff --git a/keyboards/tgr/jane/v2ce/config.h b/keyboards/tgr/jane/v2ce/config.h
index d33b3a1d0b..06432495b5 100644
--- a/keyboards/tgr/jane/v2ce/config.h
+++ b/keyboards/tgr/jane/v2ce/config.h
@@ -28,6 +28,3 @@
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
-#define LED_CAPS_LOCK_PIN D1
-#define LED_NUM_LOCK_PIN D6
diff --git a/keyboards/tgr/jane/v2ce/info.json b/keyboards/tgr/jane/v2ce/info.json
index 391b657bed..3aa62ded58 100644
--- a/keyboards/tgr/jane/v2ce/info.json
+++ b/keyboards/tgr/jane/v2ce/info.json
@@ -8,6 +8,10 @@
        "pid": "0x4A43",
        "device_version": "2.0.0"
    },
+    "indicators": {
+        "caps_lock": "D1",
+        "num_lock": "D6"
+    },
    "processor": "atmega32a",
    "bootloader": "bootloadhid",
    "community_layouts": ["tkl_f13_ansi", "tkl_f13_ansi_tsangan", "tkl_f13_iso", "tkl_f13_iso_tsangan"],
diff --git a/keyboards/tgr/tris/config.h b/keyboards/tgr/tris/config.h
index dd0643f421..b85047c488 100644
--- a/keyboards/tgr/tris/config.h
+++ b/keyboards/tgr/tris/config.h
@@ -26,8 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN D0
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/tgr/tris/info.json b/keyboards/tgr/tris/info.json
index bd2a42b77f..6ce36ce819 100644
--- a/keyboards/tgr/tris/info.json
+++ b/keyboards/tgr/tris/info.json
@@ -8,6 +8,9 @@
        "pid": "0x5452",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "num_lock": "D0"
+    },
    "processor": "atmega32a",
    "bootloader": "bootloadhid",
    "community_layouts": ["numpad_6x4", "ortho_6x4"],
diff --git a/keyboards/tkc/california/config.h b/keyboards/tkc/california/config.h
index b471ce3008..864e589c2c 100644
--- a/keyboards/tkc/california/config.h
+++ b/keyboards/tkc/california/config.h
@@ -45,8 +45,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_BREATHING
 #define BACKLIGHT_LEVELS 3
 #endif
-#define LED_NUM_LOCK_PIN F1
-#define LED_CAPS_LOCK_PIN F0
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/tkc/california/info.json b/keyboards/tkc/california/info.json
index 7cce73d271..0b50229db8 100644
--- a/keyboards/tkc/california/info.json
+++ b/keyboards/tkc/california/info.json
@@ -8,6 +8,10 @@
        "pid": "0x0009",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "F0",
+        "num_lock": "F1"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/tkc/m0lly/config.h b/keyboards/tkc/m0lly/config.h
index 284537b41d..6ac133ad9a 100644
--- a/keyboards/tkc/m0lly/config.h
+++ b/keyboards/tkc/m0lly/config.h
@@ -38,10 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN D2
-#define LED_CAPS_LOCK_PIN D3
-#define LED_SCROLL_LOCK_PIN D4
 #define BACKLIGHT_PIN B6
 #define BACKLIGHT_LEVELS 3
 #define BACKLIGHT_BREATHING
diff --git a/keyboards/tkc/m0lly/info.json b/keyboards/tkc/m0lly/info.json
index d685fa1eee..c5fa343339 100644
--- a/keyboards/tkc/m0lly/info.json
+++ b/keyboards/tkc/m0lly/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0004",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "D3",
+        "num_lock": "D2",
+        "scroll_lock": "D4"
+    },
    "processor": "at90usb1286",
    "bootloader": "qmk-dfu",
    "layouts": {
diff --git a/keyboards/tkc/tkc1800/config.h b/keyboards/tkc/tkc1800/config.h
index 5c93a36227..b914b9da7b 100644
--- a/keyboards/tkc/tkc1800/config.h
+++ b/keyboards/tkc/tkc1800/config.h
@@ -33,10 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN D2
-#define LED_CAPS_LOCK_PIN D3
-#define LED_SCROLL_LOCK_PIN D4
 #define BACKLIGHT_PIN B6
 #define BACKLIGHT_BREATHING
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/tkc/tkc1800/info.json b/keyboards/tkc/tkc1800/info.json
index 39d55cc2ce..5e0e31f036 100644
--- a/keyboards/tkc/tkc1800/info.json
+++ b/keyboards/tkc/tkc1800/info.json
@@ -8,6 +8,11 @@
    "pid": "0x0001",
    "device_version": "0.0.3"
  },
+  "indicators": {
+    "caps_lock": "D3",
+    "num_lock": "D2",
+    "scroll_lock": "D4"
+  },
  "processor": "at90usb1286",
  "bootloader": "qmk-dfu",
  "layouts": {
diff --git a/keyboards/tkc/tkl_ab87/config.h b/keyboards/tkc/tkl_ab87/config.h
index c3a2936694..c7f8f12850 100644
--- a/keyboards/tkc/tkl_ab87/config.h
+++ b/keyboards/tkc/tkl_ab87/config.h
@@ -65,9 +65,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_TWINKLE
 #endif
-#define LED_SCROLL_LOCK_PIN F0
-#define LED_CAPS_LOCK_PIN F1
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/tkc/tkl_ab87/info.json b/keyboards/tkc/tkl_ab87/info.json
index e14b8c02ec..76f0c3f63e 100644
--- a/keyboards/tkc/tkl_ab87/info.json
+++ b/keyboards/tkc/tkl_ab87/info.json
@@ -8,6 +8,10 @@
        "pid": "0x0007",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "F1",
+        "scroll_lock": "F0"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/toad/config.h b/keyboards/toad/config.h
index 59a544e2f8..8b5ffe1cd2 100644
--- a/keyboards/toad/config.h
+++ b/keyboards/toad/config.h
@@ -12,10 +12,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B6
-#define LED_SCROLL_LOCK_PIN B5
-#define LED_PIN_ON_STATE 0
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/toad/info.json b/keyboards/toad/info.json
index 370241b6ff..318d08ef38 100644
--- a/keyboards/toad/info.json
+++ b/keyboards/toad/info.json
@@ -8,6 +8,11 @@
    "pid": "0x6776",
    "device_version": "0.0.1"
  },
+  "indicators": {
+    "caps_lock": "B6",
+    "scroll_lock": "B5",
+    "on_state": 0
+  },
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "layouts": {
diff --git a/keyboards/tszaboo/ortho4exent/config.h b/keyboards/tszaboo/ortho4exent/config.h
index 2a5f0d0885..80321afd73 100644
--- a/keyboards/tszaboo/ortho4exent/config.h
+++ b/keyboards/tszaboo/ortho4exent/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { B0, B1, D4, D7, B4 }
 /*                         0   1   2   3   4   5   6   7   8   9  10  11  12  13  14*/
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, D6, D5, D3, D2, D1, B7, B3, B2 }
-#define LED_CAPS_LOCK_PIN E6
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/tszaboo/ortho4exent/info.json b/keyboards/tszaboo/ortho4exent/info.json
index b9c440e37f..2bc233fcee 100644
--- a/keyboards/tszaboo/ortho4exent/info.json
+++ b/keyboards/tszaboo/ortho4exent/info.json
@@ -8,6 +8,9 @@
        "pid": "0x7934",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "E6"
+    },
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "layouts": {
diff --git a/keyboards/ubest/vn/config.h b/keyboards/ubest/vn/config.h
index ec0851a72f..291b7de079 100644
--- a/keyboards/ubest/vn/config.h
+++ b/keyboards/ubest/vn/config.h
@@ -57,9 +57,3 @@
 //     #define RGBLIGHT_EFFECT_RGB_TEST
 //     #define RGBLIGHT_EFFECT_ALTERNATING
 #endif
-#define LED_PIN_ON_STATE        0
-#define LED_NUM_LOCK_PIN        B1
-#define LED_CAPS_LOCK_PIN       B3
-#define LED_SCROLL_LOCK_PIN B2
diff --git a/keyboards/ubest/vn/info.json b/keyboards/ubest/vn/info.json
index 7ce37df59e..ab4df7d838 100644
--- a/keyboards/ubest/vn/info.json
+++ b/keyboards/ubest/vn/info.json
@@ -8,6 +8,12 @@
        "pid": "0x0868",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B3",
+        "num_lock": "B1",
+        "scroll_lock": "B2",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/unicomp/classic_ultracl_post_2013/info.json b/keyboards/unicomp/classic_ultracl_post_2013/info.json
index e9ff22250e..dee9f85acc 100644
--- a/keyboards/unicomp/classic_ultracl_post_2013/info.json
+++ b/keyboards/unicomp/classic_ultracl_post_2013/info.json
@@ -8,6 +8,11 @@
        "pid": "0x27DB",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C11",
+        "num_lock": "C12",
+        "scroll_lock": "C10"
+    },
    "processor": "STM32F446",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/config.h b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/config.h
index 31ffeada6d..692e1cba96 100644
--- a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/config.h
+++ b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/config.h
@@ -57,8 +57,3 @@
 #define SOLENOID_MIN_DWELL 4
 #define HAPTIC_OFF_IN_LOW_POWER 1
 #define NO_HAPTIC_MOD
-#define LED_NUM_LOCK_PIN C12
-#define LED_CAPS_LOCK_PIN C11
-#define LED_SCROLL_LOCK_PIN C10
-#define LED_ON_STATE 1
diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/info.json b/keyboards/unicomp/classic_ultracl_pre_2013/info.json
index e207af78b1..aa28ce85c8 100644
--- a/keyboards/unicomp/classic_ultracl_pre_2013/info.json
+++ b/keyboards/unicomp/classic_ultracl_pre_2013/info.json
@@ -8,6 +8,11 @@
        "pid": "0x27DB",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C11",
+        "num_lock": "C12",
+        "scroll_lock": "C10"
+    },
    "processor": "STM32F446", // RET6
    "bootloader": "stm32-dfu",
    "community_layouts": ["fullsize_ansi", "fullsize_iso"],
diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/config.h b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/config.h
index 31ffeada6d..692e1cba96 100644
--- a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/config.h
+++ b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/config.h
@@ -57,8 +57,3 @@
 #define SOLENOID_MIN_DWELL 4
 #define HAPTIC_OFF_IN_LOW_POWER 1
 #define NO_HAPTIC_MOD
-#define LED_NUM_LOCK_PIN C12
-#define LED_CAPS_LOCK_PIN C11
-#define LED_SCROLL_LOCK_PIN C10
-#define LED_ON_STATE 1
diff --git a/keyboards/unicomp/pc122/info.json b/keyboards/unicomp/pc122/info.json
index 3d479bfcfb..f1d47ef1b0 100644
--- a/keyboards/unicomp/pc122/info.json
+++ b/keyboards/unicomp/pc122/info.json
@@ -8,6 +8,11 @@
        "pid": "0x27DB",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C11",
+        "num_lock": "C12",
+        "scroll_lock": "C10"
+    },
    "processor": "STM32F446", // RET6
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/unicomp/pc122/overnumpad_1xb/config.h b/keyboards/unicomp/pc122/overnumpad_1xb/config.h
index 31ffeada6d..692e1cba96 100644
--- a/keyboards/unicomp/pc122/overnumpad_1xb/config.h
+++ b/keyboards/unicomp/pc122/overnumpad_1xb/config.h
@@ -57,8 +57,3 @@
 #define SOLENOID_MIN_DWELL 4
 #define HAPTIC_OFF_IN_LOW_POWER 1
 #define NO_HAPTIC_MOD
-#define LED_NUM_LOCK_PIN C12
-#define LED_CAPS_LOCK_PIN C11
-#define LED_SCROLL_LOCK_PIN C10
-#define LED_ON_STATE 1
diff --git a/keyboards/unicomp/spacesaver_m_post_2013/info.json b/keyboards/unicomp/spacesaver_m_post_2013/info.json
index 8e3fd6bf74..c484553e89 100644
--- a/keyboards/unicomp/spacesaver_m_post_2013/info.json
+++ b/keyboards/unicomp/spacesaver_m_post_2013/info.json
@@ -8,6 +8,9 @@
        "pid": "0x27DB",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C12"
+    },
    "processor": "STM32F446", // RET6
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/config.h b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/config.h
index e00980eb83..692e1cba96 100644
--- a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/config.h
+++ b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/config.h
@@ -57,7 +57,3 @@
 #define SOLENOID_MIN_DWELL 4
 #define HAPTIC_OFF_IN_LOW_POWER 1
 #define NO_HAPTIC_MOD
-#define LED_CAPS_LOCK_PIN C12
-#define LED_ON_STATE 1
-// C11 and C10 are also leds, but C11 is not used in this keyboard, and C10 is configured in ${keyboard}.c
diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/info.json b/keyboards/unicomp/spacesaver_m_pre_2013/info.json
index a1ef9dc2f0..249b33fdd2 100644
--- a/keyboards/unicomp/spacesaver_m_pre_2013/info.json
+++ b/keyboards/unicomp/spacesaver_m_pre_2013/info.json
@@ -8,6 +8,9 @@
        "pid": "0x27DB",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C12"
+    },
    "processor": "STM32F446", // RET6
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h
index e00980eb83..692e1cba96 100644
--- a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h
+++ b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h
@@ -57,7 +57,3 @@
 #define SOLENOID_MIN_DWELL 4
 #define HAPTIC_OFF_IN_LOW_POWER 1
 #define NO_HAPTIC_MOD
-#define LED_CAPS_LOCK_PIN C12
-#define LED_ON_STATE 1
-// C11 and C10 are also leds, but C11 is not used in this keyboard, and C10 is configured in ${keyboard}.c
diff --git a/keyboards/unikorn/config.h b/keyboards/unikorn/config.h
index ffaeb054a0..51bd8ad28f 100644
--- a/keyboards/unikorn/config.h
+++ b/keyboards/unikorn/config.h
@@ -27,8 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN D1
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/unikorn/info.json b/keyboards/unikorn/info.json
index 732b9380c8..8a6b47624b 100644
--- a/keyboards/unikorn/info.json
+++ b/keyboards/unikorn/info.json
@@ -8,6 +8,9 @@
        "pid": "0x556B",
        "device_version": "2.0.0"
    },
+    "indicators": {
+        "caps_lock": "D1"
+    },
    "processor": "atmega32a",
    "bootloader": "bootloadhid",
    "layouts": {
diff --git a/keyboards/utd80/config.h b/keyboards/utd80/config.h
index 72c6d4f34d..473c78245a 100644
--- a/keyboards/utd80/config.h
+++ b/keyboards/utd80/config.h
@@ -34,9 +34,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B6
-#define LED_SCROLL_LOCK_PIN B5
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/utd80/info.json b/keyboards/utd80/info.json
index f1eeac1d22..22e83c6f70 100644
--- a/keyboards/utd80/info.json
+++ b/keyboards/utd80/info.json
@@ -8,6 +8,10 @@
      "pid": "0x001C",
      "device_version": "0.0.1"
    },
+    "indicators": {
+      "caps_lock": "B6",
+      "scroll_lock": "B5"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/v4n4g0rth0n/config.h b/keyboards/v4n4g0rth0n/config.h
index 501fe56501..f6f166791c 100644
--- a/keyboards/v4n4g0rth0n/config.h
+++ b/keyboards/v4n4g0rth0n/config.h
@@ -24,9 +24,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-// TOP, MID, BOT
-// B4, D7, D6
-#define LED_NUM_LOCK_PIN B4
-#define LED_CAPS_LOCK_PIN D7
-#define LED_SCROLL_LOCK_PIN D6
diff --git a/keyboards/v4n4g0rth0n/info.json b/keyboards/v4n4g0rth0n/info.json
index 3360a7f95f..f538b8773d 100644
--- a/keyboards/v4n4g0rth0n/info.json
+++ b/keyboards/v4n4g0rth0n/info.json
@@ -7,6 +7,11 @@
        "vid": "0xB33F",
        "pid": "0x58E4"
    },
+    "indicators": {
+        "caps_lock": "D7",
+        "num_lock": "B4",
+        "scroll_lock": "D6"
+    },
    "layouts": {
        "LAYOUT": {
            "layout": [
diff --git a/keyboards/vertex/angler2/config.h b/keyboards/vertex/angler2/config.h
index b04493b87b..41531332d5 100644
--- a/keyboards/vertex/angler2/config.h
+++ b/keyboards/vertex/angler2/config.h
@@ -36,10 +36,6 @@
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN  B0
-#define LED_SCROLL_LOCK_PIN B7
-#define LED_PIN_ON_STATE 0
 #define RGB_DI_PIN E6
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/vertex/angler2/info.json b/keyboards/vertex/angler2/info.json
index 3063fa9f28..3716ddbede 100644
--- a/keyboards/vertex/angler2/info.json
+++ b/keyboards/vertex/angler2/info.json
@@ -8,6 +8,11 @@
        "pid": "0x408F",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B0",
+        "scroll_lock": "B7",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": [
diff --git a/keyboards/vertex/arc60/config.h b/keyboards/vertex/arc60/config.h
index b74bf09003..1146eac722 100644
--- a/keyboards/vertex/arc60/config.h
+++ b/keyboards/vertex/arc60/config.h
@@ -25,9 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { B10, B1, B0, A7, A6 }
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN C13
-#define LED_PIN_ON_STATE 0
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/vertex/arc60/info.json b/keyboards/vertex/arc60/info.json
index da11e272c1..bfb8e4fc3a 100644
--- a/keyboards/vertex/arc60/info.json
+++ b/keyboards/vertex/arc60/info.json
@@ -8,6 +8,10 @@
        "pid": "0x8370",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C13",
+        "on_state": 0
+    },
    "processor": "STM32F103",
    "bootloader": "stm32duino",
    "community_layouts": [
diff --git a/keyboards/viktus/z150_bh/config.h b/keyboards/viktus/z150_bh/config.h
index d531834b48..ca3f398545 100644
--- a/keyboards/viktus/z150_bh/config.h
+++ b/keyboards/viktus/z150_bh/config.h
@@ -12,10 +12,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN E7
-#define LED_CAPS_LOCK_PIN B0
-#define LED_SCROLL_LOCK_PIN E6
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/viktus/z150_bh/info.json b/keyboards/viktus/z150_bh/info.json
index a44c903b05..f1e68dedf1 100644
--- a/keyboards/viktus/z150_bh/info.json
+++ b/keyboards/viktus/z150_bh/info.json
@@ -8,6 +8,11 @@
        "pid": "0x6060",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B0",
+        "num_lock": "E7",
+        "scroll_lock": "E6"
+    },
    "processor": "at90usb1286",
    "bootloader": "halfkay",
    "layouts": {
diff --git a/keyboards/w1_at/config.h b/keyboards/w1_at/config.h
index 02c434508a..c724292a3c 100644
--- a/keyboards/w1_at/config.h
+++ b/keyboards/w1_at/config.h
@@ -30,10 +30,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
-/* Indicator LEDs */
-#define LED_CAPS_LOCK_PIN B6
-#define LED_NUM_LOCK_PIN B3
-#define LED_SCROLL_LOCK_PIN A15
-#define LED_KANA_PIN A13
-#define LED_PIN_ON_STATE 0
diff --git a/keyboards/w1_at/info.json b/keyboards/w1_at/info.json
index b396c65f9d..a922e0f4c9 100644
--- a/keyboards/w1_at/info.json
+++ b/keyboards/w1_at/info.json
@@ -8,6 +8,13 @@
        "pid": "0x5754",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B6",
+        "num_lock": "B3",
+        "scroll_lock": "A15",
+        "kana": "A13",
+        "on_state": 0
+    },
    "bootmagic": {
        "matrix": [0, 2]
    },
diff --git a/keyboards/wavtype/foundation/config.h b/keyboards/wavtype/foundation/config.h
index 0735f41ab4..9f709e8a40 100644
--- a/keyboards/wavtype/foundation/config.h
+++ b/keyboards/wavtype/foundation/config.h
@@ -24,12 +24,6 @@
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 #define RGB_DI_PIN B0
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM 16
diff --git a/keyboards/wavtype/p01_ultra/config.h b/keyboards/wavtype/p01_ultra/config.h
index b6b98ca662..6c7522dc08 100644
--- a/keyboards/wavtype/p01_ultra/config.h
+++ b/keyboards/wavtype/p01_ultra/config.h
@@ -38,12 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION ROW2COL
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 #define RGB_DI_PIN E6
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM 18
diff --git a/keyboards/wekey/polaris/config.h b/keyboards/wekey/polaris/config.h
index 1140b508d4..28c2ecf98a 100644
--- a/keyboards/wekey/polaris/config.h
+++ b/keyboards/wekey/polaris/config.h
@@ -38,12 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/wekey/we27/config.h b/keyboards/wekey/we27/config.h
index 4aad142a9f..fd0efcb41b 100644
--- a/keyboards/wekey/we27/config.h
+++ b/keyboards/wekey/we27/config.h
@@ -117,12 +117,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODERS_CCW_KEY { { 4, 3 } }
 #endif
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/westfoxtrot/aanzee/config.h b/keyboards/westfoxtrot/aanzee/config.h
index 1b053da455..5ad3120a65 100644
--- a/keyboards/westfoxtrot/aanzee/config.h
+++ b/keyboards/westfoxtrot/aanzee/config.h
@@ -30,9 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B2
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B7
 #define BACKLIGHT_BREATHING
 #define BACKLIGHT_LEVELS 5
diff --git a/keyboards/westfoxtrot/aanzee/info.json b/keyboards/westfoxtrot/aanzee/info.json
index 465f59eea3..65945c69a3 100644
--- a/keyboards/westfoxtrot/aanzee/info.json
+++ b/keyboards/westfoxtrot/aanzee/info.json
@@ -8,6 +8,10 @@
    "pid": "0xAA01",
    "device_version": "0.0.1"
  },
+  "indicators": {
+    "caps_lock": "B2",
+    "on_state": 0
+  },
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "layouts": {
diff --git a/keyboards/wilba_tech/wt65_d/config.h b/keyboards/wilba_tech/wt65_d/config.h
index 42ff8a5979..0bedb583a7 100644
--- a/keyboards/wilba_tech/wt65_d/config.h
+++ b/keyboards/wilba_tech/wt65_d/config.h
@@ -12,8 +12,6 @@
 #define MATRIX_COL_PINS { F5, D5, D3, D2, B7, B0, B3, C7, C6, B6, B5, B4, D7, D6, D4 }
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN F1
 // Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap 
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/wilba_tech/wt65_d/info.json b/keyboards/wilba_tech/wt65_d/info.json
index e073235c39..68dc46d548 100644
--- a/keyboards/wilba_tech/wt65_d/info.json
+++ b/keyboards/wilba_tech/wt65_d/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0031",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "F1"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/winkeyless/b87/config.h b/keyboards/winkeyless/b87/config.h
index eb5627b914..ddcd8ba83d 100644
--- a/keyboards/winkeyless/b87/config.h
+++ b/keyboards/winkeyless/b87/config.h
@@ -43,6 +43,3 @@
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
-#define LED_CAPS_LOCK_PIN D1 
-#define LED_SCROLL_LOCK_PIN D6 
diff --git a/keyboards/winkeyless/b87/info.json b/keyboards/winkeyless/b87/info.json
index d5039abf58..0d53604cd1 100644
--- a/keyboards/winkeyless/b87/info.json
+++ b/keyboards/winkeyless/b87/info.json
@@ -8,6 +8,10 @@
        "pid": "0x0B87",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "D1",
+        "scroll_lock": "D6"
+    },
    "processor": "atmega32a",
    "bootloader": "bootloadhid",
    "layouts": {
diff --git a/keyboards/winkeyless/bface/config.h b/keyboards/winkeyless/bface/config.h
index 9045a2bef0..ae8d55b14f 100644
--- a/keyboards/winkeyless/bface/config.h
+++ b/keyboards/winkeyless/bface/config.h
@@ -28,10 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN D0
-#define LED_CAPS_LOCK_PIN D1
-#define LED_SCROLL_LOCK_PIN D6
 #define RGBLED_NUM 16
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/winkeyless/bface/info.json b/keyboards/winkeyless/bface/info.json
index 47cd951632..e19e42e577 100644
--- a/keyboards/winkeyless/bface/info.json
+++ b/keyboards/winkeyless/bface/info.json
@@ -8,6 +8,11 @@
    "pid": "0x4246",
    "device_version": "2.0.0"
  },
+  "indicators": {
+    "caps_lock": "D1",
+    "num_lock": "D0",
+    "scroll_lock": "D6"
+  },
  "processor": "atmega32a",
  "bootloader": "bootloadhid",
  "layouts": {
diff --git a/keyboards/winkeyless/bmini/config.h b/keyboards/winkeyless/bmini/config.h
index a10099737d..82ee4174ed 100644
--- a/keyboards/winkeyless/bmini/config.h
+++ b/keyboards/winkeyless/bmini/config.h
@@ -27,10 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN D0
-#define LED_CAPS_LOCK_PIN D1
-#define LED_SCROLL_LOCK_PIN D6
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/winkeyless/bmini/info.json b/keyboards/winkeyless/bmini/info.json
index 7d0d461050..e096f860cc 100644
--- a/keyboards/winkeyless/bmini/info.json
+++ b/keyboards/winkeyless/bmini/info.json
@@ -8,6 +8,11 @@
    "pid": "0x424D",
    "device_version": "2.0.0"
  },
+  "indicators": {
+    "caps_lock": "D1",
+    "num_lock": "D0",
+    "scroll_lock": "D6"
+  },
  "processor": "atmega32a",
  "bootloader": "bootloadhid",
  "layouts": {
diff --git a/keyboards/winkeyless/bminiex/config.h b/keyboards/winkeyless/bminiex/config.h
index 2a50a60b48..11f660f1e8 100644
--- a/keyboards/winkeyless/bminiex/config.h
+++ b/keyboards/winkeyless/bminiex/config.h
@@ -27,10 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN D0
-#define LED_CAPS_LOCK_PIN D1
-#define LED_SCROLL_LOCK_PIN D6
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/winkeyless/bminiex/info.json b/keyboards/winkeyless/bminiex/info.json
index 42acca0f6a..65d888eaec 100644
--- a/keyboards/winkeyless/bminiex/info.json
+++ b/keyboards/winkeyless/bminiex/info.json
@@ -8,6 +8,11 @@
    "pid": "0x4258",
    "device_version": "2.0.0"
  },
+  "indicators": {
+    "caps_lock": "D1",
+    "num_lock": "D0",
+    "scroll_lock": "D6"
+  },
  "processor": "atmega32a",
  "bootloader": "bootloadhid",
  "layouts": {
diff --git a/keyboards/wolf/sabre/config.h b/keyboards/wolf/sabre/config.h
index 3ebc19c5fb..cc33ee6e87 100644
--- a/keyboards/wolf/sabre/config.h
+++ b/keyboards/wolf/sabre/config.h
@@ -41,7 +41,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 #define BACKLIGHT_PIN B7
-#define LED_PIN_ON_STATE 0
-#define LED_CAPS_LOCK_PIN B3
-#define LED_SCROLL_LOCK_PIN B0
diff --git a/keyboards/wolf/sabre/info.json b/keyboards/wolf/sabre/info.json
index edefa1ad51..5dd8aba471 100644
--- a/keyboards/wolf/sabre/info.json
+++ b/keyboards/wolf/sabre/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0055",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B3",
+        "scroll_lock": "B0",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/wsk/alpha9/config.h b/keyboards/wsk/alpha9/config.h
index 01cee7ee40..503988217d 100644
--- a/keyboards/wsk/alpha9/config.h
+++ b/keyboards/wsk/alpha9/config.h
@@ -34,9 +34,6 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-#define LED_CAPS_LOCK_PIN D3
-#define LED_PIN_ON_STATE 0
 #define RGB_DI_PIN F4
 #ifdef RGB_DI_PIN
 #    define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/wsk/alpha9/info.json b/keyboards/wsk/alpha9/info.json
index 1d7a859a14..65d1bec3f7 100644
--- a/keyboards/wsk/alpha9/info.json
+++ b/keyboards/wsk/alpha9/info.json
@@ -8,6 +8,10 @@
    "pid": "0x692A",
    "device_version": "0.0.1"
  },
+  "indicators": {
+    "caps_lock": "D3",
+    "on_state": 0
+  },
  "processor": "atmega32u4",
  "bootloader": "caterina",
  "layouts": {
diff --git a/keyboards/wuque/ikki68_aurora/config.h b/keyboards/wuque/ikki68_aurora/config.h
index 821528a068..c2e7b9376f 100644
--- a/keyboards/wuque/ikki68_aurora/config.h
+++ b/keyboards/wuque/ikki68_aurora/config.h
@@ -33,10 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-#define LED_CAPS_LOCK_PIN F7
-#define LED_PIN_ON_STATE 0
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
    #define RGBLED_NUM 20
diff --git a/keyboards/wuque/ikki68_aurora/info.json b/keyboards/wuque/ikki68_aurora/info.json
index 0a5176548b..bf47f85a75 100644
--- a/keyboards/wuque/ikki68_aurora/info.json
+++ b/keyboards/wuque/ikki68_aurora/info.json
@@ -8,6 +8,10 @@
        "pid": "0x0011",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "F7",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/wuque/mammoth75x/config.h b/keyboards/wuque/mammoth75x/config.h
index 860360c4e3..b070f4246a 100644
--- a/keyboards/wuque/mammoth75x/config.h
+++ b/keyboards/wuque/mammoth75x/config.h
@@ -47,6 +47,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Note:  array is { col, row )
 #define ENCODERS_CW_KEY  { { 3, 5 } }
 #define ENCODERS_CCW_KEY { { 5, 5 } }
-#define LED_CAPS_LOCK_PIN B6
-#define LED_PIN_ON_STATE 0
diff --git a/keyboards/wuque/mammoth75x/info.json b/keyboards/wuque/mammoth75x/info.json
index 4260d60d85..4bb3a29dd7 100644
--- a/keyboards/wuque/mammoth75x/info.json
+++ b/keyboards/wuque/mammoth75x/info.json
@@ -8,6 +8,10 @@
        "pid": "0x0004",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B6",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/wuque/promise87/ansi/config.h b/keyboards/wuque/promise87/ansi/config.h
index cc846fdf69..7c98bb27f8 100644
--- a/keyboards/wuque/promise87/ansi/config.h
+++ b/keyboards/wuque/promise87/ansi/config.h
@@ -26,9 +26,6 @@
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN F6
-#define LED_PIN_ON_STATE 0
 #define RGB_DI_PIN D2
 #ifdef RGB_DI_PIN
    #define RGBLED_NUM 1
diff --git a/keyboards/wuque/promise87/ansi/info.json b/keyboards/wuque/promise87/ansi/info.json
index eeecf46b34..cd9b8b4d63 100644
--- a/keyboards/wuque/promise87/ansi/info.json
+++ b/keyboards/wuque/promise87/ansi/info.json
@@ -8,6 +8,10 @@
    "pid": "0x0005",
    "device_version": "0.0.1"
  },
+  "indicators": {
+    "caps_lock": "F6",
+    "on_state": 0
+  },
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "layout_aliases": {
diff --git a/keyboards/wuque/promise87/wkl/config.h b/keyboards/wuque/promise87/wkl/config.h
index cc846fdf69..7c98bb27f8 100644
--- a/keyboards/wuque/promise87/wkl/config.h
+++ b/keyboards/wuque/promise87/wkl/config.h
@@ -26,9 +26,6 @@
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN F6
-#define LED_PIN_ON_STATE 0
 #define RGB_DI_PIN D2
 #ifdef RGB_DI_PIN
    #define RGBLED_NUM 1
diff --git a/keyboards/wuque/promise87/wkl/info.json b/keyboards/wuque/promise87/wkl/info.json
index fcf2d5514c..0a0e3b0bc5 100644
--- a/keyboards/wuque/promise87/wkl/info.json
+++ b/keyboards/wuque/promise87/wkl/info.json
@@ -8,6 +8,10 @@
    "pid": "0x0006",
    "device_version": "0.0.1"
  },
+  "indicators": {
+    "caps_lock": "F6",
+    "on_state": 0
+  },
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "layout_aliases": {
diff --git a/keyboards/wuque/serneity65/config.h b/keyboards/wuque/serneity65/config.h
index 441855b4da..12ec621c3a 100644
--- a/keyboards/wuque/serneity65/config.h
+++ b/keyboards/wuque/serneity65/config.h
@@ -34,6 +34,3 @@
 // Note:  array is { col, row )
 #define ENCODERS_CW_KEY  { { 3, 4 } }
 #define ENCODERS_CCW_KEY { { 5, 4 } }
-#define LED_CAPS_LOCK_PIN C6
-#define LED_PIN_ON_STATE 0
diff --git a/keyboards/wuque/serneity65/info.json b/keyboards/wuque/serneity65/info.json
index fa2dc42e85..d564e12236 100644
--- a/keyboards/wuque/serneity65/info.json
+++ b/keyboards/wuque/serneity65/info.json
@@ -8,6 +8,10 @@
        "pid": "0x0003",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C6",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/xelus/dawn60/config.h b/keyboards/xelus/dawn60/config.h
deleted file mode 100644
index 0ebeb9d5a1..0000000000
--- a/keyboards/xelus/dawn60/config.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 Harrison Chan (Xelus)
- *
- * 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/>.
- */
- 
diff --git a/keyboards/xelus/dharma/config.h b/keyboards/xelus/dharma/config.h
index 49486e83e4..e5076dd7ec 100644
--- a/keyboards/xelus/dharma/config.h
+++ b/keyboards/xelus/dharma/config.h
@@ -34,7 +34,3 @@
 #define LOCKING_RESYNC_ENABLE
 #define FORCE_NKRO
-#define LED_CAPS_LOCK_PIN B7
-#define LED_NUM_LOCK_PIN F0
-#define LED_PIN_ON_STATE 1
diff --git a/keyboards/xelus/dharma/info.json b/keyboards/xelus/dharma/info.json
index 1393040568..ffd8e500b9 100644
--- a/keyboards/xelus/dharma/info.json
+++ b/keyboards/xelus/dharma/info.json
@@ -8,6 +8,10 @@
        "pid": "0xDAAA",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B7",
+        "num_lock": "F0"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/xelus/ninjin/config.h b/keyboards/xelus/ninjin/config.h
index 8b4f959f8a..321105be9a 100644
--- a/keyboards/xelus/ninjin/config.h
+++ b/keyboards/xelus/ninjin/config.h
@@ -52,7 +52,3 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-#define LED_CAPS_LOCK_PIN A2
-#define LED_SCROLL_LOCK_PIN A13
-#define LED_PIN_ON_STATE 1
diff --git a/keyboards/xelus/ninjin/info.json b/keyboards/xelus/ninjin/info.json
index 32dc05f71c..bbac38b051 100644
--- a/keyboards/xelus/ninjin/info.json
+++ b/keyboards/xelus/ninjin/info.json
@@ -8,6 +8,10 @@
        "pid": "0x4E4A",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "A2",
+        "scroll_lock": "A13"
+    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layout_aliases": {
diff --git a/keyboards/xelus/pachi/mini_32u4/config.h b/keyboards/xelus/pachi/mini_32u4/config.h
index 3f500b14c5..240c73994b 100644
--- a/keyboards/xelus/pachi/mini_32u4/config.h
+++ b/keyboards/xelus/pachi/mini_32u4/config.h
@@ -28,6 +28,3 @@
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-#define LED_CAPS_LOCK_PIN F1
-#define LED_SCROLL_LOCK_PIN B3
diff --git a/keyboards/xelus/pachi/mini_32u4/info.json b/keyboards/xelus/pachi/mini_32u4/info.json
index bb3b24b123..b400fdd7a4 100644
--- a/keyboards/xelus/pachi/mini_32u4/info.json
+++ b/keyboards/xelus/pachi/mini_32u4/info.json
@@ -8,6 +8,10 @@
        "pid": "0x5041",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "F1",
+        "scroll_lock": "B3"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/xelus/pachi/rev1/config.h b/keyboards/xelus/pachi/rev1/config.h
index a76ba6244f..1ffac9665e 100644
--- a/keyboards/xelus/pachi/rev1/config.h
+++ b/keyboards/xelus/pachi/rev1/config.h
@@ -28,7 +28,3 @@
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-#define LED_CAPS_LOCK_PIN B14
-#define LED_SCROLL_LOCK_PIN A13
-#define LED_PIN_ON_STATE 1
diff --git a/keyboards/xelus/pachi/rev1/info.json b/keyboards/xelus/pachi/rev1/info.json
index d5b965a97e..44690cd7b5 100644
--- a/keyboards/xelus/pachi/rev1/info.json
+++ b/keyboards/xelus/pachi/rev1/info.json
@@ -8,6 +8,10 @@
        "pid": "0x5041",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B14",
+        "scroll_lock": "A13"
+    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/xelus/pachi/rgb/config.h b/keyboards/xelus/pachi/rgb/config.h
deleted file mode 100644
index 33dcbf8a0d..0000000000
--- a/keyboards/xelus/pachi/rgb/config.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Harrison Chan (Xelus)
- *
- * 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/>.
- */
diff --git a/keyboards/xelus/rs108/config.h b/keyboards/xelus/rs108/config.h
index 44133a3b5b..25df662575 100644
--- a/keyboards/xelus/rs108/config.h
+++ b/keyboards/xelus/rs108/config.h
@@ -31,11 +31,6 @@
 // Locking resynchronize hack
 #define LOCKING_RESYNC_ENABLE
-//Indicator
-#define LED_CAPS_LOCK_PIN A6
-#define LED_SCROLL_LOCK_PIN A13
-#define LED_NUM_LOCK_PIN A14
 // I2C config
 #define I2C1_SCL_PIN        B8
 #define I2C1_SDA_PIN        B9
diff --git a/keyboards/xelus/rs108/info.json b/keyboards/xelus/rs108/info.json
index db08aa88c8..959da932de 100644
--- a/keyboards/xelus/rs108/info.json
+++ b/keyboards/xelus/rs108/info.json
@@ -8,6 +8,11 @@
        "pid": "0x5208",
        "device_version": "0.0.2"
    },
+    "indicators": {
+        "caps_lock": "A6",
+        "num_lock": "A14",
+        "scroll_lock": "A13"
+    },
    "processor": "STM32F401",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/xelus/rs60/config.h b/keyboards/xelus/rs60/config.h
deleted file mode 100644
index bc421a442b..0000000000
--- a/keyboards/xelus/rs60/config.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2022 Harrison Chan (Xelus)
- *
- * 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/>.
- */
diff --git a/keyboards/xelus/rs60/rev1/config.h b/keyboards/xelus/rs60/rev1/config.h
index 7765e3526b..72789dc0da 100644
--- a/keyboards/xelus/rs60/rev1/config.h
+++ b/keyboards/xelus/rs60/rev1/config.h
@@ -31,8 +31,5 @@
 // Locking resynchronize hack
 #define LOCKING_RESYNC_ENABLE
-//Indicator
-#define LED_CAPS_LOCK_PIN B0
 //Force NKRO
 #define FORCE_NKRO
diff --git a/keyboards/xelus/rs60/rev1/info.json b/keyboards/xelus/rs60/rev1/info.json
index d86a0453c2..5eff1d75a6 100644
--- a/keyboards/xelus/rs60/rev1/info.json
+++ b/keyboards/xelus/rs60/rev1/info.json
@@ -2,6 +2,9 @@
    "usb": {
        "device_version": "0.1.0"
    },
+    "indicators": {
+        "caps_lock": "B0"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/xelus/rs60/rev2_0/config.h b/keyboards/xelus/rs60/rev2_0/config.h
index b78400662c..565c9aa3d5 100644
--- a/keyboards/xelus/rs60/rev2_0/config.h
+++ b/keyboards/xelus/rs60/rev2_0/config.h
@@ -31,9 +31,6 @@
 // Locking resynchronize hack
 #define LOCKING_RESYNC_ENABLE
-//Indicator
-#define LED_CAPS_LOCK_PIN A1
 // I2C config
 #define I2C1_SCL_PIN        B8
 #define I2C1_SDA_PIN        B9
diff --git a/keyboards/xelus/rs60/rev2_0/info.json b/keyboards/xelus/rs60/rev2_0/info.json
index af4ce913eb..e2ab965c1b 100644
--- a/keyboards/xelus/rs60/rev2_0/info.json
+++ b/keyboards/xelus/rs60/rev2_0/info.json
@@ -2,6 +2,9 @@
    "usb": {
        "device_version": "0.2.0"
    },
+    "indicators": {
+        "caps_lock": "A1"
+    },
    "processor": "STM32F401",
    "bootloader": "stm32-dfu"
 }
diff --git a/keyboards/xelus/rs60/rev2_1/config.h b/keyboards/xelus/rs60/rev2_1/config.h
index d176e394c8..40834f4bfb 100644
--- a/keyboards/xelus/rs60/rev2_1/config.h
+++ b/keyboards/xelus/rs60/rev2_1/config.h
@@ -31,9 +31,6 @@
 // Locking resynchronize hack
 #define LOCKING_RESYNC_ENABLE
-//Indicator
-#define LED_CAPS_LOCK_PIN A1
 // Emulated EEPROM
 #define WEAR_LEVELING_LOGICAL_SIZE 2048
 #define WEAR_LEVELING_BACKING_SIZE WEAR_LEVELING_LOGICAL_SIZE*2
diff --git a/keyboards/xelus/rs60/rev2_1/info.json b/keyboards/xelus/rs60/rev2_1/info.json
index c01512e8b6..2cb5b5ddda 100644
--- a/keyboards/xelus/rs60/rev2_1/info.json
+++ b/keyboards/xelus/rs60/rev2_1/info.json
@@ -2,6 +2,9 @@
    "usb": {
        "device_version": "0.2.1"
    },
+    "indicators": {
+        "caps_lock": "A1"
+    },
    "processor": "STM32L412",
    "bootloader": "stm32-dfu"
 }
diff --git a/keyboards/xelus/trinityxttkl/config.h b/keyboards/xelus/trinityxttkl/config.h
index 598574ab39..9d60133ced 100644
--- a/keyboards/xelus/trinityxttkl/config.h
+++ b/keyboards/xelus/trinityxttkl/config.h
@@ -28,7 +28,3 @@
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-#define LED_CAPS_LOCK_PIN A1
-#define LED_SCROLL_LOCK_PIN A13
-#define LED_PIN_ON_STATE 1
diff --git a/keyboards/xelus/trinityxttkl/info.json b/keyboards/xelus/trinityxttkl/info.json
index 094f9083f1..787f30cf99 100644
--- a/keyboards/xelus/trinityxttkl/info.json
+++ b/keyboards/xelus/trinityxttkl/info.json
@@ -8,6 +8,10 @@
        "pid": "0x5854",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "A1",
+        "scroll_lock": "A13"
+    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/xelus/xs108/config.h b/keyboards/xelus/xs108/config.h
index fbd542c417..a0b409a749 100644
--- a/keyboards/xelus/xs108/config.h
+++ b/keyboards/xelus/xs108/config.h
@@ -30,12 +30,6 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-// LED defines
-#define LED_CAPS_LOCK_PIN A2
-#define LED_SCROLL_LOCK_PIN A13
-#define LED_NUM_LOCK_PIN B7
-#define LED_PIN_ON_STATE 1
 // I2C setup
 #define I2C1_SCL_PIN        B8
 #define I2C1_SDA_PIN        B9
diff --git a/keyboards/xelus/xs108/info.json b/keyboards/xelus/xs108/info.json
index 95b758cd3e..c4a53a6f59 100644
--- a/keyboards/xelus/xs108/info.json
+++ b/keyboards/xelus/xs108/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0108",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "A2",
+        "num_lock": "B7",
+        "scroll_lock": "A13"
+    },
    "processor": "STM32L412",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/xiudi/xd68/config.h b/keyboards/xiudi/xd68/config.h
index 2677dbf30c..2ac58e35e8 100644
--- a/keyboards/xiudi/xd68/config.h
+++ b/keyboards/xiudi/xd68/config.h
@@ -38,9 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B2
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN F5
 #define BACKLIGHT_LEVELS 6
 #define BACKLIGHT_BREATHING
diff --git a/keyboards/xiudi/xd68/info.json b/keyboards/xiudi/xd68/info.json
index 1a14004290..4f1977ae12 100644
--- a/keyboards/xiudi/xd68/info.json
+++ b/keyboards/xiudi/xd68/info.json
@@ -8,6 +8,10 @@
        "pid": "0x6868",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B2",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["65_ansi", "65_ansi_split_bs", "65_iso"],
diff --git a/keyboards/xiudi/xd84/config.h b/keyboards/xiudi/xd84/config.h
index 6a82f970ff..2c9eaf1b37 100644
--- a/keyboards/xiudi/xd84/config.h
+++ b/keyboards/xiudi/xd84/config.h
@@ -37,9 +37,6 @@
 /* COL2ROW, ROW2COL */
 //#define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B6
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B5
 #define BACKLIGHT_LEVELS 10
 #define BACKLIGHT_ON_STATE 0
diff --git a/keyboards/xiudi/xd84/info.json b/keyboards/xiudi/xd84/info.json
index 7ff0dd7bcd..c2fc8fc5d6 100644
--- a/keyboards/xiudi/xd84/info.json
+++ b/keyboards/xiudi/xd84/info.json
@@ -8,6 +8,10 @@
        "pid": "0x8484",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B6",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["75_ansi", "75_iso"],
diff --git a/keyboards/xiudi/xd84pro/config.h b/keyboards/xiudi/xd84pro/config.h
index 636fe187b1..223e68a17d 100644
--- a/keyboards/xiudi/xd84pro/config.h
+++ b/keyboards/xiudi/xd84pro/config.h
@@ -26,9 +26,6 @@
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B2
-#define LED_PIN_ON_STATE 0
 #define RGB_DI_PIN F6
 #ifdef RGB_DI_PIN
    #define RGBLED_NUM 12
diff --git a/keyboards/xiudi/xd84pro/info.json b/keyboards/xiudi/xd84pro/info.json
index a80a49598b..315515dbde 100644
--- a/keyboards/xiudi/xd84pro/info.json
+++ b/keyboards/xiudi/xd84pro/info.json
@@ -8,6 +8,10 @@
        "pid": "0x8450",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B2",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["75_ansi", "75_iso"],
diff --git a/keyboards/xiudi/xd87/config.h b/keyboards/xiudi/xd87/config.h
index 009949d249..31ea924280 100644
--- a/keyboards/xiudi/xd87/config.h
+++ b/keyboards/xiudi/xd87/config.h
@@ -40,9 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN E2
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN D0
 #define BACKLIGHT_LEVELS 3
 #define BACKLIGHT_ON_STATE 0
diff --git a/keyboards/xiudi/xd87/info.json b/keyboards/xiudi/xd87/info.json
index d122894de0..bf6a9d206e 100644
--- a/keyboards/xiudi/xd87/info.json
+++ b/keyboards/xiudi/xd87/info.json
@@ -8,6 +8,10 @@
    "pid": "0x8787",
    "device_version": "0.0.1"
  },
+  "indicators": {
+    "caps_lock": "E2",
+    "on_state": 0
+  },
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "community_layouts": ["tkl_ansi", "tkl_iso"],
diff --git a/keyboards/xiudi/xd96/config.h b/keyboards/xiudi/xd96/config.h
index d0f6e89656..8e6c6601e7 100644
--- a/keyboards/xiudi/xd96/config.h
+++ b/keyboards/xiudi/xd96/config.h
@@ -37,10 +37,6 @@
 /* COL2ROW, ROW2COL */
 //#define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN C6
-#define LED_CAPS_LOCK_PIN B6
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B5
 #define BACKLIGHT_LEVELS 10
diff --git a/keyboards/xiudi/xd96/info.json b/keyboards/xiudi/xd96/info.json
index a1d16818d5..c8a62379b2 100644
--- a/keyboards/xiudi/xd96/info.json
+++ b/keyboards/xiudi/xd96/info.json
@@ -8,6 +8,11 @@
    "pid": "0x9696",
    "device_version": "0.0.1"
  },
+  "indicators": {
+    "caps_lock": "B6",
+    "num_lock": "C6",
+    "on_state": 0
+  },
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "layouts": {  
diff --git a/keyboards/xmmx/config.h b/keyboards/xmmx/config.h
index 61f0470ce9..1a1098ed96 100644
--- a/keyboards/xmmx/config.h
+++ b/keyboards/xmmx/config.h
@@ -12,10 +12,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN B6
-#define LED_SCROLL_LOCK_PIN B5
-#define LED_PIN_ON_STATE 0
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/xmmx/info.json b/keyboards/xmmx/info.json
index 3d0beb5283..26e1b933b9 100644
--- a/keyboards/xmmx/info.json
+++ b/keyboards/xmmx/info.json
@@ -8,6 +8,11 @@
        "pid": "0x6776",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B6",
+        "scroll_lock": "B5",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/yandrstudio/zhou65/config.h b/keyboards/yandrstudio/zhou65/config.h
index b4da724d11..3c205e2570 100644
--- a/keyboards/yandrstudio/zhou65/config.h
+++ b/keyboards/yandrstudio/zhou65/config.h
@@ -27,8 +27,5 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
-#define LED_CAPS_LOCK_PIN A15
-#define LED_PIN_ON_STATE    0
 /* enable the nkro when using the VIA. */
 #define FORCE_NKRO
diff --git a/keyboards/yandrstudio/zhou65/info.json b/keyboards/yandrstudio/zhou65/info.json
index 313a0dd3b3..d3c36ca852 100644
--- a/keyboards/yandrstudio/zhou65/info.json
+++ b/keyboards/yandrstudio/zhou65/info.json
@@ -4,6 +4,10 @@
        "pid": "0xAAAD",
        "device_version": "1.0.0"
    },
+    "indicators": {
+        "caps_lock": "A15",
+        "on_state": 0
+    },
    "processor": "STM32F401",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/ydkb/chili/config.h b/keyboards/ydkb/chili/config.h
index 7a9e4df13e..3769fdf970 100644
--- a/keyboards/ydkb/chili/config.h
+++ b/keyboards/ydkb/chili/config.h
@@ -33,11 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN B1
-#define LED_CAPS_LOCK_PIN B2
-#define LED_SCROLL_LOCK_PIN B3
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B7
 #define BACKLIGHT_BREATHING
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/ydkb/chili/info.json b/keyboards/ydkb/chili/info.json
index f565eeeecf..78a64c44ea 100644
--- a/keyboards/ydkb/chili/info.json
+++ b/keyboards/ydkb/chili/info.json
@@ -8,6 +8,12 @@
        "pid": "0x0001",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B2",
+        "num_lock": "B1",
+        "scroll_lock": "B3",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/ydkb/grape/config.h b/keyboards/ydkb/grape/config.h
index 0309301e2b..9d0ed24301 100644
--- a/keyboards/ydkb/grape/config.h
+++ b/keyboards/ydkb/grape/config.h
@@ -24,11 +24,6 @@
 #define SN74X138_ADDRESS_PINS { D2, D1, D0 }
-#define LED_NUM_LOCK_PIN F1
-#define LED_CAPS_LOCK_PIN F0
-#define LED_SCROLL_LOCK_PIN E6
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B7
 #define BACKLIGHT_BREATHING
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/ydkb/grape/info.json b/keyboards/ydkb/grape/info.json
index 0ce6a3cc43..c9dbcb6136 100644
--- a/keyboards/ydkb/grape/info.json
+++ b/keyboards/ydkb/grape/info.json
@@ -8,6 +8,12 @@
        "pid": "0x6772",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "F0",
+        "num_lock": "F1",
+        "scroll_lock": "E6",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/ydkb/yd68/config.h b/keyboards/ydkb/yd68/config.h
index 9bcfa32f44..67c4b5b6bd 100644
--- a/keyboards/ydkb/yd68/config.h
+++ b/keyboards/ydkb/yd68/config.h
@@ -38,9 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN D4
-#define LED_PIN_ON_STATE 0
 #define RGB_DI_PIN B3
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/ydkb/yd68/info.json b/keyboards/ydkb/yd68/info.json
index 557cefbcb2..d8f1439a3f 100644
--- a/keyboards/ydkb/yd68/info.json
+++ b/keyboards/ydkb/yd68/info.json
@@ -8,6 +8,10 @@
    "pid": "0x6060",
    "device_version": "0.0.2"
  },
+  "indicators": {
+    "caps_lock": "D4",
+    "on_state": 0
+  },
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "layouts": {
diff --git a/keyboards/ymdk/bface/config.h b/keyboards/ymdk/bface/config.h
index f93e8bce31..aad880f51c 100644
--- a/keyboards/ymdk/bface/config.h
+++ b/keyboards/ymdk/bface/config.h
@@ -27,8 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN D1
 #define BACKLIGHT_PIN       D4
 #define BACKLIGHT_LEVELS    6
diff --git a/keyboards/ymdk/bface/info.json b/keyboards/ymdk/bface/info.json
index fe3f8c2cea..0547091c2a 100644
--- a/keyboards/ymdk/bface/info.json
+++ b/keyboards/ymdk/bface/info.json
@@ -8,6 +8,9 @@
    "pid": "0x4266",
    "device_version": "2.0.0"
  },
+  "indicators": {
+    "caps_lock": "D1"
+  },
  "processor": "atmega32a",
  "bootloader": "bootloadhid",
  "layouts": {
diff --git a/keyboards/ymdk/melody96/config.h b/keyboards/ymdk/melody96/config.h
index 21e724b43f..0aa29f642b 100644
--- a/keyboards/ymdk/melody96/config.h
+++ b/keyboards/ymdk/melody96/config.h
@@ -12,11 +12,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
-#define LED_NUM_LOCK_PIN C6
-#define LED_CAPS_LOCK_PIN C7
-#define LED_SCROLL_LOCK_PIN B5
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B6
 #ifdef BACKLIGHT_PIN
 #define BACKLIGHT_LEVELS 5
diff --git a/keyboards/ymdk/melody96/info.json b/keyboards/ymdk/melody96/info.json
index 1c21c0fdeb..93c64be2cd 100644
--- a/keyboards/ymdk/melody96/info.json
+++ b/keyboards/ymdk/melody96/info.json
@@ -8,6 +8,12 @@
        "pid": "0x4D96",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C7",
+        "num_lock": "C6",
+        "scroll_lock": "B5",
+        "on_state": 0
+    },
    "bootmagic": {
        "matrix": [5, 0]
    },
diff --git a/keyboards/ymdk/np21/config.h b/keyboards/ymdk/np21/config.h
index 6911f4f103..682396ca1e 100644
--- a/keyboards/ymdk/np21/config.h
+++ b/keyboards/ymdk/np21/config.h
@@ -38,8 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN D0
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 12
 #define BACKLIGHT_BREATHING
diff --git a/keyboards/ymdk/np21/info.json b/keyboards/ymdk/np21/info.json
index 9a7053358b..31dc02f0cd 100644
--- a/keyboards/ymdk/np21/info.json
+++ b/keyboards/ymdk/np21/info.json
@@ -7,6 +7,9 @@
        "pid": "0x5021",
        "device_version": "2.0.0"
    },
+    "indicators": {
+        "num_lock": "D0"
+    },
    "processor": "atmega32a",
    "bootloader": "bootloadhid",
    "community_layouts": ["ortho_6x4", "numpad_6x4"],
diff --git a/keyboards/ymdk/np24/u4rgb6/config.h b/keyboards/ymdk/np24/u4rgb6/config.h
index 196258a5e7..737a4c3b31 100644
--- a/keyboards/ymdk/np24/u4rgb6/config.h
+++ b/keyboards/ymdk/np24/u4rgb6/config.h
@@ -27,10 +27,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
-/* LED indicator pins */
-#define LED_NUM_LOCK_PIN    C6
-#define LED_PIN_ON_STATE    0
 #define BACKLIGHT_PIN B7
 #ifdef BACKLIGHT_PIN
 # define BACKLIGHT_LEVELS 31
diff --git a/keyboards/ymdk/np24/u4rgb6/info.json b/keyboards/ymdk/np24/u4rgb6/info.json
index 3353a16269..1d5ff5dbd7 100644
--- a/keyboards/ymdk/np24/u4rgb6/info.json
+++ b/keyboards/ymdk/np24/u4rgb6/info.json
@@ -7,6 +7,10 @@
        "pid": "0x5024",
        "device_version": "4.0.6"
    },
+    "indicators": {
+        "num_lock": "C6",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["ortho_6x4", "numpad_6x4"],
diff --git a/keyboards/ymdk/sp64/config.h b/keyboards/ymdk/sp64/config.h
index 8fd53baafd..da23123292 100644
--- a/keyboards/ymdk/sp64/config.h
+++ b/keyboards/ymdk/sp64/config.h
@@ -23,11 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RIGHT_HALF
-/* LED indicator lights */
-#define LED_CAPS_LOCK_PIN D1
-#define LED_NUM_LOCK_PIN D0
-#define LED_SCROLL_LOCK_PIN D6
 /* RGB underglow */
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
diff --git a/keyboards/ymdk/sp64/info.json b/keyboards/ymdk/sp64/info.json
index 2b2ed16285..66cbbe56e5 100644
--- a/keyboards/ymdk/sp64/info.json
+++ b/keyboards/ymdk/sp64/info.json
@@ -8,6 +8,11 @@
        "pid": "0x5364",
        "device_version": "2.0.0"
    },
+    "indicators": {
+        "caps_lock": "D1",
+        "num_lock": "D0",
+        "scroll_lock": "D6"
+    },
    "processor": "atmega32a",
    "bootloader": "bootloadhid",
    "layouts": {
diff --git a/keyboards/ymdk/wings/config.h b/keyboards/ymdk/wings/config.h
index b99fcdfda1..8b0ec334e5 100644
--- a/keyboards/ymdk/wings/config.h
+++ b/keyboards/ymdk/wings/config.h
@@ -39,9 +39,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PIN B6
 #define BACKLIGHT_LEVELS 5
-#define LED_CAPS_LOCK_PIN C7
-#define LED_PIN_ON_STATE 0
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
 #define RGBLED_NUM 14
diff --git a/keyboards/ymdk/wings/info.json b/keyboards/ymdk/wings/info.json
index 44fcc47c63..80e0c580a3 100644
--- a/keyboards/ymdk/wings/info.json
+++ b/keyboards/ymdk/wings/info.json
@@ -8,6 +8,10 @@
        "pid": "0x2975",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C7",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/ymdk/wingshs/config.h b/keyboards/ymdk/wingshs/config.h
index 9ebb46827a..11ba82cabc 100644
--- a/keyboards/ymdk/wingshs/config.h
+++ b/keyboards/ymdk/wingshs/config.h
@@ -37,9 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PIN B6
 #define BACKLIGHT_LEVELS 5
-#define LED_CAPS_LOCK_PIN C7
-#define LED_PIN_ON_STATE 0
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
 #define RGBLED_NUM 80
diff --git a/keyboards/ymdk/wingshs/info.json b/keyboards/ymdk/wingshs/info.json
index ab474f0a19..e451d10d4d 100644
--- a/keyboards/ymdk/wingshs/info.json
+++ b/keyboards/ymdk/wingshs/info.json
@@ -8,6 +8,10 @@
        "pid": "0x4975",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "C7",
+        "on_state": 0
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/ymdk/ymd75/config.h b/keyboards/ymdk/ymd75/config.h
index c9c88a026b..d384ae2479 100644
--- a/keyboards/ymdk/ymd75/config.h
+++ b/keyboards/ymdk/ymd75/config.h
@@ -22,8 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_LEVELS 12
-#define LED_CAPS_LOCK_PIN D1
 #define RGB_DI_PIN E2
 #define RGBLED_NUM 16
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/ymdk/ymd75/rev1/info.json b/keyboards/ymdk/ymd75/rev1/info.json
index d7be6a3c86..6dee7f2d94 100644
--- a/keyboards/ymdk/ymd75/rev1/info.json
+++ b/keyboards/ymdk/ymd75/rev1/info.json
@@ -2,6 +2,9 @@
    "usb": {
        "device_version": "1.0.0"
    },
+    "indicators": {
+        "caps_lock": "D1"
+    },
    "processor": "atmega32a",
    "bootloader": "bootloadhid"
 }
diff --git a/keyboards/ymdk/ymd75/rev2/info.json b/keyboards/ymdk/ymd75/rev2/info.json
index 759d2c1e0c..be7df2e5a7 100644
--- a/keyboards/ymdk/ymd75/rev2/info.json
+++ b/keyboards/ymdk/ymd75/rev2/info.json
@@ -2,6 +2,9 @@
    "usb": {
        "device_version": "2.0.0"
    },
+    "indicators": {
+        "caps_lock": "D1"
+    },
    "processor": "atmega32a",
    "bootloader": "bootloadhid"
 }
diff --git a/keyboards/ymdk/ymd75/rev3/config.h b/keyboards/ymdk/ymd75/rev3/config.h
index 9e54c7acdd..41af337f4c 100644
--- a/keyboards/ymdk/ymd75/rev3/config.h
+++ b/keyboards/ymdk/ymd75/rev3/config.h
@@ -7,5 +7,3 @@
 #define BACKLIGHT_PIN B6 // change the backlight pin that has since changed in Rev 3
 #define DIODE_DIRECTION ROW2COL
 #define RGBLIGHT_EFFECT_KNIGHT_OFFSET 4
-#undef LED_CAPS_LOCK_PIN // CapsLock pin changed in Rev 3
-#define LED_CAPS_LOCK_PIN C7
diff --git a/keyboards/ymdk/ymd75/rev3/info.json b/keyboards/ymdk/ymd75/rev3/info.json
index c72db1ba6f..850cf51f56 100644
--- a/keyboards/ymdk/ymd75/rev3/info.json
+++ b/keyboards/ymdk/ymd75/rev3/info.json
@@ -2,6 +2,9 @@
    "usb": {
        "device_version": "3.0.0"
    },
+    "indicators": {
+        "caps_lock": "C7"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/ymdk/ymd96/config.h b/keyboards/ymdk/ymd96/config.h
index 52b9ec5ed9..cb783702c6 100644
--- a/keyboards/ymdk/ymd96/config.h
+++ b/keyboards/ymdk/ymd96/config.h
@@ -28,10 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN D0
-#define LED_CAPS_LOCK_PIN D1
-#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 12
 #define BACKLIGHT_BREATHING
diff --git a/keyboards/ymdk/ymd96/info.json b/keyboards/ymdk/ymd96/info.json
index 1628aeb271..ebf56d2ee5 100644
--- a/keyboards/ymdk/ymd96/info.json
+++ b/keyboards/ymdk/ymd96/info.json
@@ -8,6 +8,11 @@
        "pid": "0x422D",
        "device_version": "2.0.0"
    },
+    "indicators": {
+        "caps_lock": "D1",
+        "num_lock": "D0",
+        "on_state": 0
+    },
    "processor": "atmega32a",
    "bootloader": "bootloadhid",
    "layouts": {
diff --git a/keyboards/zoo/wampus/config.h b/keyboards/zoo/wampus/config.h
index 9d7c3d2ce2..40fe5687be 100644
--- a/keyboards/zoo/wampus/config.h
+++ b/keyboards/zoo/wampus/config.h
@@ -38,10 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define LED_NUM_LOCK_PIN B0
-#define LED_CAPS_LOCK_PIN B8
-#define LED_SCROLL_LOCK_PIN B9
 // In-switch LED defines
 #define BACKLIGHT_PIN           A6
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/zoo/wampus/info.json b/keyboards/zoo/wampus/info.json
index 7115c201fa..4c1a36c4f4 100644
--- a/keyboards/zoo/wampus/info.json
+++ b/keyboards/zoo/wampus/info.json
@@ -8,6 +8,11 @@
        "pid": "0xE600",
        "device_version": "0.0.1"
    },
+    "indicators": {
+        "caps_lock": "B8",
+        "num_lock": "B0",
+        "scroll_lock": "B9"
+    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "community_layouts": ["alice", "alice_split_bs"],
author	Ryan <fauxpark@gmail.com>	2023-02-17 13:14:29 +1100
committer	GitHub <noreply@github.com>	2023-02-17 13:14:29 +1100
commit	f4ba17c4a0ee59603c167b04f2d6f6eee8b2cf1b (patch)
tree	11fec680226404eb46d2c61305cf7e848450c4d9 /keyboards
parent	d784f78bd0a034c1d6085379615014fd701536ab (diff)