From 87b11345a55d076966846d87b60d0f315b8bb984 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Thu, 6 Jul 2023 18:48:02 +1000
Subject: [PATCH] Get rid of `USB_LED_CAPS_LOCK` (#21436)

---
 .../1up60rgb/keymaps/default/keymap.c         |  5 +--
 .../1up60rgb/keymaps/iso/keymap.c             |  5 +--
 .../1up60rgb/keymaps/raffle/keymap.c          |  5 +--
 .../1up60rgb/keymaps/tsangan/keymap.c         |  5 +--
 .../mf68/keymaps/delivrance/keymap.c          |  7 +++--
 .../mf68/keymaps/emdarcher/keymap.c           |  7 ++---
 keyboards/40percentclub/ut47/led.c            | 31 ++++++++++---------
 .../siemens_tastatur/keymaps/default/keymap.c |  5 +--
 keyboards/dz60/keymaps/muzfuz/keymap.c        |  5 +--
 .../dztech/dz60rgb_ansi/keymaps/kuru/keymap.c |  4 +--
 .../dz60rgb_ansi/keymaps/muralisc/keymap.c    |  4 +--
 .../ergodox_ez/keymaps/dvorak_42_key/keymap.c |  5 +--
 .../ergodox_ez/keymaps/smurmann/keymap.c      |  5 +--
 .../frenchdev/keymaps/default/keymap.c        |  6 ++--
 .../owlet60/keymaps/oled_testing/keymap.c     | 18 -----------
 .../promethium/keymaps/default/keymap.c       |  5 +--
 .../promethium/keymaps/priyadi/keymap.c       |  5 +--
 .../kbd67/rev2/keymaps/tucznak/keymap.c       | 17 ++--------
 .../kbdfans/kbd6x/keymaps/konstantin/keymap.c |  6 ++--
 .../kbdfans/kbd75/keymaps/tucznak/keymap.c    |  5 +--
 .../bfo9000/keymaps/abstractkb/keymap.c       |  5 +--
 keyboards/kmini/keymaps/default/keymap.c      |  5 +--
 .../bm40hsrgb/keymaps/signynt/keymap.c        |  2 +-
 .../jj50/keymaps/abstractkb/keymap.c          |  5 +--
 .../keymaps/abstractkb_gergomatch/keymap.c    |  5 +--
 .../staggered/keymaps/tominabox1/keymap.c     |  5 +--
 .../the50/keymaps/default/keymap.c            |  5 +--
 .../the50/keymaps/mikethetiger/keymap.c       |  5 +--
 keyboards/noxary/268/keymaps/ansi/keymap.c    |  5 +--
 keyboards/noxary/268/keymaps/default/keymap.c |  5 +--
 keyboards/noxary/268/keymaps/iso/keymap.c     |  5 +--
 .../noxary/268/keymaps/sixtyeight/keymap.c    |  5 +--
 keyboards/owlab/spring/spring.c               |  2 +-
 .../percent/canoe/keymaps/boy_314/keymap.c    |  5 +--
 keyboards/planck/keymaps/altgr/common/init.h  | 11 ++++---
 keyboards/planck/keymaps/hiea/common/init.h   | 11 ++++---
 keyboards/planck/keymaps/hieax/common/init.h  | 11 ++++---
 keyboards/planck/keymaps/rootiest/keymap.c    |  2 +-
 .../planck/keymaps/sdothum/common/init.h      | 11 ++++---
 .../playkbtw/ca66/keymaps/olivia/keymap.c     | 15 ++-------
 .../playkbtw/pk60/keymaps/default/keymap.c    |  5 +--
 .../prime_e/keymaps/jetpacktuxedo/keymap.c    |  5 +--
 .../prime_e/keymaps/madhatter/keymap.c        |  5 +--
 keyboards/shoc/keymaps/bongo/keymap.c         |  2 +-
 .../keymaps/jockyxu1122_iso/keymap.c          |  5 +--
 keyboards/uk78/keymaps/default/keymap.c       |  5 +--
 keyboards/uk78/keymaps/rask/keymap.c          |  5 +--
 .../keymaps/followingghosts/keymap.c          |  5 +--
 keyboards/v60_type_r/keymaps/vimouse/keymap.c |  5 +--
 .../v60_type_r/keymaps/xtonhasvim/keymap.c    |  5 +--
 .../work_board/keymaps/drashna/keymap.c       |  4 +--
 keyboards/xbows/woody/woody.c                 |  2 +-
 .../xiudi/xd75/keymaps/bulbizarre/keymap.c    | 13 ++------
 .../mrsendyyk/keymap.c                        |  5 +--
 .../ergodox/colemak_code_friendly/keymap.c    |  8 ++---
 layouts/community/ergodox/drashna/keymap.c    |  8 ++---
 layouts/community/ergodox/jjerrell/keymap.c   |  4 +--
 layouts/community/ergodox/ordinary/keymap.c   |  2 +-
 .../community/ergodox/ordinary_osx/keymap.c   |  2 +-
 layouts/community/ergodox/osx_neo2/keymap.c   |  7 +----
 .../community/ergodox/software_neo2/keymap.c  |  2 +-
 .../community/ergodox/swedish-lindhe/keymap.c |  7 +----
 .../ortho_4x12/brandonschlack/keymap.c        |  5 +--
 layouts/community/ortho_4x12/drashna/keymap.c |  4 +--
 platforms/avr/sleep_led.c                     |  9 ++++--
 platforms/chibios/sleep_led.c                 | 11 ++++---
 quantum/led.c                                 |  6 ++--
 quantum/led.h                                 |  3 --
 users/curry/rgb_lighting_user.c               |  6 ++--
 users/turbomech/backupturbomech.c             |  5 +--
 70 files changed, 214 insertions(+), 226 deletions(-)

diff --git a/keyboards/1upkeyboards/1up60rgb/keymaps/default/keymap.c b/keyboards/1upkeyboards/1up60rgb/keymaps/default/keymap.c
index 15b7c9faa71b66ebb7d06da2a5bbe8488dfed1b8..5792f51ca82ebf63e89a1d04c976abf8fb894348 100644
--- a/keyboards/1upkeyboards/1up60rgb/keymaps/default/keymap.c
+++ b/keyboards/1upkeyboards/1up60rgb/keymaps/default/keymap.c
@@ -18,12 +18,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 
-void led_set_user(uint8_t usb_led) {
-	if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+	if (led_state.caps_lock) {
 		setPinOutput(B2);
 		writePinLow(B2);
 	} else {
 		setPinInput(B2);
 		writePinLow(B2);
 	}
+	return false;
 }
diff --git a/keyboards/1upkeyboards/1up60rgb/keymaps/iso/keymap.c b/keyboards/1upkeyboards/1up60rgb/keymaps/iso/keymap.c
index fd6087a2388266b51343e4aca37f3807f97f45f9..20783c22cba6d7bb239a03f6cd617e0a213da3ff 100644
--- a/keyboards/1upkeyboards/1up60rgb/keymaps/iso/keymap.c
+++ b/keyboards/1upkeyboards/1up60rgb/keymaps/iso/keymap.c
@@ -18,12 +18,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 
-void led_set_user(uint8_t usb_led) {
-	if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+	if (led_state.caps_lock) {
 		setPinOutput(B2);
 		writePinLow(B2);
 	} else {
 		setPinInput(B2);
 		writePinLow(B2);
 	}
+	return false;
 }
diff --git a/keyboards/1upkeyboards/1up60rgb/keymaps/raffle/keymap.c b/keyboards/1upkeyboards/1up60rgb/keymaps/raffle/keymap.c
index 78d00dd06d8a0ca0a4aa709895a34d3d6de5ba2a..453bf8c9617d20544fd12589ed27f470380070bc 100644
--- a/keyboards/1upkeyboards/1up60rgb/keymaps/raffle/keymap.c
+++ b/keyboards/1upkeyboards/1up60rgb/keymaps/raffle/keymap.c
@@ -72,10 +72,11 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 }
 
 // support for standard mod state keys (caps lock, scroll lock, etc.)
-void led_set_user(uint8_t usb_led) {
-  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+  if (led_state.caps_lock) {
     DDRB |= (1 << 2); PORTB &= ~(1 << 2);
   } else {
     DDRB &= ~(1 << 2); PORTB &= ~(1 << 2);
   }
+  return false;
 }
diff --git a/keyboards/1upkeyboards/1up60rgb/keymaps/tsangan/keymap.c b/keyboards/1upkeyboards/1up60rgb/keymaps/tsangan/keymap.c
index a45947de54b058e65789d25dedfe62ea5711aafe..5cc922788590d478adeb7a1902d56a8593e8f04b 100644
--- a/keyboards/1upkeyboards/1up60rgb/keymaps/tsangan/keymap.c
+++ b/keyboards/1upkeyboards/1up60rgb/keymaps/tsangan/keymap.c
@@ -18,12 +18,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 
-void led_set_user(uint8_t usb_led) {
-	if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+	if (led_state.caps_lock) {
 		setPinOutput(B2);
 		writePinLow(B2);
 	} else {
 		setPinInput(B2);
 		writePinLow(B2);
 	}
+	return false;
 }
diff --git a/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c b/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c
index c3e359e24ea5631e7000f8ad3f168efd72bfdcc2..f7899ad886f4d72d439237e26eb9d02ffa600e0e 100644
--- a/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c
+++ b/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c
@@ -157,11 +157,11 @@ void dynamic_macro_record_end_user(int8_t direction) {
 // Custom Caps Lock backlight behaviour
 // ------------------------------------
 
-void led_set_user(uint8_t usb_led) {
+bool led_update_user(led_t led_state) {
     // This exists because I don't like the backlight to turn OFF when the Caps Lock is ON.
     // That is, this will turn the backlight ON (at half the brightness) when the Caps Lock is ON as well.
     static bool prev_is_caps_on;
-    bool is_caps_on = IS_LED_ON(usb_led, USB_LED_CAPS_LOCK);
+    bool is_caps_on = led_state.caps_lock;
 
     if (prev_is_caps_on != is_caps_on) {
         prev_is_caps_on = is_caps_on;
@@ -178,7 +178,7 @@ void led_set_user(uint8_t usb_led) {
     }
 
     // Turn on the Pro Micro's on-board LEDs for Caps Lock
-    if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
+    if (led_state.caps_lock) {
         // Set to low
         setPinOutput(B0);
         writePinLow(B0);
@@ -189,6 +189,7 @@ void led_set_user(uint8_t usb_led) {
         setPinInput(B0);
         setPinInput(D5);
     }
+    return false;
 }
 
 // Backlight idle timeout feature
diff --git a/keyboards/40percentclub/mf68/keymaps/emdarcher/keymap.c b/keyboards/40percentclub/mf68/keymaps/emdarcher/keymap.c
index ea659979ea865fef156cae9aac556707d5e8343b..3932a1ee9b9b0df74189f5dfcdb8ef0fdfc39bd9 100644
--- a/keyboards/40percentclub/mf68/keymaps/emdarcher/keymap.c
+++ b/keyboards/40percentclub/mf68/keymaps/emdarcher/keymap.c
@@ -35,11 +35,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   )
 };
 
-
-
-void led_set_user(uint8_t usb_led){
+bool led_update_user(led_t led_state){
     //turn on the Pro Micro's on board LEDs for CAPS LOCK
-    if(IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)){
+    if(led_state.caps_lock){
         //set led pins to low
         setPinOutput(B0);
         writePinLow(B0);
@@ -50,4 +48,5 @@ void led_set_user(uint8_t usb_led){
         setPinInput(B0);
         setPinInput(D5);
     }
+    return false;
 }
diff --git a/keyboards/40percentclub/ut47/led.c b/keyboards/40percentclub/ut47/led.c
index f5d8ffc12ee9465517d4003923aa6c389de65c9f..867a6e2e2a3706e611599f5d953d0fa71bc6d532 100644
--- a/keyboards/40percentclub/ut47/led.c
+++ b/keyboards/40percentclub/ut47/led.c
@@ -19,20 +19,23 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <stdint.h>
 #include "led.h"
 
-
-void led_set(uint8_t usb_led)
+bool led_update_kb(led_t led_state)
 {
-    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
-        // output low
-        DDRB |= (1<<0);
-        PORTB &= ~(1<<0);
-        DDRD |= (1<<5);
-        PORTD &= ~(1<<5);
-    } else {
-        // Hi-Z
-        DDRB &= ~(1<<0);
-        PORTB &= ~(1<<0);
-        DDRD &= ~(1<<5);
-        PORTD &= ~(1<<5);
+    bool res = led_update_user(led_state);
+    if (res) {
+        if (led_state.caps_lock) {
+            // output low
+            DDRB |= (1<<0);
+            PORTB &= ~(1<<0);
+            DDRD |= (1<<5);
+            PORTD &= ~(1<<5);
+        } else {
+            // Hi-Z
+            DDRB &= ~(1<<0);
+            PORTB &= ~(1<<0);
+            DDRD &= ~(1<<5);
+            PORTD &= ~(1<<5);
+        }
     }
+    return false;
 }
diff --git a/keyboards/converter/siemens_tastatur/keymaps/default/keymap.c b/keyboards/converter/siemens_tastatur/keymaps/default/keymap.c
index 0ce8a64ab7ae563fdab5b4a933c0cd53e9e19ebb..0f3911a2d362b5072c438c210d4f407288c105ca 100644
--- a/keyboards/converter/siemens_tastatur/keymaps/default/keymap.c
+++ b/keyboards/converter/siemens_tastatur/keymaps/default/keymap.c
@@ -51,10 +51,11 @@ void matrix_init_user(void) {
   writePinLow(B0);
 }
 
-void led_set_user(uint8_t usb_led) {
-    if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+    if (led_state.caps_lock) {
         writePinHigh(B0);
     } else {
         writePinLow(B0);
     }
+    return false;
 }
diff --git a/keyboards/dz60/keymaps/muzfuz/keymap.c b/keyboards/dz60/keymaps/muzfuz/keymap.c
index fcd4c317d1381f3a99b1e539fa51315a9b8f55c7..1a71b9bb868e7c482f308476a67f25322664ec3d 100644
--- a/keyboards/dz60/keymaps/muzfuz/keymap.c
+++ b/keyboards/dz60/keymaps/muzfuz/keymap.c
@@ -25,12 +25,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
 };
 
-void led_set_user(uint8_t usb_led) {
-	if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+	if (led_state.caps_lock) {
 		DDRB |= (1 << 2); PORTB &= ~(1 << 2);
 	} else {
 		DDRB &= ~(1 << 2); PORTB &= ~(1 << 2);
 	}
+	return false;
 }
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record)
diff --git a/keyboards/dztech/dz60rgb_ansi/keymaps/kuru/keymap.c b/keyboards/dztech/dz60rgb_ansi/keymaps/kuru/keymap.c
index 7f3b24de74ef9b02b1f44da727de112684badd2b..e5f5083ee5fe8d141ea51288859a6b21f4add44c 100644
--- a/keyboards/dztech/dz60rgb_ansi/keymaps/kuru/keymap.c
+++ b/keyboards/dztech/dz60rgb_ansi/keymaps/kuru/keymap.c
@@ -85,7 +85,7 @@ void highlight_layer3(void){
 }
 
 bool rgb_matrix_indicators_user(void) {
-	  uint8_t this_led = host_keyboard_leds();
+	  led_t led_state = host_keyboard_led_state();
       if (!g_suspend_state) {
         switch (get_highest_layer(layer_state)) {
           case 3:
@@ -94,7 +94,7 @@ bool rgb_matrix_indicators_user(void) {
             break;
         }
       }
-	  if ( this_led & (1<<USB_LED_CAPS_LOCK)) {
+	  if (led_state.caps_lock) {
 	        rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF);
 	  }
     return false;
diff --git a/keyboards/dztech/dz60rgb_ansi/keymaps/muralisc/keymap.c b/keyboards/dztech/dz60rgb_ansi/keymaps/muralisc/keymap.c
index af2d9fa3dcfada9abea8d891f5b98e6a5318c10d..ff829f53fa0cf112e6ce2100fcc5bf2b82b8b5d2 100644
--- a/keyboards/dztech/dz60rgb_ansi/keymaps/muralisc/keymap.c
+++ b/keyboards/dztech/dz60rgb_ansi/keymaps/muralisc/keymap.c
@@ -146,7 +146,7 @@ void highlight_layer3(void) {
 }
 
 bool rgb_matrix_indicators_user(void) {
-	  uint8_t this_led = host_keyboard_leds();
+	  led_t led_state = host_keyboard_led_state();
       if (!g_suspend_state) {
         switch (get_highest_layer(layer_state)) {
           case 1:
@@ -161,7 +161,7 @@ bool rgb_matrix_indicators_user(void) {
             break;
         }
       }
-	  if ( this_led & (1<<USB_LED_CAPS_LOCK)) {
+	  if (led_state.caps_lock) {
 	        rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF);
 	  }
     return false;
diff --git a/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c b/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c
index 34284e146d2397e36fe0da2d15c2bf5d338cd33a..f8fce23ce5a0f8f63cd0cccb24bd144e4f6a57a2 100644
--- a/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c
@@ -296,12 +296,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
 
-void led_set_user(uint8_t usb_led) {
-    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+    if (led_state.caps_lock) {
         ergodox_right_led_1_on();
     } else {
         ergodox_right_led_1_off();
     }
+    return false;
 }
 
 
diff --git a/keyboards/ergodox_ez/keymaps/smurmann/keymap.c b/keyboards/ergodox_ez/keymaps/smurmann/keymap.c
index 0d60e46bfc243e6996a6afdf810444528e98a766..65a7a08ec71dd07f1a0f21773c73caa49f9bb1c6 100644
--- a/keyboards/ergodox_ez/keymaps/smurmann/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/smurmann/keymap.c
@@ -194,11 +194,12 @@ void matrix_scan_user(void) {
   }
 };
 
-void led_set_user(uint8_t usb_led){
- if (usb_led & (1 << USB_LED_CAPS_LOCK))
+bool led_update_user(led_t led_state){
+ if (led_state.caps_lock)
    {
       capsOn = true;
    }else {
       capsOn = false;
    }
+   return false;
 }
diff --git a/keyboards/handwired/frenchdev/keymaps/default/keymap.c b/keyboards/handwired/frenchdev/keymaps/default/keymap.c
index e5a5dcc6c163ed1d42e7efd82a89d8736b5e6e1c..60e355f290e75ab55f3c70d5cc188c04ae34b178 100644
--- a/keyboards/handwired/frenchdev/keymaps/default/keymap.c
+++ b/keyboards/handwired/frenchdev/keymaps/default/keymap.c
@@ -351,11 +351,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   return true;
 }
 
-void led_set_user(uint8_t usb_led) {
-  if (usb_led & (1<<USB_LED_CAPS_LOCK)){
+bool led_update_user(led_t led_state) {
+  if (led_state.caps_lock){
     frenchdev_led_3_on();
   } else {
     frenchdev_led_3_off();
   }
-  return ;
+  return false;
 }
diff --git a/keyboards/handwired/owlet60/keymaps/oled_testing/keymap.c b/keyboards/handwired/owlet60/keymaps/oled_testing/keymap.c
index f617fb5e682ff6dd1777fd372d2ae371b5bd71f9..f54ceb44910a9fb7269e0fdd470f0e5d54dcdc41 100644
--- a/keyboards/handwired/owlet60/keymaps/oled_testing/keymap.c
+++ b/keyboards/handwired/owlet60/keymaps/oled_testing/keymap.c
@@ -67,24 +67,6 @@ oled_rotation_t oled_init_user(oled_rotation_t rotation) {
   return OLED_ROTATION_180;
 }
 bool oled_task_user(void) {
-  // Host Keyboard Layer Status
-  /*oled_write_P(PSTR("Lyr: "), false);
-  switch (get_highest_layer(layer_state)) {
-    case 0:
-      oled_write_P(PSTR("Alpha\n"), false);
-      break;
-    case 1:
-      oled_write_P(PSTR("FN\n"), false);
-      break;
-    default:
-      // Or use the write_ln shortcut over adding '\n' to the end of your string
-      oled_write_ln_P(PSTR("Undefined"), false);
-  }
-
-  uint8_t led_usb_state = host_keyboard_leds();
-  oled_write_P(led_usb_state & (1<<USB_LED_CAPS_LOCK) ? PSTR("CAPLCK ") : PSTR("       "), false);
-  */
-
   static const char PROGMEM qmk_logo[] = {
     0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
     0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
diff --git a/keyboards/handwired/promethium/keymaps/default/keymap.c b/keyboards/handwired/promethium/keymaps/default/keymap.c
index 42819245c7af2ed852738dc550aab8dba40de8fb..ff73e51d5eb2914e4a57ff62004778d8c6c67c4c 100644
--- a/keyboards/handwired/promethium/keymaps/default/keymap.c
+++ b/keyboards/handwired/promethium/keymaps/default/keymap.c
@@ -1303,8 +1303,8 @@ void turn_off_capslock(void) {
     rgbsps_send();
   }
 
-  void led_set_user(uint8_t usb_led) {
-    bool new_capslock = usb_led & (1<<USB_LED_CAPS_LOCK);
+  bool led_update_user(led_t led_state) {
+    bool new_capslock = led_state.caps_lock;
     if (new_capslock ^ capslock) { // capslock state is different
       if ((capslock = new_capslock)) {
         rgbsps_set(LED_IND_CAPSLOCK, THEME_COLOR_CAPSLOCK);
@@ -1313,6 +1313,7 @@ void turn_off_capslock(void) {
       }
       rgbsps_send();
     }
+    return false;
   }
 #endif
 
diff --git a/keyboards/handwired/promethium/keymaps/priyadi/keymap.c b/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
index 203a0eda22a1e2a331f550f54920aeabe8fb5d83..37cff59cb1fb41c91f5a6a2a5ff030d2db6d10c5 100644
--- a/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
+++ b/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
@@ -1306,8 +1306,8 @@ void turn_off_capslock(void) {
     rgbsps_send();
   }
 
-  void led_set_user(uint8_t usb_led) {
-    bool new_capslock = usb_led & (1<<USB_LED_CAPS_LOCK);
+  bool led_update_user(led_t led_state) {
+    bool new_capslock = led_state.caps_lock;
     if (new_capslock ^ capslock) { // capslock state is different
       if ((capslock = new_capslock)) {
         rgbsps_set(LED_IND_CAPSLOCK, THEME_COLOR_CAPSLOCK);
@@ -1316,6 +1316,7 @@ void turn_off_capslock(void) {
       }
       rgbsps_send();
     }
+    return false;
   }
 #endif
 
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/keymap.c
index 682f15c4455e4f27434dc0cf2d8f2d325b58930c..88fe681f1426d9fc010087869aba2ed7b5a720e7 100644
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/keymap.c
+++ b/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/keymap.c
@@ -69,22 +69,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______,       _______,        _______,         _______,          _______, _______, XXXXXXX, _______, _______, _______),
     };
 
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    return true;
-}
-
-void matrix_init_user(void) {
-    
-}
-
-void matrix_scan_user(void) {
-    
-}
-
-void led_set_user(uint8_t usb_led) {
-    if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+    if (led_state.caps_lock) {
       rgblight_enable_noeeprom();
     } else {
       rgblight_disable_noeeprom();
     }
+    return false;
 }
diff --git a/keyboards/kbdfans/kbd6x/keymaps/konstantin/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/konstantin/keymap.c
index 8f2305ed4c7e7e400f30d57ecb9ec5e71fe1fee7..a8a369a6110c0142de16464a0fe6a5c60a58887b 100644
--- a/keyboards/kbdfans/kbd6x/keymaps/konstantin/keymap.c
+++ b/keyboards/kbdfans/kbd6x/keymaps/konstantin/keymap.c
@@ -43,8 +43,8 @@ static void check_light_layer(layer_state_t state) {
     last_checked_layer = true;
 }
 
-static void check_light_led(uint8_t leds) {
-    if (IS_LED_ON(leds, USB_LED_CAPS_LOCK)) {
+static void check_light_led(led_t led_state) {
+    if (led_state.caps_lock) {
         caps_light();
     } else if (IS_LAYER_ON(L_FN)) {
         fn_light();
@@ -57,7 +57,7 @@ static void check_light_led(uint8_t leds) {
 static void inline check_light(void) {
     last_checked_layer
         ? check_light_layer(layer_state)
-        : check_light_led(host_keyboard_leds());
+        : check_light_led(host_keyboard_led_state());
 }
 
 void eeconfig_init_keymap(void) {
diff --git a/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c b/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c
index 88272e3c721614c04b56c778b6453e03328106a1..c7f05a4e94374aa67568010f34851a799ed3cd33 100644
--- a/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c
@@ -79,11 +79,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-void led_set_user(uint8_t usb_led) {
-    if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+    if (led_state.caps_lock) {
         setPinOutput(B2);
         writePinLow(B2);
     } else {
         setPinInput(B2);
     }
+    return false;
 }
diff --git a/keyboards/keebio/bfo9000/keymaps/abstractkb/keymap.c b/keyboards/keebio/bfo9000/keymaps/abstractkb/keymap.c
index 4af086df3a2efd61949295e4002e66cac5b4b538..637a7e044005eaa593766746d5e40dc7aad2f98e 100644
--- a/keyboards/keebio/bfo9000/keymaps/abstractkb/keymap.c
+++ b/keyboards/keebio/bfo9000/keymaps/abstractkb/keymap.c
@@ -56,12 +56,13 @@ layer_state_t layer_state_set_user(layer_state_t state) {
   return state;
 }
 
-void led_set_user(uint8_t usb_led) {
-  if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+  if (led_state.caps_lock) {
     rgblight_mode_noeeprom(RGBLIGHT_MODE_ALTERNATING);
   } else {
     layer_state_set_user(layer_state);
   }
+  return false;
 }
 
 void myrgb_toggle(void) {
diff --git a/keyboards/kmini/keymaps/default/keymap.c b/keyboards/kmini/keymaps/default/keymap.c
index c3a7b12a40cde6da0654ee2e386027a071a8892d..1f041daffc9b206aa6b0d40419fc63da89c59f14 100755
--- a/keyboards/kmini/keymaps/default/keymap.c
+++ b/keyboards/kmini/keymaps/default/keymap.c
@@ -39,10 +39,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 };
 
-void led_set_user(uint8_t usb_led) {
-    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+    if (led_state.caps_lock) {
         writePinLow(B1);
     } else {
         writePinHigh(B1);
     }
+    return false;
 }
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt/keymap.c
index 5a1d366f56ca4191519d5ac16a24aa992bf6d85a..eb20a1a25b95d744cfc4214f3b3a71690a3938ae 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt/keymap.c
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt/keymap.c
@@ -165,7 +165,7 @@ if(IS_LAYER_ON(NSSL)) {
 
 //capslock leds
 
-if (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) {
+if (host_keyboard_led_state().caps_lock) {
     rgb_matrix_set_color_all(50, 15.6, 0);
   }
 
diff --git a/keyboards/kprepublic/jj50/keymaps/abstractkb/keymap.c b/keyboards/kprepublic/jj50/keymaps/abstractkb/keymap.c
index 21f8fcbb0f1df9566e41bd542577cd1585e547ce..f02f27005be9752f822930fad29c279b62b052d2 100644
--- a/keyboards/kprepublic/jj50/keymaps/abstractkb/keymap.c
+++ b/keyboards/kprepublic/jj50/keymaps/abstractkb/keymap.c
@@ -64,12 +64,13 @@ layer_state_t layer_state_set_user(layer_state_t state) {
   return state;
 }
 
-void led_set_user(uint8_t usb_led) {
-  if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+  if (led_state.caps_lock) {
     rgblight_mode_noeeprom(RGBLIGHT_MODE_ALTERNATING);
   } else {
     layer_state_set_user(layer_state);
   }
+  return false;
 }
 
 void myrgb_toggle(void) {
diff --git a/keyboards/kprepublic/jj50/keymaps/abstractkb_gergomatch/keymap.c b/keyboards/kprepublic/jj50/keymaps/abstractkb_gergomatch/keymap.c
index 5292d99b5a91714d8275d09a308bde0446bf430a..888e43e7dd6677fce9550f3d1f47c7132843bad3 100644
--- a/keyboards/kprepublic/jj50/keymaps/abstractkb_gergomatch/keymap.c
+++ b/keyboards/kprepublic/jj50/keymaps/abstractkb_gergomatch/keymap.c
@@ -64,12 +64,13 @@ layer_state_t layer_state_set_user(layer_state_t state) {
   return state;
 }
 
-void led_set_user(uint8_t usb_led) {
-  if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+  if (led_state.caps_lock) {
     rgblight_mode_noeeprom(RGBLIGHT_MODE_ALTERNATING);
   } else {
     layer_state_set_user(layer_state);
   }
+  return false;
 }
 
 void myrgb_toggle(void) {
diff --git a/keyboards/lazydesigners/dimple/staggered/keymaps/tominabox1/keymap.c b/keyboards/lazydesigners/dimple/staggered/keymaps/tominabox1/keymap.c
index cdaade987f1763b1e08e42b826048ddc1b8f2b25..d1917e4aa7001191186e917f32dcca9b864ee102 100644
--- a/keyboards/lazydesigners/dimple/staggered/keymaps/tominabox1/keymap.c
+++ b/keyboards/lazydesigners/dimple/staggered/keymaps/tominabox1/keymap.c
@@ -100,10 +100,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 };
 
-void led_set_user(uint8_t usb_led) {
-if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+if (led_state.caps_lock) {
 	writePinLow(E6);
 	} else {
 	writePinHigh(E6);
 	}
+  return false;
 }
diff --git a/keyboards/lazydesigners/the50/keymaps/default/keymap.c b/keyboards/lazydesigners/the50/keymaps/default/keymap.c
index 5d8ea732f6be66cf5882a93000a76de04e303b97..61e6ee878c619cd9b727d1b7414a2296d3adb5fc 100644
--- a/keyboards/lazydesigners/the50/keymaps/default/keymap.c
+++ b/keyboards/lazydesigners/the50/keymaps/default/keymap.c
@@ -49,11 +49,12 @@ EE_CLR,  _______, _______,          _______,            _______,
 )
 };
 
-void led_set_user(uint8_t usb_led) {
+bool led_update_user(led_t led_state) {
   // Turn LED On/Off for Caps Lock
-  if (host_keyboard_leds() & (1 << USB_LED_CAPS_LOCK)) {
+  if (led_state.caps_lock) {
     the50_led_on();
   } else {
     the50_led_off();
   }
+  return false;
 }
diff --git a/keyboards/lazydesigners/the50/keymaps/mikethetiger/keymap.c b/keyboards/lazydesigners/the50/keymaps/mikethetiger/keymap.c
index 8986fd6c3d7f116e35a3be17f08a9a7b3c7e8c78..c384c3c5202ddd239e4779487c7c141bcdf7ca6d 100644
--- a/keyboards/lazydesigners/the50/keymaps/mikethetiger/keymap.c
+++ b/keyboards/lazydesigners/the50/keymaps/mikethetiger/keymap.c
@@ -69,11 +69,12 @@ EE_CLR,  _______, _______,          _______,            _______,
 )
 };
 
-void led_set_user(uint8_t usb_led) {
+bool led_update_user(led_t led_state) {
   // Turn LED On/Off for Caps Lock
-  if (host_keyboard_leds() & (1 << USB_LED_CAPS_LOCK)) {
+  if (led_state.caps_lock) {
     the50_led_on();
   } else {
     the50_led_off();
   }
+  return false;
 }
diff --git a/keyboards/noxary/268/keymaps/ansi/keymap.c b/keyboards/noxary/268/keymaps/ansi/keymap.c
index dac8e6c0ddb8cd99735c96169402529e33632732..860d17177c76509bc9c278f4dafd472ef8bd7ee9 100644
--- a/keyboards/noxary/268/keymaps/ansi/keymap.c
+++ b/keyboards/noxary/268/keymaps/ansi/keymap.c
@@ -52,12 +52,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 
-void led_set_user(uint8_t usb_led) {
-  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+  if (led_state.caps_lock) {
     setPinOutput(B6);
     writePinHigh(B6);
   } else {
     setPinInput(B6);
     writePinLow(B6);
   }
+  return false;
 }
diff --git a/keyboards/noxary/268/keymaps/default/keymap.c b/keyboards/noxary/268/keymaps/default/keymap.c
index 571396f21d12b3a16dd84862cdb777fbc828869e..9023c6f81fd337af71849c24692f33896c56c704 100644
--- a/keyboards/noxary/268/keymaps/default/keymap.c
+++ b/keyboards/noxary/268/keymaps/default/keymap.c
@@ -70,8 +70,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 
-void led_set_user(uint8_t usb_led) {
-    if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+    if (led_state.caps_lock) {
         setPinOutput(B6);
         writePinHigh(B6);
     }
@@ -79,4 +79,5 @@ void led_set_user(uint8_t usb_led) {
         setPinInput(B6);
         writePinLow(B6);
     }
+    return false;
 }
diff --git a/keyboards/noxary/268/keymaps/iso/keymap.c b/keyboards/noxary/268/keymaps/iso/keymap.c
index 410883dd54f9bec66c421c54487afbeb2d906d74..76462bf7fe808f9cf7a6d451a2eb9b42c5ce053d 100644
--- a/keyboards/noxary/268/keymaps/iso/keymap.c
+++ b/keyboards/noxary/268/keymaps/iso/keymap.c
@@ -52,12 +52,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 
-void led_set_user(uint8_t usb_led) {
-  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+  if (led_state.caps_lock) {
     setPinOutput(B6);
     writePinHigh(B6);
   } else {
     setPinInput(B6);
     writePinLow(B6);
   }
+  return false;
 }
diff --git a/keyboards/noxary/268/keymaps/sixtyeight/keymap.c b/keyboards/noxary/268/keymaps/sixtyeight/keymap.c
index 8e78994017c22a5e56fb663d4ed1cda472de60f4..3527cf7ccca9f310c97a660042bb9d0c0122ed43 100644
--- a/keyboards/noxary/268/keymaps/sixtyeight/keymap.c
+++ b/keyboards/noxary/268/keymaps/sixtyeight/keymap.c
@@ -70,11 +70,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 
-void led_set_user(uint8_t usb_led) {
-    if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+    if (led_state.caps_lock) {
         DDRB |= (1 << 6); PORTB |= (1 << 6);
     }
     else {
         DDRB &= ~(1 << 6); PORTB &= ~(1 << 6);
     }
+    return false;
 }
diff --git a/keyboards/owlab/spring/spring.c b/keyboards/owlab/spring/spring.c
index 8088fb03c24778459b4711e2d6fce89fd6d6b015..13280ff9b39c50b913ecc766d13b3977c289ae28 100644
--- a/keyboards/owlab/spring/spring.c
+++ b/keyboards/owlab/spring/spring.c
@@ -108,7 +108,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
 
 
         case KC_CAPS:
-            if(IS_LED_ON(host_keyboard_leds(), USB_LED_CAPS_LOCK)){ 
+            if(host_keyboard_led_state().caps_lock){ 
                 caps_mode_index = CAPS_MODE_LOWER;
             } else{
                 caps_mode_index = CAPS_MODE_UPPER;
diff --git a/keyboards/percent/canoe/keymaps/boy_314/keymap.c b/keyboards/percent/canoe/keymaps/boy_314/keymap.c
index e9c56ed1b10eedef31d00e52b1dc5be7fa214c9c..cccfd448a0c262b65ecbe16a90d02e36e79e55df 100644
--- a/keyboards/percent/canoe/keymaps/boy_314/keymap.c
+++ b/keyboards/percent/canoe/keymaps/boy_314/keymap.c
@@ -47,10 +47,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 
-void led_set_user(uint8_t usb_led) {
-    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+    if (led_state.caps_lock) {
         rgblight_sethsv(HSV_RED);
     } else {
         rgblight_sethsv(HSV_TURQUOISE);
     }
+    return false;
 }
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/altgr/common/init.h b/keyboards/planck/keymaps/altgr/common/init.h
index 6366a19f65ebcef7fd810b2e20fa7c3906c09f22..6d0b4392fb8687a6b4ccebaef983ae791438df24 100644
--- a/keyboards/planck/keymaps/altgr/common/init.h
+++ b/keyboards/planck/keymaps/altgr/common/init.h
@@ -13,21 +13,22 @@ void matrix_init_user(void)
 
 #ifdef AUDIO_ENABLE
 #ifdef BACKLIGHT_ENABLE
-void led_set_user(uint8_t usb_led)
+bool led_update_user(led_t led_state)
 {
-  static uint8_t old_usb_led = 0;
+  static led_t old_led_state = {0};
   _delay_ms(10);                            // gets rid of tick
   if (!is_playing_notes()) {
-    if ((usb_led & (1<<USB_LED_CAPS_LOCK)) && !(old_usb_led & (1<<USB_LED_CAPS_LOCK))) {
+    if (led_state.caps_lock && !old_led_state.caps_lock) {
       // if capslock LED is turning on
       PLAY_SONG(song_caps_on);
     }
-    else if (!(usb_led & (1<<USB_LED_CAPS_LOCK)) && (old_usb_led & (1<<USB_LED_CAPS_LOCK))) {
+    else if (!led_state.caps_lock && old_led_state.caps_lock) {
       // if capslock LED is turning off
       PLAY_SONG(song_caps_off);
     }
   }
-  old_usb_led = usb_led;
+  old_led_state = led_state;
+  return false;
 }
 #endif
 
diff --git a/keyboards/planck/keymaps/hiea/common/init.h b/keyboards/planck/keymaps/hiea/common/init.h
index 6366a19f65ebcef7fd810b2e20fa7c3906c09f22..6d0b4392fb8687a6b4ccebaef983ae791438df24 100644
--- a/keyboards/planck/keymaps/hiea/common/init.h
+++ b/keyboards/planck/keymaps/hiea/common/init.h
@@ -13,21 +13,22 @@ void matrix_init_user(void)
 
 #ifdef AUDIO_ENABLE
 #ifdef BACKLIGHT_ENABLE
-void led_set_user(uint8_t usb_led)
+bool led_update_user(led_t led_state)
 {
-  static uint8_t old_usb_led = 0;
+  static led_t old_led_state = {0};
   _delay_ms(10);                            // gets rid of tick
   if (!is_playing_notes()) {
-    if ((usb_led & (1<<USB_LED_CAPS_LOCK)) && !(old_usb_led & (1<<USB_LED_CAPS_LOCK))) {
+    if (led_state.caps_lock && !old_led_state.caps_lock) {
       // if capslock LED is turning on
       PLAY_SONG(song_caps_on);
     }
-    else if (!(usb_led & (1<<USB_LED_CAPS_LOCK)) && (old_usb_led & (1<<USB_LED_CAPS_LOCK))) {
+    else if (!led_state.caps_lock && old_led_state.caps_lock) {
       // if capslock LED is turning off
       PLAY_SONG(song_caps_off);
     }
   }
-  old_usb_led = usb_led;
+  old_led_state = led_state;
+  return false;
 }
 #endif
 
diff --git a/keyboards/planck/keymaps/hieax/common/init.h b/keyboards/planck/keymaps/hieax/common/init.h
index 6366a19f65ebcef7fd810b2e20fa7c3906c09f22..6d0b4392fb8687a6b4ccebaef983ae791438df24 100644
--- a/keyboards/planck/keymaps/hieax/common/init.h
+++ b/keyboards/planck/keymaps/hieax/common/init.h
@@ -13,21 +13,22 @@ void matrix_init_user(void)
 
 #ifdef AUDIO_ENABLE
 #ifdef BACKLIGHT_ENABLE
-void led_set_user(uint8_t usb_led)
+bool led_update_user(led_t led_state)
 {
-  static uint8_t old_usb_led = 0;
+  static led_t old_led_state = {0};
   _delay_ms(10);                            // gets rid of tick
   if (!is_playing_notes()) {
-    if ((usb_led & (1<<USB_LED_CAPS_LOCK)) && !(old_usb_led & (1<<USB_LED_CAPS_LOCK))) {
+    if (led_state.caps_lock && !old_led_state.caps_lock) {
       // if capslock LED is turning on
       PLAY_SONG(song_caps_on);
     }
-    else if (!(usb_led & (1<<USB_LED_CAPS_LOCK)) && (old_usb_led & (1<<USB_LED_CAPS_LOCK))) {
+    else if (!led_state.caps_lock && old_led_state.caps_lock) {
       // if capslock LED is turning off
       PLAY_SONG(song_caps_off);
     }
   }
-  old_usb_led = usb_led;
+  old_led_state = led_state;
+  return false;
 }
 #endif
 
diff --git a/keyboards/planck/keymaps/rootiest/keymap.c b/keyboards/planck/keymaps/rootiest/keymap.c
index 7e3b8af36762121540cc302e6017adeb74fc056a..d6e8c7ef0ff04e831a7b16c0e22a687074b0b6d7 100644
--- a/keyboards/planck/keymaps/rootiest/keymap.c
+++ b/keyboards/planck/keymaps/rootiest/keymap.c
@@ -1527,7 +1527,7 @@ void scap_finished(tap_dance_state_t* state, void* user_data) {
             register_code(KC_LSFT);
             break;
         default:
-            if (host_keyboard_leds() & (1 << USB_LED_CAPS_LOCK)) {
+            if (host_keyboard_led_state().caps_lock) {
                 tap_code(KC_CAPS);
                 reset_tap_dance(state);
                 break;
diff --git a/keyboards/planck/keymaps/sdothum/common/init.h b/keyboards/planck/keymaps/sdothum/common/init.h
index 6366a19f65ebcef7fd810b2e20fa7c3906c09f22..6d0b4392fb8687a6b4ccebaef983ae791438df24 100644
--- a/keyboards/planck/keymaps/sdothum/common/init.h
+++ b/keyboards/planck/keymaps/sdothum/common/init.h
@@ -13,21 +13,22 @@ void matrix_init_user(void)
 
 #ifdef AUDIO_ENABLE
 #ifdef BACKLIGHT_ENABLE
-void led_set_user(uint8_t usb_led)
+bool led_update_user(led_t led_state)
 {
-  static uint8_t old_usb_led = 0;
+  static led_t old_led_state = {0};
   _delay_ms(10);                            // gets rid of tick
   if (!is_playing_notes()) {
-    if ((usb_led & (1<<USB_LED_CAPS_LOCK)) && !(old_usb_led & (1<<USB_LED_CAPS_LOCK))) {
+    if (led_state.caps_lock && !old_led_state.caps_lock) {
       // if capslock LED is turning on
       PLAY_SONG(song_caps_on);
     }
-    else if (!(usb_led & (1<<USB_LED_CAPS_LOCK)) && (old_usb_led & (1<<USB_LED_CAPS_LOCK))) {
+    else if (!led_state.caps_lock && old_led_state.caps_lock) {
       // if capslock LED is turning off
       PLAY_SONG(song_caps_off);
     }
   }
-  old_usb_led = usb_led;
+  old_led_state = led_state;
+  return false;
 }
 #endif
 
diff --git a/keyboards/playkbtw/ca66/keymaps/olivia/keymap.c b/keyboards/playkbtw/ca66/keymaps/olivia/keymap.c
index 9b441a889224efd0b48d02ed4b0e9b7a0b07a506..8ef6c0499db6dc86471ce99592f78a8a951a3e39 100644
--- a/keyboards/playkbtw/ca66/keymaps/olivia/keymap.c
+++ b/keyboards/playkbtw/ca66/keymaps/olivia/keymap.c
@@ -17,20 +17,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 };
 
-void matrix_init_user(void) {
-}
-
-void matrix_scan_user(void) {
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-	return true;
-}
-
-void led_set_user(uint8_t usb_led) {
-	if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+	if (led_state.caps_lock) {
 		DDRD |= (1 << 1); PORTD &= ~(1 << 1);
 	} else {
 		DDRD &= ~(1 << 1); PORTD &= ~(1 << 1);
 	}
+	return false;
 }
diff --git a/keyboards/playkbtw/pk60/keymaps/default/keymap.c b/keyboards/playkbtw/pk60/keymaps/default/keymap.c
index 65d3996a85e83a1a4286c2df84b7c6dced399f0e..cc0276673a392723ac8da42580e6ff751693ece3 100644
--- a/keyboards/playkbtw/pk60/keymaps/default/keymap.c
+++ b/keyboards/playkbtw/pk60/keymaps/default/keymap.c
@@ -20,12 +20,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 
-void led_set_user(uint8_t usb_led) {
-  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+  if (led_state.caps_lock) {
     setPinOutput(F4);
     writePinLow(F4);
   } else {
     setPinInput(F4);
     writePinLow(F4);
   }
+  return false;
 }
diff --git a/keyboards/primekb/prime_e/keymaps/jetpacktuxedo/keymap.c b/keyboards/primekb/prime_e/keymaps/jetpacktuxedo/keymap.c
index cdd1b56430dad92bf0672ec8e3b746b8257eb75e..a45a841285f0182448dacd1be47df30a67e0d307 100644
--- a/keyboards/primekb/prime_e/keymaps/jetpacktuxedo/keymap.c
+++ b/keyboards/primekb/prime_e/keymaps/jetpacktuxedo/keymap.c
@@ -100,13 +100,14 @@ layer_state_t layer_state_set_user(layer_state_t state) {
     return state;
 }
 
-void led_set_user(uint8_t usb_led) {
-    if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+    if (led_state.caps_lock) {
         CAPS = 1;
     }
     else {
         CAPS = 0;
     }
+    return false;
 }
 
 void togg_indicator(uint8_t *state, uint8_t pin) {
diff --git a/keyboards/primekb/prime_e/keymaps/madhatter/keymap.c b/keyboards/primekb/prime_e/keymaps/madhatter/keymap.c
index f3228ec0d59f8ebc919f90aa2aad64fe1d6b59b2..998046c6d7c6e880509ee927b7721392888c03e0 100644
--- a/keyboards/primekb/prime_e/keymaps/madhatter/keymap.c
+++ b/keyboards/primekb/prime_e/keymaps/madhatter/keymap.c
@@ -91,8 +91,9 @@ layer_state_t layer_state_set_user(layer_state_t state) {
     return state;
 }
 
-void led_set_user(uint8_t usb_led) {
-    CAPS = IS_LED_ON(usb_led, USB_LED_CAPS_LOCK);
+bool led_update_user(led_t led_state) {
+    CAPS = led_state.caps_lock;
+    return false;
 }
 
 void togg_indicator(uint8_t *state, uint8_t pin) {
diff --git a/keyboards/shoc/keymaps/bongo/keymap.c b/keyboards/shoc/keymaps/bongo/keymap.c
index 14779f1d7555f8dbe39933beab3f9fad50bc28e0..8f57181330dbd07f7fb542a1f05e8066d05514d4 100644
--- a/keyboards/shoc/keymaps/bongo/keymap.c
+++ b/keyboards/shoc/keymaps/bongo/keymap.c
@@ -163,7 +163,7 @@ bool oled_task_user(void) {
     oled_set_cursor(0,6);
     oled_write_P(PSTR("       WPM: "), false);
     oled_write(get_u8_str(get_current_wpm(), '0'), false);
-    if(host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)){
+    if(host_keyboard_led_state().caps_lock){
         oled_set_cursor(0,5);
         oled_write_P(PSTR("      CAPS  LOCK"), false);
     }
diff --git a/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_iso/keymap.c b/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_iso/keymap.c
index 1472f88212d6e9dfefcc3a06bf7f686d7966e1c5..5146c8f4f3333096212d72fd5506fbf26f17cc97 100644
--- a/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_iso/keymap.c
+++ b/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_iso/keymap.c
@@ -91,12 +91,13 @@ Capslock's led cannot be controlled separately on bananasplit and you can only t
   leds at once. If you only install led for capslock, it will look like capslock has toggable
   backlight.
 */
-void led_set_user(uint8_t usb_led) {
-  if (usb_led && (1 << USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+  if (led_state.caps_lock) {
     DDRB |= (1 << 7);
     PORTB |= (1 << 7);
   } else {
     DDRB &= ~(1 << 7);
     PORTB &= ~(1 << 7);
   }
+  return false;
 }
diff --git a/keyboards/uk78/keymaps/default/keymap.c b/keyboards/uk78/keymaps/default/keymap.c
index 2fa09f7d6da10972921c4804c0111ddae401491f..e4bdf905085e9b4dbc847dc6cc3d429b9e5412e5 100644
--- a/keyboards/uk78/keymaps/default/keymap.c
+++ b/keyboards/uk78/keymaps/default/keymap.c
@@ -75,12 +75,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 
-void led_set_user(uint8_t usb_led) {
-  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+  if (led_state.caps_lock) {
     setPinOutput(A3);
     writePinHigh(A3);
   } else {
     setPinInput(A3);
     writePinLow(A3);
   }
+  return false;
 }
diff --git a/keyboards/uk78/keymaps/rask/keymap.c b/keyboards/uk78/keymaps/rask/keymap.c
index eaf8c117a28ef97898e0566b09144cc09d5dbdd4..01220a775eae431fe568db531d52a9e2b84a121e 100644
--- a/keyboards/uk78/keymaps/rask/keymap.c
+++ b/keyboards/uk78/keymaps/rask/keymap.c
@@ -74,10 +74,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 
-void led_set_user(uint8_t usb_led) {
-  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+  if (led_state.caps_lock) {
     DDRA |= (1 << 3); PORTA |= (1 << 3);
   } else {
     DDRA &= ~(1 << 3); PORTA &= ~(1 << 3);
   }
+  return false;
 }
diff --git a/keyboards/v60_type_r/keymaps/followingghosts/keymap.c b/keyboards/v60_type_r/keymaps/followingghosts/keymap.c
index ab1fbd70d9fb290887fb16b34da6cbf380ab46a6..419c9ad5a72c6f7187a597ac407812a7f46a2d57 100644
--- a/keyboards/v60_type_r/keymaps/followingghosts/keymap.c
+++ b/keyboards/v60_type_r/keymaps/followingghosts/keymap.c
@@ -95,8 +95,8 @@ WASD are Up Left Right Down respectively
 
 };
 
-void led_set_user(uint8_t usb_led) {
-  if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+  if (led_state.caps_lock) {
       // output low
       DDRE  |=  (1<<PE6);
       PORTE &= ~(1<<PE6);
@@ -106,4 +106,5 @@ void led_set_user(uint8_t usb_led) {
       DDRE  &= ~(1<<PE6);
       PORTE &= ~(1<<PE6);
   }
+  return false;
 }
diff --git a/keyboards/v60_type_r/keymaps/vimouse/keymap.c b/keyboards/v60_type_r/keymaps/vimouse/keymap.c
index f426a94044ea08e3fe44c88bc10462af91e1c2f4..2eb06c05037745af2a3ae198a95faaf99e5a0e7a 100644
--- a/keyboards/v60_type_r/keymaps/vimouse/keymap.c
+++ b/keyboards/v60_type_r/keymaps/vimouse/keymap.c
@@ -97,8 +97,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _____,   _____,   _____,               _____,                                                      _____,   _____,  _____,  _____),
 };
 
-void led_set_user(uint8_t usb_led) {
-    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+    if (led_state.caps_lock) {
         // output low
         DDRE  |=  (1<<PE6);
         PORTE &= ~(1<<PE6);
@@ -108,4 +108,5 @@ void led_set_user(uint8_t usb_led) {
         DDRE  &= ~(1<<PE6);
         PORTE &= ~(1<<PE6);
     }
+    return false;
 }
diff --git a/keyboards/v60_type_r/keymaps/xtonhasvim/keymap.c b/keyboards/v60_type_r/keymaps/xtonhasvim/keymap.c
index 98bfa70d2f93f1f01e32ea6edd063a52eee96ada..f2fd693ece1972b60edbbae5913d859ce0b53583 100644
--- a/keyboards/v60_type_r/keymaps/xtonhasvim/keymap.c
+++ b/keyboards/v60_type_r/keymaps/xtonhasvim/keymap.c
@@ -69,8 +69,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 
-void led_set_user(uint8_t usb_led) {
-    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+    if (led_state.caps_lock) {
         // output low
         DDRE  |=  (1<<PE6);
         PORTE &= ~(1<<PE6);
@@ -80,6 +80,7 @@ void led_set_user(uint8_t usb_led) {
         DDRE  &= ~(1<<PE6);
         PORTE &= ~(1<<PE6);
     }
+    return false;
 }
 
 #define C_RED 0xFF, 0x00, 0x00
diff --git a/keyboards/work_louder/work_board/keymaps/drashna/keymap.c b/keyboards/work_louder/work_board/keymaps/drashna/keymap.c
index 1747ab638eb0a78ea4207d845d9981a2a5dec802..2c2022574252bbec3d1a50ac9dd3d03a4529e14d 100644
--- a/keyboards/work_louder/work_board/keymaps/drashna/keymap.c
+++ b/keyboards/work_louder/work_board/keymaps/drashna/keymap.c
@@ -110,7 +110,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
 
 bool rgb_matrix_indicators_advanced_keymap(uint8_t led_min, uint8_t led_max) {
     uint8_t this_mod = get_mods();
-    uint8_t this_led = host_keyboard_leds();
+    led_t   this_led = host_keyboard_led_state();
     uint8_t this_osm = get_oneshot_mods();
 #define THUMB_LED                                   6
 #define RGB_MATRIX_INDICATOR_SET_COLOR_wrapper(...) RGB_MATRIX_INDICATOR_SET_COLOR(__VA_ARGS__)
@@ -134,7 +134,7 @@ bool rgb_matrix_indicators_advanced_keymap(uint8_t led_min, uint8_t led_max) {
         }
     }
 
-    if ((this_mod | this_osm) & MOD_MASK_SHIFT || this_led & (1 << USB_LED_CAPS_LOCK)) {
+    if ((this_mod | this_osm) & MOD_MASK_SHIFT || this_led.caps_lock) {
         if (!layer_state_is(_ADJUST)) {
             RGB_MATRIX_INDICATOR_SET_COLOR(12, 0x00, 0xFF, 0x00);
             RGB_MATRIX_INDICATOR_SET_COLOR(13, 0x00, 0xFF, 0x00);
diff --git a/keyboards/xbows/woody/woody.c b/keyboards/xbows/woody/woody.c
index 9757bde9c94df78ecd14bf5cff6ede32bfd3aa51..fa0ba7f768a0394f0924ae686b6ed19ebd1602bc 100644
--- a/keyboards/xbows/woody/woody.c
+++ b/keyboards/xbows/woody/woody.c
@@ -101,7 +101,7 @@ bool rgb_matrix_indicators_kb(void) {
     if (!rgb_matrix_indicators_user()) {
         return false;
     }
-    if (IS_LED_ON(host_keyboard_leds(), USB_LED_CAPS_LOCK)) {
+    if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(30, 0xFF, 0x00, 0x00);
     }
     return true;
diff --git a/keyboards/xiudi/xd75/keymaps/bulbizarre/keymap.c b/keyboards/xiudi/xd75/keymaps/bulbizarre/keymap.c
index 64add732ad2cfaa1b3d41e7a9da4c55369222aad..02dbe01f1715145fdd0e2c301af96d012e07cf7f 100644
--- a/keyboards/xiudi/xd75/keymaps/bulbizarre/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/bulbizarre/keymap.c
@@ -130,16 +130,8 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
-void led_set_user(uint8_t usb_led) {
-    if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+    if (led_state.caps_lock) {
         capslock_led_on();
     } else {
         capslock_led_off();
@@ -149,4 +141,5 @@ void led_set_user(uint8_t usb_led) {
     } else {
         gp100_led_off();
     }
+    return false;
 }
diff --git a/layouts/community/60_ansi_arrow_split_bs_7u_spc/mrsendyyk/keymap.c b/layouts/community/60_ansi_arrow_split_bs_7u_spc/mrsendyyk/keymap.c
index 3af6af509133a032bdd5c59f121ae22a84440355..37e459893caa7fbcd52615e2b1599573082b9066 100644
--- a/layouts/community/60_ansi_arrow_split_bs_7u_spc/mrsendyyk/keymap.c
+++ b/layouts/community/60_ansi_arrow_split_bs_7u_spc/mrsendyyk/keymap.c
@@ -109,9 +109,9 @@ void update_led(void) {
     }
 }
 
-void led_set_user(uint8_t usb_led) {
+bool led_update_user(led_t led_state) {
     // Caps Lock Indicator
-    if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
+    if (led_state.caps_lock) {
         writePinLow(B2);
         rgblight_setrgb(255, 110, 0);
     }
@@ -133,6 +133,7 @@ void led_set_user(uint8_t usb_led) {
         }
         update_led();
     }
+    return false;
 }
 
 layer_state_t layer_state_set_user(layer_state_t state) {
diff --git a/layouts/community/ergodox/colemak_code_friendly/keymap.c b/layouts/community/ergodox/colemak_code_friendly/keymap.c
index ae5bdcc5b8cfcd34f6694057a0ef42607e21777c..d9e3c9fa61077f007a03d89e850874684d9c2bc0 100644
--- a/layouts/community/ergodox/colemak_code_friendly/keymap.c
+++ b/layouts/community/ergodox/colemak_code_friendly/keymap.c
@@ -310,9 +310,6 @@ void matrix_init_user(void) {
 void matrix_scan_user(void) {
   uint8_t layer = get_highest_layer(layer_state);
 
-  //led 1, RED, Caps-Lock ON
-  //if (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) ergodox_right_led_1_on();
-
   //led 2, GREEN
   if (layer == LAYER_NUM)
       ergodox_right_led_2_on();
@@ -327,9 +324,10 @@ void matrix_scan_user(void) {
 };
 
 // Runs constantly in the background, in a loop.
-void led_set_user(uint8_t usb_led) {
-    if (usb_led & (1<<USB_LED_CAPS_LOCK))
+bool led_update_user(led_t led_state) {
+    if (led_state.caps_lock)
         ergodox_right_led_1_on();
     else
         ergodox_right_led_1_off();
+    return false;
 }
diff --git a/layouts/community/ergodox/drashna/keymap.c b/layouts/community/ergodox/drashna/keymap.c
index 1853b7007138404945ab5df44abd00256affd2bc..8d1449486a0848a77142cf88e7490541af609645 100644
--- a/layouts/community/ergodox/drashna/keymap.c
+++ b/layouts/community/ergodox/drashna/keymap.c
@@ -212,9 +212,9 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
 
 void housekeeping_task_keymap(void) {  // runs frequently to update info
 #ifdef KEYBOARD_ergodox_ez
-    uint8_t modifiers     = get_mods();
-    uint8_t led_usb_state = host_keyboard_leds();
-    uint8_t one_shot      = get_oneshot_mods();
+    uint8_t modifiers = get_mods();
+    led_t   led_state = host_keyboard_led_state();
+    uint8_t one_shot  = get_oneshot_mods();
 
     if (!skip_leds) {
         ergodox_board_led_off();
@@ -225,7 +225,7 @@ void housekeeping_task_keymap(void) {  // runs frequently to update info
         // Since we're not using the LEDs here for layer indication anymore,
         // then lets use them for modifier indicators.  Shame we don't have 4...
         // Also, no "else", since we want to know each, independently.
-        if ((modifiers | one_shot) & MOD_MASK_SHIFT || led_usb_state & (1 << USB_LED_CAPS_LOCK)) {
+        if ((modifiers | one_shot) & MOD_MASK_SHIFT || led_state.caps_lock) {
             ergodox_right_led_2_on();
             ergodox_right_led_2_set(50);
         }
diff --git a/layouts/community/ergodox/jjerrell/keymap.c b/layouts/community/ergodox/jjerrell/keymap.c
index 110a8aba63fdd09c54ce61b205942d08d3abdb2b..48572d2de3abefcc983a0ac962f471cf36a77bcf 100644
--- a/layouts/community/ergodox/jjerrell/keymap.c
+++ b/layouts/community/ergodox/jjerrell/keymap.c
@@ -94,12 +94,12 @@ layer_state_t layer_state_set_keymap(layer_state_t state) {
 
 void matrix_scan_keymap(void) {
     uint8_t modifiers = get_mods();
-    uint8_t led_usb_state = host_keyboard_leds();
+    led_t   led_state = host_keyboard_led_state();
     uint8_t one_shot = get_oneshot_mods();
     uint8_t layer_is_workman = layer_state_is(_WORKMAN);
 
     if ((modifiers) && (layer_is_workman)) {
-        if (modifiers & MOD_MASK_SHIFT || led_usb_state & (1<<USB_LED_CAPS_LOCK) || one_shot & MOD_MASK_SHIFT) {
+        if (modifiers & MOD_MASK_SHIFT || led_state.caps_lock || one_shot & MOD_MASK_SHIFT) {
             ergodox_right_led_1_on();
             ergodox_right_led_1_set( 25 );
         } else {
diff --git a/layouts/community/ergodox/ordinary/keymap.c b/layouts/community/ergodox/ordinary/keymap.c
index 6c7586034c7d1c9b71eed81262de909473b52bcd..c828c6fb97ac1031ae5ca648508b1b997a59e379 100644
--- a/layouts/community/ergodox/ordinary/keymap.c
+++ b/layouts/community/ergodox/ordinary/keymap.c
@@ -238,7 +238,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
     // shift or caps lock turns on red light
-    if ((keyboard_report->mods & MOD_BIT(KC_LSFT)) || (keyboard_report->mods & MOD_BIT(KC_RSFT)) || (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK))) {
+    if ((keyboard_report->mods & MOD_BIT(KC_LSFT)) || (keyboard_report->mods & MOD_BIT(KC_RSFT)) || host_keyboard_led_state().caps_lock) {
         ergodox_right_led_1_on();
     } else {
         ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/ordinary_osx/keymap.c b/layouts/community/ergodox/ordinary_osx/keymap.c
index f67a6d6da03f39966b221f843b0c966130c723a8..3de64f4994aee40deca9c4d44d16e55914f446ca 100644
--- a/layouts/community/ergodox/ordinary_osx/keymap.c
+++ b/layouts/community/ergodox/ordinary_osx/keymap.c
@@ -238,7 +238,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
     // shift or caps lock turns on red light
-    if ((keyboard_report->mods & MOD_BIT(KC_LSFT)) || (keyboard_report->mods & MOD_BIT(KC_RSFT)) || (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK))) {
+    if ((keyboard_report->mods & MOD_BIT(KC_LSFT)) || (keyboard_report->mods & MOD_BIT(KC_RSFT)) || host_keyboard_led_state().caps_lock) {
         ergodox_right_led_1_on();
     } else {
         ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/osx_neo2/keymap.c b/layouts/community/ergodox/osx_neo2/keymap.c
index 5b279073cc870bb8c273f04b9c4e1dc79c8aaac2..079a92a97e7bf3dadcbcdf78c8b221ea918110d2 100644
--- a/layouts/community/ergodox/osx_neo2/keymap.c
+++ b/layouts/community/ergodox/osx_neo2/keymap.c
@@ -686,7 +686,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
   if ((capslock_state & MOD_MASK_SHIFT) == MOD_MASK_SHIFT) {
     // CAPSLOCK is currently active, disable it
-    if (host_keyboard_leds() & (1 << USB_LED_CAPS_LOCK)) {
+    if (host_keyboard_led_state().caps_lock) {
       unregister_code(KC_LOCKING_CAPS_LOCK);
     } else {
       register_code(KC_LOCKING_CAPS_LOCK);
@@ -697,11 +697,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   return process_record_user_shifted(keycode, record);
 };
 
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void){
-
-};
-
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
   uint8_t layer = get_highest_layer(layer_state);
diff --git a/layouts/community/ergodox/software_neo2/keymap.c b/layouts/community/ergodox/software_neo2/keymap.c
index c191a034f20b4ba0473a899cb3db207a10ed0ae4..1c68a68b0fbb69d8c5a20cfc70c919384f1df080 100644
--- a/layouts/community/ergodox/software_neo2/keymap.c
+++ b/layouts/community/ergodox/software_neo2/keymap.c
@@ -106,7 +106,7 @@ void matrix_scan_user(void) {
     ergodox_right_led_3_off();
     ergodox_board_led_off();
 
-    if (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) {
+    if (host_keyboard_led_state().caps_lock) {
         ergodox_right_led_3_on();
     }
 
diff --git a/layouts/community/ergodox/swedish-lindhe/keymap.c b/layouts/community/ergodox/swedish-lindhe/keymap.c
index 1644512de78e295e4e2ed8f14c6af3d18e8c4180..376574f690453cab6412052d79351e9b8dbfe543 100644
--- a/layouts/community/ergodox/swedish-lindhe/keymap.c
+++ b/layouts/community/ergodox/swedish-lindhe/keymap.c
@@ -154,11 +154,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 };
 
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-
-};
-
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
@@ -185,7 +180,7 @@ void matrix_scan_user(void) {
             break;
     }
 
-    if (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) {
+    if (host_keyboard_led_state().caps_lock) {
         // if capslk is on, set led 1 on
         ergodox_right_led_1_on();
     } else {
diff --git a/layouts/community/ortho_4x12/brandonschlack/keymap.c b/layouts/community/ortho_4x12/brandonschlack/keymap.c
index 7361de1a039952922ebb3188656c651dc1b36c29..04c83de9e9b63a1494456b9a9a79748c9f547326 100644
--- a/layouts/community/ortho_4x12/brandonschlack/keymap.c
+++ b/layouts/community/ortho_4x12/brandonschlack/keymap.c
@@ -100,12 +100,13 @@ void keyboard_post_init_keymap(void) {
 }
 
 // Use Green LED for Caps Lock
-void led_set_user(uint8_t usb_led) {
-    if (IS_LED_OFF(usb_led, USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+    if (led_state.caps_lock) {
         writePinLow(LED_GREEN);
     } else {
         writePinHigh(LED_GREEN);
     }
+    return false;
 }
 #endif
 
diff --git a/layouts/community/ortho_4x12/drashna/keymap.c b/layouts/community/ortho_4x12/drashna/keymap.c
index 475ccc5c3ab45b0cb2672beceee69be50e3b907e..cdf41fc5dc22bcf7f42160384750746b191474fe 100644
--- a/layouts/community/ortho_4x12/drashna/keymap.c
+++ b/layouts/community/ortho_4x12/drashna/keymap.c
@@ -184,7 +184,7 @@ led_config_t g_led_config = {
 
 bool rgb_matrix_indicators_advanced_keymap(uint8_t led_min, uint8_t led_max) {
     uint8_t this_mod = get_mods();
-    uint8_t this_led = host_keyboard_leds();
+    led_t   this_led = host_keyboard_led_state();
     uint8_t this_osm = get_oneshot_mods();
 #    ifdef KEYBOARD_planck_ez
 #        define THUMB_LED 41
@@ -208,7 +208,7 @@ bool rgb_matrix_indicators_advanced_keymap(uint8_t led_min, uint8_t led_max) {
             break;
     }
 
-    if ((this_mod | this_osm) & MOD_MASK_SHIFT || this_led & (1 << USB_LED_CAPS_LOCK)) {
+    if ((this_mod | this_osm) & MOD_MASK_SHIFT || this_led.caps_lock) {
         if (!layer_state_cmp(layer_state, _ADJUST)) {
             RGB_MATRIX_INDICATOR_SET_COLOR(24, 0x00, 0xFF, 0x00);
         }
diff --git a/platforms/avr/sleep_led.c b/platforms/avr/sleep_led.c
index b05431633ba38ecf6477364bbb98a36c10e46e43..ad6253be93f42c91d2aa6c60c124ddf5359aa8a3 100644
--- a/platforms/avr/sleep_led.c
+++ b/platforms/avr/sleep_led.c
@@ -109,16 +109,19 @@ ISR(TIMERx_COMPA_vect) {
             uint8_t duration : 2;
             uint8_t index : 6;
         } pwm;
-    } timer = {.row = 0};
+    } timer                = {.row = 0};
+    static led_t led_state = {0};
 
     timer.row++;
 
     // LED on
     if (timer.pwm.count == 0) {
-        led_set(1 << USB_LED_CAPS_LOCK);
+        led_state.caps_lock = true;
+        led_set(led_state.raw);
     }
     // LED off
     if (timer.pwm.count == pgm_read_byte(&breathing_table[timer.pwm.index])) {
-        led_set(0);
+        led_state.caps_lock = false;
+        led_set(led_state.raw);
     }
 }
diff --git a/platforms/chibios/sleep_led.c b/platforms/chibios/sleep_led.c
index a777d60468bb2814b3fb35910bb24368c8bf360b..a35514bf2e9c0a777086b2021ee2777441fed461 100644
--- a/platforms/chibios/sleep_led.c
+++ b/platforms/chibios/sleep_led.c
@@ -41,17 +41,20 @@ void sleep_led_timer_callback(void) {
             uint8_t duration : 2;
             uint8_t index : 6;
         } pwm;
-    } timer = {.row = 0};
+    } timer                = {.row = 0};
+    static led_t led_state = {0};
 
     timer.row++;
 
     // LED on
     if (timer.pwm.count == 0) {
-        led_set(1 << USB_LED_CAPS_LOCK);
+        led_state.caps_lock = true;
+        led_set(led_state.raw);
     }
     // LED off
     if (timer.pwm.count == breathing_table[timer.pwm.index]) {
-        led_set(0);
+        led_state.caps_lock = false;
+        led_set(led_state.raw);
     }
 }
 
@@ -190,7 +193,7 @@ void sleep_led_toggle(void) {
 void sleep_led_init(void) {}
 
 void sleep_led_enable(void) {
-    led_set(1 << USB_LED_CAPS_LOCK);
+    led_set(2); // Caps Lock
 }
 
 void sleep_led_disable(void) {
diff --git a/quantum/led.c b/quantum/led.c
index 42144566fdd6ba69d921afa519b101ac593a1f54..8d86374a6f2215e5b9c3cf81958b84cbee05f35e 100644
--- a/quantum/led.c
+++ b/quantum/led.c
@@ -153,14 +153,14 @@ __attribute__((weak)) void led_set(uint8_t usb_led) {
 /** \brief Trigger behaviour on transition to suspend
  */
 void led_suspend(void) {
-    uint8_t leds_off = 0;
+    led_t leds_off = {0};
 #ifdef BACKLIGHT_CAPS_LOCK
     if (is_backlight_enabled()) {
         // Don't try to turn off Caps Lock indicator as it is backlight and backlight is already off
-        leds_off |= (1 << USB_LED_CAPS_LOCK);
+        leds_off.caps_lock = true;
     }
 #endif
-    led_set(leds_off);
+    led_set(leds_off.raw);
 }
 
 /** \brief Trigger behaviour on transition from suspend
diff --git a/quantum/led.h b/quantum/led.h
index 679e7433962379dd9f63ea822fdc9bb2b528365d..b9fad670aeba6aa41bbaf44a5135e469cebb1652 100644
--- a/quantum/led.h
+++ b/quantum/led.h
@@ -22,9 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* FIXME: Add doxygen comments here. */
 
-/* keyboard LEDs */
-#define USB_LED_CAPS_LOCK 1
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/users/curry/rgb_lighting_user.c b/users/curry/rgb_lighting_user.c
index b8d519feca176160eac8b8ca34f82335f2b9d58d..34156744fe867b9799ce229b78c7e3326b86c8fc 100644
--- a/users/curry/rgb_lighting_user.c
+++ b/users/curry/rgb_lighting_user.c
@@ -11,9 +11,9 @@ void rgblight_sethsv_default_helper(uint8_t index) { rgblight_sethsv_at(rgblight
  * This is especially useful for One Shot Mods, since it's not always obvious if they're still lit up.
  */
 #if defined(INDICATOR_LIGHTS)
-void set_rgb_indicators(uint8_t this_mod, uint8_t this_led, uint8_t this_osm) {
+void set_rgb_indicators(uint8_t this_mod, led_t this_led, uint8_t this_osm) {
     if (userspace_config.rgb_layer_change && get_highest_layer(layer_state) == 0) {
-        if ((this_mod | this_osm) & MOD_MASK_SHIFT || this_led & (1 << USB_LED_CAPS_LOCK)) {
+        if ((this_mod | this_osm) & MOD_MASK_SHIFT || this_led.caps_lock) {
 #    ifdef SHFT_LED1
             rgblight_sethsv_at(120, 255, 255, SHFT_LED1);
 #    endif  // SHFT_LED1
@@ -79,7 +79,7 @@ void set_rgb_indicators(uint8_t this_mod, uint8_t this_led, uint8_t this_osm) {
 /* Function for the indicators */
 void matrix_scan_indicator(void) {
     if (has_initialized) {
-        set_rgb_indicators(get_mods(), host_keyboard_leds(), get_oneshot_mods());
+        set_rgb_indicators(get_mods(), host_keyboard_led_state(), get_oneshot_mods());
     }
 }
 #endif  // INDICATOR_LIGHTS
diff --git a/users/turbomech/backupturbomech.c b/users/turbomech/backupturbomech.c
index 3671d27ab4952e0c62ccdf42bff2c4b097c981c8..70d3d065c4f1934535536b917eee4e93a7d5f8ed 100644
--- a/users/turbomech/backupturbomech.c
+++ b/users/turbomech/backupturbomech.c
@@ -135,14 +135,15 @@ void matrix_init_user(void) {
 }
 
 static bool is_capslocked = false;
-void led_set_user(uint8_t usb_led) {
-  if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+  if (led_state.caps_lock) {
     is_capslocked = true;
    //     DDRB |= (1 << 2); PORTB &= ~(1 << 2);
   } else {
     is_capslocked = false;
   //  DDRB &= ~(1 << 2); PORTB &= ~(1 << 2);
   }
+  return false;
 }
   //rgblight_set();