Move remaining `LAYOUT`s to data driven (#20422)

3 files changed, 190 insertions, 325 deletions

diff --git a/keyboards/keystonecaps/gameroyadvance/gameroyadvance.c b/keyboards/keystonecaps/gameroyadvance/gameroyadvance.c
deleted file mode 100644
index 70c49ce118..0000000000
--- a/keyboards/keystonecaps/gameroyadvance/gameroyadvance.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2022 @RoyMeetsWorld
-
-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/>.
-*/
-
-#include "gameroyadvance.h"
diff --git a/keyboards/keystonecaps/gameroyadvance/gameroyadvance.h b/keyboards/keystonecaps/gameroyadvance/gameroyadvance.h
deleted file mode 100644
index 01cb32b572..0000000000
--- a/keyboards/keystonecaps/gameroyadvance/gameroyadvance.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-Copyright 2022 @RoyMeetsWorld
-
-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"
-
-/**
- * The layout macro for ANSI boards, with illustrative grid of a typical assignment.
- *   ┌───┬───┬───┬───┬───┬───┬───┐                              ┌───┬───┬───┬───┬───┬───┬───────┐
- *   │ESC│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │                              │ 7 │ 8 │ 9 │ 0 │ - │ + │ BACK  │
- * ┌─┴───┼───┼───┼───┼───┼───┼───┤┌───┬───┐        ┌───┬───┐  ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │ TAB │ Q │ W │ E │ R │ T │ Y ││F1 │F2 │        │F7 │F8 │  │ Y │ U │ I │ O │ P │ [ │ ] │  \  │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┘├───┼───┤        ├───┼───┤  └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │ CAPS │ A │ S │ D │ F │ G │   │F3 │F4 │        │F9 │F10│   │ H │ J │ K │ L │ ; │ ' │  Enter │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐ ├───┼───┤        ├───┼───┤ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
- * │ LSHIFT │ Z │ X │ C │ V │ B │ │F5 │F6 │        │F11│F12│ │ B │ N │ M │ , │ . │ / │  RSHIFT  │
- * ├────┬───┴┬──┴─┬─┴──┬┴───┼───┴┬┴───┼───┘        └───┼───┴┬┴───┼───┴───┴──┬┴───┼───┴┬────┬────│
- * │LCTL│LGUI│LALT│ FN │    │SPC │MUTE│                │MUTE│SPCE│          │RALT│ FN │RGUI│RCTL│
- * └────┴────┴────┴────┘    └────┼────┤                ├────┼────┘          └────┴────┴────┴────┘
- *                               │ENTR│                │ENTR│
- *                               └────┘                └────┘
- */
-#define LAYOUT(                                                                                            \
-	L00, L01, L02, L03, L04, L05, L06,                        R00, R01, R02, R03, R04, R05,      R07,      \
-	L10, L11, L12, L13, L14, L15, L16, L17, L18,    R10, R11, R12, R13, R14, R15, R16, R17, R18,      R28, \
-	L20, L21, L22, L23, L24, L25,      L27, L28,    R20, R21, R22, R23, R24, R25, R26, R27,      R38,      \
-	L30,      L31, L32, L33, L34, L35, L37, L38,    R30, R31, R32, R33, R34, R35, R36, R37,      R46,      \
-	L40, L41, L42, L43,           L45, L48,              R40, R42,                     R43, R44, R45, R47, \
-	                                   L47,              R41                                               \
-) \
-{ \
-	{ L00,   L01,   L02,   L03,   L04,   L05,   L06,   KC_NO, KC_NO }, \
-	{ L10,   L11,   L12,   L13,   L14,   L15,   L16,   L17,   L18   }, \
-	{ L20,   L21,   L22,   L23,   L24,   L25,   KC_NO, L27,   L28   }, \
-	{ L30,   L31,   L32,   L33,   L34,   L35,   KC_NO, L37,   L38   }, \
-	{ L40,   L41,   L42,   L43,   KC_NO, L45,   KC_NO, L47,   L48   }, \
-	{ R00,   R01,   R02,   R03,   R04,   R05,   KC_NO, R07,   KC_NO }, \
-	{ R10,   R11,   R12,   R13,   R14,   R15,   R16,   R17,   R18   }, \
-	{ R20,   R21,   R22,   R23,   R24,   R25,   R26,   R27,   R28   }, \
-	{ R30,   R31,   R32,   R33,   R34,   R35,   R36,   R37,   R38   }, \
-	{ R40,   R41,   R42,   R43,   R44,   R45,   R46,   R47,   KC_NO }  \
-}
-
-/**
- * The layout macro for split-key boards, with illustrative grid of a typical assignment.
- *
- * Backspace has two options with three distinct pads:
- *     - center pad (regular 2u backspace)
- *     - left pad + right pad (split backspace)
- *
- * You may wish to set the unused pad(s) to KC_NO or XXXXXX, as they will be ignored.
- *                                                                                      ┌───────┐
- *                                                                                      │ BACK  │   (R07)
- *                                                                                      └───────┘
- *                                                                                          | 
- *   ┌───┬───┬───┬───┬───┬───┬───┐                              ┌───┬───┬───┬───┬───┬───┬───┬───┐
- *   │ESC│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │                              │ 7 │ 8 │ 9 │ 0 │ - │ + │ \ │BCK│ (R06 R08)
- * ┌─┴───┼───┼───┼───┼───┼───┼───┤┌───┬───┐        ┌───┬───┐  ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │ TAB │ Q │ W │ E │ R │ T │ Y ││F1 │F2 │        │F7 │F8 │  │ Y │ U │ I │ O │ P │ [ │ ] │  \  │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┘├───┼───┤        ├───┼───┤  └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │ CAPS │ A │ S │ D │ F │ G │   │F3 │F4 │        │F9 │F10│   │ H │ J │ K │ L │ ; │ ' │  Enter │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐ ├───┼───┤        ├───┼───┤ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
- * │LSFT│ \ │ Z │ X │ C │ V │ B │ │F5 │F6 │        │F11│F12│ │ B │ N │ M │ , │ . │ / │RSHIFT│PSC│
- * ├────┼───┴┬──┴─┬─┴──┬┴───┼───┴┬┴───┼───┘        └───┼───┴┬┴───┼───┴───┴──┬┴───┼───┴┬────┬┴───│
- * │LCTL│LGUI│LALT│ FN │    │SPC │MUTE│                │MUTE│SPCE│          │RALT│ FN │RGUI│RCTL│
- * └────┴────┴────┴────┘    └────┼────┤                ├────┼────┘          └────┴────┴────┴────┘
- *                               │ENTR│                │ENTR│
- *                               └────┘                └────┘
- */
-#define LAYOUT_all(                                                                                        \
-	L00, L01, L02, L03, L04, L05, L06,                        R00, R01, R02, R03, R04, R05, R06, R07, R08, \
-	L10, L11, L12, L13, L14, L15, L16, L17, L18,    R10, R11, R12, R13, R14, R15, R16, R17, R18,      R28, \
-	L20, L21, L22, L23, L24, L25,      L27, L28,    R20, R21, R22, R23, R24, R25, R26, R27,      R38,      \
-	L30, L44, L31, L32, L33, L34, L35, L37, L38,    R30, R31, R32, R33, R34, R35, R36, R37,      R46, R48, \
-	L40, L41, L42, L43,           L45, L48,              R40, R42,                R43, R44,      R45, R47, \
-	                                   L47,              R41                                               \
-) \
-{ \
-	{ L00,   L01,   L02,   L03,   L04,   L05,   L06,   KC_NO, KC_NO }, \
-	{ L10,   L11,   L12,   L13,   L14,   L15,   L16,   L17,   L18   }, \
-	{ L20,   L21,   L22,   L23,   L24,   L25,   KC_NO, L27,   L28   }, \
-	{ L30,   L31,   L32,   L33,   L34,   L35,   KC_NO, L37,   L38   }, \
-	{ L40,   L41,   L42,   L43,   L44,   L45,   KC_NO, L47,   L48   }, \
-	{ R00,   R01,   R02,   R03,   R04,   R05,   R06,   R07,   R08   }, \
-	{ R10,   R11,   R12,   R13,   R14,   R15,   R16,   R17,   R18   }, \
-	{ R20,   R21,   R22,   R23,   R24,   R25,   R26,   R27,   R28   }, \
-	{ R30,   R31,   R32,   R33,   R34,   R35,   R36,   R37,   R38   }, \
-	{ R40,   R41,   R42,   R43,   R44,   R45,   R46,   R47,   R48   }  \
-}
diff --git a/keyboards/keystonecaps/gameroyadvance/info.json b/keyboards/keystonecaps/gameroyadvance/info.json
index 19df3b7916..4528484069 100644
--- a/keyboards/keystonecaps/gameroyadvance/info.json
+++ b/keyboards/keystonecaps/gameroyadvance/info.json
@@ -42,211 +42,198 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "x": 0.5, "y": 0 },
-                { "x": 1.5, "y": 0 },
-                { "x": 2.5, "y": 0 },
-                { "x": 3.5, "y": 0 },
-                { "x": 4.5, "y": 0 },
-                { "x": 5.5, "y": 0 },
-                { "x": 6.5, "y": 0 },
-
-                { "x": 13.25, "y": 0 },
-                { "x": 14.25, "y": 0 },
-                { "x": 15.25, "y": 0 },
-                { "x": 16.25, "y": 0 },
-                { "x": 17.25, "y": 0 },
-                { "x": 18.25, "y": 0 },
-                { "x": 19.25, "y": 0, "w": 2 },
-
-                { "x": 0, "y": 1, "w": 1.5 },
-                { "x": 1.5, "y": 1 },
-                { "x": 2.5, "y": 1 },
-                { "x": 3.5, "y": 1 },
-                { "x": 4.5, "y": 1 },
-                { "x": 5.5, "y": 1 },
-                { "x": 6.5, "y": 1 },
-
-                { "x": 7.75, "y": 1 },
-                { "x": 8.75, "y": 1 },
-
-                { "x": 10.5, "y": 1 },
-                { "x": 11.5, "y": 1 },
-
-                { "x": 13.25, "y": 1 },
-                { "x": 14.25, "y": 1 },
-                { "x": 15.25, "y": 1 },
-                { "x": 16.25, "y": 1 },
-                { "x": 17.25, "y": 1 },
-                { "x": 18.25, "y": 1 },
-                { "x": 19.25, "y": 1 },
-                { "x": 20.25, "y": 1, "w": 1.5 },
-
-                { "x": 0, "y": 2, "w": 1.75 },
-                { "x": 1.75, "y": 2 },
-                { "x": 2.75, "y": 2 },
-                { "x": 3.75, "y": 2 },
-                { "x": 4.75, "y": 2 },
-                { "x": 5.75, "y": 2 },
-
-                { "x": 7.75, "y": 2 },
-                { "x": 8.75, "y": 2 },
-
-                { "x": 10.5, "y": 2 },
-                { "x": 11.5, "y": 2 },
-
-                { "x": 13.5, "y": 2 },
-                { "x": 14.5, "y": 2 },
-                { "x": 15.5, "y": 2 },
-                { "x": 16.5, "y": 2 },
-                { "x": 17.5, "y": 2 },
-                { "x": 18.5, "y": 2 },
-                { "x": 19.5, "y": 2, "w": 2.25 },
-
-                { "x": 0, "y": 3, "w": 2.25 },
-                { "x": 2.25, "y": 3 },
-                { "x": 3.25, "y": 3 },
-                { "x": 4.25, "y": 3 },
-                { "x": 5.25, "y": 3 },
-                { "x": 6.25, "y": 3 },
-
-                { "x": 7.75, "y": 3 },
-                { "x": 8.75, "y": 3 },
-
-                { "x": 10.5, "y": 3 },
-                { "x": 11.5, "y": 3 },
-
-                { "x": 13, "y": 3 },
-                { "x": 14, "y": 3 },
-                { "x": 15, "y": 3 },
-                { "x": 16, "y": 3 },
-                { "x": 17, "y": 3 },
-                { "x": 18, "y": 3 },
-                { "x": 19, "y": 3, "w": 2.75 },
-
-                { "x": 0.5, "y": 4, "w": 1.25 },
-                { "x": 1.75, "y": 4, "w": 1.25 },
-                { "x": 3, "y": 4, "w": 1.25 },
-                { "x": 4.25, "y": 4, "w": 1.25 },
-
-                { "x": 6.5, "y": 4, "h": 1.5 },
-                { "x": 7.5, "y": 4 },
-
-                { "x": 11.75, "y": 4 },
-                { "x": 12.75, "y": 4, "h": 1.5 },
-
-                { "x": 16.25, "y": 4, "w": 1.25 },
-                { "x": 17.5, "y": 4, "w": 1.25 },
-                { "x": 18.75, "y": 4, "w": 1.25 },
-                { "x": 20, "y": 4, "w": 1.25 },
-
-                { "x": 7.5, "y": 5, "h": 1.5 },
-                { "x": 11.75, "y": 5, "h": 1.5 }
-            ] },
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+
+                {"matrix": [5, 0], "x": 13.25, "y": 0},
+                {"matrix": [5, 1], "x": 14.25, "y": 0},
+                {"matrix": [5, 2], "x": 15.25, "y": 0},
+                {"matrix": [5, 3], "x": 16.25, "y": 0},
+                {"matrix": [5, 4], "x": 17.25, "y": 0},
+                {"matrix": [5, 5], "x": 18.25, "y": 0},
+                {"matrix": [5, 7], "x": 19.25, "y": 0, "w": 2},
+
+                {"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": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+
+                {"matrix": [6, 0], "x": 10.5, "y": 1},
+                {"matrix": [6, 1], "x": 11.5, "y": 1},
+                {"matrix": [6, 2], "x": 13.25, "y": 1},
+                {"matrix": [6, 3], "x": 14.25, "y": 1},
+                {"matrix": [6, 4], "x": 15.25, "y": 1},
+                {"matrix": [6, 5], "x": 16.25, "y": 1},
+                {"matrix": [6, 6], "x": 17.25, "y": 1},
+                {"matrix": [6, 7], "x": 18.25, "y": 1},
+                {"matrix": [6, 8], "x": 19.25, "y": 1},
+                {"matrix": [7, 8], "x": 20.25, "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": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+
+                {"matrix": [7, 0], "x": 10.5, "y": 2},
+                {"matrix": [7, 1], "x": 11.5, "y": 2},
+                {"matrix": [7, 2], "x": 13.5, "y": 2},
+                {"matrix": [7, 3], "x": 14.5, "y": 2},
+                {"matrix": [7, 4], "x": 15.5, "y": 2},
+                {"matrix": [7, 5], "x": 16.5, "y": 2},
+                {"matrix": [7, 6], "x": 17.5, "y": 2},
+                {"matrix": [7, 7], "x": 18.5, "y": 2},
+                {"matrix": [8, 8], "x": 19.5, "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": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+
+                {"matrix": [8, 0], "x": 10.5, "y": 3},
+                {"matrix": [8, 1], "x": 11.5, "y": 3},
+                {"matrix": [8, 2], "x": 13, "y": 3},
+                {"matrix": [8, 3], "x": 14, "y": 3},
+                {"matrix": [8, 4], "x": 15, "y": 3},
+                {"matrix": [8, 5], "x": 16, "y": 3},
+                {"matrix": [8, 6], "x": 17, "y": 3},
+                {"matrix": [8, 7], "x": 18, "y": 3},
+                {"matrix": [9, 6], "x": 19, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 3, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 6.5, "y": 4, "h": 1.5},
+                {"matrix": [4, 8], "x": 7.5, "y": 4},
+
+                {"matrix": [9, 0], "x": 11.75, "y": 4},
+                {"matrix": [9, 2], "x": 12.75, "y": 4, "h": 1.5},
+                {"matrix": [9, 3], "x": 16.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 17.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 18.75, "y": 4, "w": 1.25},
+                {"matrix": [9, 7], "x": 20, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 7], "x": 7.5, "y": 5, "h": 1.5},
+
+                {"matrix": [9, 1], "x": 11.75, "y": 5, "h": 1.5}
+            ]
+        },
         "LAYOUT_all": {
             "layout": [
-                { "x": 0.5, "y": 0 },
-                { "x": 1.5, "y": 0 },
-                { "x": 2.5, "y": 0 },
-                { "x": 3.5, "y": 0 },
-                { "x": 4.5, "y": 0 },
-                { "x": 5.5, "y": 0 },
-                { "x": 6.5, "y": 0 },
-
-                { "x": 13.25, "y": 0 },
-                { "x": 14.25, "y": 0 },
-                { "x": 15.25, "y": 0 },
-                { "x": 16.25, "y": 0 },
-                { "x": 17.25, "y": 0 },
-                { "x": 18.25, "y": 0 },
-                { "x": 19.25, "y": 0 },
-                { "x": 22.25, "y": 0, "w": 2 },
-                { "x": 20.25, "y": 0 },
-
-                { "x": 0, "y": 1, "w": 1.5 },
-                { "x": 1.5, "y": 1 },
-                { "x": 2.5, "y": 1 },
-                { "x": 3.5, "y": 1 },
-                { "x": 4.5, "y": 1 },
-                { "x": 5.5, "y": 1 },
-                { "x": 6.5, "y": 1 },
-
-                { "x": 7.75, "y": 1 },
-                { "x": 8.75, "y": 1 },
-
-                { "x": 10.5, "y": 1 },
-                { "x": 11.5, "y": 1 },
-
-                { "x": 13.25, "y": 1 },
-                { "x": 14.25, "y": 1 },
-                { "x": 15.25, "y": 1 },
-                { "x": 16.25, "y": 1 },
-                { "x": 17.25, "y": 1 },
-                { "x": 18.25, "y": 1 },
-                { "x": 19.25, "y": 1 },
-                { "x": 20.25, "y": 1, "w": 1.5 },
-
-                { "x": 0, "y": 2, "w": 1.75 },
-                { "x": 1.75, "y": 2 },
-                { "x": 2.75, "y": 2 },
-                { "x": 3.75, "y": 2 },
-                { "x": 4.75, "y": 2 },
-                { "x": 5.75, "y": 2 },
-
-                { "x": 7.75, "y": 2 },
-                { "x": 8.75, "y": 2 },
-
-                { "x": 10.5, "y": 2 },
-                { "x": 11.5, "y": 2 },
-
-                { "x": 13.5, "y": 2 },
-                { "x": 14.5, "y": 2 },
-                { "x": 15.5, "y": 2 },
-                { "x": 16.5, "y": 2 },
-                { "x": 17.5, "y": 2 },
-                { "x": 18.5, "y": 2 },
-                { "x": 19.5, "y": 2, "w": 2.25 },
-
-                { "x": 0, "y": 3, "w": 1.25 },
-                { "x": 1.25, "y": 3 },
-                { "x": 2.25, "y": 3 },
-                { "x": 3.25, "y": 3 },
-                { "x": 4.25, "y": 3 },
-                { "x": 5.25, "y": 3 },
-                { "x": 6.25, "y": 3 },
-
-                { "x": 7.75, "y": 3 },
-                { "x": 8.75, "y": 3 },
-
-                { "x": 10.5, "y": 3 },
-                { "x": 11.5, "y": 3 },
-
-                { "x": 13, "y": 3 },
-                { "x": 14, "y": 3 },
-                { "x": 15, "y": 3 },
-                { "x": 16, "y": 3 },
-                { "x": 17, "y": 3 },
-                { "x": 18, "y": 3 },
-                { "x": 19, "y": 3, "w": 1.75 },
-                { "x": 20.75, "y": 3 },
-
-                { "x": 0.5, "y": 4, "w": 1.25 },
-                { "x": 1.75, "y": 4, "w": 1.25 },
-                { "x": 3, "y": 4, "w": 1.25 },
-                { "x": 4.25, "y": 4, "w": 1.25 },
-
-                { "x": 6.5, "y": 4, "h": 1.5 },
-                { "x": 7.5, "y": 4 },
-
-                { "x": 11.75, "y": 4 },
-                { "x": 12.75, "y": 4, "h": 1.5 },
-
-                { "x": 16.25, "y": 4, "w": 1.25 },
-                { "x": 17.5, "y": 4, "w": 1.25 },
-                { "x": 18.75, "y": 4, "w": 1.25 },
-                { "x": 20, "y": 4, "w": 1.25 },
-
-                { "x": 7.5, "y": 5, "h": 1.5 },
-                { "x": 11.75, "y": 5, "h": 1.5 }
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+
+                {"matrix": [5, 0], "x": 13.25, "y": 0},
+                {"matrix": [5, 1], "x": 14.25, "y": 0},
+                {"matrix": [5, 2], "x": 15.25, "y": 0},
+                {"matrix": [5, 3], "x": 16.25, "y": 0},
+                {"matrix": [5, 4], "x": 17.25, "y": 0},
+                {"matrix": [5, 5], "x": 18.25, "y": 0},
+                {"matrix": [5, 6], "x": 19.25, "y": 0},
+                {"matrix": [5, 7], "x": 22.25, "y": 0, "w": 2},
+                {"matrix": [5, 8], "x": 20.25, "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": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+
+                {"matrix": [6, 0], "x": 10.5, "y": 1},
+                {"matrix": [6, 1], "x": 11.5, "y": 1},
+                {"matrix": [6, 2], "x": 13.25, "y": 1},
+                {"matrix": [6, 3], "x": 14.25, "y": 1},
+                {"matrix": [6, 4], "x": 15.25, "y": 1},
+                {"matrix": [6, 5], "x": 16.25, "y": 1},
+                {"matrix": [6, 6], "x": 17.25, "y": 1},
+                {"matrix": [6, 7], "x": 18.25, "y": 1},
+                {"matrix": [6, 8], "x": 19.25, "y": 1},
+                {"matrix": [7, 8], "x": 20.25, "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": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+
+                {"matrix": [7, 0], "x": 10.5, "y": 2},
+                {"matrix": [7, 1], "x": 11.5, "y": 2},
+                {"matrix": [7, 2], "x": 13.5, "y": 2},
+                {"matrix": [7, 3], "x": 14.5, "y": 2},
+                {"matrix": [7, 4], "x": 15.5, "y": 2},
+                {"matrix": [7, 5], "x": 16.5, "y": 2},
+                {"matrix": [7, 6], "x": 17.5, "y": 2},
+                {"matrix": [7, 7], "x": 18.5, "y": 2},
+                {"matrix": [8, 8], "x": 19.5, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [4, 4], "x": 1.25, "y": 3},
+                {"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": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+
+                {"matrix": [8, 0], "x": 10.5, "y": 3},
+                {"matrix": [8, 1], "x": 11.5, "y": 3},
+                {"matrix": [8, 2], "x": 13, "y": 3},
+                {"matrix": [8, 3], "x": 14, "y": 3},
+                {"matrix": [8, 4], "x": 15, "y": 3},
+                {"matrix": [8, 5], "x": 16, "y": 3},
+                {"matrix": [8, 6], "x": 17, "y": 3},
+                {"matrix": [8, 7], "x": 18, "y": 3},
+                {"matrix": [9, 6], "x": 19, "y": 3, "w": 1.75},
+                {"matrix": [9, 8], "x": 20.75, "y": 3},
+
+                {"matrix": [4, 0], "x": 0.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 3, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 6.5, "y": 4, "h": 1.5},
+                {"matrix": [4, 8], "x": 7.5, "y": 4},
+
+                {"matrix": [9, 0], "x": 11.75, "y": 4},
+                {"matrix": [9, 2], "x": 12.75, "y": 4, "h": 1.5},
+                {"matrix": [9, 3], "x": 16.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 17.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 18.75, "y": 4, "w": 1.25},
+                {"matrix": [9, 7], "x": 20, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 7], "x": 7.5, "y": 5, "h": 1.5},
+
+                {"matrix": [9, 1], "x": 11.75, "y": 5, "h": 1.5}
             ]
         }
     }