diff --git a/keyboards/ares/ares.c b/keyboards/ares/ares.c
index e6379cb18d..95d4b878f1 100644
--- a/keyboards/ares/ares.c
+++ b/keyboards/ares/ares.c
@@ -24,12 +24,11 @@ void keyboard_pre_init_kb(void) {
 
 void led_init_ports(void) {
     setPinOutput(D1);
-    writePinHigh(D1);
 }
 
 bool led_update_kb(led_t led_state) {
     if (led_update_user(led_state)) {
-        writePin(D1, !led_state.caps_lock);
+        writePin(D1, led_state.caps_lock);
     }
     return true;
 }
diff --git a/keyboards/ares/config.h b/keyboards/ares/config.h
index c50587db9c..e298dfc959 100644
--- a/keyboards/ares/config.h
+++ b/keyboards/ares/config.h
@@ -39,6 +39,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
+
 #define RGBLIGHT_ANIMATIONS
 
 #define NO_UART 1
diff --git a/keyboards/bfake/bfake.c b/keyboards/bfake/bfake.c
index eb328ba833..6d0c927462 100644
--- a/keyboards/bfake/bfake.c
+++ b/keyboards/bfake/bfake.c
@@ -24,12 +24,11 @@ void keyboard_pre_init_kb(void) {
 
 void led_init_ports(void) {
     setPinOutput(D1);
-    writePinHigh(D1);
 }
 
 bool led_update_kb(led_t led_state) {
     if (led_update_user(led_state)) {
-        writePin(D1, !led_state.caps_lock);
+        writePin(D1, led_state.caps_lock);
     }
     return true;
 }
diff --git a/keyboards/bfake/config.h b/keyboards/bfake/config.h
index 7c814ccc93..ef7a866d3d 100644
--- a/keyboards/bfake/config.h
+++ b/keyboards/bfake/config.h
@@ -39,6 +39,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
+
 #define RGBLIGHT_ANIMATIONS
 
 #define NO_UART 1
diff --git a/keyboards/db/db63/config.h b/keyboards/db/db63/config.h
index 488409e3a6..3183201c1f 100644
--- a/keyboards/db/db63/config.h
+++ b/keyboards/db/db63/config.h
@@ -41,4 +41,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
-
diff --git a/keyboards/donutcables/budget96/budget96.c b/keyboards/donutcables/budget96/budget96.c
index 7317e24e26..5f3436dc61 100644
--- a/keyboards/donutcables/budget96/budget96.c
+++ b/keyboards/donutcables/budget96/budget96.c
@@ -24,14 +24,12 @@ void keyboard_pre_init_kb(void) {
 void led_init_ports(void) {
     setPinOutput(D0);
     setPinOutput(D1);
-    writePinHigh(D0);
-    writePinHigh(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);
+        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 dddc8075b1..0e05bb76f4 100644
--- a/keyboards/donutcables/budget96/config.h
+++ b/keyboards/donutcables/budget96/config.h
@@ -39,4 +39,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
+
 #define RGBLIGHT_ANIMATIONS
diff --git a/keyboards/eve/meteor/meteor.c b/keyboards/eve/meteor/meteor.c
index ac1ca5d643..1d080b389c 100644
--- a/keyboards/eve/meteor/meteor.c
+++ b/keyboards/eve/meteor/meteor.c
@@ -23,12 +23,11 @@ void keyboard_pre_init_kb(void) {
 
 void led_init_ports(void) {
     setPinOutput(D1);
-    writePinHigh(D1);
 }
 
 bool led_update_kb(led_t led_state) {
     if (led_update_user(led_state)) {
-        writePin(D1, !led_state.caps_lock);
+        writePin(D1, led_state.caps_lock);
     }
     return true;
 }
diff --git a/keyboards/exclusive/e6v2/le_bmc/le_bmc.c b/keyboards/exclusive/e6v2/le_bmc/le_bmc.c
index b09e588795..df79cc5dcf 100644
--- a/keyboards/exclusive/e6v2/le_bmc/le_bmc.c
+++ b/keyboards/exclusive/e6v2/le_bmc/le_bmc.c
@@ -23,12 +23,11 @@ void keyboard_pre_init_kb(void) {
 
 void led_init_ports(void) {
     setPinOutput(D1);
-    writePinHigh(D1);
 }
 
 bool led_update_kb(led_t led_state) {
     if (led_update_user(led_state)) {
-        writePin(D1, !led_state.caps_lock);
+        writePin(D1, led_state.caps_lock);
     }
     return true;
 }
diff --git a/keyboards/exclusive/e6v2/oe_bmc/oe_bmc.c b/keyboards/exclusive/e6v2/oe_bmc/oe_bmc.c
index a0a6c579bd..ea74d87cb1 100644
--- a/keyboards/exclusive/e6v2/oe_bmc/oe_bmc.c
+++ b/keyboards/exclusive/e6v2/oe_bmc/oe_bmc.c
@@ -23,12 +23,11 @@ void keyboard_pre_init_kb(void) {
 
 void led_init_ports(void) {
     setPinOutput(D1);
-    writePinHigh(D1);
 }
 
 bool led_update_kb(led_t led_state) {
     if (led_update_user(led_state)) {
-        writePin(D1, !led_state.caps_lock);
+        writePin(D1, led_state.caps_lock);
     }
     return true;
 }
diff --git a/keyboards/exent/config.h b/keyboards/exent/config.h
index 4921746c1c..48aee2206f 100644
--- a/keyboards/exent/config.h
+++ b/keyboards/exent/config.h
@@ -41,6 +41,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
+
 #define RGBLIGHT_ANIMATIONS
 
 #define NO_UART 1
diff --git a/keyboards/exent/exent.c b/keyboards/exent/exent.c
index c6870f2c79..a935e9e67f 100644
--- a/keyboards/exent/exent.c
+++ b/keyboards/exent/exent.c
@@ -25,16 +25,13 @@ void led_init_ports(void) {
     setPinOutput(D0);
     setPinOutput(D1);
     setPinOutput(D6);
-    writePinHigh(D0);
-    writePinHigh(D1);
-    writePinHigh(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);
+        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 0dc35e6258..be442548d0 100644
--- a/keyboards/facew/config.h
+++ b/keyboards/facew/config.h
@@ -39,4 +39,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
+
 #define RGBLIGHT_ANIMATIONS
diff --git a/keyboards/facew/facew.c b/keyboards/facew/facew.c
index fc176466fe..2f091ae6bd 100644
--- a/keyboards/facew/facew.c
+++ b/keyboards/facew/facew.c
@@ -25,13 +25,12 @@ void keyboard_pre_init_kb(void) {
 void led_init_ports(void) {
     setPinOutput(D0);
     setPinOutput(D1);
-    writePinHigh(D0);
-    writePinHigh(D1);
 }
 
 bool led_update_kb(led_t led_state) {
     if (led_update_user(led_state)) {
-        writePin(D1, !led_state.caps_lock);
+        writePin(D0, led_state.num_lock);
+        writePin(D1, led_state.caps_lock);
     }
     return true;
 }
diff --git a/keyboards/ft/mars80/config.h b/keyboards/ft/mars80/config.h
index 38c3e851a8..8c1ebe4baf 100644
--- a/keyboards/ft/mars80/config.h
+++ b/keyboards/ft/mars80/config.h
@@ -40,6 +40,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
+
 #define RGBLIGHT_ANIMATIONS
 
 #define NO_UART 1
diff --git a/keyboards/ft/mars80/mars80.c b/keyboards/ft/mars80/mars80.c
index ca1950353b..2c628a6a23 100644
--- a/keyboards/ft/mars80/mars80.c
+++ b/keyboards/ft/mars80/mars80.c
@@ -24,14 +24,12 @@ void keyboard_pre_init_kb(void) {
 void led_init_ports(void) {
     setPinOutput(D1);
     setPinOutput(D6);
-    writePinHigh(D1);
-    writePinHigh(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);
+        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 dff360ec6a..f3fb20ec6b 100644
--- a/keyboards/gray_studio/hb85/config.h
+++ b/keyboards/gray_studio/hb85/config.h
@@ -33,3 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGBLED_NUM 5
 #define RGBLIGHT_ANIMATIONS
+
+#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 57f5e60314..4b3ff64f1e 100644
--- a/keyboards/gray_studio/hb85/hb85.c
+++ b/keyboards/gray_studio/hb85/hb85.c
@@ -27,16 +27,13 @@ void led_init_ports(void) {
     setPinOutput(D0);
     setPinOutput(D1);
     setPinOutput(D6);
-    writePinHigh(D0);
-    writePinHigh(D1);
-    writePinHigh(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);
+        writePin(D0, led_state.num_lock);
+        writePin(D1, led_state.caps_lock);
+        writePin(D6, led_state.scroll_lock);
     }
     return true;
 }
diff --git a/keyboards/j80/j80.c b/keyboards/j80/j80.c
index 4ac0200a28..bed30cdecc 100644
--- a/keyboards/j80/j80.c
+++ b/keyboards/j80/j80.c
@@ -16,10 +16,21 @@
 
 #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(D1, led_state.caps_lock);
         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/v32a.c b/keyboards/jc65/v32a/v32a.c
index 627661a57c..f195e8f61e 100644
--- a/keyboards/jc65/v32a/v32a.c
+++ b/keyboards/jc65/v32a/v32a.c
@@ -24,12 +24,11 @@ void keyboard_pre_init_kb(void) {
 
 void led_init_ports(void) {
     setPinOutput(D1);
-    writePinHigh(D1);
 }
 
 bool led_update_kb(led_t led_state) {
     if (led_update_user(led_state)) {
-        writePin(D1, !led_state.caps_lock);
+        writePin(D1, led_state.caps_lock);
     }
     return true;
 }
diff --git a/keyboards/kbdfans/kbdpad/mk1/mk1.c b/keyboards/kbdfans/kbdpad/mk1/mk1.c
index f5fe47741b..540ba35892 100644
--- a/keyboards/kbdfans/kbdpad/mk1/mk1.c
+++ b/keyboards/kbdfans/kbdpad/mk1/mk1.c
@@ -23,12 +23,11 @@ void keyboard_pre_init_kb(void) {
 
 void led_init_ports(void) {
     setPinOutput(D0);
-    writePinHigh(D0);
 }
 
 bool led_update_kb(led_t led_state) {
     if (led_update_user(led_state)) {
-        writePin(D0, !led_state.num_lock);
+        writePin(D0, led_state.num_lock);
     }
     return true;
 }
diff --git a/keyboards/mehkee96/mehkee96.c b/keyboards/mehkee96/mehkee96.c
index 2da25b6b84..ae83a1bb50 100644
--- a/keyboards/mehkee96/mehkee96.c
+++ b/keyboards/mehkee96/mehkee96.c
@@ -25,14 +25,12 @@ void keyboard_pre_init_kb(void) {
 void led_init_ports(void) {
     setPinOutput(D0);
     setPinOutput(D1);
-    writePinHigh(D0);
-    writePinHigh(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);
+        writePin(D0, led_state.num_lock);
+        writePin(D1, led_state.caps_lock);
     }
     return true;
 }
diff --git a/keyboards/panc60/panc60.c b/keyboards/panc60/panc60.c
index a200b25878..d7ff52963c 100644
--- a/keyboards/panc60/panc60.c
+++ b/keyboards/panc60/panc60.c
@@ -23,12 +23,11 @@ void keyboard_pre_init_kb(void) {
 
 void led_init_ports(void) {
     setPinOutput(D1);
-    writePinHigh(D1);
 }
 
 bool led_update_kb(led_t led_state) {
     if (led_update_user(led_state)) {
-        writePin(D1, !led_state.caps_lock);
+        writePin(D1, led_state.caps_lock);
     }
     return true;
 }
diff --git a/keyboards/pearl/pearl.c b/keyboards/pearl/pearl.c
index cebbc9fcba..b08ee6f888 100644
--- a/keyboards/pearl/pearl.c
+++ b/keyboards/pearl/pearl.c
@@ -26,16 +26,13 @@ void led_init_ports(void) {
     setPinOutput(D0);
     setPinOutput(D1);
     setPinOutput(D6);
-    writePinHigh(D0);
-    writePinHigh(D1);
-    writePinHigh(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);
+        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 d3c66dbf13..dd31640e6d 100644
--- a/keyboards/percent/canoe/canoe.c
+++ b/keyboards/percent/canoe/canoe.c
@@ -24,12 +24,11 @@ void keyboard_pre_init_kb(void) {
 
 void led_init_ports(void) {
     setPinOutput(D1);
-    writePinHigh(D1);
 }
 
 bool led_update_kb(led_t led_state) {
     if (led_update_user(led_state)) {
-        writePin(D1, !led_state.caps_lock);
+        writePin(D1, led_state.caps_lock);
     }
     return true;
 }
diff --git a/keyboards/percent/skog/skog.c b/keyboards/percent/skog/skog.c
index 241833937b..152fc56845 100644
--- a/keyboards/percent/skog/skog.c
+++ b/keyboards/percent/skog/skog.c
@@ -27,14 +27,12 @@ void keyboard_pre_init_kb(void) {
 void led_init_ports(void) {
     setPinOutput(D1);
     setPinOutput(D6);
-    writePinHigh(D1);
-    writePinHigh(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);
+        writePin(D1, led_state.caps_lock);
+        writePin(D6, led_state.scroll_lock);
     }
     return true;
 }
diff --git a/keyboards/percent/skog_lite/skog_lite.c b/keyboards/percent/skog_lite/skog_lite.c
index e611885a61..95d3982113 100644
--- a/keyboards/percent/skog_lite/skog_lite.c
+++ b/keyboards/percent/skog_lite/skog_lite.c
@@ -24,14 +24,12 @@ void keyboard_pre_init_kb(void) {
 void led_init_ports(void) {
     setPinOutput(D1);
     setPinOutput(D6);
-    writePinHigh(D1);
-    writePinHigh(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);
+        writePin(D1, led_state.caps_lock);
+        writePin(D6, led_state.scroll_lock);
     }
     return true;
 }
diff --git a/keyboards/singa/singa.c b/keyboards/singa/singa.c
index 7b60e3c29d..360b214a31 100644
--- a/keyboards/singa/singa.c
+++ b/keyboards/singa/singa.c
@@ -23,12 +23,11 @@ void keyboard_pre_init_kb(void) {
 
 void led_init_ports(void) {
     setPinOutput(D1);
-    writePinHigh(D1);
 }
 
 bool led_update_kb(led_t led_state) {
     if (led_update_user(led_state)) {
-        writePin(D1, !led_state.caps_lock);
+        writePin(D1, led_state.caps_lock);
     }
     return true;
 }
diff --git a/keyboards/tgr/alice/alice.c b/keyboards/tgr/alice/alice.c
index 9fb4957ac8..a4a5c787c6 100644
--- a/keyboards/tgr/alice/alice.c
+++ b/keyboards/tgr/alice/alice.c
@@ -26,16 +26,13 @@ void led_init_ports(void) {
     setPinOutput(D0);
     setPinOutput(D1);
     setPinOutput(D6);
-    writePinHigh(D0);
-    writePinHigh(D1);
-    writePinHigh(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);
+        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/jane/jane.c b/keyboards/tgr/jane/jane.c
index 24183a0f7b..fabdc0e90c 100644
--- a/keyboards/tgr/jane/jane.c
+++ b/keyboards/tgr/jane/jane.c
@@ -24,14 +24,12 @@ void keyboard_pre_init_kb(void) {
 void led_init_ports(void) {
     setPinOutput(D1);
     setPinOutput(D6);
-    writePinHigh(D1);
-    writePinHigh(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);
+        writePin(D1, led_state.caps_lock);
+        writePin(D6, led_state.scroll_lock);
     }
     return true;
 }
diff --git a/keyboards/unikorn/unikorn.c b/keyboards/unikorn/unikorn.c
index 26a5092a59..c2c85eb984 100644
--- a/keyboards/unikorn/unikorn.c
+++ b/keyboards/unikorn/unikorn.c
@@ -23,12 +23,11 @@ void keyboard_pre_init_kb(void) {
 
 void led_init_ports(void) {
     setPinOutput(D1);
-    writePinHigh(D1);
 }
 
 bool led_update_kb(led_t led_state) {
     if (led_update_user(led_state)) {
-        writePin(D1, !led_state.caps_lock);
+        writePin(D1, led_state.caps_lock);
     }
     return true;
 }
diff --git a/keyboards/winkeyless/bface/bface.c b/keyboards/winkeyless/bface/bface.c
index 49e8bbcd2d..7d27096bad 100644
--- a/keyboards/winkeyless/bface/bface.c
+++ b/keyboards/winkeyless/bface/bface.c
@@ -25,16 +25,13 @@ void led_init_ports(void) {
     setPinOutput(D0);
     setPinOutput(D1);
     setPinOutput(D6);
-    writePinHigh(D0);
-    writePinHigh(D1);
-    writePinHigh(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);
+        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/bmini.c b/keyboards/winkeyless/bmini/bmini.c
index fe3b74be13..6529d44033 100644
--- a/keyboards/winkeyless/bmini/bmini.c
+++ b/keyboards/winkeyless/bmini/bmini.c
@@ -26,16 +26,13 @@ void led_init_ports(void) {
     setPinOutput(D0);
     setPinOutput(D1);
     setPinOutput(D6);
-    writePinHigh(D0);
-    writePinHigh(D1);
-    writePinHigh(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);
+        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/bminiex.c b/keyboards/winkeyless/bminiex/bminiex.c
index 365aeee2b2..676f88ebf5 100644
--- a/keyboards/winkeyless/bminiex/bminiex.c
+++ b/keyboards/winkeyless/bminiex/bminiex.c
@@ -26,16 +26,13 @@ void led_init_ports(void) {
     setPinOutput(D0);
     setPinOutput(D1);
     setPinOutput(D6);
-    writePinHigh(D0);
-    writePinHigh(D1);
-    writePinHigh(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);
+        writePin(D0, led_state.num_lock);
+        writePin(D1, led_state.caps_lock);
+        writePin(D6, led_state.scroll_lock);
     }
     return true;
 }
diff --git a/keyboards/ymd75/ymd75.c b/keyboards/ymd75/ymd75.c
index 1c5c380390..0870a6cc02 100644
--- a/keyboards/ymd75/ymd75.c
+++ b/keyboards/ymd75/ymd75.c
@@ -24,12 +24,11 @@ void keyboard_pre_init_kb(void) {
 
 void led_init_ports(void) {
     setPinOutput(D1);
-    writePinHigh(D1);
 }
 
 bool led_update_kb(led_t led_state) {
     if (led_update_user(led_state)) {
-        writePin(D1, !led_state.caps_lock);
+        writePin(D1, led_state.caps_lock);
     }
     return true;
 }
diff --git a/keyboards/ymd96/ymd96.c b/keyboards/ymd96/ymd96.c
index c81435e45a..5841decdab 100644
--- a/keyboards/ymd96/ymd96.c
+++ b/keyboards/ymd96/ymd96.c
@@ -26,14 +26,12 @@ void keyboard_pre_init_kb(void) {
 void led_init_ports(void) {
     setPinOutput(D0);
     setPinOutput(D1);
-    writePinHigh(D0);
-    writePinHigh(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);
+        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 e2810409a8..b35b333763 100644
--- a/keyboards/ymdk/bface/bface.c
+++ b/keyboards/ymdk/bface/bface.c
@@ -23,12 +23,11 @@ void keyboard_pre_init_kb(void) {
 
 void led_init_ports(void) {
     setPinOutput(D1);
-    writePinHigh(D1);
 }
 
 bool led_update_kb(led_t led_state) {
     if (led_update_user(led_state)) {
-        writePin(D1, !led_state.caps_lock);
+        writePin(D1, led_state.caps_lock);
     }
     return true;
 }
diff --git a/keyboards/ymdk_np21/ymdk_np21.c b/keyboards/ymdk_np21/ymdk_np21.c
index b7c2001a41..63812c9360 100644
--- a/keyboards/ymdk_np21/ymdk_np21.c
+++ b/keyboards/ymdk_np21/ymdk_np21.c
@@ -25,7 +25,6 @@ void keyboard_pre_init_kb(void) {
 
 void led_init_ports(void) {
     setPinOutput(D0);
-    writePinHigh(D0);
 }
 
 bool led_update_kb(led_t led_state) {