Move remaining `LAYOUT`s to data driven (#20422)

4 files changed, 504 insertions, 654 deletions

diff --git a/keyboards/converter/ibm_terminal/ibm_terminal.h b/keyboards/converter/ibm_terminal/ibm_terminal.h
deleted file mode 100644
index ce50e5f437..0000000000
--- a/keyboards/converter/ibm_terminal/ibm_terminal.h
+++ /dev/null
@@ -1,81 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-void matrix_init_user(void);
-
-/*
- * IBM Terminal keyboard 6110345(122keys)/1392595(102keys)
- * http://geekhack.org/showthread.php?10737-What-Can-I-Do-With-a-Terminal-Model-M
- * http://www.seasip.info/VintagePC/ibm_1391406.html
- *
- * Keymap array:
- *     8 bytes
- *   +---------+
- *  0|         |
- *  :|         | 0x00-0x87
- *  ;|         |
- * 17|         |
- *   +---------+
- */
-#define LAYOUT( \
-                    k08, k10, k18, k20, k28, k30, k38, k40, k48, k50, k57, k5F, \
-                    k07, k0F, k17, k1F, k27, k2F, k37, k3F, k47, k4F, k56, k5E, \
-\
-    k05, k06,  k0E, k16, k1E, k26, k25, k2E, k36, k3D, k3E, k46, k45, k4E, k55, k5D, k66,  k67, k6E, k6F,  k76, k77, k7E, k84, \
-    k04, k0C,  k0D, k15, k1D, k24, k2D, k2C, k35, k3C, k43, k44, k4D, k54, k5B,      k5C,  k64, k65, k6D,  k6C, k75, k7D, k7C, \
-    k03, k0B,  k14, k1C, k1B, k23, k2B, k34, k33, k3B, k42, k4B, k4C, k52,      k53, k5A,       k63,       k6B, k73, k74, k7B, \
-    k83, k0A,  k12, k13, k1A, k22, k21, k2A, k32, k31, k3A, k41, k49, k4A,      k51, k59,  k61, k62, k6A,  k69, k72, k7A, k79, \
-    k01, k09,  k11,      k19,                k29,                          k39,      k58,       k60,       k68, k70, k71, k78 \
-) { \
-    { XXX, k01, XXX, k03, k04, k05, k06, k07 }, \
-    { k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17 }, \
-    { k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27 }, \
-    { k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37 }, \
-    { k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47 }, \
-    { k48, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57 }, \
-    { k58, k59, k5A, k5B, k5C, k5D, k5E, k5F }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67 }, \
-    { k68, k69, k6A, k6B, k6C, k6D, k6E, k6F }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77 }, \
-    { k78, k79, k7A, k7B, k7C, k7D, k7E, XXX }, \
-    { XXX, XXX, XXX, k83, k84, XXX, XXX, XXX } \
-}
-
-/*
- * IBM Terminal keyboard 1399625, 101-key
- */
-#define LAYOUT_101( \
-    k08,      k07, k0F, k17, k1F, k27, k2F, k37, k3F, k47, k4F, k56, k5E,  k57, k5F, k62, \
-\
-    k0E, k16, k1E, k26, k25, k2E, k36, k3D, k3E, k46, k45, k4E, k55, k66,  k67, k6E, k6F,  k76, k77, k7E, k84, \
-    k0D, k15, k1D, k24, k2D, k2C, k35, k3C, k43, k44, k4D, k54, k5B, k5C,  k64, k65, k6D,  k6C, k75, k7D, \
-    k14, k1C, k1B, k23, k2B, k34, k33, k3B, k42, k4B, k4C, k52,      k5A,                  k6B, k73, k74, k7C, \
-    k12,      k1A, k22, k21, k2A, k32, k31, k3A, k41, k49, k4A,      k59,       k63,       k69, k72, k7A, \
-    k11,      k19,                k29,                     k39,      k58,  k61, k60, k6A,  k70,      k71, k79 \
-) { \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, k07 }, \
-    { k08, XXX, XXX, XXX, XXX, k0D, k0E, k0F }, \
-    { XXX, k11, k12, XXX, k14, k15, k16, k17 }, \
-    { XXX, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
-    { XXX, k21, k22, k23, k24, k25, k26, k27 }, \
-    { XXX, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \
-    { XXX, k31, k32, k33, k34, k35, k36, k37 }, \
-    { XXX, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \
-    { XXX, k41, k42, k43, k44, k45, k46, k47 }, \
-    { XXX, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \
-    { XXX, XXX, k52, XXX, k54, k55, k56, k57 }, \
-    { k58, k59, k5A, k5B, k5C, XXX, k5E, k5F }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67 }, \
-    { XXX, k69, k6A, k6B, k6C, k6D, k6E, k6F }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77 }, \
-    { XXX, k79, k7A, XXX, k7C, k7D, k7E, XXX }, \
-    { XXX, XXX, XXX, XXX, k84, XXX, XXX, XXX } \
-}
diff --git a/keyboards/converter/ibm_terminal/info.json b/keyboards/converter/ibm_terminal/info.json
index 51bc208c9c..39840eb627 100644
--- a/keyboards/converter/ibm_terminal/info.json
+++ b/keyboards/converter/ibm_terminal/info.json
@@ -13,238 +13,276 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"label":"F13", "x":3.25, "y":0},
-        {"label":"F14", "x":4.25, "y":0},
-        {"label":"F15", "x":5.25, "y":0},
-        {"label":"F16", "x":6.25, "y":0},
-        {"label":"F17", "x":7.25, "y":0},
-        {"label":"F18", "x":8.25, "y":0},
-        {"label":"F19", "x":9.25, "y":0},
-        {"label":"F20", "x":10.25, "y":0},
-        {"label":"F21", "x":11.25, "y":0},
-        {"label":"F22", "x":12.25, "y":0},
-        {"label":"F23", "x":13.25, "y":0},
-        {"label":"F24", "x":14.25, "y":0},
-        {"label":"F1", "x":3.25, "y":1},
-        {"label":"F2", "x":4.25, "y":1},
-        {"label":"F3", "x":5.25, "y":1},
-        {"label":"F4", "x":6.25, "y":1},
-        {"label":"F5", "x":7.25, "y":1},
-        {"label":"F6", "x":8.25, "y":1},
-        {"label":"F7", "x":9.25, "y":1},
-        {"label":"F8", "x":10.25, "y":1},
-        {"label":"F9", "x":11.25, "y":1},
-        {"label":"F10", "x":12.25, "y":1},
-        {"label":"F11", "x":13.25, "y":1},
-        {"label":"F12", "x":14.25, "y":1},
-        {"label":"Print Screen", "x":0, "y":3},
-        {"label":"Esc", "x":1, "y":3},
-        {"label":"Esc", "x":2.25, "y":3},
-        {"label":"1", "x":3.25, "y":3},
-        {"label":"2", "x":4.25, "y":3},
-        {"label":"3", "x":5.25, "y":3},
-        {"label":"4", "x":6.25, "y":3},
-        {"label":"5", "x":7.25, "y":3},
-        {"label":"6", "x":8.25, "y":3},
-        {"label":"7", "x":9.25, "y":3},
-        {"label":"8", "x":10.25, "y":3},
-        {"label":"9", "x":11.25, "y":3},
-        {"label":"0", "x":12.25, "y":3},
-        {"label":"-", "x":13.25, "y":3},
-        {"label":"=", "x":14.25, "y":3},
-        {"label":"No", "x":15.25, "y":3},
-        {"label":"Back Space", "x":16.25, "y":3},
-        {"label":"Insert", "x":17.5, "y":3},
-        {"label":"Home", "x":18.5, "y":3},
-        {"label":"Page Up", "x":19.5, "y":3},
-        {"label":"Num Lock", "x":20.75, "y":3},
-        {"label":"/", "x":21.75, "y":3},
-        {"label":"*", "x":22.75, "y":3},
-        {"label":"-", "x":23.75, "y":3},
-        {"label":"Scroll Lock", "x":0, "y":4},
-        {"label":"Int4", "x":1, "y":4},
-        {"label":"Tab", "x":2.25, "y":4, "w":1.5},
-        {"label":"Q", "x":3.75, "y":4},
-        {"label":"W", "x":4.75, "y":4},
-        {"label":"E", "x":5.75, "y":4},
-        {"label":"R", "x":6.75, "y":4},
-        {"label":"T", "x":7.75, "y":4},
-        {"label":"Y", "x":8.75, "y":4},
-        {"label":"U", "x":9.75, "y":4},
-        {"label":"I", "x":10.75, "y":4},
-        {"label":"O", "x":11.75, "y":4},
-        {"label":"P", "x":12.75, "y":4},
-        {"label":"[", "x":13.75, "y":4},
-        {"label":"]", "x":14.75, "y":4},
-        {"label":"No", "x":15.75, "y":4, "w":1.5},
-        {"label":"Delete", "x":17.5, "y":4},
-        {"label":"End", "x":18.5, "y":4},
-        {"label":"Page Down", "x":19.5, "y":4},
-        {"label":"7", "x":20.75, "y":4},
-        {"label":"8", "x":21.75, "y":4},
-        {"label":"9", "x":22.75, "y":4},
-        {"label":"+", "x":23.75, "y":4},
-        {"label":"Pause", "x":0, "y":5},
-        {"label":"Int5", "x":1, "y":5},
-        {"label":"Caps Lock", "x":2.25, "y":5, "w":1.75},
-        {"label":"A", "x":4, "y":5},
-        {"label":"S", "x":5, "y":5},
-        {"label":"D", "x":6, "y":5},
-        {"label":"F", "x":7, "y":5},
-        {"label":"G", "x":8, "y":5},
-        {"label":"H", "x":9, "y":5},
-        {"label":"J", "x":10, "y":5},
-        {"label":"K", "x":11, "y":5},
-        {"label":"L", "x":12, "y":5},
-        {"label":";", "x":13, "y":5},
-        {"label":"'", "x":14, "y":5},
-        {"label":"\\", "x":15, "y":5},
-        {"label":"Enter", "x":16, "y":5, "w":1.25},
-        {"label":"Up", "x":18.5, "y":5},
-        {"label":"4", "x":20.75, "y":5},
-        {"label":"5", "x":21.75, "y":5},
-        {"label":"6", "x":22.75, "y":5},
-        {"label":",", "x":23.75, "y":5},
-        {"label":"App", "x":0, "y":6},
-        {"label":"Int6", "x":1, "y":6},
-        {"label":"Shift", "x":2.25, "y":6, "w":1.25},
-        {"label":"ISO \\", "x":3.5, "y":6},
-        {"label":"Z", "x":4.5, "y":6},
-        {"label":"X", "x":5.5, "y":6},
-        {"label":"C", "x":6.5, "y":6},
-        {"label":"V", "x":7.5, "y":6},
-        {"label":"B", "x":8.5, "y":6},
-        {"label":"N", "x":9.5, "y":6},
-        {"label":"M", "x":10.5, "y":6},
-        {"label":",", "x":11.5, "y":6},
-        {"label":".", "x":12.5, "y":6},
-        {"label":"/", "x":13.5, "y":6},
-        {"label":"No", "x":14.5, "y":6},
-        {"label":"Shift", "x":15.5, "y":6, "w":1.75},
-        {"label":"Left", "x":17.5, "y":6},
-        {"label":"Int2", "x":18.5, "y":6},
-        {"label":"Right", "x":19.5, "y":6},
-        {"label":"1", "x":20.75, "y":6},
-        {"label":"2", "x":21.75, "y":6},
-        {"label":"3", "x":22.75, "y":6},
-        {"label":"Enter", "x":23.75, "y":6},
-        {"label":"RGUI", "x":0, "y":7},
-        {"label":"lgui", "x":1, "y":7},
-        {"label":"Ctrl", "x":2.25, "y":7, "w":1.5},
-        {"label":"Alt", "x":4.75, "y":7, "w":1.5},
-        {"label":"Space", "x":6.25, "y":7, "w":7},
-        {"label":"Alt", "x":13.25, "y":7, "w":1.5},
-        {"label":"Ctrl", "x":15.75, "y":7, "w":1.5},
-        {"label":"Down", "x":18.5, "y":7},
-        {"label":"No", "x":20.75, "y":7},
-        {"label":"0", "x":21.75, "y":7},
-        {"label":".", "x":22.75, "y":7},
-        {"label":"No", "x":23.75, "y":7}
+        {"matrix": [1, 0], "x": 3.25, "y": 0},
+        {"matrix": [2, 0], "x": 4.25, "y": 0},
+        {"matrix": [3, 0], "x": 5.25, "y": 0},
+        {"matrix": [4, 0], "x": 6.25, "y": 0},
+        {"matrix": [5, 0], "x": 7.25, "y": 0},
+        {"matrix": [6, 0], "x": 8.25, "y": 0},
+        {"matrix": [7, 0], "x": 9.25, "y": 0},
+        {"matrix": [8, 0], "x": 10.25, "y": 0},
+        {"matrix": [9, 0], "x": 11.25, "y": 0},
+        {"matrix": [10, 0], "x": 12.25, "y": 0},
+        {"matrix": [10, 7], "x": 13.25, "y": 0},
+        {"matrix": [11, 7], "x": 14.25, "y": 0},
+
+        {"matrix": [0, 7], "x": 3.25, "y": 1},
+        {"matrix": [1, 7], "x": 4.25, "y": 1},
+        {"matrix": [2, 7], "x": 5.25, "y": 1},
+        {"matrix": [3, 7], "x": 6.25, "y": 1},
+        {"matrix": [4, 7], "x": 7.25, "y": 1},
+        {"matrix": [5, 7], "x": 8.25, "y": 1},
+        {"matrix": [6, 7], "x": 9.25, "y": 1},
+        {"matrix": [7, 7], "x": 10.25, "y": 1},
+        {"matrix": [8, 7], "x": 11.25, "y": 1},
+        {"matrix": [9, 7], "x": 12.25, "y": 1},
+        {"matrix": [10, 6], "x": 13.25, "y": 1},
+        {"matrix": [11, 6], "x": 14.25, "y": 1},
+
+        {"matrix": [0, 5], "x": 0, "y": 3},
+        {"matrix": [0, 6], "x": 1, "y": 3},
+
+        {"matrix": [1, 6], "x": 2.25, "y": 3},
+        {"matrix": [2, 6], "x": 3.25, "y": 3},
+        {"matrix": [3, 6], "x": 4.25, "y": 3},
+        {"matrix": [4, 6], "x": 5.25, "y": 3},
+        {"matrix": [4, 5], "x": 6.25, "y": 3},
+        {"matrix": [5, 6], "x": 7.25, "y": 3},
+        {"matrix": [6, 6], "x": 8.25, "y": 3},
+        {"matrix": [7, 5], "x": 9.25, "y": 3},
+        {"matrix": [7, 6], "x": 10.25, "y": 3},
+        {"matrix": [8, 6], "x": 11.25, "y": 3},
+        {"matrix": [8, 5], "x": 12.25, "y": 3},
+        {"matrix": [9, 6], "x": 13.25, "y": 3},
+        {"matrix": [10, 5], "x": 14.25, "y": 3},
+        {"matrix": [11, 5], "x": 15.25, "y": 3},
+        {"matrix": [12, 6], "x": 16.25, "y": 3},
+
+        {"matrix": [12, 7], "x": 17.5, "y": 3},
+        {"matrix": [13, 6], "x": 18.5, "y": 3},
+        {"matrix": [13, 7], "x": 19.5, "y": 3},
+
+        {"matrix": [14, 6], "x": 20.75, "y": 3},
+        {"matrix": [14, 7], "x": 21.75, "y": 3},
+        {"matrix": [15, 6], "x": 22.75, "y": 3},
+        {"matrix": [16, 4], "x": 23.75, "y": 3},
+
+        {"matrix": [0, 4], "x": 0, "y": 4},
+        {"matrix": [1, 4], "x": 1, "y": 4},
+
+        {"matrix": [1, 5], "x": 2.25, "y": 4, "w": 1.5},
+        {"matrix": [2, 5], "x": 3.75, "y": 4},
+        {"matrix": [3, 5], "x": 4.75, "y": 4},
+        {"matrix": [4, 4], "x": 5.75, "y": 4},
+        {"matrix": [5, 5], "x": 6.75, "y": 4},
+        {"matrix": [5, 4], "x": 7.75, "y": 4},
+        {"matrix": [6, 5], "x": 8.75, "y": 4},
+        {"matrix": [7, 4], "x": 9.75, "y": 4},
+        {"matrix": [8, 3], "x": 10.75, "y": 4},
+        {"matrix": [8, 4], "x": 11.75, "y": 4},
+        {"matrix": [9, 5], "x": 12.75, "y": 4},
+        {"matrix": [10, 4], "x": 13.75, "y": 4},
+        {"matrix": [11, 3], "x": 14.75, "y": 4},
+        {"matrix": [11, 4], "x": 15.75, "y": 4, "w": 1.5},
+
+        {"matrix": [12, 4], "x": 17.5, "y": 4},
+        {"matrix": [12, 5], "x": 18.5, "y": 4},
+        {"matrix": [13, 5], "x": 19.5, "y": 4},
+
+        {"matrix": [13, 4], "x": 20.75, "y": 4},
+        {"matrix": [14, 5], "x": 21.75, "y": 4},
+        {"matrix": [15, 5], "x": 22.75, "y": 4},
+        {"matrix": [15, 4], "x": 23.75, "y": 4},
+
+        {"matrix": [0, 3], "x": 0, "y": 5},
+        {"matrix": [1, 3], "x": 1, "y": 5},
+
+        {"matrix": [2, 4], "x": 2.25, "y": 5, "w": 1.75},
+        {"matrix": [3, 4], "x": 4, "y": 5},
+        {"matrix": [3, 3], "x": 5, "y": 5},
+        {"matrix": [4, 3], "x": 6, "y": 5},
+        {"matrix": [5, 3], "x": 7, "y": 5},
+        {"matrix": [6, 4], "x": 8, "y": 5},
+        {"matrix": [6, 3], "x": 9, "y": 5},
+        {"matrix": [7, 3], "x": 10, "y": 5},
+        {"matrix": [8, 2], "x": 11, "y": 5},
+        {"matrix": [9, 3], "x": 12, "y": 5},
+        {"matrix": [9, 4], "x": 13, "y": 5},
+        {"matrix": [10, 2], "x": 14, "y": 5},
+        {"matrix": [10, 3], "x": 15, "y": 5},
+        {"matrix": [11, 2], "x": 16, "y": 5, "w": 1.25},
+
+        {"matrix": [12, 3], "x": 18.5, "y": 5},
+
+        {"matrix": [13, 3], "x": 20.75, "y": 5},
+        {"matrix": [14, 3], "x": 21.75, "y": 5},
+        {"matrix": [14, 4], "x": 22.75, "y": 5},
+        {"matrix": [15, 3], "x": 23.75, "y": 5},
+
+        {"matrix": [16, 3], "x": 0, "y": 6},
+        {"matrix": [1, 2], "x": 1, "y": 6},
+
+        {"matrix": [2, 2], "x": 2.25, "y": 6, "w": 1.25},
+        {"matrix": [2, 3], "x": 3.5, "y": 6},
+        {"matrix": [3, 2], "x": 4.5, "y": 6},
+        {"matrix": [4, 2], "x": 5.5, "y": 6},
+        {"matrix": [4, 1], "x": 6.5, "y": 6},
+        {"matrix": [5, 2], "x": 7.5, "y": 6},
+        {"matrix": [6, 2], "x": 8.5, "y": 6},
+        {"matrix": [6, 1], "x": 9.5, "y": 6},
+        {"matrix": [7, 2], "x": 10.5, "y": 6},
+        {"matrix": [8, 1], "x": 11.5, "y": 6},
+        {"matrix": [9, 1], "x": 12.5, "y": 6},
+        {"matrix": [9, 2], "x": 13.5, "y": 6},
+        {"matrix": [10, 1], "x": 14.5, "y": 6},
+        {"matrix": [11, 1], "x": 15.5, "y": 6, "w": 1.75},
+
+        {"matrix": [12, 1], "x": 17.5, "y": 6},
+        {"matrix": [12, 2], "x": 18.5, "y": 6},
+        {"matrix": [13, 2], "x": 19.5, "y": 6},
+
+        {"matrix": [13, 1], "x": 20.75, "y": 6},
+        {"matrix": [14, 2], "x": 21.75, "y": 6},
+        {"matrix": [15, 2], "x": 22.75, "y": 6},
+        {"matrix": [15, 1], "x": 23.75, "y": 6},
+
+        {"matrix": [0, 1], "x": 0, "y": 7},
+        {"matrix": [1, 1], "x": 1, "y": 7},
+        {"matrix": [2, 1], "x": 2.25, "y": 7, "w": 1.5},
+        {"matrix": [3, 1], "x": 4.75, "y": 7, "w": 1.5},
+        {"matrix": [5, 1], "x": 6.25, "y": 7, "w": 7},
+        {"matrix": [7, 1], "x": 13.25, "y": 7, "w": 1.5},
+        {"matrix": [11, 0], "x": 15.75, "y": 7, "w": 1.5},
+
+        {"matrix": [12, 0], "x": 18.5, "y": 7},
+
+        {"matrix": [13, 0], "x": 20.75, "y": 7},
+        {"matrix": [14, 0], "x": 21.75, "y": 7},
+        {"matrix": [14, 1], "x": 22.75, "y": 7},
+        {"matrix": [15, 0], "x": 23.75, "y": 7}
       ]
     },
     "LAYOUT_101": {
       "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":2},
-        {"label":"1", "x":1, "y":2},
-        {"label":"2", "x":2, "y":2},
-        {"label":"3", "x":3, "y":2},
-        {"label":"4", "x":4, "y":2},
-        {"label":"5", "x":5, "y":2},
-        {"label":"6", "x":6, "y":2},
-        {"label":"7", "x":7, "y":2},
-        {"label":"8", "x":8, "y":2},
-        {"label":"9", "x":9, "y":2},
-        {"label":"0", "x":10, "y":2},
-        {"label":"-", "x":11, "y":2},
-        {"label":"=", "x":12, "y":2},
-        {"label":"Back Space", "x":13, "y":2, "w":2},
-        {"label":"Insert", "x":15.25, "y":2},
-        {"label":"Home", "x":16.25, "y":2},
-        {"label":"Page Up", "x":17.25, "y":2},
-        {"label":"Num Lock", "x":18.5, "y":2},
-        {"label":"/", "x":19.5, "y":2},
-        {"label":"*", "x":20.5, "y":2},
-        {"label":"-", "x":21.5, "y":2},
-        {"label":"Tab", "x":0, "y":3, "w":1.5},
-        {"label":"Q", "x":1.5, "y":3},
-        {"label":"W", "x":2.5, "y":3},
-        {"label":"E", "x":3.5, "y":3},
-        {"label":"R", "x":4.5, "y":3},
-        {"label":"T", "x":5.5, "y":3},
-        {"label":"Y", "x":6.5, "y":3},
-        {"label":"U", "x":7.5, "y":3},
-        {"label":"I", "x":8.5, "y":3},
-        {"label":"O", "x":9.5, "y":3},
-        {"label":"P", "x":10.5, "y":3},
-        {"label":"[", "x":11.5, "y":3},
-        {"label":"]", "x":12.5, "y":3},
-        {"label":"\\", "x":13.5, "y":3, "w":1.5},
-        {"label":"Delete", "x":15.25, "y":3},
-        {"label":"End", "x":16.25, "y":3},
-        {"label":"Page Down", "x":17.25, "y":3},
-        {"label":"7", "x":18.5, "y":3},
-        {"label":"8", "x":19.5, "y":3},
-        {"label":"9", "x":20.5, "y":3},
-        {"label":"Caps Lock", "x":0, "y":4, "w":1.75},
-        {"label":"A", "x":1.75, "y":4},
-        {"label":"S", "x":2.75, "y":4},
-        {"label":"D", "x":3.75, "y":4},
-        {"label":"F", "x":4.75, "y":4},
-        {"label":"G", "x":5.75, "y":4},
-        {"label":"H", "x":6.75, "y":4},
-        {"label":"J", "x":7.75, "y":4},
-        {"label":"K", "x":8.75, "y":4},
-        {"label":"L", "x":9.75, "y":4},
-        {"label":";", "x":10.75, "y":4},
-        {"label":"'", "x":11.75, "y":4},
-        {"label":"Enter", "x":12.75, "y":4, "w":2.25},
-        {"label":"4", "x":18.5, "y":4},
-        {"label":"5", "x":19.5, "y":4},
-        {"label":"6", "x":20.5, "y":4},
-        {"label":"+", "x":21.5, "y":3, "h":2},
-        {"label":"Shift", "x":0, "y":5, "w":2.25},
-        {"label":"Z", "x":2.25, "y":5},
-        {"label":"X", "x":3.25, "y":5},
-        {"label":"C", "x":4.25, "y":5},
-        {"label":"V", "x":5.25, "y":5},
-        {"label":"B", "x":6.25, "y":5},
-        {"label":"N", "x":7.25, "y":5},
-        {"label":"M", "x":8.25, "y":5},
-        {"label":",", "x":9.25, "y":5},
-        {"label":".", "x":10.25, "y":5},
-        {"label":"/", "x":11.25, "y":5},
-        {"label":"Shift", "x":12.25, "y":5, "w":2.75},
-        {"label":"Up", "x":16.25, "y":5},
-        {"label":"1", "x":18.5, "y":5},
-        {"label":"2", "x":19.5, "y":5},
-        {"label":"3", "x":20.5, "y":5},
-        {"label":"Ctrl", "x":0, "y":6, "w":1.5},
-        {"label":"Alt", "x":2.5, "y":6, "w":1.5},
-        {"label":"Space", "x":4, "y":6, "w":7},
-        {"label":"Alt", "x":11, "y":6, "w":1.5},
-        {"label":"Ctrl", "x":13.5, "y":6, "w":1.5},
-        {"label":"Left", "x":15.25, "y":6},
-        {"label":"Down", "x":16.25, "y":6},
-        {"label":"Right", "x":17.25, "y":6},
-        {"label":"0", "x":18.5, "y":6, "w":2},
-        {"label":".", "x":20.5, "y":6},
-        {"label":"Enter", "x":21.5, "y":5, "h":2}
+        {"matrix": [1, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 7], "x": 2, "y": 0},
+        {"matrix": [1, 7], "x": 3, "y": 0},
+        {"matrix": [2, 7], "x": 4, "y": 0},
+        {"matrix": [3, 7], "x": 5, "y": 0},
+
+        {"matrix": [4, 7], "x": 6.5, "y": 0},
+        {"matrix": [5, 7], "x": 7.5, "y": 0},
+        {"matrix": [6, 7], "x": 8.5, "y": 0},
+        {"matrix": [7, 7], "x": 9.5, "y": 0},
+
+        {"matrix": [8, 7], "x": 11, "y": 0},
+        {"matrix": [9, 7], "x": 12, "y": 0},
+        {"matrix": [10, 6], "x": 13, "y": 0},
+        {"matrix": [11, 6], "x": 14, "y": 0},
+
+        {"matrix": [10, 7], "x": 15.25, "y": 0},
+        {"matrix": [11, 7], "x": 16.25, "y": 0},
+        {"matrix": [12, 2], "x": 17.25, "y": 0},
+
+        {"matrix": [1, 6], "x": 0, "y": 2},
+        {"matrix": [2, 6], "x": 1, "y": 2},
+        {"matrix": [3, 6], "x": 2, "y": 2},
+        {"matrix": [4, 6], "x": 3, "y": 2},
+        {"matrix": [4, 5], "x": 4, "y": 2},
+        {"matrix": [5, 6], "x": 5, "y": 2},
+        {"matrix": [6, 6], "x": 6, "y": 2},
+        {"matrix": [7, 5], "x": 7, "y": 2},
+        {"matrix": [7, 6], "x": 8, "y": 2},
+        {"matrix": [8, 6], "x": 9, "y": 2},
+        {"matrix": [8, 5], "x": 10, "y": 2},
+        {"matrix": [9, 6], "x": 11, "y": 2},
+        {"matrix": [10, 5], "x": 12, "y": 2},
+        {"matrix": [12, 6], "x": 13, "y": 2, "w": 2},
+
+        {"matrix": [12, 7], "x": 15.25, "y": 2},
+        {"matrix": [13, 6], "x": 16.25, "y": 2},
+        {"matrix": [13, 7], "x": 17.25, "y": 2},
+
+        {"matrix": [14, 6], "x": 18.5, "y": 2},
+        {"matrix": [14, 7], "x": 19.5, "y": 2},
+        {"matrix": [15, 6], "x": 20.5, "y": 2},
+        {"matrix": [16, 4], "x": 21.5, "y": 2},
+
+        {"matrix": [1, 5], "x": 0, "y": 3, "w": 1.5},
+        {"matrix": [2, 5], "x": 1.5, "y": 3},
+        {"matrix": [3, 5], "x": 2.5, "y": 3},
+        {"matrix": [4, 4], "x": 3.5, "y": 3},
+        {"matrix": [5, 5], "x": 4.5, "y": 3},
+        {"matrix": [5, 4], "x": 5.5, "y": 3},
+        {"matrix": [6, 5], "x": 6.5, "y": 3},
+        {"matrix": [7, 4], "x": 7.5, "y": 3},
+        {"matrix": [8, 3], "x": 8.5, "y": 3},
+        {"matrix": [8, 4], "x": 9.5, "y": 3},
+        {"matrix": [9, 5], "x": 10.5, "y": 3},
+        {"matrix": [10, 4], "x": 11.5, "y": 3},
+        {"matrix": [11, 3], "x": 12.5, "y": 3},
+        {"matrix": [11, 4], "x": 13.5, "y": 3, "w": 1.5},
+
+        {"matrix": [12, 4], "x": 15.25, "y": 3},
+        {"matrix": [12, 5], "x": 16.25, "y": 3},
+        {"matrix": [13, 5], "x": 17.25, "y": 3},
+
+        {"matrix": [13, 4], "x": 18.5, "y": 3},
+        {"matrix": [14, 5], "x": 19.5, "y": 3},
+        {"matrix": [15, 5], "x": 20.5, "y": 3},
+
+        {"matrix": [2, 4], "x": 0, "y": 4, "w": 1.75},
+        {"matrix": [3, 4], "x": 1.75, "y": 4},
+        {"matrix": [3, 3], "x": 2.75, "y": 4},
+        {"matrix": [4, 3], "x": 3.75, "y": 4},
+        {"matrix": [5, 3], "x": 4.75, "y": 4},
+        {"matrix": [6, 4], "x": 5.75, "y": 4},
+        {"matrix": [6, 3], "x": 6.75, "y": 4},
+        {"matrix": [7, 3], "x": 7.75, "y": 4},
+        {"matrix": [8, 2], "x": 8.75, "y": 4},
+        {"matrix": [9, 3], "x": 9.75, "y": 4},
+        {"matrix": [9, 4], "x": 10.75, "y": 4},
+        {"matrix": [10, 2], "x": 11.75, "y": 4},
+        {"matrix": [11, 2], "x": 12.75, "y": 4, "w": 2.25},
+
+        {"matrix": [13, 3], "x": 18.5, "y": 4},
+        {"matrix": [14, 3], "x": 19.5, "y": 4},
+        {"matrix": [14, 4], "x": 20.5, "y": 4},
+        {"matrix": [15, 4], "x": 21.5, "y": 3, "h": 2},
+
+        {"matrix": [2, 2], "x": 0, "y": 5, "w": 2.25},
+        {"matrix": [3, 2], "x": 2.25, "y": 5},
+        {"matrix": [4, 2], "x": 3.25, "y": 5},
+        {"matrix": [4, 1], "x": 4.25, "y": 5},
+        {"matrix": [5, 2], "x": 5.25, "y": 5},
+        {"matrix": [6, 2], "x": 6.25, "y": 5},
+        {"matrix": [6, 1], "x": 7.25, "y": 5},
+        {"matrix": [7, 2], "x": 8.25, "y": 5},
+        {"matrix": [8, 1], "x": 9.25, "y": 5},
+        {"matrix": [9, 1], "x": 10.25, "y": 5},
+        {"matrix": [9, 2], "x": 11.25, "y": 5},
+        {"matrix": [11, 1], "x": 12.25, "y": 5, "w": 2.75},
+
+        {"matrix": [12, 3], "x": 16.25, "y": 5},
+
+        {"matrix": [13, 1], "x": 18.5, "y": 5},
+        {"matrix": [14, 2], "x": 19.5, "y": 5},
+        {"matrix": [15, 2], "x": 20.5, "y": 5},
+
+        {"matrix": [2, 1], "x": 0, "y": 6, "w": 1.5},
+        {"matrix": [3, 1], "x": 2.5, "y": 6, "w": 1.5},
+        {"matrix": [5, 1], "x": 4, "y": 6, "w": 7},
+        {"matrix": [7, 1], "x": 11, "y": 6, "w": 1.5},
+        {"matrix": [11, 0], "x": 13.5, "y": 6, "w": 1.5},
+
+        {"matrix": [12, 1], "x": 15.25, "y": 6},
+        {"matrix": [12, 0], "x": 16.25, "y": 6},
+        {"matrix": [13, 2], "x": 17.25, "y": 6},
+
+        {"matrix": [14, 0], "x": 18.5, "y": 6, "w": 2},
+        {"matrix": [14, 1], "x": 20.5, "y": 6},
+        {"matrix": [15, 1], "x": 21.5, "y": 5, "h": 2}
       ]
     }
   }
diff --git a/keyboards/converter/xt_usb/info.json b/keyboards/converter/xt_usb/info.json
index d266a1d3c1..1c9bcf5e34 100644
--- a/keyboards/converter/xt_usb/info.json
+++ b/keyboards/converter/xt_usb/info.json
@@ -13,221 +13,248 @@
     "layouts": {
         "LAYOUT_xt": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2.25, "y": 0},
-                {"x": 3.25, "y": 0},
-                {"x": 4.25, "y": 0},
-                {"x": 5.25, "y": 0},
-                {"x": 6.25, "y": 0},
-                {"x": 7.25, "y": 0},
-                {"x": 8.25, "y": 0},
-                {"x": 9.25, "y": 0},
-                {"x": 10.25, "y": 0},
-                {"x": 11.25, "y": 0},
-                {"x": 12.25, "y": 0},
-                {"x": 13.25, "y": 0},
-                {"x": 14.25, "y": 0},
-                {"x": 15.25, "y": 0, "w": 1.75},
-                {"x": 17, "y": 0, "w": 2},
-                {"x": 19, "y": 0, "w": 2},
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2.25, "y": 1, "w": 1.5},
-                {"x": 3.75, "y": 1},
-                {"x": 4.75, "y": 1},
-                {"x": 5.75, "y": 1},
-                {"x": 6.75, "y": 1},
-                {"x": 7.75, "y": 1},
-                {"x": 8.75, "y": 1},
-                {"x": 9.75, "y": 1},
-                {"x": 10.75, "y": 1},
-                {"x": 11.75, "y": 1},
-                {"x": 12.75, "y": 1},
-                {"x": 13.75, "y": 1},
-                {"x": 14.75, "y": 1, "w": 1.25},
-                {"x": 17, "y": 1},
-                {"x": 18, "y": 1},
-                {"x": 19, "y": 1},
-                {"x": 20, "y": 1},
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2.25, "y": 2, "w": 1.75},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 6, "y": 2},
-                {"x": 7, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
-                {"x": 12, "y": 2},
-                {"x": 13, "y": 2},
-                {"x": 14, "y": 2},
-                {"x": 15, "y": 2},
-                {"x": 16, "y": 1, "h": 2},
-                {"x": 17, "y": 2},
-                {"x": 18, "y": 2},
-                {"x": 19, "y": 2},
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2.25, "y": 3, "w": 1.25},
-                {"x": 3.5, "y": 3},
-                {"x": 4.5, "y": 3},
-                {"x": 5.5, "y": 3},
-                {"x": 6.5, "y": 3},
-                {"x": 7.5, "y": 3},
-                {"x": 8.5, "y": 3},
-                {"x": 9.5, "y": 3},
-                {"x": 10.5, "y": 3},
-                {"x": 11.5, "y": 3},
-                {"x": 12.5, "y": 3},
-                {"x": 13.5, "y": 3},
-                {"x": 14.5, "y": 3, "w": 1.5},
-                {"x": 16, "y": 3},
-                {"x": 17, "y": 3},
-                {"x": 18, "y": 3},
-                {"x": 19, "y": 3},
-                {"x": 20, "y": 2, "h": 3},
-                {"x": 0, "y": 4},
-                {"x": 1, "y": 4},
-                {"x": 2.25, "y": 4, "w": 2},
-                {"x": 4.25, "y": 4, "w": 9.75},
-                {"x": 14, "y": 4, "w": 2},
-                {"x": 16, "y": 4, "w": 2},
-                {"x": 18, "y": 4, "w": 2}
+                {"matrix": [7, 3], "x": 0, "y": 0},
+                {"matrix": [7, 4], "x": 1, "y": 0},
+
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+                {"matrix": [0, 7], "x": 8.25, "y": 0},
+                {"matrix": [1, 0], "x": 9.25, "y": 0},
+                {"matrix": [1, 1], "x": 10.25, "y": 0},
+                {"matrix": [1, 2], "x": 11.25, "y": 0},
+                {"matrix": [1, 3], "x": 12.25, "y": 0},
+                {"matrix": [1, 4], "x": 13.25, "y": 0},
+                {"matrix": [1, 5], "x": 14.25, "y": 0},
+                {"matrix": [1, 6], "x": 15.25, "y": 0, "w": 1.75},
+                {"matrix": [8, 5], "x": 17, "y": 0, "w": 2},
+                {"matrix": [8, 6], "x": 19, "y": 0, "w": 2},
+
+                {"matrix": [7, 5], "x": 0, "y": 1},
+                {"matrix": [7, 6], "x": 1, "y": 1},
+
+                {"matrix": [1, 7], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 3.75, "y": 1},
+                {"matrix": [2, 1], "x": 4.75, "y": 1},
+                {"matrix": [2, 2], "x": 5.75, "y": 1},
+                {"matrix": [2, 3], "x": 6.75, "y": 1},
+                {"matrix": [2, 4], "x": 7.75, "y": 1},
+                {"matrix": [2, 5], "x": 8.75, "y": 1},
+                {"matrix": [2, 6], "x": 9.75, "y": 1},
+                {"matrix": [2, 7], "x": 10.75, "y": 1},
+                {"matrix": [3, 0], "x": 11.75, "y": 1},
+                {"matrix": [3, 1], "x": 12.75, "y": 1},
+                {"matrix": [3, 2], "x": 13.75, "y": 1},
+                {"matrix": [3, 3], "x": 14.75, "y": 1, "w": 1.25},
+                {"matrix": [8, 7], "x": 17, "y": 1},
+                {"matrix": [9, 0], "x": 18, "y": 1},
+                {"matrix": [9, 1], "x": 19, "y": 1},
+                {"matrix": [9, 2], "x": 20, "y": 1},
+
+                {"matrix": [7, 7], "x": 0, "y": 2},
+                {"matrix": [8, 0], "x": 1, "y": 2},
+
+                {"matrix": [3, 5], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [3, 6], "x": 4, "y": 2},
+                {"matrix": [3, 7], "x": 5, "y": 2},
+                {"matrix": [4, 0], "x": 6, "y": 2},
+                {"matrix": [4, 1], "x": 7, "y": 2},
+                {"matrix": [4, 2], "x": 8, "y": 2},
+                {"matrix": [4, 3], "x": 9, "y": 2},
+                {"matrix": [4, 4], "x": 10, "y": 2},
+                {"matrix": [4, 5], "x": 11, "y": 2},
+                {"matrix": [4, 6], "x": 12, "y": 2},
+                {"matrix": [4, 7], "x": 13, "y": 2},
+                {"matrix": [5, 0], "x": 14, "y": 2},
+                {"matrix": [5, 1], "x": 15, "y": 2},
+                {"matrix": [3, 4], "x": 16, "y": 1, "h": 2},
+                {"matrix": [9, 3], "x": 17, "y": 2},
+                {"matrix": [9, 4], "x": 18, "y": 2},
+                {"matrix": [9, 5], "x": 19, "y": 2},
+
+                {"matrix": [8, 1], "x": 0, "y": 3},
+                {"matrix": [8, 2], "x": 1, "y": 3},
+
+                {"matrix": [5, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.5, "y": 3},
+                {"matrix": [5, 4], "x": 4.5, "y": 3},
+                {"matrix": [5, 5], "x": 5.5, "y": 3},
+                {"matrix": [5, 6], "x": 6.5, "y": 3},
+                {"matrix": [5, 7], "x": 7.5, "y": 3},
+                {"matrix": [6, 0], "x": 8.5, "y": 3},
+                {"matrix": [6, 1], "x": 9.5, "y": 3},
+                {"matrix": [6, 2], "x": 10.5, "y": 3},
+                {"matrix": [6, 3], "x": 11.5, "y": 3},
+                {"matrix": [6, 4], "x": 12.5, "y": 3},
+                {"matrix": [6, 5], "x": 13.5, "y": 3},
+                {"matrix": [6, 6], "x": 14.5, "y": 3, "w": 1.5},
+                {"matrix": [6, 7], "x": 16, "y": 3},
+                {"matrix": [9, 7], "x": 17, "y": 3},
+                {"matrix": [10, 0], "x": 18, "y": 3},
+                {"matrix": [10, 1], "x": 19, "y": 3},
+                {"matrix": [9, 6], "x": 20, "y": 2, "h": 3},
+
+                {"matrix": [8, 3], "x": 0, "y": 4},
+                {"matrix": [8, 4], "x": 1, "y": 4},
+
+                {"matrix": [7, 0], "x": 2.25, "y": 4, "w": 2},
+                {"matrix": [7, 1], "x": 4.25, "y": 4, "w": 9.75},
+                {"matrix": [7, 2], "x": 14, "y": 4, "w": 2},
+                {"matrix": [10, 2], "x": 16, "y": 4, "w": 2},
+                {"matrix": [10, 3], "x": 18, "y": 4, "w": 2}
             ]
         },
         "LAYOUT": {
             "layout": [
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 0, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
-                {"x": 12, "y": 1},
-                {"x": 13, "y": 1},
-                {"x": 15.25, "y": 1},
-                {"x": 16.25, "y": 1},
-                {"x": 17.25, "y": 1},
-                {"x": 19.5, "y": 1},
-                {"x": 20.5, "y": 1},
-                {"x": 21.5, "y": 1},
-                {"x": 0, "y": 2.5},
-                {"x": 1, "y": 2.5},
-                {"x": 2, "y": 2.5},
-                {"x": 3, "y": 2.5},
-                {"x": 4, "y": 2.5},
-                {"x": 5, "y": 2.5},
-                {"x": 6, "y": 2.5},
-                {"x": 7, "y": 2.5},
-                {"x": 8, "y": 2.5},
-                {"x": 9, "y": 2.5},
-                {"x": 10, "y": 2.5},
-                {"x": 11, "y": 2.5},
-                {"x": 12, "y": 2.5},
-                {"x": 13, "y": 2.5},
-                {"x": 14, "y": 2.5},
-                {"x": 15.25, "y": 2.5},
-                {"x": 16.25, "y": 2.5},
-                {"x": 17.25, "y": 2.5},
-                {"x": 18.5, "y": 2.5},
-                {"x": 19.5, "y": 2.5},
-                {"x": 20.5, "y": 2.5},
-                {"x": 21.5, "y": 2.5},
-                {"x": 0, "y": 3.5, "w": 1.5},
-                {"x": 1.5, "y": 3.5},
-                {"x": 2.5, "y": 3.5},
-                {"x": 3.5, "y": 3.5},
-                {"x": 4.5, "y": 3.5},
-                {"x": 5.5, "y": 3.5},
-                {"x": 6.5, "y": 3.5},
-                {"x": 7.5, "y": 3.5},
-                {"x": 8.5, "y": 3.5},
-                {"x": 9.5, "y": 3.5},
-                {"x": 10.5, "y": 3.5},
-                {"x": 11.5, "y": 3.5},
-                {"x": 12.5, "y": 3.5},
-                {"x": 13.5, "y": 3.5, "w": 1.5},
-                {"x": 15.25, "y": 3.5},
-                {"x": 16.25, "y": 3.5},
-                {"x": 17.25, "y": 3.5},
-                {"x": 18.5, "y": 3.5},
-                {"x": 19.5, "y": 3.5},
-                {"x": 20.5, "y": 3.5},
-                {"x": 21.5, "y": 3.5},
-                {"x": 0, "y": 4.5, "w": 1.75},
-                {"x": 1.75, "y": 4.5},
-                {"x": 2.75, "y": 4.5},
-                {"x": 3.75, "y": 4.5},
-                {"x": 4.75, "y": 4.5},
-                {"x": 5.75, "y": 4.5},
-                {"x": 6.75, "y": 4.5},
-                {"x": 7.75, "y": 4.5},
-                {"x": 8.75, "y": 4.5},
-                {"x": 9.75, "y": 4.5},
-                {"x": 10.75, "y": 4.5},
-                {"x": 11.75, "y": 4.5},
-                {"x": 12.75, "y": 4.5},
-                {"x": 13.75, "y": 4.5, "w": 1.25},
-                {"x": 18.5, "y": 4.5},
-                {"x": 19.5, "y": 4.5},
-                {"x": 20.5, "y": 4.5},
-                {"x": 21.5, "y": 4.5},
-                {"x": 0, "y": 5.5, "w": 1.25},
-                {"x": 1.25, "y": 5.5},
-                {"x": 2.25, "y": 5.5},
-                {"x": 3.25, "y": 5.5},
-                {"x": 4.25, "y": 5.5},
-                {"x": 5.25, "y": 5.5},
-                {"x": 6.25, "y": 5.5},
-                {"x": 7.25, "y": 5.5},
-                {"x": 8.25, "y": 5.5},
-                {"x": 9.25, "y": 5.5},
-                {"x": 10.25, "y": 5.5},
-                {"x": 11.25, "y": 5.5},
-                {"x": 12.25, "y": 5.5},
-                {"x": 13.25, "y": 5.5, "w": 1.75},
-                {"x": 16.25, "y": 5.5},
-                {"x": 18.5, "y": 5.5},
-                {"x": 19.5, "y": 5.5},
-                {"x": 20.5, "y": 5.5},
-                {"x": 21.5, "y": 5.5},
-                {"x": 0, "y": 6.5, "w": 1.25},
-                {"x": 1.25, "y": 6.5, "w": 1.25},
-                {"x": 2.5, "y": 6.5, "w": 1.25},
-                {"x": 3.75, "y": 6.5, "w": 1.25},
-                {"x": 5, "y": 6.5, "w": 3.25},
-                {"x": 8.25, "y": 6.5, "w": 1.25},
-                {"x": 9.5, "y": 6.5, "w": 1.25},
-                {"x": 10.75, "y": 6.5},
-                {"x": 11.75, "y": 6.5},
-                {"x": 12.75, "y": 6.5},
-                {"x": 13.75, "y": 6.5, "w": 1.25},
-                {"x": 15.25, "y": 6.5},
-                {"x": 16.25, "y": 6.5},
-                {"x": 17.25, "y": 6.5},
-                {"x": 18.5, "y": 6.5, "w": 2},
-                {"x": 20.5, "y": 6.5},
-                {"x": 21.5, "y": 6.5}
+                {"matrix": [12, 4], "x": 2, "y": 0},
+                {"matrix": [12, 5], "x": 3, "y": 0},
+                {"matrix": [12, 6], "x": 4, "y": 0},
+                {"matrix": [12, 7], "x": 5, "y": 0},
+                {"matrix": [13, 0], "x": 6, "y": 0},
+                {"matrix": [13, 1], "x": 7, "y": 0},
+                {"matrix": [13, 2], "x": 8, "y": 0},
+                {"matrix": [13, 3], "x": 9, "y": 0},
+                {"matrix": [13, 4], "x": 10, "y": 0},
+                {"matrix": [13, 5], "x": 11, "y": 0},
+                {"matrix": [13, 6], "x": 12, "y": 0},
+                {"matrix": [14, 6], "x": 13, "y": 0},
+
+                {"matrix": [0, 1], "x": 0, "y": 1},
+
+                {"matrix": [7, 3], "x": 2, "y": 1},
+                {"matrix": [7, 4], "x": 3, "y": 1},
+                {"matrix": [7, 5], "x": 4, "y": 1},
+                {"matrix": [7, 6], "x": 5, "y": 1},
+                {"matrix": [7, 7], "x": 6, "y": 1},
+                {"matrix": [8, 0], "x": 7, "y": 1},
+                {"matrix": [8, 1], "x": 8, "y": 1},
+                {"matrix": [8, 2], "x": 9, "y": 1},
+                {"matrix": [8, 3], "x": 10, "y": 1},
+                {"matrix": [8, 4], "x": 11, "y": 1},
+                {"matrix": [10, 7], "x": 12, "y": 1},
+                {"matrix": [11, 0], "x": 13, "y": 1},
+
+                {"matrix": [10, 4], "x": 15.25, "y": 1},
+                {"matrix": [8, 6], "x": 16.25, "y": 1},
+                {"matrix": [10, 5], "x": 17.25, "y": 1},
+
+                {"matrix": [11, 5], "x": 19.5, "y": 1},
+                {"matrix": [11, 6], "x": 20.5, "y": 1},
+                {"matrix": [11, 7], "x": 21.5, "y": 1},
+
+                {"matrix": [5, 1], "x": 0, "y": 2.5},
+                {"matrix": [0, 2], "x": 1, "y": 2.5},
+                {"matrix": [0, 3], "x": 2, "y": 2.5},
+                {"matrix": [0, 4], "x": 3, "y": 2.5},
+                {"matrix": [0, 5], "x": 4, "y": 2.5},
+                {"matrix": [0, 6], "x": 5, "y": 2.5},
+                {"matrix": [0, 7], "x": 6, "y": 2.5},
+                {"matrix": [1, 0], "x": 7, "y": 2.5},
+                {"matrix": [1, 1], "x": 8, "y": 2.5},
+                {"matrix": [1, 2], "x": 9, "y": 2.5},
+                {"matrix": [1, 3], "x": 10, "y": 2.5},
+                {"matrix": [1, 4], "x": 11, "y": 2.5},
+                {"matrix": [1, 5], "x": 12, "y": 2.5},
+                {"matrix": [15, 5], "x": 13, "y": 2.5},
+                {"matrix": [1, 6], "x": 14, "y": 2.5},
+
+                {"matrix": [14, 1], "x": 15.25, "y": 2.5},
+                {"matrix": [14, 4], "x": 16.25, "y": 2.5},
+                {"matrix": [14, 7], "x": 17.25, "y": 2.5},
+
+                {"matrix": [8, 5], "x": 18.5, "y": 2.5},
+                {"matrix": [15, 7], "x": 19.5, "y": 2.5},
+                {"matrix": [6, 7], "x": 20.5, "y": 2.5},
+                {"matrix": [9, 2], "x": 21.5, "y": 2.5},
+
+                {"matrix": [1, 7], "x": 0, "y": 3.5, "w": 1.5},
+                {"matrix": [2, 0], "x": 1.5, "y": 3.5},
+                {"matrix": [2, 1], "x": 2.5, "y": 3.5},
+                {"matrix": [2, 2], "x": 3.5, "y": 3.5},
+                {"matrix": [2, 3], "x": 4.5, "y": 3.5},
+                {"matrix": [2, 4], "x": 5.5, "y": 3.5},
+                {"matrix": [2, 5], "x": 6.5, "y": 3.5},
+                {"matrix": [2, 6], "x": 7.5, "y": 3.5},
+                {"matrix": [2, 7], "x": 8.5, "y": 3.5},
+                {"matrix": [3, 0], "x": 9.5, "y": 3.5},
+                {"matrix": [3, 1], "x": 10.5, "y": 3.5},
+                {"matrix": [3, 2], "x": 11.5, "y": 3.5},
+                {"matrix": [3, 3], "x": 12.5, "y": 3.5},
+                {"matrix": [5, 3], "x": 13.5, "y": 3.5, "w": 1.5},
+
+                {"matrix": [14, 2], "x": 15.25, "y": 3.5},
+                {"matrix": [14, 5], "x": 16.25, "y": 3.5},
+                {"matrix": [15, 0], "x": 17.25, "y": 3.5},
+
+                {"matrix": [8, 7], "x": 18.5, "y": 3.5},
+                {"matrix": [9, 0], "x": 19.5, "y": 3.5},
+                {"matrix": [9, 1], "x": 20.5, "y": 3.5},
+                {"matrix": [9, 6], "x": 21.5, "y": 3.5},
+
+                {"matrix": [7, 2], "x": 0, "y": 4.5, "w": 1.75},
+                {"matrix": [3, 6], "x": 1.75, "y": 4.5},
+                {"matrix": [3, 7], "x": 2.75, "y": 4.5},
+                {"matrix": [4, 0], "x": 3.75, "y": 4.5},
+                {"matrix": [4, 1], "x": 4.75, "y": 4.5},
+                {"matrix": [4, 2], "x": 5.75, "y": 4.5},
+                {"matrix": [4, 3], "x": 6.75, "y": 4.5},
+                {"matrix": [4, 4], "x": 7.75, "y": 4.5},
+                {"matrix": [4, 5], "x": 8.75, "y": 4.5},
+                {"matrix": [4, 6], "x": 9.75, "y": 4.5},
+                {"matrix": [4, 7], "x": 10.75, "y": 4.5},
+                {"matrix": [5, 0], "x": 11.75, "y": 4.5},
+                {"matrix": [0, 0], "x": 12.75, "y": 4.5},
+                {"matrix": [3, 4], "x": 13.75, "y": 4.5, "w": 1.25},
+
+                {"matrix": [9, 3], "x": 18.5, "y": 4.5},
+                {"matrix": [9, 4], "x": 19.5, "y": 4.5},
+                {"matrix": [9, 5], "x": 20.5, "y": 4.5},
+                {"matrix": [15, 6], "x": 21.5, "y": 4.5},
+
+                {"matrix": [5, 2], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [10, 6], "x": 1.25, "y": 5.5},
+                {"matrix": [5, 4], "x": 2.25, "y": 5.5},
+                {"matrix": [5, 5], "x": 3.25, "y": 5.5},
+                {"matrix": [5, 6], "x": 4.25, "y": 5.5},
+                {"matrix": [5, 7], "x": 5.25, "y": 5.5},
+                {"matrix": [6, 0], "x": 6.25, "y": 5.5},
+                {"matrix": [6, 1], "x": 7.25, "y": 5.5},
+                {"matrix": [6, 2], "x": 8.25, "y": 5.5},
+                {"matrix": [6, 3], "x": 9.25, "y": 5.5},
+                {"matrix": [6, 4], "x": 10.25, "y": 5.5},
+                {"matrix": [6, 5], "x": 11.25, "y": 5.5},
+                {"matrix": [14, 3], "x": 12.25, "y": 5.5},
+                {"matrix": [6, 6], "x": 13.25, "y": 5.5, "w": 1.75},
+
+                {"matrix": [12, 0], "x": 16.25, "y": 5.5},
+
+                {"matrix": [9, 7], "x": 18.5, "y": 5.5},
+                {"matrix": [10, 0], "x": 19.5, "y": 5.5},
+                {"matrix": [10, 1], "x": 20.5, "y": 5.5},
+                {"matrix": [13, 7], "x": 21.5, "y": 5.5},
+
+                {"matrix": [3, 5], "x": 0, "y": 6.5, "w": 1.25},
+                {"matrix": [11, 2], "x": 1.25, "y": 6.5, "w": 1.25},
+                {"matrix": [7, 0], "x": 2.5, "y": 6.5, "w": 1.25},
+                {"matrix": [15, 3], "x": 3.75, "y": 6.5, "w": 1.25},
+                {"matrix": [7, 1], "x": 5, "y": 6.5, "w": 3.25},
+                {"matrix": [15, 1], "x": 8.25, "y": 6.5, "w": 1.25},
+                {"matrix": [14, 0], "x": 9.5, "y": 6.5, "w": 1.25},
+                {"matrix": [15, 4], "x": 10.75, "y": 6.5},
+                {"matrix": [11, 3], "x": 11.75, "y": 6.5},
+                {"matrix": [11, 4], "x": 12.75, "y": 6.5},
+                {"matrix": [15, 2], "x": 13.75, "y": 6.5, "w": 1.25},
+
+                {"matrix": [12, 1], "x": 15.25, "y": 6.5},
+                {"matrix": [12, 2], "x": 16.25, "y": 6.5},
+                {"matrix": [12, 3], "x": 17.25, "y": 6.5},
+
+                {"matrix": [10, 2], "x": 18.5, "y": 6.5, "w": 2},
+                {"matrix": [10, 3], "x": 20.5, "y": 6.5},
+                {"matrix": [11, 1], "x": 21.5, "y": 6.5}
             ]
         }
     }
diff --git a/keyboards/converter/xt_usb/xt_usb.h b/keyboards/converter/xt_usb/xt_usb.h
deleted file mode 100644
index 570f1a376c..0000000000
--- a/keyboards/converter/xt_usb/xt_usb.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
-Copyright 2011,2012,2013 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/* IBM XT keyboard layout
- * ,-------.  ,--------------------------------------------------------------------------.
- * | F1| F2|  |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|  BS  |NumLck |ScrLck |
- * |-------|  |--------------------------------------------------------------------------|
- * | F3| F4|  | Tab |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ] |   |  7|  8|  9|  -|
- * |-------|  |------------------------------------------------------|Ent|---------------|
- * | F5| F6|  | Ctrl |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|  `|   |  4|  5|  6|   |
- * |-------|  |----------------------------------------------------------------------|   |
- * | F7| F8|  |Shif|  \|  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift|  *|  1|  2|  3|  +|
- * |-------|  |----------------------------------------------------------------------|   |
- * | F9|F10|  |  Alt  |               Space                  |CapsLck|   0   |   .   |   |
- * `-------'  `--------------------------------------------------------------------------'
- * Scan code set 1
- * ,-------.  ,--------------------------------------------------------------------------.
- * | 3B| 3C|  | 01| 02| 03| 04| 05| 06| 07| 08| 09| 0A| 0B| 0C| 0D|  0E  |  45   |  46   |
- * |-------|  |--------------------------------------------------------------------------|
- * | 3D| 3E|  | 0F  | 10| 11| 12| 13| 14| 15| 16| 17| 18| 19| 1A| 1B |   | 47| 48| 49| 4A|
- * |-------|  |------------------------------------------------------| 1C|---------------|
- * | 3F| 40|  | 1D   | 1E| 1F| 20| 21| 22| 23| 24| 25| 26| 27| 28| 29|   | 4B| 4C| 4D|   |
- * |-------|  |----------------------------------------------------------------------|   |
- * | 41| 42|  | 2A | 2B| 2C| 2D| 2E| 2F| 30| 31| 32| 33| 34| 35|  36 | 37| 4F| 50| 51| 4E|
- * |-------|  |----------------------------------------------------------------------|   |
- * | 43| 44|  |  38   |              39                      |  3A   |  52   |  53   |   |
- * `-------'  `--------------------------------------------------------------------------'
- */
-#define LAYOUT_xt( \
-    k3B, k3C,   k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k45,      k46, \
-    k3D, k3E,   k0F, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B,      k47, k48, k49, k4A, \
-    k3F, k40,   k1D, k1E, k1F, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k1C, k4B, k4C, k4D, \
-    k41, k42,   k2A, k2B, k2C, k2D, k2E, k2F, k30, k31, k32, k33, k34, k35, k36, k37, k4F, k50, k51, k4E, \
-    k43, k44,   k38,                          k39,                     k3A,      k52,      k53 \
-) { \
-    { XXX, k01, k02, k03, k04, k05, k06, k07 }, \
-    { k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17 }, \
-    { k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27 }, \
-    { k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37 }, \
-    { k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47 }, \
-    { k48, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \
-    { k50, k51, k52, k53, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \
-}
-
-/* Extended keyboard layout
- *         ,-----------------------------------------------.
- *         |F13|F14|F15|F16|F17|F18|F19|F20|F21|F22|F23|F24|
- * ,---.   |-----------------------------------------------|     ,-----------.     ,-----------.
- * |Esc|   |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|     |PrS|ScL|Pau|     |VDn|VUp|Mut|
- * `---'   `-----------------------------------------------'     `-----------'     `-----------'
- * ,-----------------------------------------------------------. ,-----------. ,---------------.
- * |  `|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|JPY|Bsp| |Ins|Hom|PgU| |NmL|  /|  *|  -|
- * |-----------------------------------------------------------| |-----------| |---------------|
- * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  | |Del|End|PgD| |  7|  8|  9|  +|
- * |-----------------------------------------------------------| `-----------' |---------------|
- * |CapsL |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|  #|Entr|               |  4|  5|  6|KP,|
- * |-----------------------------------------------------------|     ,---.     |---------------|
- * |Shft|  <|  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /| RO|Shift |     |Up |     |  1|  2|  3|Ent|
- * |-----------------------------------------------------------| ,-----------. |---------------|
- * |Ctl|Gui|Alt|MHEN|     Space      |HENK|KANA|Alt|Gui|App|Ctl| |Lef|Dow|Rig| |      0|  .|KP=|
- * `-----------------------------------------------------------' `-----------' `---------------'
- *         ,-----------------------------------------------.
- *         | 64| 65| 66| 67| 68| 69| 6A| 6B| 6C| 6D| 6E| 76|
- * ,---.   |-----------------------------------------------|     ,-----------.     ,-----------.
- * | 01|   | 3B| 3C| 3D| 3E| 3F| 40| 41| 42| 43| 44| 57| 58|     |*37| 46|*45|     |e5E|e5F|e63|
- * `---'   `-----------------------------------------------'     `-----------'     `-----------'
- * ,-----------------------------------------------------------. ,-----------. ,---------------.
- * | 29| 02| 03| 04| 05| 06| 07| 08| 09| 0A| 0B| 0C| 0D| 7D| 0E| |e52|e47|e49| | 45|e35| 37| 4A|
- * |-----------------------------------------------------------| |-----------| |---------------|
- * | 0F  | 10| 11| 12| 13| 14| 15| 16| 17| 18| 19| 1A| 1B|  2B | |e53|e4F|e51| | 47| 48| 49| 4E|
- * |-----------------------------------------------------------| `-----------' |---------------|
- * |  3A  | 1E| 1F| 20| 21| 22| 23| 24| 25| 26| 27| 28| 00| 1C |               | 4B| 4C| 4D| 7E|
- * |-----------------------------------------------------------|     ,---.     |---------------|
- * | 2A | 56| 2C| 2D| 2E| 2F| 30| 31| 32| 33| 34| 35| 73|  36  |     |e48|     | 4F| 50| 51|e1C|
- * |-----------------------------------------------------------| ,-----------. |---------------|
- * | 1D|e5B| 38| 7B |       39       | 79 | 70 |e38|e5C|e5D|e1D| |e4B|e50|e4D| |     52| 53| 59|
- * `-----------------------------------------------------------' `-----------' `---------------'
- * e: E0-escaped codes
- * *: special handling codes
- */
-#define LAYOUT( \
-              k64, k65, k66, k67, k68, k69, k6A, k6B, k6C, k6D, k6E, k76, \
-    k01,      k3B, k3C, k3D, k3E, k3F, k40, k41, k42, k43, k44, k57, k58,        k54, k46, k55,        k5D, k5E, k5F, \
-    k29, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k7D, k0E,   k71, k74, k77,   k45, k7F, k37, k4A, \
-    k0F, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k2B,        k72, k75, k78,   k47, k48, k49, k4E, \
-    k3A, k1E, k1F, k20, k21, k22, k23, k24, k25, k26, k27, k28, k00, k1C,                         k4B, k4C, k4D, k7E, \
-    k2A, k56, k2C, k2D, k2E, k2F, k30, k31, k32, k33, k34, k35, k73, k36,             k60,        k4F, k50, k51, k6F, \
-    k1D, k5A, k38, k7B,           k39,      k79, k70, k7C, k5B, k5C, k7A,        k61, k62, k63,   k52,      k53, k59 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07 }, \
-    { k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17 }, \
-    { k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27 }, \
-    { k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37 }, \
-    { k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47 }, \
-    { k48, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57 }, \
-    { k58, k59, k5A, k5B, k5C, k5D, k5E, k5F }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67 }, \
-    { k68, k69, k6A, k6B, k6C, k6D, k6E, k6F }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77 }, \
-    { k78, k79, k7A, k7B, k7C, k7D, k7E, k7F } \
-}