153 files changed, 249 insertions, 1623 deletions
diff --git a/keyboards/ares/ares.c b/keyboards/ares/ares.c
index 95d4b878f..80d445517 100644
--- a/keyboards/ares/ares.c
+++ b/keyboards/ares/ares.c
@@ -16,19 +16,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "ares.h"
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(D1);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(D1, led_state.caps_lock);
-    }
-    return true;
-}
diff --git a/keyboards/ares/config.h b/keyboards/ares/config.h
index ffbe45605..35e885d69 100644
--- a/keyboards/ares/config.h
+++ b/keyboards/ares/config.h
@@ -37,6 +37,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 5
+#define LED_CAPS_LOCK_PIN D1
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/bfake/bfake.c b/keyboards/bfake/bfake.c
index 6d0c92746..5eedcc194 100644
--- a/keyboards/bfake/bfake.c
+++ b/keyboards/bfake/bfake.c
@@ -16,19 +16,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "bfake.h"
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(D1);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(D1, led_state.caps_lock);
-    }
-    return true;
-}
diff --git a/keyboards/bfake/config.h b/keyboards/bfake/config.h
index 6c4710a9e..54e01ad3d 100644
--- a/keyboards/bfake/config.h
+++ b/keyboards/bfake/config.h
@@ -37,6 +37,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 5
+#define LED_CAPS_LOCK_PIN D1
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/chili/chili.c b/keyboards/chili/chili.c
index 40d3528b0..f629a6d60 100644
--- a/keyboards/chili/chili.c
+++ b/keyboards/chili/chili.c
@@ -14,29 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "chili.h"
-void matrix_init_kb(void) {
-    // put your keyboard start-up code here
-    // runs once when the firmware starts up
-    led_init_ports();
-    matrix_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(B1);
-    writePinHigh(B1);
-    setPinOutput(B2);
-    writePinHigh(B2);
-    setPinOutput(B3);
-    writePinHigh(B3);
-}
-bool led_update_kb(led_t led_state) {
-    bool res = led_update_user(led_state);
-    if(res) {
-        writePin(B1, !led_state.num_lock);
-        writePin(B2, !led_state.caps_lock);
-        writePin(B3, !led_state.scroll_lock);
-    }
-    return res;
-}
diff --git a/keyboards/chili/config.h b/keyboards/chili/config.h
index 4b6a632cd..08c247587 100644
--- a/keyboards/chili/config.h
+++ b/keyboards/chili/config.h
@@ -42,6 +42,11 @@ 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/coarse/cordillera/config.h b/keyboards/coarse/cordillera/config.h
index ac636d5d5..33b0d7944 100644
--- a/keyboards/coarse/cordillera/config.h
+++ b/keyboards/coarse/cordillera/config.h
@@ -32,6 +32,10 @@ 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 BACKLIGHT_PIN           A8
 #define BACKLIGHT_PWM_DRIVER    PWMD1
 #define BACKLIGHT_PWM_CHANNEL   1
diff --git a/keyboards/coarse/cordillera/cordillera.c b/keyboards/coarse/cordillera/cordillera.c
index 5bf07740b..437547ff2 100644
--- a/keyboards/coarse/cordillera/cordillera.c
+++ b/keyboards/coarse/cordillera/cordillera.c
@@ -16,23 +16,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "cordillera.h"
-void keyboard_pre_init_kb(void) {
-        led_init_ports();
-    keyboard_pre_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(B0);
-    setPinOutput(A1);
-    setPinOutput(A0);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(B0, led_state.num_lock);
-        writePin(A1, led_state.caps_lock);
-        writePin(A0, led_state.scroll_lock);
-    }
-    return true;
-}
diff --git a/keyboards/crazy_keyboard_68/config.h b/keyboards/crazy_keyboard_68/config.h
index 2558e7579..e1304e18e 100644
--- a/keyboards/crazy_keyboard_68/config.h
+++ b/keyboards/crazy_keyboard_68/config.h
@@ -52,6 +52,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 //#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
+#define LED_CAPS_LOCK_PIN B2
+#define LED_PIN_ON_STATE 0
 //#define BACKLIGHT_PIN B7
 //#define BACKLIGHT_LEVELS 3
 //#define BACKLIGHT_BREATHING
diff --git a/keyboards/crazy_keyboard_68/crazy_keyboard_68.c b/keyboards/crazy_keyboard_68/crazy_keyboard_68.c
index f4f8515b7..cbea93fb8 100644
--- a/keyboards/crazy_keyboard_68/crazy_keyboard_68.c
+++ b/keyboards/crazy_keyboard_68/crazy_keyboard_68.c
@@ -15,22 +15,3 @@
 */
 #include "crazy_keyboard_68.h"
-void matrix_init_kb(void) {
-        led_init_ports();
-        
-        matrix_init_user();
-}
-void led_init_ports(void) {
-    // Caps lock pin
-    setPinOutput(B0);
-    writePinHigh(B0);
-}
-bool led_update_kb(led_t led_state) {
-    if(led_update_user(led_state)) {
-        writePin(B0, !led_state.caps_lock);
-    }
-    return true;
-}
diff --git a/keyboards/daisy/config.h b/keyboards/daisy/config.h
index a41e158f1..ea56f948e 100644
--- a/keyboards/daisy/config.h
+++ b/keyboards/daisy/config.h
@@ -52,6 +52,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 //#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
+#define LED_CAPS_LOCK_PIN C6
+#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN D0
 // #define BACKLIGHT_BREATHING
 #define BACKLIGHT_LEVELS 6
diff --git a/keyboards/daisy/daisy.c b/keyboards/daisy/daisy.c
index 4e365ed46..98b7ac84b 100644
--- a/keyboards/daisy/daisy.c
+++ b/keyboards/daisy/daisy.c
@@ -15,21 +15,3 @@
 */
 #include "daisy.h"
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(C6);
-    writePinHigh(C6);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(C6, !led_state.caps_lock);
-    }
-    return true;
-}
diff --git a/keyboards/do60/config.h b/keyboards/do60/config.h
index ef6c55c3e..f3ee1ed04 100644
--- a/keyboards/do60/config.h
+++ b/keyboards/do60/config.h
@@ -45,6 +45,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, F4, B4, D7, D6, B3, B0 }
 #define UNUSED_PINS
+#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/do60.c b/keyboards/do60/do60.c
index 3dba9b535..b19fc5982 100644
--- a/keyboards/do60/do60.c
+++ b/keyboards/do60/do60.c
@@ -2,26 +2,9 @@
 extern inline void setdefaultrgb(void);
 void matrix_init_kb(void) {
  // Keyboard start-up code goes here
  // Runs once when the firmware starts up
  matrix_init_user();
-  led_init_ports();
  setdefaultrgb();
 };
-void led_init_ports(void) {
-  // Set caps lock LED pin as output
-  setPinOutput(B2);
-  // Default to off
-  writePinHigh(B2);
-}
-bool led_update_kb(led_t led_state) {
-  if(led_update_user(led_state)) {
-    writePin(B2, !led_state.caps_lock);
-  }
-  return true;
-}
diff --git a/keyboards/donutcables/budget96/budget96.c b/keyboards/donutcables/budget96/budget96.c
index 5f3436dc6..8c7b894bc 100644
--- a/keyboards/donutcables/budget96/budget96.c
+++ b/keyboards/donutcables/budget96/budget96.c
@@ -15,21 +15,3 @@
 */
 #include "budget96.h"
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(D0);
-    setPinOutput(D1);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(D0, led_state.num_lock);
-        writePin(D1, led_state.caps_lock);
-    }
-    return true;
-}
diff --git a/keyboards/donutcables/budget96/config.h b/keyboards/donutcables/budget96/config.h
index e04cc8b78..39b661dda 100644
--- a/keyboards/donutcables/budget96/config.h
+++ b/keyboards/donutcables/budget96/config.h
@@ -37,6 +37,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 5
+#define LED_NUM_LOCK_PIN D0
+#define LED_CAPS_LOCK_PIN D1
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/eve/meteor/config.h b/keyboards/eve/meteor/config.h
index 1e8c6ca05..a6b2c9b69 100644
--- a/keyboards/eve/meteor/config.h
+++ b/keyboards/eve/meteor/config.h
@@ -36,5 +36,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 5
+#define LED_CAPS_LOCK_PIN D1
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/eve/meteor/meteor.c b/keyboards/eve/meteor/meteor.c
index 1d080b389..6bdb117f3 100644
--- a/keyboards/eve/meteor/meteor.c
+++ b/keyboards/eve/meteor/meteor.c
@@ -15,19 +15,3 @@
 */
 #include "meteor.h"
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(D1);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(D1, led_state.caps_lock);
-    }
-    return true;
-}
diff --git a/keyboards/evyd13/eon75/config.h b/keyboards/evyd13/eon75/config.h
index 707665140..d7d84de2a 100644
--- a/keyboards/evyd13/eon75/config.h
+++ b/keyboards/evyd13/eon75/config.h
@@ -51,6 +51,11 @@
 */
 // #define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
+#define LED_NUM_LOCK_PIN B7
+#define LED_CAPS_LOCK_PIN D5
+#define LED_SCROLL_LOCK_PIN B0
+#define LED_PIN_ON_STATE 0
 // #define BACKLIGHT_PIN B7
 // #define BACKLIGHT_BREATHING
 // #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/evyd13/eon75/eon75.c b/keyboards/evyd13/eon75/eon75.c
index 67e9fe66a..38620a636 100644
--- a/keyboards/evyd13/eon75/eon75.c
+++ b/keyboards/evyd13/eon75/eon75.c
@@ -14,32 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "eon75.h"
-void matrix_init_kb(void) {
-    // put your keyboard start-up code here
-    // runs once when the firmware starts up
-    matrix_init_user();
-    led_init_ports();
-};
-void led_init_ports(void) {
-    // * Set our LED pins as output and high
-    setPinOutput(D5);
-    writePinHigh(D5);
-    
-    setPinOutput(B7);
-    writePinHigh(B7);
-    
-    setPinOutput(B0);
-    writePinHigh(B0);
-}
-bool led_update_kb(led_t led_state) {
-    if(led_update_user(led_state)) {
-        writePin(D5, !led_state.caps_lock);
-        writePin(B7, !led_state.num_lock);
-        writePin(B0, !led_state.scroll_lock);
-    }
-    return true;
-}
diff --git a/keyboards/evyd13/eon95/config.h b/keyboards/evyd13/eon95/config.h
index eb44d8957..2d9ede3ee 100644
--- a/keyboards/evyd13/eon95/config.h
+++ b/keyboards/evyd13/eon95/config.h
@@ -51,6 +51,11 @@
 */
 // #define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
+#define LED_NUM_LOCK_PIN B7
+#define LED_CAPS_LOCK_PIN D5
+#define LED_SCROLL_LOCK_PIN B0
+#define LED_PIN_ON_STATE 0
 // #define BACKLIGHT_PIN B7
 // #define BACKLIGHT_BREATHING
 // #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/evyd13/eon95/eon95.c b/keyboards/evyd13/eon95/eon95.c
index 5eec86cc1..603d84a13 100644
--- a/keyboards/evyd13/eon95/eon95.c
+++ b/keyboards/evyd13/eon95/eon95.c
@@ -14,32 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "eon95.h"
-void matrix_init_kb(void) {
-    // put your keyboard start-up code here
-    // runs once when the firmware starts up
-    matrix_init_user();
-    led_init_ports();
-}
-void led_init_ports(void) {
-    // * Set our LED pins as output and high
-    setPinOutput(D5);
-    writePinHigh(D5);
-    
-    setPinOutput(B7);
-    writePinHigh(B7);
-    
-    setPinOutput(B0);
-    writePinHigh(B0);
-}
-bool led_update_kb(led_t led_state) {
-    if(led_update_user(led_state)) {
-        writePin(D5, !led_state.caps_lock);
-        writePin(B7, !led_state.num_lock);
-        writePin(B0, !led_state.scroll_lock);
-    }
-    return true;
-}
diff --git a/keyboards/evyd13/gh80_1800/config.h b/keyboards/evyd13/gh80_1800/config.h
index c230aa9af..26ad8a8b1 100644
--- a/keyboards/evyd13/gh80_1800/config.h
+++ b/keyboards/evyd13/gh80_1800/config.h
@@ -51,6 +51,11 @@
 */
 // #define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
+#define LED_NUM_LOCK_PIN D6
+#define LED_CAPS_LOCK_PIN D7
+#define LED_SCROLL_LOCK_PIN D4
+#define LED_PIN_ON_STATE 0
 // #define BACKLIGHT_PIN B7
 // #define BACKLIGHT_BREATHING
 // #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/evyd13/gh80_1800/gh80_1800.c b/keyboards/evyd13/gh80_1800/gh80_1800.c
index 770c6f78b..1691b3949 100644
--- a/keyboards/evyd13/gh80_1800/gh80_1800.c
+++ b/keyboards/evyd13/gh80_1800/gh80_1800.c
@@ -14,31 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "gh80_1800.h"
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-  matrix_init_user();
-  led_init_ports();
-}
-void led_init_ports(void) {
-  setPinOutput(D6);
-  setPinOutput(D7);
-  setPinOutput(D4);
-  
-  writePinHigh(D6);
-  writePinHigh(D7);
-  writePinHigh(D4);
-}
-bool led_update_kb(led_t led_state) {
-  if(led_update_user(led_state)) {
-    writePin(D6, !led_state.num_lock);
-    writePin(D7, !led_state.caps_lock);
-    writePin(D4, !led_state.scroll_lock);
-  }
-  return true;
-}
diff --git a/keyboards/evyd13/minitomic/config.h b/keyboards/evyd13/minitomic/config.h
index c041e86a2..f26b4d1d9 100644
--- a/keyboards/evyd13/minitomic/config.h
+++ b/keyboards/evyd13/minitomic/config.h
@@ -51,6 +51,9 @@
 */
 // #define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
+#define LED_CAPS_LOCK_PIN C7
+#define LED_PIN_ON_STATE 0
 // #define BACKLIGHT_PIN B7
 // #define BACKLIGHT_BREATHING
 // #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/evyd13/minitomic/minitomic.c b/keyboards/evyd13/minitomic/minitomic.c
index 8d5f11a50..15f282964 100644
--- a/keyboards/evyd13/minitomic/minitomic.c
+++ b/keyboards/evyd13/minitomic/minitomic.c
@@ -14,37 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "minitomic.h"
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-    matrix_init_user();
-    led_init_ports();
-}
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-    matrix_scan_user();
-}
-void led_init_ports(void) {
-        //Set led pin as output, then high (off)
-    writePinHigh(C7);
-}
-bool led_update_kb(led_t led_state) {
-    bool res = led_update_user(led_state);
-    if(res) {
-        // writePin 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.
-        writePin(C7, !led_state.caps_lock);
-    }
-    return res;
-}
diff --git a/keyboards/evyd13/mx5160/config.h b/keyboards/evyd13/mx5160/config.h
index 926095a5d..c65f81b87 100644
--- a/keyboards/evyd13/mx5160/config.h
+++ b/keyboards/evyd13/mx5160/config.h
@@ -55,6 +55,11 @@
 */
 // #define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
+#define LED_NUM_LOCK_PIN B2
+#define LED_CAPS_LOCK_PIN B1
+#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/evyd13/mx5160/mx5160.c b/keyboards/evyd13/mx5160/mx5160.c
index c9e412da2..298c44fd4 100644
--- a/keyboards/evyd13/mx5160/mx5160.c
+++ b/keyboards/evyd13/mx5160/mx5160.c
@@ -14,45 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "mx5160.h"
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-  matrix_init_user();
-  led_init_ports();
-}
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-  matrix_scan_user();
-}
-void led_init_ports(void) {
-        //Set led pin as output, then high (off)
-        
-        //Caps lock
-    setPinOutput(B1);
-    writePinHigh(B1);
-        
-        //Num lock
-    setPinOutput(B2);
-    writePinHigh(B2);
-        
-        //Scroll lock
-    setPinOutput(B3);
-    writePinHigh(B3);
-}
-bool led_update_kb(led_t led_state) {
-    bool res = led_update_user(led_state);
-    if (res) {
-        writePin(B2, !led_state.num_lock);
-        writePin(B1, !led_state.caps_lock);
-        writePin(B3, !led_state.scroll_lock);
-    }
-    return res;
-}
diff --git a/keyboards/evyd13/nt660/config.h b/keyboards/evyd13/nt660/config.h
index 0d9bbd330..863884714 100644
--- a/keyboards/evyd13/nt660/config.h
+++ b/keyboards/evyd13/nt660/config.h
@@ -53,6 +53,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 // #define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
+#define LED_CAPS_LOCK_PIN D0
 // #define BACKLIGHT_PIN B7
 // #define BACKLIGHT_BREATHING
 // #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/evyd13/nt660/nt660.c b/keyboards/evyd13/nt660/nt660.c
index 2a8ebfb46..f89fa579c 100644
--- a/keyboards/evyd13/nt660/nt660.c
+++ b/keyboards/evyd13/nt660/nt660.c
@@ -14,19 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "nt660.h"
-void matrix_init_kb(void) {
-    matrix_init_user();
-    led_init_ports();
-}
-void led_init_ports(void) {
-    setPinOutput(D0);
-}
-bool led_update_kb(led_t led_state) {
-    if(led_update_user(led_state)) {
-        writePin(D0, !led_state.caps_lock);
-    }
-    return true;
-}
diff --git a/keyboards/evyd13/quackfire/config.h b/keyboards/evyd13/quackfire/config.h
index 22083e811..151219a01 100644
--- a/keyboards/evyd13/quackfire/config.h
+++ b/keyboards/evyd13/quackfire/config.h
@@ -52,6 +52,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 //#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
+#define LED_CAPS_LOCK_PIN F7
+#define LED_SCROLL_LOCK_PIN F6
+#define LED_PIN_ON_STATE 0
 // #define BACKLIGHT_PIN B7
 // #define BACKLIGHT_BREATHING
 // #define BACKLIGHT_LEVELS 5
diff --git a/keyboards/evyd13/quackfire/quackfire.c b/keyboards/evyd13/quackfire/quackfire.c
index ab233bd6d..634d4187c 100644
--- a/keyboards/evyd13/quackfire/quackfire.c
+++ b/keyboards/evyd13/quackfire/quackfire.c
@@ -14,31 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "quackfire.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();
-    led_init_ports();
-}
-void led_init_ports(void) {
-    setPinOutput(F6);
-    setPinOutput(F7);
-    writePinHigh(F6);
-    writePinHigh(F7);
-}
-bool led_update_kb(led_t led_state) {
-    if(led_update_user(led_state)) {
-        writePin(F7, !led_state.caps_lock);
-        writePin(F6, !led_state.scroll_lock);
-    }
-    return true;
-}
diff --git a/keyboards/evyd13/wasdat/config.h b/keyboards/evyd13/wasdat/config.h
index c064d18a5..75b75a0d2 100644
--- a/keyboards/evyd13/wasdat/config.h
+++ b/keyboards/evyd13/wasdat/config.h
@@ -57,6 +57,11 @@ 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 B2
+#define LED_CAPS_LOCK_PIN B0
+#define LED_SCROLL_LOCK_PIN B1
+#define LED_PIN_ON_STATE 0
 // #define BACKLIGHT_PIN B7
 // #define BACKLIGHT_BREATHING
 // #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/evyd13/wasdat/wasdat.c b/keyboards/evyd13/wasdat/wasdat.c
index 2d0e999c4..6aaa1b842 100644
--- a/keyboards/evyd13/wasdat/wasdat.c
+++ b/keyboards/evyd13/wasdat/wasdat.c
@@ -14,34 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "wasdat.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();
-    led_init_ports();
-}
-void led_init_ports(void) {
-    setPinOutput(B0);
-    writePinHigh(B0);
-    setPinOutput(B1);
-    writePinHigh(B1);
-    setPinOutput(B2);
-    writePinHigh(B2);
-}
-bool led_update_kb(led_t led_state) {
-    if(led_update_user(led_state)) {
-        writePin(B0, !led_state.caps_lock);
-        writePin(B1, !led_state.scroll_lock);
-        writePin(B2, !led_state.num_lock);
-    }
-    return true;
-}
diff --git a/keyboards/evyd13/wasdat_code/config.h b/keyboards/evyd13/wasdat_code/config.h
index 804839ee9..4ac77f217 100644
--- a/keyboards/evyd13/wasdat_code/config.h
+++ b/keyboards/evyd13/wasdat_code/config.h
@@ -57,6 +57,11 @@ 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 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/wasdat_code.c b/keyboards/evyd13/wasdat_code/wasdat_code.c
index 33551c2d0..c1cdadea9 100644
--- a/keyboards/evyd13/wasdat_code/wasdat_code.c
+++ b/keyboards/evyd13/wasdat_code/wasdat_code.c
@@ -14,34 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "wasdat_code.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();
-    led_init_ports();
-}
-void led_init_ports(void) {
-    setPinOutput(B1);
-    setPinOutput(B2);
-    setPinOutput(B3);
-    writePinHigh(B1);
-    writePinHigh(B2);
-    writePinHigh(B3);
-}
-bool led_update_kb(led_t led_state) {
-    if(led_update_user(led_state)) {
-        writePin(B1, !led_state.caps_lock);
-        writePin(B2, !led_state.scroll_lock);
-        writePin(B3, !led_state.num_lock);
-    }
-    return true;
-}
diff --git a/keyboards/evyd13/wonderland/config.h b/keyboards/evyd13/wonderland/config.h
index 908c8a785..c5c7a8b6c 100644
--- a/keyboards/evyd13/wonderland/config.h
+++ b/keyboards/evyd13/wonderland/config.h
@@ -43,6 +43,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
+#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/wonderland.c b/keyboards/evyd13/wonderland/wonderland.c
index 441544381..f2a53a17a 100644
--- a/keyboards/evyd13/wonderland/wonderland.c
+++ b/keyboards/evyd13/wonderland/wonderland.c
@@ -1,34 +1 @@
 #include "wonderland.h"
-__attribute__ ((weak))
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-        led_init_ports();
-};
-__attribute__ ((weak))
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-};
-__attribute__ ((weak))
-void led_init_ports(void) {
-    // * Set our LED pins as output
-    setPinOutput(B1);
-    setPinOutput(B2);
-    setPinOutput(B3);
-}
-bool led_update_kb(led_t led_state) {
-    bool runDefault = led_update_user(led_state);
-    if (runDefault) {
-      writePin(B1, !led_state.num_lock);
-      writePin(B2, !led_state.caps_lock);
-      writePin(B3, !led_state.scroll_lock);
-    }
-    return runDefault;
-}
diff --git a/keyboards/exclusive/e65/config.h b/keyboards/exclusive/e65/config.h
index bc0f1a1ed..1d43011b8 100644
--- a/keyboards/exclusive/e65/config.h
+++ b/keyboards/exclusive/e65/config.h
@@ -39,6 +39,9 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
+#define LED_CAPS_LOCK_PIN B6
+#define LED_PIN_ON_STATE 0
 /* number of backlight levels */
 #define BACKLIGHT_PIN B7
 #ifdef BACKLIGHT_PIN
diff --git a/keyboards/exclusive/e65/e65.c b/keyboards/exclusive/e65/e65.c
index e01a0614c..feb0e6543 100644
--- a/keyboards/exclusive/e65/e65.c
+++ b/keyboards/exclusive/e65/e65.c
@@ -15,24 +15,3 @@
 */
 #include "e65.h"
-void matrix_init_kb(void) {
-    // put your keyboard start-up code here
-    // runs once when the firmware starts up
-    matrix_init_user();
-    led_init_ports();
-}
-void led_init_ports(void) {
-    setPinOutput(B6);
-    writePinHigh(B6);
-}
-bool led_update_kb(led_t led_state) {
-    if(led_update_user(led_state)) {
-        writePin(B6, !led_state.caps_lock);
-    }
-    return true;
-}
diff --git a/keyboards/exclusive/e6v2/le_bmc/config.h b/keyboards/exclusive/e6v2/le_bmc/config.h
index e9e8c9e53..8115f4ae1 100644
--- a/keyboards/exclusive/e6v2/le_bmc/config.h
+++ b/keyboards/exclusive/e6v2/le_bmc/config.h
@@ -44,6 +44,8 @@ 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/le_bmc.c b/keyboards/exclusive/e6v2/le_bmc/le_bmc.c
index df79cc5dc..e36cfd645 100644
--- a/keyboards/exclusive/e6v2/le_bmc/le_bmc.c
+++ b/keyboards/exclusive/e6v2/le_bmc/le_bmc.c
@@ -15,19 +15,3 @@
 */
 #include "le_bmc.h"
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(D1);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(D1, led_state.caps_lock);
-    }
-    return true;
-}
diff --git a/keyboards/exclusive/e6v2/oe_bmc/config.h b/keyboards/exclusive/e6v2/oe_bmc/config.h
index f4abd2112..3f2a50cde 100644
--- a/keyboards/exclusive/e6v2/oe_bmc/config.h
+++ b/keyboards/exclusive/e6v2/oe_bmc/config.h
@@ -44,6 +44,8 @@ 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/oe_bmc.c b/keyboards/exclusive/e6v2/oe_bmc/oe_bmc.c
index ea74d87cb..10dd1a26e 100644
--- a/keyboards/exclusive/e6v2/oe_bmc/oe_bmc.c
+++ b/keyboards/exclusive/e6v2/oe_bmc/oe_bmc.c
@@ -15,19 +15,3 @@
 */
 #include "oe_bmc.h"
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(D1);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(D1, led_state.caps_lock);
-    }
-    return true;
-}
diff --git a/keyboards/exent/config.h b/keyboards/exent/config.h
index 6b37bdd1c..16a49e78f 100644
--- a/keyboards/exent/config.h
+++ b/keyboards/exent/config.h
@@ -38,6 +38,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 5
+#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/exent.c b/keyboards/exent/exent.c
index a935e9e67..82066f7e8 100644
--- a/keyboards/exent/exent.c
+++ b/keyboards/exent/exent.c
@@ -15,23 +15,3 @@
 */
 #include "exent.h"
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(D0);
-    setPinOutput(D1);
-    setPinOutput(D6);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(D0, led_state.num_lock);
-        writePin(D1, led_state.caps_lock);
-        writePin(D6, led_state.scroll_lock);
-    }
-    return true;
-}
diff --git a/keyboards/facew/config.h b/keyboards/facew/config.h
index 5966429ca..14583dc83 100644
--- a/keyboards/facew/config.h
+++ b/keyboards/facew/config.h
@@ -37,6 +37,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 5
+#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/facew.c b/keyboards/facew/facew.c
index 2f091ae6b..373dbc6cd 100644
--- a/keyboards/facew/facew.c
+++ b/keyboards/facew/facew.c
@@ -16,21 +16,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "facew.h"
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(D0);
-    setPinOutput(D1);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(D0, led_state.num_lock);
-        writePin(D1, led_state.caps_lock);
-    }
-    return true;
-}
diff --git a/keyboards/foxlab/key65/hotswap/config.h b/keyboards/foxlab/key65/hotswap/config.h
index a5ada6bd0..43f883fce 100644
--- a/keyboards/foxlab/key65/hotswap/config.h
+++ b/keyboards/foxlab/key65/hotswap/config.h
@@ -45,6 +45,9 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
+#define LED_SCROLL_LOCK_PIN E6
+#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B7
 // #define BACKLIGHT_BREATHING
 #define BACKLIGHT_LEVELS 5
diff --git a/keyboards/foxlab/key65/hotswap/hotswap.c b/keyboards/foxlab/key65/hotswap/hotswap.c
index 6b3950d36..31fb011ad 100644
--- a/keyboards/foxlab/key65/hotswap/hotswap.c
+++ b/keyboards/foxlab/key65/hotswap/hotswap.c
@@ -15,20 +15,3 @@
 */
 #include "hotswap.h"
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(E6);
-    writePinHigh(E6);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(E6, !led_state.caps_lock);
-    }
-    return true;
-}
diff --git a/keyboards/foxlab/key65/universal/config.h b/keyboards/foxlab/key65/universal/config.h
index a3c01cd75..315af6676 100644
--- a/keyboards/foxlab/key65/universal/config.h
+++ b/keyboards/foxlab/key65/universal/config.h
@@ -45,6 +45,9 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
+#define LED_SCROLL_LOCK_PIN E6
+#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B7
 // #define BACKLIGHT_BREATHING
 #define BACKLIGHT_LEVELS 5
diff --git a/keyboards/foxlab/key65/universal/universal.c b/keyboards/foxlab/key65/universal/universal.c
index 361f3ad7f..5fa9e8f17 100644
--- a/keyboards/foxlab/key65/universal/universal.c
+++ b/keyboards/foxlab/key65/universal/universal.c
@@ -15,20 +15,3 @@
 */
 #include "universal.h"
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(E6);
-    writePinHigh(E6);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(E6, !led_state.caps_lock);
-    }
-    return true;
-}
diff --git a/keyboards/freyr/config.h b/keyboards/freyr/config.h
index a4e34ea47..d912b3cc1 100644
--- a/keyboards/freyr/config.h
+++ b/keyboards/freyr/config.h
@@ -47,6 +47,10 @@ 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/freyr/freyr.c b/keyboards/freyr/freyr.c
index 336b32711..a856521e7 100644
--- a/keyboards/freyr/freyr.c
+++ b/keyboards/freyr/freyr.c
@@ -15,22 +15,3 @@
 */
 #include "freyr.h"
-void matrix_init_kb(void) {
-    matrix_init_user();
-    led_init_ports();
-}
-void led_init_ports(void) {
-    setPinOutput(B3);
-    setPinOutput(B7);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(B3, !led_state.caps_lock);
-        writePin(B7, !led_state.scroll_lock);
-    }
-    return true;
-}
diff --git a/keyboards/ft/mars80/config.h b/keyboards/ft/mars80/config.h
index 3aabc926d..e56d4439b 100644
--- a/keyboards/ft/mars80/config.h
+++ b/keyboards/ft/mars80/config.h
@@ -37,6 +37,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 5
+#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/mars80.c b/keyboards/ft/mars80/mars80.c
index 2c628a6a2..5c95d04e3 100644
--- a/keyboards/ft/mars80/mars80.c
+++ b/keyboards/ft/mars80/mars80.c
@@ -15,21 +15,3 @@
 */
 #include "mars80.h"
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(D1);
-    setPinOutput(D6);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(D1, led_state.caps_lock);
-        writePin(D6, led_state.scroll_lock);
-    }
-    return true;
-}
diff --git a/keyboards/gray_studio/hb85/config.h b/keyboards/gray_studio/hb85/config.h
index 9309012a4..0e1f0aff4 100644
--- a/keyboards/gray_studio/hb85/config.h
+++ b/keyboards/gray_studio/hb85/config.h
@@ -34,5 +34,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLED_NUM 5
 #define RGBLIGHT_ANIMATIONS
+#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/hb85.c b/keyboards/gray_studio/hb85/hb85.c
index 4b3ff64f1..964234d6b 100644
--- a/keyboards/gray_studio/hb85/hb85.c
+++ b/keyboards/gray_studio/hb85/hb85.c
@@ -17,23 +17,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "hb85.h"
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(D0);
-    setPinOutput(D1);
-    setPinOutput(D6);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(D0, led_state.num_lock);
-        writePin(D1, led_state.caps_lock);
-        writePin(D6, led_state.scroll_lock);
-    }
-    return true;
-}
diff --git a/keyboards/handwired/tritium_numpad/config.h b/keyboards/handwired/tritium_numpad/config.h
index a53c27d43..1424c6b49 100644
--- a/keyboards/handwired/tritium_numpad/config.h
+++ b/keyboards/handwired/tritium_numpad/config.h
@@ -36,6 +36,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { F4, F6, B1, B2 }
 #define UNUSED_PINS
+#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/tritium_numpad.c b/keyboards/handwired/tritium_numpad/tritium_numpad.c
index 7193a934d..c9f86eda7 100644
--- a/keyboards/handwired/tritium_numpad/tritium_numpad.c
+++ b/keyboards/handwired/tritium_numpad/tritium_numpad.c
@@ -1,29 +1 @@
 #include "tritium_numpad.h"
-#include "led.h"
-void keyboard_pre_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        keyboard_pre_init_user();
-        led_init_ports();
-};
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-};
-void led_init_ports(void) {
-    // * Set our LED pins as output
-    // Numlock LED
-    setPinOutput(D5);
-}
-void led_set_kb(uint8_t usb_led) {
-    if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) {
-        writePinLow(D5);
-    } else {
-        writePinHigh(D5);
-    }
-}
diff --git a/keyboards/hid_liber/config.h b/keyboards/hid_liber/config.h
index f35799b1a..e0f92dee8 100755
--- a/keyboards/hid_liber/config.h
+++ b/keyboards/hid_liber/config.h
@@ -34,6 +34,10 @@
 // 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
 // #define BACKLIGHT_PIN B7
 // #define BACKLIGHT_BREATHING
 // #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/hid_liber/hid_liber.c b/keyboards/hid_liber/hid_liber.c
index 2d2130743..2e4ddb329 100755
--- a/keyboards/hid_liber/hid_liber.c
+++ b/keyboards/hid_liber/hid_liber.c
@@ -16,24 +16,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "hid_liber.h"
-void matrix_init_kb(void) {
-    // put your keyboard start-up code here
-    // runs once when the firmware starts up
-    led_init_ports();
-    matrix_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(B5);
-    setPinOutput(B6);
-}
-bool led_update_kb(led_t led_state) {
-    bool res = led_update_user(led_state);
-    if(res) {
-        writePin(B5, !led_state.caps_lock);
-        writePin(B6, !led_state.scroll_lock);
-    }
-    return res;
-}
diff --git a/keyboards/j80/config.h b/keyboards/j80/config.h
index c4276431c..fb17a7fd1 100644
--- a/keyboards/j80/config.h
+++ b/keyboards/j80/config.h
@@ -35,6 +35,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 5
+#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/j80.c b/keyboards/j80/j80.c
index bed30cdec..fd49e913e 100644
--- a/keyboards/j80/j80.c
+++ b/keyboards/j80/j80.c
@@ -15,23 +15,3 @@
 */
 #include "j80.h"
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(D0);
-    setPinOutput(D1);
-    setPinOutput(D6);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(D0, led_state.num_lock);
-        writePin(D1, led_state.caps_lock);
-        writePin(D6, led_state.scroll_lock);
-    }
-    return true;
-}
diff --git a/keyboards/jc65/v32a/config.h b/keyboards/jc65/v32a/config.h
index 6cf71ab3a..d6907c96c 100644
--- a/keyboards/jc65/v32a/config.h
+++ b/keyboards/jc65/v32a/config.h
@@ -32,6 +32,8 @@ 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/v32a.c b/keyboards/jc65/v32a/v32a.c
index f195e8f61..aa7233ba2 100644
--- a/keyboards/jc65/v32a/v32a.c
+++ b/keyboards/jc65/v32a/v32a.c
@@ -16,19 +16,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "v32a.h"
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(D1);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(D1, led_state.caps_lock);
-    }
-    return true;
-}
diff --git a/keyboards/kb_elmo/aek2_usb/aek2_usb.c b/keyboards/kb_elmo/aek2_usb/aek2_usb.c
index b83faf5da..6ce5d21df 100644
--- a/keyboards/kb_elmo/aek2_usb/aek2_usb.c
+++ b/keyboards/kb_elmo/aek2_usb/aek2_usb.c
@@ -15,23 +15,3 @@
 */
 #include "aek2_usb.h"
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(B0);
-    setPinOutput(B1);
-    setPinOutput(B2);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(B0, led_state.scroll_lock);
-        writePin(B1, led_state.caps_lock);
-        writePin(B2, led_state.num_lock);
-    }
-    return true;
-}
-\ No newline at end of file
diff --git a/keyboards/kb_elmo/aek2_usb/config.h b/keyboards/kb_elmo/aek2_usb/config.h
index e0fc83f17..cf8c9d66f 100644
--- a/keyboards/kb_elmo/aek2_usb/config.h
+++ b/keyboards/kb_elmo/aek2_usb/config.h
@@ -40,6 +40,10 @@ 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
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
diff --git a/keyboards/kbdfans/kbdpad/mk1/config.h b/keyboards/kbdfans/kbdpad/mk1/config.h
index 1646a1af1..80a1abef5 100644
--- a/keyboards/kbdfans/kbdpad/mk1/config.h
+++ b/keyboards/kbdfans/kbdpad/mk1/config.h
@@ -33,6 +33,8 @@ 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/mk1.c b/keyboards/kbdfans/kbdpad/mk1/mk1.c
index 540ba3589..5635b0a58 100644
--- a/keyboards/kbdfans/kbdpad/mk1/mk1.c
+++ b/keyboards/kbdfans/kbdpad/mk1/mk1.c
@@ -15,19 +15,3 @@
 */
 #include "mk1.h"
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(D0);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(D0, led_state.num_lock);
-    }
-    return true;
-}
diff --git a/keyboards/kinesis/kint2pp/config.h b/keyboards/kinesis/kint2pp/config.h
index 2acaf9be6..902c9b24a 100644
--- a/keyboards/kinesis/kint2pp/config.h
+++ b/keyboards/kinesis/kint2pp/config.h
@@ -25,7 +25,12 @@
 /* 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
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
diff --git a/keyboards/kinesis/kint2pp/kint2pp.c b/keyboards/kinesis/kint2pp/kint2pp.c
index 7e2b4348c..856e29c31 100644
--- a/keyboards/kinesis/kint2pp/kint2pp.c
+++ b/keyboards/kinesis/kint2pp/kint2pp.c
@@ -1,26 +1 @@
 #include "kint2pp.h"
-void matrix_init_kb(void) {
-        led_init_ports();
-        matrix_init_user();
-}
-void led_init_ports() {
-  // * Set our LED pins as output
-  setPinOutput(C3); // Keypad LED
-  setPinOutput(C4); // ScrLock LED
-  setPinOutput(C5); // NumLock LED
-  setPinOutput(C1); // CapsLock LED
-}
-bool led_update_kb(led_t led_state) {
-    bool res = led_update_user(led_state);
-    if(res) {
-        writePin(C3, !led_state.compose);
-        writePin(C4, !led_state.scroll_lock);
-        writePin(C5, !led_state.num_lock);
-        writePin(C1, !led_state.caps_lock);
-    }
-    return res;
-}
diff --git a/keyboards/kinesis/nguyenvietyen/config.h b/keyboards/kinesis/nguyenvietyen/config.h
index f221acd7e..52f4c8054 100644
--- a/keyboards/kinesis/nguyenvietyen/config.h
+++ b/keyboards/kinesis/nguyenvietyen/config.h
@@ -25,3 +25,9 @@
 /* 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/nguyenvietyen.c b/keyboards/kinesis/nguyenvietyen/nguyenvietyen.c
index 1919412e9..3f0147938 100644
--- a/keyboards/kinesis/nguyenvietyen/nguyenvietyen.c
+++ b/keyboards/kinesis/nguyenvietyen/nguyenvietyen.c
@@ -1,31 +1 @@
 #include "nguyenvietyen.h"
-void matrix_init_kb(void) {
-    led_init_ports();
-    matrix_init_user();
-}
-void led_init_ports() {
-    // * Set our LED pins as output
-    setPinOutput(D7);  // Keypad LED
-    setPinOutput(C6);  // ScrLock LED
-    setPinOutput(D4);  // NumLock LED
-    setPinOutput(E6);  // CapsLock LED
-    // turn all LEDs off by default
-    writePinHigh(D7);
-    writePinHigh(C6);
-    writePinHigh(D4);
-    writePinHigh(E6);
-}
-bool led_update_kb(led_t led_state) {
-    bool res = led_update_user(led_state);
-    if (res) {
-        writePin(D7, !led_state.compose);
-        writePin(C6, !led_state.scroll_lock);
-        writePin(D4, !led_state.num_lock);
-        writePin(E6, !led_state.caps_lock);
-    }
-    return res;
-}
diff --git a/keyboards/kira80/config.h b/keyboards/kira80/config.h
index 725b68d6e..d61d23ab6 100644
--- a/keyboards/kira80/config.h
+++ b/keyboards/kira80/config.h
@@ -38,6 +38,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 5
+#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/kira80.c b/keyboards/kira80/kira80.c
index a76f4001e..b3ebcae29 100644
--- a/keyboards/kira80/kira80.c
+++ b/keyboards/kira80/kira80.c
@@ -15,21 +15,3 @@
 */
 #include "kira80.h"
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(D1);
-    setPinOutput(D6);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(D1, led_state.caps_lock);
-        writePin(D6, led_state.scroll_lock);
-    }
-    return true;
-}
-\ No newline at end of file
diff --git a/keyboards/kona_classic/kona_classic.c b/keyboards/kona_classic/kona_classic.c
index 71cee7baa..af4ea06e6 100644
--- a/keyboards/kona_classic/kona_classic.c
+++ b/keyboards/kona_classic/kona_classic.c
@@ -14,32 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "kona_classic.h"
-void matrix_init_kb(void) {
-    // put your keyboard start-up code here
-    // runs once when the firmware starts up
-    led_init_ports();
-    matrix_init_user();
-}
-void matrix_scan_kb(void) {
-    // put your looping keyboard code here
-    // runs every cycle (a lot)
-    matrix_scan_user();
-}
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-    // put your per-action keyboard code here
-    // runs for every action, just before processing by the firmware
-    return process_record_user(keycode, record);
-}
-void led_init_ports(void) {
-//    DDRB |= (1<<6) | (1<<7); // OUT
-}
-void led_set_kb(uint8_t usb_led) {
-//    led_set_user(usb_led);
-}
diff --git a/keyboards/mechlovin/adelais/adelais.c b/keyboards/mechlovin/adelais/adelais.c
index da5f68f62..b9df471d3 100644
--- a/keyboards/mechlovin/adelais/adelais.c
+++ b/keyboards/mechlovin/adelais/adelais.c
@@ -15,30 +15,3 @@
 */
 #include "adelais.h"
-void matrix_init_kb(void) {
-    // put your keyboard start-up code here
-    // runs once when the firmware starts up
-    matrix_init_user();
-    led_init_ports();
-}
-void led_init_ports(void) {
-    setPinOutput(B2);
-    writePinLow(B2);
-    setPinOutput(C15);
-    writePinLow(C15);
-    setPinOutput(B9);
-    writePinLow(B9);
-}
-bool led_update_kb(led_t led_state) {
-    if(led_update_user(led_state)) {
-        writePin(B2, led_state.caps_lock);
-        writePin(B9, led_state.scroll_lock);
-        writePin(C15, led_state.num_lock);
-    }
-    return true;
-}
diff --git a/keyboards/mechlovin/adelais/config.h b/keyboards/mechlovin/adelais/config.h
index 875eba514..3ec5c4913 100644
--- a/keyboards/mechlovin/adelais/config.h
+++ b/keyboards/mechlovin/adelais/config.h
@@ -30,3 +30,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
+#define LED_NUM_LOCK_PIN C15
+#define LED_CAPS_LOCK_PIN B2
+#define LED_SCROLL_LOCK_PIN B9
diff --git a/keyboards/mechlovin/delphine/config.h b/keyboards/mechlovin/delphine/config.h
index b3a084f67..a642f37f9 100644
--- a/keyboards/mechlovin/delphine/config.h
+++ b/keyboards/mechlovin/delphine/config.h
@@ -41,4 +41,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, D3 }
 #define MATRIX_COL_PINS { F7, D7, D6, D2 }
-#define DIODE_DIRECTION COL2ROW
-\ No newline at end of file
+#define DIODE_DIRECTION COL2ROW
+#define LED_NUM_LOCK_PIN B5
diff --git a/keyboards/mechlovin/delphine/delphine.c b/keyboards/mechlovin/delphine/delphine.c
index 52292b3c9..8e33b6603 100644
--- a/keyboards/mechlovin/delphine/delphine.c
+++ b/keyboards/mechlovin/delphine/delphine.c
@@ -15,21 +15,3 @@
 */
 #include "delphine.h"
-void matrix_init_kb(void) {
-    matrix_init_user();
-    led_init_ports();
-}
-void led_init_ports(void) {
-    setPinOutput(B5);
-    writePinLow(B5);
-}
-bool led_update_kb(led_t led_state) {
-    if(led_update_user(led_state)) {
-        writePin(B5, led_state.num_lock);
-    }
-    return true;
-}
diff --git a/keyboards/mechlovin/hannah65/config.h b/keyboards/mechlovin/hannah65/config.h
index 6801c30a3..8c94fe4b3 100644
--- a/keyboards/mechlovin/hannah65/config.h
+++ b/keyboards/mechlovin/hannah65/config.h
@@ -41,6 +41,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
+#define LED_CAPS_LOCK_PIN B9
 #define BACKLIGHT_PIN B8
 #define BACKLIGHT_BREATHING
 #define BACKLIGHT_PWM_DRIVER PWMD3
diff --git a/keyboards/mechlovin/hannah65/hannah65.c b/keyboards/mechlovin/hannah65/hannah65.c
index 4f937d8a2..92e0917eb 100644
--- a/keyboards/mechlovin/hannah65/hannah65.c
+++ b/keyboards/mechlovin/hannah65/hannah65.c
@@ -15,21 +15,3 @@
 */
 #include "hannah65.h"
-void matrix_init_kb(void) {
-    matrix_init_user();
-    led_init_ports();
-}
-void led_init_ports(void) {
-    setPinOutput(B9);
-    writePinLow(B9);
-}
-bool led_update_kb(led_t led_state) {
-    if(led_update_user(led_state)) {
-        writePin(B9, led_state.caps_lock);
-    }
-    return true;
-}
diff --git a/keyboards/mechlovin/infinity87/config.h b/keyboards/mechlovin/infinity87/config.h
index 703a06f8d..ccb9f6756 100644
--- a/keyboards/mechlovin/infinity87/config.h
+++ b/keyboards/mechlovin/infinity87/config.h
@@ -45,6 +45,8 @@ 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
diff --git a/keyboards/mechlovin/infinity87/infinity87.c b/keyboards/mechlovin/infinity87/infinity87.c
index 2de528bc3..434e79609 100644
--- a/keyboards/mechlovin/infinity87/infinity87.c
+++ b/keyboards/mechlovin/infinity87/infinity87.c
@@ -15,24 +15,3 @@
 */
 #include "infinity87.h"
-void matrix_init_kb(void) {
-    matrix_init_user();
-    led_init_ports();
-}
-void led_init_ports(void) {
-    setPinOutput(A3);
-    writePinLow(A3);
-    setPinOutput(A4);
-    writePinLow(A4);
-}
-bool led_update_kb(led_t led_state) {
-    if(led_update_user(led_state)) {
-        writePin(A4, led_state.caps_lock);
-        writePin(A3, led_state.num_lock);
-    }
-    return true;
-}
diff --git a/keyboards/mechlovin/infinity88/config.h b/keyboards/mechlovin/infinity88/config.h
index df1ea4957..a387b7638 100644
--- a/keyboards/mechlovin/infinity88/config.h
+++ b/keyboards/mechlovin/infinity88/config.h
@@ -45,6 +45,8 @@ 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
diff --git a/keyboards/mechlovin/infinity88/infinity88.c b/keyboards/mechlovin/infinity88/infinity88.c
index d342ce9ee..4d352358a 100644
--- a/keyboards/mechlovin/infinity88/infinity88.c
+++ b/keyboards/mechlovin/infinity88/infinity88.c
@@ -15,25 +15,3 @@
 */
 #include "infinity88.h"
-void matrix_init_kb(void) {
-    matrix_init_user();
-    led_init_ports();
-}
-void led_init_ports(void) {
-    setPinOutput(A3);
-    writePinLow(A3);
-    setPinOutput(A4);
-    writePinLow(A4);
-}
-bool led_update_kb(led_t led_state) {
-    if(led_update_user(led_state)) {
-        writePin(A4, led_state.caps_lock);
-        writePin(A3, led_state.num_lock);
-    }
-    return true;
-}
diff --git a/keyboards/mechlovin/pisces/config.h b/keyboards/mechlovin/pisces/config.h
index 14f6404a7..1debf021c 100644
--- a/keyboards/mechlovin/pisces/config.h
+++ b/keyboards/mechlovin/pisces/config.h
@@ -45,6 +45,8 @@ 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_BREATHING
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/mechlovin/pisces/pisces.c b/keyboards/mechlovin/pisces/pisces.c
index 2a0a97f6d..b43bf2aaa 100644
--- a/keyboards/mechlovin/pisces/pisces.c
+++ b/keyboards/mechlovin/pisces/pisces.c
@@ -15,28 +15,3 @@
 */
 #include "pisces.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();
-    led_init_ports();
-}
-void led_init_ports(void) {
-    setPinOutput(B2);
-    writePinLow(B2);
-}
-bool led_update_kb(led_t led_state) {
-    if(led_update_user(led_state)) {
-        writePin(B2, led_state.caps_lock);
-    }
-    return true;
-}
diff --git a/keyboards/mehkee96/config.h b/keyboards/mehkee96/config.h
index dc8c593ad..44ded13a5 100644
--- a/keyboards/mehkee96/config.h
+++ b/keyboards/mehkee96/config.h
@@ -16,6 +16,10 @@
 #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_PIN_ON_STATE 0
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/mehkee96/mehkee96.c b/keyboards/mehkee96/mehkee96.c
index ae83a1bb5..d9e2bac7a 100644
--- a/keyboards/mehkee96/mehkee96.c
+++ b/keyboards/mehkee96/mehkee96.c
@@ -16,21 +16,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "mehkee96.h"
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(D0);
-    setPinOutput(D1);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(D0, led_state.num_lock);
-        writePin(D1, led_state.caps_lock);
-    }
-    return true;
-}
diff --git a/keyboards/nightly_boards/alter/rev1/config.h b/keyboards/nightly_boards/alter/rev1/config.h
index 30fe4b521..4f9bade71 100644
--- a/keyboards/nightly_boards/alter/rev1/config.h
+++ b/keyboards/nightly_boards/alter/rev1/config.h
@@ -44,6 +44,10 @@ 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 BACKLIGHT_PIN F1
 // #define BACKLIGHT_BREATHING
 // #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/nightly_boards/alter/rev1/rev1.c b/keyboards/nightly_boards/alter/rev1/rev1.c
index df3dd6aed..b250d32d1 100644
--- a/keyboards/nightly_boards/alter/rev1/rev1.c
+++ b/keyboards/nightly_boards/alter/rev1/rev1.c
@@ -15,23 +15,3 @@
 */
 #include "rev1.h"
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(D7);
-    setPinOutput(D6);
-    setPinOutput(B4);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(D7, led_state.num_lock);
-        writePin(D6, led_state.caps_lock);
-        writePin(B4, led_state.scroll_lock);
-    }
-    return true;
-}
diff --git a/keyboards/panc60/config.h b/keyboards/panc60/config.h
index 002ff7cf9..495f5a2d4 100644
--- a/keyboards/panc60/config.h
+++ b/keyboards/panc60/config.h
@@ -37,6 +37,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 5
+#define LED_CAPS_LOCK_PIN D1
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/panc60/panc60.c b/keyboards/panc60/panc60.c
index d7ff52963..16f298eb8 100644
--- a/keyboards/panc60/panc60.c
+++ b/keyboards/panc60/panc60.c
@@ -15,19 +15,3 @@
 */
 #include "panc60.h"
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(D1);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(D1, led_state.caps_lock);
-    }
-    return true;
-}
diff --git a/keyboards/pandora/config.h b/keyboards/pandora/config.h
index 873f6dd15..3a44129c4 100644
--- a/keyboards/pandora/config.h
+++ b/keyboards/pandora/config.h
@@ -47,6 +47,9 @@ 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
 /* Encoder Function */
 #define ENCODERS_PAD_A { F6 }
 #define ENCODERS_PAD_B { F5 }
diff --git a/keyboards/pandora/pandora.c b/keyboards/pandora/pandora.c
index 6c5d8a166..3d166646b 100644
--- a/keyboards/pandora/pandora.c
+++ b/keyboards/pandora/pandora.c
@@ -15,21 +15,3 @@
 */
 #include "pandora.h"
-void matrix_init_kb(void) {
-    matrix_init_user();
-    led_init_ports();
-};
-void led_init_ports(void) {
-    setPinOutput(E6);
-    writePinHigh(E6);
-}
-bool led_update_kb(led_t led_state) {
-    bool res = led_update_user(led_state);
-    if(res) {
-        writePin(E6, !led_state.caps_lock);
-    }
-    return res;
-}
diff --git a/keyboards/pearl/config.h b/keyboards/pearl/config.h
index a42b0a5fa..09e0c8e1e 100644
--- a/keyboards/pearl/config.h
+++ b/keyboards/pearl/config.h
@@ -25,6 +25,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MANUFACTURER Pearl Boards
 #define PRODUCT      Pearl
+#define LED_NUM_LOCK_PIN D0
+#define LED_CAPS_LOCK_PIN D1
+#define LED_SCROLL_LOCK_PIN D6
 #define RGBLIGHT_ANIMATIONS
 #define RGBLED_NUM 12
diff --git a/keyboards/pearl/pearl.c b/keyboards/pearl/pearl.c
index b08ee6f88..18ed9835d 100644
--- a/keyboards/pearl/pearl.c
+++ b/keyboards/pearl/pearl.c
@@ -16,23 +16,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "pearl.h"
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(D0);
-    setPinOutput(D1);
-    setPinOutput(D6);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(D0, led_state.num_lock);
-        writePin(D1, led_state.caps_lock);
-        writePin(D6, led_state.scroll_lock);
-    }
-    return true;
-}
diff --git a/keyboards/percent/canoe/canoe.c b/keyboards/percent/canoe/canoe.c
index dd31640e6..572ff50b0 100644
--- a/keyboards/percent/canoe/canoe.c
+++ b/keyboards/percent/canoe/canoe.c
@@ -16,19 +16,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "canoe.h"
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(D1);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(D1, led_state.caps_lock);
-    }
-    return true;
-}
diff --git a/keyboards/percent/canoe/config.h b/keyboards/percent/canoe/config.h
index b8a306b7e..c349c1106 100644
--- a/keyboards/percent/canoe/config.h
+++ b/keyboards/percent/canoe/config.h
@@ -38,6 +38,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 5
+#define LED_CAPS_LOCK_PIN D1
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/percent/skog/config.h b/keyboards/percent/skog/config.h
index 047bac02e..524fdc5cc 100644
--- a/keyboards/percent/skog/config.h
+++ b/keyboards/percent/skog/config.h
@@ -32,6 +32,9 @@ 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_ANIMATIONS
diff --git a/keyboards/percent/skog/skog.c b/keyboards/percent/skog/skog.c
index 152fc5684..c44f0373f 100644
--- a/keyboards/percent/skog/skog.c
+++ b/keyboards/percent/skog/skog.c
@@ -18,21 +18,3 @@ ps2avrGB support code by Kenneth A. (bminiex/.[ch])
 */
 #include "skog.h"
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(D1);
-    setPinOutput(D6);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(D1, led_state.caps_lock);
-        writePin(D6, led_state.scroll_lock);
-    }
-    return true;
-}
diff --git a/keyboards/percent/skog_lite/config.h b/keyboards/percent/skog_lite/config.h
index e28dcfcd2..15de9bbb8 100644
--- a/keyboards/percent/skog_lite/config.h
+++ b/keyboards/percent/skog_lite/config.h
@@ -38,6 +38,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 5
+#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/skog_lite.c b/keyboards/percent/skog_lite/skog_lite.c
index 95d398211..c69843e61 100644
--- a/keyboards/percent/skog_lite/skog_lite.c
+++ b/keyboards/percent/skog_lite/skog_lite.c
@@ -15,21 +15,3 @@
 */
 #include "skog_lite.h"
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(D1);
-    setPinOutput(D6);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(D1, led_state.caps_lock);
-        writePin(D6, led_state.scroll_lock);
-    }
-    return true;
-}
diff --git a/keyboards/phantom/config.h b/keyboards/phantom/config.h
index a5d135a4b..a948987d1 100644
--- a/keyboards/phantom/config.h
+++ b/keyboards/phantom/config.h
@@ -47,6 +47,9 @@ 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 BACKLIGHT_PIN B7
 // #define BACKLIGHT_LEVELS 3
 // #define BACKLIGHT_BREATHING
diff --git a/keyboards/phantom/phantom.c b/keyboards/phantom/phantom.c
index 1017de009..5c478f82a 100644
--- a/keyboards/phantom/phantom.c
+++ b/keyboards/phantom/phantom.c
@@ -15,23 +15,3 @@
 */
 #include "phantom.h"
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(B6);
-    setPinOutput(B7);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(B6, led_state.caps_lock);
-        writePin(B7, led_state.scroll_lock);
-    }
-    return true;
-}
diff --git a/keyboards/rart/rartlice/config.h b/keyboards/rart/rartlice/config.h
index 26f9324bd..fc6fbaa11 100644
--- a/keyboards/rart/rartlice/config.h
+++ b/keyboards/rart/rartlice/config.h
@@ -43,6 +43,11 @@ 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_ANIMATIONS
 #define RGB_DI_PIN B15
 #define RGBLED_NUM 11
diff --git a/keyboards/rart/rartlice/rartlice.c b/keyboards/rart/rartlice/rartlice.c
index be805da33..a970e9686 100644
--- a/keyboards/rart/rartlice/rartlice.c
+++ b/keyboards/rart/rartlice/rartlice.c
@@ -14,23 +14,3 @@
 */
 #include "rartlice.h"
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(A8);
-    setPinOutput(B14);
-    setPinOutput(A9);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(A8,  !led_state.num_lock);
-        writePin(B14, !led_state.caps_lock);
-        writePin(A9,  !led_state.scroll_lock);
-    }
-    return true;
-}
diff --git a/keyboards/redscarf_iiplus/verd/config.h b/keyboards/redscarf_iiplus/verd/config.h
index 06d606f55..abc3ae378 100644
--- a/keyboards/redscarf_iiplus/verd/config.h
+++ b/keyboards/redscarf_iiplus/verd/config.h
@@ -52,6 +52,10 @@ 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 E6
+#define LED_CAPS_LOCK_PIN C6
+#define LED_PIN_ON_STATE 0
 #define BACKLIGHT_PIN B7
 //   #define BACKLIGHT_BREATHING
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/redscarf_iiplus/verd/verd.c b/keyboards/redscarf_iiplus/verd/verd.c
index c16a5a974..fa5ef6bd2 100644
--- a/keyboards/redscarf_iiplus/verd/verd.c
+++ b/keyboards/redscarf_iiplus/verd/verd.c
@@ -13,30 +13,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "verd.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();
-    led_init_ports();
-}
-void led_init_ports(void) {
-        setPinOutput(C7);
-        writePinHigh(C7);
-        setPinOutput(E6);
-        writePinHigh(E6);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(C7, !led_state.caps_lock);
-        writePin(E6, !led_state.num_lock);
-    }
-    return true;
-}
diff --git a/keyboards/reversestudio/decadepad/config.h b/keyboards/reversestudio/decadepad/config.h
index 78fd40c40..383a539d7 100644
--- a/keyboards/reversestudio/decadepad/config.h
+++ b/keyboards/reversestudio/decadepad/config.h
@@ -42,6 +42,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* define if matrix has ghost */
 //#define MATRIX_HAS_GHOST
+#define LED_NUM_LOCK_PIN D4
+#define LED_PIN_ON_STATE 0
 /* number of backlight levels */
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
diff --git a/keyboards/reversestudio/decadepad/decadepad.c b/keyboards/reversestudio/decadepad/decadepad.c
index 32a66e295..699a4476b 100644
--- a/keyboards/reversestudio/decadepad/decadepad.c
+++ b/keyboards/reversestudio/decadepad/decadepad.c
@@ -1,16 +1 @@
 #include "decadepad.h"
-void matrix_init_kb(void) {
-  led_init_ports();
-  matrix_init_user(); 
-};
-void led_init_ports(void) {
-  setPinOutput(D4);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)){
-        writePin(D4, !led_state.num_lock);
-    }
-    return true;
-}
-\ No newline at end of file
diff --git a/keyboards/singa/config.h b/keyboards/singa/config.h
index 408f88b2a..1d3ed105e 100644
--- a/keyboards/singa/config.h
+++ b/keyboards/singa/config.h
@@ -37,6 +37,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 5
+#define LED_CAPS_LOCK_PIN D1
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/singa/singa.c b/keyboards/singa/singa.c
index 360b214a3..8605d6f47 100644
--- a/keyboards/singa/singa.c
+++ b/keyboards/singa/singa.c
@@ -15,19 +15,3 @@
 */
 #include "singa.h"
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(D1);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(D1, led_state.caps_lock);
-    }
-    return true;
-}
diff --git a/keyboards/stella/config.h b/keyboards/stella/config.h
index 04ba08239..512b7571d 100644
--- a/keyboards/stella/config.h
+++ b/keyboards/stella/config.h
@@ -47,6 +47,10 @@ 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/stella/stella.c b/keyboards/stella/stella.c
index 363c327d6..5eb55b366 100644
--- a/keyboards/stella/stella.c
+++ b/keyboards/stella/stella.c
@@ -15,22 +15,3 @@
 */
 #include "stella.h"
-void matrix_init_kb(void) {
-    matrix_init_user();
-    led_init_ports();
-};
-void led_init_ports(void) {
-    setPinOutput(B3);
-    setPinOutput(B7);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(B3, !led_state.caps_lock);
-        writePin(B7, !led_state.scroll_lock);
-    }
-    return true;
-}
diff --git a/keyboards/tgr/910/910.c b/keyboards/tgr/910/910.c
index 63b4a13f7..8e0c78538 100644
--- a/keyboards/tgr/910/910.c
+++ b/keyboards/tgr/910/910.c
@@ -15,23 +15,3 @@
 */
 #include "910.h"
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(D0);
-    setPinOutput(D1);
-    setPinOutput(D6);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(D0, led_state.num_lock);
-        writePin(D1, led_state.caps_lock);
-        writePin(D6, led_state.scroll_lock);
-    }
-    return true;
-}
diff --git a/keyboards/tgr/910/config.h b/keyboards/tgr/910/config.h
index 8cd46a413..7ba412be3 100644
--- a/keyboards/tgr/910/config.h
+++ b/keyboards/tgr/910/config.h
@@ -38,6 +38,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 5
+#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/910ce/910ce.c b/keyboards/tgr/910ce/910ce.c
index 4b3913179..7538158c8 100644
--- a/keyboards/tgr/910ce/910ce.c
+++ b/keyboards/tgr/910ce/910ce.c
@@ -15,19 +15,3 @@
 */
 #include "910ce.h"
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(D1);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(D1, led_state.caps_lock);
-    }
-    return true;
-}
-\ No newline at end of file
diff --git a/keyboards/tgr/910ce/config.h b/keyboards/tgr/910ce/config.h
index 6d3fe7a49..fd21a2de7 100644
--- a/keyboards/tgr/910ce/config.h
+++ b/keyboards/tgr/910ce/config.h
@@ -38,6 +38,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 5
+#define LED_CAPS_LOCK_PIN D1
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
 #define RGBLIGHT_ANIMATIONS
diff --git a/keyboards/tgr/alice/alice.c b/keyboards/tgr/alice/alice.c
index a4a5c787c..39aed2cf5 100644
--- a/keyboards/tgr/alice/alice.c
+++ b/keyboards/tgr/alice/alice.c
@@ -16,23 +16,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "alice.h"
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(D0);
-    setPinOutput(D1);
-    setPinOutput(D6);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(D0, led_state.num_lock);
-        writePin(D1, led_state.caps_lock);
-        writePin(D6, led_state.scroll_lock);
-    }
-    return true;
-}
diff --git a/keyboards/tgr/alice/config.h b/keyboards/tgr/alice/config.h
index 20f4c5970..26ed2e797 100644
--- a/keyboards/tgr/alice/config.h
+++ b/keyboards/tgr/alice/config.h
@@ -31,6 +31,10 @@ 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/jane/config.h b/keyboards/tgr/jane/config.h
index ed8b39c38..0132a716d 100644
--- a/keyboards/tgr/jane/config.h
+++ b/keyboards/tgr/jane/config.h
@@ -36,5 +36,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 5
+#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/jane.c b/keyboards/tgr/jane/jane.c
index fabdc0e90..d4cdebaa2 100644
--- a/keyboards/tgr/jane/jane.c
+++ b/keyboards/tgr/jane/jane.c
@@ -15,21 +15,3 @@
 */
 #include "jane.h"
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(D1);
-    setPinOutput(D6);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(D1, led_state.caps_lock);
-        writePin(D6, led_state.scroll_lock);
-    }
-    return true;
-}
diff --git a/keyboards/tgr/tris/config.h b/keyboards/tgr/tris/config.h
index 4ae3b967c..16e862a22 100644
--- a/keyboards/tgr/tris/config.h
+++ b/keyboards/tgr/tris/config.h
@@ -34,6 +34,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 5
+#define LED_NUM_LOCK_PIN D0
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/tgr/tris/tris.c b/keyboards/tgr/tris/tris.c
index f354d7a39..c2147b29c 100644
--- a/keyboards/tgr/tris/tris.c
+++ b/keyboards/tgr/tris/tris.c
@@ -15,19 +15,3 @@
 */
 #include "tris.h"
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(D0);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(D0, led_state.num_lock);
-    }
-    return true;
-}
diff --git a/keyboards/unikorn/config.h b/keyboards/unikorn/config.h
index c68a857d5..1029a777b 100644
--- a/keyboards/unikorn/config.h
+++ b/keyboards/unikorn/config.h
@@ -36,6 +36,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 5
+#define LED_CAPS_LOCK_PIN D1
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/unikorn/unikorn.c b/keyboards/unikorn/unikorn.c
index c2c85eb98..d803ebf9d 100644
--- a/keyboards/unikorn/unikorn.c
+++ b/keyboards/unikorn/unikorn.c
@@ -15,19 +15,3 @@
 */
 #include "unikorn.h"
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(D1);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(D1, led_state.caps_lock);
-    }
-    return true;
-}
diff --git a/keyboards/vn66/config.h b/keyboards/vn66/config.h
index e30c1b19d..d80954184 100644
--- a/keyboards/vn66/config.h
+++ b/keyboards/vn66/config.h
@@ -47,6 +47,9 @@ 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/vn66/vn66.c b/keyboards/vn66/vn66.c
index 77fe23aef..563135904 100644
--- a/keyboards/vn66/vn66.c
+++ b/keyboards/vn66/vn66.c
@@ -15,20 +15,3 @@
 */
 #include "vn66.h"
-void matrix_init_kb(void) {
-    led_init_ports();
-    matrix_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(E6);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(E6, !led_state.caps_lock);
-    }
-    return true;
-}
diff --git a/keyboards/winkeyless/bface/bface.c b/keyboards/winkeyless/bface/bface.c
index 7d27096ba..c1fcbe53b 100644
--- a/keyboards/winkeyless/bface/bface.c
+++ b/keyboards/winkeyless/bface/bface.c
@@ -15,23 +15,3 @@
 */
 #include "bface.h"
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(D0);
-    setPinOutput(D1);
-    setPinOutput(D6);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(D0, led_state.num_lock);
-        writePin(D1, led_state.caps_lock);
-        writePin(D6, led_state.scroll_lock);
-    }
-    return true;
-}
diff --git a/keyboards/winkeyless/bface/config.h b/keyboards/winkeyless/bface/config.h
index 27ee761e9..83fcfa027 100644
--- a/keyboards/winkeyless/bface/config.h
+++ b/keyboards/winkeyless/bface/config.h
@@ -35,6 +35,10 @@ 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_ANIMATIONS
diff --git a/keyboards/winkeyless/bmini/bmini.c b/keyboards/winkeyless/bmini/bmini.c
index 6529d4403..f44fd36a8 100644
--- a/keyboards/winkeyless/bmini/bmini.c
+++ b/keyboards/winkeyless/bmini/bmini.c
@@ -16,23 +16,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "bmini.h"
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(D0);
-    setPinOutput(D1);
-    setPinOutput(D6);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(D0, led_state.num_lock);
-        writePin(D1, led_state.caps_lock);
-        writePin(D6, led_state.scroll_lock);
-    }
-    return true;
-}
diff --git a/keyboards/winkeyless/bmini/config.h b/keyboards/winkeyless/bmini/config.h
index 6e91241af..1f7759faf 100644
--- a/keyboards/winkeyless/bmini/config.h
+++ b/keyboards/winkeyless/bmini/config.h
@@ -34,6 +34,10 @@ 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_ANIMATIONS
 #define BACKLIGHT_PIN D4
diff --git a/keyboards/winkeyless/bminiex/bminiex.c b/keyboards/winkeyless/bminiex/bminiex.c
index 676f88ebf..db127e030 100644
--- a/keyboards/winkeyless/bminiex/bminiex.c
+++ b/keyboards/winkeyless/bminiex/bminiex.c
@@ -16,23 +16,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "bminiex.h"
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(D0);
-    setPinOutput(D1);
-    setPinOutput(D6);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(D0, led_state.num_lock);
-        writePin(D1, led_state.caps_lock);
-        writePin(D6, led_state.scroll_lock);
-    }
-    return true;
-}
diff --git a/keyboards/winkeyless/bminiex/config.h b/keyboards/winkeyless/bminiex/config.h
index 7c9c11c11..412d10a2a 100644
--- a/keyboards/winkeyless/bminiex/config.h
+++ b/keyboards/winkeyless/bminiex/config.h
@@ -34,6 +34,10 @@ 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_ANIMATIONS
 #define BACKLIGHT_PIN D4
diff --git a/keyboards/xbows/knight/config.h b/keyboards/xbows/knight/config.h
index a6d0d8066..fbe150439 100644
--- a/keyboards/xbows/knight/config.h
+++ b/keyboards/xbows/knight/config.h
@@ -20,6 +20,10 @@
 /* define if matrix has ghost */
 //#define MATRIX_HAS_GHOST
+#define LED_NUM_LOCK_PIN D1
+#define LED_CAPS_LOCK_PIN C7
+#define LED_PIN_ON_STATE 0
 /* number of backlight levels */
 // #define BACKLIGHT_LEVELS 3
 #define BACKLIGHT_PIN B7
diff --git a/keyboards/xbows/knight/knight.c b/keyboards/xbows/knight/knight.c
index dcc5035d5..cb79d9d58 100644
--- a/keyboards/xbows/knight/knight.c
+++ b/keyboards/xbows/knight/knight.c
@@ -1,23 +1 @@
 #include "knight.h"
-void matrix_init_kb(void) {
-    // put your keyboard start-up code here
-    // runs once when the firmware starts up
-    matrix_init_user();
-    led_init_ports();
-}
-void led_init_ports(void) {
-    setPinOutput(D1);
-    writePinHigh(D1);
-    setPinOutput(C7);
-    writePinHigh(C7);
-}
-bool led_update_kb(led_t led_state) {
-    if(led_update_user(led_state)) {
-        writePin(C7, !led_state.caps_lock);
-        writePin(D1, !led_state.num_lock);
-    }
-    return true;
-}
diff --git a/keyboards/xd68/config.h b/keyboards/xd68/config.h
index 5c450c68a..4fbb66b81 100644
--- a/keyboards/xd68/config.h
+++ b/keyboards/xd68/config.h
@@ -47,6 +47,9 @@ 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/xd68/xd68.c b/keyboards/xd68/xd68.c
index 2a5a52bda..45e8a2b95 100755
--- a/keyboards/xd68/xd68.c
+++ b/keyboards/xd68/xd68.c
@@ -1,22 +1 @@
 #include "xd68.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-        led_init_ports();
-}
-void led_init_ports(void) {
-    // * Set our LED pins as output
-    setPinOutput(B2);
-    writePinHigh(B2);
-}
-bool led_update_kb(led_t led_state) {
-    if(led_update_user(led_state)) {
-        writePin(B2, !led_state.caps_lock);
-    }
-    return true;
-}
diff --git a/keyboards/xd87/config.h b/keyboards/xd87/config.h
index 7ed104c23..aa07e3225 100644
--- a/keyboards/xd87/config.h
+++ b/keyboards/xd87/config.h
@@ -49,6 +49,9 @@ 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_BREATHING
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/xd87/xd87.c b/keyboards/xd87/xd87.c
index a41b4f2db..1d21357e6 100644
--- a/keyboards/xd87/xd87.c
+++ b/keyboards/xd87/xd87.c
@@ -14,38 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "xd87.h"
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-  led_init_ports();
-  matrix_init_user();
-}
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-  matrix_scan_user();
-}
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-  
-  return process_record_user(keycode, record);
-}
-bool led_update_kb(led_t led_state) {
-    bool res = led_update_user(led_state);
-    if (res) {
-        writePin(E2, !led_state.caps_lock);
-    }
-    return res;
-}
-void led_init_ports(void) {
-  setPinOutput(E2);
-}
diff --git a/keyboards/ymd75/config.h b/keyboards/ymd75/config.h
index 79dcdc6c4..a828c4d64 100644
--- a/keyboards/ymd75/config.h
+++ b/keyboards/ymd75/config.h
@@ -29,6 +29,8 @@ 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_ANIMATIONS
diff --git a/keyboards/ymd75/rev1/rev1.c b/keyboards/ymd75/rev1/rev1.c
index 0870a6cc0..c1ad021b1 100644
--- a/keyboards/ymd75/rev1/rev1.c
+++ b/keyboards/ymd75/rev1/rev1.c
@@ -16,19 +16,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "ymd75.h"
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(D1);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(D1, led_state.caps_lock);
-    }
-    return true;
-}
diff --git a/keyboards/ymd75/rev2/rev2.c b/keyboards/ymd75/rev2/rev2.c
index 0870a6cc0..c1ad021b1 100644
--- a/keyboards/ymd75/rev2/rev2.c
+++ b/keyboards/ymd75/rev2/rev2.c
@@ -16,19 +16,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "ymd75.h"
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(D1);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(D1, led_state.caps_lock);
-    }
-    return true;
-}
diff --git a/keyboards/ymd75/rev3/rev3.c b/keyboards/ymd75/rev3/rev3.c
index 96e1a4754..c1ad021b1 100644
--- a/keyboards/ymd75/rev3/rev3.c
+++ b/keyboards/ymd75/rev3/rev3.c
@@ -16,17 +16,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "ymd75.h"
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-void led_init_ports(void) { setPinOutput(D1); }
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(D1, led_state.caps_lock);
-    }
-    return true;
-}
diff --git a/keyboards/ymd96/config.h b/keyboards/ymd96/config.h
index 6f50c7324..55c5beaf3 100644
--- a/keyboards/ymd96/config.h
+++ b/keyboards/ymd96/config.h
@@ -35,6 +35,10 @@ 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/ymd96/ymd96.c b/keyboards/ymd96/ymd96.c
index 5841decda..0c212f4ab 100644
--- a/keyboards/ymd96/ymd96.c
+++ b/keyboards/ymd96/ymd96.c
@@ -17,21 +17,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "ymd96.h"
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(D0);
-    setPinOutput(D1);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(D0, led_state.num_lock);
-        writePin(D1, led_state.caps_lock);
-    }
-    return true;
-}
diff --git a/keyboards/ymdk/bface/bface.c b/keyboards/ymdk/bface/bface.c
index b35b33376..fabc10498 100644
--- a/keyboards/ymdk/bface/bface.c
+++ b/keyboards/ymdk/bface/bface.c
@@ -15,19 +15,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "quantum.h"
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(D1);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(D1, led_state.caps_lock);
-    }
-    return true;
-}
diff --git a/keyboards/ymdk/bface/config.h b/keyboards/ymdk/bface/config.h
index 3d9605b75..6be1c8662 100644
--- a/keyboards/ymdk/bface/config.h
+++ b/keyboards/ymdk/bface/config.h
@@ -34,6 +34,8 @@ 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_np21/config.h b/keyboards/ymdk_np21/config.h
index 1ea6fb0ce..83423792b 100644
--- a/keyboards/ymdk_np21/config.h
+++ b/keyboards/ymdk_np21/config.h
@@ -46,6 +46,8 @@ 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/ymdk_np21.c b/keyboards/ymdk_np21/ymdk_np21.c
index 63812c936..3ca0e8baa 100644
--- a/keyboards/ymdk_np21/ymdk_np21.c
+++ b/keyboards/ymdk_np21/ymdk_np21.c
@@ -17,19 +17,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "ymdk_np21.h"
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-void led_init_ports(void) {
-    setPinOutput(D0);
-}
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(D0, led_state.num_lock);
-    }
-    return true;
-}