Move single `LAYOUT`s to data driven (#20365)

8 files changed, 210 insertions, 366 deletions

diff --git a/keyboards/recompile_keys/choco60/choco60.h b/keyboards/recompile_keys/choco60/choco60.h
deleted file mode 100644
index fedcf942bf..0000000000
--- a/keyboards/recompile_keys/choco60/choco60.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright 2019 Naoto Takai
- *
- * 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"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, R06, R07, R08, \
-    L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, \
-    L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, \
-    L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, R36, \
-    L40, L41,      L43,           R40, R41,      R43, R44 \
-) \
-{ \
-    { L00,   L01,   L02,   L03,   L04,   L05,   KC_NO, KC_NO, KC_NO }, \
-    { L10,   L11,   L12,   L13,   L14,   L15,   KC_NO, KC_NO, KC_NO }, \
-    { L20,   L21,   L22,   L23,   L24,   L25,   KC_NO, KC_NO, KC_NO }, \
-    { L30,   L31,   L32,   L33,   L34,   L35,   KC_NO, KC_NO, KC_NO }, \
-    { L40,   L41,   KC_NO, L43,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { R00,   R01,   R02,   R03,   R04,   R05,   R06,   R07,   R08   }, \
-    { R10,   R11,   R12,   R13,   R14,   R15,   R16,   R17,   KC_NO }, \
-    { R20,   R21,   R22,   R23,   R24,   R25,   R26,   KC_NO, KC_NO }, \
-    { R30,   R31,   R32,   R33,   R34,   R35,   R36,   KC_NO, KC_NO }, \
-    { R40,   R41,   KC_NO, R43,   R44,   KC_NO, KC_NO, KC_NO, KC_NO }  \
-}
diff --git a/keyboards/recompile_keys/choco60/info.json b/keyboards/recompile_keys/choco60/info.json
index 17ab7eadb2..891cc73796 100644
--- a/keyboards/recompile_keys/choco60/info.json
+++ b/keyboards/recompile_keys/choco60/info.json
@@ -8,9 +8,81 @@
         "pid": "0x4362",
         "device_version": "0.0.1"
     },
-    "layouts": {
+   "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":7, "y":0}, {"label":"&", "x":8, "y":0}, {"label":"*", "x":9, "y":0}, {"label":"(", "x":10, "y":0}, {"label":")", "x":11, "y":0}, {"label":"_", "x":12, "y":0}, {"label":"+", "x":13, "y":0}, {"label":"|", "x":14, "y":0}, {"label":"~", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":7.5, "y":1}, {"label":"U", "x":8.5, "y":1}, {"label":"I", "x":9.5, "y":1}, {"label":"O", "x":10.5, "y":1}, {"label":"P", "x":11.5, "y":1}, {"label":"{", "x":12.5, "y":1}, {"label":"}", "x":13.5, "y":1}, {"label":"Delete", "x":14.5, "y":1, "w":1.5}, {"label":"Control", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":7.75, "y":2}, {"label":"J", "x":8.75, "y":2}, {"label":"K", "x":9.75, "y":2}, {"label":"L", "x":10.75, "y":2}, {"label":":", "x":11.75, "y":2}, {"label":"\"", "x":12.75, "y":2}, {"label":"Return", "x":13.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":8.25, "y":3}, {"label":"M", "x":9.25, "y":3}, {"label":"<", "x":10.25, "y":3}, {"label":">", "x":11.25, "y":3}, {"label":"?", "x":12.25, "y":3}, {"label":"Shift", "x":13.25, "y":3, "w":1.75}, {"label":"Fn", "x":15, "y":3}, {"label":"Opt", "x":1.5, "y":4}, {"label":"\u2318", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":2.75}, {"label":"Opt", "x":7.75, "y":4}, {"x":8.75, "y":4, "w":2.25}, {"label":"\u2318", "x":11, "y":4, "w":1.5}, {"label":"Ctrl", "x":12.5, "y":4}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [5, 0], "x": 7, "y": 0},
+                {"matrix": [5, 1], "x": 8, "y": 0},
+                {"matrix": [5, 2], "x": 9, "y": 0},
+                {"matrix": [5, 3], "x": 10, "y": 0},
+                {"matrix": [5, 4], "x": 11, "y": 0},
+                {"matrix": [5, 5], "x": 12, "y": 0},
+                {"matrix": [5, 6], "x": 13, "y": 0},
+                {"matrix": [5, 7], "x": 14, "y": 0},
+                {"matrix": [5, 8], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+                {"matrix": [6, 0], "x": 7.5, "y": 1},
+                {"matrix": [6, 1], "x": 8.5, "y": 1},
+                {"matrix": [6, 2], "x": 9.5, "y": 1},
+                {"matrix": [6, 3], "x": 10.5, "y": 1},
+                {"matrix": [6, 4], "x": 11.5, "y": 1},
+                {"matrix": [6, 5], "x": 12.5, "y": 1},
+                {"matrix": [6, 6], "x": 13.5, "y": 1},
+                {"matrix": [6, 7], "x": 14.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+                {"matrix": [7, 0], "x": 7.75, "y": 2},
+                {"matrix": [7, 1], "x": 8.75, "y": 2},
+                {"matrix": [7, 2], "x": 9.75, "y": 2},
+                {"matrix": [7, 3], "x": 10.75, "y": 2},
+                {"matrix": [7, 4], "x": 11.75, "y": 2},
+                {"matrix": [7, 5], "x": 12.75, "y": 2},
+                {"matrix": [7, 6], "x": 13.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 8.25, "y": 3},
+                {"matrix": [8, 1], "x": 9.25, "y": 3},
+                {"matrix": [8, 2], "x": 10.25, "y": 3},
+                {"matrix": [8, 3], "x": 11.25, "y": 3},
+                {"matrix": [8, 4], "x": 12.25, "y": 3},
+                {"matrix": [8, 5], "x": 13.25, "y": 3, "w": 1.75},
+                {"matrix": [8, 6], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4},
+                {"matrix": [4, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4, "y": 4, "w": 2.75},
+
+                {"matrix": [9, 0], "x": 7.75, "y": 4},
+                {"matrix": [9, 1], "x": 8.75, "y": 4, "w": 2.25},
+                {"matrix": [9, 3], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [9, 4], "x": 12.5, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/recompile_keys/cocoa40/cocoa40.h b/keyboards/recompile_keys/cocoa40/cocoa40.h
deleted file mode 100644
index a468a75ef2..0000000000
--- a/keyboards/recompile_keys/cocoa40/cocoa40.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2019 'Naoto Takai'
- *
- * 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"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT( \
-    L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, R06, R07, \
-    L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, \
-    L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, \
-         L31, L32, L33,           R30,      R32, R33 \
-) \
-{ \
-    { L00,   L01,   L02,   L03,   L04,   L05,   KC_NO, KC_NO }, \
-    { L10,   L11,   L12,   L13,   L14,   L15,   KC_NO, KC_NO }, \
-    { L20,   L21,   L22,   L23,   L24,   L25,   KC_NO, KC_NO }, \
-    { KC_NO, L31,   L32,   L33,   KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { R00,   R01,   R02,   R03,   R04,   R05,   R06,   R07 }, \
-    { R10,   R11,   R12,   R13,   R14,   R15,   R16,   KC_NO }, \
-    { R20,   R21,   R22,   R23,   R24,   R25,   R26,   KC_NO }, \
-    { R30,   KC_NO, R32,   R33,   KC_NO, KC_NO, KC_NO, KC_NO }  \
-}
diff --git a/keyboards/recompile_keys/cocoa40/info.json b/keyboards/recompile_keys/cocoa40/info.json
index b72f109cf6..76a9302eff 100644
--- a/keyboards/recompile_keys/cocoa40/info.json
+++ b/keyboards/recompile_keys/cocoa40/info.json
@@ -20,7 +20,61 @@
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":7.25, "y":0}, {"label":"U", "x":8.25, "y":0}, {"label":"I", "x":9.25, "y":0}, {"label":"O", "x":10.25, "y":0}, {"label":"P", "x":11.25, "y":0}, {"label":"{", "x":12.25, "y":0}, {"label":"}", "x":13.25, "y":0}, {"label":"Back<br>Space", "x":14.25, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":7.5, "y":1}, {"label":"J", "x":8.5, "y":1}, {"label":"K", "x":9.5, "y":1}, {"label":"L", "x":10.5, "y":1}, {"label":":", "x":11.5, "y":1}, {"label":"\"", "x":12.5, "y":1}, {"label":"Enter", "x":13.5, "y":1, "w":1.75}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":8, "y":2}, {"label":"M", "x":9, "y":2}, {"label":"<", "x":10, "y":2}, {"label":">", "x":11, "y":2}, {"label":"?", "x":12, "y":2}, {"label":"Shift", "x":13, "y":2, "w":1.25}, {"label":"Fn", "x":14.25, "y":2}, {"label":"Opt", "x":1.5, "y":3}, {"label":"Command", "x":2.5, "y":3, "w":1.5}, {"label":"", "x":4, "y":3, "w":2.25}, {"label":"", "x":7.5, "y":3, "w":2.75}, {"label":"Command", "x":10.25, "y":3, "w":1.5}, {"label":"Opt", "x":11.75, "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": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [4, 0], "x": 7.25, "y": 0},
+                {"matrix": [4, 1], "x": 8.25, "y": 0},
+                {"matrix": [4, 2], "x": 9.25, "y": 0},
+                {"matrix": [4, 3], "x": 10.25, "y": 0},
+                {"matrix": [4, 4], "x": 11.25, "y": 0},
+                {"matrix": [4, 5], "x": 12.25, "y": 0},
+                {"matrix": [4, 6], "x": 13.25, "y": 0},
+                {"matrix": [4, 7], "x": 14.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+
+                {"matrix": [5, 0], "x": 7.5, "y": 1},
+                {"matrix": [5, 1], "x": 8.5, "y": 1},
+                {"matrix": [5, 2], "x": 9.5, "y": 1},
+                {"matrix": [5, 3], "x": 10.5, "y": 1},
+                {"matrix": [5, 4], "x": 11.5, "y": 1},
+                {"matrix": [5, 5], "x": 12.5, "y": 1},
+                {"matrix": [5, 6], "x": 13.5, "y": 1, "w": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+                {"matrix": [6, 0], "x": 8, "y": 2},
+                {"matrix": [6, 1], "x": 9, "y": 2},
+                {"matrix": [6, 2], "x": 10, "y": 2},
+                {"matrix": [6, 3], "x": 11, "y": 2},
+                {"matrix": [6, 4], "x": 12, "y": 2},
+                {"matrix": [6, 5], "x": 13, "y": 2, "w": 1.25},
+                {"matrix": [6, 6], "x": 14.25, "y": 2},
+
+                {"matrix": [3, 1], "x": 1.5, "y": 3},
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.5},
+                {"matrix": [3, 3], "x": 4, "y": 3, "w": 2.25},
+
+                {"matrix": [7, 0], "x": 7.5, "y": 3, "w": 2.75},
+                {"matrix": [7, 2], "x": 10.25, "y": 3, "w": 1.5},
+                {"matrix": [7, 3], "x": 11.75, "y": 3}
+            ]
         }
     }
 }
diff --git a/keyboards/recompile_keys/mio/info.json b/keyboards/recompile_keys/mio/info.json
index 8843ad5739..450cf1c3b0 100644
--- a/keyboards/recompile_keys/mio/info.json
+++ b/keyboards/recompile_keys/mio/info.json
@@ -21,47 +21,54 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"label": "Esc", "x": 0, "y": 0 },
-        {"label": "F1", "x": 2, "y": 0 },
-        {"label": "F2", "x": 3, "y": 0 },
-        {"label": "F3", "x": 4, "y": 0 },
-        {"label": "F4", "x": 5, "y": 0 },
-        {"label": "F5", "x": 6.25, "y": 0 },
-        {"label": "F6", "x": 7.25, "y": 0 },
-        {"label": "~", "x": 0, "y": 1.25 },
-        {"label": "!", "x": 1, "y": 1.25 },
-        {"label": "@", "x": 2, "y": 1.25 },
-        {"label": "#", "x": 3, "y": 1.25 },
-        {"label": "$", "x": 4, "y": 1.25 },
-        {"label": "%", "x": 5, "y": 1.25 },
-        {"label": "^", "x": 6, "y": 1.25 },
-        {"label": "&", "x": 7, "y": 1.25 },
-        {"label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-        {"label": "Q", "x": 1.5, "y": 2.25 },
-        {"label": "W", "x": 2.5, "y": 2.25 },
-        {"label": "E", "x": 3.5, "y": 2.25 },
-        {"label": "R", "x": 4.5, "y": 2.25 },
-        {"label": "T", "x": 5.5, "y": 2.25 },
-        {"label": "Y", "x": 6.5, "y": 2.25 },
-        {"label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-        {"label": "A", "x": 1.75, "y": 3.25 },
-        {"label": "S", "x": 2.75, "y": 3.25 },
-        {"label": "D", "x": 3.75, "y": 3.25 },
-        {"label": "F", "x": 4.75, "y": 3.25 },
-        {"label": "G", "x": 5.75, "y": 3.25 },
-        {"label": "H", "x": 6.75, "y": 3.25 },
-        {"label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
-        {"label": "Z", "x": 2.25, "y": 4.25 },
-        {"label": "X", "x": 3.25, "y": 4.25 },
-        {"label": "C", "x": 4.25, "y": 4.25 },
-        {"label": "V", "x": 5.25, "y": 4.25 },
-        {"label": "B", "x": 6.25, "y": 4.25 },
-        {"label": "N", "x": 7.25, "y": 4.25 },
-        {"label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 },
-        {"label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 },
-        {"x": 4, "y": 5.25, "w": 1.5 },
-        {"x": 5.5, "y": 5.25, "w": 2.75 },
-        {"x": 7, "y": 6.5, "w": 1.25 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+
+        {"matrix": [0, 6], "x": 6.25, "y": 0},
+        {"matrix": [0, 7], "x": 7.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.25},
+        {"matrix": [1, 1], "x": 1, "y": 1.25},
+        {"matrix": [1, 2], "x": 2, "y": 1.25},
+        {"matrix": [1, 3], "x": 3, "y": 1.25},
+        {"matrix": [1, 4], "x": 4, "y": 1.25},
+        {"matrix": [1, 5], "x": 5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6, "y": 1.25},
+        {"matrix": [1, 7], "x": 7, "y": 1.25},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+        {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+        {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+        {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+        {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+        {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+        {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 1], "x": 2.5, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 2], "x": 4, "y": 5.25, "w": 1.5},
+        {"matrix": [5, 5], "x": 5.5, "y": 5.25, "w": 2.75},
+        {"matrix": [5, 6], "x": 7, "y": 6.5, "w": 1.25}
       ]
     }
   }
diff --git a/keyboards/recompile_keys/mio/mio.h b/keyboards/recompile_keys/mio/mio.h
deleted file mode 100644
index da6dc3229c..0000000000
--- a/keyboards/recompile_keys/mio/mio.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2021 recompile keys
- *
- * 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"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    K000,           K002,   K003,   K004,   K005,   K006,   K007, \
-    K100,   K101,   K102,   K103,   K104,   K105,   K106,   K107, \
-    K200,   K201,   K202,   K203,   K204,   K205,   K206, \
-    K300,   K301,   K302,   K303,   K304,   K305,   K306, \
-    K400,   K401,   K402,   K403,   K404,   K405,   K406, \
-    K500,   K501,   K502,                   K505,   K506  \
-) \
-{ \
-    { K000,   KC_NO,  K002,   K003,   K004,   K005,   K006,   K007  }, \
-    { K100,   K101,   K102,   K103,   K104,   K105,   K106,   K107  }, \
-    { K200,   K201,   K202,   K203,   K204,   K205,   K206,   KC_NO }, \
-    { K300,   K301,   K302,   K303,   K304,   K305,   K306,   KC_NO }, \
-    { K400,   K401,   K402,   K403,   K404,   K405,   K406,   KC_NO }, \
-    { K500,   K501,   K502,   KC_NO,  KC_NO,  K505,   K506,   KC_NO }, \
-}
diff --git a/keyboards/recompile_keys/nomu30/info.json b/keyboards/recompile_keys/nomu30/info.json
index 7fa6be0d39..3753b3cb12 100644
--- a/keyboards/recompile_keys/nomu30/info.json
+++ b/keyboards/recompile_keys/nomu30/info.json
@@ -14,165 +14,39 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {
-                    "label": "Q",
-                    "x": 0.5,
-                    "y": 0
-                },
-                {
-                    "label": "W",
-                    "x": 1.5,
-                    "y": 0
-                },
-                {
-                    "label": "E",
-                    "x": 2.5,
-                    "y": 0
-                },
-                {
-                    "label": "R",
-                    "x": 3.5,
-                    "y": 0
-                },
-                {
-                    "label": "T",
-                    "x": 4.5,
-                    "y": 0
-                },
-                {
-                    "label": "Y",
-                    "x": 5.5,
-                    "y": 0
-                },
-                {
-                    "label": "U",
-                    "x": 6.5,
-                    "y": 0
-                },
-                {
-                    "label": "I",
-                    "x": 7.5,
-                    "y": 0
-                },
-                {
-                    "label": "O",
-                    "x": 8.5,
-                    "y": 0
-                },
-                {
-                    "label": "P",
-                    "x": 9.5,
-                    "y": 0
-                },
-                {
-                    "label": "Del",
-                    "x": 10.5,
-                    "y": 0
-                },
-                {
-                    "label": "|",
-                    "x": 0,
-                    "y": 1
-                },
-                {
-                    "label": "A",
-                    "x": 1,
-                    "y": 1
-                },
-                {
-                    "label": "S",
-                    "x": 2,
-                    "y": 1
-                },
-                {
-                    "label": "D",
-                    "x": 3,
-                    "y": 1
-                },
-                {
-                    "label": "F",
-                    "x": 4,
-                    "y": 1
-                },
-                {
-                    "label": "G",
-                    "x": 5,
-                    "y": 1
-                },
-                {
-                    "label": "H",
-                    "x": 6,
-                    "y": 1
-                },
-                {
-                    "label": "J",
-                    "x": 7,
-                    "y": 1
-                },
-                {
-                    "label": "K",
-                    "x": 8,
-                    "y": 1
-                },
-                {
-                    "label": "L",
-                    "x": 9,
-                    "y": 1
-                },
-                {
-                    "label": "Enter",
-                    "x": 10.25,
-                    "y": 1,
-                    "w": 1.25,
-                    "h": 2
-                },
-                {
-                    "label": "Control",
-                    "x": 0,
-                    "y": 2,
-                    "w": 1.5
-                },
-                {
-                    "label": "Z",
-                    "x": 1.5,
-                    "y": 2
-                },
-                {
-                    "label": "X",
-                    "x": 2.5,
-                    "y": 2
-                },
-                {
-                    "label": "C",
-                    "x": 3.5,
-                    "y": 2
-                },
-                {
-                    "label": "V",
-                    "x": 4.5,
-                    "y": 2
-                },
-                {
-                    "label": "B",
-                    "x": 5.5,
-                    "y": 2
-                },
-                {
-                    "label": "N",
-                    "x": 6.5,
-                    "y": 2
-                },
-                {
-                    "label": "M",
-                    "x": 7.5,
-                    "y": 2
-                },
-                {
-                    "label": "Shift",
-                    "x": 8.5,
-                    "y": 2,
-                    "w": 1.75
-                }
+                {"matrix": [0, 1], "x": 0.5, "y": 0},
+                {"matrix": [0, 2], "x": 1.5, "y": 0},
+                {"matrix": [0, 3], "x": 2.5, "y": 0},
+                {"matrix": [0, 4], "x": 3.5, "y": 0},
+                {"matrix": [0, 5], "x": 4.5, "y": 0},
+                {"matrix": [0, 6], "x": 5.5, "y": 0},
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.5, "y": 0},
+                {"matrix": [0, 11], "x": 10.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2, "w": 1.75}
             ]
         }
     }
diff --git a/keyboards/recompile_keys/nomu30/nomu30.h b/keyboards/recompile_keys/nomu30/nomu30.h
deleted file mode 100644
index 1b33c17be1..0000000000
--- a/keyboards/recompile_keys/nomu30/nomu30.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2019 Naoto Takai
- *
- * 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( \
-        K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
-  K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110,       \
-  K200, K201, K202, K203, K204, K205, K206, K207, K208                    \
-) \
-{ \
-  { KC_NO, K001, K002, K003, K004, K005, K006, K007, K008, K009,  K010,  K011  }, \
-  { K100,  K101, K102, K103, K104, K105, K106, K107, K108, K109,  K110,  KC_NO }, \
-  { K200,  K201, K202, K203, K204, K205, K206, K207, K208, KC_NO, KC_NO, KC_NO }, \
-}