Move Alice and Ergodox layouts to data driven (#20340)

2 files changed, 358 insertions, 215 deletions

diff --git a/keyboards/ergodox_ez/ergodox_ez.h b/keyboards/ergodox_ez/ergodox_ez.h
index 8551c8f3a1..0c23a12969 100644
--- a/keyboards/ergodox_ez/ergodox_ez.h
+++ b/keyboards/ergodox_ez/ergodox_ez.h
@@ -140,152 +140,6 @@ typedef union {
 
 extern keyboard_config_t keyboard_config;
 
-/*
- *   LEFT HAND: LINES 115-122
- *  RIGHT HAND: LINES 124-131
- */
-#define LAYOUT_ergodox(                                         \
-                                                                \
-    k00,k01,k02,k03,k04,k05,k06,                                \
-    k10,k11,k12,k13,k14,k15,k16,                                \
-    k20,k21,k22,k23,k24,k25,                                    \
-    k30,k31,k32,k33,k34,k35,k36,                                \
-    k40,k41,k42,k43,k44,                                        \
-                            k55,k56,                            \
-                                k54,                            \
-                        k53,k52,k51,                            \
-                                                                \
-        k07,k08,k09,k0A,k0B,k0C,k0D,                            \
-        k17,k18,k19,k1A,k1B,k1C,k1D,                            \
-            k28,k29,k2A,k2B,k2C,k2D,                            \
-        k37,k38,k39,k3A,k3B,k3C,k3D,                            \
-                k49,k4A,k4B,k4C,k4D,                            \
-    k57,k58,                                                    \
-    k59,                                                        \
-    k5C,k5B,k5A )                                               \
-                                                                \
-   /* matrix positions */                                       \
-   {                                                            \
-    { k00, k10, k20, k30, k40, KC_NO },   \
-    { k01, k11, k21, k31, k41, k51 },   \
-    { k02, k12, k22, k32, k42, k52 },   \
-    { k03, k13, k23, k33, k43, k53 },   \
-    { k04, k14, k24, k34, k44, k54 },   \
-    { k05, k15, k25, k35, KC_NO, k55 },   \
-    { k06, k16, KC_NO, k36, KC_NO, k56 },   \
-                                                                 \
-    { k07, k17, KC_NO, k37,KC_NO, k57 },   \
-    { k08, k18, k28, k38,KC_NO, k58 },   \
-    { k09, k19, k29, k39, k49, k59 },   \
-    { k0A, k1A, k2A, k3A, k4A, k5A },   \
-    { k0B, k1B, k2B, k3B, k4B, k5B },   \
-    { k0C, k1C, k2C, k3C, k4C, k5C },   \
-    { k0D, k1D, k2D, k3D, k4D, KC_NO }    \
-   }
-
-/*
- *   LEFT HAND: LINES 158-165
- *  RIGHT HAND: LINES 167-174
- */
-#define LAYOUT_ergodox_80(                                      \
-                                                                \
-    k00,k01,k02,k03,k04,k05,k06,                                \
-    k10,k11,k12,k13,k14,k15,k16,                                \
-    k20,k21,k22,k23,k24,k25,                                    \
-    k30,k31,k32,k33,k34,k35,k36,                                \
-    k40,k41,k42,k43,k44,                                        \
-                            k55,k56,                            \
-                        k45,k46,k54,                            \
-                        k53,k52,k51,                            \
-                                                                \
-        k07,k08,k09,k0A,k0B,k0C,k0D,                            \
-        k17,k18,k19,k1A,k1B,k1C,k1D,                            \
-            k28,k29,k2A,k2B,k2C,k2D,                            \
-        k37,k38,k39,k3A,k3B,k3C,k3D,                            \
-                k49,k4A,k4B,k4C,k4D,                            \
-    k57,k58,                                                    \
-    k59,k47,k48,                                                \
-    k5C,k5B,k5A )                                               \
-                                                                \
-   /* matrix positions */                                       \
-   {                                                            \
-    { k00, k10, k20, k30, k40, KC_NO },   \
-    { k01, k11, k21, k31, k41, k51 },   \
-    { k02, k12, k22, k32, k42, k52 },   \
-    { k03, k13, k23, k33, k43, k53 },   \
-    { k04, k14, k24, k34, k44, k54 },   \
-    { k05, k15, k25, k35, k45, k55 },   \
-    { k06, k16, KC_NO, k36, k46, k56 },   \
-                                                                 \
-    { k07, k17, KC_NO, k37, k47, k57 },   \
-    { k08, k18, k28, k38, k48, k58 },   \
-    { k09, k19, k29, k39, k49, k59 },   \
-    { k0A, k1A, k2A, k3A, k4A, k5A },   \
-    { k0B, k1B, k2B, k3B, k4B, k5B },   \
-    { k0C, k1C, k2C, k3C, k4C, k5C },   \
-    { k0D, k1D, k2D, k3D, k4D, KC_NO }    \
-   }
-
-/*  ---------- LEFT HAND -----------   ---------- RIGHT HAND ---------- */
-#define LAYOUT_ergodox_pretty(                                           \
-    L00,L01,L02,L03,L04,L05,L06,           R00,R01,R02,R03,R04,R05,R06,  \
-    L10,L11,L12,L13,L14,L15,L16,           R10,R11,R12,R13,R14,R15,R16,  \
-    L20,L21,L22,L23,L24,L25,                   R21,R22,R23,R24,R25,R26,  \
-    L30,L31,L32,L33,L34,L35,L36,           R30,R31,R32,R33,R34,R35,R36,  \
-    L40,L41,L42,L43,L44,                           R42,R43,R44,R45,R46,  \
-                            L55,L56,   R50,R51,                          \
-                                L54,   R52,                              \
-                        L53,L52,L51,   R55,R54,R53 )                     \
-                                          \
-   /* matrix positions */                 \
-    {                                     \
-    { L00, L10, L20, L30, L40, KC_NO },   \
-    { L01, L11, L21, L31, L41, L51 },     \
-    { L02, L12, L22, L32, L42, L52 },     \
-    { L03, L13, L23, L33, L43, L53 },     \
-    { L04, L14, L24, L34, L44, L54 },     \
-    { L05, L15, L25, L35, KC_NO, L55 },   \
-    { L06, L16, KC_NO, L36, KC_NO, L56 }, \
-                                          \
-    { R00, R10, KC_NO, R30,KC_NO, R50 },  \
-    { R01, R11, R21, R31,KC_NO, R51 },    \
-    { R02, R12, R22, R32, R42, R52 },     \
-    { R03, R13, R23, R33, R43, R53 },     \
-    { R04, R14, R24, R34, R44, R54 },     \
-    { R05, R15, R25, R35, R45, R55 },     \
-    { R06, R16, R26, R36, R46, KC_NO }    \
-    }
-
-/*  ---------- LEFT HAND -----------   ---------- RIGHT HAND ---------- */
-#define LAYOUT_ergodox_pretty_80(                                        \
-    L00,L01,L02,L03,L04,L05,L06,           R00,R01,R02,R03,R04,R05,R06,  \
-    L10,L11,L12,L13,L14,L15,L16,           R10,R11,R12,R13,R14,R15,R16,  \
-    L20,L21,L22,L23,L24,L25,                   R21,R22,R23,R24,R25,R26,  \
-    L30,L31,L32,L33,L34,L35,L36,           R30,R31,R32,R33,R34,R35,R36,  \
-    L40,L41,L42,L43,L44,                           R42,R43,R44,R45,R46,  \
-                            L55,L56,   R50,R51,                          \
-                        L45,L46,L54,   R52,R40,R41,                      \
-                        L53,L52,L51,   R55,R54,R53 )                     \
-                                          \
-      /* matrix positions */              \
-    {                                     \
-    { L00, L10, L20, L30, L40, KC_NO },   \
-    { L01, L11, L21, L31, L41, L51 },     \
-    { L02, L12, L22, L32, L42, L52 },     \
-    { L03, L13, L23, L33, L43, L53 },     \
-    { L04, L14, L24, L34, L44, L54 },     \
-    { L05, L15, L25, L35, L45, L55 },     \
-    { L06, L16, KC_NO, L36, L46, L56 },   \
-                                          \
-    { R00, R10, KC_NO, R30, R40, R50 },   \
-    { R01, R11, R21, R31, R41, R51 },     \
-    { R02, R12, R22, R32, R42, R52 },     \
-    { R03, R13, R23, R33, R43, R53 },     \
-    { R04, R14, R24, R34, R44, R54 },     \
-    { R05, R15, R25, R35, R45, R55 },     \
-    { R06, R16, R26, R36, R46, KC_NO }    \
-    }
-
 /*  ---- LEFT HAND ----     ---- RIGHT HAND ---- */
 #define LED_LAYOUT_ergodox_pretty(                \
     L01,L02,L03,L04,L05,    R01,R02,R03,R04,R05,  \
diff --git a/keyboards/ergodox_ez/info.json b/keyboards/ergodox_ez/info.json
index cfef842617..b4b5522140 100644
--- a/keyboards/ergodox_ez/info.json
+++ b/keyboards/ergodox_ez/info.json
@@ -13,97 +13,386 @@
     "layouts": {
         "LAYOUT_ergodox": {
             "layout": [
-              {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25},
-              {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25, "h":1.5},
-              {"x":0, "y":2.375, "w":1.5}, {"x":1.5, "y":2.375}, {"x":2.5, "y":2.125}, {"x":3.5, "y":2}, {"x":4.5, "y":2.125}, {"x":5.5, "y":2.25},
-              {"x":0, "y":3.375, "w":1.5}, {"x":1.5, "y":3.375}, {"x":2.5, "y":3.125}, {"x":3.5, "y":3}, {"x":4.5, "y":3.125}, {"x":5.5, "y":3.25}, {"x":6.5, "y":2.75, "h":1.5},
-                     {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125},
+                {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
+                {"matrix": [1, 0], "x": 1.5, "y": 0.375},
+                {"matrix": [2, 0], "x": 2.5, "y": 0.125},
+                {"matrix": [3, 0], "x": 3.5, "y": 0},
+                {"matrix": [4, 0], "x": 4.5, "y": 0.125},
+                {"matrix": [5, 0], "x": 5.5, "y": 0.25},
+                {"matrix": [6, 0], "x": 6.5, "y": 0.25},
 
-                                            {"x":6, "y":5}, {"x":7, "y":5},
-                                                            {"x":7, "y":6},
-              {"x":5, "y":6, "h":2}, {"x":6, "y":6, "h":2}, {"x":7, "y":7},
+                {"matrix": [0, 1], "x": 0, "y": 1.375, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.375},
+                {"matrix": [2, 1], "x": 2.5, "y": 1.125},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [4, 1], "x": 4.5, "y": 1.125},
+                {"matrix": [5, 1], "x": 5.5, "y": 1.25},
+                {"matrix": [6, 1], "x": 6.5, "y": 1.25, "h": 1.5},
 
+                {"matrix": [0, 2], "x": 0, "y": 2.375, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 2.375},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+                {"matrix": [3, 2], "x": 3.5, "y": 2},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.125},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
 
-                         {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5},
-                {"x":9.5, "y":1.25, "h":1.5}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.375, "w":1.5},
-                                              {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.375, "w":1.5},
-                {"x":9.5, "y":2.75, "h":1.5}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.375, "w":1.5},
-                                                                    {"x":11.5, "y":4.125}, {"x":12.5, "y":4}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375}, {"x":15.5, "y":4.375},
+                {"matrix": [0, 3], "x": 0, "y": 3.375, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 3.375},
+                {"matrix": [2, 3], "x": 2.5, "y": 3.125},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [4, 3], "x": 4.5, "y": 3.125},
+                {"matrix": [5, 3], "x": 5.5, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.5, "y": 2.75, "h": 1.5},
 
+                {"matrix": [0, 4], "x": 0.5, "y": 4.375},
+                {"matrix": [1, 4], "x": 1.5, "y": 4.375},
+                {"matrix": [2, 4], "x": 2.5, "y": 4.125},
+                {"matrix": [3, 4], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4.125},
 
-              {"x":9, "y":5}, {"x":10, "y":5},
-              {"x":9, "y":6},
-              {"x":9, "y":7}, {"x":10, "y":6, "h":2}, {"x":11, "y":6, "h":2}
+                {"matrix": [5, 5], "x": 6, "y": 5},
+                {"matrix": [6, 5], "x": 7, "y": 5},
+                {"matrix": [4, 5], "x": 7, "y": 6},
+                {"matrix": [3, 5], "x": 5, "y": 6, "h": 2},
+                {"matrix": [2, 5], "x": 6, "y": 6, "h": 2},
+                {"matrix": [1, 5], "x": 7, "y": 7},
+
+                {"matrix": [7, 0], "x": 9.5, "y": 0.25},
+                {"matrix": [8, 0], "x": 10.5, "y": 0.25},
+                {"matrix": [9, 0], "x": 11.5, "y": 0.125},
+                {"matrix": [10, 0], "x": 12.5, "y": 0},
+                {"matrix": [11, 0], "x": 13.5, "y": 0.125},
+                {"matrix": [12, 0], "x": 14.5, "y": 0.375},
+                {"matrix": [13, 0], "x": 15.5, "y": 0.375, "w": 1.5},
+
+                {"matrix": [7, 1], "x": 9.5, "y": 1.25, "h": 1.5},
+                {"matrix": [8, 1], "x": 10.5, "y": 1.25},
+                {"matrix": [9, 1], "x": 11.5, "y": 1.125},
+                {"matrix": [10, 1], "x": 12.5, "y": 1},
+                {"matrix": [11, 1], "x": 13.5, "y": 1.125},
+                {"matrix": [12, 1], "x": 14.5, "y": 1.375},
+                {"matrix": [13, 1], "x": 15.5, "y": 1.375, "w": 1.5},
+
+                {"matrix": [8, 2], "x": 10.5, "y": 2.25},
+                {"matrix": [9, 2], "x": 11.5, "y": 2.125},
+                {"matrix": [10, 2], "x": 12.5, "y": 2},
+                {"matrix": [11, 2], "x": 13.5, "y": 2.125},
+                {"matrix": [12, 2], "x": 14.5, "y": 2.375},
+                {"matrix": [13, 2], "x": 15.5, "y": 2.375, "w": 1.5},
+                {"matrix": [7, 3], "x": 9.5, "y": 2.75, "h": 1.5},
+
+                {"matrix": [8, 3], "x": 10.5, "y": 3.25},
+                {"matrix": [9, 3], "x": 11.5, "y": 3.125},
+                {"matrix": [10, 3], "x": 12.5, "y": 3},
+                {"matrix": [11, 3], "x": 13.5, "y": 3.125},
+                {"matrix": [12, 3], "x": 14.5, "y": 3.375},
+                {"matrix": [13, 3], "x": 15.5, "y": 3.375, "w": 1.5},
+
+                {"matrix": [9, 4], "x": 11.5, "y": 4.125},
+                {"matrix": [10, 4], "x": 12.5, "y": 4},
+                {"matrix": [11, 4], "x": 13.5, "y": 4.125},
+                {"matrix": [12, 4], "x": 14.5, "y": 4.375},
+                {"matrix": [13, 4], "x": 15.5, "y": 4.375},
+
+                {"matrix": [7, 5], "x": 9, "y": 5},
+                {"matrix": [8, 5], "x": 10, "y": 5},
+                {"matrix": [9, 5], "x": 9, "y": 6},
+                {"matrix": [12, 5], "x": 9, "y": 7},
+                {"matrix": [11, 5], "x": 10, "y": 6, "h": 2},
+                {"matrix": [10, 5], "x": 11, "y": 6, "h": 2}
             ]
         },
         "LAYOUT_ergodox_pretty": {
             "layout": [
-              {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25},
-              {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5},
+                {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
+                {"matrix": [1, 0], "x": 1.5, "y": 0.375},
+                {"matrix": [2, 0], "x": 2.5, "y": 0.125},
+                {"matrix": [3, 0], "x": 3.5, "y": 0},
+                {"matrix": [4, 0], "x": 4.5, "y": 0.125},
+                {"matrix": [5, 0], "x": 5.5, "y": 0.25},
+                {"matrix": [6, 0], "x": 6.5, "y": 0.25},
+
+                {"matrix": [7, 0], "x": 9.5, "y": 0.25},
+                {"matrix": [8, 0], "x": 10.5, "y": 0.25},
+                {"matrix": [9, 0], "x": 11.5, "y": 0.125},
+                {"matrix": [10, 0], "x": 12.5, "y": 0},
+                {"matrix": [11, 0], "x": 13.5, "y": 0.125},
+                {"matrix": [12, 0], "x": 14.5, "y": 0.375},
+                {"matrix": [13, 0], "x": 15.5, "y": 0.375, "w": 1.5},
+
+                {"matrix": [0, 1], "x": 0, "y": 1.375, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.375},
+                {"matrix": [2, 1], "x": 2.5, "y": 1.125},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [4, 1], "x": 4.5, "y": 1.125},
+                {"matrix": [5, 1], "x": 5.5, "y": 1.25},
+                {"matrix": [6, 1], "x": 6.5, "y": 1.25, "h": 1.5},
+
+                {"matrix": [7, 1], "x": 9.5, "y": 1.25, "h": 1.5},
+                {"matrix": [8, 1], "x": 10.5, "y": 1.25},
+                {"matrix": [9, 1], "x": 11.5, "y": 1.125},
+                {"matrix": [10, 1], "x": 12.5, "y": 1},
+                {"matrix": [11, 1], "x": 13.5, "y": 1.125},
+                {"matrix": [12, 1], "x": 14.5, "y": 1.375},
+                {"matrix": [13, 1], "x": 15.5, "y": 1.375, "w": 1.5},
+
+                {"matrix": [0, 2], "x": 0, "y": 2.375, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 2.375},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+                {"matrix": [3, 2], "x": 3.5, "y": 2},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.125},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+
+                {"matrix": [8, 2], "x": 10.5, "y": 2.25},
+                {"matrix": [9, 2], "x": 11.5, "y": 2.125},
+                {"matrix": [10, 2], "x": 12.5, "y": 2},
+                {"matrix": [11, 2], "x": 13.5, "y": 2.125},
+                {"matrix": [12, 2], "x": 14.5, "y": 2.375},
+                {"matrix": [13, 2], "x": 15.5, "y": 2.375, "w": 1.5},
+
+                {"matrix": [0, 3], "x": 0, "y": 3.375, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 3.375},
+                {"matrix": [2, 3], "x": 2.5, "y": 3.125},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [4, 3], "x": 4.5, "y": 3.125},
+                {"matrix": [5, 3], "x": 5.5, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.5, "y": 2.75, "h": 1.5},
 
-              {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25, "h":1.5},
-              {"x":9.5, "y":1.25, "h":1.5}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.375, "w":1.5},
+                {"matrix": [7, 3], "x": 9.5, "y": 2.75, "h": 1.5},
+                {"matrix": [8, 3], "x": 10.5, "y": 3.25},
+                {"matrix": [9, 3], "x": 11.5, "y": 3.125},
+                {"matrix": [10, 3], "x": 12.5, "y": 3},
+                {"matrix": [11, 3], "x": 13.5, "y": 3.125},
+                {"matrix": [12, 3], "x": 14.5, "y": 3.375},
+                {"matrix": [13, 3], "x": 15.5, "y": 3.375, "w": 1.5},
 
-              {"x":0, "y":2.375, "w":1.5}, {"x":1.5, "y":2.375}, {"x":2.5, "y":2.125}, {"x":3.5, "y":2}, {"x":4.5, "y":2.125}, {"x":5.5, "y":2.25},
-              {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.375, "w":1.5},
+                {"matrix": [0, 4], "x": 0.5, "y": 4.375},
+                {"matrix": [1, 4], "x": 1.5, "y": 4.375},
+                {"matrix": [2, 4], "x": 2.5, "y": 4.125},
+                {"matrix": [3, 4], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4.125},
 
-              {"x":0, "y":3.375, "w":1.5}, {"x":1.5, "y":3.375}, {"x":2.5, "y":3.125}, {"x":3.5, "y":3}, {"x":4.5, "y":3.125}, {"x":5.5, "y":3.25}, {"x":6.5, "y":2.75, "h":1.5},
-              {"x":9.5, "y":2.75, "h":1.5}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.375, "w":1.5},
+                {"matrix": [9, 4], "x": 11.5, "y": 4.125},
+                {"matrix": [10, 4], "x": 12.5, "y": 4},
+                {"matrix": [11, 4], "x": 13.5, "y": 4.125},
+                {"matrix": [12, 4], "x": 14.5, "y": 4.375},
+                {"matrix": [13, 4], "x": 15.5, "y": 4.375},
 
-                     {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125},
-                                                                    {"x":11.5, "y":4.125}, {"x":12.5, "y":4}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375}, {"x":15.5, "y":4.375},
+                {"matrix": [5, 5], "x": 6, "y": 5},
+                {"matrix": [6, 5], "x": 7, "y": 5},
 
-                                            {"x":6, "y":5}, {"x":7, "y":5},      {"x":9, "y":5}, {"x":10, "y":5},
-                                                            {"x":7, "y":6},      {"x":9, "y":6},
-              {"x":5, "y":6, "h":2}, {"x":6, "y":6, "h":2}, {"x":7, "y":7},      {"x":9, "y":7}, {"x":10, "y":6, "h":2}, {"x":11, "y":6, "h":2}
+                {"matrix": [7, 5], "x": 9, "y": 5},
+                {"matrix": [8, 5], "x": 10, "y": 5},
+
+                {"matrix": [4, 5], "x": 7, "y": 6},
+                {"matrix": [9, 5], "x": 9, "y": 6},
+
+                {"matrix": [3, 5], "x": 5, "y": 6, "h": 2},
+                {"matrix": [2, 5], "x": 6, "y": 6, "h": 2},
+                {"matrix": [1, 5], "x": 7, "y": 7},
+
+                {"matrix": [12, 5], "x": 9, "y": 7},
+                {"matrix": [11, 5], "x": 10, "y": 6, "h": 2},
+                {"matrix": [10, 5], "x": 11, "y": 6, "h": 2}
             ]
         },
         "LAYOUT_ergodox_80": {
-          "layout": [
-            {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25},
-            {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25, "h":1.5},
-            {"x":0, "y":2.375, "w":1.5}, {"x":1.5, "y":2.375}, {"x":2.5, "y":2.125}, {"x":3.5, "y":2}, {"x":4.5, "y":2.125}, {"x":5.5, "y":2.25},
-            {"x":0, "y":3.375, "w":1.5}, {"x":1.5, "y":3.375}, {"x":2.5, "y":3.125}, {"x":3.5, "y":3}, {"x":4.5, "y":3.125}, {"x":5.5, "y":3.25}, {"x":6.5, "y":2.75, "h":1.5},
-                   {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125},
-
-                                          {"x":6, "y":5}, {"x":7, "y":5},
-                          {"x":5, "y":6}, {"x":6, "y":6}, {"x":7, "y":6},
-                          {"x":5, "y":7}, {"x":6, "y":7}, {"x":7, "y":7},
-
-
-                          {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5},
-                          {"x":9.5, "y":1.25, "h":1.5}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.375, "w":1.5},
-                                                        {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.375, "w":1.5},
-                          {"x":9.5, "y":2.75, "h":1.5}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.375, "w":1.5},
-                                                                              {"x":11.5, "y":4.125}, {"x":12.5, "y":4}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375}, {"x":15.5, "y":4.375},
-
-
-            {"x":9, "y":5}, {"x":10, "y":5},
-            {"x":9, "y":6}, {"x":10, "y":6}, {"x":11, "y":6},
-            {"x":9, "y":7}, {"x":10, "y":7}, {"x":11, "y":7}
-          ]
-      },
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
+                {"matrix": [1, 0], "x": 1.5, "y": 0.375},
+                {"matrix": [2, 0], "x": 2.5, "y": 0.125},
+                {"matrix": [3, 0], "x": 3.5, "y": 0},
+                {"matrix": [4, 0], "x": 4.5, "y": 0.125},
+                {"matrix": [5, 0], "x": 5.5, "y": 0.25},
+                {"matrix": [6, 0], "x": 6.5, "y": 0.25},
+
+                {"matrix": [0, 1], "x": 0, "y": 1.375, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.375},
+                {"matrix": [2, 1], "x": 2.5, "y": 1.125},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [4, 1], "x": 4.5, "y": 1.125},
+                {"matrix": [5, 1], "x": 5.5, "y": 1.25},
+                {"matrix": [6, 1], "x": 6.5, "y": 1.25, "h": 1.5},
+
+                {"matrix": [0, 2], "x": 0, "y": 2.375, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 2.375},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+                {"matrix": [3, 2], "x": 3.5, "y": 2},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.125},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+
+                {"matrix": [0, 3], "x": 0, "y": 3.375, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 3.375},
+                {"matrix": [2, 3], "x": 2.5, "y": 3.125},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [4, 3], "x": 4.5, "y": 3.125},
+                {"matrix": [5, 3], "x": 5.5, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.5, "y": 2.75, "h": 1.5},
+
+                {"matrix": [0, 4], "x": 0.5, "y": 4.375},
+                {"matrix": [1, 4], "x": 1.5, "y": 4.375},
+                {"matrix": [2, 4], "x": 2.5, "y": 4.125},
+                {"matrix": [3, 4], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4.125},
+
+                {"matrix": [5, 5], "x": 6, "y": 5},
+                {"matrix": [6, 5], "x": 7, "y": 5},
+
+                {"matrix": [5, 4], "x": 5, "y": 6},
+                {"matrix": [6, 4], "x": 6, "y": 6},
+                {"matrix": [4, 5], "x": 7, "y": 6},
+
+                {"matrix": [3, 5], "x": 5, "y": 7},
+                {"matrix": [2, 5], "x": 6, "y": 7},
+                {"matrix": [1, 5], "x": 7, "y": 7},
+
+                {"matrix": [7, 0], "x": 9.5, "y": 0.25},
+                {"matrix": [8, 0], "x": 10.5, "y": 0.25},
+                {"matrix": [9, 0], "x": 11.5, "y": 0.125},
+                {"matrix": [10, 0], "x": 12.5, "y": 0},
+                {"matrix": [11, 0], "x": 13.5, "y": 0.125},
+                {"matrix": [12, 0], "x": 14.5, "y": 0.375},
+                {"matrix": [13, 0], "x": 15.5, "y": 0.375, "w": 1.5},
+
+                {"matrix": [7, 1], "x": 9.5, "y": 1.25, "h": 1.5},
+                {"matrix": [8, 1], "x": 10.5, "y": 1.25},
+                {"matrix": [9, 1], "x": 11.5, "y": 1.125},
+                {"matrix": [10, 1], "x": 12.5, "y": 1},
+                {"matrix": [11, 1], "x": 13.5, "y": 1.125},
+                {"matrix": [12, 1], "x": 14.5, "y": 1.375},
+                {"matrix": [13, 1], "x": 15.5, "y": 1.375, "w": 1.5},
+
+                {"matrix": [8, 2], "x": 10.5, "y": 2.25},
+                {"matrix": [9, 2], "x": 11.5, "y": 2.125},
+                {"matrix": [10, 2], "x": 12.5, "y": 2},
+                {"matrix": [11, 2], "x": 13.5, "y": 2.125},
+                {"matrix": [12, 2], "x": 14.5, "y": 2.375},
+                {"matrix": [13, 2], "x": 15.5, "y": 2.375, "w": 1.5},
+                {"matrix": [7, 3], "x": 9.5, "y": 2.75, "h": 1.5},
+
+                {"matrix": [8, 3], "x": 10.5, "y": 3.25},
+                {"matrix": [9, 3], "x": 11.5, "y": 3.125},
+                {"matrix": [10, 3], "x": 12.5, "y": 3},
+                {"matrix": [11, 3], "x": 13.5, "y": 3.125},
+                {"matrix": [12, 3], "x": 14.5, "y": 3.375},
+                {"matrix": [13, 3], "x": 15.5, "y": 3.375, "w": 1.5},
+
+                {"matrix": [9, 4], "x": 11.5, "y": 4.125},
+                {"matrix": [10, 4], "x": 12.5, "y": 4},
+                {"matrix": [11, 4], "x": 13.5, "y": 4.125},
+                {"matrix": [12, 4], "x": 14.5, "y": 4.375},
+                {"matrix": [13, 4], "x": 15.5, "y": 4.375},
+
+                {"matrix": [7, 5], "x": 9, "y": 5},
+                {"matrix": [8, 5], "x": 10, "y": 5},
+
+                {"matrix": [9, 5], "x": 9, "y": 6},
+                {"matrix": [7, 4], "x": 10, "y": 6},
+                {"matrix": [8, 4], "x": 11, "y": 6},
+
+                {"matrix": [12, 5], "x": 9, "y": 7},
+                {"matrix": [11, 5], "x": 10, "y": 7},
+                {"matrix": [10, 5], "x": 11, "y": 7}
+            ]
+        },
         "LAYOUT_ergodox_pretty_80": {
-          "layout": [
-            {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25},
-            {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5},
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
+                {"matrix": [1, 0], "x": 1.5, "y": 0.375},
+                {"matrix": [2, 0], "x": 2.5, "y": 0.125},
+                {"matrix": [3, 0], "x": 3.5, "y": 0},
+                {"matrix": [4, 0], "x": 4.5, "y": 0.125},
+                {"matrix": [5, 0], "x": 5.5, "y": 0.25},
+                {"matrix": [6, 0], "x": 6.5, "y": 0.25},
 
-            {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25, "h":1.5},
-            {"x":9.5, "y":1.25, "h":1.5}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.375, "w":1.5},
+                {"matrix": [7, 0], "x": 9.5, "y": 0.25},
+                {"matrix": [8, 0], "x": 10.5, "y": 0.25},
+                {"matrix": [9, 0], "x": 11.5, "y": 0.125},
+                {"matrix": [10, 0], "x": 12.5, "y": 0},
+                {"matrix": [11, 0], "x": 13.5, "y": 0.125},
+                {"matrix": [12, 0], "x": 14.5, "y": 0.375},
+                {"matrix": [13, 0], "x": 15.5, "y": 0.375, "w": 1.5},
 
-            {"x":0, "y":2.375, "w":1.5}, {"x":1.5, "y":2.375}, {"x":2.5, "y":2.125}, {"x":3.5, "y":2}, {"x":4.5, "y":2.125}, {"x":5.5, "y":2.25},
-            {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.375, "w":1.5},
+                {"matrix": [0, 1], "x": 0, "y": 1.375, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.375},
+                {"matrix": [2, 1], "x": 2.5, "y": 1.125},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [4, 1], "x": 4.5, "y": 1.125},
+                {"matrix": [5, 1], "x": 5.5, "y": 1.25},
+                {"matrix": [6, 1], "x": 6.5, "y": 1.25, "h": 1.5},
 
-            {"x":0, "y":3.375, "w":1.5}, {"x":1.5, "y":3.375}, {"x":2.5, "y":3.125}, {"x":3.5, "y":3}, {"x":4.5, "y":3.125}, {"x":5.5, "y":3.25}, {"x":6.5, "y":2.75, "h":1.5},
-            {"x":9.5, "y":2.75, "h":1.5}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.375, "w":1.5},
+                {"matrix": [7, 1], "x": 9.5, "y": 1.25, "h": 1.5},
+                {"matrix": [8, 1], "x": 10.5, "y": 1.25},
+                {"matrix": [9, 1], "x": 11.5, "y": 1.125},
+                {"matrix": [10, 1], "x": 12.5, "y": 1},
+                {"matrix": [11, 1], "x": 13.5, "y": 1.125},
+                {"matrix": [12, 1], "x": 14.5, "y": 1.375},
+                {"matrix": [13, 1], "x": 15.5, "y": 1.375, "w": 1.5},
 
-                   {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125},
-                                                                  {"x":11.5, "y":4.125}, {"x":12.5, "y":4}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375}, {"x":15.5, "y":4.375},
+                {"matrix": [0, 2], "x": 0, "y": 2.375, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 2.375},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+                {"matrix": [3, 2], "x": 3.5, "y": 2},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.125},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
 
-                                          {"x":6, "y":5}, {"x":7, "y":5},      {"x":9, "y":5}, {"x":10, "y":5},
-                          {"x":5, "y":6}, {"x":6, "y":6}, {"x":7, "y":6},      {"x":9, "y":6}, {"x":10, "y":6}, {"x":11, "y":6},
-                          {"x":5, "y":7}, {"x":6, "y":7}, {"x":7, "y":7},      {"x":9, "y":7}, {"x":10, "y":7}, {"x":11, "y":7}
-          ]
-      }
+                {"matrix": [8, 2], "x": 10.5, "y": 2.25},
+                {"matrix": [9, 2], "x": 11.5, "y": 2.125},
+                {"matrix": [10, 2], "x": 12.5, "y": 2},
+                {"matrix": [11, 2], "x": 13.5, "y": 2.125},
+                {"matrix": [12, 2], "x": 14.5, "y": 2.375},
+                {"matrix": [13, 2], "x": 15.5, "y": 2.375, "w": 1.5},
+
+                {"matrix": [0, 3], "x": 0, "y": 3.375, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 3.375},
+                {"matrix": [2, 3], "x": 2.5, "y": 3.125},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [4, 3], "x": 4.5, "y": 3.125},
+                {"matrix": [5, 3], "x": 5.5, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.5, "y": 2.75, "h": 1.5},
+
+                {"matrix": [7, 3], "x": 9.5, "y": 2.75, "h": 1.5},
+                {"matrix": [8, 3], "x": 10.5, "y": 3.25},
+                {"matrix": [9, 3], "x": 11.5, "y": 3.125},
+                {"matrix": [10, 3], "x": 12.5, "y": 3},
+                {"matrix": [11, 3], "x": 13.5, "y": 3.125},
+                {"matrix": [12, 3], "x": 14.5, "y": 3.375},
+                {"matrix": [13, 3], "x": 15.5, "y": 3.375, "w": 1.5},
+
+                {"matrix": [0, 4], "x": 0.5, "y": 4.375},
+                {"matrix": [1, 4], "x": 1.5, "y": 4.375},
+                {"matrix": [2, 4], "x": 2.5, "y": 4.125},
+                {"matrix": [3, 4], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4.125},
+
+                {"matrix": [9, 4], "x": 11.5, "y": 4.125},
+                {"matrix": [10, 4], "x": 12.5, "y": 4},
+                {"matrix": [11, 4], "x": 13.5, "y": 4.125},
+                {"matrix": [12, 4], "x": 14.5, "y": 4.375},
+                {"matrix": [13, 4], "x": 15.5, "y": 4.375},
+
+                {"matrix": [5, 5], "x": 6, "y": 5},
+                {"matrix": [6, 5], "x": 7, "y": 5},
+
+                {"matrix": [7, 5], "x": 9, "y": 5},
+                {"matrix": [8, 5], "x": 10, "y": 5},
+
+                {"matrix": [5, 4], "x": 5, "y": 6},
+                {"matrix": [6, 4], "x": 6, "y": 6},
+                {"matrix": [4, 5], "x": 7, "y": 6},
+
+                {"matrix": [9, 5], "x": 9, "y": 6},
+                {"matrix": [7, 4], "x": 10, "y": 6},
+                {"matrix": [8, 4], "x": 11, "y": 6},
+
+                {"matrix": [3, 5], "x": 5, "y": 7},
+                {"matrix": [2, 5], "x": 6, "y": 7},
+                {"matrix": [1, 5], "x": 7, "y": 7},
+
+                {"matrix": [12, 5], "x": 9, "y": 7},
+                {"matrix": [11, 5], "x": 10, "y": 7},
+                {"matrix": [10, 5], "x": 11, "y": 7}
+            ]
+        }
     }
 }