diff --git a/keyboards/akko/5108/5108.c b/keyboards/akko/5108/5108.c
index 7330707f453..61cb60713fe 100644
--- a/keyboards/akko/5108/5108.c
+++ b/keyboards/akko/5108/5108.c
@@ -150,13 +150,10 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 void keyboard_pre_init_kb(void) {
     gpio_set_pin_output(LED_WIN_LOCK_PIN); // LED3 Win Lock
     gpio_write_pin_low(LED_WIN_LOCK_PIN);
+
     keyboard_pre_init_user();
 }
 
-bool led_update_kb(led_t led_state) {
-    bool res = led_update_user(led_state);
-    if (res) {
-        gpio_write_pin(LED_WIN_LOCK_PIN, keymap_config.no_gui);
-    }
-    return res;
+void housekeeping_task_kb(void){
+    gpio_write_pin(LED_WIN_LOCK_PIN, keymap_config.no_gui);
 }
diff --git a/keyboards/blackplum/keymaps/default/keymap.c b/keyboards/blackplum/keymaps/default/keymap.c
index 6cab19864d6..3101d1159e5 100644
--- a/keyboards/blackplum/keymaps/default/keymap.c
+++ b/keyboards/blackplum/keymaps/default/keymap.c
@@ -1,16 +1,8 @@
 #include QMK_KEYBOARD_H
 
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-#define _BASE 0
-#define _FN 1
-
-
-
-enum custom_keycodes {
-  TG_GUI = SAFE_RANGE
+enum layer_names {
+    _BASE,
+    _FN
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -27,17 +19,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, 	UG_NEXT, 	UG_HUEU,   	UG_SATU, UG_VALU, 	_______, _______, _______, 	_______, 	_______, 	KC_PSCR, 	KC_SCRL, 	KC_PAUSE,  	_______,	KC_MUTE,	KC_END,
     _______,	UG_TOGG, 	UG_HUED, 	UG_SATD, UG_VALD, 	_______, _______, _______, 	_______, 	_______, 	_______, 	_______, 				_______,
     _______,	_______, 	_______, 	_______, _______, 	_______, _______, _______,	_______, 				_______, 	_______, 				_______,	KC_VOLU,
-    _______, 	TG_GUI,_______, 						QK_BOOT, 												_______,	_______,	_______,	KC_MPRV,    KC_VOLD, 	KC_MNXT
+    _______, 	GU_TOGG,    _______, 						QK_BOOT, 											_______,	_______,	_______,	KC_MPRV,    KC_VOLD, 	KC_MNXT
   )
 };
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if(record->event.pressed) {
-        switch(keycode) {
-            case TG_GUI:
-                keymap_config.no_gui ^= 1;
-                return false;
-        }
-    }
-    return true;
-}
diff --git a/keyboards/monsgeek/m5/m5.c b/keyboards/monsgeek/m5/m5.c
index 5113e322a5a..7a4d7f2503f 100644
--- a/keyboards/monsgeek/m5/m5.c
+++ b/keyboards/monsgeek/m5/m5.c
@@ -151,14 +151,10 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 void keyboard_pre_init_kb(void) {
     gpio_set_pin_output(LED_WIN_LOCK_PIN); // LED3 Win Lock
     gpio_write_pin_low(LED_WIN_LOCK_PIN);
+
     keyboard_pre_init_user();
 }
 
-bool led_update_kb(led_t led_state) {
-    bool res = led_update_user(led_state);
-    if (res) {
-        led_update_ports(led_state);
-        gpio_write_pin(LED_WIN_LOCK_PIN, keymap_config.no_gui);
-    }
-    return res;
+void housekeeping_task_kb(void){
+    gpio_write_pin(LED_WIN_LOCK_PIN, keymap_config.no_gui);
 }