diff --git a/keyboards/fingerpunch/barobord/keymaps/default/keymap.c b/keyboards/fingerpunch/barobord/keymaps/default/keymap.c
index 6e55bb167c..6e4c7c6e6b 100644
--- a/keyboards/fingerpunch/barobord/keymaps/default/keymap.c
+++ b/keyboards/fingerpunch/barobord/keymaps/default/keymap.c
@@ -146,28 +146,28 @@ layer_state_t layer_state_set_user(layer_state_t state) {
     switch(get_highest_layer(state)) {
         case _QWERTY:
             if (is_caps_lock_on) {
-                trackball_set_rgbw(RGB_RED, 0x00);
+                pimoroni_trackball_set_rgbw(RGB_RED, 0x00);
             } else {
-                trackball_set_rgbw(RGB_BLUE, 0x00);
+                pimoroni_trackball_set_rgbw(RGB_BLUE, 0x00);
             }
             break;
         case _COLEMAK:
-            trackball_set_rgbw(RGB_GREEN, 0x00);
+            pimoroni_trackball_set_rgbw(RGB_GREEN, 0x00);
             break;
         case _LOWER:
-            trackball_set_rgbw(RGB_PURPLE, 0x00);
+            pimoroni_trackball_set_rgbw(RGB_PURPLE, 0x00);
             break;
         case _RAISE:
-            trackball_set_rgbw(RGB_YELLOW, 0x00);
+            pimoroni_trackball_set_rgbw(RGB_YELLOW, 0x00);
             break;
         case _ADJUST:
-            trackball_set_rgbw(RGB_ORANGE, 0x00);
+            pimoroni_trackball_set_rgbw(RGB_ORANGE, 0x00);
             break;
         default: //  for any other layers, or the default layer
             if (is_caps_lock_on) {
-                trackball_set_rgbw(RGB_RED, 0x00);
+                pimoroni_trackball_set_rgbw(RGB_RED, 0x00);
             } else {
-                trackball_set_rgbw(RGB_BLUE, 0x00);
+                pimoroni_trackball_set_rgbw(RGB_BLUE, 0x00);
             }
             break;
     }
@@ -178,7 +178,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 void keyboard_post_init_user(void) {
     is_caps_lock_on = false;
     #ifdef PIMORONI_TRACKBALL_ENABLE
-    trackball_set_rgbw(RGB_BLUE, 0x00);
+    pimoroni_trackball_set_rgbw(RGB_BLUE, 0x00);
     #endif
 }
 
diff --git a/keyboards/fingerpunch/barobord/keymaps/via/keymap.c b/keyboards/fingerpunch/barobord/keymaps/via/keymap.c
index 88b4f77c61..2bde8ddc3e 100644
--- a/keyboards/fingerpunch/barobord/keymaps/via/keymap.c
+++ b/keyboards/fingerpunch/barobord/keymaps/via/keymap.c
@@ -120,25 +120,25 @@ layer_state_t layer_state_set_user(layer_state_t state) {
     switch(get_highest_layer(state)) {
         case _QWERTY:
             if (is_caps_lock_on) {
-                trackball_set_rgbw(RGB_RED, 0x00);
+                pimoroni_trackball_set_rgbw(RGB_RED, 0x00);
             } else {
-                trackball_set_rgbw(RGB_BLUE, 0x00);
+                pimoroni_trackball_set_rgbw(RGB_BLUE, 0x00);
             }
             break;
         case _LOWER:
-            trackball_set_rgbw(RGB_PURPLE, 0x00);
+            pimoroni_trackball_set_rgbw(RGB_PURPLE, 0x00);
             break;
         case _RAISE:
-            trackball_set_rgbw(RGB_YELLOW, 0x00);
+            pimoroni_trackball_set_rgbw(RGB_YELLOW, 0x00);
             break;
         case _ADJUST:
-            trackball_set_rgbw(RGB_ORANGE, 0x00);
+            pimoroni_trackball_set_rgbw(RGB_ORANGE, 0x00);
             break;
         default: //  for any other layers, or the default layer
             if (is_caps_lock_on) {
-                trackball_set_rgbw(RGB_RED, 0x00);
+                pimoroni_trackball_set_rgbw(RGB_RED, 0x00);
             } else {
-                trackball_set_rgbw(RGB_BLUE, 0x00);
+                pimoroni_trackball_set_rgbw(RGB_BLUE, 0x00);
             }
             break;
     }
@@ -149,7 +149,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 void keyboard_post_init_user(void) {
     is_caps_lock_on = false;
     #ifdef PIMORONI_TRACKBALL_ENABLE
-    trackball_set_rgbw(RGB_BLUE, 0x00);
+    pimoroni_trackball_set_rgbw(RGB_BLUE, 0x00);
     #endif
 }
 
diff --git a/keyboards/fingerpunch/barobord_byomcu/keymaps/default/keymap.c b/keyboards/fingerpunch/barobord_byomcu/keymaps/default/keymap.c
index 289888090e..6b935d6ec0 100644
--- a/keyboards/fingerpunch/barobord_byomcu/keymaps/default/keymap.c
+++ b/keyboards/fingerpunch/barobord_byomcu/keymaps/default/keymap.c
@@ -146,28 +146,28 @@ layer_state_t layer_state_set_user(layer_state_t state) {
     switch(get_highest_layer(state)) {
         case _QWERTY:
             if (is_caps_lock_on) {
-                trackball_set_rgbw(RGB_RED, 0x00);
+                pimoroni_trackball_set_rgbw(RGB_RED, 0x00);
             } else {
-                trackball_set_rgbw(RGB_BLUE, 0x00);
+                pimoroni_trackball_set_rgbw(RGB_BLUE, 0x00);
             }
             break;
         case _COLEMAK:
-            trackball_set_rgbw(RGB_GREEN, 0x00);
+            pimoroni_trackball_set_rgbw(RGB_GREEN, 0x00);
             break;
         case _LOWER:
-            trackball_set_rgbw(RGB_PURPLE, 0x00);
+            pimoroni_trackball_set_rgbw(RGB_PURPLE, 0x00);
             break;
         case _RAISE:
-            trackball_set_rgbw(RGB_YELLOW, 0x00);
+            pimoroni_trackball_set_rgbw(RGB_YELLOW, 0x00);
             break;
         case _ADJUST:
-            trackball_set_rgbw(RGB_ORANGE, 0x00);
+            pimoroni_trackball_set_rgbw(RGB_ORANGE, 0x00);
             break;
         default: //  for any other layers, or the default layer
             if (is_caps_lock_on) {
-                trackball_set_rgbw(RGB_RED, 0x00);
+                pimoroni_trackball_set_rgbw(RGB_RED, 0x00);
             } else {
-                trackball_set_rgbw(RGB_BLUE, 0x00);
+                pimoroni_trackball_set_rgbw(RGB_BLUE, 0x00);
             }
             break;
     }
@@ -178,7 +178,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 void keyboard_post_init_user(void) {
     is_caps_lock_on = false;
     #ifdef PIMORONI_TRACKBALL_ENABLE
-    trackball_set_rgbw(RGB_BLUE, 0x00);
+    pimoroni_trackball_set_rgbw(RGB_BLUE, 0x00);
     #endif
 }
 
diff --git a/keyboards/fingerpunch/bgkeeb/keymaps/default/keymap.c b/keyboards/fingerpunch/bgkeeb/keymaps/default/keymap.c
index f289fbe172..6e11769199 100644
--- a/keyboards/fingerpunch/bgkeeb/keymaps/default/keymap.c
+++ b/keyboards/fingerpunch/bgkeeb/keymaps/default/keymap.c
@@ -141,28 +141,28 @@ layer_state_t layer_state_set_user(layer_state_t state) {
     switch(get_highest_layer(state)) {
         case _QWERTY:
             if (is_caps_lock_on) {
-                trackball_set_rgbw(RGB_RED, 0x00);
+                pimoroni_trackball_set_rgbw(RGB_RED, 0x00);
             } else {
-                trackball_set_rgbw(RGB_BLUE, 0x00);
+                pimoroni_trackball_set_rgbw(RGB_BLUE, 0x00);
             }
             break;
         case _COLEMAK:
-            trackball_set_rgbw(RGB_GREEN, 0x00);
+            pimoroni_trackball_set_rgbw(RGB_GREEN, 0x00);
             break;
         case _LOWER:
-            trackball_set_rgbw(RGB_PURPLE, 0x00);
+            pimoroni_trackball_set_rgbw(RGB_PURPLE, 0x00);
             break;
         case _RAISE:
-            trackball_set_rgbw(RGB_YELLOW, 0x00);
+            pimoroni_trackball_set_rgbw(RGB_YELLOW, 0x00);
             break;
         case _ADJUST:
-            trackball_set_rgbw(RGB_ORANGE, 0x00);
+            pimoroni_trackball_set_rgbw(RGB_ORANGE, 0x00);
             break;
         default: //  for any other layers, or the default layer
             if (is_caps_lock_on) {
-                trackball_set_rgbw(RGB_RED, 0x00);
+                pimoroni_trackball_set_rgbw(RGB_RED, 0x00);
             } else {
-                trackball_set_rgbw(RGB_BLUE, 0x00);
+                pimoroni_trackball_set_rgbw(RGB_BLUE, 0x00);
             }
             break;
     }
@@ -173,7 +173,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 void keyboard_post_init_user(void) {
     is_caps_lock_on = false;
     #ifdef PIMORONI_TRACKBALL_ENABLE
-    trackball_set_rgbw(RGB_BLUE, 0x00);
+    pimoroni_trackball_set_rgbw(RGB_BLUE, 0x00);
     #endif
 }
 
diff --git a/keyboards/fingerpunch/ffkb/config.h b/keyboards/fingerpunch/ffkb/config.h
index cc61ce157f..a41862a989 100644
--- a/keyboards/fingerpunch/ffkb/config.h
+++ b/keyboards/fingerpunch/ffkb/config.h
@@ -144,7 +144,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef PIMORONI_TRACKBALL_ENABLE
 #define PIMORONI_TRACKBALL_ROTATE
 #define PIMORONI_TRACKBALL_CLICK
-#define PIMORONI_TRACKBALL_INVERT_X
 #endif
 
 // If using encoder type 2, uncomment this
diff --git a/keyboards/fingerpunch/ffkb/keymaps/default/keymap.c b/keyboards/fingerpunch/ffkb/keymaps/default/keymap.c
index 5bfef6ff86..0a997681cf 100644
--- a/keyboards/fingerpunch/ffkb/keymaps/default/keymap.c
+++ b/keyboards/fingerpunch/ffkb/keymaps/default/keymap.c
@@ -269,6 +269,73 @@ static void render_logo(void) {
 
 }
 
+/*
+static void render_status(void) {
+    oled_write_P(PSTR("    Layer: "), false);
+    switch (get_highest_layer(layer_state|default_layer_state)) {
+        case _ALPHA_ALT:
+            oled_write_P(PSTR("Alphalt   "), false);
+            break;
+        case _ALPHA:
+            oled_write_P(PSTR("Alpha     "), false);
+            break;
+        case _NAVIGATION:
+            oled_write_P(PSTR("Nav       "), false);
+            break;
+        case _SYMBOLS:
+            oled_write_P(PSTR("Symbols   "), false);
+            break;
+        case _FUNCTION:
+            oled_write_P(PSTR("Function  "), false);
+            break;
+        case _MEDIA:
+            oled_write_P(PSTR("Media     "), false);
+            break;
+        case _MOUSE:
+            oled_write_P(PSTR("Mouse     "), false);
+            break;
+        default:
+            oled_write_P(PSTR("Unkn      "), false);
+            break;
+    }
+
+    // // Write host Keyboard LED Status to OLEDs
+    // led_t led_usb_state = host_keyboard_led_state();
+    // oled_write_P(led_usb_state.num_lock    ? PSTR("NUMLCK ") : PSTR("       "), false);
+    // oled_write_P(led_usb_state.caps_lock   ? PSTR("CAPLCK ") : PSTR("       "), false);
+    // oled_write_P(led_usb_state.scroll_lock ? PSTR("SCRLCK ") : PSTR("       "), false);
+
+    // ffkb logo, 128x48px
+    static const char ffkb_logo_small [] PROGMEM = {
+    0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x40, 0x40, 
+    0x40, 0x40, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x40, 0x40, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 
+    0xc0, 0x40, 0x40, 0x40, 0x40, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0xf8, 0xfe, 0x8e, 0xdc, 0xf0, 0x70, 0x60, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 
+    0x30, 0x70, 0xf0, 0xd8, 0x9c, 0x9e, 0xfc, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 
+    0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x40, 0x40, 0x00, 0x40, 0x40, 0xc0, 0xc0, 0xc0, 
+    0x40, 0x40, 0x40, 0x40, 0x00, 0x00, 0x40, 0x40, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 
+    0x40, 0x40, 0x40, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x10, 0x10, 
+    0x18, 0x3c, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+    0xff, 0x10, 0x10, 0x18, 0x3c, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x20, 0x30, 0x78, 0x7c, 
+    0xff, 0xd7, 0x9b, 0x18, 0x78, 0x78, 0x18, 0x30, 0x70, 0xe0, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0x30, 
+    0x18, 0x58, 0x78, 0x18, 0x99, 0x9b, 0xf7, 0xfc, 0x78, 0x30, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x38, 0x78, 0xfc, 0xfc, 0xfe, 0xff, 0xf8, 0xf0, 
+    0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+    0x10, 0x10, 0x10, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xe7, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x08, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
+    0x0f, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x01, 0x01, 0x01, 0x03, 0x07, 0x0e, 0x0c, 0x18, 0x3f, 0x7f, 0x68, 0x68, 0x3f, 0x3f, 0x0c, 
+    0x0c, 0x06, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 
+    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x08, 0x00, 0x01, 0x0b, 0x0f, 0x0f, 0x0f, 0x0f, 
+    0x0f, 0x0f, 0x0e, 0x0c, 0x00, 0x00, 0x00, 0x08, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
+    0x08, 0x08, 0x0c, 0x0f, 0x0f, 0x0f, 0x07, 0x07, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    oled_write_raw_P(ffkb_logo_small, sizeof(ffkb_logo_small));
+}
+*/
+
 bool oled_task_user(void) {
     // If you don't want to display the logo, switch
     if (false) {
diff --git a/keyboards/fingerpunch/ffkb/keymaps/sadekbaroudi/keymap.c b/keyboards/fingerpunch/ffkb/keymaps/sadekbaroudi/keymap.c
index 4c48fc573a..bc7d35f2e6 100644
--- a/keyboards/fingerpunch/ffkb/keymaps/sadekbaroudi/keymap.c
+++ b/keyboards/fingerpunch/ffkb/keymaps/sadekbaroudi/keymap.c
@@ -224,40 +224,68 @@ static void render_logo(void) {
 
 /*
 static void render_status(void) {
-  oled_write_P(PSTR("ffkb\n"), false);
-  // Uncomment to set up WPM
-  //  sprintf(wpm_as_str, "WPM %03d", get_current_wpm());
-  //  oled_write(wpm_as_str,false);
-  led_t led_state = host_keyboard_led_state();
-  oled_write_P(PSTR("Caps: "), false);
-  oled_write_P(led_state.caps_lock ? PSTR("on ") : PSTR("off"), false);
-  oled_write_P(PSTR("\n"),false);
-  switch (get_highest_layer(layer_state)) {
+    oled_write_P(PSTR("    Layer: "), false);
+    switch (get_highest_layer(layer_state|default_layer_state)) {
         case _ALPHA_ALT:
-            oled_write_P(PSTR("Alphalt"), false);
+            oled_write_P(PSTR("Alphalt   "), false);
             break;
         case _ALPHA:
-            oled_write_P(PSTR("Alpha  "), false);
+            oled_write_P(PSTR("Alpha     "), false);
             break;
         case _NAVIGATION:
-            oled_write_P(PSTR("Nav    "), false);
+            oled_write_P(PSTR("Nav       "), false);
             break;
         case _SYMBOLS:
-            oled_write_P(PSTR("Symbols"), false);
+            oled_write_P(PSTR("Symbols   "), false);
             break;
         case _FUNCTION:
-            oled_write_P(PSTR("Function"), false);
+            oled_write_P(PSTR("Function  "), false);
             break;
         case _MEDIA:
-            oled_write_P(PSTR("Media  "), false);
+            oled_write_P(PSTR("Media     "), false);
             break;
         case _MOUSE:
-            oled_write_P(PSTR("Mouse  "), false);
+            oled_write_P(PSTR("Mouse     "), false);
             break;
         default:
-            oled_write_P(PSTR("Unkn "), false);
+            oled_write_P(PSTR("Unkn      "), false);
             break;
     }
+
+    // // Write host Keyboard LED Status to OLEDs
+    // led_t led_usb_state = host_keyboard_led_state();
+    // oled_write_P(led_usb_state.num_lock    ? PSTR("NUMLCK ") : PSTR("       "), false);
+    // oled_write_P(led_usb_state.caps_lock   ? PSTR("CAPLCK ") : PSTR("       "), false);
+    // oled_write_P(led_usb_state.scroll_lock ? PSTR("SCRLCK ") : PSTR("       "), false);
+
+    // ffkb logo, 128x48px
+    static const char ffkb_logo_small [] PROGMEM = {
+    0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x40, 0x40, 
+    0x40, 0x40, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x40, 0x40, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 
+    0xc0, 0x40, 0x40, 0x40, 0x40, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0xf8, 0xfe, 0x8e, 0xdc, 0xf0, 0x70, 0x60, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 
+    0x30, 0x70, 0xf0, 0xd8, 0x9c, 0x9e, 0xfc, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 
+    0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x40, 0x40, 0x00, 0x40, 0x40, 0xc0, 0xc0, 0xc0, 
+    0x40, 0x40, 0x40, 0x40, 0x00, 0x00, 0x40, 0x40, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 
+    0x40, 0x40, 0x40, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x10, 0x10, 
+    0x18, 0x3c, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+    0xff, 0x10, 0x10, 0x18, 0x3c, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x20, 0x30, 0x78, 0x7c, 
+    0xff, 0xd7, 0x9b, 0x18, 0x78, 0x78, 0x18, 0x30, 0x70, 0xe0, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0x30, 
+    0x18, 0x58, 0x78, 0x18, 0x99, 0x9b, 0xf7, 0xfc, 0x78, 0x30, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x38, 0x78, 0xfc, 0xfc, 0xfe, 0xff, 0xf8, 0xf0, 
+    0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+    0x10, 0x10, 0x10, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xe7, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x08, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
+    0x0f, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x01, 0x01, 0x01, 0x03, 0x07, 0x0e, 0x0c, 0x18, 0x3f, 0x7f, 0x68, 0x68, 0x3f, 0x3f, 0x0c, 
+    0x0c, 0x06, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 
+    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x08, 0x00, 0x01, 0x0b, 0x0f, 0x0f, 0x0f, 0x0f, 
+    0x0f, 0x0f, 0x0e, 0x0c, 0x00, 0x00, 0x00, 0x08, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
+    0x08, 0x08, 0x0c, 0x0f, 0x0f, 0x0f, 0x07, 0x07, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    oled_write_raw_P(ffkb_logo_small, sizeof(ffkb_logo_small));
 }
 */
 
@@ -287,31 +315,31 @@ layer_state_t layer_state_set_keymap(layer_state_t state) {
     switch (get_highest_layer(state)) {
     case _ALPHA_ALT:
         if (is_caps_lock_on) {
-            trackball_set_rgbw(RGB_CYAN, 0x00);
+            pimoroni_trackball_set_rgbw(RGB_CYAN, 0x00);
         } else {
-            trackball_set_rgbw(RGB_BLUE, 0x00);
+            pimoroni_trackball_set_rgbw(RGB_BLUE, 0x00);
         }
         break;
     case _NAVIGATION:
-        trackball_set_rgbw(RGB_GREEN, 0x00);
+        pimoroni_trackball_set_rgbw(RGB_GREEN, 0x00);
         break;
     case _SYMBOLS:
-        trackball_set_rgbw(RGB_PURPLE, 0x00);
+        pimoroni_trackball_set_rgbw(RGB_PURPLE, 0x00);
         break;
     case _FUNCTION:
-        trackball_set_rgbw(RGB_YELLOW, 0x00);
+        pimoroni_trackball_set_rgbw(RGB_YELLOW, 0x00);
         break;
     case _MEDIA:
-        trackball_set_rgbw(RGB_ORANGE, 0x00);
+        pimoroni_trackball_set_rgbw(RGB_ORANGE, 0x00);
         break;
     case _MOUSE:
-        trackball_set_rgbw(RGB_WHITE, 0x00);
+        pimoroni_trackball_set_rgbw(RGB_WHITE, 0x00);
         break;
     default: //  for any other layers, or the default layer
         if (is_caps_lock_on) {
-            trackball_set_rgbw(RGB_CYAN, 0x00);
+            pimoroni_trackball_set_rgbw(RGB_CYAN, 0x00);
         } else {
-            trackball_set_rgbw(RGB_BLUE, 0x00);
+            pimoroni_trackball_set_rgbw(RGB_BLUE, 0x00);
         }
         break;
     }
diff --git a/keyboards/fingerpunch/ffkb/keymaps/via/keymap.c b/keyboards/fingerpunch/ffkb/keymaps/via/keymap.c
index 1faa31e397..4f76efda94 100644
--- a/keyboards/fingerpunch/ffkb/keymaps/via/keymap.c
+++ b/keyboards/fingerpunch/ffkb/keymaps/via/keymap.c
@@ -300,6 +300,73 @@ static void render_logo(void) {
 
 }
 
+/*
+static void render_status(void) {
+    oled_write_P(PSTR("    Layer: "), false);
+    switch (get_highest_layer(layer_state|default_layer_state)) {
+        case _ALPHA_ALT:
+            oled_write_P(PSTR("Alphalt   "), false);
+            break;
+        case _ALPHA:
+            oled_write_P(PSTR("Alpha     "), false);
+            break;
+        case _NAVIGATION:
+            oled_write_P(PSTR("Nav       "), false);
+            break;
+        case _SYMBOLS:
+            oled_write_P(PSTR("Symbols   "), false);
+            break;
+        case _FUNCTION:
+            oled_write_P(PSTR("Function  "), false);
+            break;
+        case _MEDIA:
+            oled_write_P(PSTR("Media     "), false);
+            break;
+        case _MOUSE:
+            oled_write_P(PSTR("Mouse     "), false);
+            break;
+        default:
+            oled_write_P(PSTR("Unkn      "), false);
+            break;
+    }
+
+    // // Write host Keyboard LED Status to OLEDs
+    // led_t led_usb_state = host_keyboard_led_state();
+    // oled_write_P(led_usb_state.num_lock    ? PSTR("NUMLCK ") : PSTR("       "), false);
+    // oled_write_P(led_usb_state.caps_lock   ? PSTR("CAPLCK ") : PSTR("       "), false);
+    // oled_write_P(led_usb_state.scroll_lock ? PSTR("SCRLCK ") : PSTR("       "), false);
+
+    // ffkb logo, 128x48px
+    static const char ffkb_logo_small [] PROGMEM = {
+    0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x40, 0x40, 
+    0x40, 0x40, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x40, 0x40, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 
+    0xc0, 0x40, 0x40, 0x40, 0x40, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0xf8, 0xfe, 0x8e, 0xdc, 0xf0, 0x70, 0x60, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 
+    0x30, 0x70, 0xf0, 0xd8, 0x9c, 0x9e, 0xfc, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 
+    0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x40, 0x40, 0x00, 0x40, 0x40, 0xc0, 0xc0, 0xc0, 
+    0x40, 0x40, 0x40, 0x40, 0x00, 0x00, 0x40, 0x40, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 
+    0x40, 0x40, 0x40, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x10, 0x10, 
+    0x18, 0x3c, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+    0xff, 0x10, 0x10, 0x18, 0x3c, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x20, 0x30, 0x78, 0x7c, 
+    0xff, 0xd7, 0x9b, 0x18, 0x78, 0x78, 0x18, 0x30, 0x70, 0xe0, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0x30, 
+    0x18, 0x58, 0x78, 0x18, 0x99, 0x9b, 0xf7, 0xfc, 0x78, 0x30, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x38, 0x78, 0xfc, 0xfc, 0xfe, 0xff, 0xf8, 0xf0, 
+    0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+    0x10, 0x10, 0x10, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xe7, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x08, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
+    0x0f, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x01, 0x01, 0x01, 0x03, 0x07, 0x0e, 0x0c, 0x18, 0x3f, 0x7f, 0x68, 0x68, 0x3f, 0x3f, 0x0c, 
+    0x0c, 0x06, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 
+    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x08, 0x00, 0x01, 0x0b, 0x0f, 0x0f, 0x0f, 0x0f, 
+    0x0f, 0x0f, 0x0e, 0x0c, 0x00, 0x00, 0x00, 0x08, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
+    0x08, 0x08, 0x0c, 0x0f, 0x0f, 0x0f, 0x07, 0x07, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    oled_write_raw_P(ffkb_logo_small, sizeof(ffkb_logo_small));
+}
+*/
+
 bool oled_task_user(void) {
     // If you don't want to display the logo, switch
     if (false) {
diff --git a/keyboards/fingerpunch/ffkb/oled/config.h b/keyboards/fingerpunch/ffkb/oled/config.h
index 94472f300a..641c2863fb 100644
--- a/keyboards/fingerpunch/ffkb/oled/config.h
+++ b/keyboards/fingerpunch/ffkb/oled/config.h
@@ -19,5 +19,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define XOIVIOX_OLED
 #endif
 
+#undef ENCODERS_PAD_A
+#define ENCODERS_PAD_A {D7, D4}
+#undef ENCODERS_PAD_B
+#define ENCODERS_PAD_B {B4, D6}
+
 #pragma once
 #include "config_common.h"
diff --git a/keyboards/fingerpunch/ffkb/oled_ec11/config.h b/keyboards/fingerpunch/ffkb/oled_ec11/config.h
index ba88336109..2abde390b6 100644
--- a/keyboards/fingerpunch/ffkb/oled_ec11/config.h
+++ b/keyboards/fingerpunch/ffkb/oled_ec11/config.h
@@ -25,5 +25,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define ENCODERS_C_REVERSE
 
+#undef ENCODERS_PAD_A
+#define ENCODERS_PAD_A {D7, D4}
+#undef ENCODERS_PAD_B
+#define ENCODERS_PAD_B {B4, D6}
+
 #pragma once
 #include "config_common.h"
diff --git a/keyboards/fingerpunch/ffkb/oled_evq/config.h b/keyboards/fingerpunch/ffkb/oled_evq/config.h
index 24f0344fb6..b3e4109436 100644
--- a/keyboards/fingerpunch/ffkb/oled_evq/config.h
+++ b/keyboards/fingerpunch/ffkb/oled_evq/config.h
@@ -26,5 +26,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODERS_A_REVERSE
 #define ENCODERS_B_REVERSE
 
+#undef ENCODERS_PAD_A
+#define ENCODERS_PAD_A {D7, D4}
+#undef ENCODERS_PAD_B
+#define ENCODERS_PAD_B {B4, D6}
+
 #pragma once
 #include "config_common.h"
diff --git a/keyboards/fingerpunch/ffkb/pimoroni/config.h b/keyboards/fingerpunch/ffkb/pimoroni/config.h
index 6fb4343b33..87884ae93c 100644
--- a/keyboards/fingerpunch/ffkb/pimoroni/config.h
+++ b/keyboards/fingerpunch/ffkb/pimoroni/config.h
@@ -19,5 +19,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define XOIVIOX_PIMORONI
 #endif
 
+#undef ENCODERS_PAD_A
+#define ENCODERS_PAD_A {D7, D4}
+#undef ENCODERS_PAD_B
+#define ENCODERS_PAD_B {B4, D6}
+
 #pragma once
 #include "config_common.h"
diff --git a/keyboards/fingerpunch/ffkb/pimoroni_ec11/config.h b/keyboards/fingerpunch/ffkb/pimoroni_ec11/config.h
index 615524b15c..0d557cb64f 100644
--- a/keyboards/fingerpunch/ffkb/pimoroni_ec11/config.h
+++ b/keyboards/fingerpunch/ffkb/pimoroni_ec11/config.h
@@ -25,5 +25,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define ENCODERS_C_REVERSE
 
+#undef ENCODERS_PAD_A
+#define ENCODERS_PAD_A {D7, D4}
+#undef ENCODERS_PAD_B
+#define ENCODERS_PAD_B {B4, D6}
+
 #pragma once
 #include "config_common.h"
diff --git a/keyboards/fingerpunch/ffkb/pimoroni_ec11/rules.mk b/keyboards/fingerpunch/ffkb/pimoroni_ec11/rules.mk
index a7c54a20c6..d3824dd1de 100644
--- a/keyboards/fingerpunch/ffkb/pimoroni_ec11/rules.mk
+++ b/keyboards/fingerpunch/ffkb/pimoroni_ec11/rules.mk
@@ -22,6 +22,7 @@ ENCODER_ENABLE = yes
 
 ifeq ($(strip $(PIMORONI_TRACKBALL_ENABLE)), yes)
     POINTING_DEVICE_ENABLE := yes
+    POINTING_DEVICE_DRIVER := pimoroni_trackball
     SRC += drivers/sensors/pimoroni_trackball.c
     QUANTUM_LIB_SRC += i2c_master.c
     OPT_DEFS += -DPIMORONI_TRACKBALL_ENABLE
diff --git a/keyboards/fingerpunch/ffkb/pimoroni_evq/config.h b/keyboards/fingerpunch/ffkb/pimoroni_evq/config.h
index 81df828eeb..bc94c96495 100644
--- a/keyboards/fingerpunch/ffkb/pimoroni_evq/config.h
+++ b/keyboards/fingerpunch/ffkb/pimoroni_evq/config.h
@@ -26,5 +26,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODERS_A_REVERSE
 #define ENCODERS_B_REVERSE
 
+#undef ENCODERS_PAD_A
+#define ENCODERS_PAD_A {D7, D4}
+#undef ENCODERS_PAD_B
+#define ENCODERS_PAD_B {B4, D6}
+
 #pragma once
 #include "config_common.h"
diff --git a/keyboards/fingerpunch/ffkb/rgblight_oled/config.h b/keyboards/fingerpunch/ffkb/rgblight_oled/config.h
index 7936809e36..76e0fcb66d 100644
--- a/keyboards/fingerpunch/ffkb/rgblight_oled/config.h
+++ b/keyboards/fingerpunch/ffkb/rgblight_oled/config.h
@@ -23,5 +23,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define XOIVIOX_OLED
 #endif
 
+#undef ENCODERS_PAD_A
+#define ENCODERS_PAD_A {D7, D4}
+#undef ENCODERS_PAD_B
+#define ENCODERS_PAD_B {B4, D6}
+
 #pragma once
 #include "config_common.h"
diff --git a/keyboards/fingerpunch/ffkb/rgblight_oled_ec11/config.h b/keyboards/fingerpunch/ffkb/rgblight_oled_ec11/config.h
index 1ebabe87df..151d3de8a3 100644
--- a/keyboards/fingerpunch/ffkb/rgblight_oled_ec11/config.h
+++ b/keyboards/fingerpunch/ffkb/rgblight_oled_ec11/config.h
@@ -29,5 +29,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define ENCODERS_C_REVERSE
 
+#undef ENCODERS_PAD_A
+#define ENCODERS_PAD_A {D7, D4}
+#undef ENCODERS_PAD_B
+#define ENCODERS_PAD_B {B4, D6}
+
 #pragma once
 #include "config_common.h"
diff --git a/keyboards/fingerpunch/ffkb/rgblight_oled_evq/config.h b/keyboards/fingerpunch/ffkb/rgblight_oled_evq/config.h
index ce51d87c2f..7c8fcc702d 100644
--- a/keyboards/fingerpunch/ffkb/rgblight_oled_evq/config.h
+++ b/keyboards/fingerpunch/ffkb/rgblight_oled_evq/config.h
@@ -30,5 +30,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODERS_A_REVERSE true
 #define ENCODERS_B_REVERSE true
 
+#undef ENCODERS_PAD_A
+#define ENCODERS_PAD_A {D7, D4}
+#undef ENCODERS_PAD_B
+#define ENCODERS_PAD_B {B4, D6}
+
 #pragma once
 #include "config_common.h"
diff --git a/keyboards/fingerpunch/ffkb/rgblight_pimoroni/config.h b/keyboards/fingerpunch/ffkb/rgblight_pimoroni/config.h
index c20ccb4bcb..0f131f9e2a 100644
--- a/keyboards/fingerpunch/ffkb/rgblight_pimoroni/config.h
+++ b/keyboards/fingerpunch/ffkb/rgblight_pimoroni/config.h
@@ -23,5 +23,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define XOIVIOX_PIMORONI
 #endif
 
+#undef ENCODERS_PAD_A
+#define ENCODERS_PAD_A {D7, D4}
+#undef ENCODERS_PAD_B
+#define ENCODERS_PAD_B {B4, D6}
+
 #pragma once
 #include "config_common.h"
diff --git a/keyboards/fingerpunch/ffkb/rgblight_pimoroni_ec11/config.h b/keyboards/fingerpunch/ffkb/rgblight_pimoroni_ec11/config.h
index b537ec0a35..4ba9e5ac22 100644
--- a/keyboards/fingerpunch/ffkb/rgblight_pimoroni_ec11/config.h
+++ b/keyboards/fingerpunch/ffkb/rgblight_pimoroni_ec11/config.h
@@ -29,5 +29,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define ENCODERS_C_REVERSE
 
+#undef ENCODERS_PAD_A
+#define ENCODERS_PAD_A {D7, D4}
+#undef ENCODERS_PAD_B
+#define ENCODERS_PAD_B {B4, D6}
+
 #pragma once
 #include "config_common.h"
diff --git a/keyboards/fingerpunch/ffkb/rgblight_pimoroni_evq/config.h b/keyboards/fingerpunch/ffkb/rgblight_pimoroni_evq/config.h
index a933ca19af..f90e52f04c 100644
--- a/keyboards/fingerpunch/ffkb/rgblight_pimoroni_evq/config.h
+++ b/keyboards/fingerpunch/ffkb/rgblight_pimoroni_evq/config.h
@@ -30,5 +30,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODERS_A_REVERSE true
 #define ENCODERS_B_REVERSE true
 
+#undef ENCODERS_PAD_A
+#define ENCODERS_PAD_A {D7, D4}
+#undef ENCODERS_PAD_B
+#define ENCODERS_PAD_B {B4, D6}
+
 #pragma once
 #include "config_common.h"
diff --git a/keyboards/fingerpunch/ffkb/rgbmatrix_oled/config.h b/keyboards/fingerpunch/ffkb/rgbmatrix_oled/config.h
index d2e1240e1e..7350fcedab 100644
--- a/keyboards/fingerpunch/ffkb/rgbmatrix_oled/config.h
+++ b/keyboards/fingerpunch/ffkb/rgbmatrix_oled/config.h
@@ -23,5 +23,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define XOIVIOX_OLED
 #endif
 
+#undef ENCODERS_PAD_A
+#define ENCODERS_PAD_A {D7, D4}
+#undef ENCODERS_PAD_B
+#define ENCODERS_PAD_B {B4, D6}
+
 #pragma once
 #include "config_common.h"
diff --git a/keyboards/fingerpunch/ffkb/rgbmatrix_oled_ec11/config.h b/keyboards/fingerpunch/ffkb/rgbmatrix_oled_ec11/config.h
index 36dfea987b..bf22b65bf6 100644
--- a/keyboards/fingerpunch/ffkb/rgbmatrix_oled_ec11/config.h
+++ b/keyboards/fingerpunch/ffkb/rgbmatrix_oled_ec11/config.h
@@ -29,5 +29,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define ENCODERS_C_REVERSE
 
+#undef ENCODERS_PAD_A
+#define ENCODERS_PAD_A {D7, D4}
+#undef ENCODERS_PAD_B
+#define ENCODERS_PAD_B {B4, D6}
+
 #pragma once
 #include "config_common.h"
diff --git a/keyboards/fingerpunch/ffkb/rgbmatrix_oled_evq/config.h b/keyboards/fingerpunch/ffkb/rgbmatrix_oled_evq/config.h
index 54f46fc38e..bcc19b1b2e 100644
--- a/keyboards/fingerpunch/ffkb/rgbmatrix_oled_evq/config.h
+++ b/keyboards/fingerpunch/ffkb/rgbmatrix_oled_evq/config.h
@@ -30,5 +30,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODERS_A_REVERSE true
 #define ENCODERS_B_REVERSE true
 
+#undef ENCODERS_PAD_A
+#define ENCODERS_PAD_A {D5, B6}
+#undef ENCODERS_PAD_B
+#define ENCODERS_PAD_B {B7, F1}
+
 #pragma once
 #include "config_common.h"
diff --git a/keyboards/fingerpunch/ffkb/rgbmatrix_pimoroni/config.h b/keyboards/fingerpunch/ffkb/rgbmatrix_pimoroni/config.h
index c21c1c7a4a..83d45f2054 100644
--- a/keyboards/fingerpunch/ffkb/rgbmatrix_pimoroni/config.h
+++ b/keyboards/fingerpunch/ffkb/rgbmatrix_pimoroni/config.h
@@ -23,5 +23,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define XOIVIOX_PIMORONI
 #endif
 
+#undef ENCODERS_PAD_A
+#define ENCODERS_PAD_A {D7, D4}
+#undef ENCODERS_PAD_B
+#define ENCODERS_PAD_B {B4, D6}
+
 #pragma once
 #include "config_common.h"
diff --git a/keyboards/fingerpunch/ffkb/rgbmatrix_pimoroni_ec11/config.h b/keyboards/fingerpunch/ffkb/rgbmatrix_pimoroni_ec11/config.h
index 058aec4d50..f6ca8afbfd 100644
--- a/keyboards/fingerpunch/ffkb/rgbmatrix_pimoroni_ec11/config.h
+++ b/keyboards/fingerpunch/ffkb/rgbmatrix_pimoroni_ec11/config.h
@@ -29,5 +29,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define ENCODERS_C_REVERSE
 
+#undef ENCODERS_PAD_A
+#define ENCODERS_PAD_A {D5, B6}
+#undef ENCODERS_PAD_B
+#define ENCODERS_PAD_B {B7, F1}
+
 #pragma once
 #include "config_common.h"
diff --git a/keyboards/fingerpunch/ffkb/rgbmatrix_pimoroni_evq/config.h b/keyboards/fingerpunch/ffkb/rgbmatrix_pimoroni_evq/config.h
index 95d1cedc82..b45e758a4f 100644
--- a/keyboards/fingerpunch/ffkb/rgbmatrix_pimoroni_evq/config.h
+++ b/keyboards/fingerpunch/ffkb/rgbmatrix_pimoroni_evq/config.h
@@ -30,5 +30,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODERS_A_REVERSE true
 #define ENCODERS_B_REVERSE true
 
+#undef ENCODERS_PAD_A
+#define ENCODERS_PAD_A {D7, D4}
+#undef ENCODERS_PAD_B
+#define ENCODERS_PAD_B {B4, D6}
+
 #pragma once
 #include "config_common.h"
diff --git a/keyboards/fingerpunch/ffkb/rules.mk b/keyboards/fingerpunch/ffkb/rules.mk
index a4c93e1b28..9826535069 100644
--- a/keyboards/fingerpunch/ffkb/rules.mk
+++ b/keyboards/fingerpunch/ffkb/rules.mk
@@ -39,12 +39,3 @@ OLED_DRIVER_ENABLE = yes    # this can be yes or no depending on if you have an
 EXTRAFLAGS     += -flto     # macros disabled, as a lot of barobord features require more space, can move this line into all the individual rules.mk, only where needed
                             # for instance, if you build "no_features", it's very unlikely you'll need to disable macros
 MOUSEKEY_ENABLE = no
-
-PIMORONI_TRACKBALL_ENABLE = yes
-
-ifeq ($(strip $(PIMORONI_TRACKBALL_ENABLE)), yes)
-    POINTING_DEVICE_ENABLE := yes
-    SRC += drivers/sensors/pimoroni_trackball.c
-    QUANTUM_LIB_SRC += i2c_master.c
-    OPT_DEFS += -DPIMORONI_TRACKBALL_ENABLE
-endif
diff --git a/keyboards/fingerpunch/ffkb_byomcu/config.h b/keyboards/fingerpunch/ffkb_byomcu/config.h
index eacc0da46f..0d68023618 100644
--- a/keyboards/fingerpunch/ffkb_byomcu/config.h
+++ b/keyboards/fingerpunch/ffkb_byomcu/config.h
@@ -139,7 +139,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef PIMORONI_TRACKBALL_ENABLE
 #define PIMORONI_TRACKBALL_ROTATE
 #define PIMORONI_TRACKBALL_CLICK
-#define PIMORONI_TRACKBALL_INVERT_X
 #endif
 
 // If using encoder type 2, uncomment this
diff --git a/keyboards/fingerpunch/ffkb_byomcu/keymaps/sadekbaroudi/keymap.c b/keyboards/fingerpunch/ffkb_byomcu/keymaps/sadekbaroudi/keymap.c
index e3a7057fd1..a009331862 100644
--- a/keyboards/fingerpunch/ffkb_byomcu/keymaps/sadekbaroudi/keymap.c
+++ b/keyboards/fingerpunch/ffkb_byomcu/keymaps/sadekbaroudi/keymap.c
@@ -315,31 +315,31 @@ layer_state_t layer_state_set_keymap(layer_state_t state) {
     switch (get_highest_layer(state)) {
     case _ALPHA_ALT:
         if (is_caps_lock_on) {
-            trackball_set_rgbw(RGB_CYAN, 0x00);
+            pimoroni_trackball_set_rgbw(RGB_CYAN, 0x00);
         } else {
-            trackball_set_rgbw(RGB_BLUE, 0x00);
+            pimoroni_trackball_set_rgbw(RGB_BLUE, 0x00);
         }
         break;
     case _NAVIGATION:
-        trackball_set_rgbw(RGB_GREEN, 0x00);
+        pimoroni_trackball_set_rgbw(RGB_GREEN, 0x00);
         break;
     case _SYMBOLS:
-        trackball_set_rgbw(RGB_PURPLE, 0x00);
+        pimoroni_trackball_set_rgbw(RGB_PURPLE, 0x00);
         break;
     case _FUNCTION:
-        trackball_set_rgbw(RGB_YELLOW, 0x00);
+        pimoroni_trackball_set_rgbw(RGB_YELLOW, 0x00);
         break;
     case _MEDIA:
-        trackball_set_rgbw(RGB_ORANGE, 0x00);
+        pimoroni_trackball_set_rgbw(RGB_ORANGE, 0x00);
         break;
     case _MOUSE:
-        trackball_set_rgbw(RGB_WHITE, 0x00);
+        pimoroni_trackball_set_rgbw(RGB_WHITE, 0x00);
         break;
     default: //  for any other layers, or the default layer
         if (is_caps_lock_on) {
-            trackball_set_rgbw(RGB_CYAN, 0x00);
+            pimoroni_trackball_set_rgbw(RGB_CYAN, 0x00);
         } else {
-            trackball_set_rgbw(RGB_BLUE, 0x00);
+            pimoroni_trackball_set_rgbw(RGB_BLUE, 0x00);
         }
         break;
     }
diff --git a/keyboards/fingerpunch/ffkb_byomcu/oled/config.h b/keyboards/fingerpunch/ffkb_byomcu/oled/config.h
index 94472f300a..d9651e9ee6 100644
--- a/keyboards/fingerpunch/ffkb_byomcu/oled/config.h
+++ b/keyboards/fingerpunch/ffkb_byomcu/oled/config.h
@@ -19,5 +19,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define XOIVIOX_OLED
 #endif
 
+#undef ENCODERS_PAD_A
+#define ENCODERS_PAD_A {D5, B6}
+#undef ENCODERS_PAD_B
+#define ENCODERS_PAD_B {B7, F1}
+
 #pragma once
 #include "config_common.h"
diff --git a/keyboards/fingerpunch/ffkb_byomcu/oled_ec11/config.h b/keyboards/fingerpunch/ffkb_byomcu/oled_ec11/config.h
index ba88336109..6b700d4c17 100644
--- a/keyboards/fingerpunch/ffkb_byomcu/oled_ec11/config.h
+++ b/keyboards/fingerpunch/ffkb_byomcu/oled_ec11/config.h
@@ -25,5 +25,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define ENCODERS_C_REVERSE
 
+#undef ENCODERS_PAD_A
+#define ENCODERS_PAD_A {D5, B6}
+#undef ENCODERS_PAD_B
+#define ENCODERS_PAD_B {B7, F1}
+
 #pragma once
 #include "config_common.h"
diff --git a/keyboards/fingerpunch/ffkb_byomcu/oled_evq/config.h b/keyboards/fingerpunch/ffkb_byomcu/oled_evq/config.h
index 24f0344fb6..74a86b5137 100644
--- a/keyboards/fingerpunch/ffkb_byomcu/oled_evq/config.h
+++ b/keyboards/fingerpunch/ffkb_byomcu/oled_evq/config.h
@@ -26,5 +26,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODERS_A_REVERSE
 #define ENCODERS_B_REVERSE
 
+#undef ENCODERS_PAD_A
+#define ENCODERS_PAD_A {D5, B6}
+#undef ENCODERS_PAD_B
+#define ENCODERS_PAD_B {B7, F1}
+
 #pragma once
 #include "config_common.h"
diff --git a/keyboards/fingerpunch/ffkb_byomcu/pimoroni/config.h b/keyboards/fingerpunch/ffkb_byomcu/pimoroni/config.h
index 6fb4343b33..c186b76a54 100644
--- a/keyboards/fingerpunch/ffkb_byomcu/pimoroni/config.h
+++ b/keyboards/fingerpunch/ffkb_byomcu/pimoroni/config.h
@@ -19,5 +19,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define XOIVIOX_PIMORONI
 #endif
 
+#undef ENCODERS_PAD_A
+#define ENCODERS_PAD_A {D5, B6}
+#undef ENCODERS_PAD_B
+#define ENCODERS_PAD_B {B7, F1}
+
 #pragma once
 #include "config_common.h"
diff --git a/keyboards/fingerpunch/ffkb_byomcu/pimoroni_ec11/config.h b/keyboards/fingerpunch/ffkb_byomcu/pimoroni_ec11/config.h
index 615524b15c..a0e683a1f7 100644
--- a/keyboards/fingerpunch/ffkb_byomcu/pimoroni_ec11/config.h
+++ b/keyboards/fingerpunch/ffkb_byomcu/pimoroni_ec11/config.h
@@ -25,5 +25,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define ENCODERS_C_REVERSE
 
+#undef ENCODERS_PAD_A
+#define ENCODERS_PAD_A {D5, B6}
+#undef ENCODERS_PAD_B
+#define ENCODERS_PAD_B {B7, F1}
+
 #pragma once
 #include "config_common.h"
diff --git a/keyboards/fingerpunch/ffkb_byomcu/pimoroni_evq/config.h b/keyboards/fingerpunch/ffkb_byomcu/pimoroni_evq/config.h
index 81df828eeb..d11a8c578d 100644
--- a/keyboards/fingerpunch/ffkb_byomcu/pimoroni_evq/config.h
+++ b/keyboards/fingerpunch/ffkb_byomcu/pimoroni_evq/config.h
@@ -26,5 +26,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODERS_A_REVERSE
 #define ENCODERS_B_REVERSE
 
+#undef ENCODERS_PAD_A
+#define ENCODERS_PAD_A {D5, B6}
+#undef ENCODERS_PAD_B
+#define ENCODERS_PAD_B {B7, F1}
+
 #pragma once
 #include "config_common.h"
diff --git a/keyboards/fingerpunch/ffkb_byomcu/rgblight_oled/config.h b/keyboards/fingerpunch/ffkb_byomcu/rgblight_oled/config.h
index 7936809e36..34b1c09ba7 100644
--- a/keyboards/fingerpunch/ffkb_byomcu/rgblight_oled/config.h
+++ b/keyboards/fingerpunch/ffkb_byomcu/rgblight_oled/config.h
@@ -23,5 +23,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define XOIVIOX_OLED
 #endif
 
+#undef ENCODERS_PAD_A
+#define ENCODERS_PAD_A {D5, B6}
+#undef ENCODERS_PAD_B
+#define ENCODERS_PAD_B {B7, F1}
+
 #pragma once
 #include "config_common.h"
diff --git a/keyboards/fingerpunch/ffkb_byomcu/rgblight_oled_ec11/config.h b/keyboards/fingerpunch/ffkb_byomcu/rgblight_oled_ec11/config.h
index 1ebabe87df..6796665ede 100644
--- a/keyboards/fingerpunch/ffkb_byomcu/rgblight_oled_ec11/config.h
+++ b/keyboards/fingerpunch/ffkb_byomcu/rgblight_oled_ec11/config.h
@@ -29,5 +29,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define ENCODERS_C_REVERSE
 
+#undef ENCODERS_PAD_A
+#define ENCODERS_PAD_A {D5, B6}
+#undef ENCODERS_PAD_B
+#define ENCODERS_PAD_B {B7, F1}
+
 #pragma once
 #include "config_common.h"
diff --git a/keyboards/fingerpunch/ffkb_byomcu/rgblight_oled_evq/config.h b/keyboards/fingerpunch/ffkb_byomcu/rgblight_oled_evq/config.h
index ce51d87c2f..25730e6f60 100644
--- a/keyboards/fingerpunch/ffkb_byomcu/rgblight_oled_evq/config.h
+++ b/keyboards/fingerpunch/ffkb_byomcu/rgblight_oled_evq/config.h
@@ -30,5 +30,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODERS_A_REVERSE true
 #define ENCODERS_B_REVERSE true
 
+#undef ENCODERS_PAD_A
+#define ENCODERS_PAD_A {D5, B6}
+#undef ENCODERS_PAD_B
+#define ENCODERS_PAD_B {B7, F1}
+
 #pragma once
 #include "config_common.h"
diff --git a/keyboards/fingerpunch/ffkb_byomcu/rgblight_pimoroni/config.h b/keyboards/fingerpunch/ffkb_byomcu/rgblight_pimoroni/config.h
index c20ccb4bcb..b038387113 100644
--- a/keyboards/fingerpunch/ffkb_byomcu/rgblight_pimoroni/config.h
+++ b/keyboards/fingerpunch/ffkb_byomcu/rgblight_pimoroni/config.h
@@ -23,5 +23,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define XOIVIOX_PIMORONI
 #endif
 
+#undef ENCODERS_PAD_A
+#define ENCODERS_PAD_A {D5, B6}
+#undef ENCODERS_PAD_B
+#define ENCODERS_PAD_B {B7, F1}
+
 #pragma once
 #include "config_common.h"
diff --git a/keyboards/fingerpunch/ffkb_byomcu/rgblight_pimoroni_ec11/config.h b/keyboards/fingerpunch/ffkb_byomcu/rgblight_pimoroni_ec11/config.h
index b537ec0a35..6a07312dc2 100644
--- a/keyboards/fingerpunch/ffkb_byomcu/rgblight_pimoroni_ec11/config.h
+++ b/keyboards/fingerpunch/ffkb_byomcu/rgblight_pimoroni_ec11/config.h
@@ -29,5 +29,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define ENCODERS_C_REVERSE
 
+#undef ENCODERS_PAD_A
+#define ENCODERS_PAD_A {D5, B6}
+#undef ENCODERS_PAD_B
+#define ENCODERS_PAD_B {B7, F1}
+
 #pragma once
 #include "config_common.h"
diff --git a/keyboards/fingerpunch/ffkb_byomcu/rgblight_pimoroni_evq/config.h b/keyboards/fingerpunch/ffkb_byomcu/rgblight_pimoroni_evq/config.h
index a933ca19af..2533a991ae 100644
--- a/keyboards/fingerpunch/ffkb_byomcu/rgblight_pimoroni_evq/config.h
+++ b/keyboards/fingerpunch/ffkb_byomcu/rgblight_pimoroni_evq/config.h
@@ -30,5 +30,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODERS_A_REVERSE true
 #define ENCODERS_B_REVERSE true
 
+#undef ENCODERS_PAD_A
+#define ENCODERS_PAD_A {D5, B6}
+#undef ENCODERS_PAD_B
+#define ENCODERS_PAD_B {B7, F1}
+
 #pragma once
 #include "config_common.h"
diff --git a/keyboards/fingerpunch/ffkb_byomcu/rgbmatrix_oled/config.h b/keyboards/fingerpunch/ffkb_byomcu/rgbmatrix_oled/config.h
index d2e1240e1e..c7795b884e 100644
--- a/keyboards/fingerpunch/ffkb_byomcu/rgbmatrix_oled/config.h
+++ b/keyboards/fingerpunch/ffkb_byomcu/rgbmatrix_oled/config.h
@@ -23,5 +23,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define XOIVIOX_OLED
 #endif
 
+#undef ENCODERS_PAD_A
+#define ENCODERS_PAD_A {D5, B6}
+#undef ENCODERS_PAD_B
+#define ENCODERS_PAD_B {B7, F1}
+
 #pragma once
 #include "config_common.h"
diff --git a/keyboards/fingerpunch/ffkb_byomcu/rgbmatrix_oled_ec11/config.h b/keyboards/fingerpunch/ffkb_byomcu/rgbmatrix_oled_ec11/config.h
index 36dfea987b..20a78ca2cd 100644
--- a/keyboards/fingerpunch/ffkb_byomcu/rgbmatrix_oled_ec11/config.h
+++ b/keyboards/fingerpunch/ffkb_byomcu/rgbmatrix_oled_ec11/config.h
@@ -29,5 +29,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define ENCODERS_C_REVERSE
 
+#undef ENCODERS_PAD_A
+#define ENCODERS_PAD_A {D5, B6}
+#undef ENCODERS_PAD_B
+#define ENCODERS_PAD_B {B7, F1}
+
 #pragma once
 #include "config_common.h"
diff --git a/keyboards/fingerpunch/ffkb_byomcu/rgbmatrix_oled_evq/config.h b/keyboards/fingerpunch/ffkb_byomcu/rgbmatrix_oled_evq/config.h
index 54f46fc38e..bcc19b1b2e 100644
--- a/keyboards/fingerpunch/ffkb_byomcu/rgbmatrix_oled_evq/config.h
+++ b/keyboards/fingerpunch/ffkb_byomcu/rgbmatrix_oled_evq/config.h
@@ -30,5 +30,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODERS_A_REVERSE true
 #define ENCODERS_B_REVERSE true
 
+#undef ENCODERS_PAD_A
+#define ENCODERS_PAD_A {D5, B6}
+#undef ENCODERS_PAD_B
+#define ENCODERS_PAD_B {B7, F1}
+
 #pragma once
 #include "config_common.h"
diff --git a/keyboards/fingerpunch/ffkb_byomcu/rgbmatrix_pimoroni/config.h b/keyboards/fingerpunch/ffkb_byomcu/rgbmatrix_pimoroni/config.h
index c21c1c7a4a..0fecb25fe4 100644
--- a/keyboards/fingerpunch/ffkb_byomcu/rgbmatrix_pimoroni/config.h
+++ b/keyboards/fingerpunch/ffkb_byomcu/rgbmatrix_pimoroni/config.h
@@ -23,5 +23,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define XOIVIOX_PIMORONI
 #endif
 
+#undef ENCODERS_PAD_A
+#define ENCODERS_PAD_A {D5, B6}
+#undef ENCODERS_PAD_B
+#define ENCODERS_PAD_B {B7, F1}
+
 #pragma once
 #include "config_common.h"
diff --git a/keyboards/fingerpunch/ffkb_byomcu/rgbmatrix_pimoroni_ec11/config.h b/keyboards/fingerpunch/ffkb_byomcu/rgbmatrix_pimoroni_ec11/config.h
index 058aec4d50..f6ca8afbfd 100644
--- a/keyboards/fingerpunch/ffkb_byomcu/rgbmatrix_pimoroni_ec11/config.h
+++ b/keyboards/fingerpunch/ffkb_byomcu/rgbmatrix_pimoroni_ec11/config.h
@@ -29,5 +29,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define ENCODERS_C_REVERSE
 
+#undef ENCODERS_PAD_A
+#define ENCODERS_PAD_A {D5, B6}
+#undef ENCODERS_PAD_B
+#define ENCODERS_PAD_B {B7, F1}
+
 #pragma once
 #include "config_common.h"
diff --git a/keyboards/fingerpunch/ffkb_byomcu/rgbmatrix_pimoroni_evq/config.h b/keyboards/fingerpunch/ffkb_byomcu/rgbmatrix_pimoroni_evq/config.h
index 95d1cedc82..361d09528e 100644
--- a/keyboards/fingerpunch/ffkb_byomcu/rgbmatrix_pimoroni_evq/config.h
+++ b/keyboards/fingerpunch/ffkb_byomcu/rgbmatrix_pimoroni_evq/config.h
@@ -30,5 +30,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODERS_A_REVERSE true
 #define ENCODERS_B_REVERSE true
 
+#undef ENCODERS_PAD_A
+#define ENCODERS_PAD_A {D5, B6}
+#undef ENCODERS_PAD_B
+#define ENCODERS_PAD_B {B7, F1}
+
 #pragma once
 #include "config_common.h"
diff --git a/keyboards/fingerpunch/luakeeb/keymaps/default/keymap.c b/keyboards/fingerpunch/luakeeb/keymaps/default/keymap.c
index 0b3af40172..68e3925860 100644
--- a/keyboards/fingerpunch/luakeeb/keymaps/default/keymap.c
+++ b/keyboards/fingerpunch/luakeeb/keymaps/default/keymap.c
@@ -133,28 +133,28 @@ layer_state_t layer_state_set_user(layer_state_t state) {
     switch(get_highest_layer(state)) {
         case _QWERTY:
             if (is_caps_lock_on) {
-                trackball_set_rgbw(RGB_RED, 0x00);
+                pimoroni_trackball_set_rgbw(RGB_RED, 0x00);
             } else {
-                trackball_set_rgbw(RGB_BLUE, 0x00);
+                pimoroni_trackball_set_rgbw(RGB_BLUE, 0x00);
             }
             break;
         case _COLEMAK:
-            trackball_set_rgbw(RGB_GREEN, 0x00);
+            pimoroni_trackball_set_rgbw(RGB_GREEN, 0x00);
             break;
         case _LOWER:
-            trackball_set_rgbw(RGB_PURPLE, 0x00);
+            pimoroni_trackball_set_rgbw(RGB_PURPLE, 0x00);
             break;
         case _RAISE:
-            trackball_set_rgbw(RGB_YELLOW, 0x00);
+            pimoroni_trackball_set_rgbw(RGB_YELLOW, 0x00);
             break;
         case _ADJUST:
-            trackball_set_rgbw(RGB_ORANGE, 0x00);
+            pimoroni_trackball_set_rgbw(RGB_ORANGE, 0x00);
             break;
         default: //  for any other layers, or the default layer
             if (is_caps_lock_on) {
-                trackball_set_rgbw(RGB_RED, 0x00);
+                pimoroni_trackball_set_rgbw(RGB_RED, 0x00);
             } else {
-                trackball_set_rgbw(RGB_BLUE, 0x00);
+                pimoroni_trackball_set_rgbw(RGB_BLUE, 0x00);
             }
             break;
     }
@@ -165,7 +165,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 void keyboard_post_init_user(void) {
     is_caps_lock_on = false;
     #ifdef PIMORONI_TRACKBALL_ENABLE
-    trackball_set_rgbw(RGB_BLUE, 0x00);
+    pimoroni_trackball_set_rgbw(RGB_BLUE, 0x00);
     #endif
 }
 
diff --git a/users/sadekbaroudi/sadekbaroudi.c b/users/sadekbaroudi/sadekbaroudi.c
index f52e8bee05..95720ffa68 100755
--- a/users/sadekbaroudi/sadekbaroudi.c
+++ b/users/sadekbaroudi/sadekbaroudi.c
@@ -151,7 +151,7 @@ __attribute__((weak)) void keyboard_post_init_keymap(void) {}
 void keyboard_post_init_user(void) {
     is_caps_lock_on = false;
     #if defined(PIMORONI_TRACKBALL_ENABLE) && !defined(RGBLIGHT_ENABLE)
-    trackball_set_rgbw(RGB_BLUE, 0x00);
+    pimoroni_trackball_set_rgbw(RGB_BLUE, 0x00);
     #endif
 #if defined(RGBLIGHT_ENABLE)
     keyboard_post_init_rgb_light();
diff --git a/users/sadekbaroudi/sadekbaroudi.h b/users/sadekbaroudi/sadekbaroudi.h
index 8daaaa0092..6a4c9e147a 100755
--- a/users/sadekbaroudi/sadekbaroudi.h
+++ b/users/sadekbaroudi/sadekbaroudi.h
@@ -24,6 +24,7 @@
 #if defined(RGBLIGHT_ENABLE)
 #    include "rgb_stuff.h"
 #endif
+
 // #if defined(RGB_MATRIX_ENABLE)
 // #    include "rgb_matrix_stuff.h"
 // #endif