Move miscellaneous layouts to data driven (#20516)

2 files changed, 214 insertions, 293 deletions

diff --git a/keyboards/converter/adb_usb/adb_usb.h b/keyboards/converter/adb_usb/adb_usb.h
deleted file mode 100644
index ddbbd71564..0000000000
--- a/keyboards/converter/adb_usb/adb_usb.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-Copyright 2011,2012,2013 Jun Wako <wakojun@gmail.com>
-
-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/>.
-
-Ported to QMK by Peter Roe <pete@13bit.me>
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/* M0115/M3501 Apple Extended Keyboard ANSI
- * ,---.   ,---------------. ,---------------. ,---------------. ,-----------.             ,---.
- * |Esc|   |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau|             |Pwr|
- * `---'   `---------------' `---------------' `---------------' `-----------'             `---'
- * ,-----------------------------------------------------------. ,-----------. ,---------------.
- * |  `|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backspa| |Ins|Hom|PgU| |NmL|  =|  /|  *|
- * |-----------------------------------------------------------| |-----------| |---------------|
- * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \| |Del|End|PgD| |  7|  8|  9|  -|
- * |-----------------------------------------------------------| `-----------' |---------------|
- * |CapsLo|  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return  |               |  4|  5|  6|  +|
- * |-----------------------------------------------------------|     ,---.     |---------------|
- * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  ,|  /|Shift     |     |Up |     |  1|  2|  3|   |
- * |-----------------------------------------------------------| ,-----------. |-----------|Ent|
- * |Ctrl |Opt |Cmd |         Space           |     |Opt |Ctrl  | |Lef|Dow|Rig| |      0|  .|   |
- * `-----------------------------------------------------------' `-----------' `---------------'
- */
-#define LAYOUT_ext_ansi( \
-    k35,      k7A, k78, k63, k76, k60, k61, k62, k64, k65, k6D, k67, k6F,  k69, k6B, k71,                 k7F, \
-    k32, k12, k13, k14, k15, k17, k16, k1A, k1C, k19, k1D, k1B, k18, k33,  k72, k73, k74,  k47, k51, k4B, k43, \
-    k30, k0C, k0D, k0E, k0F, k11, k10, k20, k22, k1F, k23, k21, k1E, k2A,  k75, k77, k79,  k59, k5B, k5C, k4E, \
-    k39, k00, k01, k02, k03, k05, k04, k26, k28, k25, k29, k27,      k24,                  k56, k57, k58, k45, \
-    k38, k06, k07, k08, k09, k0B, k2D, k2E, k2B, k2F, k2C,           k7B,       k3E,       k53, k54, k55,\
-    k36, k3A, k37,           k31,                               k7C, k7D,  k3B, k3D, k3C,  k52,      k41, k4C \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07 }, \
-    { k08, k09, XXX, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17 }, \
-    { k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27 }, \
-    { k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \
-    { k30, k31, k32, k33, XXX, k35, k36, k37 }, \
-    { k38, k39, k3A, k3B, k3C, k3D, k3E, XXX }, \
-    { XXX, k41, XXX, k43, XXX, k45, XXX, k47 }, \
-    { XXX, XXX, XXX, k4B, k4C, XXX, k4E, XXX }, \
-    { XXX, k51, k52, k53, k54, k55, k56, k57 }, \
-    { k58, k59, XXX, k5B, k5C, XXX, XXX, XXX }, \
-    { k60, k61, k62, k63, k64, k65, XXX, k67 }, \
-    { XXX, k69, XXX, k6B, XXX, k6D, XXX, k6F }, \
-    { XXX, k71, k72, k73, k74, k75, k76, k77 }, \
-    { k78, k79, k7A, k7B, k7C, k7D, XXX, k7F } \
-}
-
-/* M0116 Apple Standard Keyboard ANSI
- *                     +-------+
- *                     | power |
- *                     +-------+
- * +---+---+---+---+---+---+---+---+---+---+---+---+---+-----+ +---+---+---+---+
- * |esc| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | bks | |clr| = | / | * |
- * +---------------------------------------------------------+ +---+---+---+---+
- * | tab | q | w | e | r | t | y | u | i | o | p | [ | ] |   | | 7 | 8 | 9 | + |
- * +-----------------------------------------------------+   | +---+---+---+---+
- * | ctrl | a | s | d | f | g | h | j | k | l | ; | ' |return| | 4 | 5 | 6 | - |
- * +---------------------------------------------------------+ +---+---+---+---+
- * | shift  | z | x | c | v | b | n | m | , | . | / |  shift | | 1 | 2 | 3 |   |
- * +---------------------------------------------------------+ +-------+---|ent|
- * |cap|opt|comnd| ` |                   | \ |lef|rig|dwn|up | |   0   | . |   |
- * +---------------------------------------------------------+ +-------+---+---+
- */
-#define LAYOUT_m0116_ansi( \
-                                  k7F, \
-    k35, k12, k13, k14, k15, k17, k16, k1A, k1C, k19, k1D, k1B, k18, k33,  k47, k51, k4B, k43, \
-    k30, k0C, k0D, k0E, k0F, k11, k10, k20, k22, k1F, k23, k21, k1E,       k59, k5B, k5C, k45, \
-    k36, k00, k01, k02, k03, k05, k04, k26, k28, k25, k29, k27,      k24,  k56, k57, k58, k4E, \
-    k38, k06, k07, k08, k09, k0B, k2D, k2E, k2B, k2F, k2C,           k7B,  k53, k54, k55, \
-    k39, k3A, k37, k32,           k31,           k2A, k3B, k3C, k3D, k3E,  k52,      k41, k4C \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07 }, \
-    { k08, k09, XXX, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17 }, \
-    { k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27 }, \
-    { k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \
-    { k30, k31, k32, k33, XXX, k35, k36, k37 }, \
-    { k38, k39, k3A, k3B, k3C, k3D, k3E, XXX }, \
-    { XXX, k41, XXX, k43, XXX, k45, XXX, k47 }, \
-    { XXX, XXX, XXX, k4B, k4C, XXX, k4E, XXX }, \
-    { XXX, k51, k52, k53, k54, k55, k56, k57 }, \
-    { k58, k59, XXX, k5B, k5C, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, k7B, XXX, XXX, XXX, k7F } \
-}
diff --git a/keyboards/converter/adb_usb/info.json b/keyboards/converter/adb_usb/info.json
index f64616e212..b553dfc10f 100644
--- a/keyboards/converter/adb_usb/info.json
+++ b/keyboards/converter/adb_usb/info.json
@@ -11,195 +11,224 @@
   "layouts": {
     "LAYOUT_ext_ansi": {
       "layout": [
-        {"label":"Escape", "x":0, "y":0},
-        {"label":"F1", "x":2, "y":0},
-        {"label":"F2", "x":3, "y":0},
-        {"label":"F3", "x":4, "y":0},
-        {"label":"F4", "x":5, "y":0},
-        {"label":"F5", "x":6.5, "y":0},
-        {"label":"F6", "x":7.5, "y":0},
-        {"label":"F7", "x":8.5, "y":0},
-        {"label":"F8", "x":9.5, "y":0},
-        {"label":"F9", "x":11, "y":0},
-        {"label":"F10", "x":12, "y":0},
-        {"label":"F11", "x":13, "y":0},
-        {"label":"F12", "x":14, "y":0},
-        {"label":"Print Screen", "x":15.25, "y":0},
-        {"label":"Scroll Lock", "x":16.25, "y":0},
-        {"label":"Pause", "x":17.25, "y":0},
-        {"label":"Eject", "x":21.5, "y":0},
-        {"label":"`", "x":0, "y":2},
-        {"label":"1", "x":1, "y":2},
-        {"label":"2", "x":2, "y":2},
-        {"label":"3", "x":3, "y":2},
-        {"label":"4", "x":4, "y":2},
-        {"label":"5", "x":5, "y":2},
-        {"label":"6", "x":6, "y":2},
-        {"label":"7", "x":7, "y":2},
-        {"label":"8", "x":8, "y":2},
-        {"label":"9", "x":9, "y":2},
-        {"label":"0", "x":10, "y":2},
-        {"label":"-", "x":11, "y":2},
-        {"label":"=", "x":12, "y":2},
-        {"label":"Backspace", "x":13, "y":2, "w":2},
-        {"label":"Insert", "x":15.25, "y":2},
-        {"label":"Home", "x":16.25, "y":2},
-        {"label":"Page Up", "x":17.25, "y":2},
-        {"label":"Num Lock", "x":18.5, "y":2},
-        {"label":"Num =", "x":19.5, "y":2},
-        {"label":"Num /", "x":20.5, "y":2},
-        {"label":"Num *", "x":21.5, "y":2},
-        {"label":"Tab", "x":0, "y":3, "w":1.5},
-        {"label":"Q", "x":1.5, "y":3},
-        {"label":"W", "x":2.5, "y":3},
-        {"label":"E", "x":3.5, "y":3},
-        {"label":"R", "x":4.5, "y":3},
-        {"label":"T", "x":5.5, "y":3},
-        {"label":"Y", "x":6.5, "y":3},
-        {"label":"U", "x":7.5, "y":3},
-        {"label":"I", "x":8.5, "y":3},
-        {"label":"O", "x":9.5, "y":3},
-        {"label":"P", "x":10.5, "y":3},
-        {"label":"[", "x":11.5, "y":3},
-        {"label":"]", "x":12.5, "y":3},
-        {"label":"\\", "x":13.5, "y":3, "w":1.5},
-        {"label":"Delete", "x":15.25, "y":3},
-        {"label":"End", "x":16.25, "y":3},
-        {"label":"Page Down", "x":17.25, "y":3},
-        {"label":"Num 7", "x":18.5, "y":3},
-        {"label":"Num 8", "x":19.5, "y":3},
-        {"label":"Num 9", "x":20.5, "y":3},
-        {"label":"Num -", "x":21.5, "y":3},
-        {"label":"Lcap", "x":0, "y":4, "w":1.75},
-        {"label":"A", "x":1.75, "y":4},
-        {"label":"S", "x":2.75, "y":4},
-        {"label":"D", "x":3.75, "y":4},
-        {"label":"F", "x":4.75, "y":4},
-        {"label":"G", "x":5.75, "y":4},
-        {"label":"H", "x":6.75, "y":4},
-        {"label":"J", "x":7.75, "y":4},
-        {"label":"K", "x":8.75, "y":4},
-        {"label":"L", "x":9.75, "y":4},
-        {"label":";", "x":10.75, "y":4},
-        {"label":"\"", "x":11.75, "y":4},
-        {"label":"Enter", "x":12.75, "y":4, "w":2.25},
-        {"label":"Num 4", "x":18.5, "y":4},
-        {"label":"Num 5", "x":19.5, "y":4},
-        {"label":"Num 6", "x":20.5, "y":4},
-        {"label":"Num +", "x":21.5, "y":4},
-        {"label":"Shift", "x":0, "y":5, "w":2.25},
-        {"label":"Z", "x":2.25, "y":5},
-        {"label":"X", "x":3.25, "y":5},
-        {"label":"C", "x":4.25, "y":5},
-        {"label":"V", "x":5.25, "y":5},
-        {"label":"B", "x":6.25, "y":5},
-        {"label":"N", "x":7.25, "y":5},
-        {"label":"M", "x":8.25, "y":5},
-        {"label":",", "x":9.25, "y":5},
-        {"label":".", "x":10.25, "y":5},
-        {"label":"/", "x":11.25, "y":5},
-        {"label":"Shift", "x":12.25, "y":5, "w":2.75},
-        {"label":"Up", "x":16.25, "y":5},
-        {"label":"Num 1", "x":18.5, "y":5},
-        {"label":"Num 2", "x":19.5, "y":5},
-        {"label":"Num 3", "x":20.5, "y":5},
-        {"label":"Ctrl", "x":0, "y":6, "w":1.5},
-        {"label":"Alt", "x":1.5, "y":6, "w":1.25},
-        {"label":"Command", "x":2.75, "y":6, "w":1.5},
-        {"label":"Space", "x":4.25, "y":6, "w":6.5},
-        {"label":"Alt", "x":12.25, "y":6, "w":1.25},
-        {"label":"Ctrl", "x":13.5, "y":6, "w":1.5},
-        {"label":"Left", "x":15.25, "y":6},
-        {"label":"Down", "x":16.25, "y":6},
-        {"label":"Right", "x":17.25, "y":6},
-        {"label":"Num 0", "x":18.5, "y":6, "w":2},
-        {"label":"Num .", "x":20.5, "y":6},
-        {"label":"Num Enter", "x":21.5, "y":5, "h":2}
+        {"matrix": [6, 5], "x": 0, "y": 0},
+
+        {"matrix": [15, 2], "x": 2, "y": 0},
+        {"matrix": [15, 0], "x": 3, "y": 0},
+        {"matrix": [12, 3], "x": 4, "y": 0},
+        {"matrix": [14, 6], "x": 5, "y": 0},
+
+        {"matrix": [12, 0], "x": 6.5, "y": 0},
+        {"matrix": [12, 1], "x": 7.5, "y": 0},
+        {"matrix": [12, 2], "x": 8.5, "y": 0},
+        {"matrix": [12, 4], "x": 9.5, "y": 0},
+
+        {"matrix": [12, 5], "x": 11, "y": 0},
+        {"matrix": [13, 5], "x": 12, "y": 0},
+        {"matrix": [12, 7], "x": 13, "y": 0},
+        {"matrix": [13, 7], "x": 14, "y": 0},
+
+        {"matrix": [13, 1], "x": 15.25, "y": 0},
+        {"matrix": [13, 3], "x": 16.25, "y": 0},
+        {"matrix": [14, 1], "x": 17.25, "y": 0},
+
+        {"matrix": [15, 7], "x": 21.5, "y": 0},
+
+        {"matrix": [6, 2], "x": 0, "y": 2},
+        {"matrix": [2, 2], "x": 1, "y": 2},
+        {"matrix": [2, 3], "x": 2, "y": 2},
+        {"matrix": [2, 4], "x": 3, "y": 2},
+        {"matrix": [2, 5], "x": 4, "y": 2},
+        {"matrix": [2, 7], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [3, 2], "x": 7, "y": 2},
+        {"matrix": [3, 4], "x": 8, "y": 2},
+        {"matrix": [3, 1], "x": 9, "y": 2},
+        {"matrix": [3, 5], "x": 10, "y": 2},
+        {"matrix": [3, 3], "x": 11, "y": 2},
+        {"matrix": [3, 0], "x": 12, "y": 2},
+        {"matrix": [6, 3], "x": 13, "y": 2, "w": 2},
+
+        {"matrix": [14, 2], "x": 15.25, "y": 2},
+        {"matrix": [14, 3], "x": 16.25, "y": 2},
+        {"matrix": [14, 4], "x": 17.25, "y": 2},
+
+        {"matrix": [8, 7], "x": 18.5, "y": 2},
+        {"matrix": [10, 1], "x": 19.5, "y": 2},
+        {"matrix": [9, 3], "x": 20.5, "y": 2},
+        {"matrix": [8, 3], "x": 21.5, "y": 2},
+
+        {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.5},
+        {"matrix": [1, 4], "x": 1.5, "y": 3},
+        {"matrix": [1, 5], "x": 2.5, "y": 3},
+        {"matrix": [1, 6], "x": 3.5, "y": 3},
+        {"matrix": [1, 7], "x": 4.5, "y": 3},
+        {"matrix": [2, 1], "x": 5.5, "y": 3},
+        {"matrix": [2, 0], "x": 6.5, "y": 3},
+        {"matrix": [4, 0], "x": 7.5, "y": 3},
+        {"matrix": [4, 2], "x": 8.5, "y": 3},
+        {"matrix": [3, 7], "x": 9.5, "y": 3},
+        {"matrix": [4, 3], "x": 10.5, "y": 3},
+        {"matrix": [4, 1], "x": 11.5, "y": 3},
+        {"matrix": [3, 6], "x": 12.5, "y": 3},
+        {"matrix": [5, 2], "x": 13.5, "y": 3, "w": 1.5},
+
+        {"matrix": [14, 5], "x": 15.25, "y": 3},
+        {"matrix": [14, 7], "x": 16.25, "y": 3},
+        {"matrix": [15, 1], "x": 17.25, "y": 3},
+
+        {"matrix": [11, 1], "x": 18.5, "y": 3},
+        {"matrix": [11, 3], "x": 19.5, "y": 3},
+        {"matrix": [11, 4], "x": 20.5, "y": 3},
+        {"matrix": [9, 6], "x": 21.5, "y": 3},
+
+        {"matrix": [7, 1], "x": 0, "y": 4, "w": 1.75},
+        {"matrix": [0, 0], "x": 1.75, "y": 4},
+        {"matrix": [0, 1], "x": 2.75, "y": 4},
+        {"matrix": [0, 2], "x": 3.75, "y": 4},
+        {"matrix": [0, 3], "x": 4.75, "y": 4},
+        {"matrix": [0, 5], "x": 5.75, "y": 4},
+        {"matrix": [0, 4], "x": 6.75, "y": 4},
+        {"matrix": [4, 6], "x": 7.75, "y": 4},
+        {"matrix": [5, 0], "x": 8.75, "y": 4},
+        {"matrix": [4, 5], "x": 9.75, "y": 4},
+        {"matrix": [5, 1], "x": 10.75, "y": 4},
+        {"matrix": [4, 7], "x": 11.75, "y": 4},
+        {"matrix": [4, 4], "x": 12.75, "y": 4, "w": 2.25},
+
+        {"matrix": [10, 6], "x": 18.5, "y": 4},
+        {"matrix": [10, 7], "x": 19.5, "y": 4},
+        {"matrix": [11, 0], "x": 20.5, "y": 4},
+        {"matrix": [8, 5], "x": 21.5, "y": 4},
+
+        {"matrix": [7, 0], "x": 0, "y": 5, "w": 2.25},
+        {"matrix": [0, 6], "x": 2.25, "y": 5},
+        {"matrix": [0, 7], "x": 3.25, "y": 5},
+        {"matrix": [1, 0], "x": 4.25, "y": 5},
+        {"matrix": [1, 1], "x": 5.25, "y": 5},
+        {"matrix": [1, 3], "x": 6.25, "y": 5},
+        {"matrix": [5, 5], "x": 7.25, "y": 5},
+        {"matrix": [5, 6], "x": 8.25, "y": 5},
+        {"matrix": [5, 3], "x": 9.25, "y": 5},
+        {"matrix": [5, 7], "x": 10.25, "y": 5},
+        {"matrix": [5, 4], "x": 11.25, "y": 5},
+        {"matrix": [15, 3], "x": 12.25, "y": 5, "w": 2.75},
+
+        {"matrix": [7, 6], "x": 16.25, "y": 5},
+
+        {"matrix": [10, 3], "x": 18.5, "y": 5},
+        {"matrix": [10, 4], "x": 19.5, "y": 5},
+        {"matrix": [10, 5], "x": 20.5, "y": 5},
+
+        {"matrix": [6, 6], "x": 0, "y": 6, "w": 1.5},
+        {"matrix": [7, 2], "x": 1.5, "y": 6, "w": 1.25},
+        {"matrix": [6, 7], "x": 2.75, "y": 6, "w": 1.5},
+        {"matrix": [6, 1], "x": 4.25, "y": 6, "w": 6.5},
+        {"matrix": [15, 4], "x": 12.25, "y": 6, "w": 1.25},
+        {"matrix": [15, 5], "x": 13.5, "y": 6, "w": 1.5},
+
+        {"matrix": [7, 3], "x": 15.25, "y": 6},
+        {"matrix": [7, 5], "x": 16.25, "y": 6},
+        {"matrix": [7, 4], "x": 17.25, "y": 6},
+
+        {"matrix": [10, 2], "x": 18.5, "y": 6, "w": 2},
+        {"matrix": [8, 1], "x": 20.5, "y": 6},
+        {"matrix": [9, 4], "x": 21.5, "y": 5, "h": 2}
       ]
     },
     "LAYOUT_m0116_ansi": {
       "layout": [
-        {"label":"Power", "x":5, "y":0, "w":2},
-        {"label":"Esc", "x":0, "y":1.25},
-        {"label":"1", "x":1, "y":1.25},
-        {"label":"2", "x":2, "y":1.25},
-        {"label":"3", "x":3, "y":1.25},
-        {"label":"4", "x":4, "y":1.25},
-        {"label":"5", "x":5, "y":1.25},
-        {"label":"6", "x":6, "y":1.25},
-        {"label":"7", "x":7, "y":1.25},
-        {"label":"8", "x":8, "y":1.25},
-        {"label":"9", "x":9, "y":1.25},
-        {"label":"0", "x":10, "y":1.25},
-        {"label":"-", "x":11, "y":1.25},
-        {"label":"=", "x":12, "y":1.25},
-        {"label":"Delete", "x":13, "y":1.25, "w":1.5},
-        {"label":"Clear", "x":15.5, "y":1.25},
-        {"label":"Num =", "x":16.5, "y":1.25},
-        {"label":"Num /", "x":17.5, "y":1.25},
-        {"label":"Num *", "x":18.5, "y":1.25},
-        {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-        {"label":"Q", "x":1.5, "y":2.25},
-        {"label":"W", "x":2.5, "y":2.25},
-        {"label":"E", "x":3.5, "y":2.25},
-        {"label":"R", "x":4.5, "y":2.25},
-        {"label":"T", "x":5.5, "y":2.25},
-        {"label":"Y", "x":6.5, "y":2.25},
-        {"label":"U", "x":7.5, "y":2.25},
-        {"label":"I", "x":8.5, "y":2.25},
-        {"label":"O", "x":9.5, "y":2.25},
-        {"label":"P", "x":10.5, "y":2.25},
-        {"label":"[", "x":11.5, "y":2.25},
-        {"label":"]", "x":12.5, "y":2.25},
-        {"label":"Num 7", "x":15.5, "y":2.25},
-        {"label":"Num 8", "x":16.5, "y":2.25},
-        {"label":"Num 9", "x":17.5, "y":2.25},
-        {"label":"Num +", "x":18.5, "y":2.25},
-        {"label":"Ctrl", "x":0, "y":3.25, "w":1.75},
-        {"label":"A", "x":1.75, "y":3.25},
-        {"label":"S", "x":2.75, "y":3.25},
-        {"label":"D", "x":3.75, "y":3.25},
-        {"label":"F", "x":4.75, "y":3.25},
-        {"label":"G", "x":5.75, "y":3.25},
-        {"label":"H", "x":6.75, "y":3.25},
-        {"label":"J", "x":7.75, "y":3.25},
-        {"label":"K", "x":8.75, "y":3.25},
-        {"label":"L", "x":9.75, "y":3.25},
-        {"label":";", "x":10.75, "y":3.25},
-        {"label":"'", "x":11.75, "y":3.25},
-        {"label":"Return", "x":12.75, "y":3.25, "w":1.75},
-        {"label":"Num 4", "x":15.5, "y":3.25},
-        {"label":"Num 5", "x":16.5, "y":3.25},
-        {"label":"Num 6", "x":17.5, "y":3.25},
-        {"label":"Num -", "x":18.5, "y":3.25},
-        {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-        {"label":"Z", "x":2.25, "y":4.25},
-        {"label":"X", "x":3.25, "y":4.25},
-        {"label":"C", "x":4.25, "y":4.25},
-        {"label":"V", "x":5.25, "y":4.25},
-        {"label":"B", "x":6.25, "y":4.25},
-        {"label":"N", "x":7.25, "y":4.25},
-        {"label":"M", "x":8.25, "y":4.25},
-        {"label":",", "x":9.25, "y":4.25},
-        {"label":".", "x":10.25, "y":4.25},
-        {"label":"/", "x":11.25, "y":4.25},
-        {"label":"Shift", "x":12.25, "y":4.25, "w":2.25},
-        {"label":"Num 1", "x":15.5, "y":4.25},
-        {"label":"Num 2", "x":16.5, "y":4.25},
-        {"label":"Num 3", "x":17.5, "y":4.25},
-        {"label":"Caps Lock", "x":0, "y":5.25},
-        {"label":"Option", "x":1, "y":5.25},
-        {"label":"Command", "x":2, "y":5.25, "w":1.75},
-        {"label":"`", "x":3.75, "y":5.25},
-        {"label":"Space", "x":4.75, "y":5.25, "w":4.75},
-        {"label":"\\", "x":9.5, "y":5.25},
-        {"label":"Left", "x":10.5, "y":5.25},
-        {"label":"Right", "x":11.5, "y":5.25},
-        {"label":"Down", "x":12.5, "y":5.25},
-        {"label":"Up", "x":13.5, "y":5.25},
-        {"label":"Num 0", "x":15.5, "y":5.25, "w":2},
-        {"label":"Num .", "x":17.5, "y":5.25},
-        {"label":"Num Enter", "x":18.5, "y":4.25, "h":2}
+        {"matrix": [15, 7], "x": 5, "y": 0, "w": 2},
+
+        {"matrix": [6, 5], "x": 0, "y": 1.25},
+        {"matrix": [2, 2], "x": 1, "y": 1.25},
+        {"matrix": [2, 3], "x": 2, "y": 1.25},
+        {"matrix": [2, 4], "x": 3, "y": 1.25},
+        {"matrix": [2, 5], "x": 4, "y": 1.25},
+        {"matrix": [2, 7], "x": 5, "y": 1.25},
+        {"matrix": [2, 6], "x": 6, "y": 1.25},
+        {"matrix": [3, 2], "x": 7, "y": 1.25},
+        {"matrix": [3, 4], "x": 8, "y": 1.25},
+        {"matrix": [3, 1], "x": 9, "y": 1.25},
+        {"matrix": [3, 5], "x": 10, "y": 1.25},
+        {"matrix": [3, 3], "x": 11, "y": 1.25},
+        {"matrix": [3, 0], "x": 12, "y": 1.25},
+        {"matrix": [6, 3], "x": 13, "y": 1.25, "w": 1.5},
+
+        {"matrix": [8, 7], "x": 15.5, "y": 1.25},
+        {"matrix": [10, 1], "x": 16.5, "y": 1.25},
+        {"matrix": [9, 3], "x": 17.5, "y": 1.25},
+        {"matrix": [8, 3], "x": 18.5, "y": 1.25},
+
+        {"matrix": [6, 0], "x": 0, "y": 2.25, "w": 1.5},
+        {"matrix": [1, 4], "x": 1.5, "y": 2.25},
+        {"matrix": [1, 5], "x": 2.5, "y": 2.25},
+        {"matrix": [1, 6], "x": 3.5, "y": 2.25},
+        {"matrix": [1, 7], "x": 4.5, "y": 2.25},
+        {"matrix": [2, 1], "x": 5.5, "y": 2.25},
+        {"matrix": [2, 0], "x": 6.5, "y": 2.25},
+        {"matrix": [4, 0], "x": 7.5, "y": 2.25},
+        {"matrix": [4, 2], "x": 8.5, "y": 2.25},
+        {"matrix": [3, 7], "x": 9.5, "y": 2.25},
+        {"matrix": [4, 3], "x": 10.5, "y": 2.25},
+        {"matrix": [4, 1], "x": 11.5, "y": 2.25},
+        {"matrix": [3, 6], "x": 12.5, "y": 2.25},
+
+        {"matrix": [11, 1], "x": 15.5, "y": 2.25},
+        {"matrix": [11, 3], "x": 16.5, "y": 2.25},
+        {"matrix": [11, 4], "x": 17.5, "y": 2.25},
+        {"matrix": [8, 5], "x": 18.5, "y": 2.25},
+
+        {"matrix": [6, 6], "x": 0, "y": 3.25, "w": 1.75},
+        {"matrix": [0, 0], "x": 1.75, "y": 3.25},
+        {"matrix": [0, 1], "x": 2.75, "y": 3.25},
+        {"matrix": [0, 2], "x": 3.75, "y": 3.25},
+        {"matrix": [0, 3], "x": 4.75, "y": 3.25},
+        {"matrix": [0, 5], "x": 5.75, "y": 3.25},
+        {"matrix": [0, 4], "x": 6.75, "y": 3.25},
+        {"matrix": [4, 6], "x": 7.75, "y": 3.25},
+        {"matrix": [5, 0], "x": 8.75, "y": 3.25},
+        {"matrix": [4, 5], "x": 9.75, "y": 3.25},
+        {"matrix": [5, 1], "x": 10.75, "y": 3.25},
+        {"matrix": [4, 7], "x": 11.75, "y": 3.25},
+        {"matrix": [4, 4], "x": 12.75, "y": 3.25, "w": 1.75},
+
+        {"matrix": [10, 6], "x": 15.5, "y": 3.25},
+        {"matrix": [10, 7], "x": 16.5, "y": 3.25},
+        {"matrix": [11, 0], "x": 17.5, "y": 3.25},
+        {"matrix": [9, 6], "x": 18.5, "y": 3.25},
+
+        {"matrix": [7, 0], "x": 0, "y": 4.25, "w": 2.25},
+        {"matrix": [0, 6], "x": 2.25, "y": 4.25},
+        {"matrix": [0, 7], "x": 3.25, "y": 4.25},
+        {"matrix": [1, 0], "x": 4.25, "y": 4.25},
+        {"matrix": [1, 1], "x": 5.25, "y": 4.25},
+        {"matrix": [1, 3], "x": 6.25, "y": 4.25},
+        {"matrix": [5, 5], "x": 7.25, "y": 4.25},
+        {"matrix": [5, 6], "x": 8.25, "y": 4.25},
+        {"matrix": [5, 3], "x": 9.25, "y": 4.25},
+        {"matrix": [5, 7], "x": 10.25, "y": 4.25},
+        {"matrix": [5, 4], "x": 11.25, "y": 4.25},
+        {"matrix": [15, 3], "x": 12.25, "y": 4.25, "w": 2.25},
+
+        {"matrix": [10, 3], "x": 15.5, "y": 4.25},
+        {"matrix": [10, 4], "x": 16.5, "y": 4.25},
+        {"matrix": [10, 5], "x": 17.5, "y": 4.25},
+
+        {"matrix": [7, 1], "x": 0, "y": 5.25},
+        {"matrix": [7, 2], "x": 1, "y": 5.25},
+        {"matrix": [6, 7], "x": 2, "y": 5.25, "w": 1.75},
+        {"matrix": [6, 2], "x": 3.75, "y": 5.25},
+        {"matrix": [6, 1], "x": 4.75, "y": 5.25, "w": 4.75},
+        {"matrix": [5, 2], "x": 9.5, "y": 5.25},
+        {"matrix": [7, 3], "x": 10.5, "y": 5.25},
+        {"matrix": [7, 4], "x": 11.5, "y": 5.25},
+        {"matrix": [7, 5], "x": 12.5, "y": 5.25},
+        {"matrix": [7, 6], "x": 13.5, "y": 5.25},
+
+        {"matrix": [10, 2], "x": 15.5, "y": 5.25, "w": 2},
+        {"matrix": [8, 1], "x": 17.5, "y": 5.25},
+        {"matrix": [9, 4], "x": 18.5, "y": 4.25, "h": 2}
       ]
     }
   }