Move remaining `LAYOUT_all`s to data driven (#20463)

3 files changed, 285 insertions, 327 deletions

diff --git a/keyboards/yiancardesigns/barleycorn/barleycorn.c b/keyboards/yiancardesigns/barleycorn/barleycorn.c
index 4d555de195..9bd5d84d2b 100644
--- a/keyboards/yiancardesigns/barleycorn/barleycorn.c
+++ b/keyboards/yiancardesigns/barleycorn/barleycorn.c
@@ -13,7 +13,7 @@
  * 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 "barleycorn.h"
+#include "quantum.h"
 
 void keyboard_pre_init_kb(void) {
     // Set our LED pins as output
diff --git a/keyboards/yiancardesigns/barleycorn/barleycorn.h b/keyboards/yiancardesigns/barleycorn/barleycorn.h
deleted file mode 100644
index 0b266feaed..0000000000
--- a/keyboards/yiancardesigns/barleycorn/barleycorn.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Copyright 2020 Yiancar
- *
- * 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
-
-#define XXX KC_NO
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1D,                K0E, K0F, K0G, K0H, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C,                     K1E, K1F, K1G, K1H, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,                     K2E, K2F, K2G, K2H, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3C,             K3D,      K3E, K3F, K3G, K3H, \
-    K40, K41, K42,                K46,                          K4A, K4B,      K4C, K4D, K4E,      K4F, K4G, K4H  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H }, \
-    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H }  \
-}
-
-#define LAYOUT_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1D,                K0E, K0F, K0G, K0H, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C,                     K1E, K1F, K1G, K1H, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,                     K2E, K2F, K2G, K2H, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3C,             K3D,      K3E, K3F, K3G, K3H, \
-    K40, K41, K42,                K46,                          K4A, K4B,      K4C, K4D, K4E,      K4F, K4G, K4H  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H }, \
-    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H }  \
-}
-
-#define LAYOUT_iso( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1D,                K0E, K0F, K0G, K0H, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,                          K1E, K1F, K1G, K1H, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,                     K2E, K2F, K2G, K2H, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3C,             K3D,      K3E, K3F, K3G, K3H, \
-    K40, K41, K42,                K46,                          K4A, K4B,      K4C, K4D, K4E,      K4F, K4G, K4H  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H }, \
-    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H }  \
-}
diff --git a/keyboards/yiancardesigns/barleycorn/info.json b/keyboards/yiancardesigns/barleycorn/info.json
index 3c7af24ebe..ad19574eae 100644
--- a/keyboards/yiancardesigns/barleycorn/info.json
+++ b/keyboards/yiancardesigns/barleycorn/info.json
@@ -12,277 +12,298 @@
     "layouts": {
       "LAYOUT_all": {
         "layout": [
-          {"label":"0,0", "x":0, "y":0},
-          {"label":"0,1", "x":1, "y":0},
-          {"label":"0,2", "x":2, "y":0},
-          {"label":"0,3", "x":3, "y":0},
-          {"label":"0,4", "x":4, "y":0},
-          {"label":"0,5", "x":5, "y":0},
-          {"label":"0,6", "x":6, "y":0},
-          {"label":"0,7", "x":7, "y":0},
-          {"label":"0,8", "x":8, "y":0},
-          {"label":"0,9", "x":9, "y":0},
-          {"label":"0,10", "x":10, "y":0},
-          {"label":"0,11", "x":11, "y":0},
-          {"label":"0,12", "x":12, "y":0},
-          {"label":"0,13", "x":13, "y":0},
-          {"label":"1,13", "x":14, "y":0},
-          {"label":"0,14", "x":15.5, "y":0},
-          {"label":"0,15", "x":16.5, "y":0},
-          {"label":"0,16", "x":17.5, "y":0},
-          {"label":"0,17", "x":18.5, "y":0},
-
-          {"label":"1,0", "x":0, "y":1, "w":1.5},
-          {"label":"1,1", "x":1.5, "y":1},
-          {"label":"1,2", "x":2.5, "y":1},
-          {"label":"1,3", "x":3.5, "y":1},
-          {"label":"1,4", "x":4.5, "y":1},
-          {"label":"1,5", "x":5.5, "y":1},
-          {"label":"1,6", "x":6.5, "y":1},
-          {"label":"1,7", "x":7.5, "y":1},
-          {"label":"1,8", "x":8.5, "y":1},
-          {"label":"1,9", "x":9.5, "y":1},
-          {"label":"1,10", "x":10.5, "y":1},
-          {"label":"1,11", "x":11.5, "y":1},
-          {"label":"1,12", "x":12.5, "y":1},
-          {"label":"2,12", "x":13.5, "y":1, "w":1.5},
-          {"label":"1,14", "x":15.5, "y":1},
-          {"label":"1,15", "x":16.5, "y":1},
-          {"label":"1,16", "x":17.5, "y":1},
-          {"label":"1,17", "x":18.5, "y":1},
-
-          {"label":"2,0", "x":0, "y":2, "w":1.75},
-          {"label":"2,1", "x":1.75, "y":2},
-          {"label":"2,2", "x":2.75, "y":2},
-          {"label":"2,3", "x":3.75, "y":2},
-          {"label":"2,4", "x":4.75, "y":2},
-          {"label":"2,5", "x":5.75, "y":2},
-          {"label":"2,6", "x":6.75, "y":2},
-          {"label":"2,7", "x":7.75, "y":2},
-          {"label":"2,8", "x":8.75, "y":2},
-          {"label":"2,9", "x":9.75, "y":2},
-          {"label":"2,10", "x":10.75, "y":2},
-          {"label":"2,11", "x":11.75, "y":2},
-          {"label":"2,13", "x":12.75, "y":2, "w":2.25},
-          {"label":"2,14", "x":15.5, "y":2},
-          {"label":"2,15", "x":16.5, "y":2},
-          {"label":"2,16", "x":17.5, "y":2},
-          {"label":"2,17", "x":18.5, "y":2},
-
-          {"label":"3,0", "x":0, "y":3, "w":1.25},
-          {"label":"3,1", "x":1.25, "y":3},
-          {"label":"3,2", "x":2.25, "y":3},
-          {"label":"3,3", "x":3.25, "y":3},
-          {"label":"3,4", "x":4.25, "y":3},
-          {"label":"3,5", "x":5.25, "y":3},
-          {"label":"3,6", "x":6.25, "y":3},
-          {"label":"3,7", "x":7.25, "y":3},
-          {"label":"3,8", "x":8.25, "y":3},
-          {"label":"3,9", "x":9.25, "y":3},
-          {"label":"3,10", "x":10.25, "y":3},
-          {"label":"3,11", "x":11.25, "y":3},
-          {"label":"3,12", "x":12.25, "y":3, "w":1.75},
-          {"label":"3,13", "x":14.25, "y":3.25},
-          {"label":"3,14", "x":15.5, "y":3},
-          {"label":"3,15", "x":16.5, "y":3},
-          {"label":"3,16", "x":17.5, "y":3},
-          {"label":"3,17", "x":18.5, "y":3},
-
-          {"label":"4,0", "x":0, "y":4, "w":1.25},
-          {"label":"4,1", "x":1.25, "y":4, "w":1.25},
-          {"label":"4,2", "x":2.5, "y":4, "w":1.25},
-          {"label":"4,6", "x":3.75, "y":4, "w":6.25},
-          {"label":"4,10", "x":10, "y":4, "w":1.5},
-          {"label":"4,11", "x":11.5, "y":4, "w":1.5},
-          {"label":"4,12", "x":13.25, "y":4.25},
-          {"label":"4,13", "x":14.25, "y":4.25},
-          {"label":"4,14", "x":15.25, "y":4.25},
-          {"label":"4,15", "x":16.5, "y":4},
-          {"label":"4,16", "x":17.5, "y":4},
-          {"label":"4,17", "x":18.5, "y":4}
+          {"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": [0, 6], "x": 6, "y": 0},
+          {"matrix": [0, 7], "x": 7, "y": 0},
+          {"matrix": [0, 8], "x": 8, "y": 0},
+          {"matrix": [0, 9], "x": 9, "y": 0},
+          {"matrix": [0, 10], "x": 10, "y": 0},
+          {"matrix": [0, 11], "x": 11, "y": 0},
+          {"matrix": [0, 12], "x": 12, "y": 0},
+          {"matrix": [0, 13], "x": 13, "y": 0},
+          {"matrix": [1, 13], "x": 14, "y": 0},
+
+          {"matrix": [0, 14], "x": 15.5, "y": 0},
+          {"matrix": [0, 15], "x": 16.5, "y": 0},
+          {"matrix": [0, 16], "x": 17.5, "y": 0},
+          {"matrix": [0, 17], "x": 18.5, "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.5, "y": 1},
+          {"matrix": [1, 8], "x": 8.5, "y": 1},
+          {"matrix": [1, 9], "x": 9.5, "y": 1},
+          {"matrix": [1, 10], "x": 10.5, "y": 1},
+          {"matrix": [1, 11], "x": 11.5, "y": 1},
+          {"matrix": [1, 12], "x": 12.5, "y": 1},
+          {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+
+          {"matrix": [1, 14], "x": 15.5, "y": 1},
+          {"matrix": [1, 15], "x": 16.5, "y": 1},
+          {"matrix": [1, 16], "x": 17.5, "y": 1},
+          {"matrix": [1, 17], "x": 18.5, "y": 1},
+
+          {"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, 6], "x": 6.75, "y": 2},
+          {"matrix": [2, 7], "x": 7.75, "y": 2},
+          {"matrix": [2, 8], "x": 8.75, "y": 2},
+          {"matrix": [2, 9], "x": 9.75, "y": 2},
+          {"matrix": [2, 10], "x": 10.75, "y": 2},
+          {"matrix": [2, 11], "x": 11.75, "y": 2},
+          {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+          {"matrix": [2, 14], "x": 15.5, "y": 2},
+          {"matrix": [2, 15], "x": 16.5, "y": 2},
+          {"matrix": [2, 16], "x": 17.5, "y": 2},
+          {"matrix": [2, 17], "x": 18.5, "y": 2},
+
+          {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+          {"matrix": [3, 1], "x": 1.25, "y": 3},
+          {"matrix": [3, 2], "x": 2.25, "y": 3},
+          {"matrix": [3, 3], "x": 3.25, "y": 3},
+          {"matrix": [3, 4], "x": 4.25, "y": 3},
+          {"matrix": [3, 5], "x": 5.25, "y": 3},
+          {"matrix": [3, 6], "x": 6.25, "y": 3},
+          {"matrix": [3, 7], "x": 7.25, "y": 3},
+          {"matrix": [3, 8], "x": 8.25, "y": 3},
+          {"matrix": [3, 9], "x": 9.25, "y": 3},
+          {"matrix": [3, 10], "x": 10.25, "y": 3},
+          {"matrix": [3, 11], "x": 11.25, "y": 3},
+          {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+
+          {"matrix": [3, 13], "x": 14.25, "y": 3.25},
+
+          {"matrix": [3, 14], "x": 15.5, "y": 3},
+          {"matrix": [3, 15], "x": 16.5, "y": 3},
+          {"matrix": [3, 16], "x": 17.5, "y": 3},
+          {"matrix": [3, 17], "x": 18.5, "y": 3},
+
+          {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+          {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+          {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+          {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+          {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+          {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+
+          {"matrix": [4, 12], "x": 13.25, "y": 4.25},
+          {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+          {"matrix": [4, 14], "x": 15.25, "y": 4.25},
+
+          {"matrix": [4, 15], "x": 16.5, "y": 4},
+          {"matrix": [4, 16], "x": 17.5, "y": 4},
+          {"matrix": [4, 17], "x": 18.5, "y": 4}
         ]
       },
       "LAYOUT_ansi": {
         "layout": [
-          {"label":"0,0", "x":0, "y":0},
-          {"label":"0,1", "x":1, "y":0},
-          {"label":"0,2", "x":2, "y":0},
-          {"label":"0,3", "x":3, "y":0},
-          {"label":"0,4", "x":4, "y":0},
-          {"label":"0,5", "x":5, "y":0},
-          {"label":"0,6", "x":6, "y":0},
-          {"label":"0,7", "x":7, "y":0},
-          {"label":"0,8", "x":8, "y":0},
-          {"label":"0,9", "x":9, "y":0},
-          {"label":"0,10", "x":10, "y":0},
-          {"label":"0,11", "x":11, "y":0},
-          {"label":"0,12", "x":12, "y":0},
-          {"label":"0,13", "x":13, "y":0},
-          {"label":"1,13", "x":14, "y":0},
-          {"label":"0,14", "x":15.5, "y":0},
-          {"label":"0,15", "x":16.5, "y":0},
-          {"label":"0,16", "x":17.5, "y":0},
-          {"label":"0,17", "x":18.5, "y":0},
-
-          {"label":"1,0", "x":0, "y":1, "w":1.5},
-          {"label":"1,1", "x":1.5, "y":1},
-          {"label":"1,2", "x":2.5, "y":1},
-          {"label":"1,3", "x":3.5, "y":1},
-          {"label":"1,4", "x":4.5, "y":1},
-          {"label":"1,5", "x":5.5, "y":1},
-          {"label":"1,6", "x":6.5, "y":1},
-          {"label":"1,7", "x":7.5, "y":1},
-          {"label":"1,8", "x":8.5, "y":1},
-          {"label":"1,9", "x":9.5, "y":1},
-          {"label":"1,10", "x":10.5, "y":1},
-          {"label":"1,11", "x":11.5, "y":1},
-          {"label":"1,12", "x":12.5, "y":1},
-          {"label":"2,12", "x":13.5, "y":1, "w":1.5},
-          {"label":"1,14", "x":15.5, "y":1},
-          {"label":"1,15", "x":16.5, "y":1},
-          {"label":"1,16", "x":17.5, "y":1},
-          {"label":"1,17", "x":18.5, "y":1},
-
-          {"label":"2,0", "x":0, "y":2, "w":1.75},
-          {"label":"2,1", "x":1.75, "y":2},
-          {"label":"2,2", "x":2.75, "y":2},
-          {"label":"2,3", "x":3.75, "y":2},
-          {"label":"2,4", "x":4.75, "y":2},
-          {"label":"2,5", "x":5.75, "y":2},
-          {"label":"2,6", "x":6.75, "y":2},
-          {"label":"2,7", "x":7.75, "y":2},
-          {"label":"2,8", "x":8.75, "y":2},
-          {"label":"2,9", "x":9.75, "y":2},
-          {"label":"2,10", "x":10.75, "y":2},
-          {"label":"2,11", "x":11.75, "y":2},
-          {"label":"2,13", "x":12.75, "y":2, "w":2.25},
-          {"label":"2,14", "x":15.5, "y":2},
-          {"label":"2,15", "x":16.5, "y":2},
-          {"label":"2,16", "x":17.5, "y":2},
-          {"label":"2,17", "x":18.5, "y":2},
-
-          {"label":"3,0", "x":0, "y":3, "w":2.25},
-          {"label":"3,2", "x":2.25, "y":3},
-          {"label":"3,3", "x":3.25, "y":3},
-          {"label":"3,4", "x":4.25, "y":3},
-          {"label":"3,5", "x":5.25, "y":3},
-          {"label":"3,6", "x":6.25, "y":3},
-          {"label":"3,7", "x":7.25, "y":3},
-          {"label":"3,8", "x":8.25, "y":3},
-          {"label":"3,9", "x":9.25, "y":3},
-          {"label":"3,10", "x":10.25, "y":3},
-          {"label":"3,11", "x":11.25, "y":3},
-          {"label":"3,12", "x":12.25, "y":3, "w":1.75},
-          {"label":"3,13", "x":14.25, "y":3.25},
-          {"label":"3,14", "x":15.5, "y":3},
-          {"label":"3,15", "x":16.5, "y":3},
-          {"label":"3,16", "x":17.5, "y":3},
-          {"label":"3,17", "x":18.5, "y":3},
-
-          {"label":"4,0", "x":0, "y":4, "w":1.25},
-          {"label":"4,1", "x":1.25, "y":4, "w":1.25},
-          {"label":"4,2", "x":2.5, "y":4, "w":1.25},
-          {"label":"4,6", "x":3.75, "y":4, "w":6.25},
-          {"label":"4,10", "x":10, "y":4, "w":1.5},
-          {"label":"4,11", "x":11.5, "y":4, "w":1.5},
-          {"label":"4,12", "x":13.25, "y":4.25},
-          {"label":"4,13", "x":14.25, "y":4.25},
-          {"label":"4,14", "x":15.25, "y":4.25},
-          {"label":"4,15", "x":16.5, "y":4},
-          {"label":"4,16", "x":17.5, "y":4},
-          {"label":"4,17", "x":18.5, "y":4}
+          {"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": [0, 6], "x": 6, "y": 0},
+          {"matrix": [0, 7], "x": 7, "y": 0},
+          {"matrix": [0, 8], "x": 8, "y": 0},
+          {"matrix": [0, 9], "x": 9, "y": 0},
+          {"matrix": [0, 10], "x": 10, "y": 0},
+          {"matrix": [0, 11], "x": 11, "y": 0},
+          {"matrix": [0, 12], "x": 12, "y": 0},
+          {"matrix": [0, 13], "x": 13, "y": 0},
+          {"matrix": [1, 13], "x": 14, "y": 0},
+
+          {"matrix": [0, 14], "x": 15.5, "y": 0},
+          {"matrix": [0, 15], "x": 16.5, "y": 0},
+          {"matrix": [0, 16], "x": 17.5, "y": 0},
+          {"matrix": [0, 17], "x": 18.5, "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.5, "y": 1},
+          {"matrix": [1, 8], "x": 8.5, "y": 1},
+          {"matrix": [1, 9], "x": 9.5, "y": 1},
+          {"matrix": [1, 10], "x": 10.5, "y": 1},
+          {"matrix": [1, 11], "x": 11.5, "y": 1},
+          {"matrix": [1, 12], "x": 12.5, "y": 1},
+          {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+
+          {"matrix": [1, 14], "x": 15.5, "y": 1},
+          {"matrix": [1, 15], "x": 16.5, "y": 1},
+          {"matrix": [1, 16], "x": 17.5, "y": 1},
+          {"matrix": [1, 17], "x": 18.5, "y": 1},
+
+          {"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, 6], "x": 6.75, "y": 2},
+          {"matrix": [2, 7], "x": 7.75, "y": 2},
+          {"matrix": [2, 8], "x": 8.75, "y": 2},
+          {"matrix": [2, 9], "x": 9.75, "y": 2},
+          {"matrix": [2, 10], "x": 10.75, "y": 2},
+          {"matrix": [2, 11], "x": 11.75, "y": 2},
+          {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+          {"matrix": [2, 14], "x": 15.5, "y": 2},
+          {"matrix": [2, 15], "x": 16.5, "y": 2},
+          {"matrix": [2, 16], "x": 17.5, "y": 2},
+          {"matrix": [2, 17], "x": 18.5, "y": 2},
+
+          {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+          {"matrix": [3, 2], "x": 2.25, "y": 3},
+          {"matrix": [3, 3], "x": 3.25, "y": 3},
+          {"matrix": [3, 4], "x": 4.25, "y": 3},
+          {"matrix": [3, 5], "x": 5.25, "y": 3},
+          {"matrix": [3, 6], "x": 6.25, "y": 3},
+          {"matrix": [3, 7], "x": 7.25, "y": 3},
+          {"matrix": [3, 8], "x": 8.25, "y": 3},
+          {"matrix": [3, 9], "x": 9.25, "y": 3},
+          {"matrix": [3, 10], "x": 10.25, "y": 3},
+          {"matrix": [3, 11], "x": 11.25, "y": 3},
+          {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+
+          {"matrix": [3, 13], "x": 14.25, "y": 3.25},
+
+          {"matrix": [3, 14], "x": 15.5, "y": 3},
+          {"matrix": [3, 15], "x": 16.5, "y": 3},
+          {"matrix": [3, 16], "x": 17.5, "y": 3},
+          {"matrix": [3, 17], "x": 18.5, "y": 3},
+
+          {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+          {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+          {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+          {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+          {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+          {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+
+          {"matrix": [4, 12], "x": 13.25, "y": 4.25},
+          {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+          {"matrix": [4, 14], "x": 15.25, "y": 4.25},
+
+          {"matrix": [4, 15], "x": 16.5, "y": 4},
+          {"matrix": [4, 16], "x": 17.5, "y": 4},
+          {"matrix": [4, 17], "x": 18.5, "y": 4}
         ]
       },
       "LAYOUT_iso": {
         "layout": [
-          {"label":"0,0", "x":0, "y":0},
-          {"label":"0,1", "x":1, "y":0},
-          {"label":"0,2", "x":2, "y":0},
-          {"label":"0,3", "x":3, "y":0},
-          {"label":"0,4", "x":4, "y":0},
-          {"label":"0,5", "x":5, "y":0},
-          {"label":"0,6", "x":6, "y":0},
-          {"label":"0,7", "x":7, "y":0},
-          {"label":"0,8", "x":8, "y":0},
-          {"label":"0,9", "x":9, "y":0},
-          {"label":"0,10", "x":10, "y":0},
-          {"label":"0,11", "x":11, "y":0},
-          {"label":"0,12", "x":12, "y":0},
-          {"label":"0,13", "x":13, "y":0},
-          {"label":"1,13", "x":14, "y":0},
-          {"label":"0,14", "x":15.5, "y":0},
-          {"label":"0,15", "x":16.5, "y":0},
-          {"label":"0,16", "x":17.5, "y":0},
-          {"label":"0,17", "x":18.5, "y":0},
-
-          {"label":"1,0", "x":0, "y":1, "w":1.5},
-          {"label":"1,1", "x":1.5, "y":1},
-          {"label":"1,2", "x":2.5, "y":1},
-          {"label":"1,3", "x":3.5, "y":1},
-          {"label":"1,4", "x":4.5, "y":1},
-          {"label":"1,5", "x":5.5, "y":1},
-          {"label":"1,6", "x":6.5, "y":1},
-          {"label":"1,7", "x":7.5, "y":1},
-          {"label":"1,8", "x":8.5, "y":1},
-          {"label":"1,9", "x":9.5, "y":1},
-          {"label":"1,10", "x":10.5, "y":1},
-          {"label":"1,11", "x":11.5, "y":1},
-          {"label":"1,12", "x":12.5, "y":1},
-          {"label":"1,14", "x":15.5, "y":1},
-          {"label":"1,15", "x":16.5, "y":1},
-          {"label":"1,16", "x":17.5, "y":1},
-          {"label":"1,17", "x":18.5, "y":1},
-
-          {"label":"2,0", "x":0, "y":2, "w":1.75},
-          {"label":"2,1", "x":1.75, "y":2},
-          {"label":"2,2", "x":2.75, "y":2},
-          {"label":"2,3", "x":3.75, "y":2},
-          {"label":"2,4", "x":4.75, "y":2},
-          {"label":"2,5", "x":5.75, "y":2},
-          {"label":"2,6", "x":6.75, "y":2},
-          {"label":"2,7", "x":7.75, "y":2},
-          {"label":"2,8", "x":8.75, "y":2},
-          {"label":"2,9", "x":9.75, "y":2},
-          {"label":"2,10", "x":10.75, "y":2},
-          {"label":"2,11", "x":11.75, "y":2},
-          {"label":"2,12", "x":12.75, "y":2},
-          {"label":"2,13", "x":13.75, "y":1, "w":1.25, "h":2},
-          {"label":"2,14", "x":15.5, "y":2},
-          {"label":"2,15", "x":16.5, "y":2},
-          {"label":"2,16", "x":17.5, "y":2},
-          {"label":"2,17", "x":18.5, "y":2},
-
-          {"label":"3,0", "x":0, "y":3, "w":1.25},
-          {"label":"3,1", "x":1.25, "y":3},
-          {"label":"3,2", "x":2.25, "y":3},
-          {"label":"3,3", "x":3.25, "y":3},
-          {"label":"3,4", "x":4.25, "y":3},
-          {"label":"3,5", "x":5.25, "y":3},
-          {"label":"3,6", "x":6.25, "y":3},
-          {"label":"3,7", "x":7.25, "y":3},
-          {"label":"3,8", "x":8.25, "y":3},
-          {"label":"3,9", "x":9.25, "y":3},
-          {"label":"3,10", "x":10.25, "y":3},
-          {"label":"3,11", "x":11.25, "y":3},
-          {"label":"3,12", "x":12.25, "y":3, "w":1.75},
-          {"label":"3,13", "x":14.25, "y":3.25},
-          {"label":"3,14", "x":15.5, "y":3},
-          {"label":"3,15", "x":16.5, "y":3},
-          {"label":"3,16", "x":17.5, "y":3},
-          {"label":"3,17", "x":18.5, "y":3},
-
-          {"label":"4,0", "x":0, "y":4, "w":1.25},
-          {"label":"4,1", "x":1.25, "y":4, "w":1.25},
-          {"label":"4,2", "x":2.5, "y":4, "w":1.25},
-          {"label":"4,6", "x":3.75, "y":4, "w":6.25},
-          {"label":"4,10", "x":10, "y":4, "w":1.5},
-          {"label":"4,11", "x":11.5, "y":4, "w":1.5},
-          {"label":"4,12", "x":13.25, "y":4.25},
-          {"label":"4,13", "x":14.25, "y":4.25},
-          {"label":"4,14", "x":15.25, "y":4.25},
-          {"label":"4,15", "x":16.5, "y":4},
-          {"label":"4,16", "x":17.5, "y":4},
-          {"label":"4,17", "x":18.5, "y":4}
+          {"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": [0, 6], "x": 6, "y": 0},
+          {"matrix": [0, 7], "x": 7, "y": 0},
+          {"matrix": [0, 8], "x": 8, "y": 0},
+          {"matrix": [0, 9], "x": 9, "y": 0},
+          {"matrix": [0, 10], "x": 10, "y": 0},
+          {"matrix": [0, 11], "x": 11, "y": 0},
+          {"matrix": [0, 12], "x": 12, "y": 0},
+          {"matrix": [0, 13], "x": 13, "y": 0},
+          {"matrix": [1, 13], "x": 14, "y": 0},
+
+          {"matrix": [0, 14], "x": 15.5, "y": 0},
+          {"matrix": [0, 15], "x": 16.5, "y": 0},
+          {"matrix": [0, 16], "x": 17.5, "y": 0},
+          {"matrix": [0, 17], "x": 18.5, "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.5, "y": 1},
+          {"matrix": [1, 8], "x": 8.5, "y": 1},
+          {"matrix": [1, 9], "x": 9.5, "y": 1},
+          {"matrix": [1, 10], "x": 10.5, "y": 1},
+          {"matrix": [1, 11], "x": 11.5, "y": 1},
+          {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+          {"matrix": [1, 14], "x": 15.5, "y": 1},
+          {"matrix": [1, 15], "x": 16.5, "y": 1},
+          {"matrix": [1, 16], "x": 17.5, "y": 1},
+          {"matrix": [1, 17], "x": 18.5, "y": 1},
+
+          {"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, 6], "x": 6.75, "y": 2},
+          {"matrix": [2, 7], "x": 7.75, "y": 2},
+          {"matrix": [2, 8], "x": 8.75, "y": 2},
+          {"matrix": [2, 9], "x": 9.75, "y": 2},
+          {"matrix": [2, 10], "x": 10.75, "y": 2},
+          {"matrix": [2, 11], "x": 11.75, "y": 2},
+          {"matrix": [2, 12], "x": 12.75, "y": 2},
+          {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+          {"matrix": [2, 14], "x": 15.5, "y": 2},
+          {"matrix": [2, 15], "x": 16.5, "y": 2},
+          {"matrix": [2, 16], "x": 17.5, "y": 2},
+          {"matrix": [2, 17], "x": 18.5, "y": 2},
+
+          {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+          {"matrix": [3, 1], "x": 1.25, "y": 3},
+          {"matrix": [3, 2], "x": 2.25, "y": 3},
+          {"matrix": [3, 3], "x": 3.25, "y": 3},
+          {"matrix": [3, 4], "x": 4.25, "y": 3},
+          {"matrix": [3, 5], "x": 5.25, "y": 3},
+          {"matrix": [3, 6], "x": 6.25, "y": 3},
+          {"matrix": [3, 7], "x": 7.25, "y": 3},
+          {"matrix": [3, 8], "x": 8.25, "y": 3},
+          {"matrix": [3, 9], "x": 9.25, "y": 3},
+          {"matrix": [3, 10], "x": 10.25, "y": 3},
+          {"matrix": [3, 11], "x": 11.25, "y": 3},
+          {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+
+          {"matrix": [3, 13], "x": 14.25, "y": 3.25},
+
+          {"matrix": [3, 14], "x": 15.5, "y": 3},
+          {"matrix": [3, 15], "x": 16.5, "y": 3},
+          {"matrix": [3, 16], "x": 17.5, "y": 3},
+          {"matrix": [3, 17], "x": 18.5, "y": 3},
+
+          {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+          {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+          {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+          {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+          {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+          {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+
+          {"matrix": [4, 12], "x": 13.25, "y": 4.25},
+          {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+          {"matrix": [4, 14], "x": 15.25, "y": 4.25},
+
+          {"matrix": [4, 15], "x": 16.5, "y": 4},
+          {"matrix": [4, 16], "x": 17.5, "y": 4},
+          {"matrix": [4, 17], "x": 18.5, "y": 4}
         ]
       }
     }