5 files changed, 16 insertions, 31 deletions
diff --git a/keyboards/keebio/bamfk4/bamfk4.c b/keyboards/keebio/bamfk4/bamfk4.c
index 6a382bfaf6..52fe61e39e 100644
--- a/keyboards/keebio/bamfk4/bamfk4.c
+++ b/keyboards/keebio/bamfk4/bamfk4.c
@@ -1,7 +1,7 @@
 // Copyright 2022 Danny Nguyen (@nooges)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "bamfk4.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/keebio/bamfk4/bamfk4.h b/keyboards/keebio/bamfk4/bamfk4.h
deleted file mode 100644
index 0bdc2f602f..0000000000
--- a/keyboards/keebio/bamfk4/bamfk4.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2022 Danny Nguyen (@nooges)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    k00, k01, k02, k03 \
-) { \
-    { k00, k01, k02, k03 }, \
-}
diff --git a/keyboards/keebio/bamfk4/config.h b/keyboards/keebio/bamfk4/config.h
index 8d60a33d48..80c50f13da 100644
--- a/keyboards/keebio/bamfk4/config.h
+++ b/keyboards/keebio/bamfk4/config.h
@@ -3,18 +3,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- */
-#define MATRIX_ROW_PINS { F0 }
-#define MATRIX_COL_PINS { E6, D5, B6, B7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
 #    define RGBLED_NUM 32
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
@@ -79,7 +67,6 @@
 #        define RGB_DISABLE_WHEN_USB_SUSPENDED
 #        define RGB_MATRIX_KEYPRESSES
 //#    endif
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/keebio/bamfk4/info.json b/keyboards/keebio/bamfk4/info.json
index 5559d586e9..ff29f68504 100644
--- a/keyboards/keebio/bamfk4/info.json
+++ b/keyboards/keebio/bamfk4/info.json
@@ -8,15 +8,26 @@
         "pid": "0x1114",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["E6", "D5", "B6", "B7"],
+        "rows": ["F0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0, "y": 0, "w": 2, "h": 2},
-                {"x": 2, "y": 0, "w": 2, "h": 2},
-                {"x": 4, "y": 0, "w": 2, "h": 2},
-                {"x": 6, "y": 0, "w": 2, "h": 2}
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 2, "h": 2},
+                {"matrix": [0, 1], "x": 2, "y": 0, "w": 2, "h": 2},
+                {"matrix": [0, 2], "x": 4, "y": 0, "w": 2, "h": 2},
+                {"matrix": [0, 3], "x": 6, "y": 0, "w": 2, "h": 2}
             ]
         }
     }
diff --git a/keyboards/keebio/bamfk4/rules.mk b/keyboards/keebio/bamfk4/rules.mk
index a236a21bde..73f76344df 100644
--- a/keyboards/keebio/bamfk4/rules.mk
+++ b/keyboards/keebio/bamfk4/rules.mk
@@ -12,6 +12,5 @@ RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no          # Audio output
 ENCODER_ENABLE = no
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 
 LTO_ENABLE = yes