Move `default` layouts to data driven (#20349)

2 files changed, 421 insertions, 521 deletions

diff --git a/keyboards/dztech/dz96/dz96.h b/keyboards/dztech/dz96/dz96.h
deleted file mode 100644
index bf84dfc3aa..0000000000
--- a/keyboards/dztech/dz96/dz96.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* Copyright 2020 kb-elmo<mail@elmo.space>
- *
- * 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"
-
-//Arrow keys and 1.75u right shift
-#define LAYOUT_default( \
-  K00, K01, K02, K03, K04, K60, K61, K62, K63, K05, K06, K07, K08, K72, K09,    K0A, K0B, K0C, K7C, \
-  K10, K11, K12, K13, K14, K64, K65, K66, K67, K15, K16, K17, K18,      K71,    K19, K1A, K1B, K1C, \
-  K20,    K21, K22, K23, K24, K68, K69, K6A, K6B, K25, K26, K27, K28,   K73,    K29, K2A, K2B, K2C, \
-  K30,     K31, K32, K33, K34, K6C, K75, K76, K77, K35, K36, K37,       K38,    K39, K3A, K3B,      \
-  K40,       K42, K43, K44, K78, K79, K7A, K7B, K45, K46, K47,     K48, K74,    K49, K4A, K4B, K4C, \
-  K50,  K51,  K52,                K59,              K55, K56, K57, K58, K53, K54,    K5A, K5B       \
-) { \
-  { K00,    K01,    K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C   }, \
-  { K10,    K11,    K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C   }, \
-  { K20,    K21,    K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C   }, \
-  { K30,    K31,    K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  KC_NO }, \
-  { K40,    KC_NO,  K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K4A,  K4B,  K4C   }, \
-  { K50,    K51,    K52,  K53,  K54,  K55,  K56,  K57,  K58,  K59,  K5A,  K5B,  KC_NO }, \
-  { K60,    K61,    K62,  K63,  K64,  K65,  K66,  K67,  K68,  K69,  K6A,  K6B,  K6C   }, \
-  { KC_NO,  K71,    K72,  K73,  K74,  K75,  K76,  K77,  K78,  K79,  K7A,  K7B,  K7C   }  \
-}
-
-// Split backspace 1.5u right mods
-#define LAYOUT_split_bs_joined_right( \
-  K00, K01, K02, K03, K04, K60, K61, K62, K63, K05, K06, K07, K08, K72, K09, K0A, K0B, K0C, K7C,  \
-  K10, K11, K12, K13, K14, K64, K65, K66, K67, K15, K16, K17, K18, K70, K71, K19, K1A, K1B, K1C,  \
-  K20,   K21, K22, K23, K24, K68, K69, K6A, K6B, K25, K26, K27, K28,  K73,   K29, K2A, K2B, K2C,  \
-  K30,    K31, K32, K33, K34, K6C, K75, K76, K77, K35, K36, K37,     K38,    K39, K3A, K3B,       \
-  K40,     K42, K43, K44, K78, K79, K7A, K7B, K45, K46, K47,    K48,    K74, K49, K4A, K4B, K4C,  \
-  K50, K51, K52,                K59,                     K55, K57, K58, K53, K54, K5A, K5B        \
-) { \
-  { K00,  K01,    K02,  K03,  K04,  K05,  K06,    K07,  K08,  K09,  K0A,  K0B,  K0C   }, \
-  { K10,  K11,    K12,  K13,  K14,  K15,  K16,    K17,  K18,  K19,  K1A,  K1B,  K1C   }, \
-  { K20,  K21,    K22,  K23,  K24,  K25,  K26,    K27,  K28,  K29,  K2A,  K2B,  K2C   }, \
-  { K30,  K31,    K32,  K33,  K34,  K35,  K36,    K37,  K38,  K39,  K3A,  K3B,  KC_NO }, \
-  { K40,  KC_NO,  K42,  K43,  K44,  K45,  K46,    K47,  K48,  K49,  K4A,  K4B,  K4C   }, \
-  { K50,  K51,    K52,  K53,  K54,  K55,  KC_NO,  K57,  K58,  K59,  K5A,  K5B,  KC_NO }, \
-  { K60,  K61,    K62,  K63,  K64,  K65,  K66,    K67,  K68,  K69,  K6A,  K6B,  K6C   }, \
-  { K70,  K71,    K72,  K73,  K74,  K75,  K76,    K77,  K78,  K79,  K7A,  K7B,  K7C   }, \
-}
-
-// Split numpad (enter, 0), split shifts (right, left), split backspace
-// This layout contains every possible keycode placement
-#define LAYOUT_split_shift_and_bs( \
-  K00, K01, K02, K03, K04, K60, K61, K62, K63, K05, K06, K07, K08, K72, K09,    K0A, K0B, K0C, K7C, \
-  K10, K11, K12, K13, K14, K64, K65, K66, K67, K15, K16, K17, K18, K70, K71,    K19, K1A, K1B, K1C, \
-  K20,    K21, K22, K23, K24, K68, K69, K6A, K6B, K25, K26, K27, K28,   K73,    K29, K2A, K2B, K2C, \
-  K30,     K31, K32, K33, K34, K6C, K75, K76, K77, K35, K36, K37,       K38,    K39, K3A, K3B, K3C, \
-  K40,  K41, K42, K43, K44, K78, K79, K7A, K7B, K45, K46, K47,     K48, K74,    K49, K4A, K4B, K4C, \
-  K50,  K51,  K52,                K59,              K55, K56, K57, K58, K53, K54,    K5A, K5B, K5C  \
-) { \
-  { K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C },  \
-  { K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C },  \
-  { K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C },  \
-  { K30,  K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  K3C },  \
-  { K40,  K41,  K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K4A,  K4B,  K4C },  \
-  { K50,  K51,  K52,  K53,  K54,  K55,  K56,  K57,  K58,  K59,  K5A,  K5B,  K5C },  \
-  { K60,  K61,  K62,  K63,  K64,  K65,  K66,  K67,  K68,  K69,  K6A,  K6B,  K6C },  \
-  { K70,  K71,  K72,  K73,  K74,  K75,  K76,  K77,  K78,  K79,  K7A,  K7B,  K7C },  \
-}
-
-// ISO Layout
-#define LAYOUT_iso( \
-  K00, K01, K02, K03, K04, K60, K61, K62, K63, K05, K06, K07, K08, K72, K09,    K0A, K0B, K0C, K7C, \
-  K10, K11, K12, K13, K14, K64, K65, K66, K67, K15, K16, K17, K18,      K71,    K19, K1A, K1B, K1C, \
-  K20,    K21, K22, K23, K24, K68, K69, K6A, K6B, K25, K26, K27, K28,           K29, K2A, K2B, K2C, \
-  K30,     K31, K32, K33, K34, K6C, K75, K76, K77, K35, K36, K37, K73,  K38,    K39, K3A, K3B,      \
-  K40,  K41, K42, K43, K44, K78, K79, K7A, K7B, K45, K46, K47,     K48, K74,    K49, K4A, K4B, K4C, \
-  K50,  K51,  K52,                K59,              K55, K56, K57, K58, K53, K54,    K5A, K5B       \
-) { \
-  { K00,    K01,    K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C   }, \
-  { K10,    K11,    K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C   }, \
-  { K20,    K21,    K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C   }, \
-  { K30,    K31,    K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  KC_NO }, \
-  { K40,    K41,    K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K4A,  K4B,  K4C   }, \
-  { K50,    K51,    K52,  K53,  K54,  K55,  K56,  K57,  K58,  K59,  K5A,  K5B,  KC_NO }, \
-  { K60,    K61,    K62,  K63,  K64,  K65,  K66,  K67,  K68,  K69,  K6A,  K6B,  K6C   }, \
-  { KC_NO,  K71,    K72,  K73,  K74,  K75,  K76,  K77,  K78,  K79,  K7A,  K7B,  K7C   }  \
-}
diff --git a/keyboards/dztech/dz96/info.json b/keyboards/dztech/dz96/info.json
index a7229ce131..47ceaebcd2 100644
--- a/keyboards/dztech/dz96/info.json
+++ b/keyboards/dztech/dz96/info.json
@@ -26,449 +26,446 @@
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
-    "LAYOUT_default": {
-      "layout": [
-        {"label":"ESC", "x":0, "y":0},
-        {"label":"F1", "x":1, "y":0},
-        {"label":"F2", "x":2, "y":0},
-        {"label":"F3", "x":3, "y":0},
-        {"label":"F4", "x":4, "y":0},
-        {"label":"F5", "x":5, "y":0},
-        {"label":"F6", "x":6, "y":0},
-        {"label":"F7", "x":7, "y":0},
-        {"label":"F8", "x":8, "y":0},
-        {"label":"F9", "x":9, "y":0},
-        {"label":"F10", "x":10, "y":0},
-        {"label":"F11", "x":11, "y":0},
-        {"label":"F12", "x":12, "y":0},
-        {"label":"PRINT SCREEN", "x":13, "y":0},
-        {"label":"HOME", "x":14, "y":0},
-        {"label":"END", "x":15, "y":0},
-        {"label":"PAGE UP", "x":16, "y":0},
-        {"label":"PAGE DOWN", "x":17, "y":0},
-        {"label":"DELETE", "x":18, "y":0},
+        "LAYOUT_default": {
+            "layout": [
+                {"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": [6, 0], "x": 5, "y": 0},
+                {"matrix": [6, 1], "x": 6, "y": 0},
+                {"matrix": [6, 2], "x": 7, "y": 0},
+                {"matrix": [6, 3], "x": 8, "y": 0},
+                {"matrix": [0, 5], "x": 9, "y": 0},
+                {"matrix": [0, 6], "x": 10, "y": 0},
+                {"matrix": [0, 7], "x": 11, "y": 0},
+                {"matrix": [0, 8], "x": 12, "y": 0},
+                {"matrix": [7, 2], "x": 13, "y": 0},
+                {"matrix": [0, 9], "x": 14, "y": 0},
+                {"matrix": [0, 10], "x": 15, "y": 0},
+                {"matrix": [0, 11], "x": 16, "y": 0},
+                {"matrix": [0, 12], "x": 17, "y": 0},
+                {"matrix": [7, 12], "x": 18, "y": 0},
 
-        {"label":"GRAVE", "x":0, "y":1},
-        {"label":"1", "x":1, "y":1},
-        {"label":"2", "x":2, "y":1},
-        {"label":"3", "x":3, "y":1},
-        {"label":"4", "x":4, "y":1},
-        {"label":"5", "x":5, "y":1},
-        {"label":"6", "x":6, "y":1},
-        {"label":"7", "x":7, "y":1},
-        {"label":"8", "x":8, "y":1},
-        {"label":"9", "x":9, "y":1},
-        {"label":"0", "x":10, "y":1},
-        {"label":"MINUS", "x":11, "y":1},
-        {"label":"EQUAL", "x":12, "y":1},
-        {"label":"BACKSPACE", "x":13, "y":1, "w":2},
-        {"label":"NUM LOCK", "x":15, "y":1},
-        {"label":"KEYPAD /", "x":16, "y":1},
-        {"label":"KEYPAD *", "x":17, "y":1},
-        {"label":"KEYPAD -", "x":18, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [6, 4], "x": 5, "y": 1},
+                {"matrix": [6, 5], "x": 6, "y": 1},
+                {"matrix": [6, 6], "x": 7, "y": 1},
+                {"matrix": [6, 7], "x": 8, "y": 1},
+                {"matrix": [1, 5], "x": 9, "y": 1},
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [7, 1], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 9], "x": 15, "y": 1},
+                {"matrix": [1, 10], "x": 16, "y": 1},
+                {"matrix": [1, 11], "x": 17, "y": 1},
+                {"matrix": [1, 12], "x": 18, "y": 1},
 
-        {"label":"TAB", "x":0, "y":2, "w":1.5},
-        {"label":"Q", "x":1.5, "y":2},
-        {"label":"W", "x":2.5, "y":2},
-        {"label":"E", "x":3.5, "y":2},
-        {"label":"R", "x":4.5, "y":2},
-        {"label":"T", "x":5.5, "y":2},
-        {"label":"Y", "x":6.5, "y":2},
-        {"label":"U", "x":7.5, "y":2},
-        {"label":"I", "x":8.5, "y":2},
-        {"label":"O", "x":9.5, "y":2},
-        {"label":"P", "x":10.5, "y":2},
-        {"label":"LBRACKET", "x":11.5, "y":2},
-        {"label":"RBRACKET", "x":12.5, "y":2},
-        {"label":"BACKSLASH", "x":13.5, "y":2, "w":1.5},
-        {"label":"KEYPAD 7", "x":15, "y":2},
-        {"label":"KEYPAD 8", "x":16, "y":2},
-        {"label":"KEYPAD 9", "x":17, "y":2},
-        {"label":"KEYPAD +", "x":18, "y":2, "h":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [6, 8], "x": 5.5, "y": 2},
+                {"matrix": [6, 9], "x": 6.5, "y": 2},
+                {"matrix": [6, 10], "x": 7.5, "y": 2},
+                {"matrix": [6, 11], "x": 8.5, "y": 2},
+                {"matrix": [2, 5], "x": 9.5, "y": 2},
+                {"matrix": [2, 6], "x": 10.5, "y": 2},
+                {"matrix": [2, 7], "x": 11.5, "y": 2},
+                {"matrix": [2, 8], "x": 12.5, "y": 2},
+                {"matrix": [7, 3], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 9], "x": 15, "y": 2},
+                {"matrix": [2, 10], "x": 16, "y": 2},
+                {"matrix": [2, 11], "x": 17, "y": 2},
+                {"matrix": [2, 12], "x": 18, "y": 2, "h": 2},
 
-        {"label":"CAPS LOCK", "x":0, "y":3, "w":1.75},
-        {"label":"A", "x":1.75, "y":3},
-        {"label":"S", "x":2.75, "y":3},
-        {"label":"D", "x":3.75, "y":3},
-        {"label":"F", "x":4.75, "y":3},
-        {"label":"G", "x":5.75, "y":3},
-        {"label":"H", "x":6.75, "y":3},
-        {"label":"J", "x":7.75, "y":3},
-        {"label":"K", "x":8.75, "y":3},
-        {"label":"L", "x":9.75, "y":3},
-        {"label":"SEMICOLON", "x":10.75, "y":3},
-        {"label":"QUOTE", "x":11.75, "y":3},
-        {"label":"ENTER", "x":12.75, "y":3, "w":2.25},
-        {"label":"KEYPAD 4", "x":15, "y":3},
-        {"label":"KEYPAD 5", "x":16, "y":3},
-        {"label":"KEYPAD 6", "x":17, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [6, 12], "x": 5.75, "y": 3},
+                {"matrix": [7, 5], "x": 6.75, "y": 3},
+                {"matrix": [7, 6], "x": 7.75, "y": 3},
+                {"matrix": [7, 7], "x": 8.75, "y": 3},
+                {"matrix": [3, 5], "x": 9.75, "y": 3},
+                {"matrix": [3, 6], "x": 10.75, "y": 3},
+                {"matrix": [3, 7], "x": 11.75, "y": 3},
+                {"matrix": [3, 8], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 9], "x": 15, "y": 3},
+                {"matrix": [3, 10], "x": 16, "y": 3},
+                {"matrix": [3, 11], "x": 17, "y": 3},
 
-        {"label":"LSHIFT", "x":0, "y":4, "w":2.25},
-        {"label":"Z", "x":2.25, "y":4},
-        {"label":"X", "x":3.25, "y":4},
-        {"label":"C", "x":4.25, "y":4},
-        {"label":"V", "x":5.25, "y":4},
-        {"label":"B", "x":6.25, "y":4},
-        {"label":"N", "x":7.25, "y":4},
-        {"label":"M", "x":8.25, "y":4},
-        {"label":"COMMA", "x":9.25, "y":4},
-        {"label":"PERIOD", "x":10.25, "y":4},
-        {"label":"SLASH", "x":11.25, "y":4},
-        {"label":"RSHIFT", "x":12.25, "y":4, "w":1.75},
-        {"label":"UP", "x":14, "y":4},
-        {"label":"KEYPAD 1", "x":15, "y":4},
-        {"label":"KEYPAD 2", "x":16, "y":4},
-        {"label":"KEYPAD 3", "x":17, "y":4},
-        {"label":"KEYPAD ENTER", "x":18, "y":4, "h":2},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [7, 8], "x": 5.25, "y": 4},
+                {"matrix": [7, 9], "x": 6.25, "y": 4},
+                {"matrix": [7, 10], "x": 7.25, "y": 4},
+                {"matrix": [7, 11], "x": 8.25, "y": 4},
+                {"matrix": [4, 5], "x": 9.25, "y": 4},
+                {"matrix": [4, 6], "x": 10.25, "y": 4},
+                {"matrix": [4, 7], "x": 11.25, "y": 4},
+                {"matrix": [4, 8], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [7, 4], "x": 14, "y": 4},
+                {"matrix": [4, 9], "x": 15, "y": 4},
+                {"matrix": [4, 10], "x": 16, "y": 4},
+                {"matrix": [4, 11], "x": 17, "y": 4},
+                {"matrix": [4, 12], "x": 18, "y": 4, "h": 2},
 
-        {"label":"LCTRL", "x":0, "y":5, "w":1.25},
-        {"label":"LGUI", "x":1.25, "y":5, "w":1.25},
-        {"label":"LALT", "x":2.5, "y":5, "w":1.25},
-        {"label":"SPACE", "x":3.75, "y":5, "w":6.25},
-        {"label":"RALT", "x":10, "y":5},
-        {"label":"RCTRL", "x":11, "y":5},
-        {"label":"FN", "x":12, "y":5},
-        {"label":"LEFT", "x":13, "y":5},
-        {"label":"DOWN", "x":14, "y":5},
-        {"label":"RIGHT", "x":15, "y":5},
-        {"label":"KEYPAD 0", "x":16, "y":5},
-        {"label":"KEYPAD .", "x":17, "y":5}
-      ]
-    },
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 9], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 5], "x": 10, "y": 5},
+                {"matrix": [5, 6], "x": 11, "y": 5},
+                {"matrix": [5, 7], "x": 12, "y": 5},
+                {"matrix": [5, 8], "x": 13, "y": 5},
+                {"matrix": [5, 3], "x": 14, "y": 5},
+                {"matrix": [5, 4], "x": 15, "y": 5},
+                {"matrix": [5, 10], "x": 16, "y": 5},
+                {"matrix": [5, 11], "x": 17, "y": 5}
+            ]
+        },
+        "LAYOUT_split_bs_joined_right": {
+            "layout": [
+                {"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": [6, 0], "x": 5, "y": 0},
+                {"matrix": [6, 1], "x": 6, "y": 0},
+                {"matrix": [6, 2], "x": 7, "y": 0},
+                {"matrix": [6, 3], "x": 8, "y": 0},
+                {"matrix": [0, 5], "x": 9, "y": 0},
+                {"matrix": [0, 6], "x": 10, "y": 0},
+                {"matrix": [0, 7], "x": 11, "y": 0},
+                {"matrix": [0, 8], "x": 12, "y": 0},
+                {"matrix": [7, 2], "x": 13, "y": 0},
+                {"matrix": [0, 9], "x": 14, "y": 0},
+                {"matrix": [0, 10], "x": 15, "y": 0},
+                {"matrix": [0, 11], "x": 16, "y": 0},
+                {"matrix": [0, 12], "x": 17, "y": 0},
+                {"matrix": [7, 12], "x": 18, "y": 0},
 
-    "LAYOUT_split_bs_joined_right": {
-      "layout": [
-        {"label": "K00", "x": 0, "y": 0},
-        {"label": "K01", "x": 1, "y": 0},
-        {"label": "K02", "x": 2, "y": 0},
-        {"label": "K03", "x": 3, "y": 0},
-        {"label": "K04", "x": 4, "y": 0},
-        {"label": "K60", "x": 5, "y": 0},
-        {"label": "K61", "x": 6, "y": 0},
-        {"label": "K62", "x": 7, "y": 0},
-        {"label": "K63", "x": 8, "y": 0},
-        {"label": "K05", "x": 9, "y": 0},
-        {"label": "K06", "x": 10, "y": 0},
-        {"label": "K07", "x": 11, "y": 0},
-        {"label": "K08", "x": 12, "y": 0},
-        {"label": "K72", "x": 13, "y": 0},
-        {"label": "K09", "x": 14, "y": 0},
-        {"label": "K0A", "x": 15, "y": 0},
-        {"label": "K0B", "x": 16, "y": 0},
-        {"label": "K0C", "x": 17, "y": 0},
-        {"label": "K7C", "x": 18, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [6, 4], "x": 5, "y": 1},
+                {"matrix": [6, 5], "x": 6, "y": 1},
+                {"matrix": [6, 6], "x": 7, "y": 1},
+                {"matrix": [6, 7], "x": 8, "y": 1},
+                {"matrix": [1, 5], "x": 9, "y": 1},
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [7, 0], "x": 13, "y": 1},
+                {"matrix": [7, 1], "x": 14, "y": 1},
+                {"matrix": [1, 9], "x": 15, "y": 1},
+                {"matrix": [1, 10], "x": 16, "y": 1},
+                {"matrix": [1, 11], "x": 17, "y": 1},
+                {"matrix": [1, 12], "x": 18, "y": 1},
 
-        {"label": "K10", "x": 0, "y": 1},
-        {"label": "K11", "x": 1, "y": 1},
-        {"label": "K12", "x": 2, "y": 1},
-        {"label": "K13", "x": 3, "y": 1},
-        {"label": "K14", "x": 4, "y": 1},
-        {"label": "K64", "x": 5, "y": 1},
-        {"label": "K65", "x": 6, "y": 1},
-        {"label": "K66", "x": 7, "y": 1},
-        {"label": "K67", "x": 8, "y": 1},
-        {"label": "K15", "x": 9, "y": 1},
-        {"label": "K16", "x": 10, "y": 1},
-        {"label": "K17", "x": 11, "y": 1},
-        {"label": "K18", "x": 12, "y": 1},
-        {"label": "K70", "x": 13, "y": 1},
-        {"label": "K71", "x": 14, "y": 1},
-        {"label": "K19", "x": 15, "y": 1},
-        {"label": "K1A", "x": 16, "y": 1},
-        {"label": "K1B", "x": 17, "y": 1},
-        {"label": "K1C", "x": 18, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [6, 8], "x": 5.5, "y": 2},
+                {"matrix": [6, 9], "x": 6.5, "y": 2},
+                {"matrix": [6, 10], "x": 7.5, "y": 2},
+                {"matrix": [6, 11], "x": 8.5, "y": 2},
+                {"matrix": [2, 5], "x": 9.5, "y": 2},
+                {"matrix": [2, 6], "x": 10.5, "y": 2},
+                {"matrix": [2, 7], "x": 11.5, "y": 2},
+                {"matrix": [2, 8], "x": 12.5, "y": 2},
+                {"matrix": [7, 3], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 9], "x": 15, "y": 2},
+                {"matrix": [2, 10], "x": 16, "y": 2},
+                {"matrix": [2, 11], "x": 17, "y": 2},
+                {"matrix": [2, 12], "x": 18, "y": 2, "h": 2},
 
-        {"label": "K20", "x": 0, "y": 2, "w": 1.5},
-        {"label": "K21", "x": 1.5, "y": 2},
-        {"label": "K22", "x": 2.5, "y": 2},
-        {"label": "K23", "x": 3.5, "y": 2},
-        {"label": "K24", "x": 4.5, "y": 2},
-        {"label": "K68", "x": 5.5, "y": 2},
-        {"label": "K69", "x": 6.5, "y": 2},
-        {"label": "K6A", "x": 7.5, "y": 2},
-        {"label": "K6B", "x": 8.5, "y": 2},
-        {"label": "K25", "x": 9.5, "y": 2},
-        {"label": "K26", "x": 10.5, "y": 2},
-        {"label": "K27", "x": 11.5, "y": 2},
-        {"label": "K28", "x": 12.5, "y": 2},
-        {"label": "K73", "x": 13.5, "y": 2, "w": 1.5},
-        {"label": "K29", "x": 15, "y": 2},
-        {"label": "K2A", "x": 16, "y": 2},
-        {"label": "K2B", "x": 17, "y": 2},
-        {"label": "K2C", "x": 18, "y": 2, "h": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [6, 12], "x": 5.75, "y": 3},
+                {"matrix": [7, 5], "x": 6.75, "y": 3},
+                {"matrix": [7, 6], "x": 7.75, "y": 3},
+                {"matrix": [7, 7], "x": 8.75, "y": 3},
+                {"matrix": [3, 5], "x": 9.75, "y": 3},
+                {"matrix": [3, 6], "x": 10.75, "y": 3},
+                {"matrix": [3, 7], "x": 11.75, "y": 3},
+                {"matrix": [3, 8], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 9], "x": 15, "y": 3},
+                {"matrix": [3, 10], "x": 16, "y": 3},
+                {"matrix": [3, 11], "x": 17, "y": 3},
 
-        {"label": "K30", "x": 0, "y": 3, "w": 1.75},
-        {"label": "K31", "x": 1.75, "y": 3},
-        {"label": "K32", "x": 2.75, "y": 3},
-        {"label": "K33", "x": 3.75, "y": 3},
-        {"label": "K34", "x": 4.75, "y": 3},
-        {"label": "K6C", "x": 5.75, "y": 3},
-        {"label": "K75", "x": 6.75, "y": 3},
-        {"label": "K76", "x": 7.75, "y": 3},
-        {"label": "K77", "x": 8.75, "y": 3},
-        {"label": "K35", "x": 9.75, "y": 3},
-        {"label": "K36", "x": 10.75, "y": 3},
-        {"label": "K37", "x": 11.75, "y": 3},
-        {"label": "K38", "x": 12.75, "y": 3, "w": 2.25},
-        {"label": "K39", "x": 15, "y": 3},
-        {"label": "K3A", "x": 16, "y": 3},
-        {"label": "K3B", "x": 17, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [7, 8], "x": 5.25, "y": 4},
+                {"matrix": [7, 9], "x": 6.25, "y": 4},
+                {"matrix": [7, 10], "x": 7.25, "y": 4},
+                {"matrix": [7, 11], "x": 8.25, "y": 4},
+                {"matrix": [4, 5], "x": 9.25, "y": 4},
+                {"matrix": [4, 6], "x": 10.25, "y": 4},
+                {"matrix": [4, 7], "x": 11.25, "y": 4},
+                {"matrix": [4, 8], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [7, 4], "x": 14, "y": 4},
+                {"matrix": [4, 9], "x": 15, "y": 4},
+                {"matrix": [4, 10], "x": 16, "y": 4},
+                {"matrix": [4, 11], "x": 17, "y": 4},
+                {"matrix": [4, 12], "x": 18, "y": 4, "h": 2},
 
-        {"label": "K40", "x": 0, "y": 4, "w": 2.25},
-        {"label": "K42", "x": 2.25, "y": 4},
-        {"label": "K43", "x": 3.25, "y": 4},
-        {"label": "K44", "x": 4.25, "y": 4},
-        {"label": "K78", "x": 5.25, "y": 4},
-        {"label": "K79", "x": 6.25, "y": 4},
-        {"label": "K7A", "x": 7.25, "y": 4},
-        {"label": "K7B", "x": 8.25, "y": 4},
-        {"label": "K45", "x": 9.25, "y": 4},
-        {"label": "K46", "x": 10.25, "y": 4},
-        {"label": "K47", "x": 11.25, "y": 4},
-        {"label": "K48", "x": 12.25, "y": 4, "w": 1.75},
-        {"label": "K74", "x": 14, "y": 4},
-        {"label": "K49", "x": 15, "y": 4},
-        {"label": "K4A", "x": 16, "y": 4},
-        {"label": "K4B", "x": 17, "y": 4},
-        {"label": "K4C", "x": 18, "y": 4, "h": 2},
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 9], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 5], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 7], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 8], "x": 13, "y": 5},
+                {"matrix": [5, 3], "x": 14, "y": 5},
+                {"matrix": [5, 4], "x": 15, "y": 5},
+                {"matrix": [5, 10], "x": 16, "y": 5},
+                {"matrix": [5, 11], "x": 17, "y": 5}
+            ]
+        },
+        "LAYOUT_split_shift_and_bs": {
+            "layout": [
+                {"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": [6, 0], "x": 5, "y": 0},
+                {"matrix": [6, 1], "x": 6, "y": 0},
+                {"matrix": [6, 2], "x": 7, "y": 0},
+                {"matrix": [6, 3], "x": 8, "y": 0},
+                {"matrix": [0, 5], "x": 9, "y": 0},
+                {"matrix": [0, 6], "x": 10, "y": 0},
+                {"matrix": [0, 7], "x": 11, "y": 0},
+                {"matrix": [0, 8], "x": 12, "y": 0},
+                {"matrix": [7, 2], "x": 13, "y": 0},
+                {"matrix": [0, 9], "x": 14, "y": 0},
+                {"matrix": [0, 10], "x": 15, "y": 0},
+                {"matrix": [0, 11], "x": 16, "y": 0},
+                {"matrix": [0, 12], "x": 17, "y": 0},
+                {"matrix": [7, 12], "x": 18, "y": 0},
 
-        {"label": "K50", "x": 0, "y": 5, "w": 1.25},
-        {"label": "K51", "x": 1.25, "y": 5, "w": 1.25},
-        {"label": "K52", "x": 2.5, "y": 5, "w": 1.25},
-        {"label": "K59", "x": 3.75, "y": 5, "w": 6.25},
-        {"label": "K55", "x": 10, "y": 5, "w": 1.5},
-        {"label": "K57", "x": 11.5, "y": 5, "w": 1.5},
-        {"label": "K58", "x": 13, "y": 5},
-        {"label": "K53", "x": 14, "y": 5},
-        {"label": "K54", "x": 15, "y": 5},
-        {"label": "K5A", "x": 16, "y": 5},
-        {"label": "K5B", "x": 17, "y": 5}
-      ]
-    },
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [6, 4], "x": 5, "y": 1},
+                {"matrix": [6, 5], "x": 6, "y": 1},
+                {"matrix": [6, 6], "x": 7, "y": 1},
+                {"matrix": [6, 7], "x": 8, "y": 1},
+                {"matrix": [1, 5], "x": 9, "y": 1},
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [7, 0], "x": 13, "y": 1},
+                {"matrix": [7, 1], "x": 14, "y": 1},
+                {"matrix": [1, 9], "x": 15, "y": 1},
+                {"matrix": [1, 10], "x": 16, "y": 1},
+                {"matrix": [1, 11], "x": 17, "y": 1},
+                {"matrix": [1, 12], "x": 18, "y": 1},
 
-    "LAYOUT_split_shift_and_bs": {
-      "layout": [
-        {"label":"ESC", "x":0, "y":0},
-        {"label":"F1", "x":1, "y":0},
-        {"label":"F2", "x":2, "y":0},
-        {"label":"F3", "x":3, "y":0},
-        {"label":"F4", "x":4, "y":0},
-        {"label":"F5", "x":5, "y":0},
-        {"label":"F6", "x":6, "y":0},
-        {"label":"F7", "x":7, "y":0},
-        {"label":"F8", "x":8, "y":0},
-        {"label":"F9", "x":9, "y":0},
-        {"label":"F10", "x":10, "y":0},
-        {"label":"F11", "x":11, "y":0},
-        {"label":"F12", "x":12, "y":0},
-        {"label":"PRINT SCREEN", "x":13, "y":0},
-        {"label":"HOME", "x":14, "y":0},
-        {"label":"END", "x":15, "y":0},
-        {"label":"PAGE UP", "x":16, "y":0},
-        {"label":"PAGE DOWN", "x":17, "y":0},
-        {"label":"DELETE", "x":18, "y":0},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [6, 8], "x": 5.5, "y": 2},
+                {"matrix": [6, 9], "x": 6.5, "y": 2},
+                {"matrix": [6, 10], "x": 7.5, "y": 2},
+                {"matrix": [6, 11], "x": 8.5, "y": 2},
+                {"matrix": [2, 5], "x": 9.5, "y": 2},
+                {"matrix": [2, 6], "x": 10.5, "y": 2},
+                {"matrix": [2, 7], "x": 11.5, "y": 2},
+                {"matrix": [2, 8], "x": 12.5, "y": 2},
+                {"matrix": [7, 3], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 9], "x": 15, "y": 2},
+                {"matrix": [2, 10], "x": 16, "y": 2},
+                {"matrix": [2, 11], "x": 17, "y": 2},
+                {"matrix": [2, 12], "x": 18, "y": 2},
 
-        {"label":"GRAVE", "x":0, "y":1},
-        {"label":"1", "x":1, "y":1},
-        {"label":"2", "x":2, "y":1},
-        {"label":"3", "x":3, "y":1},
-        {"label":"4", "x":4, "y":1},
-        {"label":"5", "x":5, "y":1},
-        {"label":"6", "x":6, "y":1},
-        {"label":"7", "x":7, "y":1},
-        {"label":"8", "x":8, "y":1},
-        {"label":"9", "x":9, "y":1},
-        {"label":"0", "x":10, "y":1},
-        {"label":"MINUS", "x":11, "y":1},
-        {"label":"EQUAL", "x":12, "y":1},
-        {"label":"BACKSPACE", "x":13, "y":1},
-        {"label":"BACKSPACE", "x":14, "y":1},
-        {"label":"NUM LOCK", "x":15, "y":1},
-        {"label":"KEYPAD /", "x":16, "y":1},
-        {"label":"KEYPAD *", "x":17, "y":1},
-        {"label":"KEYPAD -", "x":18, "y":1},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [6, 12], "x": 5.75, "y": 3},
+                {"matrix": [7, 5], "x": 6.75, "y": 3},
+                {"matrix": [7, 6], "x": 7.75, "y": 3},
+                {"matrix": [7, 7], "x": 8.75, "y": 3},
+                {"matrix": [3, 5], "x": 9.75, "y": 3},
+                {"matrix": [3, 6], "x": 10.75, "y": 3},
+                {"matrix": [3, 7], "x": 11.75, "y": 3},
+                {"matrix": [3, 8], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 9], "x": 15, "y": 3},
+                {"matrix": [3, 10], "x": 16, "y": 3},
+                {"matrix": [3, 11], "x": 17, "y": 3},
+                {"matrix": [3, 12], "x": 18, "y": 3},
 
-        {"label":"TAB", "x":0, "y":2, "w":1.5},
-        {"label":"Q", "x":1.5, "y":2},
-        {"label":"W", "x":2.5, "y":2},
-        {"label":"E", "x":3.5, "y":2},
-        {"label":"R", "x":4.5, "y":2},
-        {"label":"T", "x":5.5, "y":2},
-        {"label":"Y", "x":6.5, "y":2},
-        {"label":"U", "x":7.5, "y":2},
-        {"label":"I", "x":8.5, "y":2},
-        {"label":"O", "x":9.5, "y":2},
-        {"label":"P", "x":10.5, "y":2},
-        {"label":"LBRACKET", "x":11.5, "y":2},
-        {"label":"RBRACKET", "x":12.5, "y":2},
-        {"label":"BACKSLASH", "x":13.5, "y":2, "w":1.5},
-        {"label":"KEYPAD 7", "x":15, "y":2},
-        {"label":"KEYPAD 8", "x":16, "y":2},
-        {"label":"KEYPAD 9", "x":17, "y":2},
-        {"label":"KEYPAD +", "x":18, "y":2},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [7, 8], "x": 5.25, "y": 4},
+                {"matrix": [7, 9], "x": 6.25, "y": 4},
+                {"matrix": [7, 10], "x": 7.25, "y": 4},
+                {"matrix": [7, 11], "x": 8.25, "y": 4},
+                {"matrix": [4, 5], "x": 9.25, "y": 4},
+                {"matrix": [4, 6], "x": 10.25, "y": 4},
+                {"matrix": [4, 7], "x": 11.25, "y": 4},
+                {"matrix": [4, 8], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [7, 4], "x": 14, "y": 4},
+                {"matrix": [4, 9], "x": 15, "y": 4},
+                {"matrix": [4, 10], "x": 16, "y": 4},
+                {"matrix": [4, 11], "x": 17, "y": 4},
+                {"matrix": [4, 12], "x": 18, "y": 4},
 
-        {"label":"CAPS LOCK", "x":0, "y":3, "w":1.75},
-        {"label":"A", "x":1.75, "y":3},
-        {"label":"S", "x":2.75, "y":3},
-        {"label":"D", "x":3.75, "y":3},
-        {"label":"F", "x":4.75, "y":3},
-        {"label":"G", "x":5.75, "y":3},
-        {"label":"H", "x":6.75, "y":3},
-        {"label":"J", "x":7.75, "y":3},
-        {"label":"K", "x":8.75, "y":3},
-        {"label":"L", "x":9.75, "y":3},
-        {"label":"SEMICOLON", "x":10.75, "y":3},
-        {"label":"QUOTE", "x":11.75, "y":3},
-        {"label":"ENTER", "x":12.75, "y":3, "w":2.25},
-        {"label":"KEYPAD 4", "x":15, "y":3},
-        {"label":"KEYPAD 5", "x":16, "y":3},
-        {"label":"KEYPAD 6", "x":17, "y":3},
-        {"label":"KEYPAD +", "x":18, "y":3},
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 9], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 5], "x": 10, "y": 5},
+                {"matrix": [5, 6], "x": 11, "y": 5},
+                {"matrix": [5, 7], "x": 12, "y": 5},
+                {"matrix": [5, 8], "x": 13, "y": 5},
+                {"matrix": [5, 3], "x": 14, "y": 5},
+                {"matrix": [5, 4], "x": 15, "y": 5},
+                {"matrix": [5, 10], "x": 16, "y": 5},
+                {"matrix": [5, 11], "x": 17, "y": 5},
+                {"matrix": [5, 12], "x": 18, "y": 5}
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"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": [6, 0], "x": 5, "y": 0},
+                {"matrix": [6, 1], "x": 6, "y": 0},
+                {"matrix": [6, 2], "x": 7, "y": 0},
+                {"matrix": [6, 3], "x": 8, "y": 0},
+                {"matrix": [0, 5], "x": 9, "y": 0},
+                {"matrix": [0, 6], "x": 10, "y": 0},
+                {"matrix": [0, 7], "x": 11, "y": 0},
+                {"matrix": [0, 8], "x": 12, "y": 0},
+                {"matrix": [7, 2], "x": 13, "y": 0},
+                {"matrix": [0, 9], "x": 14, "y": 0},
+                {"matrix": [0, 10], "x": 15, "y": 0},
+                {"matrix": [0, 11], "x": 16, "y": 0},
+                {"matrix": [0, 12], "x": 17, "y": 0},
+                {"matrix": [7, 12], "x": 18, "y": 0},
 
-        {"label":"LSHIFT", "x":0, "y":4, "w":1.25},
-        {"label":"ISO BACKSLASH", "x":1.25, "y":4},
-        {"label":"Z", "x":2.25, "y":4},
-        {"label":"X", "x":3.25, "y":4},
-        {"label":"C", "x":4.25, "y":4},
-        {"label":"V", "x":5.25, "y":4},
-        {"label":"B", "x":6.25, "y":4},
-        {"label":"N", "x":7.25, "y":4},
-        {"label":"M", "x":8.25, "y":4},
-        {"label":"COMMA", "x":9.25, "y":4},
-        {"label":"PERIOD", "x":10.25, "y":4},
-        {"label":"SLASH", "x":11.25, "y":4},
-        {"label":"RSHIFT", "x":12.25, "y":4, "w":1.75},
-        {"label":"UP", "x":14, "y":4},
-        {"label":"KEYPAD 1", "x":15, "y":4},
-        {"label":"KEYPAD 2", "x":16, "y":4},
-        {"label":"KEYPAD 3", "x":17, "y":4},
-        {"label":"KEYPAD ENTER", "x":18, "y":4},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [6, 4], "x": 5, "y": 1},
+                {"matrix": [6, 5], "x": 6, "y": 1},
+                {"matrix": [6, 6], "x": 7, "y": 1},
+                {"matrix": [6, 7], "x": 8, "y": 1},
+                {"matrix": [1, 5], "x": 9, "y": 1},
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [7, 1], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 9], "x": 15, "y": 1},
+                {"matrix": [1, 10], "x": 16, "y": 1},
+                {"matrix": [1, 11], "x": 17, "y": 1},
+                {"matrix": [1, 12], "x": 18, "y": 1},
 
-        {"label":"LCTRL", "x":0, "y":5, "w":1.25},
-        {"label":"LGUI", "x":1.25, "y":5, "w":1.25},
-        {"label":"LALT", "x":2.5, "y":5, "w":1.25},
-        {"label":"SPACE", "x":3.75, "y":5, "w":6.25},
-        {"label":"RALT", "x":10, "y":5},
-        {"label":"MENU", "x":11, "y":5},
-        {"label":"RCTRL", "x":12, "y":5},
-        {"label":"LEFT", "x":13, "y":5},
-        {"label":"DOWN", "x":14, "y":5},
-        {"label":"RIGHT", "x":15, "y":5},
-        {"label":"KEYPAD 0", "x":16, "y":5},
-        {"label":"KEYPAD .", "x":17, "y":5},
-        {"label":"KEYPAD ENTER", "x":18, "y":5}
-      ]
-    },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [6, 8], "x": 5.5, "y": 2},
+                {"matrix": [6, 9], "x": 6.5, "y": 2},
+                {"matrix": [6, 10], "x": 7.5, "y": 2},
+                {"matrix": [6, 11], "x": 8.5, "y": 2},
+                {"matrix": [2, 5], "x": 9.5, "y": 2},
+                {"matrix": [2, 6], "x": 10.5, "y": 2},
+                {"matrix": [2, 7], "x": 11.5, "y": 2},
+                {"matrix": [2, 8], "x": 12.5, "y": 2},
+                {"matrix": [2, 9], "x": 15, "y": 2},
+