Move TKL layouts to data driven (#20337)

2 files changed, 406 insertions, 449 deletions

diff --git a/keyboards/bpiphany/pegasushoof/2015/2015.h b/keyboards/bpiphany/pegasushoof/2015/2015.h
deleted file mode 100644
index 2b4fac85f3..0000000000
--- a/keyboards/bpiphany/pegasushoof/2015/2015.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-Copyright 2016 Daniel Svensson <dsvensson@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/>.
-*/
-
-#pragma once
-
-#include "matrix.h"
-#include "quantum.h"
-
-#define  ___ XXXXXXX
-
-#define LAYOUT( \
-    KJ6,      KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0,   KC7, KC5, KA5, \
-    KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2,   KL4, KO4, KQ4, \
-    KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2, KB3,   KK4, KO7, KQ7, \
-    KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6,      KB1,                  \
-    KN2, KI6, KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0,      KN3,        KO6,      \
-    KA4, KP2, KC6,                KK6,                KC0, KM3, KD0, KA1,   KO0, KK0, KL0  \
-    ) { /*         00-A  01-B  02-C  03-D  04-E  05-F  06-G  07-H  08-I  09-J  10-K  11-L  12-M  13-N  14-O  15-P  16-Q  17-R */ \
-        /* 0 */  { ___ , KB0 , KC0 , KD0 , ___ , KF0 , KG0 , ___ , ___ , ___ , KK0 , KL0 , ___ , ___ , KO0 , ___ , ___ , KR0 }, \
-        /* 1 */  { KA1 , KB1 , ___ , KD1 , KE1 , KF1 , KG1 , KH1 , KI1 , KJ1 , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ }, \
-        /* 2 */  { ___ , KB2 , ___ , KD2 , KE2 , KF2 , KG2 , KH2 , KI2 , KJ2 , ___ , ___ , ___ , KN2 , ___ , KP2 , ___ , KR2 }, \
-        /* 3 */  { ___ , KB3 , ___ , KD3 , KE3 , KF3 , KG3 , KH3 , KI3 , KJ3 , ___ , ___ , KM3 , KN3 , ___ , ___ , ___ , KR3 }, \
-        /* 4 */  { KA4 , KB4 , ___ , KD4 , KE4 , KF4 , KG4 , KH4 , KI4 , KJ4 , KK4 , KL4 , ___ , ___ , KO4 , ___ , KQ4 , KR4 }, \
-        /* 5 */  { KA5 , ___ , KC5 , KD5 , KE5 , KF5 , KG5 , KH5 , KI5 , KJ5 , ___ , ___ , ___ , ___ , ___ , ___ , ___ , KR5 }, \
-        /* 6 */  { ___ , KB6 , KC6 , ___ , KE6 , KF6 , KG6 , KH6 , KI6 , KJ6 , KK6 , ___ , ___ , ___ , KO6 , ___ , ___ , KR6 }, \
-        /* 7 */  { KA7 , KB7 , KC7 , KD7 , KE7 , KF7 , KG7 , KH7 , KI7 , KJ7 , ___ , ___ , ___ , ___ , KO7 , ___ , KQ7 , KR7 }  \
-    }
-
-#define LAYOUT_tkl_ansi( \
-    KJ6,      KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0,   KC7, KC5, KA5, \
-    KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2,   KL4, KO4, KQ4, \
-    KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2, KB3,   KK4, KO7, KQ7, \
-    KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6,      KB1,                  \
-    KN2,      KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0,      KN3,        KO6,      \
-    KA4, KP2, KC6,                KK6,                KC0, KM3, KD0, KA1,   KO0, KK0, KL0  \
-    ) { /*         00-A  01-B  02-C  03-D  04-E  05-F  06-G  07-H  08-I  09-J  10-K  11-L  12-M  13-N  14-O  15-P  16-Q  17-R */ \
-        /* 0 */  { ___ , KB0 , KC0 , KD0 , ___ , KF0 , KG0 , ___ , ___ , ___ , KK0 , KL0 , ___ , ___ , KO0 , ___ , ___ , KR0 }, \
-        /* 1 */  { KA1 , KB1 , ___ , KD1 , KE1 , KF1 , KG1 , KH1 , KI1 , KJ1 , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ }, \
-        /* 2 */  { ___ , KB2 , ___ , KD2 , KE2 , KF2 , KG2 , KH2 , KI2 , KJ2 , ___ , ___ , ___ , KN2 , ___ , KP2 , ___ , KR2 }, \
-        /* 3 */  { ___ , KB3 , ___ , KD3 , KE3 , KF3 , KG3 , KH3 , KI3 , KJ3 , ___ , ___ , KM3 , KN3 , ___ , ___ , ___ , KR3 }, \
-        /* 4 */  { KA4 , KB4 , ___ , KD4 , KE4 , KF4 , KG4 , KH4 , KI4 , KJ4 , KK4 , KL4 , ___ , ___ , KO4 , ___ , KQ4 , KR4 }, \
-        /* 5 */  { KA5 , ___ , KC5 , KD5 , KE5 , KF5 , KG5 , KH5 , KI5 , KJ5 , ___ , ___ , ___ , ___ , ___ , ___ , ___ , KR5 }, \
-        /* 6 */  { ___ , KB6 , KC6 , ___ , KE6 , KF6 , KG6 , KH6 , ___ , KJ6 , KK6 , ___ , ___ , ___ , KO6 , ___ , ___ , KR6 }, \
-        /* 7 */  { KA7 , KB7 , KC7 , KD7 , KE7 , KF7 , KG7 , KH7 , KI7 , KJ7 , ___ , ___ , ___ , ___ , KO7 , ___ , KQ7 , KR7 }  \
-    }
-
-#define LAYOUT_tkl_iso( \
-    KJ6,      KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0,   KC7, KC5, KA5, \
-    KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2,   KL4, KO4, KQ4, \
-    KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2,        KK4, KO7, KQ7, \
-    KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6, KB3, KB1,                  \
-    KN2, KI6, KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0,      KN3,        KO6,      \
-    KA4, KP2, KC6,                KK6,                KC0, KM3, KD0, KA1,   KO0, KK0, KL0  \
-    ) { /*         00-A  01-B  02-C  03-D  04-E  05-F  06-G  07-H  08-I  09-J  10-K  11-L  12-M  13-N  14-O  15-P  16-Q  17-R */ \
-        /* 0 */  { ___ , KB0 , KC0 , KD0 , ___ , KF0 , KG0 , ___ , ___ , ___ , KK0 , KL0 , ___ , ___ , KO0 , ___ , ___ , KR0 }, \
-        /* 1 */  { KA1 , KB1 , ___ , KD1 , KE1 , KF1 , KG1 , KH1 , KI1 , KJ1 , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ }, \
-        /* 2 */  { ___ , KB2 , ___ , KD2 , KE2 , KF2 , KG2 , KH2 , KI2 , KJ2 , ___ , ___ , ___ , KN2 , ___ , KP2 , ___ , KR2 }, \
-        /* 3 */  { ___ , KB3 , ___ , KD3 , KE3 , KF3 , KG3 , KH3 , KI3 , KJ3 , ___ , ___ , KM3 , KN3 , ___ , ___ , ___ , KR3 }, \
-        /* 4 */  { KA4 , KB4 , ___ , KD4 , KE4 , KF4 , KG4 , KH4 , KI4 , KJ4 , KK4 , KL4 , ___ , ___ , KO4 , ___ , KQ4 , KR4 }, \
-        /* 5 */  { KA5 , ___ , KC5 , KD5 , KE5 , KF5 , KG5 , KH5 , KI5 , KJ5 , ___ , ___ , ___ , ___ , ___ , ___ , ___ , KR5 }, \
-        /* 6 */  { ___ , KB6 , KC6 , ___ , KE6 , KF6 , KG6 , KH6 , KI6 , KJ6 , KK6 , ___ , ___ , ___ , KO6 , ___ , ___ , KR6 }, \
-        /* 7 */  { KA7 , KB7 , KC7 , KD7 , KE7 , KF7 , KG7 , KH7 , KI7 , KJ7 , ___ , ___ , ___ , ___ , KO7 , ___ , KQ7 , KR7 }  \
-    }
-
-#define LAYOUT_tkl_jis( \
-    KJ6,      KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0,        KC7, KC5, KA5, \
-    KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB5, KB2,   KL4, KO4, KQ4, \
-    KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2,             KK4, KO7, KQ7, \
-    KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6, KB3, KB1,                       \
-    KN2,      KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0, KE0, KN3,             KO6,      \
-    KA4, KP2, KC6, KJ0,           KK6,           KI0, KH0, KC0, KD0, KA1,        KO0, KK0, KL0  \
-    ) { /*         00-A  01-B  02-C  03-D  04-E  05-F  06-G  07-H  08-I  09-J  10-K  11-L  12-M  13-N  14-O  15-P  16-Q  17-R */ \
-        /* 0 */  { ___ , KB0 , KC0 , KD0 , KE0 , KF0 , KG0 , KH0 , KI0 , KJ0 , KK0 , KL0 , ___ , ___ , KO0 , ___ , ___ , KR0 }, \
-        /* 1 */  { KA1 , KB1 , ___ , KD1 , KE1 , KF1 , KG1 , KH1 , KI1 , KJ1 , ___ , ___ , ___ , ___ , ___ , ___ , ___ ,     }, \
-        /* 2 */  { ___ , KB2 , ___ , KD2 , KE2 , KF2 , KG2 , KH2 , KI2 , KJ2 , ___ , ___ , ___ , KN2 , ___ , KP2 , ___ , KR2 }, \
-        /* 3 */  { ___ , KB3 , ___ , KD3 , KE3 , KF3 , KG3 , KH3 , KI3 , KJ3 , ___ , ___ , ___ , KN3 , ___ , ___ , ___ , KR3 }, \
-        /* 4 */  { KA4 , KB4 , ___ , KD4 , KE4 , KF4 , KG4 , KH4 , KI4 , KJ4 , KK4 , KL4 , ___ , ___ , KO4 , ___ , KQ4 , KR4 }, \
-        /* 5 */  { KA5 , KB5 , KC5 , KD5 , KE5 , KF5 , KG5 , KH5 , KI5 , KJ5 , ___ , ___ , ___ , ___ , ___ , ___ , ___ , KR5 }, \
-        /* 6 */  { ___ , KB6 , KC6 , ___ , KE6 , KF6 , KG6 , KH6 , ___ , KJ6 , KK6 , ___ , ___ , ___ , KO6 , ___ , ___ , KR6 }, \
-        /* 7 */  { KA7 , KB7 , KC7 , KD7 , KE7 , KF7 , KG7 , KH7 , KI7 , KJ7 , ___ , ___ , ___ , ___ , KO7 , ___ , KQ7 , KR7 }  \
-}
diff --git a/keyboards/bpiphany/pegasushoof/2015/info.json b/keyboards/bpiphany/pegasushoof/2015/info.json
index e583db7daf..592128a6b2 100644
--- a/keyboards/bpiphany/pegasushoof/2015/info.json
+++ b/keyboards/bpiphany/pegasushoof/2015/info.json
@@ -10,372 +10,424 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Esc", "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":"`", "x":0, "y":1.5},
-                {"label":"1", "x":1, "y":1.5},
-                {"label":"2", "x":2, "y":1.5},
-                {"label":"3", "x":3, "y":1.5},
-                {"label":"4", "x":4, "y":1.5},
-                {"label":"5", "x":5, "y":1.5},
-                {"label":"6", "x":6, "y":1.5},
-                {"label":"7", "x":7, "y":1.5},
-                {"label":"8", "x":8, "y":1.5},
-                {"label":"9", "x":9, "y":1.5},
-                {"label":"0", "x":10, "y":1.5},
-                {"label":"-", "x":11, "y":1.5},
-                {"label":"=", "x":12, "y":1.5},
-                {"label":"Backspace", "x":13, "y":1.5, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"Page Up", "x":17.25, "y":1.5},
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"[", "x":11.5, "y":2.5},
-                {"label":"]", "x":12.5, "y":2.5},
-                {"label":"\\", "x":13.5, "y":2.5, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"Page Down", "x":17.25, "y":2.5},
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":";", "x":10.75, "y":3.5},
-                {"label":"'", "x":11.75, "y":3.5},
-                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
-                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
-                {"label":"ISO \\", "x":1.25, "y":4.5},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":",", "x":9.25, "y":4.5},
-                {"label":".", "x":10.25, "y":4.5},
-                {"label":"/", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"Up", "x":16.25, "y":4.5},
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"label":"AltGr", "x":10, "y":5.5, "w":1.25},
-                {"label":"GUI", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"Left", "x":15.25, "y":5.5},
-                {"label":"Down", "x":16.25, "y":5.5},
-                {"label":"Right", "x":17.25, "y":5.5}
+                {"matrix": [6, 9], "x": 0, "y": 0},
+
+                {"matrix": [4, 8], "x": 2, "y": 0},
+                {"matrix": [4, 7], "x": 3, "y": 0},
+                {"matrix": [2, 7], "x": 4, "y": 0},
+                {"matrix": [6, 7], "x": 5, "y": 0},
+
+                {"matrix": [7, 0], "x": 6.5, "y": 0},
+                {"matrix": [6, 4], "x": 7.5, "y": 0},
+                {"matrix": [2, 3], "x": 8.5, "y": 0},
+                {"matrix": [4, 3], "x": 9.5, "y": 0},
+
+                {"matrix": [4, 1], "x": 11, "y": 0},
+                {"matrix": [7, 1], "x": 12, "y": 0},
+                {"matrix": [6, 1], "x": 13, "y": 0},
+                {"matrix": [0, 1], "x": 14, "y": 0},
+
+                {"matrix": [7, 2], "x": 15.25, "y": 0},
+                {"matrix": [5, 2], "x": 16.25, "y": 0},
+                {"matrix": [5, 0], "x": 17.25, "y": 0},
+
+                {"matrix": [4, 9], "x": 0, "y": 1.5},
+                {"matrix": [7, 9], "x": 1, "y": 1.5},
+                {"matrix": [7, 8], "x": 2, "y": 1.5},
+                {"matrix": [7, 7], "x": 3, "y": 1.5},
+                {"matrix": [7, 6], "x": 4, "y": 1.5},
+                {"matrix": [4, 6], "x": 5, "y": 1.5},
+                {"matrix": [4, 5], "x": 6, "y": 1.5},
+                {"matrix": [7, 5], "x": 7, "y": 1.5},
+                {"matrix": [7, 4], "x": 8, "y": 1.5},
+                {"matrix": [7, 3], "x": 9, "y": 1.5},
+                {"matrix": [7, 17], "x": 10, "y": 1.5},
+                {"matrix": [4, 17], "x": 11, "y": 1.5},
+                {"matrix": [4, 4], "x": 12, "y": 1.5},
+                {"matrix": [2, 1], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [4, 11], "x": 15.25, "y": 1.5},
+                {"matrix": [4, 14], "x": 16.25, "y": 1.5},
+                {"matrix": [4, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 9], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [5, 9], "x": 1.5, "y": 2.5},
+                {"matrix": [5, 8], "x": 2.5, "y": 2.5},
+                {"matrix": [5, 7], "x": 3.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 5], "x": 7.5, "y": 2.5},
+                {"matrix": [5, 4], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 3], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 17], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 17], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 12.5, "y": 2.5},
+                {"matrix": [3, 1], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [4, 10], "x": 15.25, "y": 2.5},
+                {"matrix": [7, 14], "x": 16.25, "y": 2.5},
+                {"matrix": [7, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [2, 8], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 9], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 4.75, "y": 3.5},
+                {"matrix": [6, 6], "x": 5.75, "y": 3.5},
+                {"matrix": [6, 5], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 17], "x": 10.75, "y": 3.5},
+                {"matrix": [6, 17], "x": 11.75, "y": 3.5},
+                {"matrix": [1, 1], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [2, 13], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [6, 8], "x": 1.25, "y": 4.5},
+                {"matrix": [1, 9], "x": 2.25, "y": 4.5},
+                {"matrix": [1, 8], "x": 3.25, "y": 4.5},
+                {"matrix": [1, 7], "x": 4.25, "y": 4.5},
+                {"matrix": [1, 6], "x": 5.25, "y": 4.5},
+                {"matrix": [0, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [0, 5], "x": 7.25, "y": 4.5},
+                {"matrix": [1, 5], "x": 8.25, "y": 4.5},
+                {"matrix": [1, 4], "x": 9.25, "y": 4.5},
+                {"matrix": [1, 3], "x": 10.25, "y": 4.5},
+                {"matrix": [0, 17], "x": 11.25, "y": 4.5},
+                {"matrix": [3, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [6, 14], "x": 16.25, "y": 4.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 15], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 10], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [0, 2], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [3, 12], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [1, 0], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [0, 10], "x": 16.25, "y": 5.5},
+                {"matrix": [0, 11], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"label":"Esc", "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":"`", "x":0, "y":1.5},
-                {"label":"1", "x":1, "y":1.5},
-                {"label":"2", "x":2, "y":1.5},
-                {"label":"3", "x":3, "y":1.5},
-                {"label":"4", "x":4, "y":1.5},
-                {"label":"5", "x":5, "y":1.5},
-                {"label":"6", "x":6, "y":1.5},
-                {"label":"7", "x":7, "y":1.5},
-                {"label":"8", "x":8, "y":1.5},
-                {"label":"9", "x":9, "y":1.5},
-                {"label":"0", "x":10, "y":1.5},
-                {"label":"-", "x":11, "y":1.5},
-                {"label":"=", "x":12, "y":1.5},
-                {"label":"Backspace", "x":13, "y":1.5, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"Page Up", "x":17.25, "y":1.5},
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"[", "x":11.5, "y":2.5},
-                {"label":"]", "x":12.5, "y":2.5},
-                {"label":"\\", "x":13.5, "y":2.5, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"Page Down", "x":17.25, "y":2.5},
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":";", "x":10.75, "y":3.5},
-                {"label":"'", "x":11.75, "y":3.5},
-                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
-                {"label":"Shift", "x":0, "y":4.5, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":",", "x":9.25, "y":4.5},
-                {"label":".", "x":10.25, "y":4.5},
-                {"label":"/", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"Up", "x":16.25, "y":4.5},
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"label":"AltGr", "x":10, "y":5.5, "w":1.25},
-                {"label":"GUI", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"Left", "x":15.25, "y":5.5},
-                {"label":"Down", "x":16.25, "y":5.5},
-                {"label":"Right", "x":17.25, "y":5.5}
+                {"matrix": [6, 9], "x": 0, "y": 0},
+
+                {"matrix": [4, 8], "x": 2, "y": 0},
+                {"matrix": [4, 7], "x": 3, "y": 0},
+                {"matrix": [2, 7], "x": 4, "y": 0},
+                {"matrix": [6, 7], "x": 5, "y": 0},
+
+                {"matrix": [7, 0], "x": 6.5, "y": 0},
+                {"matrix": [6, 4], "x": 7.5, "y": 0},
+                {"matrix": [2, 3], "x": 8.5, "y": 0},
+                {"matrix": [4, 3], "x": 9.5, "y": 0},
+
+                {"matrix": [4, 1], "x": 11, "y": 0},
+                {"matrix": [7, 1], "x": 12, "y": 0},
+                {"matrix": [6, 1], "x": 13, "y": 0},
+                {"matrix": [0, 1], "x": 14, "y": 0},
+
+                {"matrix": [7, 2], "x": 15.25, "y": 0},
+                {"matrix": [5, 2], "x": 16.25, "y": 0},
+                {"matrix": [5, 0], "x": 17.25, "y": 0},
+
+                {"matrix": [4, 9], "x": 0, "y": 1.5},
+                {"matrix": [7, 9], "x": 1, "y": 1.5},
+                {"matrix": [7, 8], "x": 2, "y": 1.5},
+                {"matrix": [7, 7], "x": 3, "y": 1.5},
+                {"matrix": [7, 6], "x": 4, "y": 1.5},
+                {"matrix": [4, 6], "x": 5, "y": 1.5},
+                {"matrix": [4, 5], "x": 6, "y": 1.5},
+                {"matrix": [7, 5], "x": 7, "y": 1.5},
+                {"matrix": [7, 4], "x": 8, "y": 1.5},
+                {"matrix": [7, 3], "x": 9, "y": 1.5},
+                {"matrix": [7, 17], "x": 10, "y": 1.5},
+                {"matrix": [4, 17], "x": 11, "y": 1.5},
+                {"matrix": [4, 4], "x": 12, "y": 1.5},
+                {"matrix": [2, 1], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [4, 11], "x": 15.25, "y": 1.5},
+                {"matrix": [4, 14], "x": 16.25, "y": 1.5},
+                {"matrix": [4, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 9], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [5, 9], "x": 1.5, "y": 2.5},
+                {"matrix": [5, 8], "x": 2.5, "y": 2.5},
+                {"matrix": [5, 7], "x": 3.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 5], "x": 7.5, "y": 2.5},
+                {"matrix": [5, 4], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 3], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 17], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 17], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 12.5, "y": 2.5},
+                {"matrix": [3, 1], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [4, 10], "x": 15.25, "y": 2.5},
+                {"matrix": [7, 14], "x": 16.25, "y": 2.5},
+                {"matrix": [7, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [2, 8], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 9], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 4.75, "y": 3.5},
+                {"matrix": [6, 6], "x": 5.75, "y": 3.5},
+                {"matrix": [6, 5], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 17], "x": 10.75, "y": 3.5},
+                {"matrix": [6, 17], "x": 11.75, "y": 3.5},
+                {"matrix": [1, 1], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [2, 13], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [1, 9], "x": 2.25, "y": 4.5},
+                {"matrix": [1, 8], "x": 3.25, "y": 4.5},
+                {"matrix": [1, 7], "x": 4.25, "y": 4.5},
+                {"matrix": [1, 6], "x": 5.25, "y": 4.5},
+                {"matrix": [0, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [0, 5], "x": 7.25, "y": 4.5},
+                {"matrix": [1, 5], "x": 8.25, "y": 4.5},
+                {"matrix": [1, 4], "x": 9.25, "y": 4.5},
+                {"matrix": [1, 3], "x": 10.25, "y": 4.5},
+                {"matrix": [0, 17], "x": 11.25, "y": 4.5},
+                {"matrix": [3, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [6, 14], "x": 16.25, "y": 4.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 15], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 10], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [0, 2], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [3, 12], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [1, 0], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [0, 10], "x": 16.25, "y": 5.5},
+                {"matrix": [0, 11], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_iso": {
             "layout": [
-                {"label":"Esc", "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":"`", "x":0, "y":1.5},
-                {"label":"1", "x":1, "y":1.5},
-                {"label":"2", "x":2, "y":1.5},
-                {"label":"3", "x":3, "y":1.5},
-                {"label":"4", "x":4, "y":1.5},
-                {"label":"5", "x":5, "y":1.5},
-                {"label":"6", "x":6, "y":1.5},
-                {"label":"7", "x":7, "y":1.5},
-                {"label":"8", "x":8, "y":1.5},
-                {"label":"9", "x":9, "y":1.5},
-                {"label":"0", "x":10, "y":1.5},
-                {"label":"-", "x":11, "y":1.5},
-                {"label":"=", "x":12, "y":1.5},
-                {"label":"Backspace", "x":13, "y":1.5, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"Page Up", "x":17.25, "y":1.5},
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"[", "x":11.5, "y":2.5},
-                {"label":"]", "x":12.5, "y":2.5},
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"Page Down", "x":17.25, "y":2.5},
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":";", "x":10.75, "y":3.5},
-                {"label":"'", "x":11.75, "y":3.5},
-                {"label":"#", "x":12.75, "y":3.5},
-                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
-                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
-                {"label":"\\", "x":1.25, "y":4.5},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":",", "x":9.25, "y":4.5},
-                {"label":".", "x":10.25, "y":4.5},
-                {"label":"/", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"↑", "x":16.25, "y":4.5},
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"label":"AltGr", "x":10, "y":5.5, "w":1.25},
-                {"label":"GUI", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"App", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"←", "x":15.25, "y":5.5},
-                {"label":"↓", "x":16.25, "y":5.5},
-                {"label":"→", "x":17.25, "y":5.5}
+                {"matrix": [6, 9], "x": 0, "y": 0},
+
+                {"matrix": [4, 8], "x": 2, "y": 0},
+                {"matrix": [4, 7], "x": 3, "y": 0},
+                {"matrix": [2, 7], "x": 4, "y": 0},
+                {"matrix": [6, 7], "x": 5, "y": 0},
+
+                {"matrix": [7, 0], "x": 6.5, "y": 0},
+                {"matrix": [6, 4], "x": 7.5, "y": 0},
+                {"matrix": [2, 3], "x": 8.5, "y": 0},
+                {"matrix": [4, 3], "x": 9.5, "y": 0},
+
+                {"matrix": [4, 1], "x": 11, "y": 0},
+                {"matrix": [7, 1], "x": 12, "y": 0},
+                {"matrix": [6, 1], "x": 13, "y": 0},
+                {"matrix": [0, 1], "x": 14, "y": 0},
+
+                {"matrix": [7, 2], "x": 15.25, "y": 0},
+                {"matrix": [5, 2], "x": 16.25, "y": 0},
+                {"matrix": [5, 0], "x": 17.25, "y": 0},
+
+                {"matrix": [4, 9], "x": 0, "y": 1.5},
+                {"matrix": [7, 9], "x": 1, "y": 1.5},
+                {"matrix": [7, 8], "x": 2, "y": 1.5},
+                {"matrix": [7, 7], "x": 3, "y": 1.5},
+                {"matrix": [7, 6], "x": 4, "y": 1.5},
+                {"matrix": [4, 6], "x": 5, "y": 1.5},
+                {"matrix": [4, 5], "x": 6, "y": 1.5},
+                {"matrix": [7, 5], "x": 7, "y": 1.5},
+                {"matrix": [7, 4], "x": 8, "y": 1.5},
+                {"matrix": [7, 3], "x": 9, "y": 1.5},
+                {"matrix": [7, 17], "x": 10, "y": 1.5},
+                {"matrix": [4, 17], "x": 11, "y": 1.5},
+                {"matrix": [4, 4], "x": 12, "y": 1.5},
+                {"matrix": [2, 1], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [4, 11], "x": 15.25, "y": 1.5},
+                {"matrix": [4, 14], "x": 16.25, "y": 1.5},
+                {"matrix": [4, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 9], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [5, 9], "x": 1.5, "y": 2.5},
+                {"matrix": [5, 8], "x": 2.5, "y": 2.5},
+                {"matrix": [5, 7], "x": 3.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 5], "x": 7.5, "y": 2.5},
+                {"matrix": [5, 4], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 3], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 17], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 17], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 12.5, "y": 2.5},
+
+                {"matrix": [4, 10], "x": 15.25, "y": 2.5},
+                {"matrix": [7, 14], "x": 16.25, "y": 2.5},
+                {"matrix": [7, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [2, 8], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 9], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 4.75, "y": 3.5},
+                {"matrix": [6, 6], "x": 5.75, "y": 3.5},
+                {"matrix": [6, 5], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 17], "x": 10.75, "y": 3.5},
+                {"matrix": [6, 17], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 1], "x": 12.75, "y": 3.5},
+                {"matrix": [1, 1], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 13], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [6, 8], "x": 1.25, "y": 4.5},
+                {"matrix": [1, 9], "x": 2.25, "y": 4.5},
+                {"matrix": [1, 8], "x": 3.25, "y": 4.5},
+                {"matrix": [1, 7], "x": 4.25, "y": 4.5},
+                {"matrix": [1, 6], "x": 5.25, "y": 4.5},
+                {"matrix": [0, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [0, 5], "x": 7.25, "y": 4.5},
+                {"matrix": [1, 5], "x": 8.25, "y": 4.5},
+                {"matrix": [1, 4], "x": 9.25, "y": 4.5},
+                {"matrix": [1, 3], "x": 10.25, "y": 4.5},
+                {"matrix": [0, 17], "x": 11.25, "y": 4.5},
+                {"matrix": [3, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [6, 14], "x": 16.25, "y": 4.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 15], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 10], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [0, 2], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [3, 12], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [1, 0], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [0, 10], "x": 16.25, "y": 5.5},
+                {"matrix": [0, 11], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_jis": {
             "layout": [
-                {"label":"Esc", "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":"Half-width/Full-width", "x":0, "y":1.5},
-                {"label":"1", "x":1, "y":1.5},
-                {"label":"2", "x":2, "y":1.5},
-                {"label":"3", "x":3, "y":1.5},
-                {"label":"4", "x":4, "y":1.5},
-                {"label":"5", "x":5, "y":1.5},
-                {"label":"6", "x":6, "y":1.5},
-                {"label":"7", "x":7, "y":1.5},
-                {"label":"8", "x":8, "y":1.5},
-                {"label":"9", "x":9, "y":1.5},
-                {"label":"0", "x":10, "y":1.5},
-                {"label":"-", "x":11, "y":1.5},
-                {"label":"^", "x":12, "y":1.5},
-                {"label":"Yen", "x":13, "y":1.5},
-                {"label":"Backspace", "x":14, "y":1.5},
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"Page Up", "x":17.25, "y":1.5},
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"@", "x":11.5, "y":2.5},
-                {"label":"[", "x":12.5, "y":2.5},
-                {"label":"Del", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"Page Down", "x":17.25, "y":2.5},
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":";", "x":10.75, "y":3.5},
-                {"label":":", "x":11.75, "y":3.5},
-                {"label":"]", "x":12.75, "y":3.5},
-                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
-                {"label":"Shift", "x":0, "y":4.5, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":",", "x":9.25, "y":4.5},
-                {"label":".", "x":10.25, "y":4.5},
-                {"label":"/", "x":11.25, "y":4.5},
-                {"label":"\\", "x":12.25, "y":4.5},
-                {"label":"Shift", "x":13.25, "y":4.5, "w":1.75},
-                {"label":"Up", "x":16.25, "y":4.5},
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":5.5},
-                {"label":"Alt", "x":2.25, "y":5.5, "w":1.25},
-                {"label":"Muhenkan", "x":3.5, "y":5.5},
-                {"label":"Space", "x":4.5, "y":5.5, "w":4.5},
-                {"label":"Henkan", "x":9, "y":5.5, "w":1.25},
-                {"label":"Kana", "x":10.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":11.5, "y":5.5, "w":1.25},
-                {"label":"Fn", "x":12.75, "y":5.5},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"Left", "x":15.25, "y":5.5},
-                {"label":"Down", "x":16.25, "y":5.5},
-                {"label":"Right", "x":17.25, "y":5.5}
+                {"matrix": [6, 9], "x": 0, "y": 0},
+
+                {"matrix": [4, 8], "x": 2, "y": 0},
+                {"matrix": [4, 7], "x": 3, "y": 0},
+                {"matrix": [2, 7], "x": 4, "y": 0},
+                {"matrix": [6, 7], "x": 5, "y": 0},
+
+                {"matrix": [7, 0], "x": 6.5, "y": 0},
+                {"matrix": [6, 4], "x": 7.5, "y": 0},
+                {"matrix": [2, 3], "x": 8.5, "y": 0},
+                {"matrix": [4, 3], "x": 9.5, "y": 0},
+
+                {"matrix": [4, 1], "x": 11, "y": 0},
+                {"matrix": [7, 1], "x": 12, "y": 0},
+                {"matrix": [6, 1], "x": 13, "y": 0},
+                {"matrix": [0, 1], "x": 14, "y": 0},
+
+                {"matrix": [7, 2], "x": 15.25, "y": 0},
+                {"matrix": [5, 2], "x": 16.25, "y": 0},
+                {"matrix": [5, 0], "x": 17.25, "y": 0},
+
+                {"matrix": [4, 9], "x": 0, "y": 1.5},
+                {"matrix": [7, 9], "x": 1, "y": 1.5},
+                {"matrix": [7, 8], "x": 2, "y": 1.5},
+                {"matrix": [7, 7], "x": 3, "y": 1.5},
+                {"matrix": [7, 6], "x": 4, "y": 1.5},
+                {"matrix": [4, 6], "x": 5, "y": 1.5},
+                {"matrix": [4, 5], "x": 6, "y": 1.5},
+                {"matrix": [7, 5], "x": 7, "y": 1.5},
+                {"matrix": [7, 4], "x": 8, "y": 1.5},
+                {"matrix": [7, 3], "x": 9, "y": 1.5},
+                {"matrix": [7, 17], "x": 10, "y": 1.5},
+                {"matrix": [4, 17], "x": 11, "y": 1.5},
+                {"matrix": [4, 4], "x": 12, "y": 1.5},
+                {"matrix": [5, 1], "x": 13, "y": 1.5},
+                {"matrix": [2, 1], "x": 14, "y": 1.5},
+
+                {"matrix": [4, 11], "x": 15.25, "y": 1.5},
+                {"matrix": [4, 14], "x": 16.25, "y": 1.5},
+                {"matrix": [4, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 9], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [5, 9], "x": 1.5, "y": 2.5},
+                {"matrix": [5, 8], "x": 2.5, "y": 2.5},
+                {"matrix": [5, 7], "x": 3.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 5], "x": 7.5, "y": 2.5},
+                {"matrix": [5, 4], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 3], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 17], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 17], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 12.5, "y": 2.5},
+
+                {"matrix": [4, 10], "x": 15.25, "y": 2.5},
+                {"matrix": [7, 14], "x": 16.25, "y": 2.5},
+                {"matrix": [7, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [2, 8], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 9], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 4.75, "y": 3.5},
+                {"matrix": [6, 6], "x": 5.75, "y": 3.5},
+                {"matrix": [6, 5], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 17], "x": 10.75, "y": 3.5},
+                {"matrix": [6, 17], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 1], "x": 12.75, "y": 3.5},
+                {"matrix": [1, 1], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 13], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [1, 9], "x": 2.25, "y": 4.5},
+                {"matrix": [1, 8], "x": 3.25, "y": 4.5},
+                {"matrix": [1, 7], "x": 4.25, "y": 4.5},
+                {"matrix": [1, 6], "x": 5.25, "y": 4.5},
+                {"matrix": [0, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [0, 5], "x": 7.25, "y": 4.5},
+                {"matrix": [1, 5], "x": 8.25, "y": 4.5},
+                {"matrix": [1, 4], "x": 9.25, "y": 4.5},
+                {"matrix": [1, 3], "x": 10.25, "y": 4.5},
+                {"matrix": [0, 17], "x": 11.25, "y": 4.5},
+                {"matrix": [0, 4], "x": 12.25, "y": 4.5},
+                {"matrix": [3, 13], "x": 13.25, "y": 4.5, "w": 1.75},
+
+                {"matrix": [6, 14], "x": 16.25, "y": 4.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 15], "x": 1.25, "y": 5.5},
+                {"matrix": [6, 2], "x": 2.25, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 9], "x": 3.5, "y": 5.5},
+                {"matrix": [6, 10], "x": 4.5, "y": 5.5, "w": 4.5},
+                {"matrix": [0, 8], "x": 9, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 7], "x": 10.25, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 2], "x": 11.5, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 3], "x": 12.75, "y": 5.5},
+                {"matrix": [1, 0], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [0, 10], "x": 16.25, "y": 5.5},
+                {"matrix": [0, 11], "x": 17.25, "y": 5.5}
             ]
         }
     }