5 files changed, 20 insertions, 23 deletions
diff --git a/keyboards/marksard/rhymestone/common/oled_helper.c b/keyboards/marksard/rhymestone/common/oled_helper.c
index 354c1fb896..613798c941 100644
--- a/keyboards/marksard/rhymestone/common/oled_helper.c
+++ b/keyboards/marksard/rhymestone/common/oled_helper.c
@@ -1,8 +1,10 @@
-#ifdef OLED_ENABLE
-#include QMK_KEYBOARD_H
+#include "oled_helper.h"
+#include "quantum.h"
 #include <stdio.h>
 #include <string.h>
 
+#ifdef OLED_ENABLE
+
 void render_logo(void) {
 
   static const char PROGMEM logo_buf[]={
diff --git a/keyboards/marksard/rhymestone/common/oled_helper.h b/keyboards/marksard/rhymestone/common/oled_helper.h
index dc9a938f6c..9495937e2a 100644
--- a/keyboards/marksard/rhymestone/common/oled_helper.h
+++ b/keyboards/marksard/rhymestone/common/oled_helper.h
@@ -1,3 +1,8 @@
+#pragma once
+
+#include <stdint.h>
+#include "action.h"
+
 #ifdef OLED_ENABLE
 
 void render_logo(void);
diff --git a/keyboards/marksard/rhymestone/rev1/config.h b/keyboards/marksard/rhymestone/rev1/config.h
index 9cc003be13..32927c4506 100644
--- a/keyboards/marksard/rhymestone/rev1/config.h
+++ b/keyboards/marksard/rhymestone/rev1/config.h
@@ -17,27 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { D4, C6, D7, E6, B4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-
 #ifdef RGBLIGHT_ENABLE
-// #ifdef RGB_DI_PIN
   #define RGBLED_NUM 40
   #define RGBLED_SPLIT {20, 20}
   #define RGBLIGHT_HUE_STEP 8
diff --git a/keyboards/marksard/rhymestone/rev1/info.json b/keyboards/marksard/rhymestone/rev1/info.json
index 6d68519512..07135b5be0 100644
--- a/keyboards/marksard/rhymestone/rev1/info.json
+++ b/keyboards/marksard/rhymestone/rev1/info.json
@@ -8,9 +8,20 @@
         "pid": "0xDFA1",
         "device_version": "0.2.0"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4"],
+        "rows": ["F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["ortho_4x10"],
diff --git a/keyboards/marksard/rhymestone/rules.mk b/keyboards/marksard/rhymestone/rules.mk
index affdbd6f11..6f15328b5a 100644
--- a/keyboards/marksard/rhymestone/rules.mk
+++ b/keyboards/marksard/rhymestone/rules.mk
@@ -12,6 +12,5 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 SPLIT_KEYBOARD = yes
 RGB_MATRIX_ENABLE = no
-RGB_MATRIX_DRIVER = WS2812
 
 DEFAULT_FOLDER = marksard/rhymestone/rev1