Merge branch 'develop'

13 files changed, 1281 insertions, 136 deletions

diff --git a/keyboards/acheron/austin/austin.c b/keyboards/acheron/austin/austin.c
index 347e7c0f1a..5c0a4f642d 100644
--- a/keyboards/acheron/austin/austin.c
+++ b/keyboards/acheron/austin/austin.c
@@ -1,4 +1,4 @@
-#include "austin.h"
+#include "quantum.h"
 
 void keyboard_pre_init_kb(void) {
     setPinOutput(A0);
diff --git a/keyboards/acheron/austin/austin.h b/keyboards/acheron/austin/austin.h
deleted file mode 100644
index 6c066eb046..0000000000
--- a/keyboards/acheron/austin/austin.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,       K0E,  K0F, K0G, K0H, K0I, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,  K1F,  K1G, K1H, K1I, K5I, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,       K2E,  K2F, K2G, K2H, K3I, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,            K3E,  K3F, K3G, K3H,      \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,   K4D,           K4F, K4G, K4H, K4I, \
-    K50, K51, K52,                K55,                K59, K5A,   K5B, K5C, K5E,      K5F, K5G, K5H       \
-) { \
-    {  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I  }, \
-    {  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I  }, \
-    {  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, ___  }, \
-    {  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___, K3E, K3F, K3G, K3H, K3I  }, \
-    {  K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, ___, K4F, K4G, K4H, K4I  }, \
-    {  K50, K51, K52, ___, ___, K55, ___, ___, ___, K59, K5A, K5B, K5C, ___, K5E, K5F, K5G, K5H, K5I  } \
-}
diff --git a/keyboards/acheron/austin/config.h b/keyboards/acheron/austin/config.h
index ce12edfd33..a47b76953a 100644
--- a/keyboards/acheron/austin/config.h
+++ b/keyboards/acheron/austin/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B10, B11, B12, B13, B14, B15, A8, A9, A10, A5, A15, B3, B4, B5, B8, A3, C15, C14, F1 }
-#define MATRIX_ROW_PINS { C13, A4, A7, B0, B1, B2 }
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER    PWMD3
 #define BACKLIGHT_PWM_CHANNEL   1
 #define BACKLIGHT_PAL_MODE      1
diff --git a/keyboards/acheron/austin/info.json b/keyboards/acheron/austin/info.json
index dad488df8f..d36258fb92 100755
--- a/keyboards/acheron/austin/info.json
+++ b/keyboards/acheron/austin/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4175",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10", "A5", "A15", "B3", "B4", "B5", "B8", "A3", "C15", "C14", "F1"],
+        "rows": ["C13", "A4", "A7", "B0", "B1", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "A6",
         "levels": 6,
@@ -18,116 +23,1032 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"Print Screen", "x":14, "y":0},
-                {"label":"Scroll Lock", "x":15.25, "y":0},
-                {"label":"Pause", "x":16.5, "y":0},
-                {"label":"Home", "x":17.5, "y":0},
-                {"label":"End", "x":18.5, "y":0},
-                {"label":"Delete", "x":19.5, "y":0},
-
-                {"label":"`", "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":"Backspace", "x":13, "y":1.25},
-                {"label":"Backspace", "x":14, "y":1.25},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Num Lock", "x":16.5, "y":1.25},
-                {"label":"/", "x":17.5, "y":1.25},
-                {"label":"*", "x":18.5, "y":1.25},
-                {"label":"-", "x":19.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":"\\", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Page Up", "x":15.25, "y":2.25},
-                {"label":"7", "x":16.5, "y":2.25},
-                {"label":"8", "x":17.5, "y":2.25},
-                {"label":"9", "x":18.5, "y":2.25},
-                {"label":"+", "x":19.5, "y":2.25, "h":2},
-
-                {"label":"Caps Lock", "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":"Enter", "x":12.75, "y":3.25, "w":2.25},
-                {"label":"Page Down", "x":15.25, "y":3.25},
-                {"label":"4", "x":16.5, "y":3.25},
-                {"label":"5", "x":17.5, "y":3.25},
-                {"label":"6", "x":18.5, "y":3.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"label":"ISO \\", "x":1.25, "y":4.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":1.75},
-                {"label":"Up", "x":14.25, "y":4.5},
-                {"label":"1", "x":16.5, "y":4.25},
-                {"label":"2", "x":17.5, "y":4.25},
-                {"label":"3", "x":18.5, "y":4.25},
-                {"label":"Enter", "x":19.5, "y":4.25, "h":2},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.5},
-                {"label":"Ctrl", "x":11.5, "y":5.25, "w":1.5},
-                {"label":"Left", "x":13.25, "y":5.5},
-                {"label":"Down", "x":14.25, "y":5.5},
-                {"label":"Right", "x":15.25, "y":5.5},
-                {"label":"0", "x":16.5, "y":5.25},
-                {"label":"0", "x":17.5, "y":5.25},
-                {"label":".", "x":18.5, "y":5.25}
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Scroll Lock", "matrix": [0, 14], "x": 15.25, "y": 0},
+
+                {"label": "Pause", "matrix": [0, 15], "x": 16.5, "y": 0},
+                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "End", "matrix": [0, 17], "x": 18.5, "y": 0},
+                {"label": "Delete", "matrix": [0, 18], "x": 19.5, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25},
+
+                {"label": "Num Lock", "matrix": [1, 16], "x": 16.5, "y": 1.25},
+                {"label": "/", "matrix": [1, 17], "x": 17.5, "y": 1.25},
+                {"label": "*", "matrix": [1, 18], "x": 18.5, "y": 1.25},
+                {"label": "-", "matrix": [5, 18], "x": 19.5, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Page Up", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+
+                {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25},
+                {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25},
+                {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25},
+                {"label": "+", "matrix": [3, 18], "x": 19.5, "y": 2.25, "h": 2},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Page Down", "matrix": [3, 14], "x": 15.25, "y": 3.25},
+
+                {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25},
+                {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25},
+                {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"label": "\u2191", "matrix": [4, 13], "x": 14.25, "y": 4.5},
+
+                {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25},
+                {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25},
+                {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25},
+                {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25, "h": 2},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 11], "x": 13.25, "y": 5.5},
+                {"label": "\u2193", "matrix": [5, 12], "x": 14.25, "y": 5.5},
+                {"label": "\u2192", "matrix": [5, 14], "x": 15.25, "y": 5.5},
+
+                {"label": "0", "matrix": [5, 15], "x": 16.5, "y": 5.25},
+                {"label": "0", "matrix": [5, 16], "x": 17.5, "y": 5.25},
+                {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25}
+            ]
+        },
+        "LAYOUT_ansi": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+                {"label": "Print Screen", "matrix": [0, 13], "x": 14, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 15], "x": 16.5, "y": 0},
+                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "End", "matrix": [0, 17], "x": 18.5, "y": 0},
+                {"label": "Delete", "matrix": [0, 18], "x": 19.5, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 1.25, "w": 2},
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"label": "Num Lock", "matrix": [1, 16], "x": 16.5, "y": 1.25},
+                {"label": "/", "matrix": [1, 17], "x": 17.5, "y": 1.25},
+                {"label": "*", "matrix": [1, 18], "x": 18.5, "y": 1.25},
+                {"label": "-", "matrix": [5, 18], "x": 19.5, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"label": "Page Up", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25},
+                {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25},
+                {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25},
+                {"label": "+", "matrix": [3, 18], "x": 19.5, "y": 2.25, "h": 2},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"label": "Page Down", "matrix": [3, 14], "x": 15.25, "y": 3.25},
+                {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25},
+                {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25},
+                {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Up", "matrix": [4, 13], "x": 14.25, "y": 4.5},
+                {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25},
+                {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25},
+                {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25},
+                {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25, "h": 2},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.5},
+                {"label": "Left", "matrix": [5, 11], "x": 13.25, "y": 5.5},
+                {"label": "Down", "matrix": [5, 12], "x": 14.25, "y": 5.5},
+                {"label": "Right", "matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"label": "0", "matrix": [5, 15], "x": 16.5, "y": 5.25},
+                {"label": "0", "matrix": [5, 16], "x": 17.5, "y": 5.25},
+                {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25}
+            ]
+        },
+        "LAYOUT_ansi_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+                {"label": "Print Screen", "matrix": [0, 13], "x": 14, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 15], "x": 16.5, "y": 0},
+                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "End", "matrix": [0, 17], "x": 18.5, "y": 0},
+                {"label": "Delete", "matrix": [0, 18], "x": 19.5, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 1.25},
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"label": "Num Lock", "matrix": [1, 16], "x": 16.5, "y": 1.25},
+                {"label": "/", "matrix": [1, 17], "x": 17.5, "y": 1.25},
+                {"label": "*", "matrix": [1, 18], "x": 18.5, "y": 1.25},
+                {"label": "-", "matrix": [5, 18], "x": 19.5, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"label": "Page Up", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25},
+                {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25},
+                {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25},
+                {"label": "+", "matrix": [3, 18], "x": 19.5, "y": 2.25, "h": 2},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"label": "Page Down", "matrix": [3, 14], "x": 15.25, "y": 3.25},
+                {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25},
+                {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25},
+                {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Up", "matrix": [4, 13], "x": 14.25, "y": 4.5},
+                {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25},
+                {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25},
+                {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25},
+                {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25, "h": 2},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.5},
+                {"label": "Left", "matrix": [5, 11], "x": 13.25, "y": 5.5},
+                {"label": "Down", "matrix": [5, 12], "x": 14.25, "y": 5.5},
+                {"label": "Right", "matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"label": "0", "matrix": [5, 15], "x": 16.5, "y": 5.25},
+                {"label": "0", "matrix": [5, 16], "x": 17.5, "y": 5.25},
+                {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25}
+            ]
+        },
+        "LAYOUT_ansi_wkl": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+                {"label": "Print Screen", "matrix": [0, 13], "x": 14, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 15], "x": 16.5, "y": 0},
+                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "End", "matrix": [0, 17], "x": 18.5, "y": 0},
+                {"label": "Delete", "matrix": [0, 18], "x": 19.5, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 1.25, "w": 2},
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"label": "Num Lock", "matrix": [1, 16], "x": 16.5, "y": 1.25},
+                {"label": "/", "matrix": [1, 17], "x": 17.5, "y": 1.25},
+                {"label": "*", "matrix": [1, 18], "x": 18.5, "y": 1.25},
+                {"label": "-", "matrix": [5, 18], "x": 19.5, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"label": "Page Up", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25},
+                {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25},
+                {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25},
+                {"label": "+", "matrix": [3, 18], "x": 19.5, "y": 2.25, "h": 2},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"label": "Page Down", "matrix": [3, 14], "x": 15.25, "y": 3.25},
+                {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25},
+                {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25},
+                {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "