diff --git a/keyboards/acheron/austin/austin.c b/keyboards/acheron/austin/austin.c
deleted file mode 100644
index 9a69d1c0865..00000000000
--- a/keyboards/acheron/austin/austin.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include "quantum.h"
-
-void keyboard_pre_init_kb(void) {
-    gpio_set_pin_output(A0);
-    gpio_set_pin_output(A1);
-    gpio_set_pin_output(A2);
-
-    keyboard_pre_init_user();
-}
-
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        gpio_write_pin(A2, led_state.num_lock);
-        gpio_write_pin(A0, led_state.caps_lock);
-        gpio_write_pin(A1, led_state.scroll_lock);
-    }
-    return true;
-}
diff --git a/keyboards/acheron/austin/keyboard.json b/keyboards/acheron/austin/keyboard.json
index bee675472c9..a3df5dd75d3 100755
--- a/keyboards/acheron/austin/keyboard.json
+++ b/keyboards/acheron/austin/keyboard.json
@@ -33,6 +33,11 @@
         "levels": 6,
         "breathing": true
     },
+    "indicators": {
+        "caps_lock": "A0",
+        "num_lock": "A2",
+        "scroll_lock": "A1"
+    },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/cheshire/curiosity/curiosity.c b/keyboards/cheshire/curiosity/curiosity.c
deleted file mode 100644
index 2813cff9b4a..00000000000
--- a/keyboards/cheshire/curiosity/curiosity.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "quantum.h"
-
-void matrix_init_board(void){
-    gpio_set_pin_output(A8);
-    gpio_set_pin_output(A9);
-    gpio_set_pin_output(A10);
-}
-
-bool led_update_kb(led_t led_state) {
-    bool runDefault = led_update_user(led_state);
-    if (runDefault) {
-      gpio_write_pin(A8, !led_state.num_lock);
-      gpio_write_pin(A9, !led_state.caps_lock);
-      gpio_write_pin(A10, !led_state.scroll_lock);
-    }
-    return runDefault;
-}
diff --git a/keyboards/cheshire/curiosity/keyboard.json b/keyboards/cheshire/curiosity/keyboard.json
index 679f2a45d1a..b408a5b6e95 100644
--- a/keyboards/cheshire/curiosity/keyboard.json
+++ b/keyboards/cheshire/curiosity/keyboard.json
@@ -7,6 +7,12 @@
         "pid": "0x0FAD",
         "device_version": "0.0.1"
     },
+    "indicators": {
+        "caps_lock": "A9",
+        "num_lock": "A8",
+        "scroll_lock": "A10",
+        "on_state": 0
+    },
     "rgblight": {
         "led_count": 14,
         "animations": {
diff --git a/keyboards/doppelganger/doppelganger.c b/keyboards/doppelganger/doppelganger.c
index 4a62fdf45f1..de0e2cc7556 100644
--- a/keyboards/doppelganger/doppelganger.c
+++ b/keyboards/doppelganger/doppelganger.c
@@ -16,21 +16,9 @@
 #include "quantum.h"
 
 void keyboard_pre_init_kb(void) {
-    gpio_set_pin_output(C6);
     gpio_set_pin_output(B0);
-}
 
-bool led_update_kb(led_t led_state) {
-    bool res = led_update_user(led_state);
-    if (res) {
-        // gpio_write_pin sets the pin high for 1 and low for 0.
-        // In this example the pins are inverted, setting
-        // it low/0 turns it on, and high/1 turns the LED off.
-        // This behavior depends on whether the LED is between the pin
-        // and VCC or the pin and GND.
-        gpio_write_pin(C6, !led_state.caps_lock);
-    }
-    return res;
+    keyboard_pre_init_user();
 }
 
 __attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) {
diff --git a/keyboards/doppelganger/keyboard.json b/keyboards/doppelganger/keyboard.json
index 9ea2241a807..ccba77fdfa5 100644
--- a/keyboards/doppelganger/keyboard.json
+++ b/keyboards/doppelganger/keyboard.json
@@ -8,6 +8,10 @@
         "pid": "0x4447",
         "device_version": "0.0.1"
     },
+    "indicators": {
+        "caps_lock": "C6",
+        "on_state": 0
+    },
     "matrix_pins": {
         "cols": ["F4", "F0", "B7", "B3", "B2", "B1", "D5", "D3", "D2"],
         "rows": ["E6", "F1", "C7", "F7", "F6"]
diff --git a/keyboards/exclusive/e85/soldered/keyboard.json b/keyboards/exclusive/e85/soldered/keyboard.json
index 8b4ebbfc575..dfd6d18826b 100644
--- a/keyboards/exclusive/e85/soldered/keyboard.json
+++ b/keyboards/exclusive/e85/soldered/keyboard.json
@@ -18,6 +18,10 @@
         "levels": 6,
         "breathing": true
     },
+    "indicators": {
+        "caps_lock": "C7",
+        "scroll_lock": "B5"
+    },
     "rgblight": {
         "saturation_steps": 8,
         "brightness_steps": 8,
diff --git a/keyboards/exclusive/e85/soldered/soldered.c b/keyboards/exclusive/e85/soldered/soldered.c
deleted file mode 100644
index bdee95c26c6..00000000000
--- a/keyboards/exclusive/e85/soldered/soldered.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2020 VashtaNerada
- *
- * 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/>.
- */
-
-#include "quantum.h"
-
-void keyboard_pre_init_kb(void) {
-    gpio_set_pin_output(C7);
-    gpio_set_pin_output(B5);
-
-    keyboard_pre_init_user();
-}
-
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        gpio_write_pin(C7, led_state.caps_lock);
-        gpio_write_pin(B5, led_state.scroll_lock);
-    }
-    return true;
-}
diff --git a/keyboards/ghs/rar/keyboard.json b/keyboards/ghs/rar/keyboard.json
index 22b133c8f99..96184abe6a6 100644
--- a/keyboards/ghs/rar/keyboard.json
+++ b/keyboards/ghs/rar/keyboard.json
@@ -8,6 +8,10 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "indicators": {
+        "caps_lock": "B1",
+        "scroll_lock": "B3"
+    },
     "rgblight": {
         "led_count": 17,
         "animations": {
diff --git a/keyboards/ghs/rar/rar.c b/keyboards/ghs/rar/rar.c
deleted file mode 100644
index 591932c99c2..00000000000
--- a/keyboards/ghs/rar/rar.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2020 Gone Hacking Studio
- *
- * 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/>.
- */
-
-#include "quantum.h"
-
-void keyboard_pre_init_kb(void) {
-    // Set our LED pins as output.
-    gpio_set_pin_output(B1);
-    gpio_set_pin_output(B3);
-
-    keyboard_pre_init_user();
-}
-
-bool led_update_kb(led_t led_state) {
-    bool res = led_update_user(led_state);
-
-    if (res) {
-        gpio_write_pin(B1, led_state.caps_lock);
-        gpio_write_pin(B3, led_state.scroll_lock);
-    }
-
-    return res;
-}
diff --git a/keyboards/gray_studio/think65/solder/keyboard.json b/keyboards/gray_studio/think65/solder/keyboard.json
index 9706e8b4b49..09096a854e5 100644
--- a/keyboards/gray_studio/think65/solder/keyboard.json
+++ b/keyboards/gray_studio/think65/solder/keyboard.json
@@ -41,6 +41,10 @@
         "nkro": false,
         "rgblight": true
     },
+    "indicators": {
+        "caps_lock": "C7",
+        "on_state": 0
+    },
     "matrix_pins": {
         "cols": ["D1", "D0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "F0", "F1", "B6", "F4", "F5", "F6"],
         "rows": ["B0", "B1", "B2", "B3", "E6"]
diff --git a/keyboards/gray_studio/think65/solder/solder.c b/keyboards/gray_studio/think65/solder/solder.c
deleted file mode 100644
index 84267b9db07..00000000000
--- a/keyboards/gray_studio/think65/solder/solder.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2019 MechMerlin
- *
- * 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/>.
- */
-#include "quantum.h"
-
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-
-
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-
-  gpio_set_pin_output(C7);
-  matrix_init_user();
-}
-
-bool led_update_kb(led_t led_state) {
-  if(led_update_user(led_state)) {
-    gpio_write_pin(C7, !led_state.caps_lock);
-  }
-  return true;
-}
diff --git a/keyboards/ilumkb/volcano660/keyboard.json b/keyboards/ilumkb/volcano660/keyboard.json
index 297b28a5f92..fa74e46fedb 100644
--- a/keyboards/ilumkb/volcano660/keyboard.json
+++ b/keyboards/ilumkb/volcano660/keyboard.json
@@ -32,6 +32,12 @@
         "pin": "B7",
         "levels": 5
     },
+    "indicators": {
+        "caps_lock": "D2",
+        "num_lock": "D0",
+        "scroll_lock": "D1",
+        "on_state": 0
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": [
diff --git a/keyboards/ilumkb/volcano660/volcano660.c b/keyboards/ilumkb/volcano660/volcano660.c
deleted file mode 100644
index 5e6d67c9ba9..00000000000
--- a/keyboards/ilumkb/volcano660/volcano660.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2020 dztech
- *
- * 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/>.
- */
-#include "quantum.h"
-
-void matrix_init_kb(void) {
-    gpio_set_pin_output(D0);
-    gpio_set_pin_output(D1);
-    gpio_set_pin_output(D2); 
-    matrix_init_user();
-}
-
-bool led_update_kb(led_t led_state) {
-    bool res = led_update_user(led_state);
-    if(res) {
-        gpio_write_pin(D0, !led_state.num_lock);
-        gpio_write_pin(D2, !led_state.caps_lock);
-        gpio_write_pin(D1, !led_state.scroll_lock);
-
-    }
-    return res;
-}
diff --git a/keyboards/jae/j01/j01.c b/keyboards/jae/j01/j01.c
deleted file mode 100644
index 4d3f8ced46c..00000000000
--- a/keyboards/jae/j01/j01.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright Evy Dekkers
- *
- * 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/>.
- */
-
-#include "quantum.h"
-
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-
-
-void matrix_init_kb(void) {
-    // put your keyboard start-up code here
-    // runs once when the firmware starts up
-
-    matrix_init_user();
-    gpio_set_pin_output(E6);
-}
-
-bool led_update_kb(led_t led_state) {
-    if(led_update_user(led_state)) {
-        gpio_write_pin(E6, !led_state.caps_lock);
-    }
-
-    return true;
-}
diff --git a/keyboards/jae/j01/keyboard.json b/keyboards/jae/j01/keyboard.json
index 56a5062c94c..fd16f2a46e7 100644
--- a/keyboards/jae/j01/keyboard.json
+++ b/keyboards/jae/j01/keyboard.json
@@ -33,6 +33,10 @@
         "levels": 4,
         "breathing": true
     },
+    "indicators": {
+        "caps_lock": "E6",
+        "on_state": 0
+    },
     "bootmagic": {
         "matrix": [0, 2]
     },
diff --git a/keyboards/kkatano/wallaby/keyboard.json b/keyboards/kkatano/wallaby/keyboard.json
index ee475a54bc0..636fdba0422 100644
--- a/keyboards/kkatano/wallaby/keyboard.json
+++ b/keyboards/kkatano/wallaby/keyboard.json
@@ -22,6 +22,10 @@
             "resync": true
         }
     },
+    "indicators": {
+        "caps_lock": "B6",
+        "scroll_lock": "B7"
+    },
     "matrix_pins": {
         "cols": ["D5", "C7", "C6", "D4", "D0", "E6", "F0", "F1", "F4", "F5", "F6", "F7", "D7", "D6", "D1", "D2", "D3"],
         "rows": ["B5", "B4", "B3", "B2", "B1", "B0"]
diff --git a/keyboards/kkatano/wallaby/wallaby.c b/keyboards/kkatano/wallaby/wallaby.c
deleted file mode 100644
index de2583903bb..00000000000
--- a/keyboards/kkatano/wallaby/wallaby.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2020 Koichi Katano
- *
- * 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/>.
- */
-
-#include "quantum.h"
-
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        gpio_write_pin(B6, led_state.caps_lock);
-        gpio_write_pin(B7, led_state.scroll_lock);
-    }
-    return true;
-}
diff --git a/keyboards/kkatano/yurei/keyboard.json b/keyboards/kkatano/yurei/keyboard.json
index 7bf08957872..59084920da6 100644
--- a/keyboards/kkatano/yurei/keyboard.json
+++ b/keyboards/kkatano/yurei/keyboard.json
@@ -22,6 +22,10 @@
             "resync": true
         }
     },
+    "indicators": {
+        "caps_lock": "B6",
+        "scroll_lock": "B7"
+    },
     "matrix_pins": {
         "cols": ["D5", "C7", "C6", "D4", "D0", "E6", "F0", "F1", "F4", "F5", "F6", "F7", "D7", "D6", "D1", "D2", "D3"],
         "rows": ["B5", "B4", "B3", "B2", "B1", "B0"]
diff --git a/keyboards/kkatano/yurei/yurei.c b/keyboards/kkatano/yurei/yurei.c
deleted file mode 100644
index 283726a884f..00000000000
--- a/keyboards/kkatano/yurei/yurei.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2019 Koichi Katano
- *
- * 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/>.
- */
-
-#include "quantum.h"
-
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        gpio_write_pin(B6, led_state.caps_lock);
-        gpio_write_pin(B7, led_state.scroll_lock);
-    }
-    return true;
-}
diff --git a/keyboards/marksard/leftover30/keyboard.json b/keyboards/marksard/leftover30/keyboard.json
index 546b3dbdd33..ae2250a5f2c 100644
--- a/keyboards/marksard/leftover30/keyboard.json
+++ b/keyboards/marksard/leftover30/keyboard.json
@@ -33,6 +33,10 @@
             {"pin_a": "F4", "pin_b": "F5"}
         ]
     },
+    "indicators": {
+        "caps_lock": "D1",
+        "num_lock": "D2"
+    },
     "rgblight": {
         "saturation_steps": 8,
         "brightness_steps": 8,
diff --git a/keyboards/marksard/leftover30/leftover30.c b/keyboards/marksard/leftover30/leftover30.c
deleted file mode 100644
index cea0de703ab..00000000000
--- a/keyboards/marksard/leftover30/leftover30.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2020 marksard
- *
- * 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/>.
- */
-
-#include "quantum.h"
-
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-
-void keyboard_pre_init_user(void) {
-  /* Set CAPSLOCK indicator pin as output */
-  gpio_set_pin_output(D1);
-  /* Set NUMLOCK indicator pin as output */
-  gpio_set_pin_output(D2);
-}
-
-bool led_update_kb(led_t led_state) {
-    bool res = led_update_user(led_state);
-    if(res) {
-        gpio_write_pin(D2, led_state.num_lock);
-        gpio_write_pin(D1, led_state.caps_lock);
-    }
-    return res;
-}
diff --git a/keyboards/noxary/220/220.c b/keyboards/noxary/220/220.c
deleted file mode 100644
index c5affa4344d..00000000000
--- a/keyboards/noxary/220/220.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2020 Rozakiin
- *
- * 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/>.
- */
-#include "quantum.h"
-
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-  gpio_set_pin_output(C6);
-  matrix_init_user();
-}
-
-bool led_update_kb(led_t led_state) {
-    if(led_update_user(led_state)) {
-        gpio_write_pin(C6, led_state.num_lock);
-    }
-    return true;
-}
\ No newline at end of file
diff --git a/keyboards/noxary/220/keyboard.json b/keyboards/noxary/220/keyboard.json
index 75d71aac8a3..35653169998 100644
--- a/keyboards/noxary/220/keyboard.json
+++ b/keyboards/noxary/220/keyboard.json
@@ -32,6 +32,9 @@
         "pin": "B7",
         "breathing": true
     },
+    "indicators": {
+        "num_lock": "C6"
+    },
     "processor": "atmega32u2",
     "bootloader": "atmel-dfu",
     "community_layouts": ["ortho_6x4"],
diff --git a/keyboards/noxary/268_2/268_2.c b/keyboards/noxary/268_2/268_2.c
deleted file mode 100644
index 56b42d2343d..00000000000
--- a/keyboards/noxary/268_2/268_2.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2018 Rozakiin
- *
- * 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/>.
- */
-#include "quantum.h"
-
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-  gpio_set_pin_output(B0);
-  matrix_init_user();
-}
-
-bool led_update_kb(led_t led_state) {
-    if(led_update_user(led_state)) {
-        gpio_write_pin(B0, led_state.caps_lock);
-    }
-    return true;
-}
diff --git a/keyboards/noxary/268_2/keyboard.json b/keyboards/noxary/268_2/keyboard.json
index c724d07a493..08daee6d639 100644
--- a/keyboards/noxary/268_2/keyboard.json
+++ b/keyboards/noxary/268_2/keyboard.json
@@ -31,6 +31,9 @@
   "backlight": {
     "pin": "B7"
   },
+  "indicators": {
+    "caps_lock": "B0"
+  },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "community_layouts": ["65_ansi_blocker"],
diff --git a/keyboards/noxary/280/280.c b/keyboards/noxary/280/280.c
deleted file mode 100644
index 0f29df178f4..00000000000
--- a/keyboards/noxary/280/280.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2019 %YOUR_NAME%
- *
- * 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/>.
- */
-#include "quantum.h"
-
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-  gpio_set_pin_output(D5);
-  gpio_set_pin_output(D0);
-	matrix_init_user();
-}
-
-bool led_update_kb(led_t led_state) {
-    if(led_update_user(led_state)) {
-        gpio_write_pin(D5, led_state.caps_lock);
-        gpio_write_pin(D0, led_state.scroll_lock);
-    }
-    return true;
-}
\ No newline at end of file
diff --git a/keyboards/noxary/280/keyboard.json b/keyboards/noxary/280/keyboard.json
index 17acb96cdf4..4bd9257152f 100644
--- a/keyboards/noxary/280/keyboard.json
+++ b/keyboards/noxary/280/keyboard.json
@@ -32,6 +32,10 @@
         "pin": "B7",
         "breathing": true
     },
+    "indicators": {
+        "caps_lock": "D5",
+        "scroll_lock": "D0"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/ortho5by12/keyboard.json b/keyboards/ortho5by12/keyboard.json
index 49ce4944175..5bcd1e00fcd 100644
--- a/keyboards/ortho5by12/keyboard.json
+++ b/keyboards/ortho5by12/keyboard.json
@@ -22,6 +22,10 @@
       "resync": true
     }
   },
+  "indicators": {
+    "caps_lock": "C5",
+    "num_lock": "C4"
+  },
   "matrix_pins": {
     "cols": ["C2", "D0", "D1", "D4", "C3", "C1"],
     "rows": ["B5", "B1", "B2", "B3", "B4", "C0", "D5", "D6", "D7", "B0"]
diff --git a/keyboards/ortho5by12/ortho5by12.c b/keyboards/ortho5by12/ortho5by12.c
deleted file mode 100644
index d0d9ce9102d..00000000000
--- a/keyboards/ortho5by12/ortho5by12.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2019 Takuya Urakawa (dm9records.com)
- *
- * 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/>.
- */
-#include "quantum.h"
-
-void matrix_init_kb(void) {
-    gpio_set_pin_output(C4);
-    gpio_set_pin_output(C5);
-}
-
-bool led_update_kb(led_t led_state) {
-    bool res = led_update_user(led_state);
-    if(res) {
-        gpio_write_pin(C4, led_state.num_lock);
-        gpio_write_pin(C5, led_state.caps_lock);
-    }
-    return res;
-}
diff --git a/keyboards/percent/canoe_gen2/canoe_gen2.c b/keyboards/percent/canoe_gen2/canoe_gen2.c
index ea091c34744..435083a269d 100644
--- a/keyboards/percent/canoe_gen2/canoe_gen2.c
+++ b/keyboards/percent/canoe_gen2/canoe_gen2.c
@@ -17,21 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "quantum.h"
 
-void keyboard_pre_init_kb(void) {
-  gpio_set_pin_output(E6);
-  gpio_write_pin_high(E6);
-  
-  keyboard_pre_init_user();
-}
-
-bool led_update_kb(led_t led_state) {
-    if(led_update_user(led_state)) {
-        gpio_write_pin(E6, !led_state.caps_lock);
-    }
-
-    return true;
-}
-
 #ifdef RGB_MATRIX_ENABLE
 void suspend_power_down_kb(void) {
     rgb_matrix_set_suspend_state(true);
diff --git a/keyboards/percent/canoe_gen2/keyboard.json b/keyboards/percent/canoe_gen2/keyboard.json
index 0b6ece2613c..85fbfd28b9d 100644
--- a/keyboards/percent/canoe_gen2/keyboard.json
+++ b/keyboards/percent/canoe_gen2/keyboard.json
@@ -22,6 +22,10 @@
             "resync": true
         }
     },
+    "indicators": {
+        "caps_lock": "E6",
+        "on_state": 0
+    },
     "ws2812": {
         "pin": "B7"
     },
diff --git a/keyboards/pom_keyboards/tnln95/keyboard.json b/keyboards/pom_keyboards/tnln95/keyboard.json
index c92ac5b38f1..09b3f71f7c0 100644
--- a/keyboards/pom_keyboards/tnln95/keyboard.json
+++ b/keyboards/pom_keyboards/tnln95/keyboard.json
@@ -37,6 +37,10 @@
         "levels": 10,
         "breathing": true
     },
+    "indicators": {
+        "caps_lock": "B2",
+        "num_lock": "B1"
+    },
     "rgblight": {
         "saturation_steps": 8,
         "brightness_steps": 8,
diff --git a/keyboards/pom_keyboards/tnln95/tnln95.c b/keyboards/pom_keyboards/tnln95/tnln95.c
deleted file mode 100644
index b8ab8ff7a7e..00000000000
--- a/keyboards/pom_keyboards/tnln95/tnln95.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 Nguyen Minh Hoang
- *
- * 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/>.
- */
-#include "quantum.h"
-
-void keyboard_pre_init_kb(void) {
-    gpio_set_pin_output(B1);
-    gpio_set_pin_output(B2);
-    /* I will add function to these later */
-    // gpio_set_pin_output(B3);
-    // gpio_set_pin_output(E2);
-
-    keyboard_pre_init_user();
-}
-
-bool led_update_kb(led_t led_state) {
-    bool res = led_update_user(led_state);
-    if(res) {
-        gpio_write_pin(B1, led_state.num_lock);
-        gpio_write_pin(B2, led_state.caps_lock);
-    }
-    return res;
-}
diff --git a/keyboards/projectkb/alice/alice.c b/keyboards/projectkb/alice/alice.c
deleted file mode 100644
index 8ec5f16736f..00000000000
--- a/keyboards/projectkb/alice/alice.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "quantum.h"
-
-void keyboard_pre_init_kb(void) {
-    gpio_set_pin_output(INDICATOR_PIN_0);
-    gpio_set_pin_output(INDICATOR_PIN_1);
-    gpio_set_pin_output(INDICATOR_PIN_2);
-
-    keyboard_pre_init_user();
-}
-
-
-bool led_update_kb(led_t led_state) {
-    bool runDefault = led_update_user(led_state);
-    if (runDefault) {
-      gpio_write_pin(INDICATOR_PIN_0, !led_state.num_lock);
-      gpio_write_pin(INDICATOR_PIN_1, !led_state.caps_lock);
-      gpio_write_pin(INDICATOR_PIN_2, !led_state.scroll_lock);
-    }
-    return runDefault;
-}
diff --git a/keyboards/projectkb/alice/rev1/config.h b/keyboards/projectkb/alice/rev1/config.h
index 66d3b75731b..b8c68bc65d4 100644
--- a/keyboards/projectkb/alice/rev1/config.h
+++ b/keyboards/projectkb/alice/rev1/config.h
@@ -26,10 +26,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
 
-#define INDICATOR_PIN_0 A0
-#define INDICATOR_PIN_1 A1
-#define INDICATOR_PIN_2 A2
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/projectkb/alice/rev1/keyboard.json b/keyboards/projectkb/alice/rev1/keyboard.json
index 7e957d7ff41..01eee1300be 100644
--- a/keyboards/projectkb/alice/rev1/keyboard.json
+++ b/keyboards/projectkb/alice/rev1/keyboard.json
@@ -15,6 +15,11 @@
             "resync": true
         }
     },
+    "indicators": {
+        "caps_lock": "A1",
+        "num_lock": "A0",
+        "scroll_lock": "A2"
+    },
     "rgblight": {
         "led_count": 14,
         "animations": {
diff --git a/keyboards/projectkb/alice/rev2/config.h b/keyboards/projectkb/alice/rev2/config.h
index 3e786c18056..b8c68bc65d4 100644
--- a/keyboards/projectkb/alice/rev2/config.h
+++ b/keyboards/projectkb/alice/rev2/config.h
@@ -26,10 +26,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
 
-#define INDICATOR_PIN_0 A9
-#define INDICATOR_PIN_1 A8
-#define INDICATOR_PIN_2 B12
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/projectkb/alice/rev2/keyboard.json b/keyboards/projectkb/alice/rev2/keyboard.json
index 639fc268779..0e34b7104f9 100644
--- a/keyboards/projectkb/alice/rev2/keyboard.json
+++ b/keyboards/projectkb/alice/rev2/keyboard.json
@@ -15,6 +15,11 @@
             "resync": true
         }
     },
+    "indicators": {
+        "caps_lock": "A8",
+        "num_lock": "A9",
+        "scroll_lock": "B12"
+    },
     "rgblight": {
         "led_count": 14,
         "animations": {
diff --git a/keyboards/rubi/keyboard.json b/keyboards/rubi/keyboard.json
index cb94b586156..555376b533b 100644
--- a/keyboards/rubi/keyboard.json
+++ b/keyboards/rubi/keyboard.json
@@ -22,6 +22,9 @@
             "resync": true
         }
     },
+   "indicators": {
+      "caps_lock": "C6"
+   },
    "matrix_pins": {
       "cols": ["B3", "B2", "B1", "F7"],
       "rows": ["F0", "F1", "F4", "F5", "F6"]
diff --git a/keyboards/rubi/rubi.c b/keyboards/rubi/rubi.c
index 89bf9caa6d4..4f0536397f0 100644
--- a/keyboards/rubi/rubi.c
+++ b/keyboards/rubi/rubi.c
@@ -63,12 +63,3 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
 
     return process_record_user_oled(keycode, record);
 }
-
-
-bool led_update_kb(led_t led_state) {
-    bool res = led_update_user(led_state);
-    if (res) {
-        gpio_write_pin(C6, led_state.num_lock);
-    }
-    return true;
-}
diff --git a/keyboards/team0110/p1800fl/keyboard.json b/keyboards/team0110/p1800fl/keyboard.json
index a56864cd36a..681482db5bc 100644
--- a/keyboards/team0110/p1800fl/keyboard.json
+++ b/keyboards/team0110/p1800fl/keyboard.json
@@ -34,6 +34,11 @@
         "levels": 5,
         "breathing": true
     },
+    "indicators": {
+        "caps_lock": "D5",
+        "num_lock": "D3",
+        "scroll_lock": "C6"
+    },
     "rgblight": {
         "saturation_steps": 8,
         "brightness_steps": 8,
diff --git a/keyboards/team0110/p1800fl/p1800fl.c b/keyboards/team0110/p1800fl/p1800fl.c
deleted file mode 100644
index 9f47b8a5c44..00000000000
--- a/keyboards/team0110/p1800fl/p1800fl.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2020 marhalloweenvt
- *
- * 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/>.
- */
-
-#include "quantum.h"
-
-bool led_update_kb(led_t led_state) {
-    bool res = led_update_user(led_state);
-    if(res) {
-        gpio_write_pin(D3, led_state.num_lock);
-        gpio_write_pin(D5, led_state.caps_lock);
-        gpio_write_pin(C6, led_state.scroll_lock);
-    }
-    return res;
-}
-
diff --git a/keyboards/tkc/osav2/keyboard.json b/keyboards/tkc/osav2/keyboard.json
index 118eedfc850..ef4c7897978 100644
--- a/keyboards/tkc/osav2/keyboard.json
+++ b/keyboards/tkc/osav2/keyboard.json
@@ -50,6 +50,11 @@
         "pin": "D6",
         "breathing": true
     },
+    "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/tkc/osav2/osav2.c b/keyboards/tkc/osav2/osav2.c
deleted file mode 100644
index 99660464865..00000000000
--- a/keyboards/tkc/osav2/osav2.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2019 jrfhoutx
- *
- * 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/>.
- */
-#include "quantum.h"
-
-void keyboard_pre_init_kb(void) {
-    gpio_set_pin_output(C7);
-    gpio_set_pin_output(C6);
-    gpio_set_pin_output(B6);
-
-    keyboard_pre_init_user();
-}
-
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        gpio_write_pin(C7, led_state.num_lock);
-        gpio_write_pin(C6, led_state.caps_lock);
-        gpio_write_pin(B6, led_state.scroll_lock);
-    }
-    return true;
-}
diff --git a/keyboards/tr60w/keyboard.json b/keyboards/tr60w/keyboard.json
index 60c01bdcfc6..dc71e3ad7aa 100644
--- a/keyboards/tr60w/keyboard.json
+++ b/keyboards/tr60w/keyboard.json
@@ -32,6 +32,12 @@
     "backlight": {
         "pin": "B7"
     },
+    "indicators": {
+        "caps_lock": "B2",
+        "num_lock": "B1",
+        "scroll_lock": "B3",
+        "on_state": 0
+    },
     "rgblight": {
         "saturation_steps": 8,
         "brightness_steps": 8,
diff --git a/keyboards/tr60w/tr60w.c b/keyboards/tr60w/tr60w.c
deleted file mode 100644
index ebf48cb1c7b..00000000000
--- a/keyboards/tr60w/tr60w.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "quantum.h"
-
-bool led_update_kb(led_t led_state) {
-    bool runDefault = led_update_user(led_state);
-    if (runDefault) {
-      gpio_write_pin(B1, !led_state.num_lock);
-      gpio_write_pin(B2, !led_state.caps_lock);
-      gpio_write_pin(B3, !led_state.scroll_lock);
-    }
-    return runDefault;
-}
diff --git a/keyboards/wolfmarkclub/wm1/keyboard.json b/keyboards/wolfmarkclub/wm1/keyboard.json
index 56c062e1024..0cea5546c8a 100644
--- a/keyboards/wolfmarkclub/wm1/keyboard.json
+++ b/keyboards/wolfmarkclub/wm1/keyboard.json
@@ -27,6 +27,11 @@
             "resync": true
         }
     },
+    "indicators": {
+        "caps_lock": "B1",
+        "num_lock": "B0",
+        "scroll_lock": "C5"
+    },
     "rgblight": {
         "saturation_steps": 8,
         "brightness_steps": 8,
diff --git a/keyboards/wolfmarkclub/wm1/wm1.c b/keyboards/wolfmarkclub/wm1/wm1.c
index 9c4fb090c88..83c4c8bb458 100644
--- a/keyboards/wolfmarkclub/wm1/wm1.c
+++ b/keyboards/wolfmarkclub/wm1/wm1.c
@@ -4,19 +4,3 @@ void bootloader_jump(void) {
     // This board doesn't use the "standard" stm32duino bootloader, and no information is available regarding how to enter bootloader mode. All we can do here is reset.
     NVIC_SystemReset();
 }
-
-void matrix_init_kb(void) {
-  gpio_set_pin_output(B1); // Top Indicator LED
-  gpio_set_pin_output(B0); // Middle Indicator LED
-  gpio_set_pin_output(C5); // Bottom Indicator LED
-  matrix_init_user();
-}
-
-bool led_update_kb(led_t led_state) {
-    if(led_update_user(led_state)) {
-        gpio_write_pin(B1, led_state.caps_lock);
-        gpio_write_pin(B0, led_state.num_lock);
-        gpio_write_pin(C5, led_state.scroll_lock);
-    }
-    return true;
-}
diff --git a/keyboards/wsk/g4m3ralpha/g4m3ralpha.c b/keyboards/wsk/g4m3ralpha/g4m3ralpha.c
deleted file mode 100644
index 3c039a173fe..00000000000
--- a/keyboards/wsk/g4m3ralpha/g4m3ralpha.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2020 Worldspawn <mcmancuso@gmail.com>
- *
- * 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/>.
- */
-
-#include "quantum.h"
-
-
-void matrix_init_kb(void) {
-    gpio_set_pin_output(D3);
-    gpio_write_pin_low(D3);
-    gpio_set_pin_output(D2);
-    gpio_write_pin_low(D2);
-    gpio_set_pin_output(D0);
-    gpio_write_pin_low(D0);
-
-    matrix_init_user();
-};
-
-bool led_update_kb(led_t led_state) {
-    bool res = led_update_user(led_state);
-    if(res) {
-        gpio_write_pin(D3, led_state.num_lock);
-        gpio_write_pin(D0, led_state.caps_lock);
-        gpio_write_pin(D2, led_state.scroll_lock);
-    }
-    return res;
-}
diff --git a/keyboards/wsk/g4m3ralpha/keyboard.json b/keyboards/wsk/g4m3ralpha/keyboard.json
index fcb2f26f5fd..b5cdb7ce101 100644
--- a/keyboards/wsk/g4m3ralpha/keyboard.json
+++ b/keyboards/wsk/g4m3ralpha/keyboard.json
@@ -8,6 +8,11 @@
     "pid": "0x56D9",
     "device_version": "0.0.1"
   },
+  "indicators": {
+    "caps_lock": "D0",
+    "num_lock": "D3",
+    "scroll_lock": "D2"
+  },
   "rgblight": {
     "saturation_steps": 8,
     "brightness_steps": 8,
diff --git a/keyboards/yushakobo/navpad/navpad_prefs.c b/keyboards/yushakobo/navpad/navpad_prefs.c
index 08b7464cf95..c7b3881621a 100644
--- a/keyboards/yushakobo/navpad/navpad_prefs.c
+++ b/keyboards/yushakobo/navpad/navpad_prefs.c
@@ -37,10 +37,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
   return true;
 }
 
-bool led_update_kb(led_t led_state) {
-    return led_update_user(led_state);
-}
-
 #ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) { return false; }