diff --git a/keyboards/nullbitsco/nibble/rp2040/info.json b/keyboards/nullbitsco/nibble/rp2040/info.json
index 7542082f805ddf132bb1514f3e9d9d3681ea6db0..cc1ecf2cff084c3c2ecfa45759737598a5f3509a 100644
--- a/keyboards/nullbitsco/nibble/rp2040/info.json
+++ b/keyboards/nullbitsco/nibble/rp2040/info.json
@@ -9,4 +9,4 @@
     "ws2812": {
         "pin": "GP7"
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/nullbitsco/snap/avr/keymaps/bongo_reactive/keymap.c b/keyboards/nullbitsco/snap/avr/keymaps/bongo_reactive/keymap.c
index 4b7b8e98bdc1dac7d42cc1c1fd10b9812192909c..575b8e6e93db30fec0c4d38390f4d50f5caa999b 100644
--- a/keyboards/nullbitsco/snap/avr/keymaps/bongo_reactive/keymap.c
+++ b/keyboards/nullbitsco/snap/avr/keymaps/bongo_reactive/keymap.c
@@ -92,7 +92,7 @@ static void render_status(void) {
 
     // Only update if the LED state has changed
     // Otherwise, the OLED will not turn off if an LED is on.
-    if (persistent_led_state != led_state) {
+    if (persistent_led_state.raw != led_state.raw) {
         persistent_led_state = led_state;
         
         oled_write_ln_P(PSTR(""), false);
diff --git a/keyboards/nullbitsco/snap/avr/keymaps/oled/keymap.c b/keyboards/nullbitsco/snap/avr/keymaps/oled/keymap.c
index 7edc1020b146e1ca441ba367be401ab5374c324b..720d30f9680b8de0545fcb57a3d552311551e60d 100644
--- a/keyboards/nullbitsco/snap/avr/keymaps/oled/keymap.c
+++ b/keyboards/nullbitsco/snap/avr/keymaps/oled/keymap.c
@@ -119,7 +119,7 @@ static void render_status(void) {
 
     // Only update if the LED state has changed
     // Otherwise, the OLED will not turn off if an LED is on.
-    if (persistent_led_state != led_state) {
+    if (persistent_led_state.raw != led_state.raw) {
         persistent_led_state = led_state;
         
         oled_write_ln_P(PSTR(""), false);
diff --git a/keyboards/nullbitsco/snap/avr/keymaps/typehud/keymap.c b/keyboards/nullbitsco/snap/avr/keymaps/typehud/keymap.c
index c981e378e8ad7fc83708ab0086eba51eb105e7ac..54c01c7333b3a9c78011895fae326b006ccf5ac9 100644
--- a/keyboards/nullbitsco/snap/avr/keymaps/typehud/keymap.c
+++ b/keyboards/nullbitsco/snap/avr/keymaps/typehud/keymap.c
@@ -99,7 +99,7 @@ static void render_status(void) {
 
     // Only update if the LED state has changed
     // Otherwise, the OLED will not turn off if an LED is on.
-    if (persistent_led_state != led_state) {
+    if (persistent_led_state.raw != led_state.raw) {
         persistent_led_state = led_state;
 
         oled_write_ln_P(PSTR("            "), false);
diff --git a/keyboards/nullbitsco/snap/rp2040/keymaps/bongo_reactive/keymap.c b/keyboards/nullbitsco/snap/rp2040/keymaps/bongo_reactive/keymap.c
index e1e32d1ebe02b35cc8a1ab9167a58ea551688646..c500429acb063e51f7f7b16e8a74325cccb571de 100644
--- a/keyboards/nullbitsco/snap/rp2040/keymaps/bongo_reactive/keymap.c
+++ b/keyboards/nullbitsco/snap/rp2040/keymaps/bongo_reactive/keymap.c
@@ -101,27 +101,27 @@ static void render_status(void) {
 
     // Host Keyboard LED Status
     oled_set_cursor(0, 1);
-    static uint8_t persistent_led_state = 0;
-    uint8_t led_usb_state = host_keyboard_leds();
+    static led_t persistent_led_state = {0};
+    led_t led_state = host_keyboard_led_state();
 
     // Only update if the LED state has changed
     // Otherwise, the OLED will not turn off if an LED is on.
-    if (persistent_led_state != led_usb_state) {
-        persistent_led_state = led_usb_state;
+    if (persistent_led_state.raw != led_state.raw) {
+        persistent_led_state = led_state;
         
         oled_write_ln_P(PSTR(""), false);
 
-        if (IS_LED_ON(led_usb_state, USB_LED_CAPS_LOCK)) {
+        if (led_state.caps_lock) {
             oled_set_cursor(0, 1);
             oled_write_P(PSTR("CAPS"), false);
         }
 
-        if (IS_LED_ON(led_usb_state, USB_LED_NUM_LOCK)) {
+        if (led_state.num_lock) {
             oled_set_cursor(5, 1);
             oled_write_P(PSTR("NUM"), true);
         }
 
-        if (IS_LED_ON(led_usb_state, USB_LED_SCROLL_LOCK)) {
+        if (led_state.scroll_lock) {
             oled_set_cursor(9, 1);
             oled_write_P(PSTR("SCR"), false);
         }
diff --git a/keyboards/nullbitsco/snap/rp2040/keymaps/bongo_reactive/rules.mk b/keyboards/nullbitsco/snap/rp2040/keymaps/bongo_reactive/rules.mk
index d9301f9e1a11fa039380488530a8d135819c2b07..f2387d183ade8686ca4f073ddd4c8099d7d54737 100644
--- a/keyboards/nullbitsco/snap/rp2040/keymaps/bongo_reactive/rules.mk
+++ b/keyboards/nullbitsco/snap/rp2040/keymaps/bongo_reactive/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 VIA_ENABLE = yes
 WPM_ENABLE = yes
 ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/nullbitsco/snap/rp2040/keymaps/bongo_reactive_single_oled/rules.mk b/keyboards/nullbitsco/snap/rp2040/keymaps/bongo_reactive_single_oled/rules.mk
index d0a184e961f1470b626158efd5c1e28bb6edc21f..506f77c16d69d4a7bc0431cfea4e7979beab47b1 100644
--- a/keyboards/nullbitsco/snap/rp2040/keymaps/bongo_reactive_single_oled/rules.mk
+++ b/keyboards/nullbitsco/snap/rp2040/keymaps/bongo_reactive_single_oled/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 WPM_ENABLE = yes
 VIA_ENABLE = yes
 ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/nullbitsco/snap/rp2040/keymaps/oled/keymap.c b/keyboards/nullbitsco/snap/rp2040/keymaps/oled/keymap.c
index 8d9c5fa4e48bf4491b08bc0ea803f6333fd4a659..2d988e6801c5f8af7456aee213ebc60f398f32d6 100644
--- a/keyboards/nullbitsco/snap/rp2040/keymaps/oled/keymap.c
+++ b/keyboards/nullbitsco/snap/rp2040/keymaps/oled/keymap.c
@@ -126,27 +126,27 @@ static void render_status(void) {
 
     // Host Keyboard LED Status
     oled_set_cursor(0, 1);
-    static uint8_t persistent_led_state = 0;
-    uint8_t led_usb_state = host_keyboard_leds();
+    static led_t persistent_led_state = {0};
+    led_t led_state = host_keyboard_led_state();
 
     // Only update if the LED state has changed
     // Otherwise, the OLED will not turn off if an LED is on.
-    if (persistent_led_state != led_usb_state) {
-        persistent_led_state = led_usb_state;
+    if (persistent_led_state.raw != led_state.raw) {
+        persistent_led_state = led_state;
         
         oled_write_ln_P(PSTR(""), false);
 
-        if (IS_LED_ON(led_usb_state, USB_LED_CAPS_LOCK)) {
+        if (led_state.caps_lock) {
             oled_set_cursor(0, 1);
             oled_write_P(PSTR("CAPS"), false);
         }
 
-        if (IS_LED_ON(led_usb_state, USB_LED_NUM_LOCK)) {
+        if (led_state.num_lock) {
             oled_set_cursor(5, 1);
             oled_write_P(PSTR("NUM"), true);
         }
 
-        if (IS_LED_ON(led_usb_state, USB_LED_SCROLL_LOCK)) {
+        if (led_state.scroll_lock) {
             oled_set_cursor(9, 1);
             oled_write_P(PSTR("SCR"), false);
         }
diff --git a/keyboards/nullbitsco/snap/rp2040/keymaps/oled/rules.mk b/keyboards/nullbitsco/snap/rp2040/keymaps/oled/rules.mk
index d0a184e961f1470b626158efd5c1e28bb6edc21f..506f77c16d69d4a7bc0431cfea4e7979beab47b1 100644
--- a/keyboards/nullbitsco/snap/rp2040/keymaps/oled/rules.mk
+++ b/keyboards/nullbitsco/snap/rp2040/keymaps/oled/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 WPM_ENABLE = yes
 VIA_ENABLE = yes
 ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/nullbitsco/snap/rp2040/keymaps/typehud/keymap.c b/keyboards/nullbitsco/snap/rp2040/keymaps/typehud/keymap.c
index cc218713bcd00dd93a62d07c60b340ec0993dd75..7ef5dd7a827b06cfe8478efdfbb514bbd545d7bd 100644
--- a/keyboards/nullbitsco/snap/rp2040/keymaps/typehud/keymap.c
+++ b/keyboards/nullbitsco/snap/rp2040/keymaps/typehud/keymap.c
@@ -107,27 +107,27 @@ static void render_status(void) {
 
     // Host Keyboard LED Status
     oled_set_cursor(0, 1);
-    static uint8_t persistent_led_state = 0;
-    uint8_t        led_usb_state        = host_keyboard_leds();
+    static led_t persistent_led_state = {0};
+    led_t led_state = host_keyboard_led_state();
 
     // Only update if the LED state has changed
     // Otherwise, the OLED will not turn off if an LED is on.
-    if (persistent_led_state != led_usb_state) {
-        persistent_led_state = led_usb_state;
+    if (persistent_led_state.raw != led_state.raw) {
+        persistent_led_state = led_state;
 
         oled_write_ln_P(PSTR("            "), false);
 
-        if (IS_LED_ON(led_usb_state, USB_LED_CAPS_LOCK)) {
+        if (led_state.caps_lock) {
             oled_set_cursor(0, 1);
             oled_write_P(PSTR("CAPS"), false);
         }
 
-        if (IS_LED_ON(led_usb_state, USB_LED_NUM_LOCK)) {
+        if (led_state.num_lock) {
             oled_set_cursor(5, 1);
             oled_write_P(PSTR("NUM"), true);
         }
 
-        if (IS_LED_ON(led_usb_state, USB_LED_SCROLL_LOCK)) {
+        if (led_state.scroll_lock) {
             oled_set_cursor(9, 1);
             oled_write_P(PSTR("SCR"), false);
         }
diff --git a/keyboards/nullbitsco/snap/rp2040/keymaps/typehud/rules.mk b/keyboards/nullbitsco/snap/rp2040/keymaps/typehud/rules.mk
index 151e44f4aac8385dff3c8ccf5852ed6768c61e6d..16bd6085c0594d041196fe66b148d54e5fe9b1d7 100644
--- a/keyboards/nullbitsco/snap/rp2040/keymaps/typehud/rules.mk
+++ b/keyboards/nullbitsco/snap/rp2040/keymaps/typehud/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 WPM_ENABLE = yes
 VIA_ENABLE = yes
 ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/nullbitsco/tidbit/avr/info.json b/keyboards/nullbitsco/tidbit/avr/info.json
index 9a04a8b7dffe89f8f8c447ae6beaae4fb40a6cc9..324d2fb5cf844a7d2a823b64f44664cc0c509c88 100644
--- a/keyboards/nullbitsco/tidbit/avr/info.json
+++ b/keyboards/nullbitsco/tidbit/avr/info.json
@@ -7,13 +7,6 @@
             {"pin_a": "D3", "pin_b": "D2"}
         ]
     },
-    "ws2812": {
-        "pin": "B6"
-    },
-    "matrix_pins": {
-        "cols": [null, null, "F4", "F5", "F6", "F7"],
-        "rows": ["B1", "E6", "D7", "C6", "D4"]
-    },
     "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/nullbitsco/tidbit/rp2040/info.json b/keyboards/nullbitsco/tidbit/rp2040/info.json
index 1aa61e7ec4aecfaa319b09cabe91d336a4097b16..d03abe1ee1463bf5d1caad381341af0ee8596cae 100644
--- a/keyboards/nullbitsco/tidbit/rp2040/info.json
+++ b/keyboards/nullbitsco/tidbit/rp2040/info.json
@@ -7,6 +7,7 @@
             {"pin_a": "GP0", "pin_b": "GP1"}
         ]
     },
+    "diode_direction": "ROW2COL",
     "processor": "RP2040",
     "bootloader": "rp2040",
     "ws2812": {