Merge branch 'develop'

27 files changed, 1847 insertions, 470 deletions

diff --git a/keyboards/akb/eb46/config.h b/keyboards/akb/eb46/config.h
deleted file mode 100644
index 3fa5884805..0000000000
--- a/keyboards/akb/eb46/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-Copyright 2019 Elliot Powell
-
-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
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS \
-  { B5, B4, D7, B6 }
-#define MATRIX_COL_PINS \
-  { B0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D4, D6, C6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/akb/eb46/eb46.c b/keyboards/akb/eb46/eb46.c
deleted file mode 100644
index a2113d0fe9..0000000000
--- a/keyboards/akb/eb46/eb46.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Elliot Powell
- *
- * 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/>.
- */
-#include "eb46.h"
diff --git a/keyboards/akb/eb46/eb46.h b/keyboards/akb/eb46/eb46.h
deleted file mode 100644
index 8dd5290b8d..0000000000
--- a/keyboards/akb/eb46/eb46.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2019 Elliot Powell
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define xxx KC_NO
-
-#define LAYOUT(\
-  k000, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b,\
-	k100, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a,     \
-	k200, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a,     \
-	k300, k30, k31, k32, k33,           k36,      k38, k39, k3a     \
-) \
-{ \
-  {k000, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b},\
-	{k100, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, xxx},\
-	{k200, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, xxx},\
-	{k300, k30, k31, k32, k33, xxx, xxx, k36, xxx, k38, k39, k3a, xxx} \
-}
diff --git a/keyboards/akb/eb46/info.json b/keyboards/akb/eb46/info.json
index ad1f03501a..fafd42cd90 100644
--- a/keyboards/akb/eb46/info.json
+++ b/keyboards/akb/eb46/info.json
@@ -7,57 +7,69 @@
         "pid": "0xFEED",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "C6"],
+        "rows": ["B5", "B4", "D7", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "label": "F1", "x": 0, "y": 0 },
-                { "label": "Esc", "x": 1.25, "y": 0 },
-                { "label": "Q", "x": 2.25, "y": 0 },
-                { "label": "W", "x": 3.25, "y": 0 },
-                { "label": "E", "x": 4.25, "y": 0 },
-                { "label": "R", "x": 5.25, "y": 0 },
-                { "label": "T", "x": 6.25, "y": 0 },
-                { "label": "Y", "x": 7.25, "y": 0 },
-                { "label": "U", "x": 8.25, "y": 0 },
-                { "label": "I", "x": 9.25, "y": 0 },
-                { "label": "O", "x": 10.25, "y": 0 },
-                { "label": "P", "x": 11.25, "y": 0 },
-                { "label": "BackSpace", "x": 12.25, "y": 0 },
-                { "label": "F2", "x": 0, "y": 1 },
-                { "label": "Tab", "x": 1.25, "y": 1, "w": 1.25 },
-                { "label": "A", "x": 2.5, "y": 1 },
-                { "label": "S", "x": 3.5, "y": 1 },
-                { "label": "D", "x": 4.5, "y": 1 },
-                { "label": "F", "x": 5.5, "y": 1 },
-                { "label": "G", "x": 6.5, "y": 1 },
-                { "label": "H", "x": 7.5, "y": 1 },
-                { "label": "J", "x": 8.5, "y": 1 },
-                { "label": "K", "x": 9.5, "y": 1 },
-                { "label": "L", "x": 10.5, "y": 1 },
-                { "label": "Enter", "x": 11.5, "y": 1, "w": 1.75 },
-                { "label": "F3", "x": 0, "y": 2 },
-                { "label": "Shift", "x": 1.25, "y": 2, "w": 1.75 },
-                { "label": "Z", "x": 3, "y": 2 },
-                { "label": "X", "x": 4, "y": 2 },
-                { "label": "C", "x": 5, "y": 2 },
-                { "label": "V", "x": 6, "y": 2 },
-                { "label": "B", "x": 7, "y": 2 },
-                { "label": "N", "x": 8, "y": 2 },
-                { "label": "M", "x": 9, "y": 2 },
-                { "label": "<", "x": 10, "y": 2 },
-                { "label": ">", "x": 11, "y": 2 },
-                { "label": "RShift", "x": 12, "y": 2, "w": 1.25 },
-                { "label": "F4", "x": 0, "y": 3 },
-                { "label": "Ctrl", "x": 1.25, "y": 3, "w": 1.25 },
-                { "label": "Win", "x": 2.5, "y": 3 },
-                { "label": "Alt", "x": 3.5, "y": 3, "w": 1.25 },
-                { "label": "FN0", "x": 4.75, "y": 3, "w": 2.25 },
-                { "label": "Space", "x": 7, "y": 3, "w": 2.75 },
-                { "label": "Menu", "x": 9.75, "y": 3 },
-                { "label": "RAlt", "x": 10.75, "y": 3, "w": 1.25 },
-                { "label": "Super", "x": 12.25, "y": 3 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.25},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1, "w": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.5, "y": 3},
+                {"matrix": [3, 3], "x": 3.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 7], "x": 7, "y": 3, "w": 2.75},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 11], "x": 12.25, "y": 3}
             ]
         }
     }
diff --git a/keyboards/akb/ogr/info.json b/keyboards/akb/ogr/info.json
index f2583154ba..d1b062820a 100644
--- a/keyboards/akb/ogr/info.json
+++ b/keyboards/akb/ogr/info.json
@@ -29,87 +29,770 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "matrix": [0, 1], "x": 1.0, "y": 0.0 },
-                { "matrix": [0, 2], "x": 2.5, "y": 0.0 },
-                { "matrix": [0, 3], "x": 3.5, "y": 0.0 },
-                { "matrix": [0, 4], "x": 4.5, "y": 0.0 },
-                { "matrix": [0, 5], "x": 5.5, "y": 0.0 },
-                { "matrix": [0, 6], "x": 6.5, "y": 0.0 },
-                { "matrix": [0, 7], "x": 7.5, "y": 0.0 },
-                { "matrix": [0, 8], "x": 8.5, "y": 0.0 },
-                { "matrix": [0, 9], "x": 9.5, "y": 0.0 },
-                { "matrix": [0, 10], "x": 10.5, "y": 0.0 },
-                { "matrix": [0, 11], "x": 11.5, "y": 0.0 },
-                { "matrix": [0, 12], "x": 12.5, "y": 0.0 },
-                { "matrix": [0, 13], "x": 13.5, "y": 0.0 },
-                { "matrix": [0, 14], "x": 14.5, "y": 0.0 },
-                { "matrix": [0, 15], "x": 15.5, "y": 0.0 },
-                { "matrix": [0, 16], "x": 16.5, "y": 0.0 },
-                { "matrix": [0, 17], "x": 17.5, "y": 0.0 },
-                { "matrix": [1, 0], "x": 0.0, "y": 1.0 },
-                { "matrix": [1, 1], "x": 1.0, "y": 1.0 },
-                { "matrix": [1, 2], "w": 1.5, "x": 2.5, "y": 1.0 },
-                { "matrix": [1, 3], "x": 4.0, "y": 1.0 },
-                { "matrix": [1, 4], "x": 5.0, "y": 1.0 },
-                { "matrix": [1, 5], "x": 6.0, "y": 1.0 },
-                { "matrix": [1, 6], "x": 7.0, "y": 1.0 },
-                { "matrix": [1, 7], "x": 8.0, "y": 1.0 },
-                { "matrix": [1, 8], "x": 9.0, "y": 1.0 },
-                { "matrix": [1, 9], "x": 10.0, "y": 1.0 },
-                { "matrix": [1, 10], "x": 11.0, "y": 1.0 },
-                { "matrix": [1, 11], "x": 12.0, "y": 1.0 },
-                { "matrix": [1, 12], "x": 13.0, "y": 1.0 },
-                { "matrix": [1, 13], "x": 14.0, "y": 1.0 },
-                { "matrix": [1, 14], "x": 15.0, "y": 1.0 },
-                { "matrix": [1, 15], "w": 1.5, "x": 16.0, "y": 1.0 },
-                { "matrix": [1, 16], "x": 17.5, "y": 1.0 },
-                { "matrix": [2, 0], "x": 0.0, "y": 2.0 },
-                { "matrix": [2, 1], "x": 1.0, "y": 2.0 },
-                { "matrix": [2, 2], "w": 1.75, "x": 2.5, "y": 2.0 },
-                { "matrix": [2, 3], "x": 4.25, "y": 2.0 },
-                { "matrix": [2, 4], "x": 5.25, "y": 2.0 },
-                { "matrix": [2, 5], "x": 6.25, "y": 2.0 },
-                { "matrix": [2, 6], "x": 7.25, "y": 2.0 },
-                { "matrix": [2, 7], "x": 8.25, "y": 2.0 },
-                { "matrix": [2, 8], "x": 9.25, "y": 2.0 },
-                { "matrix": [2, 9], "x": 10.25, "y": 2.0 },
-                { "matrix": [2, 10], "x": 11.25, "y": 2.0 },
-                { "matrix": [2, 11], "x": 12.25, "y": 2.0 },
-                { "matrix": [2, 12], "x": 13.25, "y": 2.0 },
-                { "matrix": [2, 13], "x": 14.25, "y": 2.0 },
-                { "matrix": [2, 15], "w": 2.25, "x": 15.25, "y": 2.0 },
-                { "matrix": [2, 16], "x": 17.5, "y": 2.0 },
-                { "matrix": [3, 0], "x": 0.0, "y": 3.0 },
-                { "matrix": [3, 1], "x": 1.0, "y": 3.0 },
-                { "matrix": [3, 2], "w": 1.25, "x": 2.5, "y": 3.0 },
-                { "matrix": [3, 3], "x": 3.75, "y": 3.0 },
-                { "matrix": [3, 4], "x": 4.75, "y": 3.0 },
-                { "matrix": [3, 5], "x": 5.75, "y": 3.0 },
-                { "matrix": [3, 6], "x": 6.75, "y": 3.0 },
-                { "matrix": [3, 7], "x": 7.75, "y": 3.0 },
-                { "matrix": [3, 8], "x": 8.75, "y": 3.0 },
-                { "matrix": [3, 9], "x": 9.75, "y": 3.0 },
-                { "matrix": [3, 10], "x": 10.75, "y": 3.0 },
-                { "matrix": [3, 11], "x": 11.75, "y": 3.0 },
-                { "matrix": [3, 12], "x": 12.75, "y": 3.0 },
-                { "matrix": [3, 13], "x": 13.75, "y": 3.0 },
-                { "matrix": [3, 14], "w": 1.75, "x": 14.75, "y": 3.0 },
-                { "matrix": [3, 15], "x": 16.5, "y": 3.0 },
-                { "matrix": [3, 16], "x": 17.5, "y": 3.0 },
-                { "matrix": [4, 0], "x": 0.0, "y": 4.0 },
-                { "matrix": [4, 1], "x": 1.0, "y": 4.0 },
-                { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4.0 },
-                { "matrix": [4, 3], "w": 1.25, "x": 3.75, "y": 4.0 },
-                { "matrix": [4, 4], "w": 1.25, "x": 5.0, "y": 4.0 },
-                { "matrix": [4, 9], "w": 6.25, "x": 6.25, "y": 4.0 },
-                { "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4.0 },
-                { "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4.0 },
-                { "matrix": [4, 14], "x": 15.5, "y": 4.0 },
-                { "matrix": [4, 15], "x": 16.5, "y": 4.0 },
-                { "matrix": [4, 16], "x": 17.5, "y": 4.0 }
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F2", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "Esc", "matrix": [0, 2], "x": 2.5, "y": 0},
+                {"label": "1", "matrix": [0, 3], "x": 3.5, "y": 0},
+                {"label": "2", "matrix": [0, 4], "x": 4.5, "y": 0},
+                {"label": "3", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "4", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "5", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "6", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "7", "matrix": [0, 9], "x": 9.5, "y": 0},
+                {"label": "8", "matrix": [0, 10], "x": 10.5, "y": 0},
+                {"label": "9", "matrix": [0, 11], "x": 11.5, "y": 0},
+                {"label": "0", "matrix": [0, 12], "x": 12.5, "y": 0},
+                {"label": "-", "matrix": [0, 13], "x": 13.5, "y": 0},
+                {"label": "=", "matrix": [0, 14], "x": 14.5, "y": 0},
+                {"label": "Backspace", "matrix": [0, 15], "x": 15.5, "y": 0},
+                {"label": "Delete", "matrix": [0, 16], "x": 16.5, "y": 0},
+                {"label": "Home", "matrix": [0, 17], "x": 17.5, "y": 0},
+
+                {"label": "F3", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "F4", "matrix": [1, 1], "x": 1, "y": 1},
+                {"label": "Tab", "matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 3], "x": 4, "y": 1},
+                {"label": "W", "matrix": [1, 4], "x": 5, "y": 1},
+                {"label": "E", "matrix": [1, 5], "x": 6, "y": 1},
+                {"label": "R", "matrix": [1, 6], "x": 7, "y": 1},
+                {"label": "T", "matrix": [1, 7], "x": 8, "y": 1},
+                {"label": "Y", "matrix": [1, 8], "x": 9, "y": 1},
+                {"label": "U", "matrix": [1, 9], "x": 10, "y": 1},
+                {"label": "I", "matrix": [1, 10], "x": 11, "y": 1},
+                {"label": "O", "matrix": [1, 11], "x": 12, "y": 1},
+                {"label": "P", "matrix": [1, 12], "x": 13, "y": 1},
+                {"label": "[", "matrix": [1, 13], "x": 14, "y": 1},
+                {"label": "]", "matrix": [1, 14], "x": 15, "y": 1},
+                {"label": "\\", "matrix": [1, 15], "x": 16, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.5, "y": 1},
+
+                {"label": "F5", "matrix": [2, 0], "x": 0, "y": 2},
+                {"label": "F6", "matrix": [2, 1], "x": 1, "y": 2},
+                {"label": "Caps Lock", "matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 3], "x": 4.25, "y": 2},
+                {"label": "S", "matrix": [2, 4], "x": 5.25, "y": 2},
+                {"label": "D", "matrix": [2, 5], "x": 6.25, "y": 2},
+                {"label": "F", "matrix": [2, 6], "x": 7.25, "y": 2},
+                {"label": "G", "matrix": [2, 7], "x": 8.25, "y": 2},
+                {"label": "H", "matrix": [2, 8], "x": 9.25, "y": 2},
+                {"label": "J", "matrix": [2, 9], "x": 10.25, "y": 2},
+                {"label": "K", "matrix": [2, 10], "x": 11.25, "y": 2},
+                {"label": "L", "matrix": [2, 11], "x": 12.25, "y": 2},
+                {"label": ";", "matrix": [2, 12], "x": 13.25, "y": 2},
+                {"label": "'", "matrix": [2, 13], "x": 14.25, "y": 2},
+                {"label": "Enter", "matrix": [2, 15], "x": 15.25, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.5, "y": 2},
+
+                {"label": "F7", "matrix": [3, 0], "x": 0, "y": 3},
+                {"label": "F8", "matrix": [3, 1], "x": 1, "y": 3},
+                {"label": "Shift", "matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 3], "x": 3.75, "y": 3},
+                {"label": "Z", "matrix": [3, 4], "x": 4.75, "y": 3},
+                {"label": "X", "matrix": [3, 5], "x": 5.75, "y": 3},
+                {"label": "C", "matrix": [3, 6], "x": 6.75, "y": 3},
+                {"label": "V", "matrix": [3, 7], "x": 7.75, "y": 3},
+                {"label": "B", "matrix": [3, 8], "x": 8.75, "y": 3},
+                {"label": "N", "matrix": [3, 9], "x": 9.75, "y": 3},
+                {"label": "M", "matrix": [3, 10], "x": 10.75, "y": 3},
+                {"label": ",", "matrix": [3, 11], "x": 11.75, "y": 3},
+                {"label": ".", "matrix": [3, 12], "x": 12.75, "y": 3},
+                {"label": "/", "matrix": [3, 13], "x": 13.75, "y": 3},
+                {"label": "Shift", "matrix": [3, 14], "x": 14.75, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 15], "x": 16.5, "y": 3},
+                {"label": "End", "matrix": [3, 16], "x": 17.5, "y": 3},
+
+                {"label": "F9", "matrix": [4, 0], "x": 0, "y": 4},
+                {"label": "F10", "matrix": [4, 1], "x": 1, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 4], "x": 5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 9], "x": 6.25, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
+                {"label": "\u2190", "matrix": [4, 14], "x": 15.5, "y": 4},
+                {"label": "\u2193", "matrix": [4, 15], "x": 16.5, "y": 4},
+                {"label": "\u2192", "matrix": [4, 16], "x": 17.5, "y": 4}
+            ]
+        },
+        "LAYOUT_65_xt_ansi_blocker": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 0], "x": 0.0, "y": 0.0},
+                {"label": "F2", "matrix": [0, 1], "x": 1.0, "y": 0.0},
+                {"label": "Esc", "matrix": [0, 2], "x": 2.5, "y": 0.0},
+                {"label": "1", "matrix": [0, 3], "x": 3.5, "y": 0.0},
+                {"label": "2", "matrix": [0, 4], "x": 4.5, "y": 0.0},
+                {"label": "3", "matrix": [0, 5], "x": 5.5, "y": 0.0},
+                {"label": "4", "matrix": [0, 6], "x": 6.5, "y": 0.0},
+                {"label": "5", "matrix": [0, 7], "x": 7.5, "y": 0.0},
+                {"label": "6", "matrix": [0, 8], "x": 8.5, "y": 0.0},
+                {"label": "7", "matrix": [0, 9], "x": 9.5, "y": 0.0},
+                {"label": "8", "matrix": [0, 10], "x": 10.5, "y": 0.0},
+                {"label": "9", "matrix": [0, 11], "x": 11.5, "y": 0.0},
+                {"label": "0", "matrix": [0, 12], "x": 12.5, "y": 0.0},
+                {"label": "-", "matrix": [0, 13], "x": 13.5, "y": 0.0},
+                {"label": "=", "matrix": [0, 14], "x": 14.5, "y": 0.0},
+                {"label": "Backspace", "matrix": [0, 15], "x": 15.5, "y": 0.0, "w": 2.0},
+                {"label": "Home", "matrix": [0, 17], "x": 17.5, "y": 0.0},
+
+                {"label": "F3", "matrix": [1, 0], "x": 0.0, "y": 1.0},
+                {"label": "F4", "matrix": [1, 1], "x": 1.0, "y": 1.0},
+                {"label": "Tab", "matrix": [1, 2], "x": 2.5, "y": 1.0, "w": 1.5},
+                {"label": "Q", "matrix": [1, 3], "x": 4.0, "y": 1.0},
+                {"label": "W", "matrix": [1, 4], "x": 5.0, "y": 1.0},
+                {"label": "E", "matrix": [1, 5], "x": 6.0, "y": 1.0},
+                {"label": "R", "matrix": [1, 6], "x": 7.0, "y": 1.0},
+                {"label": "T", "matrix": [1, 7], "x": 8.0, "y": 1.0},
+                {"label": "Y", "matrix": [1, 8], "x": 9.0, "y": 1.0},
+                {"label": "U", "matrix": [1, 9], "x": 10.0, "y": 1.0},
+                {"label": "I", "matrix": [1, 10], "x": 11.0, "y": 1.0},
+                {"label": "O", "matrix": [1, 11], "x": 12.0, "y": 1.0},
+                {"label": "P", "matrix": [1, 12], "x": 13.0, "y": 1.0},
+                {"label": "[", "matrix": [1, 13], "x": 14.0, "y": 1.0},
+                {"label": "]", "matrix": [1, 14], "x": 15.0, "y": 1.0},
+                {"label": "\\", "matrix": [1, 15], "x": 16.0, "y": 1.0, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.5, "y": 1.0},
+
+                {"label": "F5", "matrix": [2, 0], "x": 0.0, "y": 2.0},
+                {"label": "F6", "matrix": [2, 1], "x": 1.0, "y": 2.0},
+                {"label": "Caps Lock", "matrix": [2, 2], "x": 2.5, "y": 2.0, "w": 1.75},
+                {"label": "A", "matrix": [2, 3], "x": 4.25, "y": 2.0},
+                {"label": "S", "matrix": [2, 4], "x": 5.25, "y": 2.0},
+                {"label": "D", "matrix": [2, 5], "x": 6.25, "y": 2.0},
+                {"label": "F", "matrix": [2, 6], "x": 7.25, "y": 2.0},
+                {"label": "G", "matrix": [2, 7], "x": 8.25, "y": 2.0},
+                {"label": "H", "matrix": [2, 8], "x": 9.25, "y": 2.0},
+                {"label": "J", "matrix": [2, 9], "x": 10.25, "y": 2.0},
+                {"label": "K", "matrix": [2, 10], "x": 11.25, "y": 2.0},
+                {"label": "L", "matrix": [2, 11], "x": 12.25, "y": 2.0},
+                {"label": ";", "matrix": [2, 12], "x": 13.25, "y": 2.0},
+                {"label": "'", "matrix": [2, 13], "x": 14.25, "y": 2.0},
+                {"label": "Enter", "matrix": [2, 15], "x": 15.25, "y": 2.0, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.5, "y": 2.0},
+
+                {"label": "F7", "matrix": [3, 0], "x": 0.0, "y": 3.0},
+                {"label": "F8", "matrix": [3, 1], "x": 1.0, "y": 3.0},
+                {"label": "Shift", "matrix": [3, 2], "x": 2.5, "y": 3.0, "w": 2.25},
+                {"label": "Z", "matrix": [3, 4], "x": 4.75, "y": 3.0},
+                {"label": "X", "matrix": [3, 5], "x": 5.75, "y": 3.0},
+                {"label": "C", "matrix": [3, 6], "x": 6.75, "y": 3.0},
+                {"label": "V", "matrix": [3, 7], "x": 7.75, "y": 3.0},
+                {"label": "B", "matrix": [3, 8], "x": 8.75, "y": 3.0},
+                {"label": "N", "matrix": [3, 9], "x": 9.75, "y": 3.0},
+                {"label": "M", "matrix": [3, 10], "x": 10.75, "y": 3.0},
+                {"label": ",", "matrix": [3, 11], "x": 11.75, "y": 3.0},
+                {"label": ".", "matrix": [3, 12], "x": 12.75, "y": 3.0},
+                {"label": "/", "matrix": [3, 13], "x": 13.75, "y": 3.0},
+                {"label": "Shift", "matrix": [3, 14], "x": 14.75, "y": 3.0, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 15], "x": 16.5, "y": 3.0},
+                {"label": "End", "matrix": [3, 16], "x": 17.5, "y": 3.0},
+
+                {"label": "F9", "matrix": [4, 0], "x": 0.0, "y": 4.0},
+                {"label": "F10", "matrix": [4, 1], "x": 1.0, "y": 4.0},
+                {"label": "Ctrl", "matrix": [4, 2], "x": 2.5, "y": 4.0, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4.0, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 4], "x": 5.0, "y": 4.0, "w": 1.25},
+                {"label": "Space", "matrix": [4, 9], "x": 6.25, "y": 4.0, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 12], "x": 12.5, "y": 4.0, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4.0, "w": 1.25},
+                {"label": "\u2190", "matrix": [4, 14], "x": 15.5, "y": 4.0},
+                {"label": "\u2193", "matrix": [4, 15], "x": 16.5, "y": 4.0},
+                {"label": "\u2192", "matrix": [4, 16], "x": 17.5, "y": 4.0}
+            ]
+        },
+        "LAYOUT_65_xt_ansi_blocker_split_bs": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 0], "x": 0.0, "y": 0.0},
+                {"label": "F2", "matrix": [0, 1], "x": 1.0, "y": 0.0},
+                {"label": "Esc", "matrix": [0, 2], "x": 2.5, "y": 0.0},
+                {"label": "1", "matrix": [0, 3], "x": 3.5, "y": 0.0},
+                {"label": "2", "matrix": [0, 4], "x": 4.5, "y": 0.0},
+                {"label": "3", "matrix": [0, 5], "x": 5.5, "y": 0.0},
+                {"label": "4", "matrix": [0, 6], "x": 6.5, "y": 0.0},
+                {"label": "5", "matrix": [0, 7], "x": 7.5, "y": 0.0},
+                {"label": "6", "matrix": [0, 8], "x": 8.5, "y": 0.0},
+                {"label": "7", "matrix": [0, 9], "x": 9.5, "y": 0.0},
+                {"label": "8", "matrix": [0, 10], "x": 10.5, "y": 0.0},
+                {"label": "9", "matrix": [0, 11], "x": 11.5, "y": 0.0},
+                {"label": "0", "matrix": [0, 12], "x": 12.5, "y": 0.0},
+                {"label": "-", "matrix": [0, 13], "x": 13.5, "y": 0.0},
+                {"label": "=", "matrix": [0, 14], "x": 14.5, "y": 0.0},
+                {"label": "Backspace", "matrix": [0, 15], "x": 15.5, "y": 0.0},
+                {"label": "Delete", "matrix": [0, 16], "x": 16.5, "y": 0.0},
+                {"label": "Home", "matrix": [0, 17], "x": 17.5, "y": 0.0},
+
+                {"label": "F3", "matrix": [1, 0], "x": 0.0, "y": 1.0},
+                {"label": "F4", "matrix": [1, 1], "x": 1.0, "y": 1.0},
+                {"label": "Tab", "matrix": [1, 2], "x": 2.5, "y": 1.0, "w": 1.5},
+                {"label": "Q", "matrix": [1, 3], "x": 4.0, "y": 1.0},
+                {"label": "W", "matrix": [1, 4], "x": 5.0, "y": 1.0},
+                {"label": "E", "matrix": [1, 5], "x": 6.0, "y": 1.0},
+                {"label": "R", "matrix": [1, 6], "x": 7.0, "y": 1.0},
+                {"label": "T", "matrix": [1, 7], "x": 8.0, "y": 1.0},
+                {"label": "Y", "matrix": [1, 8], "x": 9.0, "y": 1.0},
+                {"label": "U", "matrix": [1, 9], "x": 10.0, "y": 1.0},
+                {"label": "I", "matrix": [1, 10], "x": 11.0, "y": 1.0},
+                {"label": "O", "matrix": [1, 11], "x": 12.0, "y": 1.0},
+                {"label": "P", "matrix": [1, 12], "x": 13.0, "y": 1.0},
+                {"label": "[", "matrix": [1, 13], "x": 14.0, "y": 1.0},
+                {"label": "]", "matrix": [1, 14], "x": 15.0, "y": 1.0},
+                {"label": "\\", "matrix": [1, 15], "x": 16.0, "y": 1.0, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.5, "y": 1.0},
+
+                {"label": "F5", "matrix": [2, 0], "x": 0.0, "y": 2.0},
+                {"label": "F6", "matrix": [2, 1], "x": 1.0, "y": 2.0},
+                {"label": "Caps Lock", "matrix": [2, 2], "x": 2.5, "y": 2.0, "w": 1.75},
+                {"label": "A", "matrix": [2, 3], "x": 4.25, "y": 2.0},
+                {"label": "S", "matrix": [2, 4], "x": 5.25, "y": 2.0},
+                {"label": "D", "matrix": [2, 5], "x": 6.25, "y": 2.0},
+                {"label": "F", "matrix": [2, 6], "x": 7.25, "y": 2.0},
+                {"label": "G", "matrix": [2, 7], "x": 8.25, "y": 2.0},
+                {"label": "H", "matrix": [2, 8], "x": 9.25, "y": 2.0},
+                {"label": "J", "matrix": [2, 9], "x": 10.25, "y": 2.0},
+                {"label": "K", "matrix": [2, 10], "x": 11.25, "y": 2.0},
+                {"label": "L", "matrix": [2, 11], "x": 12.25, "y": 2.0},
+                {"label": ";", "matrix": [2, 12], "x": 13.25, "y": 2.0},
+                {"label": "'", "matrix": [2, 13], "x": 14.25, "y": 2.0},
+                {"label": "Enter", "matrix": [2, 15], "x": 15.25, "y": 2.0, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.5, "y": 2.0},
+
+                {"label": "F7", "matrix": [3, 0], "x": 0.0, "y": 3.0},
+                {"label": "F8", "matrix": [3, 1], "x": 1.0, "y": 3.0},
+                {"label": "Shift", "matrix": [3, 2], "x": 2.5, "y": 3.0, "w": 2.25},
+                {"label": "Z", "matrix": [3, 4], "x": 4.75, "y": 3.0},
+                {"label": "X", "matrix": [3, 5], "x": 5.75, "y": 3.0},
+                {"label": "C", "matrix": [3, 6], "x": 6.75, "y": 3.0},
+                {"label": "V", "matrix": [3, 7], "x": 7.75, "y": 3.0},
+                {"label": "B", "matrix": [3, 8], "x": 8.75, "y": 3.0},
+                {"label": "N", "matrix": [3, 9], "x": 9.75, "y": 3.0},
+                {"label": "M", "matrix": [3, 10], "x": 10.75, "y": 3.0},
+                {"label": ",", "matrix": [3, 11], "x": 11.75, "y": 3.0},
+                {"label": ".", "matrix": [3, 12], "x": 12.75, "y": 3.0},
+                {"label": "/", "matrix": [3, 13], "x": 13.75, "y": 3.0},
+                {"label": "Shift", "matrix": [3, 14], "x": 14.75, "y": 3.0, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 15], "x": 16.5, "y": 3.0},
+                {"label": "End", "matrix": [3, 16], "x": 17.5, "y": 3.0},
+
+                {"label": "F9", "matrix": [4, 0], "x": 0.0, "y": 4.0},
+                {"label": "F10", "matrix": [4, 1], "x": 1.0, "y": 4.0},
+                {"label": "Ctrl", "matrix": [4, 2], "x": 2.5, "y": 4.0, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4.0, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 4], "x": 5.0, "y": 4.0, "w": 1.25},
+                {"label": "Space", "matrix": [4, 9], "x": 6.25, "y": 4.0, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 12], "x": 12.5, "y": 4.0, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4.0, "w": 1.25},
+                {"label": "\u2190", "matrix": [4, 14], "x": 15.5, "y": 4.0},
+                {"label": "\u2193", "matrix": [4, 15], "x": 16.5, "y": 4.0},
+                {"label": "\u2192", "matrix": [4, 16], "x": 17.5, "y": 4.0}
+            ]
+        },
+        "LAYOUT_65_xt_ansi_blocker_wkl": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 0], "x": 0.0, "y": 0.0},
+                {"label": "F2", "matrix": [0, 1], "x": 1.0, "y": 0.0},
+                {"label": "Esc", "matrix": [0, 2], "x": 2.5, "y": 0.0},
+                {"label": "1", "matrix": [0, 3], "x": 3.5, "y": 0.0},
+                {"label": "2", "matrix": [0, 4], "x": 4.5, "y": 0.0},
+                {"label": "3", "matrix": [0, 5], "x": 5.5, "y": 0.0},
+                {"label": "4", "matrix": [0, 6], "x": 6.5, "y": 0.0},
+                {"label": "5", "matrix": [0, 7], "x": 7.5, "y": 0.0},
+                {"label": "6", "matrix": [0, 8], "x": 8.5, "y": 0.0},
+                {"label": "7", "matrix": [0, 9], "x": 9.5, "y": 0.0},
+                {"label": "8", "matrix": [0, 10], "x": 10.5, "y": 0.0},
+                {"label": "9", "matrix": [0, 11], "x": 11.5, "y": 0.0},
+                {"label": "0", "matrix": [0, 12], "x": 12.5, "y": 0.0},
+                {"label": "-", "matrix": [0, 13], "