Move 65% layouts to data driven (#20308)

3 files changed, 285 insertions, 351 deletions

diff --git a/keyboards/noxary/268_2/268_2.c b/keyboards/noxary/268_2/268_2.c
index 9a2b4432d3..60d54a681c 100644
--- a/keyboards/noxary/268_2/268_2.c
+++ b/keyboards/noxary/268_2/268_2.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 "268_2.h"
+#include "quantum.h"
 
 void matrix_init_kb(void) {
   // put your keyboard start-up code here
diff --git a/keyboards/noxary/268_2/268_2.h b/keyboards/noxary/268_2/268_2.h
deleted file mode 100644
index e69ed88def..0000000000
--- a/keyboards/noxary/268_2/268_2.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* Copyright 2018 Rozakiin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_65_ansi_blocker( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,       K014, K015, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114, K115, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,             K214, K215, \
-    K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,       K314, K315, \
-    K400, K401, K402,                   K406,                   K409, K410,       K412, K414, K415  \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  KC_NO, K014,  K015 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO, K114,  K115 }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  KC_NO, KC_NO, K214,  K215 }, \
-    { K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  KC_NO, K314,  K315 }, \
-    { K400,  K401,  K402,  KC_NO, KC_NO, KC_NO, K406,  KC_NO, KC_NO, K409,  K410,  KC_NO, K412,  KC_NO, K414,  K415 }  \
-}
-
-#define LAYOUT_split_bs( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114, K115, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,             K214, K215, \
-    K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,       K314, K315, \
-    K400, K401, K402,                   K406,                   K409, K410,       K412, K414, K415  \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO, K114,  K115 }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  KC_NO, KC_NO, K214,  K215 }, \
-    { K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  KC_NO, K314,  K315 }, \
-    { K400,  K401,  K402,  KC_NO, KC_NO, KC_NO, K406,  KC_NO, KC_NO, K409,  K410,  KC_NO, K412,  KC_NO, K414,  K415 }  \
-}
-
-#define LAYOUT_7u_space( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,       K014, K015, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114, K115, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,             K214, K215, \
-    K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,       K314, K315, \
-    K400, K401, K402,                   K406,                         K410,       K412, K414, K415  \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  KC_NO, K014,  K015 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO, K114,  K115 }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  KC_NO, KC_NO, K214,  K215 }, \
-    { K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  KC_NO, K314,  K315 }, \
-    { K400,  K401,  K402,  KC_NO, KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, K410,  KC_NO, K412,  KC_NO, K414,  K415 }  \
-}
-
-#define LAYOUT_7u_space_split_bs( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114, K115, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,             K214, K215, \
-    K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,       K314, K315, \
-    K400, K401, K402,                   K406,                         K410,       K412, K414, K415  \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO, K114,  K115 }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  KC_NO, KC_NO, K214,  K215 }, \
-    { K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  KC_NO, K314,  K315 }, \
-    { K400,  K401,  K402,  KC_NO, KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, K410,  KC_NO, K412,  KC_NO, K414,  K415 }  \
-}
diff --git a/keyboards/noxary/268_2/info.json b/keyboards/noxary/268_2/info.json
index 692a4cd8a6..b96500aa31 100644
--- a/keyboards/noxary/268_2/info.json
+++ b/keyboards/noxary/268_2/info.json
@@ -22,286 +22,302 @@
   "layouts": {
     "LAYOUT_65_ansi_blocker": {
       "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":8, "y":0},
-        {"x":9, "y":0},
-        {"x":10, "y":0},
-        {"x":11, "y":0},
-        {"x":12, "y":0},
-        {"x":13, "y":0, "w":2},
-        {"x":15, "y":0},
-        {"x":0, "y":1, "w":1.5},
-        {"x":1.5, "y":1},
-        {"x":2.5, "y":1},
-        {"x":3.5, "y":1},
-        {"x":4.5, "y":1},
-        {"x":5.5, "y":1},
-        {"x":6.5, "y":1},
-        {"x":7.5, "y":1},
-        {"x":8.5, "y":1},
-        {"x":9.5, "y":1},
-        {"x":10.5, "y":1},
-        {"x":11.5, "y":1},
-        {"x":12.5, "y":1},
-        {"x":13.5, "y":1, "w":1.5},
-        {"x":15, "y":1},
-        {"x":0, "y":2, "w":1.75},
-        {"x":1.75, "y":2},
-        {"x":2.75, "y":2},
-        {"x":3.75, "y":2},
-        {"x":4.75, "y":2},
-        {"x":5.75, "y":2},
-        {"x":6.75, "y":2},
-        {"x":7.75, "y":2},
-        {"x":8.75, "y":2},
-        {"x":9.75, "y":2},
-        {"x":10.75, "y":2},
-        {"x":11.75, "y":2},
-        {"x":12.75, "y":2, "w":2.25},
-        {"x":15, "y":2},
-        {"x":0, "y":3, "w":2.25},
-        {"x":2.25, "y":3},
-        {"x":3.25, "y":3},
-        {"x":4.25, "y":3},
-        {"x":5.25, "y":3},
-        {"x":6.25, "y":3},
-        {"x":7.25, "y":3},
-        {"x":8.25, "y":3},
-        {"x":9.25, "y":3},
-        {"x":10.25, "y":3},
-        {"x":11.25, "y":3},
-        {"x":12.25, "y":3, "w":1.75},
-        {"x":14, "y":3},
-        {"x":15, "y":3},
-        {"x":0, "y":4, "w":1.25},
-        {"x":1.25, "y":4, "w":1.25},
-        {"x":2.5, "y":4, "w":1.25},
-        {"x":3.75, "y":4, "w":6.25},
-        {"x":10, "y":4, "w":1.25},
-        {"x":11.25, "y":4, "w":1.25},
-        {"x":13, "y":4},
-        {"x":14, "y":4},
-        {"x":15, "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, 14], "x": 13, "y": 0, "w": 2},
+        {"matrix": [0, 15], "x": 15, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [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": 13.5, "y": 1, "w": 1.5},
+        {"matrix": [1, 15], "x": 15, "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, 14], "x": 12.75, "y": 2, "w": 2.25},
+        {"matrix": [2, 15], "x": 15, "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, 14], "x": 14, "y": 3},
+        {"matrix": [3, 15], "x": 15, "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, 9], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 12], "x": 13, "y": 4},
+        {"matrix": [4, 14], "x": 14, "y": 4},
+        {"matrix": [4, 15], "x": 15, "y": 4}
       ]
     },
     "LAYOUT_split_bs": {
       "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":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, "w":1.5},
-        {"x":1.5, "y":1},
-        {"x":2.5, "y":1},
-        {"x":3.5, "y":1},
-        {"x":4.5, "y":1},
-        {"x":5.5, "y":1},
-        {"x":6.5, "y":1},
-        {"x":7.5, "y":1},
-        {"x":8.5, "y":1},
-        {"x":9.5, "y":1},
-        {"x":10.5, "y":1},
-        {"x":11.5, "y":1},
-        {"x":12.5, "y":1},
-        {"x":13.5, "y":1, "w":1.5},
-        {"x":15, "y":1},
-        {"x":0, "y":2, "w":1.75},
-        {"x":1.75, "y":2},
-        {"x":2.75, "y":2},
-        {"x":3.75, "y":2},
-        {"x":4.75, "y":2},
-        {"x":5.75, "y":2},
-        {"x":6.75, "y":2},
-        {"x":7.75, "y":2},
-        {"x":8.75, "y":2},
-        {"x":9.75, "y":2},
-        {"x":10.75, "y":2},
-        {"x":11.75, "y":2},
-        {"x":12.75, "y":2, "w":2.25},
-        {"x":15, "y":2},
-        {"x":0, "y":3, "w":2.25},
-        {"x":2.25, "y":3},
-        {"x":3.25, "y":3},
-        {"x":4.25, "y":3},
-        {"x":5.25, "y":3},
-        {"x":6.25, "y":3},
-        {"x":7.25, "y":3},
-        {"x":8.25, "y":3},
-        {"x":9.25, "y":3},
-        {"x":10.25, "y":3},
-        {"x":11.25, "y":3},
-        {"x":12.25, "y":3, "w":1.75},
-        {"x":14, "y":3},
-        {"x":15, "y":3},
-        {"x":0, "y":4, "w":1.25},
-        {"x":1.25, "y":4, "w":1.25},
-        {"x":2.5, "y":4, "w":1.25},
-        {"x":3.75, "y":4, "w":6.25},
-        {"x":10, "y":4, "w":1.25},
-        {"x":11.25, "y":4, "w":1.25},
-        {"x":13, "y":4},
-        {"x":14, "y":4},
-        {"x":15, "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": [0, 14], "x": 14, "y": 0},
+        {"matrix": [0, 15], "x": 15, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [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": 13.5, "y": 1, "w": 1.5},
+        {"matrix": [1, 15], "x": 15, "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, 14], "x": 12.75, "y": 2, "w": 2.25},
+        {"matrix": [2, 15], "x": 15, "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, 14], "x": 14, "y": 3},
+        {"matrix": [3, 15], "x": 15, "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, 9], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 12], "x": 13, "y": 4},
+        {"matrix": [4, 14], "x": 14, "y": 4},
+        {"matrix": [4, 15], "x": 15, "y": 4}
       ]
     },
     "LAYOUT_7u_space": {
       "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":8, "y":0},
-        {"x":9, "y":0},
-        {"x":10, "y":0},
-        {"x":11, "y":0},
-        {"x":12, "y":0},
-        {"x":13, "y":0, "w":2},
-        {"x":15, "y":0},
-        {"x":0, "y":1, "w":1.5},
-        {"x":1.5, "y":1},
-        {"x":2.5, "y":1},
-        {"x":3.5, "y":1},
-        {"x":4.5, "y":1},
-        {"x":5.5, "y":1},
-        {"x":6.5, "y":1},
-        {"x":7.5, "y":1},
-        {"x":8.5, "y":1},
-        {"x":9.5, "y":1},
-        {"x":10.5, "y":1},
-        {"x":11.5, "y":1},
-        {"x":12.5, "y":1},
-        {"x":13.5, "y":1, "w":1.5},
-        {"x":15, "y":1},
-        {"x":0, "y":2, "w":1.75},
-        {"x":1.75, "y":2},
-        {"x":2.75, "y":2},
-        {"x":3.75, "y":2},
-        {"x":4.75, "y":2},
-        {"x":5.75, "y":2},
-        {"x":6.75, "y":2},
-        {"x":7.75, "y":2},
-        {"x":8.75, "y":2},
-        {"x":9.75, "y":2},
-        {"x":10.75, "y":2},
-        {"x":11.75, "y":2},
-        {"x":12.75, "y":2, "w":2.25},
-        {"x":15, "y":2},
-        {"x":0, "y":3, "w":2.25},
-        {"x":2.25, "y":3},
-        {"x":3.25, "y":3},
-        {"x":4.25, "y":3},
-        {"x":5.25, "y":3},
-        {"x":6.25, "y":3},
-        {"x":7.25, "y":3},
-        {"x":8.25, "y":3},
-        {"x":9.25, "y":3},
-        {"x":10.25, "y":3},
-        {"x":11.25, "y":3},
-        {"x":12.25, "y":3, "w":1.75},
-        {"x":14, "y":3},
-        {"x":15, "y":3},
-        {"x":0, "y":4, "w":1.5},
-        {"x":1.5, "y":4},
-        {"x":2.5, "y":4, "w":1.5},
-        {"x":4, "y":4, "w":7},
-        {"x":11, "y":4, "w":1.5},
-        {"x":13, "y":4},
-        {"x":14, "y":4},
-        {"x":15, "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, 14], "x": 13, "y": 0, "w": 2},
+        {"matrix": [0, 15], "x": 15, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [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": 13.5, "y": 1, "w": 1.5},
+        {"matrix": [1, 15], "x": 15, "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, 14], "x": 12.75, "y": 2, "w": 2.25},
+        {"matrix": [2, 15], "x": 15, "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, 14], "x": 14, "y": 3},
+        {"matrix": [3, 15], "x": 15, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+        {"matrix": [4, 1], "x": 1.5, "y": 4},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+        {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+        {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+        {"matrix": [4, 12], "x": 13, "y": 4},
+        {"matrix": [4, 14], "x": 14, "y": 4},
+        {"matrix": [4, 15], "x": 15, "y": 4}
       ]
     },
     "LAYOUT_7u_space_split_bs": {
       "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":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, "w":1.5},
-        {"x":1.5, "y":1},
-        {"x":2.5, "y":1},
-        {"x":3.5, "y":1},
-        {"x":4.5, "y":1},
-        {"x":5.5, "y":1},
-        {"x":6.5, "y":1},
-        {"x":7.5, "y":1},
-        {"x":8.5, "y":1},
-        {"x":9.5, "y":1},
-        {"x":10.5, "y":1},
-        {"x":11.5, "y":1},
-        {"x":12.5, "y":1},
-        {"x":13.5, "y":1, "w":1.5},
-        {"x":15, "y":1},
-        {"x":0, "y":2, "w":1.75},
-        {"x":1.75, "y":2},
-        {"x":2.75, "y":2},
-        {"x":3.75, "y":2},
-        {"x":4.75, "y":2},
-        {"x":5.75, "y":2},
-        {"x":6.75, "y":2},
-        {"x":7.75, "y":2},
-        {"x":8.75, "y":2},
-        {"x":9.75, "y":2},
-        {"x":10.75, "y":2},
-        {"x":11.75, "y":2},
-        {"x":12.75, "y":2, "w":2.25},
-        {"x":15, "y":2},
-        {"x":0, "y":3, "w":2.25},
-        {"x":2.25, "y":3},
-        {"x":3.25, "y":3},
-        {"x":4.25, "y":3},
-        {"x":5.25, "y":3},
-        {"x":6.25, "y":3},
-        {"x":7.25, "y":3},
-        {"x":8.25, "y":3},
-        {"x":9.25, "y":3},
-        {"x":10.25, "y":3},
-        {"x":11.25, "y":3},
-        {"x":12.25, "y":3, "w":1.75},
-        {"x":14, "y":3},
-        {"x":15, "y":3},
-        {"x":0, "y":4, "w":1.5},
-        {"x":1.5, "y":4},
-        {"x":2.5, "y":4, "w":1.5},
-        {"x":4, "y":4, "w":7},
-        {"x":11, "y":4, "w":1.5},
-        {"x":13, "y":4},
-        {"x":14, "y":4},
-        {"x":15, "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": [0, 14], "x": 14, "y": 0},
+        {"matrix": [0, 15], "x": 15, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [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": 13.5, "y": 1, "w": 1.5},
+        {"matrix": [1, 15], "x": 15, "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, 14], "x": 12.75, "y": 2, "w": 2.25},
+        {"matrix": [2, 15], "x": 15, "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, 14], "x": 14, "y": 3},
+        {"matrix": [3, 15], "x": 15, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+        {"matrix": [4, 1], "x": 1.5, "y": 4},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+        {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+        {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+        {"matrix": [4, 12], "x": 13, "y": 4},
+        {"matrix": [4, 14], "x": 14, "y": 4},
+        {"matrix": [4, 15], "x": 15, "y": 4}
       ]
     }
   }