5 files changed, 19 insertions, 42 deletions
diff --git a/keyboards/momokai/tap_trio/config.h b/keyboards/momokai/tap_trio/config.h
index 7a38599d11..b60152e21c 100644
--- a/keyboards/momokai/tap_trio/config.h
+++ b/keyboards/momokai/tap_trio/config.h
@@ -16,15 +16,7 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { E0 }
-#define MATRIX_COL_PINS { E6, B2, B7, D1, D2, D3 }
-
-#define DIODE_DIRECTION COL2ROW
-
-
 //TODO: implement RGB Matrix
-#define RGB_DI_PIN F0
 // #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
 
 
diff --git a/keyboards/momokai/tap_trio/info.json b/keyboards/momokai/tap_trio/info.json
index 63e6257ee8..dbe5cb6bc7 100644
--- a/keyboards/momokai/tap_trio/info.json
+++ b/keyboards/momokai/tap_trio/info.json
@@ -8,17 +8,29 @@
         "pid": "0x0006",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F0"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["E6", "B2", "B7", "D1", "D2", "D3"],
+        "rows": ["E0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "label": "K00 (E0,E6)", "x": 0, "y": 0, "w": 1.5, "h": 1.5 },
-                { "label": "K01 (E0,B2)", "x": 2.25, "y": 0, "w": 1.5, "h": 1.5 },
-                { "label": "K02 (E0,B7)", "x": 4.5, "y": 0, "w": 1.5, "h": 1.5 },
-                { "label": "K03 (E0,D1)", "x": 2.25, "y": 2.5 },
-                { "label": "K04 (E0,D2)", "x": 3.75, "y": 2.5 },
-                { "label": "K05 (E0,D3)", "x": 5.25, "y": 2.5 }
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5, "h": 1.5},
+                {"matrix": [0, 1], "x": 2.25, "y": 0, "w": 1.5, "h": 1.5},
+                {"matrix": [0, 2], "x": 4.5, "y": 0, "w": 1.5, "h": 1.5},
+
+                {"matrix": [0, 3], "x": 2.25, "y": 2.5},
+                {"matrix": [0, 4], "x": 3.75, "y": 2.5},
+                {"matrix": [0, 5], "x": 5.25, "y": 2.5}
             ]
         }
     }
diff --git a/keyboards/momokai/tap_trio/rules.mk b/keyboards/momokai/tap_trio/rules.mk
index 0459a2ad6b..bb8155a9b8 100644
--- a/keyboards/momokai/tap_trio/rules.mk
+++ b/keyboards/momokai/tap_trio/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
diff --git a/keyboards/momokai/tap_trio/tap_trio.c b/keyboards/momokai/tap_trio/tap_trio.c
index 69b850e04c..73957745a9 100644
--- a/keyboards/momokai/tap_trio/tap_trio.c
+++ b/keyboards/momokai/tap_trio/tap_trio.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "tap_trio.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/momokai/tap_trio/tap_trio.h b/keyboards/momokai/tap_trio/tap_trio.h
deleted file mode 100644
index b2b17b3436..0000000000
--- a/keyboards/momokai/tap_trio/tap_trio.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2022 Momokai
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	K00, K01, K02, \
-	K03, K04, K05  \
-) { \
-	{ K00,   K01,   K02,   K03,   K04,   K05 }  \
-}
-