5 files changed, 23 insertions, 29 deletions
diff --git a/keyboards/kingly_keys/romac/config.h b/keyboards/kingly_keys/romac/config.h
index e81c5f4913..0f5a7a6d7f 100644
--- a/keyboards/kingly_keys/romac/config.h
+++ b/keyboards/kingly_keys/romac/config.h
@@ -1,13 +1,5 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D4, C6, D7, E6 }
-#define MATRIX_COL_PINS { F7, B1, B3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/kingly_keys/romac/info.json b/keyboards/kingly_keys/romac/info.json
index 1f8b3f4871..236cc335a2 100644
--- a/keyboards/kingly_keys/romac/info.json
+++ b/keyboards/kingly_keys/romac/info.json
@@ -8,11 +8,32 @@
     "pid": "0x0001",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F7", "B1", "B3"],
+    "rows": ["D4", "C6", "D7", "E6"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
     "LAYOUT": {
-	  "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}]
+	  "layout": [
+      {"matrix": [0, 0], "x": 0, "y": 0},
+      {"matrix": [0, 1], "x": 1, "y": 0},
+      {"matrix": [0, 2], "x": 2, "y": 0},
+
+      {"matrix": [1, 0], "x": 0, "y": 1},
+      {"matrix": [1, 1], "x": 1, "y": 1},
+      {"matrix": [1, 2], "x": 2, "y": 1},
+
+      {"matrix": [2, 0], "x": 0, "y": 2},
+      {"matrix": [2, 1], "x": 1, "y": 2},
+      {"matrix": [2, 2], "x": 2, "y": 2},
+
+      {"matrix": [3, 0], "x": 0, "y": 3},
+      {"matrix": [3, 1], "x": 1, "y": 3},
+      {"matrix": [3, 2], "x": 2, "y": 3}
+    ]
 	}
   }
 }
diff --git a/keyboards/kingly_keys/romac/keymaps/stanrc85/config.h b/keyboards/kingly_keys/romac/keymaps/stanrc85/config.h
index 41bba326c4..c2bd34ed27 100644
--- a/keyboards/kingly_keys/romac/keymaps/stanrc85/config.h
+++ b/keyboards/kingly_keys/romac/keymaps/stanrc85/config.h
@@ -1,8 +1,7 @@
 #undef RGBLED_NUM
 #define RGBLED_NUM 16
 
-#define RGB_DI_PIN F4
-#ifdef RGB_DI_PIN
+#define WS2812_DI_PIN F4
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
   #define RGBLIGHT_VAL_STEP 8
@@ -16,4 +15,3 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/kingly_keys/romac/romac.c b/keyboards/kingly_keys/romac/romac.c
deleted file mode 100644
index 24f4c16333..0000000000
--- a/keyboards/kingly_keys/romac/romac.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "romac.h"
diff --git a/keyboards/kingly_keys/romac/romac.h b/keyboards/kingly_keys/romac/romac.h
deleted file mode 100644
index e6fb9694d2..0000000000
--- a/keyboards/kingly_keys/romac/romac.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	K00, K01, K02, \
-	K10, K11, K12, \
-	K20, K21, K22, \
-	K30, K31, K32  \
-) \
-{ \
-	{ K00,   K01,   K02 }, \
-	{ K10,   K11,   K12 }, \
-	{ K20,   K21,   K22 }, \
-	{ K30,   K31,   K32 }  \
-}