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

3 files changed, 301 insertions, 383 deletions

diff --git a/keyboards/keyprez/bison/bison.c b/keyboards/keyprez/bison/bison.c
index 30e0cdbe2b..2106ae8c2c 100644
--- a/keyboards/keyprez/bison/bison.c
+++ b/keyboards/keyprez/bison/bison.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "bison.h"
+#include "quantum.h"
 
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) { return false; }
diff --git a/keyboards/keyprez/bison/bison.h b/keyboards/keyprez/bison/bison.h
deleted file mode 100644
index 74b7bae985..0000000000
--- a/keyboards/keyprez/bison/bison.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* Copyright 2021 csandven
- *
- * 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( \
-    L00, L01, L02, L03, L04, L05, L06, L07,                     R00, R01, R02, R03, R04, R05, R06, R07,  \
-    L10, L11, L12, L13, L14, L15, L16, L17,                     R10, R11, R12, R13, R14, R15, R16, R17,  \
-    L20, L21, L22, L23, L24, L25, L26, L27,                     R20, R21, R22, R23, R24, R25, R26, R27,  \
-    L30, L31, L32, L33, L34, L35, L36, L37, L44,           R40, R30, R31, R32, R33, R34, R35, R36, R37,  \
-                          L40, L41, L42, L43,                 R41, R42, R43, R44                         \
-    ) \
-    { \
-        { L07, L06, L05, L04, L03, L02, L01, L00 }, \
-        { L17, L16, L15, L14, L13, L12, L11, L10 }, \
-        { L27, L26, L25, L24, L23, L22, L21, L20 }, \
-        { L37, L36, L35, L34, L33, L32, L31, L30 }, \
-        { L43, L42, L41, L40, L44, KC_NO, KC_NO, KC_NO }, \
-        { R00, R01, R02, R03, R04, R05, R06, R07 }, \
-        { R10, R11, R12, R13, R14, R15, R16, R17 }, \
-        { R20, R21, R22, R23, R24, R25, R26, R27 }, \
-        { R30, R31, R32, R33, R34, R35, R36, R37 }, \
-        { R41, R42, R43, R44, R40, KC_NO, KC_NO }  \
-    }
-
-#define LAYOUT_6_8( \
-    L02, L03, L04, L05, L06, L07,                     R00, R01, R02, R03, R04, R05, R06, R07,  \
-    L12, L13, L14, L15, L16, L17,                     R10, R11, R12, R13, R14, R15, R16, R17,  \
-    L22, L23, L24, L25, L26, L27,                     R20, R21, R22, R23, R24, R25, R26, R27,  \
-    L32, L33, L34, L35, L36, L37, L44,           R40, R30, R31, R32, R33, R34, R35, R36, R37,  \
-                L40, L41, L42, L43,                 R41, R42, R43, R44                         \
-    ) \
-    { \
-        { L07, L06, L05, L04, L03, L02, KC_NO, KC_NO }, \
-        { L17, L16, L15, L14, L13, L12, KC_NO, KC_NO }, \
-        { L27, L26, L25, L24, L23, L22, KC_NO, KC_NO }, \
-        { L37, L36, L35, L34, L33, L32, KC_NO, KC_NO }, \
-        { L43, L42, L41, L40, L44, KC_NO, KC_NO, KC_NO }, \
-        { R00, R01, R02, R03, R04, R05, R06, R07 }, \
-        { R10, R11, R12, R13, R14, R15, R16, R17 }, \
-        { R20, R21, R22, R23, R24, R25, R26, R27 }, \
-        { R30, R31, R32, R33, R34, R35, R36, R37 }, \
-        { R41, R42, R43, R44, R40, KC_NO, KC_NO }  \
-    }
-
-#define LAYOUT_8_6( \
-    L00, L01, L02, L03, L04, L05, L06, L07,                     R00, R01, R02, R03, R04, R05,  \
-    L10, L11, L12, L13, L14, L15, L16, L17,                     R10, R11, R12, R13, R14, R15,  \
-    L20, L21, L22, L23, L24, L25, L26, L27,                     R20, R21, R22, R23, R24, R25,  \
-    L30, L31, L32, L33, L34, L35, L36, L37, L44,           R40, R30, R31, R32, R33, R34, R35,  \
-                          L40, L41, L42, L43,                 R41, R42, R43, R44               \
-    ) \
-    { \
-        { L07, L06, L05, L04, L03, L02, L01, L00 }, \
-        { L17, L16, L15, L14, L13, L12, L11, L10 }, \
-        { L27, L26, L25, L24, L23, L22, L21, L20 }, \
-        { L37, L36, L35, L34, L33, L32, L31, L30 }, \
-        { L43, L42, L41, L40, L44, KC_NO, KC_NO, KC_NO }, \
-        { R00, R01, R02, R03, R04, R05, KC_NO, KC_NO }, \
-        { R10, R11, R12, R13, R14, R15, KC_NO, KC_NO }, \
-        { R20, R21, R22, R23, R24, R25, KC_NO, KC_NO }, \
-        { R30, R31, R32, R33, R34, R35, KC_NO, KC_NO }, \
-        { R41, R42, R43, R44, R40, KC_NO, KC_NO }  \
-    }
-
-#define LAYOUT_6_6( \
-    L02, L03, L04, L05, L06, L07,                     R00, R01, R02, R03, R04, R05,  \
-    L12, L13, L14, L15, L16, L17,                     R10, R11, R12, R13, R14, R15,  \
-    L22, L23, L24, L25, L26, L27,                     R20, R21, R22, R23, R24, R25,  \
-    L32, L33, L34, L35, L36, L37, L44,           R40, R30, R31, R32, R33, R34, R35,  \
-                L40, L41, L42, L43,                 R41, R42, R43, R44               \
-    ) \
-    { \
-        { L07, L06, L05, L04, L03, L02, KC_NO, KC_NO }, \
-        { L17, L16, L15, L14, L13, L12, KC_NO, KC_NO }, \
-        { L27, L26, L25, L24, L23, L22, KC_NO, KC_NO }, \
-        { L37, L36, L35, L34, L33, L32, KC_NO, KC_NO }, \
-        { L43, L42, L41, L40, L44, KC_NO, KC_NO, KC_NO }, \
-        { R00, R01, R02, R03, R04, R05, KC_NO, KC_NO }, \
-        { R10, R11, R12, R13, R14, R15, KC_NO, KC_NO }, \
-        { R20, R21, R22, R23, R24, R25, KC_NO, KC_NO }, \
-        { R30, R31, R32, R33, R34, R35, KC_NO, KC_NO }, \
-        { R41, R42, R43, R44, R40, KC_NO, KC_NO }  \
-    }
diff --git a/keyboards/keyprez/bison/info.json b/keyboards/keyprez/bison/info.json
index bc67710d03..3e47764d5e 100644
--- a/keyboards/keyprez/bison/info.json
+++ b/keyboards/keyprez/bison/info.json
@@ -33,301 +33,318 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-                {"x": 15, "y": 0},
-                {"x": 16, "y": 0},
-                {"x": 17, "y": 0},
-
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
-                {"x": 12, "y": 1},
-                {"x": 13, "y": 1},
-                {"x": 14, "y": 1},
-                {"x": 15, "y": 1},
-                {"x": 16, "y": 1},
-                {"x": 17, "y": 1},
-
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 6, "y": 2},
-                {"x": 7, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
-                {"x": 12, "y": 2},
-                {"x": 13, "y": 2},
-                {"x": 14, "y": 2},
-                {"x": 15, "y": 2},
-                {"x": 16, "y": 2},
-                {"x": 17, "y": 2},
-
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
-                {"x": 12, "y": 3},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
-                {"x": 15, "y": 3},
-                {"x": 16, "y": 3},
-                {"x": 17, "y": 3},
-
-                {"x": 3.75, "y": 4},
-                {"x": 4.75, "y": 4},
-                {"x": 5.75, "y": 4},
-                {"x": 6.75, "y": 4, "w": 1.5},
-                {"x": 9.75, "y": 4, "w": 1.5},
-                {"x": 11.25, "y": 4},
-                {"x": 12.25, "y": 4},
-                {"x": 13.25, "y": 4}
+                {"matrix": [0, 7], "x": 0, "y": 0},
+                {"matrix": [0, 6], "x": 1, "y": 0},
+                {"matrix": [0, 5], "x": 2, "y": 0},
+                {"matrix": [0, 4], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [0, 1], "x": 6, "y": 0},
+                {"matrix": [0, 0], "x": 7, "y": 0},
+
+                {"matrix": [5, 0], "x": 10, "y": 0},
+                {"matrix": [5, 1], "x": 11, "y": 0},
+                {"matrix": [5, 2], "x": 12, "y": 0},
+                {"matrix": [5, 3], "x": 13, "y": 0},
+                {"matrix": [5, 4], "x": 14, "y": 0},
+                {"matrix": [5, 5], "x": 15, "y": 0},
+                {"matrix": [5, 6], "x": 16, "y": 0},
+                {"matrix": [5, 7], "x": 17, "y": 0},
+
+                {"matrix": [1, 7], "x": 0, "y": 1},
+                {"matrix": [1, 6], "x": 1, "y": 1},
+                {"matrix": [1, 5], "x": 2, "y": 1},
+                {"matrix": [1, 4], "x": 3, "y": 1},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 2], "x": 5, "y": 1},
+                {"matrix": [1, 1], "x": 6, "y": 1},
+                {"matrix": [1, 0], "x": 7, "y": 1},
+
+                {"matrix": [6, 0], "x": 10, "y": 1},
+                {"matrix": [6, 1], "x": 11, "y": 1},
+                {"matrix": [6, 2], "x": 12, "y": 1},
+                {"matrix": [6, 3], "x": 13, "y": 1},
+                {"matrix": [6, 4], "x": 14, "y": 1},
+                {"matrix": [6, 5], "x": 15, "y": 1},
+                {"matrix": [6, 6], "x": 16, "y": 1},
+                {"matrix": [6, 7], "x": 17, "y": 1},
+
+                {"matrix": [2, 7], "x": 0, "y": 2},
+                {"matrix": [2, 6], "x": 1, "y": 2},
+                {"matrix": [2, 5], "x": 2, "y": 2},
+                {"matrix": [2, 4], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 2], "x": 5, "y": 2},
+                {"matrix": [2, 1], "x": 6, "y": 2},
+                {"matrix": [2, 0], "x": 7, "y": 2},
+
+                {"matrix": [7, 0], "x": 10, "y": 2},
+                {"matrix": [7, 1], "x": 11, "y": 2},
+                {"matrix": [7, 2], "x": 12, "y": 2},
+                {"matrix": [7, 3], "x": 13, "y": 2},
+                {"matrix": [7, 4], "x": 14, "y": 2},
+                {"matrix": [7, 5], "x": 15, "y": 2},
+                {"matrix": [7, 6], "x": 16, "y": 2},
+                {"matrix": [7, 7], "x": 17, "y": 2},
+
+                {"matrix": [3, 7], "x": 0, "y": 3},
+                {"matrix": [3, 6], "x": 1, "y": 3},
+                {"matrix": [3, 5], "x": 2, "y": 3},
+                {"matrix": [3, 4], "x": 3, "y": 3},
+                {"matrix": [3, 3], "x": 4, "y": 3},
+                {"matrix": [3, 2], "x": 5, "y": 3},
+                {"matrix": [3, 1], "x": 6, "y": 3},
+                {"matrix": [3, 0], "x": 7, "y": 3},
+                {"matrix": [4, 4], "x": 8, "y": 3},
+
+                {"matrix": [9, 4], "x": 9, "y": 3},
+                {"matrix": [8, 0], "x": 10, "y": 3},
+                {"matrix": [8, 1], "x": 11, "y": 3},
+                {"matrix": [8, 2], "x": 12, "y": 3},
+                {"matrix": [8, 3], "x": 13, "y": 3},
+                {"matrix": [8, 4], "x": 14, "y": 3},
+                {"matrix": [8, 5], "x": 15, "y": 3},
+                {"matrix": [8, 6], "x": 16, "y": 3},
+                {"matrix": [8, 7], "x": 17, "y": 3},
+
+                {"matrix": [4, 3], "x": 3.75, "y": 4},
+                {"matrix": [4, 2], "x": 4.75, "y": 4},
+                {"matrix": [4, 1], "x": 5.75, "y": 4},
+                {"matrix": [4, 0], "x": 6.75, "y": 4, "w": 1.5},
+
+                {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 1], "x": 11.25, "y": 4},
+                {"matrix": [9, 2], "x": 12.25, "y": 4},
+                {"matrix": [9, 3], "x": 13.25, "y": 4}
             ]
         },
-
         "LAYOUT_6_8": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-                {"x": 15, "y": 0},
-
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
-                {"x": 12, "y": 1},
-                {"x": 13, "y": 1},
-                {"x": 14, "y": 1},
-                {"x": 15, "y": 1},
-
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
-                {"x": 12, "y": 2},
-                {"x": 13, "y": 2},
-                {"x": 14, "y": 2},
-                {"x": 15, "y": 2},
-
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
-                {"x": 12, "y": 3},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
-                {"x": 15, "y": 3},
-
-                {"x": 1.75, "y": 4},
-                {"x": 2.75, "y": 4},
-                {"x": 3.75, "y": 4},
-                {"x": 4.75, "y": 4, "w": 1.5},
-                {"x": 7.75, "y": 4, "w": 1.5},
-                {"x": 9.25, "y": 4},
-                {"x": 10.25, "y": 4},
-                {"x": 11.25, "y": 4}
+                {"matrix": [0, 5], "x": 0, "y": 0},
+                {"matrix": [0, 4], "x": 1, "y": 0},
+                {"matrix": [0, 3], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 1], "x": 4, "y": 0},
+                {"matrix": [0, 0], "x": 5, "y": 0},
+
+                {"matrix": [5, 0], "x": 8, "y": 0},
+                {"matrix": [5, 1], "x": 9, "y": 0},
+                {"matrix": [5, 2], "x": 10, "y": 0},
+                {"matrix": [5, 3], "x": 11, "y": 0},
+                {"matrix": [5, 4], "x": 12, "y": 0},
+                {"matrix": [5, 5], "x": 13, "y": 0},
+                {"matrix": [5, 6], "x": 14, "y": 0},
+                {"matrix": [5, 7], "x": 15, "y": 0},
+
+                {"matrix": [1, 5], "x": 0, "y": 1},
+                {"matrix": [1, 4], "x": 1, "y": 1},
+                {"matrix": [1, 3], "x": 2, "y": 1},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 1], "x": 4, "y": 1},
+                {"matrix": [1, 0], "x": 5, "y": 1},
+
+                {"matrix": [6, 0], "x": 8, "y": 1},
+                {"matrix": [6, 1], "x": 9, "y": 1},
+                {"matrix": [6, 2], "x": 10, "y": 1},
+                {"matrix": [6, 3], "x": 11, "y": 1},
+                {"matrix": [6, 4], "x": 12, "y": 1},
+                {"matrix": [6, 5], "x": 13, "y": 1},
+                {"matrix": [6, 6], "x": 14, "y": 1},
+                {"matrix": [6, 7], "x": 15, "y": 1},
+
+                {"matrix": [2, 5], "x": 0, "y": 2},
+                {"matrix": [2, 4], "x": 1, "y": 2},
+                {"matrix": [2, 3], "x": 2, "y": 2},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 1], "x": 4, "y": 2},
+                {"matrix": [2, 0], "x": 5, "y": 2},
+
+                {"matrix": [7, 0], "x": 8, "y": 2},
+                {"matrix": [7, 1], "x": 9, "y": 2},
+                {"matrix": [7, 2], "x": 10, "y": 2},
+                {"matrix": [7, 3], "x": 11, "y": 2},
+                {"matrix": [7, 4], "x": 12, "y": 2},
+                {"matrix": [7, 5], "x": 13, "y": 2},
+                {"matrix": [7, 6], "x": 14, "y": 2},
+                {"matrix": [7, 7], "x": 15, "y": 2},
+
+                {"matrix": [3, 5], "x": 0, "y": 3},
+                {"matrix": [3, 4], "x": 1, "y": 3},
+                {"matrix": [3, 3], "x": 2, "y": 3},
+                {"matrix": [3, 2], "x": 3, "y": 3},
+                {"matrix": [3, 1], "x": 4, "y": 3},
+                {"matrix": [3, 0], "x": 5, "y": 3},
+                {"matrix": [4, 4], "x": 6, "y": 3},
+
+                {"matrix": [9, 4], "x": 7, "y": 3},
+                {"matrix": [8, 0], "x": 8, "y": 3},
+                {"matrix": [8, 1], "x": 9, "y": 3},
+                {"matrix": [8, 2], "x": 10, "y": 3},
+                {"matrix": [8, 3], "x": 11, "y": 3},
+                {"matrix": [8, 4], "x": 12, "y": 3},
+                {"matrix": [8, 5], "x": 13, "y": 3},
+                {"matrix": [8, 6], "x": 14, "y": 3},
+                {"matrix": [8, 7], "x": 15, "y": 3},
+
+                {"matrix": [4, 3], "x": 1.75, "y": 4},
+                {"matrix": [4, 2], "x": 2.75, "y": 4},
+                {"matrix": [4, 1], "x": 3.75, "y": 4},
+                {"matrix": [4, 0], "x": 4.75, "y": 4, "w": 1.5},
+
+                {"matrix": [9, 0], "x": 7.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 1], "x": 9.25, "y": 4},
+                {"matrix": [9, 2], "x": 10.25, "y": 4},
+                {"matrix": [9, 3], "x": 11.25, "y": 4}
             ]
         },
-
         "LAYOUT_8_6": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-                {"x": 15, "y": 0},
-
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
-                {"x": 12, "y": 1},
-                {"x": 13, "y": 1},
-                {"x": 14, "y": 1},
-                {"x": 15, "y": 1},
-
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 6, "y": 2},
-                {"x": 7, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
-                {"x": 12, "y": 2},
-                {"x": 13, "y": 2},
-                {"x": 14, "y": 2},
-                {"x": 15, "y": 2},
-
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
-                {"x": 12, "y": 3},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
-                {"x": 15, "y": 3},
-
-                {"x": 3.75, "y": 4},
-                {"x": 4.75, "y": 4},
-                {"x": 5.75, "y": 4},
-                {"x": 6.75, "y": 4, "w": 1.5},
-                {"x": 9.75, "y": 4, "w": 1.5},
-                {"x": 11.25, "y": 4},
-                {"x": 12.25, "y": 4},
-                {"x": 13.25, "y": 4}
+                {"matrix": [0, 7], "x": 0, "y": 0},
+                {"matrix": [0, 6], "x": 1, "y": 0},
+                {"matrix": [0, 5], "x": 2, "y": 0},
+                {"matrix": [0, 4], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [0, 1], "x": 6, "y": 0},
+                {"matrix": [0, 0], "x": 7, "y": 0},
+
+                {"matrix": [5, 0], "x": 10, "y": 0},
+                {"matrix": [5, 1], "x": 11, "y": 0},
+                {"matrix": [5, 2], "x": 12, "y": 0},
+                {"matrix": [5, 3], "x": 13, "y": 0},
+                {"matrix": [5, 4], "x": 14, "y": 0},
+                {"matrix": [5, 5], "x": 15, "y": 0},
+
+                {"matrix": [1, 7], "x": 0, "y": 1},
+                {"matrix": [1, 6], "x": 1, "y": 1},
+                {"matrix": [1, 5], "x": 2, "y": 1},
+                {"matrix": [1, 4], "x": 3, "y": 1},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 2], "x": 5, "y": 1},
+                {"matrix": [1, 1], "x": 6, "y": 1},
+                {"matrix": [1, 0], "x": 7, "y": 1},
+
+                {"matrix": [6, 0], "x": 10, "y": 1},
+                {"matrix": [6, 1], "x": 11, "y": 1},
+                {"matrix": [6, 2], "x": 12, "y": 1},
+                {"matrix": [6, 3], "x": 13, "y": 1},
+                {"matrix": [6, 4], "x": 14, "y": 1},
+                {"matrix": [6, 5], "x": 15, "y": 1},
+
+                {"matrix": [2, 7], "x": 0, "y": 2},
+                {"matrix": [2, 6], "x": 1, "y": 2},
+                {"matrix": [2, 5], "x": 2, "y": 2},
+                {"matrix": [2, 4], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 2], "x": 5, "y": 2},
+                {"matrix": [2, 1], "x": 6, "y": 2},
+                {"matrix": [2, 0], "x": 7, "y": 2},
+
+                {"matrix": [7, 0], "x": 10, "y": 2},
+                {"matrix": [7, 1], "x": 11, "y": 2},
+                {"matrix": [7, 2], "x": 12, "y": 2},
+                {"matrix": [7, 3], "x": 13, "y": 2},
+                {"matrix": [7, 4], "x": 14, "y": 2},
+                {"matrix": [7, 5], "x": 15, "y": 2},
+
+                {"matrix": [3, 7], "x": 0, "y": 3},
+                {"matrix": [3, 6], "x": 1, "y": 3},
+                {"matrix": [3, 5], "x": 2, "y": 3},
+                {"matrix": [3, 4], "x": 3, "y": 3},
+                {"matrix": [3, 3], "x": 4, "y": 3},
+                {"matrix": [3, 2], "x": 5, "y": 3},
+                {"matrix": [3, 1], "x": 6, "y": 3},
+                {"matrix": [3, 0], "x": 7, "y": 3},
+                {"matrix": [4, 4], "x": 8, "y": 3},
+
+                {"matrix": [9, 4], "x": 9, "y": 3},
+                {"matrix": [8, 0], "x": 10, "y": 3},
+                {"matrix": [8, 1], "x": 11, "y": 3},
+                {"matrix": [8, 2], "x": 12, "y": 3},
+                {"matrix": [8, 3], "x": 13, "y": 3},
+                {"matrix": [8, 4], "x": 14, "y": 3},
+                {"matrix": [8, 5], "x": 15, "y": 3},
+
+                {"matrix": [4, 3], "x": 3.75, "y": 4},
+                {"matrix": [4, 2], "x": 4.75, "y": 4},
+                {"matrix": [4, 1], "x": 5.75, "y": 4},
+                {"matrix": [4, 0], "x": 6.75, "y": 4, "w": 1.5},
+
+                {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 1], "x": 11.25, "y": 4},
+                {"matrix": [9, 2], "x": 12.25, "y": 4},
+                {"matrix": [9, 3], "x": 13.25, "y": 4}
             ]
         },
-
         "LAYOUT_6_6": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
-                {"x": 12, "y": 1},
-                {"x": 13, "y": 1},
-
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
-                {"x": 12, "y": 2},
-                {"x": 13, "y": 2},
-
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
-                {"x": 12, "y": 3},
-                {"x": 13, "y": 3},
-
-                {"x": 1.75, "y": 4},
-                {"x": 2.75, "y": 4},
-                {"x": 3.75, "y": 4},
-                {"x": 4.75, "y": 4, "w": 1.5},
-                {"x": 7.75, "y": 4, "w": 1.5},
-                {"x": 9.25, "y": 4},
-                {"x": 10.25, "y": 4},
-                {"x": 11.25, "y": 4}
+                {"matrix": [0, 5], "x": 0, "y": 0},
+                {"matrix": [0, 4], "x": 1, "y": 0},
+                {"matrix": [0, 3], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 1], "x": 4, "y": 0},
+                {"matrix": [0, 0], "x": 5, "y": 0},
+
+                {"matrix": [5, 0], "x": 8, "y": 0},
+                {"matrix": [5, 1], "x": 9, "y": 0},
+                {"matrix": [5, 2], "x": 10, "y": 0},
+                {"matrix": [5, 3], "x": 11, "y": 0},
+                {"matrix": [5, 4], "x": 12, "y": 0},
+                {"matrix": [5, 5], "x": 13, "y": 0},
+
+                {"matrix": [1, 5], "x": 0, "y": 1},
+                {"matrix": [1, 4], "x": 1, "y": 1},
+                {"matrix": [1, 3], "x": 2, "y": 1},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 1], "x": 4, "y": 1},
+                {"matrix": [1, 0], "x": 5, "y": 1},
+
+                {"matrix": [6, 0], "x": 8, "y": 1},
+                {"matrix": [6, 1], "x": 9, "y": 1},
+                {"matrix": [6, 2], "x": 10, "y": 1},
+                {"matrix": [6, 3], "x": 11, "y": 1},
+                {"matrix": [6, 4], "x": 12, "y": 1},
+                {"matrix": [6, 5], "x": 13, "y": 1},
+
+                {"matrix": [2, 5], "x": 0, "y": 2},
+                {"matrix": [2, 4], "x": 1, "y": 2},
+                {"matrix": [2, 3], "x": 2, "y": 2},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 1], "x": 4, "y": 2},
+                {"matrix": [2, 0], "x": 5, "y": 2},
+
+                {"matrix": [7, 0], "x": 8, "y": 2},
+                {"matrix": [7, 1], "x": 9, "y": 2},
+                {"matrix": [7, 2], "x": 10, "y": 2},
+                {"matrix": [7, 3], "x": 11, "y": 2},
+                {"matrix": [7, 4], "x": 12, "y": 2},
+                {"matrix": [7, 5], "x": 13, "y": 2},
+
+                {"matrix": [3, 5], "x": 0, "y": 3},
+                {"matrix": [3, 4], "x": 1, "y": 3},
+                {"matrix": [3, 3], "x": 2, "y": 3},
+                {"matrix": [3, 2], "x": 3, "y": 3},
+                {"matrix": [3, 1], "x": 4, "y": 3},
+                {"matrix": [3, 0], "x": 5, "y": 3},
+                {"matrix": [4, 4], "x": 6, "y": 3},
+
+                {"matrix": [9, 4], "x": 7, "y": 3},
+                {"matrix": [8, 0], "x": 8, "y": 3},
+                {"matrix": [8, 1], "x": 9, "y": 3},
+                {"matrix": [8, 2], "x": 10, "y": 3},
+                {"matrix": [8, 3], "x": 11, "y": 3},
+                {"matrix": [8, 4], "x": 12, "y": 3},
+                {"matrix": [8, 5], "x": 13, "y": 3},
+
+                {"matrix": [4, 3], "x": 1.75, "y": 4},
+                {"matrix": [4, 2], "x": 2.75, "y": 4},
+                {"matrix": [4, 1], "x": 3.75, "y": 4},
+                {"matrix": [4, 0], "x": 4.75, "y": 4, "w": 1.5},
+
+                {"matrix": [9, 0], "x": 7.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 1], "x": 9.25, "y": 4},
+                {"matrix": [9, 2], "x": 10.25, "y": 4},
+                {"matrix": [9, 3], "x": 11.25, "y": 4}
             ]
         }
     }