From 1d5ee895ad00b99d2d99a6cfb67b01b6dc84c874 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Tue, 16 Apr 2024 05:42:34 +0100
Subject: Migrate build target markers to keyboard.json - FG (#23534)

---
 keyboards/fallacy/info.json                        |  211 ----
 keyboards/fallacy/keyboard.json                    |  211 ++++
 keyboards/fc660c/info.json                         |  107 ---
 keyboards/fc660c/keyboard.json                     |  107 +++
 keyboards/fc980c/info.json                         |  150 ---
 keyboards/fc980c/keyboard.json                     |  150 +++
 keyboards/ferris/0_1/info.json                     |   72 --
 keyboards/ferris/0_1/keyboard.json                 |   72 ++
 keyboards/ferris/0_2/bling/info.json               |   57 --
 keyboards/ferris/0_2/bling/keyboard.json           |   57 ++
 keyboards/ferris/0_2/bling/rules.mk                |    0
 keyboards/fjlabs/7vhotswap/info.json               |  138 ---
 keyboards/fjlabs/7vhotswap/keyboard.json           |  138 +++
 keyboards/fjlabs/ad65/info.json                    |  730 --------------
 keyboards/fjlabs/ad65/keyboard.json                |  730 ++++++++++++++
 keyboards/fjlabs/avalon/info.json                  |  861 -----------------
 keyboards/fjlabs/avalon/keyboard.json              |  861 +++++++++++++++++
 keyboards/fjlabs/bks65/info.json                   |  126 ---
 keyboards/fjlabs/bks65/keyboard.json               |  126 +++
 keyboards/fjlabs/bks65solder/info.json             |  203 ----
 keyboards/fjlabs/bks65solder/keyboard.json         |  203 ++++
 keyboards/fjlabs/bolsa65/info.json                 |  103 --
 keyboards/fjlabs/bolsa65/keyboard.json             |  103 ++
 keyboards/fjlabs/kf87/info.json                    |  155 ---
 keyboards/fjlabs/kf87/keyboard.json                |  155 +++
 keyboards/fjlabs/kyuu/info.json                    |  126 ---
 keyboards/fjlabs/kyuu/keyboard.json                |  126 +++
 keyboards/fjlabs/ldk65/info.json                   |  107 ---
 keyboards/fjlabs/ldk65/keyboard.json               |  107 +++
 keyboards/fjlabs/midway60/info.json                |  671 -------------
 keyboards/fjlabs/midway60/keyboard.json            |  671 +++++++++++++
 keyboards/fjlabs/mk61rgbansi/info.json             |  121 ---
 keyboards/fjlabs/mk61rgbansi/keyboard.json         |  121 +++
 keyboards/fjlabs/peaker/info.json                  |  113 ---
 keyboards/fjlabs/peaker/keyboard.json              |  113 +++
 keyboards/fjlabs/polaris/info.json                 |  673 -------------
 keyboards/fjlabs/polaris/keyboard.json             |  673 +++++++++++++
 keyboards/fjlabs/ready100/info.json                |  123 ---
 keyboards/fjlabs/ready100/keyboard.json            |  123 +++
 keyboards/fjlabs/sinanju/info.json                 |  164 ----
 keyboards/fjlabs/sinanju/keyboard.json             |  164 ++++
 keyboards/fjlabs/sinanjuwk/info.json               |  451 ---------
 keyboards/fjlabs/sinanjuwk/keyboard.json           |  451 +++++++++
 keyboards/fjlabs/solanis/info.json                 | 1011 --------------------
 keyboards/fjlabs/solanis/keyboard.json             | 1011 ++++++++++++++++++++
 keyboards/fjlabs/swordfish/info.json               |  201 ----
 keyboards/fjlabs/swordfish/keyboard.json           |  201 ++++
 keyboards/fjlabs/tf60ansi/info.json                |  121 ---
 keyboards/fjlabs/tf60ansi/keyboard.json            |  121 +++
 keyboards/fjlabs/tf60v2/info.json                  |  123 ---
 keyboards/fjlabs/tf60v2/keyboard.json              |  123 +++
 keyboards/fjlabs/tf65rgbv2/info.json               |  128 ---
 keyboards/fjlabs/tf65rgbv2/keyboard.json           |  128 +++
 keyboards/fractal/info.json                        |  162 ----
 keyboards/fractal/keyboard.json                    |  162 ++++
 keyboards/frobiac/blackbowl/info.json              |   83 --
 keyboards/frobiac/blackbowl/keyboard.json          |   83 ++
 keyboards/gboards/ergotaco/info.json               |   42 -
 keyboards/gboards/ergotaco/keyboard.json           |   42 +
 keyboards/gboards/georgi/info.json                 |   72 --
 keyboards/gboards/georgi/keyboard.json             |   72 ++
 keyboards/gboards/gergo/info.json                  |   95 --
 keyboards/gboards/gergo/keyboard.json              |   95 ++
 keyboards/gboards/gergoplex/info.json              |   73 --
 keyboards/gboards/gergoplex/keyboard.json          |   73 ++
 keyboards/geistmaschine/macropod/info.json         |   37 -
 keyboards/geistmaschine/macropod/keyboard.json     |   37 +
 keyboards/geonworks/ee_at/info.json                |  499 ----------
 keyboards/geonworks/ee_at/keyboard.json            |  499 ++++++++++
 keyboards/geonworks/w1_at/info.json                |  507 ----------
 keyboards/geonworks/w1_at/keyboard.json            |  507 ++++++++++
 keyboards/gl516/a52gl/info.json                    |   86 --
 keyboards/gl516/a52gl/keyboard.json                |   86 ++
 keyboards/gl516/j73gl/info.json                    |  121 ---
 keyboards/gl516/j73gl/keyboard.json                |  121 +++
 keyboards/gl516/n51gl/info.json                    |  110 ---
 keyboards/gl516/n51gl/keyboard.json                |  110 +++
 keyboards/glenpickle/chimera_ergo/info.json        |   88 --
 keyboards/glenpickle/chimera_ergo/keyboard.json    |   88 ++
 keyboards/glenpickle/chimera_ls/info.json          |   79 --
 keyboards/glenpickle/chimera_ls/keyboard.json      |   79 ++
 keyboards/glenpickle/chimera_ortho/info.json       |   79 --
 keyboards/glenpickle/chimera_ortho/keyboard.json   |   79 ++
 keyboards/glenpickle/chimera_ortho_plus/info.json  |   88 --
 .../glenpickle/chimera_ortho_plus/keyboard.json    |   88 ++
 keyboards/gmmk/numpad/info.json                    |  121 ---
 keyboards/gmmk/numpad/keyboard.json                |  121 +++
 keyboards/gon/nerd60/info.json                     |  388 --------
 keyboards/gon/nerd60/keyboard.json                 |  388 ++++++++
 keyboards/gon/nerdtkl/info.json                    |  140 ---
 keyboards/gon/nerdtkl/keyboard.json                |  140 +++
 keyboards/gopolar/gg86/info.json                   |  393 --------
 keyboards/gopolar/gg86/keyboard.json               |  393 ++++++++
 keyboards/gray_studio/cod67/info.json              |  132 ---
 keyboards/gray_studio/cod67/keyboard.json          |  132 +++
 keyboards/gregandcin/teaqueen/info.json            |  115 ---
 keyboards/gregandcin/teaqueen/keyboard.json        |  115 +++
 97 files changed, 10556 insertions(+), 10556 deletions(-)
 delete mode 100644 keyboards/fallacy/info.json
 create mode 100644 keyboards/fallacy/keyboard.json
 delete mode 100644 keyboards/fc660c/info.json
 create mode 100644 keyboards/fc660c/keyboard.json
 delete mode 100644 keyboards/fc980c/info.json
 create mode 100644 keyboards/fc980c/keyboard.json
 delete mode 100644 keyboards/ferris/0_1/info.json
 create mode 100644 keyboards/ferris/0_1/keyboard.json
 delete mode 100644 keyboards/ferris/0_2/bling/info.json
 create mode 100644 keyboards/ferris/0_2/bling/keyboard.json
 delete mode 100644 keyboards/ferris/0_2/bling/rules.mk
 delete mode 100644 keyboards/fjlabs/7vhotswap/info.json
 create mode 100644 keyboards/fjlabs/7vhotswap/keyboard.json
 delete mode 100644 keyboards/fjlabs/ad65/info.json
 create mode 100644 keyboards/fjlabs/ad65/keyboard.json
 delete mode 100644 keyboards/fjlabs/avalon/info.json
 create mode 100644 keyboards/fjlabs/avalon/keyboard.json
 delete mode 100644 keyboards/fjlabs/bks65/info.json
 create mode 100644 keyboards/fjlabs/bks65/keyboard.json
 delete mode 100644 keyboards/fjlabs/bks65solder/info.json
 create mode 100644 keyboards/fjlabs/bks65solder/keyboard.json
 delete mode 100644 keyboards/fjlabs/bolsa65/info.json
 create mode 100644 keyboards/fjlabs/bolsa65/keyboard.json
 delete mode 100644 keyboards/fjlabs/kf87/info.json
 create mode 100644 keyboards/fjlabs/kf87/keyboard.json
 delete mode 100644 keyboards/fjlabs/kyuu/info.json
 create mode 100644 keyboards/fjlabs/kyuu/keyboard.json
 delete mode 100644 keyboards/fjlabs/ldk65/info.json
 create mode 100644 keyboards/fjlabs/ldk65/keyboard.json
 delete mode 100644 keyboards/fjlabs/midway60/info.json
 create mode 100644 keyboards/fjlabs/midway60/keyboard.json
 delete mode 100644 keyboards/fjlabs/mk61rgbansi/info.json
 create mode 100644 keyboards/fjlabs/mk61rgbansi/keyboard.json
 delete mode 100644 keyboards/fjlabs/peaker/info.json
 create mode 100644 keyboards/fjlabs/peaker/keyboard.json
 delete mode 100644 keyboards/fjlabs/polaris/info.json
 create mode 100644 keyboards/fjlabs/polaris/keyboard.json
 delete mode 100644 keyboards/fjlabs/ready100/info.json
 create mode 100644 keyboards/fjlabs/ready100/keyboard.json
 delete mode 100644 keyboards/fjlabs/sinanju/info.json
 create mode 100644 keyboards/fjlabs/sinanju/keyboard.json
 delete mode 100644 keyboards/fjlabs/sinanjuwk/info.json
 create mode 100644 keyboards/fjlabs/sinanjuwk/keyboard.json
 delete mode 100644 keyboards/fjlabs/solanis/info.json
 create mode 100644 keyboards/fjlabs/solanis/keyboard.json
 delete mode 100644 keyboards/fjlabs/swordfish/info.json
 create mode 100644 keyboards/fjlabs/swordfish/keyboard.json
 delete mode 100644 keyboards/fjlabs/tf60ansi/info.json
 create mode 100644 keyboards/fjlabs/tf60ansi/keyboard.json
 delete mode 100644 keyboards/fjlabs/tf60v2/info.json
 create mode 100644 keyboards/fjlabs/tf60v2/keyboard.json
 delete mode 100644 keyboards/fjlabs/tf65rgbv2/info.json
 create mode 100644 keyboards/fjlabs/tf65rgbv2/keyboard.json
 delete mode 100644 keyboards/fractal/info.json
 create mode 100644 keyboards/fractal/keyboard.json
 delete mode 100644 keyboards/frobiac/blackbowl/info.json
 create mode 100644 keyboards/frobiac/blackbowl/keyboard.json
 delete mode 100644 keyboards/gboards/ergotaco/info.json
 create mode 100644 keyboards/gboards/ergotaco/keyboard.json
 delete mode 100644 keyboards/gboards/georgi/info.json
 create mode 100644 keyboards/gboards/georgi/keyboard.json
 delete mode 100644 keyboards/gboards/gergo/info.json
 create mode 100644 keyboards/gboards/gergo/keyboard.json
 delete mode 100644 keyboards/gboards/gergoplex/info.json
 create mode 100644 keyboards/gboards/gergoplex/keyboard.json
 delete mode 100644 keyboards/geistmaschine/macropod/info.json
 create mode 100644 keyboards/geistmaschine/macropod/keyboard.json
 delete mode 100644 keyboards/geonworks/ee_at/info.json
 create mode 100644 keyboards/geonworks/ee_at/keyboard.json
 delete mode 100644 keyboards/geonworks/w1_at/info.json
 create mode 100644 keyboards/geonworks/w1_at/keyboard.json
 delete mode 100644 keyboards/gl516/a52gl/info.json
 create mode 100644 keyboards/gl516/a52gl/keyboard.json
 delete mode 100644 keyboards/gl516/j73gl/info.json
 create mode 100644 keyboards/gl516/j73gl/keyboard.json
 delete mode 100644 keyboards/gl516/n51gl/info.json
 create mode 100644 keyboards/gl516/n51gl/keyboard.json
 delete mode 100644 keyboards/glenpickle/chimera_ergo/info.json
 create mode 100644 keyboards/glenpickle/chimera_ergo/keyboard.json
 delete mode 100644 keyboards/glenpickle/chimera_ls/info.json
 create mode 100644 keyboards/glenpickle/chimera_ls/keyboard.json
 delete mode 100644 keyboards/glenpickle/chimera_ortho/info.json
 create mode 100644 keyboards/glenpickle/chimera_ortho/keyboard.json
 delete mode 100644 keyboards/glenpickle/chimera_ortho_plus/info.json
 create mode 100644 keyboards/glenpickle/chimera_ortho_plus/keyboard.json
 delete mode 100644 keyboards/gmmk/numpad/info.json
 create mode 100644 keyboards/gmmk/numpad/keyboard.json
 delete mode 100644 keyboards/gon/nerd60/info.json
 create mode 100644 keyboards/gon/nerd60/keyboard.json
 delete mode 100644 keyboards/gon/nerdtkl/info.json
 create mode 100644 keyboards/gon/nerdtkl/keyboard.json
 delete mode 100644 keyboards/gopolar/gg86/info.json
 create mode 100644 keyboards/gopolar/gg86/keyboard.json
 delete mode 100644 keyboards/gray_studio/cod67/info.json
 create mode 100644 keyboards/gray_studio/cod67/keyboard.json
 delete mode 100644 keyboards/gregandcin/teaqueen/info.json
 create mode 100644 keyboards/gregandcin/teaqueen/keyboard.json

diff --git a/keyboards/fallacy/info.json b/keyboards/fallacy/info.json
deleted file mode 100644
index fbeca239d9..0000000000
--- a/keyboards/fallacy/info.json
+++ /dev/null
@@ -1,211 +0,0 @@
-{
-    "keyboard_name": "Fallacy",
-    "manufacturer": "SheuBox",
-    "maintainer": "Toraifu",
-    "usb": {
-        "vid": "0xBF00",
-        "pid": "0xBFFA",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"],
-        "rows": ["B1", "B2", "B3", "C6", "C7"]
-    },
-    "diode_direction": "COL2ROW",
-    "rgblight": {
-        "led_count": 14,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "D2"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "features": {
-        "bootmagic": true,
-        "mousekey": false,
-        "extrakey": true,
-        "command": true,
-        "nkro": true,
-        "rgblight": true
-    },
-    "community_layouts": ["alice", "alice_split_bs"],
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_alice_split_bs",
-        "LAYOUT_default": "LAYOUT_alice"
-    },
-    "layouts": {
-        "LAYOUT_alice_split_bs": {
-            "layout": [
-                {"matrix": [1, 0], "x": 0.5, "y": 0},
-
-                {"matrix": [0, 0], "x": 1.75, "y": 0},
-                {"matrix": [0, 1], "x": 2.75, "y": 0},
-                {"matrix": [0, 2], "x": 3.75, "y": 0},
-                {"matrix": [0, 3], "x": 4.75, "y": 0},
-                {"matrix": [0, 4], "x": 5.75, "y": 0},
-                {"matrix": [0, 5], "x": 6.75, "y": 0},
-                {"matrix": [0, 6], "x": 7.75, "y": 0},
-
-                {"matrix": [0, 7], "x": 10, "y": 0},
-                {"matrix": [0, 8], "x": 11, "y": 0},
-                {"matrix": [0, 9], "x": 12, "y": 0},
-                {"matrix": [0, 10], "x": 13, "y": 0},
-                {"matrix": [0, 11], "x": 14, "y": 0},
-                {"matrix": [0, 12], "x": 15, "y": 0},
-                {"matrix": [0, 13], "x": 16, "y": 0},
-                {"matrix": [0, 14], "x": 17, "y": 0},
-
-                {"matrix": [2, 0], "x": 0.25, "y": 1},
-
-                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 3, "y": 1},
-                {"matrix": [1, 3], "x": 4, "y": 1},
-                {"matrix": [1, 4], "x": 5, "y": 1},
-                {"matrix": [1, 5], "x": 6, "y": 1},
-                {"matrix": [1, 6], "x": 7, "y": 1},
-
-                {"matrix": [1, 7], "x": 9.75, "y": 1},
-                {"matrix": [1, 8], "x": 10.75, "y": 1},
-                {"matrix": [1, 9], "x": 11.75, "y": 1},
-                {"matrix": [1, 10], "x": 12.75, "y": 1},
-                {"matrix": [1, 11], "x": 13.75, "y": 1},
-                {"matrix": [1, 12], "x": 14.75, "y": 1},
-                {"matrix": [1, 13], "x": 15.75, "y": 1},
-                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
-
-                {"matrix": [3, 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": 10.25, "y": 2},
-                {"matrix": [2, 8], "x": 11.25, "y": 2},
-                {"matrix": [2, 9], "x": 12.25, "y": 2},
-                {"matrix": [2, 10], "x": 13.25, "y": 2},
-                {"matrix": [2, 11], "x": 14.25, "y": 2},
-                {"matrix": [2, 12], "x": 15.25, "y": 2},
-                {"matrix": [2, 14], "x": 16.25, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 1], "x": 1, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-
-                {"matrix": [3, 7], "x": 10, "y": 3},
-                {"matrix": [3, 8], "x": 11, "y": 3},
-                {"matrix": [3, 9], "x": 12, "y": 3},
-                {"matrix": [3, 10], "x": 13, "y": 3},
-                {"matrix": [3, 11], "x": 14, "y": 3},
-                {"matrix": [3, 12], "x": 15, "y": 3},
-                {"matrix": [3, 13], "x": 16, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 17.75, "y": 3},
-
-                {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.5},
-                {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.5},
-                {"matrix": [4, 5], "x": 5.5, "y": 4, "w": 2.25},
-                {"matrix": [4, 6], "x": 7.75, "y": 4},
-                {"matrix": [4, 8], "x": 10, "y": 4, "w": 2.75},
-                {"matrix": [4, 10], "x": 12.75, "y": 4, "w": 1.5},
-                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_alice": {
-            "layout": [
-                {"matrix": [1, 0], "x": 0.5, "y": 0},
-
-                {"matrix": [0, 0], "x": 1.75, "y": 0},
-                {"matrix": [0, 1], "x": 2.75, "y": 0},
-                {"matrix": [0, 2], "x": 3.75, "y": 0},
-                {"matrix": [0, 3], "x": 4.75, "y": 0},
-                {"matrix": [0, 4], "x": 5.75, "y": 0},
-                {"matrix": [0, 5], "x": 6.75, "y": 0},
-                {"matrix": [0, 6], "x": 7.75, "y": 0},
-
-                {"matrix": [0, 7], "x": 10, "y": 0},
-                {"matrix": [0, 8], "x": 11, "y": 0},
-                {"matrix": [0, 9], "x": 12, "y": 0},
-                {"matrix": [0, 10], "x": 13, "y": 0},
-                {"matrix": [0, 11], "x": 14, "y": 0},
-                {"matrix": [0, 12], "x": 15, "y": 0},
-                {"matrix": [0, 14], "x": 16, "y": 0, "w": 2},
-
-                {"matrix": [2, 0], "x": 0.25, "y": 1},
-
-                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 3, "y": 1},
-                {"matrix": [1, 3], "x": 4, "y": 1},
-                {"matrix": [1, 4], "x": 5, "y": 1},
-                {"matrix": [1, 5], "x": 6, "y": 1},
-                {"matrix": [1, 6], "x": 7, "y": 1},
-
-                {"matrix": [1, 7], "x": 9.75, "y": 1},
-                {"matrix": [1, 8], "x": 10.75, "y": 1},
-                {"matrix": [1, 9], "x": 11.75, "y": 1},
-                {"matrix": [1, 10], "x": 12.75, "y": 1},
-                {"matrix": [1, 11], "x": 13.75, "y": 1},
-                {"matrix": [1, 12], "x": 14.75, "y": 1},
-                {"matrix": [1, 13], "x": 15.75, "y": 1},
-                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
-
-                {"matrix": [3, 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": 10.25, "y": 2},
-                {"matrix": [2, 8], "x": 11.25, "y": 2},
-                {"matrix": [2, 9], "x": 12.25, "y": 2},
-                {"matrix": [2, 10], "x": 13.25, "y": 2},
-                {"matrix": [2, 11], "x": 14.25, "y": 2},
-                {"matrix": [2, 12], "x": 15.25, "y": 2},
-                {"matrix": [2, 14], "x": 16.25, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 1], "x": 1, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-
-                {"matrix": [3, 7], "x": 10, "y": 3},
-                {"matrix": [3, 8], "x": 11, "y": 3},
-                {"matrix": [3, 9], "x": 12, "y": 3},
-                {"matrix": [3, 10], "x": 13, "y": 3},
-                {"matrix": [3, 11], "x": 14, "y": 3},
-                {"matrix": [3, 12], "x": 15, "y": 3},
-                {"matrix": [3, 13], "x": 16, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 17.75, "y": 3},
-
-                {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.5},
-                {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.5},
-                {"matrix": [4, 5], "x": 5.5, "y": 4, "w": 2.25},
-                {"matrix": [4, 6], "x": 7.75, "y": 4},
-                {"matrix": [4, 8], "x": 10, "y": 4, "w": 2.75},
-                {"matrix": [4, 10], "x": 12.75, "y": 4, "w": 1.5},
-                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fallacy/keyboard.json b/keyboards/fallacy/keyboard.json
new file mode 100644
index 0000000000..fbeca239d9
--- /dev/null
+++ b/keyboards/fallacy/keyboard.json
@@ -0,0 +1,211 @@
+{
+    "keyboard_name": "Fallacy",
+    "manufacturer": "SheuBox",
+    "maintainer": "Toraifu",
+    "usb": {
+        "vid": "0xBF00",
+        "pid": "0xBFFA",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"],
+        "rows": ["B1", "B2", "B3", "C6", "C7"]
+    },
+    "diode_direction": "COL2ROW",
+    "rgblight": {
+        "led_count": 14,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "D2"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "community_layouts": ["alice", "alice_split_bs"],
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_alice_split_bs",
+        "LAYOUT_default": "LAYOUT_alice"
+    },
+    "layouts": {
+        "LAYOUT_alice_split_bs": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.75, "y": 0},
+                {"matrix": [0, 1], "x": 2.75, "y": 0},
+                {"matrix": [0, 2], "x": 3.75, "y": 0},
+                {"matrix": [0, 3], "x": 4.75, "y": 0},
+                {"matrix": [0, 4], "x": 5.75, "y": 0},
+                {"matrix": [0, 5], "x": 6.75, "y": 0},
+                {"matrix": [0, 6], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 10, "y": 0},
+                {"matrix": [0, 8], "x": 11, "y": 0},
+                {"matrix": [0, 9], "x": 12, "y": 0},
+                {"matrix": [0, 10], "x": 13, "y": 0},
+                {"matrix": [0, 11], "x": 14, "y": 0},
+                {"matrix": [0, 12], "x": 15, "y": 0},
+                {"matrix": [0, 13], "x": 16, "y": 0},
+                {"matrix": [0, 14], "x": 17, "y": 0},
+
+                {"matrix": [2, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+
+                {"matrix": [1, 7], "x": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 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": 10.25, "y": 2},
+                {"matrix": [2, 8], "x": 11.25, "y": 2},
+                {"matrix": [2, 9], "x": 12.25, "y": 2},
+                {"matrix": [2, 10], "x": 13.25, "y": 2},
+                {"matrix": [2, 11], "x": 14.25, "y": 2},
+                {"matrix": [2, 12], "x": 15.25, "y": 2},
+                {"matrix": [2, 14], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+
+                {"matrix": [3, 7], "x": 10, "y": 3},
+                {"matrix": [3, 8], "x": 11, "y": 3},
+                {"matrix": [3, 9], "x": 12, "y": 3},
+                {"matrix": [3, 10], "x": 13, "y": 3},
+                {"matrix": [3, 11], "x": 14, "y": 3},
+                {"matrix": [3, 12], "x": 15, "y": 3},
+                {"matrix": [3, 13], "x": 16, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.75, "y": 3},
+
+                {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.5, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 7.75, "y": 4},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.75, "y": 0},
+                {"matrix": [0, 1], "x": 2.75, "y": 0},
+                {"matrix": [0, 2], "x": 3.75, "y": 0},
+                {"matrix": [0, 3], "x": 4.75, "y": 0},
+                {"matrix": [0, 4], "x": 5.75, "y": 0},
+                {"matrix": [0, 5], "x": 6.75, "y": 0},
+                {"matrix": [0, 6], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 10, "y": 0},
+                {"matrix": [0, 8], "x": 11, "y": 0},
+                {"matrix": [0, 9], "x": 12, "y": 0},
+                {"matrix": [0, 10], "x": 13, "y": 0},
+                {"matrix": [0, 11], "x": 14, "y": 0},
+                {"matrix": [0, 12], "x": 15, "y": 0},
+                {"matrix": [0, 14], "x": 16, "y": 0, "w": 2},
+
+                {"matrix": [2, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+
+                {"matrix": [1, 7], "x": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 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": 10.25, "y": 2},
+                {"matrix": [2, 8], "x": 11.25, "y": 2},
+                {"matrix": [2, 9], "x": 12.25, "y": 2},
+                {"matrix": [2, 10], "x": 13.25, "y": 2},
+                {"matrix": [2, 11], "x": 14.25, "y": 2},
+                {"matrix": [2, 12], "x": 15.25, "y": 2},
+                {"matrix": [2, 14], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+
+                {"matrix": [3, 7], "x": 10, "y": 3},
+                {"matrix": [3, 8], "x": 11, "y": 3},
+                {"matrix": [3, 9], "x": 12, "y": 3},
+                {"matrix": [3, 10], "x": 13, "y": 3},
+                {"matrix": [3, 11], "x": 14, "y": 3},
+                {"matrix": [3, 12], "x": 15, "y": 3},
+                {"matrix": [3, 13], "x": 16, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.75, "y": 3},
+
+                {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.5, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 7.75, "y": 4},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fc660c/info.json b/keyboards/fc660c/info.json
deleted file mode 100644
index 6c573fef88..0000000000
--- a/keyboards/fc660c/info.json
+++ /dev/null
@@ -1,107 +0,0 @@
-{
-    "keyboard_name": "FC660C",
-    "manufacturer": "Hasu",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x4853",
-        "pid": "0x660C",
-        "device_version": "1.0.0"
-    },
-    "tapping": {
-        "term": 175
-    },
-    "indicators": {
-        "caps_lock": "B6",
-        "on_state": 0
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "features": {
-        "bootmagic": false,
-        "mousekey": true,
-        "extrakey": true,
-        "console": true,
-        "command": true,
-        "nkro": true
-    },
-    "debounce": 0,
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [1, 3], "x": 0, "y": 0},
-                {"matrix": [1, 0], "x": 1, "y": 0},
-                {"matrix": [1, 1], "x": 2, "y": 0},
-                {"matrix": [1, 2], "x": 3, "y": 0},
-                {"matrix": [1, 4], "x": 4, "y": 0},
-                {"matrix": [1, 6], "x": 5, "y": 0},
-                {"matrix": [1, 7], "x": 6, "y": 0},
-                {"matrix": [1, 5], "x": 7, "y": 0},
-                {"matrix": [1, 11], "x": 8, "y": 0},
-                {"matrix": [1, 8], "x": 9, "y": 0},
-                {"matrix": [1, 9], "x": 10, "y": 0},
-                {"matrix": [1, 10], "x": 11, "y": 0},
-                {"matrix": [1, 12], "x": 12, "y": 0},
-                {"matrix": [1, 14], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 15], "x": 15.5, "y": 0},
-
-                {"matrix": [0, 3], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [0, 0], "x": 1.5, "y": 1},
-                {"matrix": [0, 1], "x": 2.5, "y": 1},
-                {"matrix": [0, 2], "x": 3.5, "y": 1},
-                {"matrix": [0, 4], "x": 4.5, "y": 1},
-                {"matrix": [0, 6], "x": 5.5, "y": 1},
-                {"matrix": [0, 7], "x": 6.5, "y": 1},
-                {"matrix": [0, 5], "x": 7.5, "y": 1},
-                {"matrix": [0, 11], "x": 8.5, "y": 1},
-                {"matrix": [0, 8], "x": 9.5, "y": 1},
-                {"matrix": [0, 9], "x": 10.5, "y": 1},
-                {"matrix": [0, 10], "x": 11.5, "y": 1},
-                {"matrix": [0, 12], "x": 12.5, "y": 1},
-                {"matrix": [0, 14], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [0, 15], "x": 15.5, "y": 1},
-
-                {"matrix": [4, 3], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [4, 0], "x": 1.75, "y": 2},
-                {"matrix": [4, 1], "x": 2.75, "y": 2},
-                {"matrix": [4, 2], "x": 3.75, "y": 2},
-                {"matrix": [4, 4], "x": 4.75, "y": 2},
-                {"matrix": [4, 6], "x": 5.75, "y": 2},
-                {"matrix": [4, 7], "x": 6.75, "y": 2},
-                {"matrix": [4, 5], "x": 7.75, "y": 2},
-                {"matrix": [4, 11], "x": 8.75, "y": 2},
-                {"matrix": [4, 8], "x": 9.75, "y": 2},
-                {"matrix": [4, 9], "x": 10.75, "y": 2},
-                {"matrix": [4, 10], "x": 11.75, "y": 2},
-                {"matrix": [4, 14], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 3], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 6], "x": 5.25, "y": 3},
-                {"matrix": [3, 7], "x": 6.25, "y": 3},
-                {"matrix": [3, 5], "x": 7.25, "y": 3},
-                {"matrix": [3, 11], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 13], "x": 14.5, "y": 3},
-
-                {"matrix": [2, 3], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [2, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [2, 7], "x": 3.75, "y": 4, "w": 6},
-                {"matrix": [2, 8], "x": 9.75, "y": 4, "w": 1.25},
-                {"matrix": [2, 10], "x": 11, "y": 4, "w": 1.25},
-                {"matrix": [2, 12], "x": 12.25, "y": 4, "w": 1.25},
-                {"matrix": [2, 14], "x": 13.5, "y": 4},
-                {"matrix": [2, 13], "x": 14.5, "y": 4},
-                {"matrix": [2, 15], "x": 15.5, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fc660c/keyboard.json b/keyboards/fc660c/keyboard.json
new file mode 100644
index 0000000000..6c573fef88
--- /dev/null
+++ b/keyboards/fc660c/keyboard.json
@@ -0,0 +1,107 @@
+{
+    "keyboard_name": "FC660C",
+    "manufacturer": "Hasu",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4853",
+        "pid": "0x660C",
+        "device_version": "1.0.0"
+    },
+    "tapping": {
+        "term": 175
+    },
+    "indicators": {
+        "caps_lock": "B6",
+        "on_state": 0
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true
+    },
+    "debounce": 0,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [1, 3], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [1, 2], "x": 3, "y": 0},
+                {"matrix": [1, 4], "x": 4, "y": 0},
+                {"matrix": [1, 6], "x": 5, "y": 0},
+                {"matrix": [1, 7], "x": 6, "y": 0},
+                {"matrix": [1, 5], "x": 7, "y": 0},
+                {"matrix": [1, 11], "x": 8, "y": 0},
+                {"matrix": [1, 8], "x": 9, "y": 0},
+                {"matrix": [1, 9], "x": 10, "y": 0},
+                {"matrix": [1, 10], "x": 11, "y": 0},
+                {"matrix": [1, 12], "x": 12, "y": 0},
+                {"matrix": [1, 14], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.5, "y": 0},
+
+                {"matrix": [0, 3], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [0, 0], "x": 1.5, "y": 1},
+                {"matrix": [0, 1], "x": 2.5, "y": 1},
+                {"matrix": [0, 2], "x": 3.5, "y": 1},
+                {"matrix": [0, 4], "x": 4.5, "y": 1},
+                {"matrix": [0, 6], "x": 5.5, "y": 1},
+                {"matrix": [0, 7], "x": 6.5, "y": 1},
+                {"matrix": [0, 5], "x": 7.5, "y": 1},
+                {"matrix": [0, 11], "x": 8.5, "y": 1},
+                {"matrix": [0, 8], "x": 9.5, "y": 1},
+                {"matrix": [0, 9], "x": 10.5, "y": 1},
+                {"matrix": [0, 10], "x": 11.5, "y": 1},
+                {"matrix": [0, 12], "x": 12.5, "y": 1},
+                {"matrix": [0, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [0, 15], "x": 15.5, "y": 1},
+
+                {"matrix": [4, 3], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [4, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [4, 2], "x": 3.75, "y": 2},
+                {"matrix": [4, 4], "x": 4.75, "y": 2},
+                {"matrix": [4, 6], "x": 5.75, "y": 2},
+                {"matrix": [4, 7], "x": 6.75, "y": 2},
+                {"matrix": [4, 5], "x": 7.75, "y": 2},
+                {"matrix": [4, 11], "x": 8.75, "y": 2},
+                {"matrix": [4, 8], "x": 9.75, "y": 2},
+                {"matrix": [4, 9], "x": 10.75, "y": 2},
+                {"matrix": [4, 10], "x": 11.75, "y": 2},
+                {"matrix": [4, 14], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 3], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 6], "x": 5.25, "y": 3},
+                {"matrix": [3, 7], "x": 6.25, "y": 3},
+                {"matrix": [3, 5], "x": 7.25, "y": 3},
+                {"matrix": [3, 11], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 13], "x": 14.5, "y": 3},
+
+                {"matrix": [2, 3], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [2, 7], "x": 3.75, "y": 4, "w": 6},
+                {"matrix": [2, 8], "x": 9.75, "y": 4, "w": 1.25},
+                {"matrix": [2, 10], "x": 11, "y": 4, "w": 1.25},
+                {"matrix": [2, 12], "x": 12.25, "y": 4, "w": 1.25},
+                {"matrix": [2, 14], "x": 13.5, "y": 4},
+                {"matrix": [2, 13], "x": 14.5, "y": 4},
+                {"matrix": [2, 15], "x": 15.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fc980c/info.json b/keyboards/fc980c/info.json
deleted file mode 100644
index 9944dd3899..0000000000
--- a/keyboards/fc980c/info.json
+++ /dev/null
@@ -1,150 +0,0 @@
-{
-  "keyboard_name": "FC980C",
-  "manufacturer": "Hasu",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0x4853",
-    "pid": "0x980C",
-    "device_version": "1.0.0"
-  },
-  "dynamic_keymap": {
-    "layer_count": 3
-  },
-  "indicators": {
-    "caps_lock": "B5",
-    "num_lock": "B4",
-    "scroll_lock": "B6"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "atmel-dfu",
-  "features": {
-    "bootmagic": false,
-    "mousekey": true,
-    "extrakey": true,
-    "console": true,
-    "command": true,
-    "nkro": true
-  },
-  "debounce": 0,
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [0, 13], "x": 0, "y": 0},
-
-        {"matrix": [2, 13], "x": 2, "y": 0},
-        {"matrix": [5, 13], "x": 3, "y": 0},
-        {"matrix": [3, 13], "x": 4, "y": 0},
-        {"matrix": [6, 13], "x": 5, "y": 0},
-
-        {"matrix": [7, 13], "x": 6.5, "y": 0},
-        {"matrix": [7, 15], "x": 7.5, "y": 0},
-        {"matrix": [7, 14], "x": 8.5, "y": 0},
-        {"matrix": [7, 12], "x": 9.5, "y": 0},
-
-        {"matrix": [7, 2], "x": 11, "y": 0},
-        {"matrix": [7, 1], "x": 12, "y": 0},
-        {"matrix": [7, 0], "x": 13, "y": 0},
-        {"matrix": [7, 3], "x": 14, "y": 0},
-
-        {"matrix": [7, 4], "x": 15.5, "y": 0},
-        {"matrix": [7, 6], "x": 16.5, "y": 0},
-        {"matrix": [7, 7], "x": 17.5, "y": 0},
-        {"matrix": [7, 5], "x": 18.5, "y": 0},
-
-        {"matrix": [0, 10], "x": 0, "y": 1.5},
-        {"matrix": [6, 9], "x": 1, "y": 1.5},
-        {"matrix": [5, 9], "x": 2, "y": 1.5},
-        {"matrix": [5, 8], "x": 3, "y": 1.5},
-        {"matrix": [5, 11], "x": 4, "y": 1.5},
-        {"matrix": [6, 15], "x": 5, "y": 1.5},
-        {"matrix": [5, 15], "x": 6, "y": 1.5},
-        {"matrix": [5, 14], "x": 7, "y": 1.5},
-        {"matrix": [6, 12], "x": 8, "y": 1.5},
-        {"matrix": [5, 12], "x": 9, "y": 1.5},
-        {"matrix": [5, 2], "x": 10, "y": 1.5},
-        {"matrix": [5, 1], "x": 11, "y": 1.5},
-        {"matrix": [5, 0], "x": 12, "y": 1.5},
-        {"matrix": [5, 5], "x": 13, "y": 1.5, "w": 2},
-
-        {"matrix": [5, 4], "x": 15.5, "y": 1.5},
-        {"matrix": [5, 6], "x": 16.5, "y": 1.5},
-        {"matrix": [5, 7], "x": 17.5, "y": 1.5},
-        {"matrix": [6, 5], "x": 18.5, "y": 1.5},
-
-        {"matrix": [6, 10], "x": 0, "y": 2.5, "w": 1.5},
-        {"matrix": [3, 9], "x": 1.5, "y": 2.5},
-        {"matrix": [6, 8], "x": 2.5, "y": 2.5},
-        {"matrix": [6, 11], "x": 3.5, "y": 2.5},
-        {"matrix": [3, 11], "x": 4.5, "y": 2.5},
-        {"matrix": [3, 15], "x": 5.5, "y": 2.5},
-        {"matrix": [6, 14], "x": 6.5, "y": 2.5},
-        {"matrix": [3, 14], "x": 7.5, "y": 2.5},
-        {"matrix": [3, 12], "x": 8.5, "y": 2.5},
-        {"matrix": [6, 2], "x": 9.5, "y": 2.5},
-        {"matrix": [6, 1], "x": 10.5, "y": 2.5},
-        {"matrix": [6, 0], "x": 11.5, "y": 2.5},
-        {"matrix": [3, 3], "x": 12.5, "y": 2.5},
-        {"matrix": [5, 3], "x": 13.5, "y": 2.5, "w": 1.5},
-
-        {"matrix": [6, 4], "x": 15.5, "y": 2.5},
-        {"matrix": [6, 6], "x": 16.5, "y": 2.5},
-        {"matrix": [6, 7], "x": 17.5, "y": 2.5},
-        {"matrix": [2, 5], "x": 18.5, "y": 2.5, "h": 2},
-
-        {"matrix": [3, 10], "x": 0, "y": 3.5, "w": 1.75},
-        {"matrix": [2, 9], "x": 1.75, "y": 3.5},
-        {"matrix": [3, 8], "x": 2.75, "y": 3.5},
-        {"matrix": [2, 8], "x": 3.75, "y": 3.5},
-        {"matrix": [2, 11], "x": 4.75, "y": 3.5},
-        {"matrix": [2, 15], "x": 5.75, "y": 3.5},
-        {"matrix": [2, 14], "x": 6.75, "y": 3.5},
-        {"matrix": [2, 12], "x": 7.75, "y": 3.5},
-        {"matrix": [1, 12], "x": 8.75, "y": 3.5},
-        {"matrix": [3, 2], "x": 9.75, "y": 3.5},
-        {"matrix": [3, 1], "x": 10.75, "y": 3.5},
-        {"matrix": [2, 0], "x": 11.75, "y": 3.5},
-        {"matrix": [6, 3], "x": 12.75, "y": 3.5, "w": 2.25},
-
-        {"matrix": [2, 4], "x": 15.5, "y": 3.5},
-        {"matrix": [2, 6], "x": 16.5, "y": 3.5},
-        {"matrix": [2, 7], "x": 17.5, "y": 3.5},
-
-        {"matrix": [2, 10], "x": 0, "y": 4.5, "w": 2.25},
-        {"matrix": [1, 8], "x": 2.25, "y": 4.5},
-        {"matrix": [0, 8], "x": 3.25, "y": 4.5},
-        {"matrix": [1, 11], "x": 4.25, "y": 4.5},
-        {"matrix": [0, 11], "x": 5.25, "y": 4.5},
-        {"matrix": [1, 15], "x": 6.25, "y": 4.5},
-        {"matrix": [1, 14], "x": 7.25, "y": 4.5},
-        {"matrix": [0, 14], "x": 8.25, "y": 4.5},
-        {"matrix": [2, 2], "x": 9.25, "y": 4.5},
-        {"matrix": [1, 1], "x": 10.25, "y": 4.5},
-        {"matrix": [2, 1], "x": 11.25, "y": 4.5},
-        {"matrix": [3, 0], "x": 12.25, "y": 4.5, "w": 1.75},
-
-        {"matrix": [3, 4], "x": 14.25, "y": 4.75},
-
-        {"matrix": [1, 4], "x": 15.5, "y": 4.5},
-        {"matrix": [1, 6], "x": 16.5, "y": 4.5},
-        {"matrix": [1, 7], "x": 17.5, "y": 4.5},
-        {"matrix": [1, 5], "x": 18.5, "y": 4.5, "h": 2},
-
-        {"matrix": [1, 10], "x": 0, "y": 5.5, "w": 1.25},
-        {"matrix": [0, 9], "x": 1.25, "y": 5.5},
-        {"matrix": [1, 9], "x": 2.25, "y": 5.5, "w": 1.25},
-        {"matrix": [0, 15], "x": 3.5, "y": 5.5, "w": 6},
-        {"matrix": [0, 2], "x": 9.5, "y": 5.5, "w": 1.25},
-        {"matrix": [0, 1], "x": 10.75, "y": 5.5},
-        {"matrix": [1, 0], "x": 11.75, "y": 5.5, "w": 1.25},
-
-        {"matrix": [0, 0], "x": 13.25, "y": 5.75},
-        {"matrix": [0, 4], "x": 14.25, "y": 5.75},
-        {"matrix": [0, 6], "x": 15.25, "y": 5.75},
-
-        {"matrix": [0, 7], "x": 16.5, "y": 5.5},
-        {"matrix": [0, 5], "x": 17.5, "y": 5.5}
-      ]
-    }
-  }
-}
diff --git a/keyboards/fc980c/keyboard.json b/keyboards/fc980c/keyboard.json
new file mode 100644
index 0000000000..9944dd3899
--- /dev/null
+++ b/keyboards/fc980c/keyboard.json
@@ -0,0 +1,150 @@
+{
+  "keyboard_name": "FC980C",
+  "manufacturer": "Hasu",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0x4853",
+    "pid": "0x980C",
+    "device_version": "1.0.0"
+  },
+  "dynamic_keymap": {
+    "layer_count": 3
+  },
+  "indicators": {
+    "caps_lock": "B5",
+    "num_lock": "B4",
+    "scroll_lock": "B6"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "console": true,
+    "command": true,
+    "nkro": true
+  },
+  "debounce": 0,
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 13], "x": 0, "y": 0},
+
+        {"matrix": [2, 13], "x": 2, "y": 0},
+        {"matrix": [5, 13], "x": 3, "y": 0},
+        {"matrix": [3, 13], "x": 4, "y": 0},
+        {"matrix": [6, 13], "x": 5, "y": 0},
+
+        {"matrix": [7, 13], "x": 6.5, "y": 0},
+        {"matrix": [7, 15], "x": 7.5, "y": 0},
+        {"matrix": [7, 14], "x": 8.5, "y": 0},
+        {"matrix": [7, 12], "x": 9.5, "y": 0},
+
+        {"matrix": [7, 2], "x": 11, "y": 0},
+        {"matrix": [7, 1], "x": 12, "y": 0},
+        {"matrix": [7, 0], "x": 13, "y": 0},
+        {"matrix": [7, 3], "x": 14, "y": 0},
+
+        {"matrix": [7, 4], "x": 15.5, "y": 0},
+        {"matrix": [7, 6], "x": 16.5, "y": 0},
+        {"matrix": [7, 7], "x": 17.5, "y": 0},
+        {"matrix": [7, 5], "x": 18.5, "y": 0},
+
+        {"matrix": [0, 10], "x": 0, "y": 1.5},
+        {"matrix": [6, 9], "x": 1, "y": 1.5},
+        {"matrix": [5, 9], "x": 2, "y": 1.5},
+        {"matrix": [5, 8], "x": 3, "y": 1.5},
+        {"matrix": [5, 11], "x": 4, "y": 1.5},
+        {"matrix": [6, 15], "x": 5, "y": 1.5},
+        {"matrix": [5, 15], "x": 6, "y": 1.5},
+        {"matrix": [5, 14], "x": 7, "y": 1.5},
+        {"matrix": [6, 12], "x": 8, "y": 1.5},
+        {"matrix": [5, 12], "x": 9, "y": 1.5},
+        {"matrix": [5, 2], "x": 10, "y": 1.5},
+        {"matrix": [5, 1], "x": 11, "y": 1.5},
+        {"matrix": [5, 0], "x": 12, "y": 1.5},
+        {"matrix": [5, 5], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [5, 4], "x": 15.5, "y": 1.5},
+        {"matrix": [5, 6], "x": 16.5, "y": 1.5},
+        {"matrix": [5, 7], "x": 17.5, "y": 1.5},
+        {"matrix": [6, 5], "x": 18.5, "y": 1.5},
+
+        {"matrix": [6, 10], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [3, 9], "x": 1.5, "y": 2.5},
+        {"matrix": [6, 8], "x": 2.5, "y": 2.5},
+        {"matrix": [6, 11], "x": 3.5, "y": 2.5},
+        {"matrix": [3, 11], "x": 4.5, "y": 2.5},
+        {"matrix": [3, 15], "x": 5.5, "y": 2.5},
+        {"matrix": [6, 14], "x": 6.5, "y": 2.5},
+        {"matrix": [3, 14], "x": 7.5, "y": 2.5},
+        {"matrix": [3, 12], "x": 8.5, "y": 2.5},
+        {"matrix": [6, 2], "x": 9.5, "y": 2.5},
+        {"matrix": [6, 1], "x": 10.5, "y": 2.5},
+        {"matrix": [6, 0], "x": 11.5, "y": 2.5},
+        {"matrix": [3, 3], "x": 12.5, "y": 2.5},
+        {"matrix": [5, 3], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [6, 4], "x": 15.5, "y": 2.5},
+        {"matrix": [6, 6], "x": 16.5, "y": 2.5},
+        {"matrix": [6, 7], "x": 17.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 18.5, "y": 2.5, "h": 2},
+
+        {"matrix": [3, 10], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [2, 9], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 2.75, "y": 3.5},
+        {"matrix": [2, 8], "x": 3.75, "y": 3.5},
+        {"matrix": [2, 11], "x": 4.75, "y": 3.5},
+        {"matrix": [2, 15], "x": 5.75, "y": 3.5},
+        {"matrix": [2, 14], "x": 6.75, "y": 3.5},
+        {"matrix": [2, 12], "x": 7.75, "y": 3.5},
+        {"matrix": [1, 12], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 2], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 1], "x": 10.75, "y": 3.5},
+        {"matrix": [2, 0], "x": 11.75, "y": 3.5},
+        {"matrix": [6, 3], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [2, 4], "x": 15.5, "y": 3.5},
+        {"matrix": [2, 6], "x": 16.5, "y": 3.5},
+        {"matrix": [2, 7], "x": 17.5, "y": 3.5},
+
+        {"matrix": [2, 10], "x": 0, "y": 4.5, "w": 2.25},
+        {"matrix": [1, 8], "x": 2.25, "y": 4.5},
+        {"matrix": [0, 8], "x": 3.25, "y": 4.5},
+        {"matrix": [1, 11], "x": 4.25, "y": 4.5},
+        {"matrix": [0, 11], "x": 5.25, "y": 4.5},
+        {"matrix": [1, 15], "x": 6.25, "y": 4.5},
+        {"matrix": [1, 14], "x": 7.25, "y": 4.5},
+        {"matrix": [0, 14], "x": 8.25, "y": 4.5},
+        {"matrix": [2, 2], "x": 9.25, "y": 4.5},
+        {"matrix": [1, 1], "x": 10.25, "y": 4.5},
+        {"matrix": [2, 1], "x": 11.25, "y": 4.5},
+        {"matrix": [3, 0], "x": 12.25, "y": 4.5, "w": 1.75},
+
+        {"matrix": [3, 4], "x": 14.25, "y": 4.75},
+
+        {"matrix": [1, 4], "x": 15.5, "y": 4.5},
+        {"matrix": [1, 6], "x": 16.5, "y": 4.5},
+        {"matrix": [1, 7], "x": 17.5, "y": 4.5},
+        {"matrix": [1, 5], "x": 18.5, "y": 4.5, "h": 2},
+
+        {"matrix": [1, 10], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [0, 9], "x": 1.25, "y": 5.5},
+        {"matrix": [1, 9], "x": 2.25, "y": 5.5, "w": 1.25},
+        {"matrix": [0, 15], "x": 3.5, "y": 5.5, "w": 6},
+        {"matrix": [0, 2], "x": 9.5, "y": 5.5, "w": 1.25},
+        {"matrix": [0, 1], "x": 10.75, "y": 5.5},
+        {"matrix": [1, 0], "x": 11.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [0, 0], "x": 13.25, "y": 5.75},
+        {"matrix": [0, 4], "x": 14.25, "y": 5.75},
+        {"matrix": [0, 6], "x": 15.25, "y": 5.75},
+
+        {"matrix": [0, 7], "x": 16.5, "y": 5.5},
+        {"matrix": [0, 5], "x": 17.5, "y": 5.5}
+      ]
+    }
+  }
+}
diff --git a/keyboards/ferris/0_1/info.json b/keyboards/ferris/0_1/info.json
deleted file mode 100644
index a7f7c08bec..0000000000
--- a/keyboards/ferris/0_1/info.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-    "keyboard_name": "Ferris the keeb",
-    "manufacturer": "Pierre",
-    "usb": {
-        "vid": "0xC2AB",
-        "pid": "0x0000",
-        "device_version": "0.0.1",
-        "no_startup_check": true
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "features": {
-        "bootmagic": false,
-        "mousekey": true,
-        "extrakey": true,
-        "unicode": true
-    },
-    "build": {
-        "lto": true
-    },
-    "community_layouts": ["split_3x5_2"],
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_split_3x5_2"
-    },
-    "layouts": {
-        "LAYOUT_split_3x5_2": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.93},
-                {"matrix": [0, 1], "x": 1, "y": 0.31},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0.28},
-                {"matrix": [0, 4], "x": 4, "y": 0.42},
-
-                {"matrix": [4, 0], "x": 7, "y": 0.42},
-                {"matrix": [4, 1], "x": 8, "y": 0.28},
-                {"matrix": [4, 2], "x": 9, "y": 0},
-                {"matrix": [4, 3], "x": 10, "y": 0.31},
-                {"matrix": [4, 4], "x": 11, "y": 0.93},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.93},
-                {"matrix": [1, 1], "x": 1, "y": 1.31},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1.28},
-                {"matrix": [1, 4], "x": 4, "y": 1.42},
-
-                {"matrix": [5, 0], "x": 7, "y": 1.42},
-                {"matrix": [5, 1], "x": 8, "y": 1.28},
-                {"matrix": [5, 2], "x": 9, "y": 1},
-                {"matrix": [5, 3], "x": 10, "y": 1.31},
-                {"matrix": [5, 4], "x": 11, "y": 1.93},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.93},
-                {"matrix": [2, 1], "x": 1, "y": 2.31},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2.28},
-                {"matrix": [2, 4], "x": 4, "y": 2.42},
-
-                {"matrix": [6, 0], "x": 7, "y": 2.42},
-                {"matrix": [6, 1], "x": 8, "y": 2.28},
-                {"matrix": [6, 2], "x": 9, "y": 2},
-                {"matrix": [6, 3], "x": 10, "y": 2.31},
-                {"matrix": [6, 4], "x": 11, "y": 2.93},
-
-                {"matrix": [3, 3], "x": 3.5, "y": 3.75},
-                {"matrix": [3, 4], "x": 4.5, "y": 4},
-
-                {"matrix": [7, 0], "x": 6.5, "y": 4},
-                {"matrix": [7, 1], "x": 7.5, "y": 3.75}
-            ]
-        }
-    }
-}
diff --git a/keyboards/ferris/0_1/keyboard.json b/keyboards/ferris/0_1/keyboard.json
new file mode 100644
index 0000000000..a7f7c08bec
--- /dev/null
+++ b/keyboards/ferris/0_1/keyboard.json
@@ -0,0 +1,72 @@
+{
+    "keyboard_name": "Ferris the keeb",
+    "manufacturer": "Pierre",
+    "usb": {
+        "vid": "0xC2AB",
+        "pid": "0x0000",
+        "device_version": "0.0.1",
+        "no_startup_check": true
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "unicode": true
+    },
+    "build": {
+        "lto": true
+    },
+    "community_layouts": ["split_3x5_2"],
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_split_3x5_2"
+    },
+    "layouts": {
+        "LAYOUT_split_3x5_2": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.93},
+                {"matrix": [0, 1], "x": 1, "y": 0.31},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.28},
+                {"matrix": [0, 4], "x": 4, "y": 0.42},
+
+                {"matrix": [4, 0], "x": 7, "y": 0.42},
+                {"matrix": [4, 1], "x": 8, "y": 0.28},
+                {"matrix": [4, 2], "x": 9, "y": 0},
+                {"matrix": [4, 3], "x": 10, "y": 0.31},
+                {"matrix": [4, 4], "x": 11, "y": 0.93},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.93},
+                {"matrix": [1, 1], "x": 1, "y": 1.31},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.28},
+                {"matrix": [1, 4], "x": 4, "y": 1.42},
+
+                {"matrix": [5, 0], "x": 7, "y": 1.42},
+                {"matrix": [5, 1], "x": 8, "y": 1.28},
+                {"matrix": [5, 2], "x": 9, "y": 1},
+                {"matrix": [5, 3], "x": 10, "y": 1.31},
+                {"matrix": [5, 4], "x": 11, "y": 1.93},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.93},
+                {"matrix": [2, 1], "x": 1, "y": 2.31},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.28},
+                {"matrix": [2, 4], "x": 4, "y": 2.42},
+
+                {"matrix": [6, 0], "x": 7, "y": 2.42},
+                {"matrix": [6, 1], "x": 8, "y": 2.28},
+                {"matrix": [6, 2], "x": 9, "y": 2},
+                {"matrix": [6, 3], "x": 10, "y": 2.31},
+                {"matrix": [6, 4], "x": 11, "y": 2.93},
+
+                {"matrix": [3, 3], "x": 3.5, "y": 3.75},
+                {"matrix": [3, 4], "x": 4.5, "y": 4},
+
+                {"matrix": [7, 0], "x": 6.5, "y": 4},
+                {"matrix": [7, 1], "x": 7.5, "y": 3.75}
+            ]
+        }
+    }
+}
diff --git a/keyboards/ferris/0_2/bling/info.json b/keyboards/ferris/0_2/bling/info.json
deleted file mode 100644
index 22ef500d6d..0000000000
--- a/keyboards/ferris/0_2/bling/info.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-    "keyboard_name": "Ferris 0.2 - Bling",
-    "usb": {
-        "pid": "0x0002"
-    },
-    "rgb_matrix": {
-        "animations": {
-            "alphas_mods": true,
-            "gradient_up_down": true,
-            "gradient_left_right": true,
-            "breathing": true,
-            "band_sat": true,
-            "band_val": true,
-            "band_pinwheel_sat": true,
-            "band_pinwheel_val": true,
-            "band_spiral_sat": true,
-            "band_spiral_val": true,
-            "cycle_all": true,
-            "cycle_left_right": true,
-            "cycle_up_down": true,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": true,
-            "cycle_pinwheel": true,
-            "cycle_spiral": true,
-            "dual_beacon": true,
-            "rainbow_beacon": true,
-            "rainbow_pinwheels": true,
-            "raindrops": true,
-            "jellybean_raindrops": true,
-            "hue_breathing": true,
-            "hue_pendulum": true,
-            "hue_wave": true,
-            "pixel_rain": true,
-            "pixel_flow": true,
-            "pixel_fractal": true,
-            "typing_heatmap": true,
-            "digital_rain": true,
-            "solid_reactive_simple": true,
-            "solid_reactive": true,
-            "solid_reactive_wide": true,
-            "solid_reactive_multiwide": true,
-            "solid_reactive_cross": true,
-            "solid_reactive_multicross": true,
-            "solid_reactive_nexus": true,
-            "solid_reactive_multinexus": true,
-            "splash": true,
-            "multisplash": true,
-            "solid_splash": true,
-            "solid_multisplash": true
-        },
-        "driver": "is31fl3731"
-    },
-    "features": {
-        "rgb_matrix": true
-    }
-}
diff --git a/keyboards/ferris/0_2/bling/keyboard.json b/keyboards/ferris/0_2/bling/keyboard.json
new file mode 100644
index 0000000000..22ef500d6d
--- /dev/null
+++ b/keyboards/ferris/0_2/bling/keyboard.json
@@ -0,0 +1,57 @@
+{
+    "keyboard_name": "Ferris 0.2 - Bling",
+    "usb": {
+        "pid": "0x0002"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "is31fl3731"
+    },
+    "features": {
+        "rgb_matrix": true
+    }
+}
diff --git a/keyboards/ferris/0_2/bling/rules.mk b/keyboards/ferris/0_2/bling/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/fjlabs/7vhotswap/info.json b/keyboards/fjlabs/7vhotswap/info.json
deleted file mode 100644
index 220cf28831..0000000000
--- a/keyboards/fjlabs/7vhotswap/info.json
+++ /dev/null
@@ -1,138 +0,0 @@
-{
-    "keyboard_name": "7V Hotswap",
-    "manufacturer": "FJLaboratories",
-    "url": "http://www.fjlaboratories.com/",
-    "maintainer": "mrnoisytiger",
-    "usb": {
-        "vid": "0x7074",
-        "pid": "0x0014",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
-        "rows": ["B0", "F4", "F1", "F7", "F6", "F5"]
-    },
-    "diode_direction": "COL2ROW",
-    "rgblight": {
-        "led_count": 4,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "C7"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "features": {
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true,
-        "command": true,
-        "nkro": true,
-        "rgblight": true
-    },
-    "layouts": {
-        "LAYOUT_75_all": {
-            "layout": [
-                {"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.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-                {"matrix": [0, 9], "x": 9.75, "y": 0},
-                {"matrix": [0, 10], "x": 10.75, "y": 0},
-                {"matrix": [0, 11], "x": 11.75, "y": 0},
-                {"matrix": [0, 12], "x": 12.75, "y": 0},
-                {"matrix": [0, 13], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.25},
-                {"matrix": [1, 1], "x": 1, "y": 1.25},
-                {"matrix": [1, 2], "x": 2, "y": 1.25},
-                {"matrix": [1, 3], "x": 3, "y": 1.25},
-                {"matrix": [1, 4], "x": 4, "y": 1.25},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6, "y": 1.25},
-                {"matrix": [1, 7], "x": 7, "y": 1.25},
-                {"matrix": [1, 8], "x": 8, "y": 1.25},
-                {"matrix": [1, 9], "x": 9, "y": 1.25},
-                {"matrix": [1, 10], "x": 10, "y": 1.25},
-                {"matrix": [1, 11], "x": 11, "y": 1.25},
-                {"matrix": [1, 12], "x": 12, "y": 1.25},
-                {"matrix": [1, 13], "x": 13, "y": 1.25},
-                {"matrix": [3, 13], "x": 14, "y": 1.25},
-                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
-                {"matrix": [3, 14], "x": 15.25, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
-
-                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.5},
-
-                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
-                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
-                {"matrix": [5, 14], "x": 15.25, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fjlabs/7vhotswap/keyboard.json b/keyboards/fjlabs/7vhotswap/keyboard.json
new file mode 100644
index 0000000000..220cf28831
--- /dev/null
+++ b/keyboards/fjlabs/7vhotswap/keyboard.json
@@ -0,0 +1,138 @@
+{
+    "keyboard_name": "7V Hotswap",
+    "manufacturer": "FJLaboratories",
+    "url": "http://www.fjlaboratories.com/",
+    "maintainer": "mrnoisytiger",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x0014",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
+        "rows": ["B0", "F4", "F1", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
+    "rgblight": {
+        "led_count": 4,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "C7"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "layouts": {
+        "LAYOUT_75_all": {
+            "layout": [
+                {"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.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [3, 13], "x": 14, "y": 1.25},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 14], "x": 15.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/ad65/info.json b/keyboards/fjlabs/ad65/info.json
deleted file mode 100644
index 19adad7932..0000000000
--- a/keyboards/fjlabs/ad65/info.json
+++ /dev/null
@@ -1,730 +0,0 @@
-{
-    "keyboard_name": "AD65",
-    "manufacturer": "Absolute Designs",
-    "url": "https://arnoldh93.wixsite.com/website",
-    "maintainer": "mrnoisytiger",
-    "usb": {
-        "vid": "0x7074",
-        "pid": "0x0010",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
-        "rows": ["F4", "F1", "F7", "F6", "F5"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "C7"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "features": {
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true,
-        "command": true,
-        "nkro": true
-    },
-    "community_layouts": [
-        "65_ansi_blocker",
-        "65_ansi_blocker_split_bs",
-        "65_ansi_blocker_tsangan",
-        "65_ansi_blocker_tsangan_split_bs",
-        "65_iso_blocker",
-        "65_iso_blocker_split_bs",
-        "65_iso_blocker_tsangan",
-        "65_iso_blocker_tsangan_split_bs"
-    ],
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_blocker": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_blocker_split_bs": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_blocker_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_iso_blocker": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_iso_blocker_split_bs": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_iso_blocker_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_iso_blocker_tsangan_split_bs": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fjlabs/ad65/keyboard.json b/keyboards/fjlabs/ad65/keyboard.json
new file mode 100644
index 0000000000..19adad7932
--- /dev/null
+++ b/keyboards/fjlabs/ad65/keyboard.json
@@ -0,0 +1,730 @@
+{
+    "keyboard_name": "AD65",
+    "manufacturer": "Absolute Designs",
+    "url": "https://arnoldh93.wixsite.com/website",
+    "maintainer": "mrnoisytiger",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x0010",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
+        "rows": ["F4", "F1", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "C7"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true
+    },
+    "community_layouts": [
+        "65_ansi_blocker",
+        "65_ansi_blocker_split_bs",
+        "65_ansi_blocker_tsangan",
+        "65_ansi_blocker_tsangan_split_bs",
+        "65_iso_blocker",
+        "65_iso_blocker_split_bs",
+        "65_iso_blocker_tsangan",
+        "65_iso_blocker_tsangan_split_bs"
+    ],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker_tsangan_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+                {"label": "`", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/avalon/info.json b/keyboards/fjlabs/avalon/info.json
deleted file mode 100644
index 2407c3ec26..0000000000
--- a/keyboards/fjlabs/avalon/info.json
+++ /dev/null
@@ -1,861 +0,0 @@
-{
-    "keyboard_name": "Avalon",
-    "manufacturer": "Trailblazer Keyboards",
-    "url": "https://fjlaboratories.com/",
-    "maintainer": "mrnoisytiger",
-    "usb": {
-        "vid": "0x7074",
-        "pid": "0x0015",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B0", "F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
-        "rows": ["F4", "F1", "F7", "F6", "F5"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "C7"
-    },
-    "rgblight": {
-        "led_count": 6,
-        "brightness_steps": 12,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        },
-        "default": {
-            "animation": "rainbow_swirl",
-            "speed": 144
-        }
-    },
-    "ws2812": {
-        "pin": "D6"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "features": {
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true,
-        "command": true,
-        "nkro": true,
-        "rgblight": true
-    },
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
-                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
-                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
-                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
-                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
-                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
-                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
-                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
-                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0},
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 0},
-
-                {"label": "`", "matrix": [0, 15], "x": 16.5, "y": 0},
-
-                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
-                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
-                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
-                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
-                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
-                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
-                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
-                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
-                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
-                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
-                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
-                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
-                {"label": "\\", "matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
-
-                {"label": "Page Up", "matrix": [1, 15], "x": 16.5, "y": 1},
-
-                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
-                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
-                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
-                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
-                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
-                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
-                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
-                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
-                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
-                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
-                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
-
-                {"label": "Page Down", "matrix": [2, 15], "x": 16.5, "y": 2},
-
-                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
-
-                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
-                {"label": "Shift", "matrix": [3, 2], "x": 2.5, "y": 3},
-                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
-                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
-                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
-                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
-                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
-                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
-                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
-                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
-                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
-                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
-                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
-
-                {"label": "\u2191", "matrix": [3, 14], "x": 15.25, "y": 3},
-
-                {"label": "F5", "matrix": [4, 0], "x": 0, "y": 4},
-
-                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "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": "Space", "matrix": [4, 7], "x": 5, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [4, 13], "x": 14.25, "y": 4},
-                {"label": "\u2193", "matrix": [4, 14], "x": 15.25, "y": 4},
-                {"label": "\u2192", "matrix": [4, 15], "x": 16.25, "y": 4}
-            ]
-        },
-        "LAYOUT_ansi_blocker": {
-            "layout": [
-                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
-                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
-                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
-                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
-                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
-                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
-                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
-                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
-                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
-
-                {"label": "`", "matrix": [0, 15], "x": 16.5, "y": 0},
-
-                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
-                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
-                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
-                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
-                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
-                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
-                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
-                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
-                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
-                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
-                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
-                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
-                {"label": "\\", "matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
-
-                {"label": "Page Up", "matrix": [1, 15], "x": 16.5, "y": 1},
-
-                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
-                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
-                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
-                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
-                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
-                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
-                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
-                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
-                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
-                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
-                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
-
-                {"label": "Page Down", "matrix": [2, 15], "x": 16.5, "y": 2},
-
-                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
-
-                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
-                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
-                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
-                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
-                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
-                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
-                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
-                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
-                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
-                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
-                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
-
-                {"label": "\u2191", "matrix": [3, 14], "x": 15.25, "y": 3},
-
-                {"label": "F5", "matrix": [4, 0], "x": 0, "y": 4},
-
-                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "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": "Space", "matrix": [4, 7], "x": 5, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [4, 13], "x": 14.25, "y": 4},
-                {"label": "\u2193", "matrix": [4, 14], "x": 15.25, "y": 4},
-                {"label": "\u2192", "matrix": [4, 15], "x": 16.25, "y": 4}
-            ]
-        },
-        "LAYOUT_ansi_blocker_split_bs": {
-            "layout": [
-                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
-                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
-                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
-                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
-                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
-                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
-                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
-                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
-                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0},
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 0},
-
-                {"label": "`", "matrix": [0, 15], "x": 16.5, "y": 0},
-
-                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
-                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
-                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
-                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
-                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
-                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
-                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
-                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
-                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
-                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
-                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
-                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
-                {"label": "\\", "matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
-
-                {"label": "Page Up", "matrix": [1, 15], "x": 16.5, "y": 1},
-
-                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
-                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
-                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
-                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
-                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
-                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
-                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
-                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
-                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
-                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
-                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
-
-                {"label": "Page Down", "matrix": [2, 15], "x": 16.5, "y": 2},
-
-                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
-
-                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
-                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
-                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
-                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
-                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
-                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
-                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
-                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
-                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
-                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
-                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
-
-                {"label": "\u2191", "matrix": [3, 14], "x": 15.25, "y": 3},
-
-                {"label": "F5", "matrix": [4, 0], "x": 0, "y": 4},
-
-                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "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": "Space", "matrix": [4, 7], "x": 5, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [4, 13], "x": 14.25, "y": 4},
-                {"label": "\u2193", "matrix": [4, 14], "x": 15.25, "y": 4},
-                {"label": "\u2192", "matrix": [4, 15], "x": 16.25, "y": 4}
-            ]
-        },
-        "LAYOUT_ansi_blocker_tsangan": {
-            "layout": [
-                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
-                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
-                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
-                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
-                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
-                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
-                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
-                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
-                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
-
-                {"label": "`", "matrix": [0, 15], "x": 16.5, "y": 0},
-
-                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
-                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
-                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
-                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
-                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
-                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
-                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
-                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
-                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
-                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
-                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
-                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
-                {"label": "\\", "matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
-
-                {"label": "Page Up", "matrix": [1, 15], "x": 16.5, "y": 1},
-
-                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
-                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
-                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
-                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
-                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
-                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
-                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
-                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
-                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
-                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
-                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
-
-                {"label": "Page Down", "matrix": [2, 15], "x": 16.5, "y": 2},
-
-                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
-
-                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
-                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
-                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
-                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
-                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
-                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
-                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
-                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
-                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
-                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
-                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
-
-                {"label": "\u2191", "matrix": [3, 14], "x": 15.25, "y": 3},
-
-                {"label": "F5", "matrix": [4, 0], "x": 0, "y": 4},
-
-                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.75, "y": 4},
-                {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 7], "x": 5.25, "y": 4, "w": 7},
-                {"label": "Fn", "matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 13], "x": 14.25, "y": 4},
-                {"label": "\u2193", "matrix": [4, 14], "x": 15.25, "y": 4},
-                {"label": "\u2192", "matrix": [4, 15], "x": 16.25, "y": 4}
-            ]
-        },
-        "LAYOUT_ansi_blocker_tsangan_split_bs": {
-            "layout": [
-                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
-                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
-                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
-                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
-                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
-                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
-                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
-                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
-                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0},
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 0},
-
-                {"label": "`", "matrix": [0, 15], "x": 16.5, "y": 0},
-
-                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
-                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
-                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
-                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
-                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
-                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
-                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
-                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
-                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
-                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
-                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
-                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
-                {"label": "\\", "matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
-
-                {"label": "Page Up", "matrix": [1, 15], "x": 16.5, "y": 1},
-
-                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
-                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
-                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
-                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
-                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
-                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
-                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
-                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
-                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
-                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
-                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
-
-                {"label": "Page Down", "matrix": [2, 15], "x": 16.5, "y": 2},
-
-                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
-
-                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
-                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
-                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
-                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
-                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
-                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
-                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
-                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
-                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
-                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
-                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
-
-                {"label": "\u2191", "matrix": [3, 14], "x": 15.25, "y": 3},
-
-                {"label": "F5", "matrix": [4, 0], "x": 0, "y": 4},
-
-                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.75, "y": 4},
-                {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 7], "x": 5.25, "y": 4, "w": 7},
-                {"label": "Fn", "matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 13], "x": 14.25, "y": 4},
-                {"label": "\u2193", "matrix": [4, 14], "x": 15.25, "y": 4},
-                {"label": "\u2192", "matrix": [4, 15], "x": 16.25, "y": 4}
-            ]
-        },
-        "LAYOUT_iso_blocker": {
-            "layout": [
-                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
-                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
-                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
-                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
-                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
-                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
-                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
-                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
-                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
-
-                {"label": "`", "matrix": [0, 15], "x": 16.5, "y": 0},
-
-                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
-                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
-                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
-                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
-                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
-                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
-                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
-                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
-                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
-                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
-                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
-                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
-
-                {"label": "Page Up", "matrix": [1, 15], "x": 16.5, "y": 1},
-
-                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
-                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
-                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
-                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
-                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
-                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
-                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
-                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
-                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
-                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
-                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
-                {"label": "#", "matrix": [2, 13], "x": 14, "y": 2},
-                {"label": "Enter", "matrix": [1, 14], "x": 15, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "Page Down", "matrix": [2, 15], "x": 16.5, "y": 2},
-
-                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
-
-                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 2], "x": 2.5, "y": 3},
-                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
-                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
-                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
-                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
-                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
-                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
-                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
-                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
-                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
-                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
-                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
-
-                {"label": "\u2191", "matrix": [3, 14], "x": 15.25, "y": 3},
-
-                {"label": "F5", "matrix": [4, 0], "x": 0, "y": 4},
-
-                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "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": "Space", "matrix": [4, 7], "x": 5, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [4, 13], "x": 14.25, "y": 4},
-                {"label": "\u2193", "matrix": [4, 14], "x": 15.25, "y": 4},
-                {"label": "\u2192", "matrix": [4, 15], "x": 16.25, "y": 4}
-            ]
-        },
-        "LAYOUT_iso_blocker_split_bs": {
-            "layout": [
-                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
-                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
-                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
-                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
-                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
-                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
-                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
-                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
-                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0},
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 0},
-
-                {"label": "`", "matrix": [0, 15], "x": 16.5, "y": 0},
-
-                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
-                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
-                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
-                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
-                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
-                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
-                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
-                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
-                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
-                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
-                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
-                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
-
-                {"label": "Page Up", "matrix": [1, 15], "x": 16.5, "y": 1},
-
-                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
-                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
-                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
-                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
-                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
-                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
-                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
-                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
-                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
-                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
-                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
-                {"label": "#", "matrix": [2, 13], "x": 14, "y": 2},
-                {"label": "Enter", "matrix": [1, 14], "x": 15, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "Page Down", "matrix": [2, 15], "x": 16.5, "y": 2},
-
-                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
-
-                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 2], "x": 2.5, "y": 3},
-                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
-                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
-                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
-                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
-                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
-                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
-                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
-                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
-                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
-                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
-                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
-
-                {"label": "\u2191", "matrix": [3, 14], "x": 15.25, "y": 3},
-
-                {"label": "F5", "matrix": [4, 0], "x": 0, "y": 4},
-
-                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "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": "Space", "matrix": [4, 7], "x": 5, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [4, 13], "x": 14.25, "y": 4},
-                {"label": "\u2193", "matrix": [4, 14], "x": 15.25, "y": 4},
-                {"label": "\u2192", "matrix": [4, 15], "x": 16.25, "y": 4}
-            ]
-        },
-        "LAYOUT_iso_blocker_tsangan": {
-            "layout": [
-                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
-                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
-                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
-                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
-                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
-                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
-                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
-                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
-                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
-
-                {"label": "`", "matrix": [0, 15], "x": 16.5, "y": 0},
-
-                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
-                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
-                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
-                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
-                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
-                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
-                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
-                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
-                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
-                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
-                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
-                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
-
-                {"label": "Page Up", "matrix": [1, 15], "x": 16.5, "y": 1},
-
-                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
-                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
-                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
-                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
-                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
-                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
-                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
-                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
-                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
-                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
-                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
-                {"label": "#", "matrix": [2, 13], "x": 14, "y": 2},
-                {"label": "Enter", "matrix": [1, 14], "x": 15, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "Page Down", "matrix": [2, 15], "x": 16.5, "y": 2},
-
-                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
-
-                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 2], "x": 2.5, "y": 3},
-                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
-                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
-                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
-                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
-                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
-                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
-                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
-                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
-                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
-                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
-                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
-
-                {"label": "\u2191", "matrix": [3, 14], "x": 15.25, "y": 3},
-
-                {"label": "F5", "matrix": [4, 0], "x": 0, "y": 4},
-
-                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.75, "y": 4},
-                {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 7], "x": 5.25, "y": 4, "w": 7},
-                {"label": "Fn", "matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 13], "x": 14.25, "y": 4},
-                {"label": "\u2193", "matrix": [4, 14], "x": 15.25, "y": 4},
-                {"label": "\u2192", "matrix": [4, 15], "x": 16.25, "y": 4}
-            ]
-        },
-        "LAYOUT_iso_blocker_tsangan_split_bs": {
-            "layout": [
-                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
-                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
-                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
-                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
-                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
-                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
-                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
-                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
-                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0},
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 0},
-
-                {"label": "`", "matrix": [0, 15], "x": 16.5, "y": 0},
-
-                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
-                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
-                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
-                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
-                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
-                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
-                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
-                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
-                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
-                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
-                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
-                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
-
-                {"label": "Page Up", "matrix": [1, 15], "x": 16.5, "y": 1},
-
-                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
-                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
-                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
-                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
-                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
-                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
-                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
-                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
-                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
-                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
-                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
-                {"label": "#", "matrix": [2, 13], "x": 14, "y": 2},
-                {"label": "Enter", "matrix": [1, 14], "x": 15, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "Page Down", "matrix": [2, 15], "x": 16.5, "y": 2},
-
-                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
-
-                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 2], "x": 2.5, "y": 3},
-                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
-                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
-                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
-                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
-                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
-                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
-                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
-                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
-                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
-                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
-                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
-
-                {"label": "\u2191", "matrix": [3, 14], "x": 15.25, "y": 3},
-
-                {"label": "F5", "matrix": [4, 0], "x": 0, "y": 4},
-
-                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.75, "y": 4},
-                {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 7], "x": 5.25, "y": 4, "w": 7},
-                {"label": "Fn", "matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 13], "x": 14.25, "y": 4},
-                {"label": "\u2193", "matrix": [4, 14], "x": 15.25, "y": 4},
-                {"label": "\u2192", "matrix": [4, 15], "x": 16.25, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fjlabs/avalon/keyboard.json b/keyboards/fjlabs/avalon/keyboard.json
new file mode 100644
index 0000000000..2407c3ec26
--- /dev/null
+++ b/keyboards/fjlabs/avalon/keyboard.json
@@ -0,0 +1,861 @@
+{
+    "keyboard_name": "Avalon",
+    "manufacturer": "Trailblazer Keyboards",
+    "url": "https://fjlaboratories.com/",
+    "maintainer": "mrnoisytiger",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x0015",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["B0", "F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
+        "rows": ["F4", "F1", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "C7"
+    },
+    "rgblight": {
+        "led_count": 6,
+        "brightness_steps": 12,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl",
+            "speed": 144
+        }
+    },
+    "ws2812": {
+        "pin": "D6"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
+                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
+                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
+                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
+                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
+                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
+                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0},
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 0},
+
+                {"label": "`", "matrix": [0, 15], "x": 16.5, "y": 0},
+
+                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
+                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
+                {"label": "\\", "matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
+
+                {"label": "Page Up", "matrix": [1, 15], "x": 16.5, "y": 1},
+
+                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
+
+                {"label": "Page Down", "matrix": [2, 15], "x": 16.5, "y": 2},
+
+                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"label": "Shift", "matrix": [3, 2], "x": 2.5, "y": 3},
+                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
+                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
+                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
+                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
+                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+
+                {"label": "\u2191", "matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"label": "F5", "matrix": [4, 0], "x": 0, "y": 4},
+
+                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "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": "Space", "matrix": [4, 7], "x": 5, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [4, 13], "x": 14.25, "y": 4},
+                {"label": "\u2193", "matrix": [4, 14], "x": 15.25, "y": 4},
+                {"label": "\u2192", "matrix": [4, 15], "x": 16.25, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi_blocker": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
+                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
+                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
+                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
+                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
+                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
+                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
+
+                {"label": "`", "matrix": [0, 15], "x": 16.5, "y": 0},
+
+                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
+                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
+                {"label": "\\", "matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
+
+                {"label": "Page Up", "matrix": [1, 15], "x": 16.5, "y": 1},
+
+                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
+
+                {"label": "Page Down", "matrix": [2, 15], "x": 16.5, "y": 2},
+
+                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
+                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
+                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
+                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
+                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+
+                {"label": "\u2191", "matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"label": "F5", "matrix": [4, 0], "x": 0, "y": 4},
+
+                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "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": "Space", "matrix": [4, 7], "x": 5, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [4, 13], "x": 14.25, "y": 4},
+                {"label": "\u2193", "matrix": [4, 14], "x": 15.25, "y": 4},
+                {"label": "\u2192", "matrix": [4, 15], "x": 16.25, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi_blocker_split_bs": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
+                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
+                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
+                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
+                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
+                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
+                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0},
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 0},
+
+                {"label": "`", "matrix": [0, 15], "x": 16.5, "y": 0},
+
+                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
+                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
+                {"label": "\\", "matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
+
+                {"label": "Page Up", "matrix": [1, 15], "x": 16.5, "y": 1},
+
+                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
+
+                {"label": "Page Down", "matrix": [2, 15], "x": 16.5, "y": 2},
+
+                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
+                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
+                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
+                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
+                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+
+                {"label": "\u2191", "matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"label": "F5", "matrix": [4, 0], "x": 0, "y": 4},
+
+                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "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": "Space", "matrix": [4, 7], "x": 5, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [4, 13], "x": 14.25, "y": 4},
+                {"label": "\u2193", "matrix": [4, 14], "x": 15.25, "y": 4},
+                {"label": "\u2192", "matrix": [4, 15], "x": 16.25, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi_blocker_tsangan": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
+                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
+                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
+                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
+                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
+                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
+                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
+
+                {"label": "`", "matrix": [0, 15], "x": 16.5, "y": 0},
+
+                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
+                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
+                {"label": "\\", "matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
+
+                {"label": "Page Up", "matrix": [1, 15], "x": 16.5, "y": 1},
+
+                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
+
+                {"label": "Page Down", "matrix": [2, 15], "x": 16.5, "y": 2},
+
+                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
+                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
+                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
+                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
+                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+
+                {"label": "\u2191", "matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"label": "F5", "matrix": [4, 0], "x": 0, "y": 4},
+
+                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.75, "y": 4},
+                {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 7], "x": 5.25, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 13], "x": 14.25, "y": 4},
+                {"label": "\u2193", "matrix": [4, 14], "x": 15.25, "y": 4},
+                {"label": "\u2192", "matrix": [4, 15], "x": 16.25, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi_blocker_tsangan_split_bs": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
+                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
+                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
+                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
+                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
+                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
+                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0},
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 0},
+
+                {"label": "`", "matrix": [0, 15], "x": 16.5, "y": 0},
+
+                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
+                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
+                {"label": "\\", "matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
+
+                {"label": "Page Up", "matrix": [1, 15], "x": 16.5, "y": 1},
+
+                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
+
+                {"label": "Page Down", "matrix": [2, 15], "x": 16.5, "y": 2},
+
+                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
+                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
+                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
+                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
+                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+
+                {"label": "\u2191", "matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"label": "F5", "matrix": [4, 0], "x": 0, "y": 4},
+
+                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.75, "y": 4},
+                {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 7], "x": 5.25, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 13], "x": 14.25, "y": 4},
+                {"label": "\u2193", "matrix": [4, 14], "x": 15.25, "y": 4},
+                {"label": "\u2192", "matrix": [4, 15], "x": 16.25, "y": 4}
+            ]
+        },
+        "LAYOUT_iso_blocker": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
+                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
+                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
+                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
+                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
+                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
+                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
+
+                {"label": "`", "matrix": [0, 15], "x": 16.5, "y": 0},
+
+                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
+                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
+
+                {"label": "Page Up", "matrix": [1, 15], "x": 16.5, "y": 1},
+
+                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "#", "matrix": [2, 13], "x": 14, "y": 2},
+                {"label": "Enter", "matrix": [1, 14], "x": 15, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Page Down", "matrix": [2, 15], "x": 16.5, "y": 2},
+
+                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 2], "x": 2.5, "y": 3},
+                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
+                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
+                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
+                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
+                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+
+                {"label": "\u2191", "matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"label": "F5", "matrix": [4, 0], "x": 0, "y": 4},
+
+                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "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": "Space", "matrix": [4, 7], "x": 5, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [4, 13], "x": 14.25, "y": 4},
+                {"label": "\u2193", "matrix": [4, 14], "x": 15.25, "y": 4},
+                {"label": "\u2192", "matrix": [4, 15], "x": 16.25, "y": 4}
+            ]
+        },
+        "LAYOUT_iso_blocker_split_bs": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
+                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
+                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
+                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
+                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
+                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
+                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0},
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 0},
+
+                {"label": "`", "matrix": [0, 15], "x": 16.5, "y": 0},
+
+                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
+                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
+
+                {"label": "Page Up", "matrix": [1, 15], "x": 16.5, "y": 1},
+
+                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "#", "matrix": [2, 13], "x": 14, "y": 2},
+                {"label": "Enter", "matrix": [1, 14], "x": 15, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Page Down", "matrix": [2, 15], "x": 16.5, "y": 2},
+
+                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 2], "x": 2.5, "y": 3},
+                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
+                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
+                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
+                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
+                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+
+                {"label": "\u2191", "matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"label": "F5", "matrix": [4, 0], "x": 0, "y": 4},
+
+                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "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": "Space", "matrix": [4, 7], "x": 5, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [4, 13], "x": 14.25, "y": 4},
+                {"label": "\u2193", "matrix": [4, 14], "x": 15.25, "y": 4},
+                {"label": "\u2192", "matrix": [4, 15], "x": 16.25, "y": 4}
+            ]
+        },
+        "LAYOUT_iso_blocker_tsangan": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
+                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
+                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
+                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
+                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
+                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
+                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
+
+                {"label": "`", "matrix": [0, 15], "x": 16.5, "y": 0},
+
+                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
+                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
+
+                {"label": "Page Up", "matrix": [1, 15], "x": 16.5, "y": 1},
+
+                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "#", "matrix": [2, 13], "x": 14, "y": 2},
+                {"label": "Enter", "matrix": [1, 14], "x": 15, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Page Down", "matrix": [2, 15], "x": 16.5, "y": 2},
+
+                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 2], "x": 2.5, "y": 3},
+                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
+                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
+                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
+                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
+                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+
+                {"label": "\u2191", "matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"label": "F5", "matrix": [4, 0], "x": 0, "y": 4},
+
+                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.75, "y": 4},
+                {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 7], "x": 5.25, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 13], "x": 14.25, "y": 4},
+                {"label": "\u2193", "matrix": [4, 14], "x": 15.25, "y": 4},
+                {"label": "\u2192", "matrix": [4, 15], "x": 16.25, "y": 4}
+            ]
+        },
+        "LAYOUT_iso_blocker_tsangan_split_bs": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
+                {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0},
+                {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0},
+                {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0},
+                {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0},
+                {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0},
+                {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0},
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 0},
+
+                {"label": "`", "matrix": [0, 15], "x": 16.5, "y": 0},
+
+                {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1},
+                {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
+
+                {"label": "Page Up", "matrix": [1, 15], "x": 16.5, "y": 1},
+
+                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "#", "matrix": [2, 13], "x": 14, "y": 2},
+                {"label": "Enter", "matrix": [1, 14], "x": 15, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Page Down", "matrix": [2, 15], "x": 16.5, "y": 2},
+
+                {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 2], "x": 2.5, "y": 3},
+                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
+                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
+                {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3},
+                {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3},
+                {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+
+                {"label": "\u2191", "matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"label": "F5", "matrix": [4, 0], "x": 0, "y": 4},
+
+                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.75, "y": 4},
+                {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 7], "x": 5.25, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 13], "x": 14.25, "y": 4},
+                {"label": "\u2193", "matrix": [4, 14], "x": 15.25, "y": 4},
+                {"label": "\u2192", "matrix": [4, 15], "x": 16.25, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/bks65/info.json b/keyboards/fjlabs/bks65/info.json
deleted file mode 100644
index 5be09bfe0d..0000000000
--- a/keyboards/fjlabs/bks65/info.json
+++ /dev/null
@@ -1,126 +0,0 @@
-{
-    "keyboard_name": "BKS65",
-    "manufacturer": "FJLabs",
-    "url": "https://www.bolsakeyboardsupply.com",
-    "maintainer": "FJLabs",
-    "usb": {
-        "vid": "0x7074",
-        "pid": "0x1001",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
-        "rows": ["F4", "F1", "F7", "F6", "F5"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "C7"
-    },
-    "rgblight": {
-        "led_count": 24,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "B0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "features": {
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true,
-        "command": true,
-        "nkro": true,
-        "rgblight": true
-    },
-    "community_layouts": ["65_ansi"],
-    "layouts": {
-        "LAYOUT_65_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"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},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4},
-                {"matrix": [4, 10], "x": 11, "y": 4},
-                {"matrix": [4, 11], "x": 12, "y": 4},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fjlabs/bks65/keyboard.json b/keyboards/fjlabs/bks65/keyboard.json
new file mode 100644
index 0000000000..5be09bfe0d
--- /dev/null
+++ b/keyboards/fjlabs/bks65/keyboard.json
@@ -0,0 +1,126 @@
+{
+    "keyboard_name": "BKS65",
+    "manufacturer": "FJLabs",
+    "url": "https://www.bolsakeyboardsupply.com",
+    "maintainer": "FJLabs",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x1001",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
+        "rows": ["F4", "F1", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "C7"
+    },
+    "rgblight": {
+        "led_count": 24,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "community_layouts": ["65_ansi"],
+    "layouts": {
+        "LAYOUT_65_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"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},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/bks65solder/info.json b/keyboards/fjlabs/bks65solder/info.json
deleted file mode 100644
index 609dc4cdbc..0000000000
--- a/keyboards/fjlabs/bks65solder/info.json
+++ /dev/null
@@ -1,203 +0,0 @@
-{
-    "keyboard_name": "BKS65 Solder",
-    "manufacturer": "FJLabs",
-    "url": "https://www.bolsakeyboardsupply.com",
-    "maintainer": "FJLabs",
-    "usb": {
-        "vid": "0x7074",
-        "pid": "0x0099",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
-        "rows": ["F4", "F1", "F7", "F6", "F5"]
-    },
-    "diode_direction": "COL2ROW",
-    "rgblight": {
-        "led_count": 24,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "B0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "features": {
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true,
-        "command": true,
-        "nkro": true,
-        "rgblight": true
-    },
-    "community_layouts": ["65_ansi"],
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [2, 13], "x": 14, "y": 0},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"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},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 2.25},
-                {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
-                {"matrix": [4, 9], "x": 10, "y": 4},
-                {"matrix": [4, 10], "x": 11, "y": 4},
-                {"matrix": [4, 11], "x": 12, "y": 4},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"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},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4},
-                {"matrix": [4, 10], "x": 11, "y": 4},
-                {"matrix": [4, 11], "x": 12, "y": 4},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fjlabs/bks65solder/keyboard.json b/keyboards/fjlabs/bks65solder/keyboard.json
new file mode 100644
index 0000000000..609dc4cdbc
--- /dev/null
+++ b/keyboards/fjlabs/bks65solder/keyboard.json
@@ -0,0 +1,203 @@
+{
+    "keyboard_name": "BKS65 Solder",
+    "manufacturer": "FJLabs",
+    "url": "https://www.bolsakeyboardsupply.com",
+    "maintainer": "FJLabs",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x0099",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
+        "rows": ["F4", "F1", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
+    "rgblight": {
+        "led_count": 24,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "community_layouts": ["65_ansi"],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"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},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"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},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/bolsa65/info.json b/keyboards/fjlabs/bolsa65/info.json
deleted file mode 100644
index 9deb09fef2..0000000000
--- a/keyboards/fjlabs/bolsa65/info.json
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-    "keyboard_name": "Bolsa65",
-    "manufacturer": "FJLabs",
-    "url": "https://www.bolsakeyboardsupply.com",
-    "maintainer": "FJLabs",
-    "usb": {
-        "vid": "0x7074",
-        "pid": "0x0001",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["C7", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"],
-        "rows": ["F1", "F0", "F6", "F5", "F4"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "features": {
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true,
-        "command": true,
-        "nkro": true
-    },
-    "community_layouts": ["65_ansi_blocker"],
-    "layouts": {
-        "LAYOUT_65_ansi_blocker": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"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},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fjlabs/bolsa65/keyboard.json b/keyboards/fjlabs/bolsa65/keyboard.json
new file mode 100644
index 0000000000..9deb09fef2
--- /dev/null
+++ b/keyboards/fjlabs/bolsa65/keyboard.json
@@ -0,0 +1,103 @@
+{
+    "keyboard_name": "Bolsa65",
+    "manufacturer": "FJLabs",
+    "url": "https://www.bolsakeyboardsupply.com",
+    "maintainer": "FJLabs",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["C7", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"],
+        "rows": ["F1", "F0", "F6", "F5", "F4"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true
+    },
+    "community_layouts": ["65_ansi_blocker"],
+    "layouts": {
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"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},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/kf87/info.json b/keyboards/fjlabs/kf87/info.json
deleted file mode 100644
index e4f48acc8e..0000000000
--- a/keyboards/fjlabs/kf87/info.json
+++ /dev/null
@@ -1,155 +0,0 @@
-{
-    "keyboard_name": "KF87",
-    "manufacturer": "FJLaboratories",
-    "url": "http://www.fjlaboratories.com/",
-    "maintainer": "FJLabs",
-    "usb": {
-        "vid": "0x7074",
-        "pid": "0x0006",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "D5", "D6", "D7"],
-        "rows": ["B4", "B5", "B6", "C0", "E1", "E0"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "C4",
-        "scroll_lock": "C6"
-    },
-    "ws2812": {
-        "pin": "C2"
-    },
-    "rgblight": {
-        "led_count": 87,
-        "max_brightness": 86,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "processor": "at90usb646",
-    "bootloader": "atmel-dfu",
-    "features": {
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true,
-        "command": true,
-        "nkro": true,
-        "rgblight": true
-    },
-    "layouts": {
-        "LAYOUT_tkl_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-                {"matrix": [0, 9], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 10], "x": 11, "y": 0},
-                {"matrix": [0, 11], "x": 12, "y": 0},
-                {"matrix": [0, 12], "x": 13, "y": 0},
-                {"matrix": [0, 13], "x": 14, "y": 0},
-
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-                {"matrix": [0, 15], "x": 16.25, "y": 0},
-                {"matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.25},
-                {"matrix": [1, 1], "x": 1, "y": 1.25},
-                {"matrix": [1, 2], "x": 2, "y": 1.25},
-                {"matrix": [1, 3], "x": 3, "y": 1.25},
-                {"matrix": [1, 4], "x": 4, "y": 1.25},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6, "y": 1.25},
-                {"matrix": [1, 7], "x": 7, "y": 1.25},
-                {"matrix": [1, 8], "x": 8, "y": 1.25},
-                {"matrix": [1, 9], "x": 9, "y": 1.25},
-                {"matrix": [1, 10], "x": 10, "y": 1.25},
-                {"matrix": [1, 11], "x": 11, "y": 1.25},
-                {"matrix": [1, 12], "x": 12, "y": 1.25},
-                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fjlabs/kf87/keyboard.json b/keyboards/fjlabs/kf87/keyboard.json
new file mode 100644
index 0000000000..e4f48acc8e
--- /dev/null
+++ b/keyboards/fjlabs/kf87/keyboard.json
@@ -0,0 +1,155 @@
+{
+    "keyboard_name": "KF87",
+    "manufacturer": "FJLaboratories",
+    "url": "http://www.fjlaboratories.com/",
+    "maintainer": "FJLabs",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x0006",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "D5", "D6", "D7"],
+        "rows": ["B4", "B5", "B6", "C0", "E1", "E0"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "C4",
+        "scroll_lock": "C6"
+    },
+    "ws2812": {
+        "pin": "C2"
+    },
+    "rgblight": {
+        "led_count": 87,
+        "max_brightness": 86,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "processor": "at90usb646",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "layouts": {
+        "LAYOUT_tkl_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/kyuu/info.json b/keyboards/fjlabs/kyuu/info.json
deleted file mode 100644
index a16e2835cf..0000000000
--- a/keyboards/fjlabs/kyuu/info.json
+++ /dev/null
@@ -1,126 +0,0 @@
-{
-    "keyboard_name": "Kyuu Hotswap",
-    "manufacturer": "FJLabs",
-    "url": "https://www.bolsakeyboardsupply.com",
-    "maintainer": "FJLabs",
-    "usb": {
-        "vid": "0x7074",
-        "pid": "0x1012",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
-        "rows": ["F4", "F1", "F7", "F6", "F5"]
-    },
-    "diode_direction": "COL2ROW",
-    "rgblight": {
-        "led_count": 16,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        },
-        "default": {
-            "animation": "rainbow_swirl",
-            "speed": 144
-        }
-    },
-    "ws2812": {
-        "pin": "C7"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "features": {
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true,
-        "command": true,
-        "nkro": true,
-        "rgblight": true
-    },
-    "layouts": {
-        "LAYOUT_65_ansi_blocker_badge": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [0, 14], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"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},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fjlabs/kyuu/keyboard.json b/keyboards/fjlabs/kyuu/keyboard.json
new file mode 100644
index 0000000000..a16e2835cf
--- /dev/null
+++ b/keyboards/fjlabs/kyuu/keyboard.json
@@ -0,0 +1,126 @@
+{
+    "keyboard_name": "Kyuu Hotswap",
+    "manufacturer": "FJLabs",
+    "url": "https://www.bolsakeyboardsupply.com",
+    "maintainer": "FJLabs",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x1012",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
+        "rows": ["F4", "F1", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
+    "rgblight": {
+        "led_count": 16,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl",
+            "speed": 144
+        }
+    },
+    "ws2812": {
+        "pin": "C7"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "layouts": {
+        "LAYOUT_65_ansi_blocker_badge": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"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},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/ldk65/info.json b/keyboards/fjlabs/ldk65/info.json
deleted file mode 100644
index a9d997c67e..0000000000
--- a/keyboards/fjlabs/ldk65/info.json
+++ /dev/null
@@ -1,107 +0,0 @@
-{
-    "keyboard_name": "LDK65",
-    "manufacturer": "FJLabs",
-    "url": "https://www.bolsakeyboardsupply.com",
-    "maintainer": "FJLabs",
-    "usb": {
-        "vid": "0x7074",
-        "pid": "0x0002",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
-        "rows": ["F4", "F1", "F7", "F6", "F5"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "C7"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "features": {
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true,
-        "command": true,
-        "nkro": true
-    },
-    "community_layouts": ["65_ansi"],
-    "layouts": {
-        "LAYOUT_65_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"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},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4},
-                {"matrix": [4, 10], "x": 11, "y": 4},
-                {"matrix": [4, 11], "x": 12, "y": 4},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fjlabs/ldk65/keyboard.json b/keyboards/fjlabs/ldk65/keyboard.json
new file mode 100644
index 0000000000..a9d997c67e
--- /dev/null
+++ b/keyboards/fjlabs/ldk65/keyboard.json
@@ -0,0 +1,107 @@
+{
+    "keyboard_name": "LDK65",
+    "manufacturer": "FJLabs",
+    "url": "https://www.bolsakeyboardsupply.com",
+    "maintainer": "FJLabs",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x0002",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
+        "rows": ["F4", "F1", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "C7"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true
+    },
+    "community_layouts": ["65_ansi"],
+    "layouts": {
+        "LAYOUT_65_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"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},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/midway60/info.json b/keyboards/fjlabs/midway60/info.json
deleted file mode 100644
index 0f5b1e13bc..0000000000
--- a/keyboards/fjlabs/midway60/info.json
+++ /dev/null
@@ -1,671 +0,0 @@
-{
-    "keyboard_name": "Midway60",
-    "manufacturer": "FJLabs",
-    "url": "https://www.bolsakeyboardsupply.com",
-    "maintainer": "mrnoisytiger",
-    "usb": {
-        "vid": "0x7074",
-        "pid": "0x1002",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6"],
-        "rows": ["F4", "F1", "F7", "F6", "F5"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "C7"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "features": {
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true,
-        "command": true,
-        "nkro": true
-    },
-    "community_layouts": [
-        "60_ansi",
-        "60_ansi_split_bs_rshift",
-        "60_ansi_tsangan",
-        "60_tsangan_hhkb",
-        "60_iso",
-        "60_iso_split_bs_rshift",
-        "60_iso_tsangan"
-    ],
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_tsangan_hhkb": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_iso": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_iso_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_iso_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_iso_tsangan_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fjlabs/midway60/keyboard.json b/keyboards/fjlabs/midway60/keyboard.json
new file mode 100644
index 0000000000..0f5b1e13bc
--- /dev/null
+++ b/keyboards/fjlabs/midway60/keyboard.json
@@ -0,0 +1,671 @@
+{
+    "keyboard_name": "Midway60",
+    "manufacturer": "FJLabs",
+    "url": "https://www.bolsakeyboardsupply.com",
+    "maintainer": "mrnoisytiger",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x1002",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6"],
+        "rows": ["F4", "F1", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "C7"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true
+    },
+    "community_layouts": [
+        "60_ansi",
+        "60_ansi_split_bs_rshift",
+        "60_ansi_tsangan",
+        "60_tsangan_hhkb",
+        "60_iso",
+        "60_iso_split_bs_rshift",
+        "60_iso_tsangan"
+    ],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/mk61rgbansi/info.json b/keyboards/fjlabs/mk61rgbansi/info.json
deleted file mode 100644
index de26f98ebe..0000000000
--- a/keyboards/fjlabs/mk61rgbansi/info.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-    "keyboard_name": "MK61-RGB-ANSI",
-    "manufacturer": "Mechanical Keyboards LLC",
-    "url": "https://www.fjlaboratories.com/",
-    "maintainer": "Mechanical Keyboards, LLC",
-    "usb": {
-        "vid": "0x7074",
-        "pid": "0x1011",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B3", "B2", "B1"],
-        "rows": ["F0", "F1", "F4", "F5", "F6"]
-    },
-    "diode_direction": "COL2ROW",
-    "ws2812": {
-        "pin": "F7"
-    },
-    "rgblight": {
-        "led_count": 64,
-        "max_brightness": 108,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        },
-        "default": {
-            "animation": "rainbow_swirl",
-            "speed": 144
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "features": {
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true,
-        "command": true,
-        "nkro": true,
-        "rgblight": true
-    },
-    "community_layouts": ["60_ansi"],
-    "layouts": {
-        "LAYOUT_60_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"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},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fjlabs/mk61rgbansi/keyboard.json b/keyboards/fjlabs/mk61rgbansi/keyboard.json
new file mode 100644
index 0000000000..de26f98ebe
--- /dev/null
+++ b/keyboards/fjlabs/mk61rgbansi/keyboard.json
@@ -0,0 +1,121 @@
+{
+    "keyboard_name": "MK61-RGB-ANSI",
+    "manufacturer": "Mechanical Keyboards LLC",
+    "url": "https://www.fjlaboratories.com/",
+    "maintainer": "Mechanical Keyboards, LLC",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x1011",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B3", "B2", "B1"],
+        "rows": ["F0", "F1", "F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "F7"
+    },
+    "rgblight": {
+        "led_count": 64,
+        "max_brightness": 108,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl",
+            "speed": 144
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "community_layouts": ["60_ansi"],
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"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},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/peaker/info.json b/keyboards/fjlabs/peaker/info.json
deleted file mode 100644
index 73f4f754c3..0000000000
--- a/keyboards/fjlabs/peaker/info.json
+++ /dev/null
@@ -1,113 +0,0 @@
-{
-    "keyboard_name": "Peaker",
-    "manufacturer": "FJLaboratories",
-    "url": "http://www.lucidkb.com",
-    "maintainer": "Lucid",
-    "usb": {
-        "vid": "0x7074",
-        "pid": "0x0020",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "D5", "D6", "D7"],
-        "rows": ["B5", "B6", "C0", "E1", "E0"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "at90usb646",
-    "bootloader": "atmel-dfu",
-    "features": {
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true,
-        "command": true,
-        "nkro": true
-    },
-    "layouts": {
-        "LAYOUT_tkl_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [0, 14], "x": 14, "y": 0},
-
-                {"matrix": [0, 15], "x": 15.25, "y": 0},
-                {"matrix": [0, 16], "x": 16.25, "y": 0},
-                {"matrix": [1, 0], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 1], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 1.5, "y": 1},
-                {"matrix": [1, 3], "x": 2.5, "y": 1},
-                {"matrix": [1, 4], "x": 3.5, "y": 1},
-                {"matrix": [1, 5], "x": 4.5, "y": 1},
-                {"matrix": [1, 6], "x": 5.5, "y": 1},
-                {"matrix": [1, 7], "x": 6.5, "y": 1},
-                {"matrix": [1, 8], "x": 7.5, "y": 1},
-                {"matrix": [1, 9], "x": 8.5, "y": 1},
-                {"matrix": [1, 10], "x": 9.5, "y": 1},
-                {"matrix": [1, 11], "x": 10.5, "y": 1},
-                {"matrix": [1, 12], "x": 11.5, "y": 1},
-                {"matrix": [1, 13], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [1, 15], "x": 15.25, "y": 1},
-                {"matrix": [1, 16], "x": 16.25, "y": 1},
-                {"matrix": [2, 0], "x": 17.25, "y": 1},
-
-                {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 1.75, "y": 2},
-                {"matrix": [2, 3], "x": 2.75, "y": 2},
-                {"matrix": [2, 4], "x": 3.75, "y": 2},
-                {"matrix": [2, 5], "x": 4.75, "y": 2},
-                {"matrix": [2, 6], "x": 5.75, "y": 2},
-                {"matrix": [2, 7], "x": 6.75, "y": 2},
-                {"matrix": [2, 8], "x": 7.75, "y": 2},
-                {"matrix": [2, 9], "x": 8.75, "y": 2},
-                {"matrix": [2, 10], "x": 9.75, "y": 2},
-                {"matrix": [2, 11], "x": 10.75, "y": 2},
-                {"matrix": [2, 12], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [3, 15], "x": 16.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 14], "x": 15.25, "y": 4},
-                {"matrix": [4, 15], "x": 16.25, "y": 4},
-                {"matrix": [4, 16], "x": 17.25, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fjlabs/peaker/keyboard.json b/keyboards/fjlabs/peaker/keyboard.json
new file mode 100644
index 0000000000..73f4f754c3
--- /dev/null
+++ b/keyboards/fjlabs/peaker/keyboard.json
@@ -0,0 +1,113 @@
+{
+    "keyboard_name": "Peaker",
+    "manufacturer": "FJLaboratories",
+    "url": "http://www.lucidkb.com",
+    "maintainer": "Lucid",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x0020",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "D5", "D6", "D7"],
+        "rows": ["B5", "B6", "C0", "E1", "E0"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "at90usb646",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true
+    },
+    "layouts": {
+        "LAYOUT_tkl_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [1, 0], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 1], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1},
+                {"matrix": [1, 16], "x": 16.25, "y": 1},
+                {"matrix": [2, 0], "x": 17.25, "y": 1},
+
+                {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [3, 15], "x": 16.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4},
+                {"matrix": [4, 16], "x": 17.25, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/polaris/info.json b/keyboards/fjlabs/polaris/info.json
deleted file mode 100644
index c4f3caf287..0000000000
--- a/keyboards/fjlabs/polaris/info.json
+++ /dev/null
@@ -1,673 +0,0 @@
-{
-    "keyboard_name": "Polaris",
-    "manufacturer": "FJLaboratories",
-    "url": "http://www.fjlaboratories.com/projects/",
-    "maintainer": "mrnoisytiger",
-    "usb": {
-        "vid": "0x7074",
-        "pid": "0x9001",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6"],
-        "rows": ["F4", "F1", "F7", "F6", "F5"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "C7"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "features": {
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true,
-        "command": true,
-        "nkro": true
-    },
-    "community_layouts": [
-        "60_ansi",
-        "60_ansi_split_bs_rshift",
-        "60_ansi_tsangan",
-        "60_tsangan_hhkb",
-        "60_iso",
-        "60_iso_split_bs_rshift",
-        "60_iso_tsangan"
-    ],
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u25bd", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
-                {"label": "Space", "matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u25bd", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Fn", "matrix": [4, 12], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_tsangan_hhkb": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u25bd", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Fn", "matrix": [4, 12], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_iso": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_iso_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u25bd", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_iso_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_iso_tsangan_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u25bd", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fjlabs/polaris/keyboard.json b/keyboards/fjlabs/polaris/keyboard.json
new file mode 100644
index 0000000000..c4f3caf287
--- /dev/null
+++ b/keyboards/fjlabs/polaris/keyboard.json
@@ -0,0 +1,673 @@
+{
+    "keyboard_name": "Polaris",
+    "manufacturer": "FJLaboratories",
+    "url": "http://www.fjlaboratories.com/projects/",
+    "maintainer": "mrnoisytiger",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x9001",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6"],
+        "rows": ["F4", "F1", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "C7"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true
+    },
+    "community_layouts": [
+        "60_ansi",
+        "60_ansi_split_bs_rshift",
+        "60_ansi_tsangan",
+        "60_tsangan_hhkb",
+        "60_iso",
+        "60_iso_split_bs_rshift",
+        "60_iso_tsangan"
+    ],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u25bd", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
+                {"label": "Space", "matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u25bd", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Fn", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u25bd", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Fn", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u25bd", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u25bd", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/ready100/info.json b/keyboards/fjlabs/ready100/info.json
deleted file mode 100644
index b5940b9c52..0000000000
--- a/keyboards/fjlabs/ready100/info.json
+++ /dev/null
@@ -1,123 +0,0 @@
-{
-    "keyboard_name": "Ready100",
-    "manufacturer": "FJLabs",
-    "url": "https://www.ready100.com",
-    "maintainer": "FJLabs",
-    "usb": {
-        "vid": "0x7074",
-        "pid": "0x1003",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B3", "B2", "B1"],
-        "rows": ["F0", "F1", "F4", "F5", "F6"]
-    },
-    "diode_direction": "COL2ROW",
-    "ws2812": {
-        "pin": "F7"
-    },
-    "rgblight": {
-        "led_count": 64,
-        "max_brightness": 108,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "features": {
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true,
-        "command": true,
-        "nkro": true,
-        "rgblight": true
-    },
-    "layout_aliases": {
-        "LAYOUT_64key": "LAYOUT_64_ansi"
-    },
-    "community_layouts": ["64_ansi"],
-    "layouts": {
-        "LAYOUT_64_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"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},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2},
-                {"matrix": [3, 1], "x": 2, "y": 3},
-                {"matrix": [3, 2], "x": 3, "y": 3},
-                {"matrix": [3, 3], "x": 4, "y": 3},
-                {"matrix": [3, 4], "x": 5, "y": 3},
-                {"matrix": [3, 5], "x": 6, "y": 3},
-                {"matrix": [3, 6], "x": 7, "y": 3},
-                {"matrix": [3, 7], "x": 8, "y": 3},
-                {"matrix": [3, 8], "x": 9, "y": 3},
-                {"matrix": [3, 9], "x": 10, "y": 3},
-                {"matrix": [3, 10], "x": 11, "y": 3},
-                {"matrix": [3, 11], "x": 12, "y": 3},
-                {"matrix": [3, 12], "x": 13, "y": 3},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4},
-                {"matrix": [4, 10], "x": 11, "y": 4},
-                {"matrix": [4, 11], "x": 12, "y": 4},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fjlabs/ready100/keyboard.json b/keyboards/fjlabs/ready100/keyboard.json
new file mode 100644
index 0000000000..b5940b9c52
--- /dev/null
+++ b/keyboards/fjlabs/ready100/keyboard.json
@@ -0,0 +1,123 @@
+{
+    "keyboard_name": "Ready100",
+    "manufacturer": "FJLabs",
+    "url": "https://www.ready100.com",
+    "maintainer": "FJLabs",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x1003",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B3", "B2", "B1"],
+        "rows": ["F0", "F1", "F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "F7"
+    },
+    "rgblight": {
+        "led_count": 64,
+        "max_brightness": 108,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "layout_aliases": {
+        "LAYOUT_64key": "LAYOUT_64_ansi"
+    },
+    "community_layouts": ["64_ansi"],
+    "layouts": {
+        "LAYOUT_64_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"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},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2},
+                {"matrix": [3, 1], "x": 2, "y": 3},
+                {"matrix": [3, 2], "x": 3, "y": 3},
+                {"matrix": [3, 3], "x": 4, "y": 3},
+                {"matrix": [3, 4], "x": 5, "y": 3},
+                {"matrix": [3, 5], "x": 6, "y": 3},
+                {"matrix": [3, 6], "x": 7, "y": 3},
+                {"matrix": [3, 7], "x": 8, "y": 3},
+                {"matrix": [3, 8], "x": 9, "y": 3},
+                {"matrix": [3, 9], "x": 10, "y": 3},
+                {"matrix": [3, 10], "x": 11, "y": 3},
+                {"matrix": [3, 11], "x": 12, "y": 3},
+                {"matrix": [3, 12], "x": 13, "y": 3},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/sinanju/info.json b/keyboards/fjlabs/sinanju/info.json
deleted file mode 100644
index ef9cf0e872..0000000000
--- a/keyboards/fjlabs/sinanju/info.json
+++ /dev/null
@@ -1,164 +0,0 @@
-{
-    "keyboard_name": "Sinanju",
-    "manufacturer": "FJLabs",
-    "url": "https://www.fjlaboratories.com",
-    "maintainer": "mrnoisytiger",
-    "usb": {
-        "vid": "0x7074",
-        "pid": "0x1022",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6"],
-        "rows": ["F4", "F1", "F7", "F6", "F5"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "C7"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "features": {
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true,
-        "command": true,
-        "nkro": true
-    },
-    "layouts": {
-        "LAYOUT_60_ansi_wkl": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"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},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
-                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_ansi_wkl_split_bs_rshift": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [2, 13], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"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},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
-                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fjlabs/sinanju/keyboard.json b/keyboards/fjlabs/sinanju/keyboard.json
new file mode 100644
index 0000000000..ef9cf0e872
--- /dev/null
+++ b/keyboards/fjlabs/sinanju/keyboard.json
@@ -0,0 +1,164 @@
+{
+    "keyboard_name": "Sinanju",
+    "manufacturer": "FJLabs",
+    "url": "https://www.fjlaboratories.com",
+    "maintainer": "mrnoisytiger",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x1022",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6"],
+        "rows": ["F4", "F1", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "C7"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true
+    },
+    "layouts": {
+        "LAYOUT_60_ansi_wkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"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},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"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},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/sinanjuwk/info.json b/keyboards/fjlabs/sinanjuwk/info.json
deleted file mode 100644
index e825ae335e..0000000000
--- a/keyboards/fjlabs/sinanjuwk/info.json
+++ /dev/null
@@ -1,451 +0,0 @@
-{
-    "keyboard_name": "Sinanju WK",
-    "manufacturer": "FJLabs",
-    "url": "https://www.fjlaboratories.com",
-    "maintainer": "mrnoisytiger",
-    "usb": {
-        "vid": "0x7074",
-        "pid": "0x1023",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6"],
-        "rows": ["F4", "F1", "F7", "F6", "F5"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "C7"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "features": {
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true,
-        "command": true,
-        "nkro": true
-    },
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_60_ansi_split_bs_rshift"
-    },
-    "community_layouts": [
-        "60_ansi",
-        "60_ansi_split_bs_rshift",
-        "60_ansi_tsangan",
-        "60_tsangan_hhkb"
-    ],
-    "layouts": {
-        "LAYOUT_60_ansi": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_tsangan_hhkb": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_ansi_wkl": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_ansi_wkl_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fjlabs/sinanjuwk/keyboard.json b/keyboards/fjlabs/sinanjuwk/keyboard.json
new file mode 100644
index 0000000000..e825ae335e
--- /dev/null
+++ b/keyboards/fjlabs/sinanjuwk/keyboard.json
@@ -0,0 +1,451 @@
+{
+    "keyboard_name": "Sinanju WK",
+    "manufacturer": "FJLabs",
+    "url": "https://www.fjlaboratories.com",
+    "maintainer": "mrnoisytiger",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x1023",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6"],
+        "rows": ["F4", "F1", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "C7"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true
+    },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_60_ansi_split_bs_rshift"
+    },
+    "community_layouts": [
+        "60_ansi",
+        "60_ansi_split_bs_rshift",
+        "60_ansi_tsangan",
+        "60_tsangan_hhkb"
+    ],
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_ansi_wkl": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/solanis/info.json b/keyboards/fjlabs/solanis/info.json
deleted file mode 100644
index 12103d1058..0000000000
--- a/keyboards/fjlabs/solanis/info.json
+++ /dev/null
@@ -1,1011 +0,0 @@
-{
-    "keyboard_name": "Solanis",
-    "manufacturer": "FJLaboratories",
-    "url": "http://www.fjlaboratories.com/",
-    "maintainer": "mrnoisytiger",
-    "usb": {
-        "vid": "0x7074",
-        "pid": "0x0017",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "D5", "D6", "D7"],
-        "rows": ["B4", "B5", "B6", "C0", "E1", "E0"]
-    },
-    "diode_direction": "COL2ROW",
-    "ws2812": {
-        "pin": "B7"
-    },
-    "rgblight": {
-        "led_count": 24,
-        "max_brightness": 172,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "processor": "at90usb646",
-    "bootloader": "atmel-dfu",
-    "features": {
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true,
-        "command": true,
-        "nkro": true,
-        "rgblight": true
-    },
-    "community_layouts": [
-        "tkl_ansi",
-        "tkl_ansi_split_bs_rshift",
-        "tkl_ansi_tsangan",
-        "tkl_ansi_tsangan_split_bs_rshift",
-        "tkl_f13_ansi",
-        "tkl_f13_ansi_split_bs_rshift",
-        "tkl_f13_ansi_tsangan",
-        "tkl_f13_ansi_tsangan_split_bs_rshift"
-    ],
-    "layouts": {
-        "LAYOUT_all": {
-            "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": "F13", "matrix": [0, 13], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "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": "Delete", "matrix": [3, 14], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "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": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"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, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"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, 4], "x": 3.75, "y": 5.25, "w": 2.25},
-                {"label": "Space", "matrix": [5, 5], "x": 6, "y": 5.25, "w": 1.25},
-                {"label": "Space", "matrix": [5, 8], "x": 7.25, "y": 5.25, "w": 2.75},
-                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"label": "Menu (Legacy)", "matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 10], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 11], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 12], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 13], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "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, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "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": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"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, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"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.25},
-                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"label": "Menu (Legacy)", "matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 10], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 11], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 12], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 13], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "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": "Delete", "matrix": [3, 14], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "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": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"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, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"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.25},
-                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"label": "Menu (Legacy)", "matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 10], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 11], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 12], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 13], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "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, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "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": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"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, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 5], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Menu (Legacy)", "matrix": [5, 11], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 10], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 11], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 12], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 13], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "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": "Delete", "matrix": [3, 14], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "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": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"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, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 5], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Menu (Legacy)", "matrix": [5, 11], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_f13_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": "F13", "matrix": [0, 13], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "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, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "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": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"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, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"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.25},
-                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"label": "Menu (Legacy)", "matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_f13_ansi_split_bs_rshift": {
-            "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": "F13", "matrix": [0, 13], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "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": "Delete", "matrix": [3, 14], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "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": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"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, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"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.25},
-                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"label": "Menu (Legacy)", "matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_f13_ansi_tsangan": {
-            "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": "F13", "matrix": [0, 13], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "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, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "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": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"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, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 5], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Menu (Legacy)", "matrix": [5, 11], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift": {
-            "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": "F13", "matrix": [0, 13], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "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": "Delete", "matrix": [3, 14], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "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": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"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, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 5], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Menu (Legacy)", "matrix": [5, 11], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fjlabs/solanis/keyboard.json b/keyboards/fjlabs/solanis/keyboard.json
new file mode 100644
index 0000000000..12103d1058
--- /dev/null
+++ b/keyboards/fjlabs/solanis/keyboard.json
@@ -0,0 +1,1011 @@
+{
+    "keyboard_name": "Solanis",
+    "manufacturer": "FJLaboratories",
+    "url": "http://www.fjlaboratories.com/",
+    "maintainer": "mrnoisytiger",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x0017",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "D5", "D6", "D7"],
+        "rows": ["B4", "B5", "B6", "C0", "E1", "E0"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "B7"
+    },
+    "rgblight": {
+        "led_count": 24,
+        "max_brightness": 172,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "processor": "at90usb646",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "community_layouts": [
+        "tkl_ansi",
+        "tkl_ansi_split_bs_rshift",
+        "tkl_ansi_tsangan",
+        "tkl_ansi_tsangan_split_bs_rshift",
+        "tkl_f13_ansi",
+        "tkl_f13_ansi_split_bs_rshift",
+        "tkl_f13_ansi_tsangan",
+        "tkl_f13_ansi_tsangan_split_bs_rshift"
+    ],
+    "layouts": {
+        "LAYOUT_all": {
+            "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": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "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": "Delete", "matrix": [3, 14], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "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": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"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, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"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, 4], "x": 3.75, "y": 5.25, "w": 2.25},
+                {"label": "Space", "matrix": [5, 5], "x": 6, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 8], "x": 7.25, "y": 5.25, "w": 2.75},
+                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "Menu (Legacy)", "matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 10], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 11], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 12], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "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, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "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": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"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, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"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.25},
+                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "Menu (Legacy)", "matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 10], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 11], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 12], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "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": "Delete", "matrix": [3, 14], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "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": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"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, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"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.25},
+                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "Menu (Legacy)", "matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 10], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 11], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 12], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "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, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "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": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"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, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 5], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Menu (Legacy)", "matrix": [5, 11], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 10], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 11], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 12], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "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": "Delete", "matrix": [3, 14], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "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": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"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, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 5], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Menu (Legacy)", "matrix": [5, 11], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_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": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "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, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "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": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"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, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"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.25},
+                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "Menu (Legacy)", "matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi_split_bs_rshift": {
+            "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": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "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": "Delete", "matrix": [3, 14], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "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": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"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, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"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.25},
+                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "Menu (Legacy)", "matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi_tsangan": {
+            "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": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "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, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "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": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"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, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 5], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Menu (Legacy)", "matrix": [5, 11], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift": {
+            "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": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "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": "Delete", "matrix": [3, 14], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "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": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"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, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 5], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Menu (Legacy)", "matrix": [5, 11], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/swordfish/info.json b/keyboards/fjlabs/swordfish/info.json
deleted file mode 100644
index 331bae459c..0000000000
--- a/keyboards/fjlabs/swordfish/info.json
+++ /dev/null
@@ -1,201 +0,0 @@
-{
-    "keyboard_name": "Swordfish",
-    "manufacturer": "FJLaboratories",
-    "url": "http://www.fjlaboratories.com/",
-    "maintainer": "mrnoisytiger",
-    "usb": {
-        "vid": "0x7074",
-        "pid": "0x0024",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "B2", "B3", "B7", "B5", "B4", "D7", "D6", "D4", "D5"],
-        "rows": ["B0", "B1", "C7", "C6", "B6"]
-    },
-    "diode_direction": "COL2ROW",
-    "rgblight": {
-        "led_count": 1,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "features": {
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true,
-        "command": true,
-        "nkro": true,
-        "rgblight": true
-    },
-    "layouts": {
-        "LAYOUT_2u_bs": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [1, 5], "x": 5, "y": 0},
-                {"matrix": [0, 5], "x": 6, "y": 0},
-                {"matrix": [0, 6], "x": 9, "y": 0},
-                {"matrix": [0, 7], "x": 10, "y": 0},
-                {"matrix": [0, 8], "x": 11, "y": 0},
-                {"matrix": [0, 9], "x": 12, "y": 0},
-                {"matrix": [0, 10], "x": 13, "y": 0},
-                {"matrix": [0, 11], "x": 14, "y": 0},
-                {"matrix": [0, 12], "x": 15, "y": 0, "w": 2},
-                {"matrix": [0, 14], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"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": [2, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 8.5, "y": 1},
-                {"matrix": [1, 7], "x": 9.5, "y": 1},
-                {"matrix": [1, 8], "x": 10.5, "y": 1},
-                {"matrix": [1, 9], "x": 11.5, "y": 1},
-                {"matrix": [1, 10], "x": 12.5, "y": 1},
-                {"matrix": [1, 11], "x": 13.5, "y": 1},
-                {"matrix": [1, 12], "x": 14.5, "y": 1},
-                {"matrix": [1, 13], "x": 15.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 17.25, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [3, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 8.75, "y": 2},
-                {"matrix": [2, 7], "x": 9.75, "y": 2},
-                {"matrix": [2, 8], "x": 10.75, "y": 2},
-                {"matrix": [2, 9], "x": 11.75, "y": 2},
-                {"matrix": [2, 10], "x": 12.75, "y": 2},
-                {"matrix": [2, 11], "x": 13.75, "y": 2},
-                {"matrix": [2, 13], "x": 14.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 17.25, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [4, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 8.25, "y": 3},
-                {"matrix": [3, 7], "x": 9.25, "y": 3},
-                {"matrix": [3, 8], "x": 10.25, "y": 3},
-                {"matrix": [3, 9], "x": 11.25, "y": 3},
-                {"matrix": [3, 10], "x": 12.25, "y": 3},
-                {"matrix": [3, 11], "x": 13.25, "y": 3},
-                {"matrix": [3, 12], "x": 14.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 16.25, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 3.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 2.75},
-                {"matrix": [4, 7], "x": 8.25, "y": 4, "w": 2.25},
-                {"matrix": [4, 8], "x": 10.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 15.25, "y": 4.25},
-                {"matrix": [4, 13], "x": 16.25, "y": 4.25},
-                {"matrix": [4, 14], "x": 17.25, "y": 4.25}
-            ]
-        },
-        "LAYOUT_split_bs": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [1, 5], "x": 5, "y": 0},
-                {"matrix": [0, 5], "x": 6, "y": 0},
-                {"matrix": [0, 6], "x": 9, "y": 0},
-                {"matrix": [0, 7], "x": 10, "y": 0},
-                {"matrix": [0, 8], "x": 11, "y": 0},
-                {"matrix": [0, 9], "x": 12, "y": 0},
-                {"matrix": [0, 10], "x": 13, "y": 0},
-                {"matrix": [0, 11], "x": 14, "y": 0},
-                {"matrix": [0, 12], "x": 15, "y": 0},
-                {"matrix": [0, 13], "x": 16, "y": 0},
-                {"matrix": [0, 14], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"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": [2, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 8.5, "y": 1},
-                {"matrix": [1, 7], "x": 9.5, "y": 1},
-                {"matrix": [1, 8], "x": 10.5, "y": 1},
-                {"matrix": [1, 9], "x": 11.5, "y": 1},
-                {"matrix": [1, 10], "x": 12.5, "y": 1},
-                {"matrix": [1, 11], "x": 13.5, "y": 1},
-                {"matrix": [1, 12], "x": 14.5, "y": 1},
-                {"matrix": [1, 13], "x": 15.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 17.25, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [3, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 8.75, "y": 2},
-                {"matrix": [2, 7], "x": 9.75, "y": 2},
-                {"matrix": [2, 8], "x": 10.75, "y": 2},
-                {"matrix": [2, 9], "x": 11.75, "y": 2},
-                {"matrix": [2, 10], "x": 12.75, "y": 2},
-                {"matrix": [2, 11], "x": 13.75, "y": 2},
-                {"matrix": [2, 13], "x": 14.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 17.25, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [4, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 8.25, "y": 3},
-                {"matrix": [3, 7], "x": 9.25, "y": 3},
-                {"matrix": [3, 8], "x": 10.25, "y": 3},
-                {"matrix": [3, 9], "x": 11.25, "y": 3},
-                {"matrix": [3, 10], "x": 12.25, "y": 3},
-                {"matrix": [3, 11], "x": 13.25, "y": 3},
-                {"matrix": [3, 12], "x": 14.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 16.25, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 3.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 2.75},
-                {"matrix": [4, 7], "x": 8.25, "y": 4, "w": 2.25},
-                {"matrix": [4, 8], "x": 10.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 15.25, "y": 4.25},
-                {"matrix": [4, 13], "x": 16.25, "y": 4.25},
-                {"matrix": [4, 14], "x": 17.25, "y": 4.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fjlabs/swordfish/keyboard.json b/keyboards/fjlabs/swordfish/keyboard.json
new file mode 100644
index 0000000000..331bae459c
--- /dev/null
+++ b/keyboards/fjlabs/swordfish/keyboard.json
@@ -0,0 +1,201 @@
+{
+    "keyboard_name": "Swordfish",
+    "manufacturer": "FJLaboratories",
+    "url": "http://www.fjlaboratories.com/",
+    "maintainer": "mrnoisytiger",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x0024",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "B2", "B3", "B7", "B5", "B4", "D7", "D6", "D4", "D5"],
+        "rows": ["B0", "B1", "C7", "C6", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "rgblight": {
+        "led_count": 1,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "layouts": {
+        "LAYOUT_2u_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [1, 5], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6, "y": 0},
+                {"matrix": [0, 6], "x": 9, "y": 0},
+                {"matrix": [0, 7], "x": 10, "y": 0},
+                {"matrix": [0, 8], "x": 11, "y": 0},
+                {"matrix": [0, 9], "x": 12, "y": 0},
+                {"matrix": [0, 10], "x": 13, "y": 0},
+                {"matrix": [0, 11], "x": 14, "y": 0},
+                {"matrix": [0, 12], "x": 15, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"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": [2, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 8.5, "y": 1},
+                {"matrix": [1, 7], "x": 9.5, "y": 1},
+                {"matrix": [1, 8], "x": 10.5, "y": 1},
+                {"matrix": [1, 9], "x": 11.5, "y": 1},
+                {"matrix": [1, 10], "x": 12.5, "y": 1},
+                {"matrix": [1, 11], "x": 13.5, "y": 1},
+                {"matrix": [1, 12], "x": 14.5, "y": 1},
+                {"matrix": [1, 13], "x": 15.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 17.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [3, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 8.75, "y": 2},
+                {"matrix": [2, 7], "x": 9.75, "y": 2},
+                {"matrix": [2, 8], "x": 10.75, "y": 2},
+                {"matrix": [2, 9], "x": 11.75, "y": 2},
+                {"matrix": [2, 10], "x": 12.75, "y": 2},
+                {"matrix": [2, 11], "x": 13.75, "y": 2},
+                {"matrix": [2, 13], "x": 14.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 17.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [4, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 8.25, "y": 3},
+                {"matrix": [3, 7], "x": 9.25, "y": 3},
+                {"matrix": [3, 8], "x": 10.25, "y": 3},
+                {"matrix": [3, 9], "x": 11.25, "y": 3},
+                {"matrix": [3, 10], "x": 12.25, "y": 3},
+                {"matrix": [3, 11], "x": 13.25, "y": 3},
+                {"matrix": [3, 12], "x": 14.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 16.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 7], "x": 8.25, "y": 4, "w": 2.25},
+                {"matrix": [4, 8], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 15.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 16.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 17.25, "y": 4.25}
+            ]
+        },
+        "LAYOUT_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [1, 5], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6, "y": 0},
+                {"matrix": [0, 6], "x": 9, "y": 0},
+                {"matrix": [0, 7], "x": 10, "y": 0},
+                {"matrix": [0, 8], "x": 11, "y": 0},
+                {"matrix": [0, 9], "x": 12, "y": 0},
+                {"matrix": [0, 10], "x": 13, "y": 0},
+                {"matrix": [0, 11], "x": 14, "y": 0},
+                {"matrix": [0, 12], "x": 15, "y": 0},
+                {"matrix": [0, 13], "x": 16, "y": 0},
+                {"matrix": [0, 14], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"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": [2, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 8.5, "y": 1},
+                {"matrix": [1, 7], "x": 9.5, "y": 1},
+                {"matrix": [1, 8], "x": 10.5, "y": 1},
+                {"matrix": [1, 9], "x": 11.5, "y": 1},
+                {"matrix": [1, 10], "x": 12.5, "y": 1},
+                {"matrix": [1, 11], "x": 13.5, "y": 1},
+                {"matrix": [1, 12], "x": 14.5, "y": 1},
+                {"matrix": [1, 13], "x": 15.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 17.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [3, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 8.75, "y": 2},
+                {"matrix": [2, 7], "x": 9.75, "y": 2},
+                {"matrix": [2, 8], "x": 10.75, "y": 2},
+                {"matrix": [2, 9], "x": 11.75, "y": 2},
+                {"matrix": [2, 10], "x": 12.75, "y": 2},
+                {"matrix": [2, 11], "x": 13.75, "y": 2},
+                {"matrix": [2, 13], "x": 14.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 17.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [4, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 8.25, "y": 3},
+                {"matrix": [3, 7], "x": 9.25, "y": 3},
+                {"matrix": [3, 8], "x": 10.25, "y": 3},
+                {"matrix": [3, 9], "x": 11.25, "y": 3},
+                {"matrix": [3, 10], "x": 12.25, "y": 3},
+                {"matrix": [3, 11], "x": 13.25, "y": 3},
+                {"matrix": [3, 12], "x": 14.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 16.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 7], "x": 8.25, "y": 4, "w": 2.25},
+                {"matrix": [4, 8], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 15.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 16.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 17.25, "y": 4.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/tf60ansi/info.json b/keyboards/fjlabs/tf60ansi/info.json
deleted file mode 100644
index 69ff0690a1..0000000000
--- a/keyboards/fjlabs/tf60ansi/info.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-    "keyboard_name": "TF60 ANSI",
-    "manufacturer": "FJLabs",
-    "url": "https://www.fjlaboratories.com/",
-    "maintainer": "FJLabs",
-    "usb": {
-        "vid": "0x7074",
-        "pid": "0x1004",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B3", "B2", "B1"],
-        "rows": ["F0", "F1", "F4", "F5", "F6"]
-    },
-    "diode_direction": "COL2ROW",
-    "ws2812": {
-        "pin": "F7"
-    },
-    "rgblight": {
-        "led_count": 64,
-        "max_brightness": 108,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        },
-        "default": {
-            "animation": "rainbow_swirl",
-            "speed": 144
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "features": {
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true,
-        "command": true,
-        "nkro": true,
-        "rgblight": true
-    },
-    "community_layouts": ["60_ansi"],
-    "layouts": {
-        "LAYOUT_60_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"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},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fjlabs/tf60ansi/keyboard.json b/keyboards/fjlabs/tf60ansi/keyboard.json
new file mode 100644
index 0000000000..69ff0690a1
--- /dev/null
+++ b/keyboards/fjlabs/tf60ansi/keyboard.json
@@ -0,0 +1,121 @@
+{
+    "keyboard_name": "TF60 ANSI",
+    "manufacturer": "FJLabs",
+    "url": "https://www.fjlaboratories.com/",
+    "maintainer": "FJLabs",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x1004",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B3", "B2", "B1"],
+        "rows": ["F0", "F1", "F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "F7"
+    },
+    "rgblight": {
+        "led_count": 64,
+        "max_brightness": 108,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl",
+            "speed": 144
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "community_layouts": ["60_ansi"],
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"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},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/tf60v2/info.json b/keyboards/fjlabs/tf60v2/info.json
deleted file mode 100644
index 337a06843f..0000000000
--- a/keyboards/fjlabs/tf60v2/info.json
+++ /dev/null
@@ -1,123 +0,0 @@
-{
-    "keyboard_name": "TF60 V2",
-    "manufacturer": "FJLabs",
-    "url": "https://www.fjlaboratories.com/",
-    "maintainer": "FJLabs",
-    "usb": {
-        "vid": "0x7074",
-        "pid": "0x1005",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B3", "B2", "B1"],
-        "rows": ["F0", "F1", "F4", "F5", "F6"]
-    },
-    "diode_direction": "COL2ROW",
-    "ws2812": {
-        "pin": "F7"
-    },
-    "rgblight": {
-        "led_count": 64,
-        "max_brightness": 108,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        },
-        "default": {
-            "animation": "rainbow_swirl",
-            "speed": 144
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "features": {
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true,
-        "command": true,
-        "nkro": true,
-        "rgblight": true
-    },
-    "community_layouts": ["60_ansi_arrow"],
-    "layouts": {
-        "LAYOUT_60_ansi_arrow": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"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},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 12], "x": 13, "y": 3},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4},
-                {"matrix": [4, 10], "x": 11, "y": 4},
-                {"matrix": [4, 11], "x": 12, "y": 4},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fjlabs/tf60v2/keyboard.json b/keyboards/fjlabs/tf60v2/keyboard.json
new file mode 100644
index 0000000000..337a06843f
--- /dev/null
+++ b/keyboards/fjlabs/tf60v2/keyboard.json
@@ -0,0 +1,123 @@
+{
+    "keyboard_name": "TF60 V2",
+    "manufacturer": "FJLabs",
+    "url": "https://www.fjlaboratories.com/",
+    "maintainer": "FJLabs",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x1005",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B3", "B2", "B1"],
+        "rows": ["F0", "F1", "F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "F7"
+    },
+    "rgblight": {
+        "led_count": 64,
+        "max_brightness": 108,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl",
+            "speed": 144
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "community_layouts": ["60_ansi_arrow"],
+    "layouts": {
+        "LAYOUT_60_ansi_arrow": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"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},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 13, "y": 3},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/tf65rgbv2/info.json b/keyboards/fjlabs/tf65rgbv2/info.json
deleted file mode 100644
index dd567c63b8..0000000000
--- a/keyboards/fjlabs/tf65rgbv2/info.json
+++ /dev/null
@@ -1,128 +0,0 @@
-{
-    "keyboard_name": "TF65 RGB V2",
-    "manufacturer": "FJLabs",
-    "url": "https://www.fjlaboratories.com/",
-    "maintainer": "FJLabs",
-    "usb": {
-        "vid": "0x7074",
-        "pid": "0x1007",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B3", "B2", "B1", "D1"],
-        "rows": ["F0", "F1", "F4", "F5", "F6"]
-    },
-    "diode_direction": "COL2ROW",
-    "ws2812": {
-        "pin": "F7"
-    },
-    "rgblight": {
-        "led_count": 68,
-        "max_brightness": 96,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        },
-        "default": {
-            "animation": "rainbow_swirl",
-            "speed": 144
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "features": {
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true,
-        "command": true,
-        "nkro": true,
-        "rgblight": true
-    },
-    "community_layouts": ["65_ansi"],
-    "layouts": {
-        "LAYOUT_65_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"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},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4},
-                {"matrix": [4, 10], "x": 11, "y": 4},
-                {"matrix": [4, 11], "x": 12, "y": 4},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fjlabs/tf65rgbv2/keyboard.json b/keyboards/fjlabs/tf65rgbv2/keyboard.json
new file mode 100644
index 0000000000..dd567c63b8
--- /dev/null
+++ b/keyboards/fjlabs/tf65rgbv2/keyboard.json
@@ -0,0 +1,128 @@
+{
+    "keyboard_name": "TF65 RGB V2",
+    "manufacturer": "FJLabs",
+    "url": "https://www.fjlaboratories.com/",
+    "maintainer": "FJLabs",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x1007",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B3", "B2", "B1", "D1"],
+        "rows": ["F0", "F1", "F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "F7"
+    },
+    "rgblight": {
+        "led_count": 68,
+        "max_brightness": 96,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl",
+            "speed": 144
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "community_layouts": ["65_ansi"],
+    "layouts": {
+        "LAYOUT_65_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"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},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fractal/info.json b/keyboards/fractal/info.json
deleted file mode 100644
index 4086ff969f..0000000000
--- a/keyboards/fractal/info.json
+++ /dev/null
@@ -1,162 +0,0 @@
-{
-  "keyboard_name": "Fractal",
-  "manufacturer": "KeyPCB",
-  "url": "https://keypcb.bigcartel.com/product/fractal-keyboard-group-buy",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x6060",
-    "device_version": "0.0.1"
-  },
-  "matrix_pins": {
-    "cols": ["B3", "B2", "B6", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D3"],
-    "rows": ["B1", "F7", "F6", "F5", "F4"]
-  },
-  "diode_direction": "COL2ROW",
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "features": {
-    "bootmagic": true,
-    "mousekey": true,
-    "extrakey": true,
-    "nkro": true
-  },
-  "community_layouts": ["ortho_5x12"],
-  "layouts": {
-    "LAYOUT_ortho_5x12": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"matrix": [0, 11], "x": 11, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1},
-        {"matrix": [1, 1], "x": 1, "y": 1},
-        {"matrix": [1, 2], "x": 2, "y": 1},
-        {"matrix": [1, 3], "x": 3, "y": 1},
-        {"matrix": [1, 4], "x": 4, "y": 1},
-        {"matrix": [1, 5], "x": 5, "y": 1},
-        {"matrix": [1, 6], "x": 6, "y": 1},
-        {"matrix": [1, 7], "x": 7, "y": 1},
-        {"matrix": [1, 8], "x": 8, "y": 1},
-        {"matrix": [1, 9], "x": 9, "y": 1},
-        {"matrix": [1, 10], "x": 10, "y": 1},
-        {"matrix": [1, 11], "x": 11, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2},
-        {"matrix": [2, 5], "x": 5, "y": 2},
-        {"matrix": [2, 6], "x": 6, "y": 2},
-        {"matrix": [2, 7], "x": 7, "y": 2},
-        {"matrix": [2, 8], "x": 8, "y": 2},
-        {"matrix": [2, 9], "x": 9, "y": 2},
-        {"matrix": [2, 10], "x": 10, "y": 2},
-        {"matrix": [2, 11], "x": 11, "y": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3},
-        {"matrix": [3, 1], "x": 1, "y": 3},
-        {"matrix": [3, 2], "x": 2, "y": 3},
-        {"matrix": [3, 3], "x": 3, "y": 3},
-        {"matrix": [3, 4], "x": 4, "y": 3},
-        {"matrix": [3, 5], "x": 5, "y": 3},
-        {"matrix": [3, 6], "x": 6, "y": 3},
-        {"matrix": [3, 7], "x": 7, "y": 3},
-        {"matrix": [3, 8], "x": 8, "y": 3},
-        {"matrix": [3, 9], "x": 9, "y": 3},
-        {"matrix": [3, 10], "x": 10, "y": 3},
-        {"matrix": [3, 11], "x": 11, "y": 3},
-
-        {"matrix": [4, 0], "x": 0, "y": 4},
-        {"matrix": [4, 1], "x": 1, "y": 4},
-        {"matrix": [4, 2], "x": 2, "y": 4},
-        {"matrix": [4, 3], "x": 3, "y": 4},
-        {"matrix": [4, 4], "x": 4, "y": 4},
-        {"matrix": [4, 5], "x": 5, "y": 4},
-        {"matrix": [4, 6], "x": 6, "y": 4},
-        {"matrix": [4, 7], "x": 7, "y": 4},
-        {"matrix": [4, 8], "x": 8, "y": 4},
-        {"matrix": [4, 9], "x": 9, "y": 4},
-        {"matrix": [4, 10], "x": 10, "y": 4},
-        {"matrix": [4, 11], "x": 11, "y": 4}
-      ]
-    },
-    "LAYOUT_preonic_mit": {
-        "layout": [
-          {"matrix": [0, 0], "x": 0, "y": 0},
-          {"matrix": [0, 1], "x": 1, "y": 0},
-          {"matrix": [0, 2], "x": 2, "y": 0},
-          {"matrix": [0, 3], "x": 3, "y": 0},
-          {"matrix": [0, 4], "x": 4, "y": 0},
-          {"matrix": [0, 5], "x": 5, "y": 0},
-          {"matrix": [0, 6], "x": 6, "y": 0},
-          {"matrix": [0, 7], "x": 7, "y": 0},
-          {"matrix": [0, 8], "x": 8, "y": 0},
-          {"matrix": [0, 9], "x": 9, "y": 0},
-          {"matrix": [0, 10], "x": 10, "y": 0},
-          {"matrix": [0, 11], "x": 11, "y": 0},
-
-          {"matrix": [1, 0], "x": 0, "y": 1},
-          {"matrix": [1, 1], "x": 1, "y": 1},
-          {"matrix": [1, 2], "x": 2, "y": 1},
-          {"matrix": [1, 3], "x": 3, "y": 1},
-          {"matrix": [1, 4], "x": 4, "y": 1},
-          {"matrix": [1, 5], "x": 5, "y": 1},
-          {"matrix": [1, 6], "x": 6, "y": 1},
-          {"matrix": [1, 7], "x": 7, "y": 1},
-          {"matrix": [1, 8], "x": 8, "y": 1},
-          {"matrix": [1, 9], "x": 9, "y": 1},
-          {"matrix": [1, 10], "x": 10, "y": 1},
-          {"matrix": [1, 11], "x": 11, "y": 1},
-
-          {"matrix": [2, 0], "x": 0, "y": 2},
-          {"matrix": [2, 1], "x": 1, "y": 2},
-          {"matrix": [2, 2], "x": 2, "y": 2},
-          {"matrix": [2, 3], "x": 3, "y": 2},
-          {"matrix": [2, 4], "x": 4, "y": 2},
-          {"matrix": [2, 5], "x": 5, "y": 2},
-          {"matrix": [2, 6], "x": 6, "y": 2},
-          {"matrix": [2, 7], "x": 7, "y": 2},
-          {"matrix": [2, 8], "x": 8, "y": 2},
-          {"matrix": [2, 9], "x": 9, "y": 2},
-          {"matrix": [2, 10], "x": 10, "y": 2},
-          {"matrix": [2, 11], "x": 11, "y": 2},
-
-          {"matrix": [3, 0], "x": 0, "y": 3},
-          {"matrix": [3, 1], "x": 1, "y": 3},
-          {"matrix": [3, 2], "x": 2, "y": 3},
-          {"matrix": [3, 3], "x": 3, "y": 3},
-          {"matrix": [3, 4], "x": 4, "y": 3},
-          {"matrix": [3, 5], "x": 5, "y": 3},
-          {"matrix": [3, 6], "x": 6, "y": 3},
-          {"matrix": [3, 7], "x": 7, "y": 3},
-          {"matrix": [3, 8], "x": 8, "y": 3},
-          {"matrix": [3, 9], "x": 9, "y": 3},
-          {"matrix": [3, 10], "x": 10, "y": 3},
-          {"matrix": [3, 11], "x": 11, "y": 3},
-
-          {"matrix": [4, 0], "x": 0, "y": 4},
-          {"matrix": [4, 1], "x": 1, "y": 4},
-          {"matrix": [4, 2], "x": 2, "y": 4},
-          {"matrix": [4, 3], "x": 3, "y": 4},
-          {"matrix": [4, 4], "x": 4, "y": 4},
-          {"matrix": [4, 6], "x": 5, "y": 4, "w": 2},
-          {"matrix": [4, 7], "x": 7, "y": 4},
-          {"matrix": [4, 8], "x": 8, "y": 4},
-          {"matrix": [4, 9], "x": 9, "y": 4},
-          {"matrix": [4, 10], "x": 10, "y": 4},
-          {"matrix": [4, 11], "x": 11, "y": 4}
-        ]
-      }
-    }
-}
diff --git a/keyboards/fractal/keyboard.json b/keyboards/fractal/keyboard.json
new file mode 100644
index 0000000000..4086ff969f
--- /dev/null
+++ b/keyboards/fractal/keyboard.json
@@ -0,0 +1,162 @@
+{
+  "keyboard_name": "Fractal",
+  "manufacturer": "KeyPCB",
+  "url": "https://keypcb.bigcartel.com/product/fractal-keyboard-group-buy",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x6060",
+    "device_version": "0.0.1"
+  },
+  "matrix_pins": {
+    "cols": ["B3", "B2", "B6", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D3"],
+    "rows": ["B1", "F7", "F6", "F5", "F4"]
+  },
+  "diode_direction": "COL2ROW",
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "features": {
+    "bootmagic": true,
+    "mousekey": true,
+    "extrakey": true,
+    "nkro": true
+  },
+  "community_layouts": ["ortho_5x12"],
+  "layouts": {
+    "LAYOUT_ortho_5x12": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+        {"matrix": [4, 1], "x": 1, "y": 4},
+        {"matrix": [4, 2], "x": 2, "y": 4},
+        {"matrix": [4, 3], "x": 3, "y": 4},
+        {"matrix": [4, 4], "x": 4, "y": 4},
+        {"matrix": [4, 5], "x": 5, "y": 4},
+        {"matrix": [4, 6], "x": 6, "y": 4},
+        {"matrix": [4, 7], "x": 7, "y": 4},
+        {"matrix": [4, 8], "x": 8, "y": 4},
+        {"matrix": [4, 9], "x": 9, "y": 4},
+        {"matrix": [4, 10], "x": 10, "y": 4},
+        {"matrix": [4, 11], "x": 11, "y": 4}
+      ]
+    },
+    "LAYOUT_preonic_mit": {
+        "layout": [
+          {"matrix": [0, 0], "x": 0, "y": 0},
+          {"matrix": [0, 1], "x": 1, "y": 0},
+          {"matrix": [0, 2], "x": 2, "y": 0},
+          {"matrix": [0, 3], "x": 3, "y": 0},
+          {"matrix": [0, 4], "x": 4, "y": 0},
+          {"matrix": [0, 5], "x": 5, "y": 0},
+          {"matrix": [0, 6], "x": 6, "y": 0},
+          {"matrix": [0, 7], "x": 7, "y": 0},
+          {"matrix": [0, 8], "x": 8, "y": 0},
+          {"matrix": [0, 9], "x": 9, "y": 0},
+          {"matrix": [0, 10], "x": 10, "y": 0},
+          {"matrix": [0, 11], "x": 11, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1},
+          {"matrix": [1, 1], "x": 1, "y": 1},
+          {"matrix": [1, 2], "x": 2, "y": 1},
+          {"matrix": [1, 3], "x": 3, "y": 1},
+          {"matrix": [1, 4], "x": 4, "y": 1},
+          {"matrix": [1, 5], "x": 5, "y": 1},
+          {"matrix": [1, 6], "x": 6, "y": 1},
+          {"matrix": [1, 7], "x": 7, "y": 1},
+          {"matrix": [1, 8], "x": 8, "y": 1},
+          {"matrix": [1, 9], "x": 9, "y": 1},
+          {"matrix": [1, 10], "x": 10, "y": 1},
+          {"matrix": [1, 11], "x": 11, "y": 1},
+
+          {"matrix": [2, 0], "x": 0, "y": 2},
+          {"matrix": [2, 1], "x": 1, "y": 2},
+          {"matrix": [2, 2], "x": 2, "y": 2},
+          {"matrix": [2, 3], "x": 3, "y": 2},
+          {"matrix": [2, 4], "x": 4, "y": 2},
+          {"matrix": [2, 5], "x": 5, "y": 2},
+          {"matrix": [2, 6], "x": 6, "y": 2},
+          {"matrix": [2, 7], "x": 7, "y": 2},
+          {"matrix": [2, 8], "x": 8, "y": 2},
+          {"matrix": [2, 9], "x": 9, "y": 2},
+          {"matrix": [2, 10], "x": 10, "y": 2},
+          {"matrix": [2, 11], "x": 11, "y": 2},
+
+          {"matrix": [3, 0], "x": 0, "y": 3},
+          {"matrix": [3, 1], "x": 1, "y": 3},
+          {"matrix": [3, 2], "x": 2, "y": 3},
+          {"matrix": [3, 3], "x": 3, "y": 3},
+          {"matrix": [3, 4], "x": 4, "y": 3},
+          {"matrix": [3, 5], "x": 5, "y": 3},
+          {"matrix": [3, 6], "x": 6, "y": 3},
+          {"matrix": [3, 7], "x": 7, "y": 3},
+          {"matrix": [3, 8], "x": 8, "y": 3},
+          {"matrix": [3, 9], "x": 9, "y": 3},
+          {"matrix": [3, 10], "x": 10, "y": 3},
+          {"matrix": [3, 11], "x": 11, "y": 3},
+
+          {"matrix": [4, 0], "x": 0, "y": 4},
+          {"matrix": [4, 1], "x": 1, "y": 4},
+          {"matrix": [4, 2], "x": 2, "y": 4},
+          {"matrix": [4, 3], "x": 3, "y": 4},
+          {"matrix": [4, 4], "x": 4, "y": 4},
+          {"matrix": [4, 6], "x": 5, "y": 4, "w": 2},
+          {"matrix": [4, 7], "x": 7, "y": 4},
+          {"matrix": [4, 8], "x": 8, "y": 4},
+          {"matrix": [4, 9], "x": 9, "y": 4},
+          {"matrix": [4, 10], "x": 10, "y": 4},
+          {"matrix": [4, 11], "x": 11, "y": 4}
+        ]
+      }
+    }
+}
diff --git a/keyboards/frobiac/blackbowl/info.json b/keyboards/frobiac/blackbowl/info.json
deleted file mode 100644
index 8a4aed1948..0000000000
--- a/keyboards/frobiac/blackbowl/info.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-    "manufacturer": "frobiac",
-    "keyboard_name": "blackbowl",
-    "url": "https://www.github.com/frobiac/adnw",
-    "maintainer": "frobiac",
-    "bootloader": "halfkay",
-    "processor": "atmega32u4",
-    "diode_direction": "ROW2COL",
-    "features": {
-        "bootmagic": false,
-        "command": false,
-        "console": false,
-        "dynamic_macro": true,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": false,
-        "ps2": true,
-        "ps2_mouse": true
-    },
-    "build": {
-        "lto": true
-    },
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x1D50",
-        "vid": "0x6033"
-    },
-    "matrix_pins": {
-        "cols": [null, null, null, null],
-        "rows": [null, null, null, null, null, null, null, null, null, null]
-    },
-  "layouts": {
-    "LAYOUT": {
-       "layout": [
-                {"matrix": [5, 3], "label": "K", "x": 0, "y": 1},
-                {"matrix": [6, 3], "label": "U", "x": 1, "y": 0.5},
-                {"matrix": [7, 3], "label": "Q", "x": 2, "y": 0},
-                {"matrix": [8, 3], "label": ".", "x": 3, "y": 0},
-                {"matrix": [9, 3], "label": "J", "x": 4, "y": 0},
-
-                {"matrix": [0, 3], "label": "P", "x": 6, "y": 0},
-                {"matrix": [1, 3], "label": "C", "x": 7, "y": 0},
-                {"matrix": [2, 3], "label": "L", "x": 8, "y": 0},
-                {"matrix": [3, 3], "label": "M", "x": 9, "y": 0.5},
-                {"matrix": [4, 3], "label": "F", "x": 10, "y": 1},
-
-                {"matrix": [5, 2], "label": "H", "x": 0, "y": 2},
-                {"matrix": [6, 2], "label": "I", "x": 1, "y": 1.5},
-                {"matrix": [7, 2], "label": "E", "x": 2, "y": 1},
-                {"matrix": [8, 2], "label": "A", "x": 3, "y": 1},
-                {"matrix": [9, 2], "label": "O", "x": 4, "y": 1},
-
-                {"matrix": [0, 2], "label": "D", "x": 6, "y": 1},
-                {"matrix": [1, 2], "label": "T", "x": 7, "y": 1},
-                {"matrix": [2, 2], "label": "R", "x": 8, "y": 1},
-                {"matrix": [3, 2], "label": "N", "x": 9, "y": 1.5},
-                {"matrix": [4, 2], "label": "S", "x": 10, "y": 2},
-
-                {"matrix": [5, 1], "label": "X", "x": 0, "y": 3},
-                {"matrix": [6, 1], "label": "Y", "x": 1, "y": 2.5},
-                {"matrix": [7, 1], "label": "-", "x": 2, "y": 2},
-                {"matrix": [8, 1], "label": ",", "x": 3, "y": 2},
-                {"matrix": [9, 1], "label": "/", "x": 4, "y": 2},
-
-                {"matrix": [0, 1], "label": "B", "x": 6, "y": 2},
-                {"matrix": [1, 1], "label": "G", "x": 7, "y": 2},
-                {"matrix": [2, 1], "label": "W", "x": 8, "y": 2},
-                {"matrix": [3, 1], "label": "V", "x": 9, "y": 2.5},
-                {"matrix": [4, 1], "label": "Z", "x": 10, "y": 3},
-
-                {"matrix": [5, 0], "label": " ", "x": 0, "y": 0},
-                {"matrix": [7, 0], "label": "Gui", "x": 2, "y": 3},
-                {"matrix": [8, 0], "label": "tab", "x": 3, "y": 3},
-                {"matrix": [9, 0], "label": "spc", "x": 4, "y": 3},
-
-                {"matrix": [0, 0], "label": "L2", "x": 6, "y": 3},
-                {"matrix": [1, 0], "label": "Sh", "x": 7, "y": 3},
-                {"matrix": [2, 0], "label": "L3", "x": 8, "y": 3},
-                {"matrix": [4, 0], "label": "Fx", "x": 10, "y": 0}
-       ]
-    }
-  }
-}
diff --git a/keyboards/frobiac/blackbowl/keyboard.json b/keyboards/frobiac/blackbowl/keyboard.json
new file mode 100644
index 0000000000..8a4aed1948
--- /dev/null
+++ b/keyboards/frobiac/blackbowl/keyboard.json
@@ -0,0 +1,83 @@
+{
+    "manufacturer": "frobiac",
+    "keyboard_name": "blackbowl",
+    "url": "https://www.github.com/frobiac/adnw",
+    "maintainer": "frobiac",
+    "bootloader": "halfkay",
+    "processor": "atmega32u4",
+    "diode_direction": "ROW2COL",
+    "features": {
+        "bootmagic": false,
+        "command": false,
+        "console": false,
+        "dynamic_macro": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "ps2": true,
+        "ps2_mouse": true
+    },
+    "build": {
+        "lto": true
+    },
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x1D50",
+        "vid": "0x6033"
+    },
+    "matrix_pins": {
+        "cols": [null, null, null, null],
+        "rows": [null, null, null, null, null, null, null, null, null, null]
+    },
+  "layouts": {
+    "LAYOUT": {
+       "layout": [
+                {"matrix": [5, 3], "label": "K", "x": 0, "y": 1},
+                {"matrix": [6, 3], "label": "U", "x": 1, "y": 0.5},
+                {"matrix": [7, 3], "label": "Q", "x": 2, "y": 0},
+                {"matrix": [8, 3], "label": ".", "x": 3, "y": 0},
+                {"matrix": [9, 3], "label": "J", "x": 4, "y": 0},
+
+                {"matrix": [0, 3], "label": "P", "x": 6, "y": 0},
+                {"matrix": [1, 3], "label": "C", "x": 7, "y": 0},
+                {"matrix": [2, 3], "label": "L", "x": 8, "y": 0},
+                {"matrix": [3, 3], "label": "M", "x": 9, "y": 0.5},
+                {"matrix": [4, 3], "label": "F", "x": 10, "y": 1},
+
+                {"matrix": [5, 2], "label": "H", "x": 0, "y": 2},
+                {"matrix": [6, 2], "label": "I", "x": 1, "y": 1.5},
+                {"matrix": [7, 2], "label": "E", "x": 2, "y": 1},
+                {"matrix": [8, 2], "label": "A", "x": 3, "y": 1},
+                {"matrix": [9, 2], "label": "O", "x": 4, "y": 1},
+
+                {"matrix": [0, 2], "label": "D", "x": 6, "y": 1},
+                {"matrix": [1, 2], "label": "T", "x": 7, "y": 1},
+                {"matrix": [2, 2], "label": "R", "x": 8, "y": 1},
+                {"matrix": [3, 2], "label": "N", "x": 9, "y": 1.5},
+                {"matrix": [4, 2], "label": "S", "x": 10, "y": 2},
+
+                {"matrix": [5, 1], "label": "X", "x": 0, "y": 3},
+                {"matrix": [6, 1], "label": "Y", "x": 1, "y": 2.5},
+                {"matrix": [7, 1], "label": "-", "x": 2, "y": 2},
+                {"matrix": [8, 1], "label": ",", "x": 3, "y": 2},
+                {"matrix": [9, 1], "label": "/", "x": 4, "y": 2},
+
+                {"matrix": [0, 1], "label": "B", "x": 6, "y": 2},
+                {"matrix": [1, 1], "label": "G", "x": 7, "y": 2},
+                {"matrix": [2, 1], "label": "W", "x": 8, "y": 2},
+                {"matrix": [3, 1], "label": "V", "x": 9, "y": 2.5},
+                {"matrix": [4, 1], "label": "Z", "x": 10, "y": 3},
+
+                {"matrix": [5, 0], "label": " ", "x": 0, "y": 0},
+                {"matrix": [7, 0], "label": "Gui", "x": 2, "y": 3},
+                {"matrix": [8, 0], "label": "tab", "x": 3, "y": 3},
+                {"matrix": [9, 0], "label": "spc", "x": 4, "y": 3},
+
+                {"matrix": [0, 0], "label": "L2", "x": 6, "y": 3},
+                {"matrix": [1, 0], "label": "Sh", "x": 7, "y": 3},
+                {"matrix": [2, 0], "label": "L3", "x": 8, "y": 3},
+                {"matrix": [4, 0], "label": "Fx", "x": 10, "y": 0}
+       ]
+    }
+  }
+}
diff --git a/keyboards/gboards/ergotaco/info.json b/keyboards/gboards/ergotaco/info.json
deleted file mode 100644
index 1d13c2458a..0000000000
--- a/keyboards/gboards/ergotaco/info.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "keyboard_name": "ErgoTaco",
-    "manufacturer": "g Heavy Industries",
-    "url": "http://gboards.ca",
-    "maintainer": "germ",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x1337",
-        "device_version": "0.0.1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "features": {
-        "bootmagic": false,
-        "mousekey": false,
-        "extrakey": true,
-        "console": true,
-        "command": true
-    },
-    "tapping": {
-        "toggle": 1
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [11, 0], "x": 0, "y": 1},
-                {"matrix": [10, 0], "x": 1, "y": 0.5},
-                {"matrix": [9, 0], "x": 2, "y": 0.25},
-                {"matrix": [8, 0], "x": 3, "y": 0},
-                {"matrix": [7, 0], "x": 4, "y": 0.75},
-                {"matrix": [6, 0], "x": 5, "y": 1.5},
-
-                {"matrix": [0, 0], "x": 7, "y": 1.5},
-                {"matrix": [1, 0], "x": 8, "y": 0.75},
-                {"matrix": [2, 0], "x": 9, "y": 0},
-                {"matrix": [3, 0], "x": 10, "y": 0.25},
-                {"matrix": [4, 0], "x": 11, "y": 0.5},
-                {"matrix": [5, 0], "x": 12, "y": 1}
-            ]
-        }
-    }
-}
diff --git a/keyboards/gboards/ergotaco/keyboard.json b/keyboards/gboards/ergotaco/keyboard.json
new file mode 100644
index 0000000000..1d13c2458a
--- /dev/null
+++ b/keyboards/gboards/ergotaco/keyboard.json
@@ -0,0 +1,42 @@
+{
+    "keyboard_name": "ErgoTaco",
+    "manufacturer": "g Heavy Industries",
+    "url": "http://gboards.ca",
+    "maintainer": "germ",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x1337",
+        "device_version": "0.0.1"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "console": true,
+        "command": true
+    },
+    "tapping": {
+        "toggle": 1
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [11, 0], "x": 0, "y": 1},
+                {"matrix": [10, 0], "x": 1, "y": 0.5},
+                {"matrix": [9, 0], "x": 2, "y": 0.25},
+                {"matrix": [8, 0], "x": 3, "y": 0},
+                {"matrix": [7, 0], "x": 4, "y": 0.75},
+                {"matrix": [6, 0], "x": 5, "y": 1.5},
+
+                {"matrix": [0, 0], "x": 7, "y": 1.5},
+                {"matrix": [1, 0], "x": 8, "y": 0.75},
+                {"matrix": [2, 0], "x": 9, "y": 0},
+                {"matrix": [3, 0], "x": 10, "y": 0.25},
+                {"matrix": [4, 0], "x": 11, "y": 0.5},
+                {"matrix": [5, 0], "x": 12, "y": 1}
+            ]
+        }
+    }
+}
diff --git a/keyboards/gboards/georgi/info.json b/keyboards/gboards/georgi/info.json
deleted file mode 100644
index 066797a241..0000000000
--- a/keyboards/gboards/georgi/info.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-    "keyboard_name": "Georgi",
-    "manufacturer": "g Heavy Industries",
-    "url": "http://gboards.ca",
-    "maintainer": "germ",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x1337",
-        "device_version": "0.0.1",
-        "force_nkro": true
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "features": {
-        "bootmagic": false,
-        "mousekey": false,
-        "extrakey": true,
-        "console": true,
-        "nkro": true,
-        "steno": true
-    },
-    "build": {
-        "lto": true
-    },
-    "tapping": {
-        "toggle": 2
-    },
-    "layout_aliases": {
-        "LAYOUT_georgi": "LAYOUT"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [12, 1], "x": 0, "y": 0.5},
-                {"matrix": [11, 1], "x": 1, "y": 0.5},
-                {"matrix": [10, 1], "x": 2, "y": 0.3},
-                {"matrix": [9, 1], "x": 3, "y": 0},
-                {"matrix": [8, 1], "x": 4, "y": 0.4},
-                {"matrix": [7, 1], "x": 5, "y": 0.5},
-
-                {"matrix": [0, 1], "x": 7, "y": 0.5},
-                {"matrix": [1, 1], "x": 8, "y": 0.4},
-                {"matrix": [2, 1], "x": 9, "y": 0},
-                {"matrix": [3, 1], "x": 10, "y": 0.3},
-                {"matrix": [4, 1], "x": 11, "y": 0.5},
-                {"matrix": [5, 1], "x": 12, "y": 0.5},
-
-                {"matrix": [12, 2], "x": 0, "y": 1.5},
-                {"matrix": [11, 2], "x": 1, "y": 1.5},
-                {"matrix": [10, 2], "x": 2, "y": 1.3},
-                {"matrix": [9, 2], "x": 3, "y": 1},
-                {"matrix": [8, 2], "x": 4, "y": 1.4},
-                {"matrix": [7, 2], "x": 5, "y": 1.5},
-
-                {"matrix": [0, 2], "x": 7, "y": 1.5},
-                {"matrix": [1, 2], "x": 8, "y": 1.4},
-                {"matrix": [2, 2], "x": 9, "y": 1},
-                {"matrix": [3, 2], "x": 10, "y": 1.3},
-                {"matrix": [4, 2], "x": 11, "y": 1.5},
-                {"matrix": [5, 2], "x": 12, "y": 1.5},
-
-                {"matrix": [9, 3], "x": 3, "y": 2.75},
-                {"matrix": [8, 3], "x": 4, "y": 2.75},
-                {"matrix": [7, 3], "x": 5, "y": 2.75},
-
-                {"matrix": [1, 3], "x": 7, "y": 2.75},
-                {"matrix": [0, 3], "x": 8, "y": 2.75},
-                {"matrix": [2, 3], "x": 9, "y": 2.75}
-            ]
-        }
-    }
-}
diff --git a/keyboards/gboards/georgi/keyboard.json b/keyboards/gboards/georgi/keyboard.json
new file mode 100644
index 0000000000..066797a241
--- /dev/null
+++ b/keyboards/gboards/georgi/keyboard.json
@@ -0,0 +1,72 @@
+{
+    "keyboard_name": "Georgi",
+    "manufacturer": "g Heavy Industries",
+    "url": "http://gboards.ca",
+    "maintainer": "germ",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x1337",
+        "device_version": "0.0.1",
+        "force_nkro": true
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "console": true,
+        "nkro": true,
+        "steno": true
+    },
+    "build": {
+        "lto": true
+    },
+    "tapping": {
+        "toggle": 2
+    },
+    "layout_aliases": {
+        "LAYOUT_georgi": "LAYOUT"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [12, 1], "x": 0, "y": 0.5},
+                {"matrix": [11, 1], "x": 1, "y": 0.5},
+                {"matrix": [10, 1], "x": 2, "y": 0.3},
+                {"matrix": [9, 1], "x": 3, "y": 0},
+                {"matrix": [8, 1], "x": 4, "y": 0.4},
+                {"matrix": [7, 1], "x": 5, "y": 0.5},
+
+                {"matrix": [0, 1], "x": 7, "y": 0.5},
+                {"matrix": [1, 1], "x": 8, "y": 0.4},
+                {"matrix": [2, 1], "x": 9, "y": 0},
+                {"matrix": [3, 1], "x": 10, "y": 0.3},
+                {"matrix": [4, 1], "x": 11, "y": 0.5},
+                {"matrix": [5, 1], "x": 12, "y": 0.5},
+
+                {"matrix": [12, 2], "x": 0, "y": 1.5},
+                {"matrix": [11, 2], "x": 1, "y": 1.5},
+                {"matrix": [10, 2], "x": 2, "y": 1.3},
+                {"matrix": [9, 2], "x": 3, "y": 1},
+                {"matrix": [8, 2], "x": 4, "y": 1.4},
+                {"matrix": [7, 2], "x": 5, "y": 1.5},
+
+                {"matrix": [0, 2], "x": 7, "y": 1.5},
+                {"matrix": [1, 2], "x": 8, "y": 1.4},
+                {"matrix": [2, 2], "x": 9, "y": 1},
+                {"matrix": [3, 2], "x": 10, "y": 1.3},
+                {"matrix": [4, 2], "x": 11, "y": 1.5},
+                {"matrix": [5, 2], "x": 12, "y": 1.5},
+
+                {"matrix": [9, 3], "x": 3, "y": 2.75},
+                {"matrix": [8, 3], "x": 4, "y": 2.75},
+                {"matrix": [7, 3], "x": 5, "y": 2.75},
+
+                {"matrix": [1, 3], "x": 7, "y": 2.75},
+                {"matrix": [0, 3], "x": 8, "y": 2.75},
+                {"matrix": [2, 3], "x": 9, "y": 2.75}
+            ]
+        }
+    }
+}
diff --git a/keyboards/gboards/gergo/info.json b/keyboards/gboards/gergo/info.json
deleted file mode 100644
index e576ac8012..0000000000
--- a/keyboards/gboards/gergo/info.json
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-    "keyboard_name": "Gergo",
-    "manufacturer": "g Heavy Industries",
-    "url": "http://gboards.ca",
-    "maintainer": "germ",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x1307",
-        "device_version": "0.0.1"
-    },
-    "build": {
-        "debounce_type": "sym_eager_pr"
-    },
-    "bootmagic": {
-        "matrix": [13, 2]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "features": {
-        "bootmagic": true,
-        "mousekey": false,
-        "extrakey": true,
-        "console": true,
-        "command": true
-    },
-    "tapping": {
-        "toggle": 1
-    },
-    "layout_aliases": {
-        "LAYOUT_gergo": "LAYOUT"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [6, 0], "x": 0, "y": 0.38, "w": 1.5},
-                {"matrix": [5, 0], "x": 1.5, "y": 0.38},
-                {"matrix": [4, 0], "x": 2.5, "y": 0.13},
-                {"matrix": [3, 0], "x": 3.5, "y": 0},
-                {"matrix": [2, 0], "x": 4.5, "y": 0.13},
-                {"matrix": [1, 0], "x": 5.5, "y": 0.25},
-
-                {"matrix": [8, 0], "x": 13, "y": 0.25},
-                {"matrix": [9, 0], "x": 14, "y": 0.13},
-                {"matrix": [10, 0], "x": 15, "y": 0},
-                {"matrix": [11, 0], "x": 16, "y": 0.13},
-                {"matrix": [12, 0], "x": 17, "y": 0.38},
-                {"matrix": [13, 0], "x": 18, "y": 0.38, "w": 1.5},
-
-                {"matrix": [6, 1], "x": 0, "y": 1.38, "w": 1.5},
-                {"matrix": [5, 1], "x": 1.5, "y": 1.38},
-                {"matrix": [4, 1], "x": 2.5, "y": 1.13},
-                {"matrix": [3, 1], "x": 3.5, "y": 1},
-                {"matrix": [2, 1], "x": 4.5, "y": 1.13},
-                {"matrix": [1, 1], "x": 5.5, "y": 1.25},
-                {"matrix": [0, 1], "x": 6.5, "y": 0.25, "h": 1.5},
-
-                {"matrix": [7, 1], "x": 12, "y": 0.25, "h": 1.5},
-                {"matrix": [8, 1], "x": 13, "y": 1.25},
-                {"matrix": [9, 1], "x": 14, "y": 1.13},
-                {"matrix": [10, 1], "x": 15, "y": 1},
-                {"matrix": [11, 1], "x": 16, "y": 1.13},
-                {"matrix": [12, 1], "x": 17, "y": 1.38},
-                {"matrix": [13, 1], "x": 18, "y": 1.38, "w": 1.5},
-
-                {"matrix": [6, 2], "x": 0, "y": 2.38, "w": 1.5},
-                {"matrix": [5, 2], "x": 1.5, "y": 2.38},
-                {"matrix": [4, 2], "x": 2.5, "y": 2.13},
-                {"matrix": [3, 2], "x": 3.5, "y": 2},
-                {"matrix": [2, 2], "x": 4.5, "y": 2.13},
-                {"matrix": [1, 2], "x": 5.5, "y": 2.25},
-                {"matrix": [0, 2], "x": 6.5, "y": 1.75, "h": 1.5},
-                {"matrix": [0, 3], "x": 8.25, "y": 2.75},
-
-                {"matrix": [7, 3], "x": 10.25, "y": 2.75},
-                {"matrix": [7, 2], "x": 12, "y": 1.75, "h": 1.5},
-                {"matrix": [8, 2], "x": 13, "y": 2.25},
-                {"matrix": [9, 2], "x": 14, "y": 2.13},
-                {"matrix": [10, 2], "x": 15, "y": 2},
-                {"matrix": [11, 2], "x": 16, "y": 2.13},
-                {"matrix": [12, 2], "x": 17, "y": 2.38},
-                {"matrix": [13, 2], "x": 18, "y": 2.38, "w": 1.5},
-
-                {"matrix": [4, 3], "x": 4.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 6, "y": 3.63},
-                {"matrix": [2, 3], "x": 7.25, "y": 3.75, "h": 2},
-                {"matrix": [1, 3], "x": 8.25, "y": 3.75, "h": 2},
-
-                {"matrix": [8, 3], "x": 10.25, "y": 3.75, "h": 2},
-                {"matrix": [9, 3], "x": 11.25, "y": 3.75, "h": 2},
-                {"matrix": [10, 3], "x": 12.5, "y": 3.63},
-                {"matrix": [11, 3], "x": 13.75, "y": 3.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/gboards/gergo/keyboard.json b/keyboards/gboards/gergo/keyboard.json
new file mode 100644
index 0000000000..e576ac8012
--- /dev/null
+++ b/keyboards/gboards/gergo/keyboard.json
@@ -0,0 +1,95 @@
+{
+    "keyboard_name": "Gergo",
+    "manufacturer": "g Heavy Industries",
+    "url": "http://gboards.ca",
+    "maintainer": "germ",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x1307",
+        "device_version": "0.0.1"
+    },
+    "build": {
+        "debounce_type": "sym_eager_pr"
+    },
+    "bootmagic": {
+        "matrix": [13, 2]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "console": true,
+        "command": true
+    },
+    "tapping": {
+        "toggle": 1
+    },
+    "layout_aliases": {
+        "LAYOUT_gergo": "LAYOUT"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [6, 0], "x": 0, "y": 0.38, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 0.38},
+                {"matrix": [4, 0], "x": 2.5, "y": 0.13},
+                {"matrix": [3, 0], "x": 3.5, "y": 0},
+                {"matrix": [2, 0], "x": 4.5, "y": 0.13},
+                {"matrix": [1, 0], "x": 5.5, "y": 0.25},
+
+                {"matrix": [8, 0], "x": 13, "y": 0.25},
+                {"matrix": [9, 0], "x": 14, "y": 0.13},
+                {"matrix": [10, 0], "x": 15, "y": 0},
+                {"matrix": [11, 0], "x": 16, "y": 0.13},
+                {"matrix": [12, 0], "x": 17, "y": 0.38},
+                {"matrix": [13, 0], "x": 18, "y": 0.38, "w": 1.5},
+
+                {"matrix": [6, 1], "x": 0, "y": 1.38, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 1.38},
+                {"matrix": [4, 1], "x": 2.5, "y": 1.13},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 1], "x": 4.5, "y": 1.13},
+                {"matrix": [1, 1], "x": 5.5, "y": 1.25},
+                {"matrix": [0, 1], "x": 6.5, "y": 0.25, "h": 1.5},
+
+                {"matrix": [7, 1], "x": 12, "y": 0.25, "h": 1.5},
+                {"matrix": [8, 1], "x": 13, "y": 1.25},
+                {"matrix": [9, 1], "x": 14, "y": 1.13},
+                {"matrix": [10, 1], "x": 15, "y": 1},
+                {"matrix": [11, 1], "x": 16, "y": 1.13},
+                {"matrix": [12, 1], "x": 17, "y": 1.38},
+                {"matrix": [13, 1], "x": 18, "y": 1.38, "w": 1.5},
+
+                {"matrix": [6, 2], "x": 0, "y": 2.38, "w": 1.5},
+                {"matrix": [5, 2], "x": 1.5, "y": 2.38},
+                {"matrix": [4, 2], "x": 2.5, "y": 2.13},
+                {"matrix": [3, 2], "x": 3.5, "y": 2},
+                {"matrix": [2, 2], "x": 4.5, "y": 2.13},
+                {"matrix": [1, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [0, 2], "x": 6.5, "y": 1.75, "h": 1.5},
+                {"matrix": [0, 3], "x": 8.25, "y": 2.75},
+
+                {"matrix": [7, 3], "x": 10.25, "y": 2.75},
+                {"matrix": [7, 2], "x": 12, "y": 1.75, "h": 1.5},
+                {"matrix": [8, 2], "x": 13, "y": 2.25},
+                {"matrix": [9, 2], "x": 14, "y": 2.13},
+                {"matrix": [10, 2], "x": 15, "y": 2},
+                {"matrix": [11, 2], "x": 16, "y": 2.13},
+                {"matrix": [12, 2], "x": 17, "y": 2.38},
+                {"matrix": [13, 2], "x": 18, "y": 2.38, "w": 1.5},
+
+                {"matrix": [4, 3], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 6, "y": 3.63},
+                {"matrix": [2, 3], "x": 7.25, "y": 3.75, "h": 2},
+                {"matrix": [1, 3], "x": 8.25, "y": 3.75, "h": 2},
+
+                {"matrix": [8, 3], "x": 10.25, "y": 3.75, "h": 2},
+                {"matrix": [9, 3], "x": 11.25, "y": 3.75, "h": 2},
+                {"matrix": [10, 3], "x": 12.5, "y": 3.63},
+                {"matrix": [11, 3], "x": 13.75, "y": 3.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/gboards/gergoplex/info.json b/keyboards/gboards/gergoplex/info.json
deleted file mode 100644
index cf1e451392..0000000000
--- a/keyboards/gboards/gergoplex/info.json
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-    "keyboard_name": "GergoPlex",
-    "manufacturer": "g Heavy Industries",
-    "url": "",
-    "maintainer": "germ",
-    "usb": {
-        "vid": "0x6B0A",
-        "pid": "0x0002",
-        "device_version": "0.0.1"
-    },
-    "build": {
-        "debounce_type": "sym_eager_pr"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "features": {
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true,
-        "command": true,
-        "nkro": true
-    },
-    "community_layouts": ["split_3x5_3"],
-    "layouts": {
-        "LAYOUT_split_3x5_3": {
-            "layout": [
-                {"matrix": [4, 0], "x": 0, "y": 0.25},
-                {"matrix": [3, 0], "x": 1, "y": 0.125},
-                {"matrix": [2, 0], "x": 2, "y": 0},
-                {"matrix": [1, 0], "x": 3, "y": 0.125},
-                {"matrix": [0, 0], "x": 4, "y": 0.375},
-
-                {"matrix": [5, 0], "x": 8, "y": 0.375},
-                {"matrix": [6, 0], "x": 9, "y": 0.125},
-                {"matrix": [7, 0], "x": 10, "y": 0},
-                {"matrix": [8, 0], "x": 11, "y": 0.125},
-                {"matrix": [9, 0], "x": 12, "y": 0.25},
-
-                {"matrix": [4, 1], "x": 0, "y": 1.25},
-                {"matrix": [3, 1], "x": 1, "y": 1.125},
-                {"matrix": [2, 1], "x": 2, "y": 1},
-                {"matrix": [1, 1], "x": 3, "y": 1.125},
-                {"matrix": [0, 1], "x": 4, "y": 1.375},
-
-                {"matrix": [5, 1], "x": 8, "y": 1.375},
-                {"matrix": [6, 1], "x": 9, "y": 1.125},
-                {"matrix": [7, 1], "x": 10, "y": 1},
-                {"matrix": [8, 1], "x": 11, "y": 1.125},
-                {"matrix": [9, 1], "x": 12, "y": 1.25},
-
-                {"matrix": [4, 2], "x": 0, "y": 2.25},
-                {"matrix": [3, 2], "x": 1, "y": 2.125},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [1, 2], "x": 3, "y": 2.125},
-                {"matrix": [0, 2], "x": 4, "y": 2.375},
-
-                {"matrix": [5, 2], "x": 8, "y": 2.375},
-                {"matrix": [6, 2], "x": 9, "y": 2.125},
-                {"matrix": [7, 2], "x": 10, "y": 2},
-                {"matrix": [8, 2], "x": 11, "y": 2.125},
-                {"matrix": [9, 2], "x": 12, "y": 2.25},
-
-                {"matrix": [3, 3], "x": 2, "y": 3.5},
-                {"matrix": [2, 3], "x": 3.25, "y": 3.625, "w": 1.5},
-                {"matrix": [1, 3], "x": 5, "y": 3.125, "h": 2},
-
-                {"matrix": [6, 3], "x": 7, "y": 3.125, "h": 2},
-                {"matrix": [7, 3], "x": 8.25, "y": 3.625, "w": 1.5},
-                {"matrix": [8, 3], "x": 10, "y": 3.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/gboards/gergoplex/keyboard.json b/keyboards/gboards/gergoplex/keyboard.json
new file mode 100644
index 0000000000..cf1e451392
--- /dev/null
+++ b/keyboards/gboards/gergoplex/keyboard.json
@@ -0,0 +1,73 @@
+{
+    "keyboard_name": "GergoPlex",
+    "manufacturer": "g Heavy Industries",
+    "url": "",
+    "maintainer": "germ",
+    "usb": {
+        "vid": "0x6B0A",
+        "pid": "0x0002",
+        "device_version": "0.0.1"
+    },
+    "build": {
+        "debounce_type": "sym_eager_pr"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true
+    },
+    "community_layouts": ["split_3x5_3"],
+    "layouts": {
+        "LAYOUT_split_3x5_3": {
+            "layout": [
+                {"matrix": [4, 0], "x": 0, "y": 0.25},
+                {"matrix": [3, 0], "x": 1, "y": 0.125},
+                {"matrix": [2, 0], "x": 2, "y": 0},
+                {"matrix": [1, 0], "x": 3, "y": 0.125},
+                {"matrix": [0, 0], "x": 4, "y": 0.375},
+
+                {"matrix": [5, 0], "x": 8, "y": 0.375},
+                {"matrix": [6, 0], "x": 9, "y": 0.125},
+                {"matrix": [7, 0], "x": 10, "y": 0},
+                {"matrix": [8, 0], "x": 11, "y": 0.125},
+                {"matrix": [9, 0], "x": 12, "y": 0.25},
+
+                {"matrix": [4, 1], "x": 0, "y": 1.25},
+                {"matrix": [3, 1], "x": 1, "y": 1.125},
+                {"matrix": [2, 1], "x": 2, "y": 1},
+                {"matrix": [1, 1], "x": 3, "y": 1.125},
+                {"matrix": [0, 1], "x": 4, "y": 1.375},
+
+                {"matrix": [5, 1], "x": 8, "y": 1.375},
+                {"matrix": [6, 1], "x": 9, "y": 1.125},
+                {"matrix": [7, 1], "x": 10, "y": 1},
+                {"matrix": [8, 1], "x": 11, "y": 1.125},
+                {"matrix": [9, 1], "x": 12, "y": 1.25},
+
+                {"matrix": [4, 2], "x": 0, "y": 2.25},
+                {"matrix": [3, 2], "x": 1, "y": 2.125},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [1, 2], "x": 3, "y": 2.125},
+                {"matrix": [0, 2], "x": 4, "y": 2.375},
+
+                {"matrix": [5, 2], "x": 8, "y": 2.375},
+                {"matrix": [6, 2], "x": 9, "y": 2.125},
+                {"matrix": [7, 2], "x": 10, "y": 2},
+                {"matrix": [8, 2], "x": 11, "y": 2.125},
+                {"matrix": [9, 2], "x": 12, "y": 2.25},
+
+                {"matrix": [3, 3], "x": 2, "y": 3.5},
+                {"matrix": [2, 3], "x": 3.25, "y": 3.625, "w": 1.5},
+                {"matrix": [1, 3], "x": 5, "y": 3.125, "h": 2},
+
+                {"matrix": [6, 3], "x": 7, "y": 3.125, "h": 2},
+                {"matrix": [7, 3], "x": 8.25, "y": 3.625, "w": 1.5},
+                {"matrix": [8, 3], "x": 10, "y": 3.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/geistmaschine/macropod/info.json b/keyboards/geistmaschine/macropod/info.json
deleted file mode 100644
index 333e7c0a50..0000000000
--- a/keyboards/geistmaschine/macropod/info.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "manufacturer": "Geistmaschine",
-    "keyboard_name": "Macropod",
-    "maintainer": "ebastler",
-    "bootloader": "atmel-dfu",
-    "processor": "atmega32u4",
-    "url": "https://geistmaschine.io/",
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x0004",
-        "vid": "0x676D"
-    },
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": false,
-        "encoder": true
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "D3", "pin_b": "D5", "resolution": 2}
-        ]
-    },
-    "layouts": {
-        "LAYOUT_fourkey": {
-            "layout": [
-              {"x": 0, "y": 0, "matrix": [0, 0]},
-              {"x": 0, "y": 1.25, "matrix": [0, 1]},
-              {"x": 0, "y": 2.25, "matrix": [0, 2]},
-              {"x": 0, "y": 3.25, "matrix": [0, 3]}
-            ]
-        }
-    }
-}
diff --git a/keyboards/geistmaschine/macropod/keyboard.json b/keyboards/geistmaschine/macropod/keyboard.json
new file mode 100644
index 0000000000..333e7c0a50
--- /dev/null
+++ b/keyboards/geistmaschine/macropod/keyboard.json
@@ -0,0 +1,37 @@
+{
+    "manufacturer": "Geistmaschine",
+    "keyboard_name": "Macropod",
+    "maintainer": "ebastler",
+    "bootloader": "atmel-dfu",
+    "processor": "atmega32u4",
+    "url": "https://geistmaschine.io/",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0004",
+        "vid": "0x676D"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "encoder": true
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D3", "pin_b": "D5", "resolution": 2}
+        ]
+    },
+    "layouts": {
+        "LAYOUT_fourkey": {
+            "layout": [
+              {"x": 0, "y": 0, "matrix": [0, 0]},
+              {"x": 0, "y": 1.25, "matrix": [0, 1]},
+              {"x": 0, "y": 2.25, "matrix": [0, 2]},
+              {"x": 0, "y": 3.25, "matrix": [0, 3]}
+            ]
+        }
+    }
+}
diff --git a/keyboards/geonworks/ee_at/info.json b/keyboards/geonworks/ee_at/info.json
deleted file mode 100644
index 803e0d3640..0000000000
--- a/keyboards/geonworks/ee_at/info.json
+++ /dev/null
@@ -1,499 +0,0 @@
-{
-    "manufacturer": "Yiancar-Designs",
-    "keyboard_name": "EE-AT",
-    "maintainer": "Yiancar-Designs",
-    "bootloader": "stm32-dfu",
-    "bootmagic": {
-        "matrix": [0, 2]
-    },
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
-    "indicators": {
-        "caps_lock": "B6",
-        "kana": "A13",
-        "num_lock": "B3",
-        "on_state": 0,
-        "scroll_lock": "A15"
-    },
-    "matrix_pins": {
-        "cols": ["B7", "A0", "A1", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10"],
-        "rows": ["A2", "B9", "B8", "B5", "B4"]
-    },
-    "processor": "STM32F072",
-    "url": "https://yiancar-designs.com",
-    "usb": {
-        "device_version": "0.0.1",
-        "pid": "0x5755",
-        "vid": "0x8968"
-    },
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "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": [0, 13], "x": 13.25, "y": 0},
-                {"matrix": [0, 14], "x": 14.25, "y": 0},
-                {"matrix": [0, 15], "x": 15.25, "y": 0},
-                {"matrix": [2, 14], "x": 16.25, "y": 0},
-                {"matrix": [0, 16], "x": 17.5, "y": 0},
-                {"matrix": [0, 17], "x": 18.5, "y": 0},
-                {"matrix": [0, 18], "x": 19.5, "y": 0},
-                {"matrix": [0, 19], "x": 20.5, "y": 0},
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 3], "x": 3.75, "y": 1},
-                {"matrix": [1, 4], "x": 4.75, "y": 1},
-                {"matrix": [1, 5], "x": 5.75, "y": 1},
-                {"matrix": [1, 6], "x": 6.75, "y": 1},
-                {"matrix": [1, 7], "x": 7.75, "y": 1},
-                {"matrix": [1, 8], "x": 8.75, "y": 1},
-                {"matrix": [1, 9], "x": 9.75, "y": 1},
-                {"matrix": [1, 10], "x": 10.75, "y": 1},
-                {"matrix": [1, 11], "x": 11.75, "y": 1},
-                {"matrix": [1, 12], "x": 12.75, "y": 1},
-                {"matrix": [1, 13], "x": 13.75, "y": 1},
-                {"matrix": [1, 14], "x": 14.75, "y": 1},
-                {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
-                {"matrix": [1, 16], "x": 17.5, "y": 1},
-                {"matrix": [1, 17], "x": 18.5, "y": 1},
-                {"matrix": [1, 18], "x": 19.5, "y": 1},
-                {"matrix": [1, 19], "x": 20.5, "y": 1, "h": 2},
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
-                {"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},
-                {"matrix": [2, 12], "x": 13, "y": 2},
-                {"matrix": [2, 13], "x": 14, "y": 2},
-                {"matrix": [2, 15], "x": 15, "y": 2, "w": 2.25},
-                {"matrix": [2, 16], "x": 17.5, "y": 2},
-                {"matrix": [2, 17], "x": 18.5, "y": 2},
-                {"matrix": [2, 18], "x": 19.5, "y": 2},
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 4], "x": 4.5, "y": 3},
-                {"matrix": [3, 5], "x": 5.5, "y": 3},
-                {"matrix": [3, 6], "x": 6.5, "y": 3},
-                {"matrix": [3, 7], "x": 7.5, "y": 3},
-                {"matrix": [3, 8], "x": 8.5, "y": 3},
-                {"matrix": [3, 9], "x": 9.5, "y": 3},
-                {"matrix": [3, 10], "x": 10.5, "y": 3},
-                {"matrix": [3, 11], "x": 11.5, "y": 3},
-                {"matrix": [3, 12], "x": 12.5, "y": 3},
-                {"matrix": [3, 13], "x": 13.5, "y": 3},
-                {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
-                {"matrix": [3, 15], "x": 16.25, "y": 3},
-                {"matrix": [3, 16], "x": 17.5, "y": 3},
-                {"matrix": [3, 17], "x": 18.5, "y": 3},
-                {"matrix": [3, 18], "x": 19.5, "y": 3},
-                {"matrix": [4, 19], "x": 20.5, "y": 3, "h": 2},
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 3], "x": 3.75, "y": 4},
-                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
-                {"matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
-                {"matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 14], "x": 14.75, "y": 4},
-                {"matrix": [4, 15], "x": 15.75, "y": 4, "w": 1.5},
-                {"matrix": [4, 16], "x": 17.5, "y": 4, "w": 2},
-                {"matrix": [4, 18], "x": 19.5, "y": 4}
-            ]
-        },
-        "LAYOUT_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "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": [0, 13], "x": 13.25, "y": 0},
-                {"matrix": [0, 14], "x": 14.25, "y": 0},
-                {"matrix": [0, 15], "x": 15.25, "y": 0, "w": 2},
-                {"matrix": [0, 16], "x": 17.5, "y": 0},
-                {"matrix": [0, 17], "x": 18.5, "y": 0},
-                {"matrix": [0, 18], "x": 19.5, "y": 0},
-                {"matrix": [0, 19], "x": 20.5, "y": 0},
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 3], "x": 3.75, "y": 1},
-                {"matrix": [1, 4], "x": 4.75, "y": 1},
-                {"matrix": [1, 5], "x": 5.75, "y": 1},
-                {"matrix": [1, 6], "x": 6.75, "y": 1},
-                {"matrix": [1, 7], "x": 7.75, "y": 1},
-                {"matrix": [1, 8], "x": 8.75, "y": 1},
-                {"matrix": [1, 9], "x": 9.75, "y": 1},
-                {"matrix": [1, 10], "x": 10.75, "y": 1},
-                {"matrix": [1, 11], "x": 11.75, "y": 1},
-                {"matrix": [1, 12], "x": 12.75, "y": 1},
-                {"matrix": [1, 13], "x": 13.75, "y": 1},
-                {"matrix": [1, 14], "x": 14.75, "y": 1},
-                {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
-                {"matrix": [1, 16], "x": 17.5, "y": 1},
-                {"matrix": [1, 17], "x": 18.5, "y": 1},
-                {"matrix": [1, 18], "x": 19.5, "y": 1},
-                {"matrix": [1, 19], "x": 20.5, "y": 1, "h": 2},
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
-                {"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},
-                {"matrix": [2, 12], "x": 13, "y": 2},
-                {"matrix": [2, 13], "x": 14, "y": 2},
-                {"matrix": [2, 15], "x": 15, "y": 2, "w": 2.25},
-                {"matrix": [2, 16], "x": 17.5, "y": 2},
-                {"matrix": [2, 17], "x": 18.5, "y": 2},
-                {"matrix": [2, 18], "x": 19.5, "y": 2},
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 4], "x": 4.5, "y": 3},
-                {"matrix": [3, 5], "x": 5.5, "y": 3},
-                {"matrix": [3, 6], "x": 6.5, "y": 3},
-                {"matrix": [3, 7], "x": 7.5, "y": 3},
-                {"matrix": [3, 8], "x": 8.5, "y": 3},
-                {"matrix": [3, 9], "x": 9.5, "y": 3},
-                {"matrix": [3, 10], "x": 10.5, "y": 3},
-                {"matrix": [3, 11], "x": 11.5, "y": 3},
-                {"matrix": [3, 12], "x": 12.5, "y": 3},
-                {"matrix": [3, 13], "x": 13.5, "y": 3},
-                {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 2.75},
-                {"matrix": [3, 16], "x": 17.5, "y": 3},
-                {"matrix": [3, 17], "x": 18.5, "y": 3},
-                {"matrix": [3, 18], "x": 19.5, "y": 3},
-                {"matrix": [4, 19], "x": 20.5, "y": 3, "h": 2},
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 3], "x": 3.75, "y": 4},
-                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
-                {"matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
-                {"matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 14], "x": 14.75, "y": 4},
-                {"matrix": [4, 15], "x": 15.75, "y": 4, "w": 1.5},
-                {"matrix": [4, 16], "x": 17.5, "y": 4, "w": 2},
-                {"matrix": [4, 18], "x": 19.5, "y": 4}
-            ]
-        },
-        "LAYOUT_ansi_split_bs": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "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": [0, 13], "x": 13.25, "y": 0},
-                {"matrix": [0, 14], "x": 14.25, "y": 0},
-                {"matrix": [0, 15], "x": 15.25, "y": 0},
-                {"matrix": [2, 14], "x": 16.25, "y": 0},
-                {"matrix": [0, 16], "x": 17.5, "y": 0},
-                {"matrix": [0, 17], "x": 18.5, "y": 0},
-                {"matrix": [0, 18], "x": 19.5, "y": 0},
-                {"matrix": [0, 19], "x": 20.5, "y": 0},
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 3], "x": 3.75, "y": 1},
-                {"matrix": [1, 4], "x": 4.75, "y": 1},
-                {"matrix": [1, 5], "x": 5.75, "y": 1},
-                {"matrix": [1, 6], "x": 6.75, "y": 1},
-                {"matrix": [1, 7], "x": 7.75, "y": 1},
-                {"matrix": [1, 8], "x": 8.75, "y": 1},
-                {"matrix": [1, 9], "x": 9.75, "y": 1},
-                {"matrix": [1, 10], "x": 10.75, "y": 1},
-                {"matrix": [1, 11], "x": 11.75, "y": 1},
-                {"matrix": [1, 12], "x": 12.75, "y": 1},
-                {"matrix": [1, 13], "x": 13.75, "y": 1},
-                {"matrix": [1, 14], "x": 14.75, "y": 1},
-                {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
-                {"matrix": [1, 16], "x": 17.5, "y": 1},
-                {"matrix": [1, 17], "x": 18.5, "y": 1},
-                {"matrix": [1, 18], "x": 19.5, "y": 1},
-                {"matrix": [1, 19], "x": 20.5, "y": 1, "h": 2},
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
-                {"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},
-                {"matrix": [2, 12], "x": 13, "y": 2},
-                {"matrix": [2, 13], "x": 14, "y": 2},
-                {"matrix": [2, 15], "x": 15, "y": 2, "w": 2.25},
-                {"matrix": [2, 16], "x": 17.5, "y": 2},
-                {"matrix": [2, 17], "x": 18.5, "y": 2},
-                {"matrix": [2, 18], "x": 19.5, "y": 2},
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 4], "x": 4.5, "y": 3},
-                {"matrix": [3, 5], "x": 5.5, "y": 3},
-                {"matrix": [3, 6], "x": 6.5, "y": 3},
-                {"matrix": [3, 7], "x": 7.5, "y": 3},
-                {"matrix": [3, 8], "x": 8.5, "y": 3},
-                {"matrix": [3, 9], "x": 9.5, "y": 3},
-                {"matrix": [3, 10], "x": 10.5, "y": 3},
-                {"matrix": [3, 11], "x": 11.5, "y": 3},
-                {"matrix": [3, 12], "x": 12.5, "y": 3},
-                {"matrix": [3, 13], "x": 13.5, "y": 3},
-                {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 2.75},
-                {"matrix": [3, 16], "x": 17.5, "y": 3},
-                {"matrix": [3, 17], "x": 18.5, "y": 3},
-                {"matrix": [3, 18], "x": 19.5, "y": 3},
-                {"matrix": [4, 19], "x": 20.5, "y": 3, "h": 2},
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 3], "x": 3.75, "y": 4},
-                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
-                {"matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
-                {"matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 14], "x": 14.75, "y": 4},
-                {"matrix": [4, 15], "x": 15.75, "y": 4, "w": 1.5},
-                {"matrix": [4, 16], "x": 17.5, "y": 4, "w": 2},
-                {"matrix": [4, 18], "x": 19.5, "y": 4}
-            ]
-        },
-        "LAYOUT_ansi_split_bs_rshift": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "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": [0, 13], "x": 13.25, "y": 0},
-                {"matrix": [0, 14], "x": 14.25, "y": 0},
-                {"matrix": [0, 15], "x": 15.25, "y": 0},
-                {"matrix": [2, 14], "x": 16.25, "y": 0},
-                {"matrix": [0, 16], "x": 17.5, "y": 0},
-                {"matrix": [0, 17], "x": 18.5, "y": 0},
-                {"matrix": [0, 18], "x": 19.5, "y": 0},
-                {"matrix": [0, 19], "x": 20.5, "y": 0},
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 3], "x": 3.75, "y": 1},
-                {"matrix": [1, 4], "x": 4.75, "y": 1},
-                {"matrix": [1, 5], "x": 5.75, "y": 1},
-                {"matrix": [1, 6], "x": 6.75, "y": 1},
-                {"matrix": [1, 7], "x": 7.75, "y": 1},
-                {"matrix": [1, 8], "x": 8.75, "y": 1},
-                {"matrix": [1, 9], "x": 9.75, "y": 1},
-                {"matrix": [1, 10], "x": 10.75, "y": 1},
-                {"matrix": [1, 11], "x": 11.75, "y": 1},
-                {"matrix": [1, 12], "x": 12.75, "y": 1},
-                {"matrix": [1, 13], "x": 13.75, "y": 1},
-                {"matrix": [1, 14], "x": 14.75, "y": 1},
-                {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
-                {"matrix": [1, 16], "x": 17.5, "y": 1},
-                {"matrix": [1, 17], "x": 18.5, "y": 1},
-                {"matrix": [1, 18], "x": 19.5, "y": 1},
-                {"matrix": [1, 19], "x": 20.5, "y": 1, "h": 2},
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
-                {"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},
-                {"matrix": [2, 12], "x": 13, "y": 2},
-                {"matrix": [2, 13], "x": 14, "y": 2},
-                {"matrix": [2, 15], "x": 15, "y": 2, "w": 2.25},
-                {"matrix": [2, 16], "x": 17.5, "y": 2},
-                {"matrix": [2, 17], "x": 18.5, "y": 2},
-                {"matrix": [2, 18], "x": 19.5, "y": 2},
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 4], "x": 4.5, "y": 3},
-                {"matrix": [3, 5], "x": 5.5, "y": 3},
-                {"matrix": [3, 6], "x": 6.5, "y": 3},
-                {"matrix": [3, 7], "x": 7.5, "y": 3},
-                {"matrix": [3, 8], "x": 8.5, "y": 3},
-                {"matrix": [3, 9], "x": 9.5, "y": 3},
-                {"matrix": [3, 10], "x": 10.5, "y": 3},
-                {"matrix": [3, 11], "x": 11.5, "y": 3},
-                {"matrix": [3, 12], "x": 12.5, "y": 3},
-                {"matrix": [3, 13], "x": 13.5, "y": 3},
-                {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
-                {"matrix": [3, 15], "x": 16.25, "y": 3},
-                {"matrix": [3, 16], "x": 17.5, "y": 3},
-                {"matrix": [3, 17], "x": 18.5, "y": 3},
-                {"matrix": [3, 18], "x": 19.5, "y": 3},
-                {"matrix": [4, 19], "x": 20.5, "y": 3, "h": 2},
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 3], "x": 3.75, "y": 4},
-                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
-                {"matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
-                {"matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 14], "x": 14.75, "y": 4},
-                {"matrix": [4, 15], "x": 15.75, "y": 4, "w": 1.5},
-                {"matrix": [4, 16], "x": 17.5, "y": 4, "w": 2},
-                {"matrix": [4, 18], "x": 19.5, "y": 4}
-            ]
-        },
-        "LAYOUT_ansi_split_rshift": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "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": [0, 13], "x": 13.25, "y": 0},
-                {"matrix": [0, 14], "x": 14.25, "y": 0},
-                {"matrix": [0, 15], "x": 15.25, "y": 0, "w": 2},
-                {"matrix": [0, 16], "x": 17.5, "y": 0},
-                {"matrix": [0, 17], "x": 18.5, "y": 0},
-                {"matrix": [0, 18], "x": 19.5, "y": 0},
-                {"matrix": [0, 19], "x": 20.5, "y": 0},
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 3], "x": 3.75, "y": 1},
-                {"matrix": [1, 4], "x": 4.75, "y": 1},
-                {"matrix": [1, 5], "x": 5.75, "y": 1},
-                {"matrix": [1, 6], "x": 6.75, "y": 1},
-                {"matrix": [1, 7], "x": 7.75, "y": 1},
-                {"matrix": [1, 8], "x": 8.75, "y": 1},
-                {"matrix": [1, 9], "x": 9.75, "y": 1},
-                {"matrix": [1, 10], "x": 10.75, "y": 1},
-                {"matrix": [1, 11], "x": 11.75, "y": 1},
-                {"matrix": [1, 12], "x": 12.75, "y": 1},
-                {"matrix": [1, 13], "x": 13.75, "y": 1},
-                {"matrix": [1, 14], "x": 14.75, "y": 1},
-                {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
-                {"matrix": [1, 16], "x": 17.5, "y": 1},
-                {"matrix": [1, 17], "x": 18.5, "y": 1},
-                {"matrix": [1, 18], "x": 19.5, "y": 1},
-                {"matrix": [1, 19], "x": 20.5, "y": 1, "h": 2},
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
-                {"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},
-                {"matrix": [2, 12], "x": 13, "y": 2},
-                {"matrix": [2, 13], "x": 14, "y": 2},
-                {"matrix": [2, 15], "x": 15, "y": 2, "w": 2.25},
-                {"matrix": [2, 16], "x": 17.5, "y": 2},
-                {"matrix": [2, 17], "x": 18.5, "y": 2},
-                {"matrix": [2, 18], "x": 19.5, "y": 2},
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 4], "x": 4.5, "y": 3},
-                {"matrix": [3, 5], "x": 5.5, "y": 3},
-                {"matrix": [3, 6], "x": 6.5, "y": 3},
-                {"matrix": [3, 7], "x": 7.5, "y": 3},
-                {"matrix": [3, 8], "x": 8.5, "y": 3},
-                {"matrix": [3, 9], "x": 9.5, "y": 3},
-                {"matrix": [3, 10], "x": 10.5, "y": 3},
-                {"matrix": [3, 11], "x": 11.5, "y": 3},
-                {"matrix": [3, 12], "x": 12.5, "y": 3},
-                {"matrix": [3, 13], "x": 13.5, "y": 3},
-                {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
-                {"matrix": [3, 15], "x": 16.25, "y": 3},
-                {"matrix": [3, 16], "x": 17.5, "y": 3},
-                {"matrix": [3, 17], "x": 18.5, "y": 3},
-                {"matrix": [3, 18], "x": 19.5, "y": 3},
-                {"matrix": [4, 19], "x": 20.5, "y": 3, "h": 2},
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 3], "x": 3.75, "y": 4},
-                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
-                {"matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
-                {"matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 14], "x": 14.75, "y": 4},
-                {"matrix": [4, 15], "x": 15.75, "y": 4, "w": 1.5},
-                {"matrix": [4, 16], "x": 17.5, "y": 4, "w": 2},
-                {"matrix": [4, 18], "x": 19.5, "y": 4}
-            ]
-        }
-    }
-}
\ No newline at end of file
diff --git a/keyboards/geonworks/ee_at/keyboard.json b/keyboards/geonworks/ee_at/keyboard.json
new file mode 100644
index 0000000000..803e0d3640
--- /dev/null
+++ b/keyboards/geonworks/ee_at/keyboard.json
@@ -0,0 +1,499 @@
+{
+    "manufacturer": "Yiancar-Designs",
+    "keyboard_name": "EE-AT",
+    "maintainer": "Yiancar-Designs",
+    "bootloader": "stm32-dfu",
+    "bootmagic": {
+        "matrix": [0, 2]
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "indicators": {
+        "caps_lock": "B6",
+        "kana": "A13",
+        "num_lock": "B3",
+        "on_state": 0,
+        "scroll_lock": "A15"
+    },
+    "matrix_pins": {
+        "cols": ["B7", "A0", "A1", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10"],
+        "rows": ["A2", "B9", "B8", "B5", "B4"]
+    },
+    "processor": "STM32F072",
+    "url": "https://yiancar-designs.com",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x5755",
+        "vid": "0x8968"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "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": [0, 13], "x": 13.25, "y": 0},
+                {"matrix": [0, 14], "x": 14.25, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [2, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+                {"matrix": [0, 18], "x": 19.5, "y": 0},
+                {"matrix": [0, 19], "x": 20.5, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 14.75, "y": 1},
+                {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 16], "x": 17.5, "y": 1},
+                {"matrix": [1, 17], "x": 18.5, "y": 1},
+                {"matrix": [1, 18], "x": 19.5, "y": 1},
+                {"matrix": [1, 19], "x": 20.5, "y": 1, "h": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"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},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+                {"matrix": [2, 13], "x": 14, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2, "w": 2.25},
+                {"matrix": [2, 16], "x": 17.5, "y": 2},
+                {"matrix": [2, 17], "x": 18.5, "y": 2},
+                {"matrix": [2, 18], "x": 19.5, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3},
+                {"matrix": [3, 11], "x": 11.5, "y": 3},
+                {"matrix": [3, 12], "x": 12.5, "y": 3},
+                {"matrix": [3, 13], "x": 13.5, "y": 3},
+                {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 15], "x": 16.25, "y": 3},
+                {"matrix": [3, 16], "x": 17.5, "y": 3},
+                {"matrix": [3, 17], "x": 18.5, "y": 3},
+                {"matrix": [3, 18], "x": 19.5, "y": 3},
+                {"matrix": [4, 19], "x": 20.5, "y": 3, "h": 2},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 3.75, "y": 4},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
+                {"matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 14.75, "y": 4},
+                {"matrix": [4, 15], "x": 15.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 16], "x": 17.5, "y": 4, "w": 2},
+                {"matrix": [4, 18], "x": 19.5, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "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": [0, 13], "x": 13.25, "y": 0},
+                {"matrix": [0, 14], "x": 14.25, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "y": 0, "w": 2},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+                {"matrix": [0, 18], "x": 19.5, "y": 0},
+                {"matrix": [0, 19], "x": 20.5, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 14.75, "y": 1},
+                {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 16], "x": 17.5, "y": 1},
+                {"matrix": [1, 17], "x": 18.5, "y": 1},
+                {"matrix": [1, 18], "x": 19.5, "y": 1},
+                {"matrix": [1, 19], "x": 20.5, "y": 1, "h": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"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},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+                {"matrix": [2, 13], "x": 14, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2, "w": 2.25},
+                {"matrix": [2, 16], "x": 17.5, "y": 2},
+                {"matrix": [2, 17], "x": 18.5, "y": 2},
+                {"matrix": [2, 18], "x": 19.5, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3},
+                {"matrix": [3, 11], "x": 11.5, "y": 3},
+                {"matrix": [3, 12], "x": 12.5, "y": 3},
+                {"matrix": [3, 13], "x": 13.5, "y": 3},
+                {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 2.75},
+                {"matrix": [3, 16], "x": 17.5, "y": 3},
+                {"matrix": [3, 17], "x": 18.5, "y": 3},
+                {"matrix": [3, 18], "x": 19.5, "y": 3},
+                {"matrix": [4, 19], "x": 20.5, "y": 3, "h": 2},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 3.75, "y": 4},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
+                {"matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 14.75, "y": 4},
+                {"matrix": [4, 15], "x": 15.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 16], "x": 17.5, "y": 4, "w": 2},
+                {"matrix": [4, 18], "x": 19.5, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "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": [0, 13], "x": 13.25, "y": 0},
+                {"matrix": [0, 14], "x": 14.25, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [2, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+                {"matrix": [0, 18], "x": 19.5, "y": 0},
+                {"matrix": [0, 19], "x": 20.5, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 14.75, "y": 1},
+                {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 16], "x": 17.5, "y": 1},
+                {"matrix": [1, 17], "x": 18.5, "y": 1},
+                {"matrix": [1, 18], "x": 19.5, "y": 1},
+                {"matrix": [1, 19], "x": 20.5, "y": 1, "h": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"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},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+                {"matrix": [2, 13], "x": 14, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2, "w": 2.25},
+                {"matrix": [2, 16], "x": 17.5, "y": 2},
+                {"matrix": [2, 17], "x": 18.5, "y": 2},
+                {"matrix": [2, 18], "x": 19.5, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3},
+                {"matrix": [3, 11], "x": 11.5, "y": 3},
+                {"matrix": [3, 12], "x": 12.5, "y": 3},
+                {"matrix": [3, 13], "x": 13.5, "y": 3},
+                {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 2.75},
+                {"matrix": [3, 16], "x": 17.5, "y": 3},
+                {"matrix": [3, 17], "x": 18.5, "y": 3},
+                {"matrix": [3, 18], "x": 19.5, "y": 3},
+                {"matrix": [4, 19], "x": 20.5, "y": 3, "h": 2},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 3.75, "y": 4},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
+                {"matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 14.75, "y": 4},
+                {"matrix": [4, 15], "x": 15.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 16], "x": 17.5, "y": 4, "w": 2},
+                {"matrix": [4, 18], "x": 19.5, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "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": [0, 13], "x": 13.25, "y": 0},
+                {"matrix": [0, 14], "x": 14.25, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [2, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+                {"matrix": [0, 18], "x": 19.5, "y": 0},
+                {"matrix": [0, 19], "x": 20.5, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 14.75, "y": 1},
+                {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 16], "x": 17.5, "y": 1},
+                {"matrix": [1, 17], "x": 18.5, "y": 1},
+                {"matrix": [1, 18], "x": 19.5, "y": 1},
+                {"matrix": [1, 19], "x": 20.5, "y": 1, "h": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"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},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+                {"matrix": [2, 13], "x": 14, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2, "w": 2.25},
+                {"matrix": [2, 16], "x": 17.5, "y": 2},
+                {"matrix": [2, 17], "x": 18.5, "y": 2},
+                {"matrix": [2, 18], "x": 19.5, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3},
+                {"matrix": [3, 11], "x": 11.5, "y": 3},
+                {"matrix": [3, 12], "x": 12.5, "y": 3},
+                {"matrix": [3, 13], "x": 13.5, "y": 3},
+                {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 15], "x": 16.25, "y": 3},
+                {"matrix": [3, 16], "x": 17.5, "y": 3},
+                {"matrix": [3, 17], "x": 18.5, "y": 3},
+                {"matrix": [3, 18], "x": 19.5, "y": 3},
+                {"matrix": [4, 19], "x": 20.5, "y": 3, "h": 2},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 3.75, "y": 4},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
+                {"matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 14.75, "y": 4},
+                {"matrix": [4, 15], "x": 15.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 16], "x": 17.5, "y": 4, "w": 2},
+                {"matrix": [4, 18], "x": 19.5, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi_split_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "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": [0, 13], "x": 13.25, "y": 0},
+                {"matrix": [0, 14], "x": 14.25, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "y": 0, "w": 2},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+                {"matrix": [0, 18], "x": 19.5, "y": 0},
+                {"matrix": [0, 19], "x": 20.5, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 14.75, "y": 1},
+                {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 16], "x": 17.5, "y": 1},
+                {"matrix": [1, 17], "x": 18.5, "y": 1},
+                {"matrix": [1, 18], "x": 19.5, "y": 1},
+                {"matrix": [1, 19], "x": 20.5, "y": 1, "h": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"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},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+                {"matrix": [2, 13], "x": 14, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2, "w": 2.25},
+                {"matrix": [2, 16], "x": 17.5, "y": 2},
+                {"matrix": [2, 17], "x": 18.5, "y": 2},
+                {"matrix": [2, 18], "x": 19.5, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3},
+                {"matrix": [3, 11], "x": 11.5, "y": 3},
+                {"matrix": [3, 12], "x": 12.5, "y": 3},
+                {"matrix": [3, 13], "x": 13.5, "y": 3},
+                {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 15], "x": 16.25, "y": 3},
+                {"matrix": [3, 16], "x": 17.5, "y": 3},
+                {"matrix": [3, 17], "x": 18.5, "y": 3},
+                {"matrix": [3, 18], "x": 19.5, "y": 3},
+                {"matrix": [4, 19], "x": 20.5, "y": 3, "h": 2},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 3.75, "y": 4},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
+                {"matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 14.75, "y": 4},
+                {"matrix": [4, 15], "x": 15.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 16], "x": 17.5, "y": 4, "w": 2},
+                {"matrix": [4, 18], "x": 19.5, "y": 4}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/geonworks/w1_at/info.json b/keyboards/geonworks/w1_at/info.json
deleted file mode 100644
index 8b7991c03d..0000000000
--- a/keyboards/geonworks/w1_at/info.json
+++ /dev/null
@@ -1,507 +0,0 @@
-{
-    "manufacturer": "Yiancar-Designs",
-    "keyboard_name": "W1-AT",
-    "maintainer": "Yiancar-Designs",
-    "bootloader": "stm32-dfu",
-    "bootmagic": {
-        "matrix": [0, 2]
-    },
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
-    "indicators": {
-        "caps_lock": "B6",
-        "kana": "A13",
-        "num_lock": "B3",
-        "on_state": 0,
-        "scroll_lock": "A15"
-    },
-    "matrix_pins": {
-        "cols": ["B7", "A0", "A1", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10"],
-        "rows": ["A2", "B9", "B8", "B5", "B4"]
-    },
-    "processor": "STM32F072",
-    "url": "https://yiancar-designs.com",
-    "usb": {
-        "device_version": "0.0.1",
-        "pid": "0x5754",
-        "vid": "0x8968"
-    },
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"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.25, "y": 0},
-                {"label": "1", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "2", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "3", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "4", "matrix": [0, 6], "x": 6.25, "y": 0},
-                {"label": "5", "matrix": [0, 7], "x": 7.25, "y": 0},
-                {"label": "6", "matrix": [0, 8], "x": 8.25, "y": 0},
-                {"label": "7", "matrix": [0, 9], "x": 9.25, "y": 0},
-                {"label": "8", "matrix": [0, 10], "x": 10.25, "y": 0},
-                {"label": "9", "matrix": [0, 11], "x": 11.25, "y": 0},
-                {"label": "0", "matrix": [0, 12], "x": 12.25, "y": 0},
-                {"label": "-", "matrix": [0, 13], "x": 13.25, "y": 0},
-                {"label": "=", "matrix": [0, 14], "x": 14.25, "y": 0},
-                {"label": "Backspace", "matrix": [0, 15], "x": 15.25, "y": 0},
-                {"label": "Delete", "matrix": [2, 14], "x": 16.25, "y": 0},
-                {"label": "Num Lock", "matrix": [0, 16], "x": 17.5, "y": 0},
-                {"label": "-", "matrix": [0, 17], "x": 18.5, "y": 0},
-                {"label": "/", "matrix": [0, 18], "x": 19.5, "y": 0},
-                {"label": "*", "matrix": [0, 19], "x": 20.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.25, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 3], "x": 3.75, "y": 1},
-                {"label": "W", "matrix": [1, 4], "x": 4.75, "y": 1},
-                {"label": "E", "matrix": [1, 5], "x": 5.75, "y": 1},
-                {"label": "R", "matrix": [1, 6], "x": 6.75, "y": 1},
-                {"label": "T", "matrix": [1, 7], "x": 7.75, "y": 1},
-                {"label": "Y", "matrix": [1, 8], "x": 8.75, "y": 1},
-                {"label": "U", "matrix": [1, 9], "x": 9.75, "y": 1},
-                {"label": "I", "matrix": [1, 10], "x": 10.75, "y": 1},
-                {"label": "O", "matrix": [1, 11], "x": 11.75, "y": 1},
-                {"label": "P", "matrix": [1, 12], "x": 12.75, "y": 1},
-                {"label": "[", "matrix": [1, 13], "x": 13.75, "y": 1},
-                {"label": "]", "matrix": [1, 14], "x": 14.75, "y": 1},
-                {"label": "\\", "matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
-                {"label": "7", "matrix": [1, 16], "x": 17.5, "y": 1},
-                {"label": "8", "matrix": [1, 17], "x": 18.5, "y": 1},
-                {"label": "9", "matrix": [1, 18], "x": 19.5, "y": 1},
-                {"label": "+", "matrix": [1, 19], "x": 20.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.25, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 3], "x": 4, "y": 2},
-                {"label": "S", "matrix": [2, 4], "x": 5, "y": 2},
-                {"label": "D", "matrix": [2, 5], "x": 6, "y": 2},
-                {"label": "F", "matrix": [2, 6], "x": 7, "y": 2},
-                {"label": "G", "matrix": [2, 7], "x": 8, "y": 2},
-                {"label": "H", "matrix": [2, 8], "x": 9, "y": 2},
-                {"label": "J", "matrix": [2, 9], "x": 10, "y": 2},
-                {"label": "K", "matrix": [2, 10], "x": 11, "y": 2},
-                {"label": "L", "matrix": [2, 11], "x": 12, "y": 2},
-                {"label": ";", "matrix": [2, 12], "x": 13, "y": 2},
-                {"label": "'", "matrix": [2, 13], "x": 14, "y": 2},
-                {"label": "Enter", "matrix": [2, 15], "x": 15, "y": 2, "w": 2.25},
-                {"label": "4", "matrix": [2, 16], "x": 17.5, "y": 2},
-                {"label": "5", "matrix": [2, 17], "x": 18.5, "y": 2},
-                {"label": "6", "matrix": [2, 18], "x": 19.5, "y": 2},
-                {"label": "-", "matrix": [2, 19], "x": 20.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.25, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 3], "x": 3.5, "y": 3},
-                {"label": "Z", "matrix": [3, 4], "x": 4.5, "y": 3},
-                {"label": "X", "matrix": [3, 5], "x": 5.5, "y": 3},
-                {"label": "C", "matrix": [3, 6], "x": 6.5, "y": 3},
-                {"label": "V", "matrix": [3, 7], "x": 7.5, "y": 3},
-                {"label": "B", "matrix": [3, 8], "x": 8.5, "y": 3},
-                {"label": "N", "matrix": [3, 9], "x": 9.5, "y": 3},
-                {"label": "M", "matrix": [3, 10], "x": 10.5, "y": 3},
-                {"label": ",", "matrix": [3, 11], "x": 11.5, "y": 3},
-                {"label": ".", "matrix": [3, 12], "x": 12.5, "y": 3},
-                {"label": "/", "matrix": [3, 13], "x": 13.5, "y": 3},
-                {"label": "Shift", "matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [3, 15], "x": 16.25, "y": 3},
-                {"label": "1", "matrix": [3, 16], "x": 17.5, "y": 3},
-                {"label": "2", "matrix": [3, 17], "x": 18.5, "y": 3},
-                {"label": "3", "matrix": [3, 18], "x": 19.5, "y": 3},
-                {"label": "-", "matrix": [3, 19], "x": 20.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.25, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
-                {"label": "Ctrl", "matrix": [4, 15], "x": 15.75, "y": 4, "w": 1.5},
-                {"label": "0", "matrix": [4, 16], "x": 17.5, "y": 4},
-                {"label": "00", "matrix": [4, 17], "x": 18.5, "y": 4},
-                {"label": ".", "matrix": [4, 18], "x": 19.5, "y": 4},
-                {"label": "Enter", "matrix": [4, 19], "x": 20.5, "y": 4}
-            ]
-        },
-        "LAYOUT_ansi_wkl": {
-            "layout": [
-                {"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.25, "y": 0},
-                {"label": "1", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "2", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "3", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "4", "matrix": [0, 6], "x": 6.25, "y": 0},
-                {"label": "5", "matrix": [0, 7], "x": 7.25, "y": 0},
-                {"label": "6", "matrix": [0, 8], "x": 8.25, "y": 0},
-                {"label": "7", "matrix": [0, 9], "x": 9.25, "y": 0},
-                {"label": "8", "matrix": [0, 10], "x": 10.25, "y": 0},
-                {"label": "9", "matrix": [0, 11], "x": 11.25, "y": 0},
-                {"label": "0", "matrix": [0, 12], "x": 12.25, "y": 0},
-                {"label": "-", "matrix": [0, 13], "x": 13.25, "y": 0},
-                {"label": "=", "matrix": [0, 14], "x": 14.25, "y": 0},
-                {"label": "Backspace", "matrix": [0, 15], "x": 15.25, "y": 0, "w": 2},
-                {"label": "Num Lock", "matrix": [0, 16], "x": 17.5, "y": 0},
-                {"label": "-", "matrix": [0, 17], "x": 18.5, "y": 0},
-                {"label": "/", "matrix": [0, 18], "x": 19.5, "y": 0},
-                {"label": "*", "matrix": [0, 19], "x": 20.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.25, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 3], "x": 3.75, "y": 1},
-                {"label": "W", "matrix": [1, 4], "x": 4.75, "y": 1},
-                {"label": "E", "matrix": [1, 5], "x": 5.75, "y": 1},
-                {"label": "R", "matrix": [1, 6], "x": 6.75, "y": 1},
-                {"label": "T", "matrix": [1, 7], "x": 7.75, "y": 1},
-                {"label": "Y", "matrix": [1, 8], "x": 8.75, "y": 1},
-                {"label": "U", "matrix": [1, 9], "x": 9.75, "y": 1},
-                {"label": "I", "matrix": [1, 10], "x": 10.75, "y": 1},
-                {"label": "O", "matrix": [1, 11], "x": 11.75, "y": 1},
-                {"label": "P", "matrix": [1, 12], "x": 12.75, "y": 1},
-                {"label": "[", "matrix": [1, 13], "x": 13.75, "y": 1},
-                {"label": "]", "matrix": [1, 14], "x": 14.75, "y": 1},
-                {"label": "\\", "matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
-                {"label": "7", "matrix": [1, 16], "x": 17.5, "y": 1},
-                {"label": "8", "matrix": [1, 17], "x": 18.5, "y": 1},
-                {"label": "9", "matrix": [1, 18], "x": 19.5, "y": 1},
-                {"label": "+", "matrix": [1, 19], "x": 20.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.25, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 3], "x": 4, "y": 2},
-                {"label": "S", "matrix": [2, 4], "x": 5, "y": 2},
-                {"label": "D", "matrix": [2, 5], "x": 6, "y": 2},
-                {"label": "F", "matrix": [2, 6], "x": 7, "y": 2},
-                {"label": "G", "matrix": [2, 7], "x": 8, "y": 2},
-                {"label": "H", "matrix": [2, 8], "x": 9, "y": 2},
-                {"label": "J", "matrix": [2, 9], "x": 10, "y": 2},
-                {"label": "K", "matrix": [2, 10], "x": 11, "y": 2},
-                {"label": "L", "matrix": [2, 11], "x": 12, "y": 2},
-                {"label": ";", "matrix": [2, 12], "x": 13, "y": 2},
-                {"label": "'", "matrix": [2, 13], "x": 14, "y": 2},
-                {"label": "Enter", "matrix": [2, 15], "x": 15, "y": 2, "w": 2.25},
-                {"label": "4", "matrix": [2, 16], "x": 17.5, "y": 2},
-                {"label": "5", "matrix": [2, 17], "x": 18.5, "y": 2},
-                {"label": "6", "matrix": [2, 18], "x": 19.5, "y": 2},
-                {"label": "-", "matrix": [2, 19], "x": 20.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.25, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 4], "x": 4.5, "y": 3},
-                {"label": "X", "matrix": [3, 5], "x": 5.5, "y": 3},
-                {"label": "C", "matrix": [3, 6], "x": 6.5, "y": 3},
-                {"label": "V", "matrix": [3, 7], "x": 7.5, "y": 3},
-                {"label": "B", "matrix": [3, 8], "x": 8.5, "y": 3},
-                {"label": "N", "matrix": [3, 9], "x": 9.5, "y": 3},
-                {"label": "M", "matrix": [3, 10], "x": 10.5, "y": 3},
-                {"label": ",", "matrix": [3, 11], "x": 11.5, "y": 3},
-                {"label": ".", "matrix": [3, 12], "x": 12.5, "y": 3},
-                {"label": "/", "matrix": [3, 13], "x": 13.5, "y": 3},
-                {"label": "Shift", "matrix": [3, 14], "x": 14.5, "y": 3, "w": 2.75},
-                {"label": "1", "matrix": [3, 16], "x": 17.5, "y": 3},
-                {"label": "2", "matrix": [3, 17], "x": 18.5, "y": 3},
-                {"label": "3", "matrix": [3, 18], "x": 19.5, "y": 3},
-                {"label": "-", "matrix": [3, 19], "x": 20.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.25, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
-                {"label": "Ctrl", "matrix": [4, 15], "x": 15.75, "y": 4, "w": 1.5},
-                {"label": "0", "matrix": [4, 16], "x": 17.5, "y": 4},
-                {"label": "00", "matrix": [4, 17], "x": 18.5, "y": 4},
-                {"label": ".", "matrix": [4, 18], "x": 19.5, "y": 4},
-                {"label": "Enter", "matrix": [4, 19], "x": 20.5, "y": 4}
-            ]
-        },
-        "LAYOUT_ansi_wkl_split_bs_rshift": {
-            "layout": [
-                {"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.25, "y": 0},
-                {"label": "1", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "2", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "3", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "4", "matrix": [0, 6], "x": 6.25, "y": 0},
-                {"label": "5", "matrix": [0, 7], "x": 7.25, "y": 0},
-                {"label": "6", "matrix": [0, 8], "x": 8.25, "y": 0},
-                {"label": "7", "matrix": [0, 9], "x": 9.25, "y": 0},
-                {"label": "8", "matrix": [0, 10], "x": 10.25, "y": 0},
-                {"label": "9", "matrix": [0, 11], "x": 11.25, "y": 0},
-                {"label": "0", "matrix": [0, 12], "x": 12.25, "y": 0},
-                {"label": "-", "matrix": [0, 13], "x": 13.25, "y": 0},
-                {"label": "=", "matrix": [0, 14], "x": 14.25, "y": 0},
-                {"label": "Backspace", "matrix": [0, 15], "x": 15.25, "y": 0},
-                {"label": "Delete", "matrix": [2, 14], "x": 16.25, "y": 0},
-                {"label": "Num Lock", "matrix": [0, 16], "x": 17.5, "y": 0},
-                {"label": "-", "matrix": [0, 17], "x": 18.5, "y": 0},
-                {"label": "/", "matrix": [0, 18], "x": 19.5, "y": 0},
-                {"label": "*", "matrix": [0, 19], "x": 20.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.25, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 3], "x": 3.75, "y": 1},
-                {"label": "W", "matrix": [1, 4], "x": 4.75, "y": 1},
-                {"label": "E", "matrix": [1, 5], "x": 5.75, "y": 1},
-                {"label": "R", "matrix": [1, 6], "x": 6.75, "y": 1},
-                {"label": "T", "matrix": [1, 7], "x": 7.75, "y": 1},
-                {"label": "Y", "matrix": [1, 8], "x": 8.75, "y": 1},
-                {"label": "U", "matrix": [1, 9], "x": 9.75, "y": 1},
-                {"label": "I", "matrix": [1, 10], "x": 10.75, "y": 1},
-                {"label": "O", "matrix": [1, 11], "x": 11.75, "y": 1},
-                {"label": "P", "matrix": [1, 12], "x": 12.75, "y": 1},
-                {"label": "[", "matrix": [1, 13], "x": 13.75, "y": 1},
-                {"label": "]", "matrix": [1, 14], "x": 14.75, "y": 1},
-                {"label": "\\", "matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
-                {"label": "7", "matrix": [1, 16], "x": 17.5, "y": 1},
-                {"label": "8", "matrix": [1, 17], "x": 18.5, "y": 1},
-                {"label": "9", "matrix": [1, 18], "x": 19.5, "y": 1},
-                {"label": "+", "matrix": [1, 19], "x": 20.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.25, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 3], "x": 4, "y": 2},
-                {"label": "S", "matrix": [2, 4], "x": 5, "y": 2},
-                {"label": "D", "matrix": [2, 5], "x": 6, "y": 2},
-                {"label": "F", "matrix": [2, 6], "x": 7, "y": 2},
-                {"label": "G", "matrix": [2, 7], "x": 8, "y": 2},
-                {"label": "H", "matrix": [2, 8], "x": 9, "y": 2},
-                {"label": "J", "matrix": [2, 9], "x": 10, "y": 2},
-                {"label": "K", "matrix": [2, 10], "x": 11, "y": 2},
-                {"label": "L", "matrix": [2, 11], "x": 12, "y": 2},
-                {"label": ";", "matrix": [2, 12], "x": 13, "y": 2},
-                {"label": "'", "matrix": [2, 13], "x": 14, "y": 2},
-                {"label": "Enter", "matrix": [2, 15], "x": 15, "y": 2, "w": 2.25},
-                {"label": "4", "matrix": [2, 16], "x": 17.5, "y": 2},
-                {"label": "5", "matrix": [2, 17], "x": 18.5, "y": 2},
-                {"label": "6", "matrix": [2, 18], "x": 19.5, "y": 2},
-                {"label": "-", "matrix": [2, 19], "x": 20.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.25, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 4], "x": 4.5, "y": 3},
-                {"label": "X", "matrix": [3, 5], "x": 5.5, "y": 3},
-                {"label": "C", "matrix": [3, 6], "x": 6.5, "y": 3},
-                {"label": "V", "matrix": [3, 7], "x": 7.5, "y": 3},
-                {"label": "B", "matrix": [3, 8], "x": 8.5, "y": 3},
-                {"label": "N", "matrix": [3, 9], "x": 9.5, "y": 3},
-                {"label": "M", "matrix": [3, 10], "x": 10.5, "y": 3},
-                {"label": ",", "matrix": [3, 11], "x": 11.5, "y": 3},
-                {"label": ".", "matrix": [3, 12], "x": 12.5, "y": 3},
-                {"label": "/", "matrix": [3, 13], "x": 13.5, "y": 3},
-                {"label": "Shift", "matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [3, 15], "x": 16.25, "y": 3},
-                {"label": "1", "matrix": [3, 16], "x": 17.5, "y": 3},
-                {"label": "2", "matrix": [3, 17], "x": 18.5, "y": 3},
-                {"label": "3", "matrix": [3, 18], "x": 19.5, "y": 3},
-                {"label": "-", "matrix": [3, 19], "x": 20.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.25, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
-                {"label": "Ctrl", "matrix": [4, 15], "x": 15.75, "y": 4, "w": 1.5},
-                {"label": "0", "matrix": [4, 16], "x": 17.5, "y": 4},
-                {"label": "00", "matrix": [4, 17], "x": 18.5, "y": 4},
-                {"label": ".", "matrix": [4, 18], "x": 19.5, "y": 4},
-                {"label": "Enter", "matrix": [4, 19], "x": 20.5, "y": 4}
-            ]
-        },
-        "LAYOUT_iso_wkl": {
-            "layout": [
-                {"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.25, "y": 0},
-                {"label": "1", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "2", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "3", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "4", "matrix": [0, 6], "x": 6.25, "y": 0},
-                {"label": "5", "matrix": [0, 7], "x": 7.25, "y": 0},
-                {"label": "6", "matrix": [0, 8], "x": 8.25, "y": 0},
-                {"label": "7", "matrix": [0, 9], "x": 9.25, "y": 0},
-                {"label": "8", "matrix": [0, 10], "x": 10.25, "y": 0},
-                {"label": "9", "matrix": [0, 11], "x": 11.25, "y": 0},
-                {"label": "0", "matrix": [0, 12], "x": 12.25, "y": 0},
-                {"label": "-", "matrix": [0, 13], "x": 13.25, "y": 0},
-                {"label": "=", "matrix": [0, 14], "x": 14.25, "y": 0},
-                {"label": "Backspace", "matrix": [0, 15], "x": 15.25, "y": 0, "w": 2},
-                {"label": "Num Lock", "matrix": [0, 16], "x": 17.5, "y": 0},
-                {"label": "-", "matrix": [0, 17], "x": 18.5, "y": 0},
-                {"label": "/", "matrix": [0, 18], "x": 19.5, "y": 0},
-                {"label": "*", "matrix": [0, 19], "x": 20.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.25, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 3], "x": 3.75, "y": 1},
-                {"label": "W", "matrix": [1, 4], "x": 4.75, "y": 1},
-                {"label": "E", "matrix": [1, 5], "x": 5.75, "y": 1},
-                {"label": "R", "matrix": [1, 6], "x": 6.75, "y": 1},
-                {"label": "T", "matrix": [1, 7], "x": 7.75, "y": 1},
-                {"label": "Y", "matrix": [1, 8], "x": 8.75, "y": 1},
-                {"label": "U", "matrix": [1, 9], "x": 9.75, "y": 1},
-                {"label": "I", "matrix": [1, 10], "x": 10.75, "y": 1},
-                {"label": "O", "matrix": [1, 11], "x": 11.75, "y": 1},
-                {"label": "P", "matrix": [1, 12], "x": 12.75, "y": 1},
-                {"label": "[", "matrix": [1, 13], "x": 13.75, "y": 1},
-                {"label": "]", "matrix": [1, 14], "x": 14.75, "y": 1},
-                {"label": "7", "matrix": [1, 16], "x": 17.5, "y": 1},
-                {"label": "8", "matrix": [1, 17], "x": 18.5, "y": 1},
-                {"label": "9", "matrix": [1, 18], "x": 19.5, "y": 1},
-                {"label": "+", "matrix": [1, 19], "x": 20.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.25, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 3], "x": 4, "y": 2},
-                {"label": "S", "matrix": [2, 4], "x": 5, "y": 2},
-                {"label": "D", "matrix": [2, 5], "x": 6, "y": 2},
-                {"label": "F", "matrix": [2, 6], "x": 7, "y": 2},
-                {"label": "G", "matrix": [2, 7], "x": 8, "y": 2},
-                {"label": "H", "matrix": [2, 8], "x": 9, "y": 2},
-                {"label": "J", "matrix": [2, 9], "x": 10, "y": 2},
-                {"label": "K", "matrix": [2, 10], "x": 11, "y": 2},
-                {"label": "L", "matrix": [2, 11], "x": 12, "y": 2},
-                {"label": ";", "matrix": [2, 12], "x": 13, "y": 2},
-                {"label": "'", "matrix": [2, 13], "x": 14, "y": 2},
-                {"label": "#", "matrix": [1, 15], "x": 15, "y": 2},
-                {"label": "Enter", "matrix": [2, 15], "x": 16, "y": 1, "w": 1.25, "h": 2},
-                {"label": "4", "matrix": [2, 16], "x": 17.5, "y": 2},
-                {"label": "5", "matrix": [2, 17], "x": 18.5, "y": 2},
-                {"label": "6", "matrix": [2, 18], "x": 19.5, "y": 2},
-                {"label": "-", "matrix": [2, 19], "x": 20.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.25, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 3], "x": 3.5, "y": 3},
-                {"label": "Z", "matrix": [3, 4], "x": 4.5, "y": 3},
-                {"label": "X", "matrix": [3, 5], "x": 5.5, "y": 3},
-                {"label": "C", "matrix": [3, 6], "x": 6.5, "y": 3},
-                {"label": "V", "matrix": [3, 7], "x": 7.5, "y": 3},
-                {"label": "B", "matrix": [3, 8], "x": 8.5, "y": 3},
-                {"label": "N", "matrix": [3, 9], "x": 9.5, "y": 3},
-                {"label": "M", "matrix": [3, 10], "x": 10.5, "y": 3},
-                {"label": ",", "matrix": [3, 11], "x": 11.5, "y": 3},
-                {"label": ".", "matrix": [3, 12], "x": 12.5, "y": 3},
-                {"label": "/", "matrix": [3, 13], "x": 13.5, "y": 3},
-                {"label": "Shift", "matrix": [3, 14], "x": 14.5, "y": 3, "w": 2.75},
-                {"label": "1", "matrix": [3, 16], "x": 17.5, "y": 3},
-                {"label": "2", "matrix": [3, 17], "x": 18.5, "y": 3},
-                {"label": "3", "matrix": [3, 18], "x": 19.5, "y": 3},
-                {"label": "-", "matrix": [3, 19], "x": 20.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.25, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
-                {"label": "Ctrl", "matrix": [4, 15], "x": 15.75, "y": 4, "w": 1.5},
-                {"label": "0", "matrix": [4, 16], "x": 17.5, "y": 4},
-                {"label": "00", "matrix": [4, 17], "x": 18.5, "y": 4},
-                {"label": ".", "matrix": [4, 18], "x": 19.5, "y": 4},
-                {"label": "Enter", "matrix": [4, 19], "x": 20.5, "y": 4}
-            ]
-        },
-        "LAYOUT_iso_wkl_split_bs_rshift": {
-            "layout": [
-                {"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.25, "y": 0},
-                {"label": "1", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "2", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "3", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "4", "matrix": [0, 6], "x": 6.25, "y": 0},
-                {"label": "5", "matrix": [0, 7], "x": 7.25, "y": 0},
-                {"label": "6", "matrix": [0, 8], "x": 8.25, "y": 0},
-                {"label": "7", "matrix": [0, 9], "x": 9.25, "y": 0},
-                {"label": "8", "matrix": [0, 10], "x": 10.25, "y": 0},
-                {"label": "9", "matrix": [0, 11], "x": 11.25, "y": 0},
-                {"label": "0", "matrix": [0, 12], "x": 12.25, "y": 0},
-                {"label": "-", "matrix": [0, 13], "x": 13.25, "y": 0},
-                {"label": "=", "matrix": [0, 14], "x": 14.25, "y": 0},
-                {"label": "Backspace", "matrix": [0, 15], "x": 15.25, "y": 0},
-                {"label": "Delete", "matrix": [2, 14], "x": 16.25, "y": 0},
-                {"label": "Num Lock", "matrix": [0, 16], "x": 17.5, "y": 0},
-                {"label": "-", "matrix": [0, 17], "x": 18.5, "y": 0},
-                {"label": "/", "matrix": [0, 18], "x": 19.5, "y": 0},
-                {"label": "*", "matrix": [0, 19], "x": 20.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.25, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 3], "x": 3.75, "y": 1},
-                {"label": "W", "matrix": [1, 4], "x": 4.75, "y": 1},
-                {"label": "E", "matrix": [1, 5], "x": 5.75, "y": 1},
-                {"label": "R", "matrix": [1, 6], "x": 6.75, "y": 1},
-                {"label": "T", "matrix": [1, 7], "x": 7.75, "y": 1},
-                {"label": "Y", "matrix": [1, 8], "x": 8.75, "y": 1},
-                {"label": "U", "matrix": [1, 9], "x": 9.75, "y": 1},
-                {"label": "I", "matrix": [1, 10], "x": 10.75, "y": 1},
-                {"label": "O", "matrix": [1, 11], "x": 11.75, "y": 1},
-                {"label": "P", "matrix": [1, 12], "x": 12.75, "y": 1},
-                {"label": "[", "matrix": [1, 13], "x": 13.75, "y": 1},
-                {"label": "]", "matrix": [1, 14], "x": 14.75, "y": 1},
-                {"label": "7", "matrix": [1, 16], "x": 17.5, "y": 1},
-                {"label": "8", "matrix": [1, 17], "x": 18.5, "y": 1},
-                {"label": "9", "matrix": [1, 18], "x": 19.5, "y": 1},
-                {"label": "+", "matrix": [1, 19], "x": 20.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.25, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 3], "x": 4, "y": 2},
-                {"label": "S", "matrix": [2, 4], "x": 5, "y": 2},
-                {"label": "D", "matrix": [2, 5], "x": 6, "y": 2},
-                {"label": "F", "matrix": [2, 6], "x": 7, "y": 2},
-                {"label": "G", "matrix": [2, 7], "x": 8, "y": 2},
-                {"label": "H", "matrix": [2, 8], "x": 9, "y": 2},
-                {"label": "J", "matrix": [2, 9], "x": 10, "y": 2},
-                {"label": "K", "matrix": [2, 10], "x": 11, "y": 2},
-                {"label": "L", "matrix": [2, 11], "x": 12, "y": 2},
-                {"label": ";", "matrix": [2, 12], "x": 13, "y": 2},
-                {"label": "'", "matrix": [2, 13], "x": 14, "y": 2},
-                {"label": "#", "matrix": [1, 15], "x": 15, "y": 2},
-                {"label": "Enter", "matrix": [2, 15], "x": 16, "y": 1, "w": 1.25, "h": 2},
-                {"label": "4", "matrix": [2, 16], "x": 17.5, "y": 2},
-                {"label": "5", "matrix": [2, 17], "x": 18.5, "y": 2},
-                {"label": "6", "matrix": [2, 18], "x": 19.5, "y": 2},
-                {"label": "-", "matrix": [2, 19], "x": 20.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.25, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 3], "x": 3.5, "y": 3},
-                {"label": "Z", "matrix": [3, 4], "x": 4.5, "y": 3},
-                {"label": "X", "matrix": [3, 5], "x": 5.5, "y": 3},
-                {"label": "C", "matrix": [3, 6], "x": 6.5, "y": 3},
-                {"label": "V", "matrix": [3, 7], "x": 7.5, "y": 3},
-                {"label": "B", "matrix": [3, 8], "x": 8.5, "y": 3},
-                {"label": "N", "matrix": [3, 9], "x": 9.5, "y": 3},
-                {"label": "M", "matrix": [3, 10], "x": 10.5, "y": 3},
-                {"label": ",", "matrix": [3, 11], "x": 11.5, "y": 3},
-                {"label": ".", "matrix": [3, 12], "x": 12.5, "y": 3},
-                {"label": "/", "matrix": [3, 13], "x": 13.5, "y": 3},
-                {"label": "Shift", "matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [3, 15], "x": 16.25, "y": 3},
-                {"label": "1", "matrix": [3, 16], "x": 17.5, "y": 3},
-                {"label": "2", "matrix": [3, 17], "x": 18.5, "y": 3},
-                {"label": "3", "matrix": [3, 18], "x": 19.5, "y": 3},
-                {"label": "-", "matrix": [3, 19], "x": 20.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.25, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
-                {"label": "Ctrl", "matrix": [4, 15], "x": 15.75, "y": 4, "w": 1.5},
-                {"label": "0", "matrix": [4, 16], "x": 17.5, "y": 4},
-                {"label": "00", "matrix": [4, 17], "x": 18.5, "y": 4},
-                {"label": ".", "matrix": [4, 18], "x": 19.5, "y": 4},
-                {"label": "Enter", "matrix": [4, 19], "x": 20.5, "y": 4}
-            ]
-        }
-    }
-}
\ No newline at end of file
diff --git a/keyboards/geonworks/w1_at/keyboard.json b/keyboards/geonworks/w1_at/keyboard.json
new file mode 100644
index 0000000000..8b7991c03d
--- /dev/null
+++ b/keyboards/geonworks/w1_at/keyboard.json
@@ -0,0 +1,507 @@
+{
+    "manufacturer": "Yiancar-Designs",
+    "keyboard_name": "W1-AT",
+    "maintainer": "Yiancar-Designs",
+    "bootloader": "stm32-dfu",
+    "bootmagic": {
+        "matrix": [0, 2]
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "indicators": {
+        "caps_lock": "B6",
+        "kana": "A13",
+        "num_lock": "B3",
+        "on_state": 0,
+        "scroll_lock": "A15"
+    },
+    "matrix_pins": {
+        "cols": ["B7", "A0", "A1", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10"],
+        "rows": ["A2", "B9", "B8", "B5", "B4"]
+    },
+    "processor": "STM32F072",
+    "url": "https://yiancar-designs.com",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x5754",
+        "vid": "0x8968"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"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.25, "y": 0},
+                {"label": "1", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "2", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "3", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "4", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "5", "matrix": [0, 7], "x": 7.25, "y": 0},
+                {"label": "6", "matrix": [0, 8], "x": 8.25, "y": 0},
+                {"label": "7", "matrix": [0, 9], "x": 9.25, "y": 0},
+                {"label": "8", "matrix": [0, 10], "x": 10.25, "y": 0},
+                {"label": "9", "matrix": [0, 11], "x": 11.25, "y": 0},
+                {"label": "0", "matrix": [0, 12], "x": 12.25, "y": 0},
+                {"label": "-", "matrix": [0, 13], "x": 13.25, "y": 0},
+                {"label": "=", "matrix": [0, 14], "x": 14.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 15], "x": 15.25, "y": 0},
+                {"label": "Delete", "matrix": [2, 14], "x": 16.25, "y": 0},
+                {"label": "Num Lock", "matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "-", "matrix": [0, 17], "x": 18.5, "y": 0},
+                {"label": "/", "matrix": [0, 18], "x": 19.5, "y": 0},
+                {"label": "*", "matrix": [0, 19], "x": 20.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.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 3], "x": 3.75, "y": 1},
+                {"label": "W", "matrix": [1, 4], "x": 4.75, "y": 1},
+                {"label": "E", "matrix": [1, 5], "x": 5.75, "y": 1},
+                {"label": "R", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "T", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "Y", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "U", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "I", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "O", "matrix": [1, 11], "x": 11.75, "y": 1},
+                {"label": "P", "matrix": [1, 12], "x": 12.75, "y": 1},
+                {"label": "[", "matrix": [1, 13], "x": 13.75, "y": 1},
+                {"label": "]", "matrix": [1, 14], "x": 14.75, "y": 1},
+                {"label": "\\", "matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
+                {"label": "7", "matrix": [1, 16], "x": 17.5, "y": 1},
+                {"label": "8", "matrix": [1, 17], "x": 18.5, "y": 1},
+                {"label": "9", "matrix": [1, 18], "x": 19.5, "y": 1},
+                {"label": "+", "matrix": [1, 19], "x": 20.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.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "S", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "D", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "F", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "G", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "H", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "J", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "K", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": "L", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": ";", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "'", "matrix": [2, 13], "x": 14, "y": 2},
+                {"label": "Enter", "matrix": [2, 15], "x": 15, "y": 2, "w": 2.25},
+                {"label": "4", "matrix": [2, 16], "x": 17.5, "y": 2},
+                {"label": "5", "matrix": [2, 17], "x": 18.5, "y": 2},
+                {"label": "6", "matrix": [2, 18], "x": 19.5, "y": 2},
+                {"label": "-", "matrix": [2, 19], "x": 20.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.25, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 3], "x": 3.5, "y": 3},
+                {"label": "Z", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "X", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "C", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "V", "matrix": [3, 7], "x": 7.5, "y": 3},
+                {"label": "B", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": "N", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": "M", "matrix": [3, 10], "x": 10.5, "y": 3},
+                {"label": ",", "matrix": [3, 11], "x": 11.5, "y": 3},
+                {"label": ".", "matrix": [3, 12], "x": 12.5, "y": 3},
+                {"label": "/", "matrix": [3, 13], "x": 13.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 15], "x": 16.25, "y": 3},
+                {"label": "1", "matrix": [3, 16], "x": 17.5, "y": 3},
+                {"label": "2", "matrix": [3, 17], "x": 18.5, "y": 3},
+                {"label": "3", "matrix": [3, 18], "x": 19.5, "y": 3},
+                {"label": "-", "matrix": [3, 19], "x": 20.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.25, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
+                {"label": "Ctrl", "matrix": [4, 15], "x": 15.75, "y": 4, "w": 1.5},
+                {"label": "0", "matrix": [4, 16], "x": 17.5, "y": 4},
+                {"label": "00", "matrix": [4, 17], "x": 18.5, "y": 4},
+                {"label": ".", "matrix": [4, 18], "x": 19.5, "y": 4},
+                {"label": "Enter", "matrix": [4, 19], "x": 20.5, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi_wkl": {
+            "layout": [
+                {"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.25, "y": 0},
+                {"label": "1", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "2", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "3", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "4", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "5", "matrix": [0, 7], "x": 7.25, "y": 0},
+                {"label": "6", "matrix": [0, 8], "x": 8.25, "y": 0},
+                {"label": "7", "matrix": [0, 9], "x": 9.25, "y": 0},
+                {"label": "8", "matrix": [0, 10], "x": 10.25, "y": 0},
+                {"label": "9", "matrix": [0, 11], "x": 11.25, "y": 0},
+                {"label": "0", "matrix": [0, 12], "x": 12.25, "y": 0},
+                {"label": "-", "matrix": [0, 13], "x": 13.25, "y": 0},
+                {"label": "=", "matrix": [0, 14], "x": 14.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 15], "x": 15.25, "y": 0, "w": 2},
+                {"label": "Num Lock", "matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "-", "matrix": [0, 17], "x": 18.5, "y": 0},
+                {"label": "/", "matrix": [0, 18], "x": 19.5, "y": 0},
+                {"label": "*", "matrix": [0, 19], "x": 20.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.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 3], "x": 3.75, "y": 1},
+                {"label": "W", "matrix": [1, 4], "x": 4.75, "y": 1},
+                {"label": "E", "matrix": [1, 5], "x": 5.75, "y": 1},
+                {"label": "R", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "T", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "Y", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "U", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "I", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "O", "matrix": [1, 11], "x": 11.75, "y": 1},
+                {"label": "P", "matrix": [1, 12], "x": 12.75, "y": 1},
+                {"label": "[", "matrix": [1, 13], "x": 13.75, "y": 1},
+                {"label": "]", "matrix": [1, 14], "x": 14.75, "y": 1},
+                {"label": "\\", "matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
+                {"label": "7", "matrix": [1, 16], "x": 17.5, "y": 1},
+                {"label": "8", "matrix": [1, 17], "x": 18.5, "y": 1},
+                {"label": "9", "matrix": [1, 18], "x": 19.5, "y": 1},
+                {"label": "+", "matrix": [1, 19], "x": 20.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.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "S", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "D", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "F", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "G", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "H", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "J", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "K", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": "L", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": ";", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "'", "matrix": [2, 13], "x": 14, "y": 2},
+                {"label": "Enter", "matrix": [2, 15], "x": 15, "y": 2, "w": 2.25},
+                {"label": "4", "matrix": [2, 16], "x": 17.5, "y": 2},
+                {"label": "5", "matrix": [2, 17], "x": 18.5, "y": 2},
+                {"label": "6", "matrix": [2, 18], "x": 19.5, "y": 2},
+                {"label": "-", "matrix": [2, 19], "x": 20.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.25, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "X", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "C", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "V", "matrix": [3, 7], "x": 7.5, "y": 3},
+                {"label": "B", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": "N", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": "M", "matrix": [3, 10], "x": 10.5, "y": 3},
+                {"label": ",", "matrix": [3, 11], "x": 11.5, "y": 3},
+                {"label": ".", "matrix": [3, 12], "x": 12.5, "y": 3},
+                {"label": "/", "matrix": [3, 13], "x": 13.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 14], "x": 14.5, "y": 3, "w": 2.75},
+                {"label": "1", "matrix": [3, 16], "x": 17.5, "y": 3},
+                {"label": "2", "matrix": [3, 17], "x": 18.5, "y": 3},
+                {"label": "3", "matrix": [3, 18], "x": 19.5, "y": 3},
+                {"label": "-", "matrix": [3, 19], "x": 20.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.25, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
+                {"label": "Ctrl", "matrix": [4, 15], "x": 15.75, "y": 4, "w": 1.5},
+                {"label": "0", "matrix": [4, 16], "x": 17.5, "y": 4},
+                {"label": "00", "matrix": [4, 17], "x": 18.5, "y": 4},
+                {"label": ".", "matrix": [4, 18], "x": 19.5, "y": 4},
+                {"label": "Enter", "matrix": [4, 19], "x": 20.5, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                {"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.25, "y": 0},
+                {"label": "1", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "2", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "3", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "4", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "5", "matrix": [0, 7], "x": 7.25, "y": 0},
+                {"label": "6", "matrix": [0, 8], "x": 8.25, "y": 0},
+                {"label": "7", "matrix": [0, 9], "x": 9.25, "y": 0},
+                {"label": "8", "matrix": [0, 10], "x": 10.25, "y": 0},
+                {"label": "9", "matrix": [0, 11], "x": 11.25, "y": 0},
+                {"label": "0", "matrix": [0, 12], "x": 12.25, "y": 0},
+                {"label": "-", "matrix": [0, 13], "x": 13.25, "y": 0},
+                {"label": "=", "matrix": [0, 14], "x": 14.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 15], "x": 15.25, "y": 0},
+                {"label": "Delete", "matrix": [2, 14], "x": 16.25, "y": 0},
+                {"label": "Num Lock", "matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "-", "matrix": [0, 17], "x": 18.5, "y": 0},
+                {"label": "/", "matrix": [0, 18], "x": 19.5, "y": 0},
+                {"label": "*", "matrix": [0, 19], "x": 20.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.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 3], "x": 3.75, "y": 1},
+                {"label": "W", "matrix": [1, 4], "x": 4.75, "y": 1},
+                {"label": "E", "matrix": [1, 5], "x": 5.75, "y": 1},
+                {"label": "R", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "T", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "Y", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "U", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "I", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "O", "matrix": [1, 11], "x": 11.75, "y": 1},
+                {"label": "P", "matrix": [1, 12], "x": 12.75, "y": 1},
+                {"label": "[", "matrix": [1, 13], "x": 13.75, "y": 1},
+                {"label": "]", "matrix": [1, 14], "x": 14.75, "y": 1},
+                {"label": "\\", "matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
+                {"label": "7", "matrix": [1, 16], "x": 17.5, "y": 1},
+                {"label": "8", "matrix": [1, 17], "x": 18.5, "y": 1},
+                {"label": "9", "matrix": [1, 18], "x": 19.5, "y": 1},
+                {"label": "+", "matrix": [1, 19], "x": 20.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.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "S", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "D", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "F", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "G", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "H", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "J", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "K", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": "L", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": ";", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "'", "matrix": [2, 13], "x": 14, "y": 2},
+                {"label": "Enter", "matrix": [2, 15], "x": 15, "y": 2, "w": 2.25},
+                {"label": "4", "matrix": [2, 16], "x": 17.5, "y": 2},
+                {"label": "5", "matrix": [2, 17], "x": 18.5, "y": 2},
+                {"label": "6", "matrix": [2, 18], "x": 19.5, "y": 2},
+                {"label": "-", "matrix": [2, 19], "x": 20.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.25, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "X", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "C", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "V", "matrix": [3, 7], "x": 7.5, "y": 3},
+                {"label": "B", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": "N", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": "M", "matrix": [3, 10], "x": 10.5, "y": 3},
+                {"label": ",", "matrix": [3, 11], "x": 11.5, "y": 3},
+                {"label": ".", "matrix": [3, 12], "x": 12.5, "y": 3},
+                {"label": "/", "matrix": [3, 13], "x": 13.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 15], "x": 16.25, "y": 3},
+                {"label": "1", "matrix": [3, 16], "x": 17.5, "y": 3},
+                {"label": "2", "matrix": [3, 17], "x": 18.5, "y": 3},
+                {"label": "3", "matrix": [3, 18], "x": 19.5, "y": 3},
+                {"label": "-", "matrix": [3, 19], "x": 20.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.25, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
+                {"label": "Ctrl", "matrix": [4, 15], "x": 15.75, "y": 4, "w": 1.5},
+                {"label": "0", "matrix": [4, 16], "x": 17.5, "y": 4},
+                {"label": "00", "matrix": [4, 17], "x": 18.5, "y": 4},
+                {"label": ".", "matrix": [4, 18], "x": 19.5, "y": 4},
+                {"label": "Enter", "matrix": [4, 19], "x": 20.5, "y": 4}
+            ]
+        },
+        "LAYOUT_iso_wkl": {
+            "layout": [
+                {"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.25, "y": 0},
+                {"label": "1", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "2", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "3", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "4", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "5", "matrix": [0, 7], "x": 7.25, "y": 0},
+                {"label": "6", "matrix": [0, 8], "x": 8.25, "y": 0},
+                {"label": "7", "matrix": [0, 9], "x": 9.25, "y": 0},
+                {"label": "8", "matrix": [0, 10], "x": 10.25, "y": 0},
+                {"label": "9", "matrix": [0, 11], "x": 11.25, "y": 0},
+                {"label": "0", "matrix": [0, 12], "x": 12.25, "y": 0},
+                {"label": "-", "matrix": [0, 13], "x": 13.25, "y": 0},
+                {"label": "=", "matrix": [0, 14], "x": 14.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 15], "x": 15.25, "y": 0, "w": 2},
+                {"label": "Num Lock", "matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "-", "matrix": [0, 17], "x": 18.5, "y": 0},
+                {"label": "/", "matrix": [0, 18], "x": 19.5, "y": 0},
+                {"label": "*", "matrix": [0, 19], "x": 20.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.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 3], "x": 3.75, "y": 1},
+                {"label": "W", "matrix": [1, 4], "x": 4.75, "y": 1},
+                {"label": "E", "matrix": [1, 5], "x": 5.75, "y": 1},
+                {"label": "R", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "T", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "Y", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "U", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "I", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "O", "matrix": [1, 11], "x": 11.75, "y": 1},
+                {"label": "P", "matrix": [1, 12], "x": 12.75, "y": 1},
+                {"label": "[", "matrix": [1, 13], "x": 13.75, "y": 1},
+                {"label": "]", "matrix": [1, 14], "x": 14.75, "y": 1},
+                {"label": "7", "matrix": [1, 16], "x": 17.5, "y": 1},
+                {"label": "8", "matrix": [1, 17], "x": 18.5, "y": 1},
+                {"label": "9", "matrix": [1, 18], "x": 19.5, "y": 1},
+                {"label": "+", "matrix": [1, 19], "x": 20.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.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "S", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "D", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "F", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "G", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "H", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "J", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "K", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": "L", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": ";", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "'", "matrix": [2, 13], "x": 14, "y": 2},
+                {"label": "#", "matrix": [1, 15], "x": 15, "y": 2},
+                {"label": "Enter", "matrix": [2, 15], "x": 16, "y": 1, "w": 1.25, "h": 2},
+                {"label": "4", "matrix": [2, 16], "x": 17.5, "y": 2},
+                {"label": "5", "matrix": [2, 17], "x": 18.5, "y": 2},
+                {"label": "6", "matrix": [2, 18], "x": 19.5, "y": 2},
+                {"label": "-", "matrix": [2, 19], "x": 20.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.25, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 3], "x": 3.5, "y": 3},
+                {"label": "Z", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "X", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "C", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "V", "matrix": [3, 7], "x": 7.5, "y": 3},
+                {"label": "B", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": "N", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": "M", "matrix": [3, 10], "x": 10.5, "y": 3},
+                {"label": ",", "matrix": [3, 11], "x": 11.5, "y": 3},
+                {"label": ".", "matrix": [3, 12], "x": 12.5, "y": 3},
+                {"label": "/", "matrix": [3, 13], "x": 13.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 14], "x": 14.5, "y": 3, "w": 2.75},
+                {"label": "1", "matrix": [3, 16], "x": 17.5, "y": 3},
+                {"label": "2", "matrix": [3, 17], "x": 18.5, "y": 3},
+                {"label": "3", "matrix": [3, 18], "x": 19.5, "y": 3},
+                {"label": "-", "matrix": [3, 19], "x": 20.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.25, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
+                {"label": "Ctrl", "matrix": [4, 15], "x": 15.75, "y": 4, "w": 1.5},
+                {"label": "0", "matrix": [4, 16], "x": 17.5, "y": 4},
+                {"label": "00", "matrix": [4, 17], "x": 18.5, "y": 4},
+                {"label": ".", "matrix": [4, 18], "x": 19.5, "y": 4},
+                {"label": "Enter", "matrix": [4, 19], "x": 20.5, "y": 4}
+            ]
+        },
+        "LAYOUT_iso_wkl_split_bs_rshift": {
+            "layout": [
+                {"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.25, "y": 0},
+                {"label": "1", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "2", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "3", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "4", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "5", "matrix": [0, 7], "x": 7.25, "y": 0},
+                {"label": "6", "matrix": [0, 8], "x": 8.25, "y": 0},
+                {"label": "7", "matrix": [0, 9], "x": 9.25, "y": 0},
+                {"label": "8", "matrix": [0, 10], "x": 10.25, "y": 0},
+                {"label": "9", "matrix": [0, 11], "x": 11.25, "y": 0},
+                {"label": "0", "matrix": [0, 12], "x": 12.25, "y": 0},
+                {"label": "-", "matrix": [0, 13], "x": 13.25, "y": 0},
+                {"label": "=", "matrix": [0, 14], "x": 14.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 15], "x": 15.25, "y": 0},
+                {"label": "Delete", "matrix": [2, 14], "x": 16.25, "y": 0},
+                {"label": "Num Lock", "matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "-", "matrix": [0, 17], "x": 18.5, "y": 0},
+                {"label": "/", "matrix": [0, 18], "x": 19.5, "y": 0},
+                {"label": "*", "matrix": [0, 19], "x": 20.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.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 3], "x": 3.75, "y": 1},
+                {"label": "W", "matrix": [1, 4], "x": 4.75, "y": 1},
+                {"label": "E", "matrix": [1, 5], "x": 5.75, "y": 1},
+                {"label": "R", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "T", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "Y", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "U", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "I", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "O", "matrix": [1, 11], "x": 11.75, "y": 1},
+                {"label": "P", "matrix": [1, 12], "x": 12.75, "y": 1},
+                {"label": "[", "matrix": [1, 13], "x": 13.75, "y": 1},
+                {"label": "]", "matrix": [1, 14], "x": 14.75, "y": 1},
+                {"label": "7", "matrix": [1, 16], "x": 17.5, "y": 1},
+                {"label": "8", "matrix": [1, 17], "x": 18.5, "y": 1},
+                {"label": "9", "matrix": [1, 18], "x": 19.5, "y": 1},
+                {"label": "+", "matrix": [1, 19], "x": 20.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.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "S", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "D", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "F", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "G", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "H", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "J", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "K", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": "L", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": ";", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "'", "matrix": [2, 13], "x": 14, "y": 2},
+                {"label": "#", "matrix": [1, 15], "x": 15, "y": 2},
+                {"label": "Enter", "matrix": [2, 15], "x": 16, "y": 1, "w": 1.25, "h": 2},
+                {"label": "4", "matrix": [2, 16], "x": 17.5, "y": 2},
+                {"label": "5", "matrix": [2, 17], "x": 18.5, "y": 2},
+                {"label": "6", "matrix": [2, 18], "x": 19.5, "y": 2},
+                {"label": "-", "matrix": [2, 19], "x": 20.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.25, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 3], "x": 3.5, "y": 3},
+                {"label": "Z", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "X", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "C", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "V", "matrix": [3, 7], "x": 7.5, "y": 3},
+                {"label": "B", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": "N", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": "M", "matrix": [3, 10], "x": 10.5, "y": 3},
+                {"label": ",", "matrix": [3, 11], "x": 11.5, "y": 3},
+                {"label": ".", "matrix": [3, 12], "x": 12.5, "y": 3},
+                {"label": "/", "matrix": [3, 13], "x": 13.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 15], "x": 16.25, "y": 3},
+                {"label": "1", "matrix": [3, 16], "x": 17.5, "y": 3},
+                {"label": "2", "matrix": [3, 17], "x": 18.5, "y": 3},
+                {"label": "3", "matrix": [3, 18], "x": 19.5, "y": 3},
+                {"label": "-", "matrix": [3, 19], "x": 20.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.25, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
+                {"label": "Ctrl", "matrix": [4, 15], "x": 15.75, "y": 4, "w": 1.5},
+                {"label": "0", "matrix": [4, 16], "x": 17.5, "y": 4},
+                {"label": "00", "matrix": [4, 17], "x": 18.5, "y": 4},
+                {"label": ".", "matrix": [4, 18], "x": 19.5, "y": 4},
+                {"label": "Enter", "matrix": [4, 19], "x": 20.5, "y": 4}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/gl516/a52gl/info.json b/keyboards/gl516/a52gl/info.json
deleted file mode 100644
index 54fbce6bda..0000000000
--- a/keyboards/gl516/a52gl/info.json
+++ /dev/null
@@ -1,86 +0,0 @@
-{
-    "keyboard_name": "a52gl",
-    "manufacturer": "Salicylic_Acid",
-    "url": "https://salicylic-acid3.hatenablog.com/",
-    "maintainer": "Salicylic_acid3",
-    "usb": {
-        "vid": "0x04D8",
-        "pid": "0xE8D1",
-        "device_version": "0.0.1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "features": {
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "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": 7.75, "y": 0},
-                {"matrix": [4, 0], "x": 8.75, "y": 0},
-                {"matrix": [4, 1], "x": 9.75, "y": 0},
-                {"matrix": [4, 2], "x": 10.75, "y": 0},
-                {"matrix": [4, 3], "x": 12, "y": 0},
-                {"matrix": [4, 4], "x": 13, "y": 0},
-                {"matrix": [4, 5], "x": 14, "y": 0},
-                {"matrix": [4, 6], "x": 15, "y": 0, "w": 1.5},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
-                {"matrix": [1, 1], "x": 1.25, "y": 1},
-                {"matrix": [1, 2], "x": 2.52, "y": 1},
-                {"matrix": [1, 3], "x": 3.52, "y": 1},
-                {"matrix": [1, 4], "x": 4.52, "y": 1},
-                {"matrix": [1, 5], "x": 5.52, "y": 1},
-
-                {"matrix": [1, 6], "x": 8, "y": 1},
-                {"matrix": [5, 0], "x": 9, "y": 1},
-                {"matrix": [5, 1], "x": 10, "y": 1},
-                {"matrix": [5, 2], "x": 11, "y": 1},
-                {"matrix": [5, 3], "x": 12.25, "y": 1},
-                {"matrix": [5, 4], "x": 13.25, "y": 1},
-                {"matrix": [5, 5], "x": 14.25, "y": 1, "w": 2.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 3.05, "y": 2},
-                {"matrix": [2, 3], "x": 4.05, "y": 2},
-                {"matrix": [2, 4], "x": 5.05, "y": 2},
-                {"matrix": [2, 5], "x": 6.05, "y": 2},
-
-                {"matrix": [2, 6], "x": 7.5, "y": 2},
-                {"matrix": [6, 0], "x": 8.5, "y": 2},
-                {"matrix": [6, 1], "x": 9.5, "y": 2},
-                {"matrix": [6, 2], "x": 10.5, "y": 2},
-                {"matrix": [6, 3], "x": 12, "y": 2},
-                {"matrix": [6, 4], "x": 13, "y": 2},
-
-                {"matrix": [6, 5], "x": 14.25, "y": 2.25},
-
-                {"matrix": [6, 6], "x": 15.5, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
-                {"matrix": [3, 2], "x": 3.05, "y": 3},
-                {"matrix": [3, 4], "x": 4.05, "y": 3, "w": 2},
-                {"matrix": [3, 5], "x": 6.05, "y": 3},
-
-                {"matrix": [3, 6], "x": 7.5, "y": 3, "w": 2.25},
-                {"matrix": [7, 1], "x": 9.75, "y": 3, "w": 1.25},
-                {"matrix": [7, 3], "x": 12, "y": 3},
-
-                {"matrix": [7, 4], "x": 13.25, "y": 3.25},
-                {"matrix": [7, 5], "x": 14.25, "y": 3.25},
-                {"matrix": [7, 6], "x": 15.25, "y": 3.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/gl516/a52gl/keyboard.json b/keyboards/gl516/a52gl/keyboard.json
new file mode 100644
index 0000000000..54fbce6bda
--- /dev/null
+++ b/keyboards/gl516/a52gl/keyboard.json
@@ -0,0 +1,86 @@
+{
+    "keyboard_name": "a52gl",
+    "manufacturer": "Salicylic_Acid",
+    "url": "https://salicylic-acid3.hatenablog.com/",
+    "maintainer": "Salicylic_acid3",
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xE8D1",
+        "device_version": "0.0.1"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "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": 7.75, "y": 0},
+                {"matrix": [4, 0], "x": 8.75, "y": 0},
+                {"matrix": [4, 1], "x": 9.75, "y": 0},
+                {"matrix": [4, 2], "x": 10.75, "y": 0},
+                {"matrix": [4, 3], "x": 12, "y": 0},
+                {"matrix": [4, 4], "x": 13, "y": 0},
+                {"matrix": [4, 5], "x": 14, "y": 0},
+                {"matrix": [4, 6], "x": 15, "y": 0, "w": 1.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.52, "y": 1},
+                {"matrix": [1, 3], "x": 3.52, "y": 1},
+                {"matrix": [1, 4], "x": 4.52, "y": 1},
+                {"matrix": [1, 5], "x": 5.52, "y": 1},
+
+                {"matrix": [1, 6], "x": 8, "y": 1},
+                {"matrix": [5, 0], "x": 9, "y": 1},
+                {"matrix": [5, 1], "x": 10, "y": 1},
+                {"matrix": [5, 2], "x": 11, "y": 1},
+                {"matrix": [5, 3], "x": 12.25, "y": 1},
+                {"matrix": [5, 4], "x": 13.25, "y": 1},
+                {"matrix": [5, 5], "x": 14.25, "y": 1, "w": 2.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 3.05, "y": 2},
+                {"matrix": [2, 3], "x": 4.05, "y": 2},
+                {"matrix": [2, 4], "x": 5.05, "y": 2},
+                {"matrix": [2, 5], "x": 6.05, "y": 2},
+
+                {"matrix": [2, 6], "x": 7.5, "y": 2},
+                {"matrix": [6, 0], "x": 8.5, "y": 2},
+                {"matrix": [6, 1], "x": 9.5, "y": 2},
+                {"matrix": [6, 2], "x": 10.5, "y": 2},
+                {"matrix": [6, 3], "x": 12, "y": 2},
+                {"matrix": [6, 4], "x": 13, "y": 2},
+
+                {"matrix": [6, 5], "x": 14.25, "y": 2.25},
+
+                {"matrix": [6, 6], "x": 15.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 3.05, "y": 3},
+                {"matrix": [3, 4], "x": 4.05, "y": 3, "w": 2},
+                {"matrix": [3, 5], "x": 6.05, "y": 3},
+
+                {"matrix": [3, 6], "x": 7.5, "y": 3, "w": 2.25},
+                {"matrix": [7, 1], "x": 9.75, "y": 3, "w": 1.25},
+                {"matrix": [7, 3], "x": 12, "y": 3},
+
+                {"matrix": [7, 4], "x": 13.25, "y": 3.25},
+                {"matrix": [7, 5], "x": 14.25, "y": 3.25},
+                {"matrix": [7, 6], "x": 15.25, "y": 3.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/gl516/j73gl/info.json b/keyboards/gl516/j73gl/info.json
deleted file mode 100644
index b252363f70..0000000000
--- a/keyboards/gl516/j73gl/info.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-    "keyboard_name": "j73gl",
-    "manufacturer": "Salicylic_Acid",
-    "url": "https://salicylic-acid3.hatenablog.com/",
-    "maintainer": "Salicylic_acid3",
-    "usb": {
-        "vid": "0x04D8",
-        "pid": "0xE8D0",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "led_count": 73,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "features": {
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true,
-        "rgblight": true
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [5, 0], "x": 7, "y": 0},
-                {"matrix": [5, 1], "x": 8, "y": 0},
-                {"matrix": [5, 2], "x": 9, "y": 0},
-                {"matrix": [5, 3], "x": 10, "y": 0},
-                {"matrix": [5, 4], "x": 11, "y": 0},
-                {"matrix": [5, 5], "x": 12, "y": 0},
-                {"matrix": [5, 6], "x": 13, "y": 0},
-                {"matrix": [6, 6], "x": 14, "y": 0},
-                {"matrix": [5, 7], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"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": [6, 0], "x": 7.5, "y": 1},
-                {"matrix": [6, 1], "x": 8.5, "y": 1},
-                {"matrix": [6, 2], "x": 9.5, "y": 1},
-                {"matrix": [6, 3], "x": 10.5, "y": 1},
-                {"matrix": [6, 4], "x": 11.5, "y": 1},
-                {"matrix": [6, 5], "x": 12.5, "y": 1},
-                {"matrix": [6, 7], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [7, 0], "x": 7.75, "y": 2},
-                {"matrix": [7, 1], "x": 8.75, "y": 2},
-                {"matrix": [7, 2], "x": 9.75, "y": 2},
-                {"matrix": [7, 3], "x": 10.75, "y": 2},
-                {"matrix": [7, 4], "x": 11.75, "y": 2},
-                {"matrix": [7, 5], "x": 12.75, "y": 2},
-                {"matrix": [7, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"matrix": [7, 7], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [8, 0], "x": 8.25, "y": 3},
-                {"matrix": [8, 1], "x": 9.25, "y": 3},
-                {"matrix": [8, 2], "x": 10.25, "y": 3},
-                {"matrix": [8, 3], "x": 11.25, "y": 3},
-                {"matrix": [8, 5], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [8, 6], "x": 14, "y": 3},
-                {"matrix": [8, 7], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.5, "y": 4},
-                {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 5.75, "y": 4},
-                {"matrix": [4, 6], "x": 6.75, "y": 4},
-                {"matrix": [9, 0], "x": 7.75, "y": 4, "w": 1.25},
-                {"matrix": [9, 1], "x": 9, "y": 4},
-                {"matrix": [9, 2], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [9, 3], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"matrix": [9, 5], "x": 13, "y": 4},
-                {"matrix": [9, 6], "x": 14, "y": 4},
-                {"matrix": [9, 7], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/gl516/j73gl/keyboard.json b/keyboards/gl516/j73gl/keyboard.json
new file mode 100644
index 0000000000..b252363f70
--- /dev/null
+++ b/keyboards/gl516/j73gl/keyboard.json
@@ -0,0 +1,121 @@
+{
+    "keyboard_name": "j73gl",
+    "manufacturer": "Salicylic_Acid",
+    "url": "https://salicylic-acid3.hatenablog.com/",
+    "maintainer": "Salicylic_acid3",
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xE8D0",
+        "device_version": "0.0.1"
+    },
+    "rgblight": {
+        "led_count": 73,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgblight": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [5, 0], "x": 7, "y": 0},
+                {"matrix": [5, 1], "x": 8, "y": 0},
+                {"matrix": [5, 2], "x": 9, "y": 0},
+                {"matrix": [5, 3], "x": 10, "y": 0},
+                {"matrix": [5, 4], "x": 11, "y": 0},
+                {"matrix": [5, 5], "x": 12, "y": 0},
+                {"matrix": [5, 6], "x": 13, "y": 0},
+                {"matrix": [6, 6], "x": 14, "y": 0},
+                {"matrix": [5, 7], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"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": [6, 0], "x": 7.5, "y": 1},
+                {"matrix": [6, 1], "x": 8.5, "y": 1},
+                {"matrix": [6, 2], "x": 9.5, "y": 1},
+                {"matrix": [6, 3], "x": 10.5, "y": 1},
+                {"matrix": [6, 4], "x": 11.5, "y": 1},
+                {"matrix": [6, 5], "x": 12.5, "y": 1},
+                {"matrix": [6, 7], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [7, 0], "x": 7.75, "y": 2},
+                {"matrix": [7, 1], "x": 8.75, "y": 2},
+                {"matrix": [7, 2], "x": 9.75, "y": 2},
+                {"matrix": [7, 3], "x": 10.75, "y": 2},
+                {"matrix": [7, 4], "x": 11.75, "y": 2},
+                {"matrix": [7, 5], "x": 12.75, "y": 2},
+                {"matrix": [7, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [7, 7], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [8, 0], "x": 8.25, "y": 3},
+                {"matrix": [8, 1], "x": 9.25, "y": 3},
+                {"matrix": [8, 2], "x": 10.25, "y": 3},
+                {"matrix": [8, 3], "x": 11.25, "y": 3},
+                {"matrix": [8, 5], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [8, 6], "x": 14, "y": 3},
+                {"matrix": [8, 7], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 5.75, "y": 4},
+                {"matrix": [4, 6], "x": 6.75, "y": 4},
+                {"matrix": [9, 0], "x": 7.75, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 9, "y": 4},
+                {"matrix": [9, 2], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [9, 3], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"matrix": [9, 5], "x": 13, "y": 4},
+                {"matrix": [9, 6], "x": 14, "y": 4},
+                {"matrix": [9, 7], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/gl516/n51gl/info.json b/keyboards/gl516/n51gl/info.json
deleted file mode 100644
index 0e54ee52a4..0000000000
--- a/keyboards/gl516/n51gl/info.json
+++ /dev/null
@@ -1,110 +0,0 @@
-{
-    "keyboard_name": "n51gl",
-    "manufacturer": "Salicylic_Acid",
-    "url": "https://salicylic-acid3.hatenablog.com/",
-    "maintainer": "Salicylic_acid3",
-    "usb": {
-        "vid": "0x04D8",
-        "pid": "0xE8CF",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "led_count": 15,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "D7", "pin_b": "E6", "resolution": 3}
-        ]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "features": {
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true,
-        "rgblight": true,
-        "encoder": true
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0.25, "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": [4, 0], "x": 9.25, "y": 0},
-                {"matrix": [4, 1], "x": 10.25, "y": 0},
-                {"matrix": [4, 2], "x": 11.25, "y": 0},
-                {"matrix": [4, 3], "x": 12.25, "y": 0},
-                {"matrix": [4, 4], "x": 13.25, "y": 0},
-                {"matrix": [4, 5], "x": 14.25, "y": 0},
-                {"matrix": [4, 6], "x": 15.25, "y": 0},
-
-                {"matrix": [1, 1], "x": 0.25, "y": 1, "w": 1.75},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3.25, "y": 1},
-                {"matrix": [1, 4], "x": 4.25, "y": 1},
-                {"matrix": [1, 5], "x": 5.25, "y": 1},
-                {"matrix": [1, 6], "x": 6.25, "y": 1},
-
-                {"matrix": [5, 0], "x": 9.25, "y": 1},
-                {"matrix": [5, 1], "x": 10.25, "y": 1},
-                {"matrix": [5, 2], "x": 11.25, "y": 1},
-                {"matrix": [5, 3], "x": 12.25, "y": 1},
-                {"matrix": [5, 4], "x": 13.5, "y": 1},
-                {"matrix": [5, 5], "x": 14.5, "y": 1},
-                {"matrix": [5, 6], "x": 15.5, "y": 1},
-
-                {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 1.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.25, "y": 2},
-                {"matrix": [2, 4], "x": 4.25, "y": 2},
-                {"matrix": [2, 5], "x": 5.25, "y": 2},
-                {"matrix": [2, 6], "x": 6.25, "y": 2},
-
-                {"matrix": [2, 0], "x": 7.75, "y": 2},
-
-                {"matrix": [6, 0], "x": 9.25, "y": 2},
-                {"matrix": [6, 1], "x": 10.25, "y": 2},
-                {"matrix": [6, 2], "x": 11.25, "y": 2},
-                {"matrix": [6, 3], "x": 12.25, "y": 2},
-                {"matrix": [6, 4], "x": 13.75, "y": 2},
-                {"matrix": [6, 5], "x": 14.75, "y": 2},
-                {"matrix": [6, 6], "x": 15.75, "y": 2},
-
-                {"matrix": [3, 1], "x": 0.25, "y": 3, "w": 1.25},
-                {"matrix": [3, 2], "x": 1.5, "y": 3, "w": 1.25},
-                {"matrix": [3, 4], "x": 4.125, "y": 3, "w": 1.25},
-                {"matrix": [3, 5], "x": 5.375, "y": 3, "w": 1.25},
-                {"matrix": [3, 6], "x": 6.625, "y": 3},
-
-                {"matrix": [7, 0], "x": 8.875, "y": 3},
-                {"matrix": [7, 1], "x": 9.875, "y": 3, "w": 1.25},
-                {"matrix": [7, 2], "x": 11.125, "y": 3, "w": 1.25},
-
-                {"matrix": [7, 4], "x": 13.75, "y": 3},
-                {"matrix": [7, 5], "x": 14.75, "y": 3},
-                {"matrix": [7, 6], "x": 15.75, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/gl516/n51gl/keyboard.json b/keyboards/gl516/n51gl/keyboard.json
new file mode 100644
index 0000000000..0e54ee52a4
--- /dev/null
+++ b/keyboards/gl516/n51gl/keyboard.json
@@ -0,0 +1,110 @@
+{
+    "keyboard_name": "n51gl",
+    "manufacturer": "Salicylic_Acid",
+    "url": "https://salicylic-acid3.hatenablog.com/",
+    "maintainer": "Salicylic_acid3",
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xE8CF",
+        "device_version": "0.0.1"
+    },
+    "rgblight": {
+        "led_count": 15,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D7", "pin_b": "E6", "resolution": 3}
+        ]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgblight": true,
+        "encoder": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0.25, "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": [4, 0], "x": 9.25, "y": 0},
+                {"matrix": [4, 1], "x": 10.25, "y": 0},
+                {"matrix": [4, 2], "x": 11.25, "y": 0},
+                {"matrix": [4, 3], "x": 12.25, "y": 0},
+                {"matrix": [4, 4], "x": 13.25, "y": 0},
+                {"matrix": [4, 5], "x": 14.25, "y": 0},
+                {"matrix": [4, 6], "x": 15.25, "y": 0},
+
+                {"matrix": [1, 1], "x": 0.25, "y": 1, "w": 1.75},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+
+                {"matrix": [5, 0], "x": 9.25, "y": 1},
+                {"matrix": [5, 1], "x": 10.25, "y": 1},
+                {"matrix": [5, 2], "x": 11.25, "y": 1},
+                {"matrix": [5, 3], "x": 12.25, "y": 1},
+                {"matrix": [5, 4], "x": 13.5, "y": 1},
+                {"matrix": [5, 5], "x": 14.5, "y": 1},
+                {"matrix": [5, 6], "x": 15.5, "y": 1},
+
+                {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.25, "y": 2},
+                {"matrix": [2, 4], "x": 4.25, "y": 2},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [2, 6], "x": 6.25, "y": 2},
+
+                {"matrix": [2, 0], "x": 7.75, "y": 2},
+
+                {"matrix": [6, 0], "x": 9.25, "y": 2},
+                {"matrix": [6, 1], "x": 10.25, "y": 2},
+                {"matrix": [6, 2], "x": 11.25, "y": 2},
+                {"matrix": [6, 3], "x": 12.25, "y": 2},
+                {"matrix": [6, 4], "x": 13.75, "y": 2},
+                {"matrix": [6, 5], "x": 14.75, "y": 2},
+                {"matrix": [6, 6], "x": 15.75, "y": 2},
+
+                {"matrix": [3, 1], "x": 0.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 1.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 4.125, "y": 3, "w": 1.25},
+                {"matrix": [3, 5], "x": 5.375, "y": 3, "w": 1.25},
+                {"matrix": [3, 6], "x": 6.625, "y": 3},
+
+                {"matrix": [7, 0], "x": 8.875, "y": 3},
+                {"matrix": [7, 1], "x": 9.875, "y": 3, "w": 1.25},
+                {"matrix": [7, 2], "x": 11.125, "y": 3, "w": 1.25},
+
+                {"matrix": [7, 4], "x": 13.75, "y": 3},
+                {"matrix": [7, 5], "x": 14.75, "y": 3},
+                {"matrix": [7, 6], "x": 15.75, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/glenpickle/chimera_ergo/info.json b/keyboards/glenpickle/chimera_ergo/info.json
deleted file mode 100644
index 038498fd10..0000000000
--- a/keyboards/glenpickle/chimera_ergo/info.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-  "keyboard_name": "Chimera Ergo",
-  "manufacturer": "Unknown",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x6060",
-    "device_version": "0.0.1"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "features": {
-    "bootmagic": false,
-    "mousekey": true,
-    "extrakey": true,
-    "console": true,
-    "command": true,
-    "nkro": true
-  },
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [1, 0], "x": 0, "y": 1},
-        {"matrix": [0, 5], "x": 1, "y": 0.75},
-        {"matrix": [2, 2], "x": 2, "y": 0.25},
-        {"matrix": [4, 2], "x": 3, "y": 0},
-        {"matrix": [3, 3], "x": 4, "y": 0.25},
-        {"matrix": [3, 4], "x": 5, "y": 0.5},
-
-        {"matrix": [3, 7], "x": 7, "y": 0.5},
-        {"matrix": [3, 8], "x": 8, "y": 0.25},
-        {"matrix": [4, 8], "x": 9, "y": 0},
-        {"matrix": [2, 9], "x": 10, "y": 0.25},
-        {"matrix": [4, 9], "x": 11, "y": 0.75},
-        {"matrix": [1, 11], "x": 12, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-        {"matrix": [3, 1], "x": 1, "y": 1.75},
-        {"matrix": [1, 2], "x": 2, "y": 1.25},
-        {"matrix": [0, 3], "x": 3, "y": 1},
-        {"matrix": [1, 4], "x": 4, "y": 1.25},
-        {"matrix": [2, 4], "x": 5, "y": 1.5},
-
-        {"matrix": [2, 7], "x": 7, "y": 1.5},
-        {"matrix": [1, 7], "x": 8, "y": 1.25},
-        {"matrix": [0, 8], "x": 9, "y": 1},
-        {"matrix": [1, 9], "x": 10, "y": 1.25},
-        {"matrix": [3, 10], "x": 11, "y": 1.75},
-        {"matrix": [2, 11], "x": 12, "y": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3},
-        {"matrix": [2, 1], "x": 1, "y": 2.75},
-        {"matrix": [0, 2], "x": 2, "y": 2.25},
-        {"matrix": [1, 3], "x": 3, "y": 2},
-        {"matrix": [0, 4], "x": 4, "y": 2.25},
-        {"matrix": [4, 0], "x": 5, "y": 2.5},
-
-        {"matrix": [4, 6], "x": 7, "y": 2.5},
-        {"matrix": [0, 7], "x": 8, "y": 2.25},
-        {"matrix": [1, 8], "x": 9, "y": 2},
-        {"matrix": [0, 9], "x": 10, "y": 2.25},
-        {"matrix": [2, 10], "x": 11, "y": 2.75},
-        {"matrix": [3, 11], "x": 12, "y": 3},
-
-        {"matrix": [1, 5], "x": 0, "y": 4},
-        {"matrix": [4, 4], "x": 1, "y": 3.75},
-        {"matrix": [3, 2], "x": 2, "y": 3.25},
-        {"matrix": [2, 3], "x": 3, "y": 3},
-        {"matrix": [4, 3], "x": 4, "y": 3.25},
-        {"matrix": [4, 1], "x": 5, "y": 3.5},
-
-        {"matrix": [0, 6], "x": 7, "y": 3.5},
-        {"matrix": [4, 7], "x": 8, "y": 3.25},
-        {"matrix": [2, 8], "x": 9, "y": 3},
-        {"matrix": [3, 9], "x": 10, "y": 3.25},
-        {"matrix": [4, 10], "x": 11, "y": 3.75},
-        {"matrix": [1, 6], "x": 12, "y": 4},
-
-        {"matrix": [3, 5], "x": 4, "y": 4.75},
-        {"matrix": [2, 5], "x": 5, "y": 5},
-
-        {"matrix": [2, 6], "x": 7, "y": 5},
-        {"matrix": [3, 6], "x": 8, "y": 4.75}
-      ]
-    }
-  }
-}
diff --git a/keyboards/glenpickle/chimera_ergo/keyboard.json b/keyboards/glenpickle/chimera_ergo/keyboard.json
new file mode 100644
index 0000000000..038498fd10
--- /dev/null
+++ b/keyboards/glenpickle/chimera_ergo/keyboard.json
@@ -0,0 +1,88 @@
+{
+  "keyboard_name": "Chimera Ergo",
+  "manufacturer": "Unknown",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x6060",
+    "device_version": "0.0.1"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "console": true,
+    "command": true,
+    "nkro": true
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [0, 5], "x": 1, "y": 0.75},
+        {"matrix": [2, 2], "x": 2, "y": 0.25},
+        {"matrix": [4, 2], "x": 3, "y": 0},
+        {"matrix": [3, 3], "x": 4, "y": 0.25},
+        {"matrix": [3, 4], "x": 5, "y": 0.5},
+
+        {"matrix": [3, 7], "x": 7, "y": 0.5},
+        {"matrix": [3, 8], "x": 8, "y": 0.25},
+        {"matrix": [4, 8], "x": 9, "y": 0},
+        {"matrix": [2, 9], "x": 10, "y": 0.25},
+        {"matrix": [4, 9], "x": 11, "y": 0.75},
+        {"matrix": [1, 11], "x": 12, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [3, 1], "x": 1, "y": 1.75},
+        {"matrix": [1, 2], "x": 2, "y": 1.25},
+        {"matrix": [0, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1.25},
+        {"matrix": [2, 4], "x": 5, "y": 1.5},
+
+        {"matrix": [2, 7], "x": 7, "y": 1.5},
+        {"matrix": [1, 7], "x": 8, "y": 1.25},
+        {"matrix": [0, 8], "x": 9, "y": 1},
+        {"matrix": [1, 9], "x": 10, "y": 1.25},
+        {"matrix": [3, 10], "x": 11, "y": 1.75},
+        {"matrix": [2, 11], "x": 12, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [2, 1], "x": 1, "y": 2.75},
+        {"matrix": [0, 2], "x": 2, "y": 2.25},
+        {"matrix": [1, 3], "x": 3, "y": 2},
+        {"matrix": [0, 4], "x": 4, "y": 2.25},
+        {"matrix": [4, 0], "x": 5, "y": 2.5},
+
+        {"matrix": [4, 6], "x": 7, "y": 2.5},
+        {"matrix": [0, 7], "x": 8, "y": 2.25},
+        {"matrix": [1, 8], "x": 9, "y": 2},
+        {"matrix": [0, 9], "x": 10, "y": 2.25},
+        {"matrix": [2, 10], "x": 11, "y": 2.75},
+        {"matrix": [3, 11], "x": 12, "y": 3},
+
+        {"matrix": [1, 5], "x": 0, "y": 4},
+        {"matrix": [4, 4], "x": 1, "y": 3.75},
+        {"matrix": [3, 2], "x": 2, "y": 3.25},
+        {"matrix": [2, 3], "x": 3, "y": 3},
+        {"matrix": [4, 3], "x": 4, "y": 3.25},
+        {"matrix": [4, 1], "x": 5, "y": 3.5},
+
+        {"matrix": [0, 6], "x": 7, "y": 3.5},
+        {"matrix": [4, 7], "x": 8, "y": 3.25},
+        {"matrix": [2, 8], "x": 9, "y": 3},
+        {"matrix": [3, 9], "x": 10, "y": 3.25},
+        {"matrix": [4, 10], "x": 11, "y": 3.75},
+        {"matrix": [1, 6], "x": 12, "y": 4},
+
+        {"matrix": [3, 5], "x": 4, "y": 4.75},
+        {"matrix": [2, 5], "x": 5, "y": 5},
+
+        {"matrix": [2, 6], "x": 7, "y": 5},
+        {"matrix": [3, 6], "x": 8, "y": 4.75}
+      ]
+    }
+  }
+}
diff --git a/keyboards/glenpickle/chimera_ls/info.json b/keyboards/glenpickle/chimera_ls/info.json
deleted file mode 100644
index b0d6a52912..0000000000
--- a/keyboards/glenpickle/chimera_ls/info.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-  "keyboard_name": "Chimera Lets Split",
-  "manufacturer": "Unknown",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x6060",
-    "device_version": "0.0.1"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "features": {
-    "bootmagic": false,
-    "mousekey": true,
-    "extrakey": true,
-    "console": true,
-    "command": true,
-    "nkro": true
-  },
-  "community_layouts": ["ortho_4x12"],
-  "layouts": {
-    "LAYOUT_ortho_4x12": {
-      "layout": [
-        {"matrix": [0, 8], "x": 0, "y": 0},
-        {"matrix": [4, 8], "x": 1, "y": 0},
-        {"matrix": [2, 9], "x": 2, "y": 0},
-        {"matrix": [4, 7], "x": 3, "y": 0},
-        {"matrix": [4, 6], "x": 4, "y": 0},
-        {"matrix": [4, 5], "x": 5, "y": 0},
-        {"matrix": [4, 0], "x": 7, "y": 0},
-        {"matrix": [4, 1], "x": 8, "y": 0},
-        {"matrix": [4, 2], "x": 9, "y": 0},
-        {"matrix": [2, 4], "x": 10, "y": 0},
-        {"matrix": [4, 3], "x": 11, "y": 0},
-        {"matrix": [0, 3], "x": 12, "y": 0},
-
-        {"matrix": [0, 9], "x": 0, "y": 1},
-        {"matrix": [1, 9], "x": 1, "y": 1},
-        {"matrix": [3, 7], "x": 2, "y": 1},
-        {"matrix": [3, 6], "x": 3, "y": 1},
-        {"matrix": [3, 5], "x": 4, "y": 1},
-        {"matrix": [3, 9], "x": 5, "y": 1},
-        {"matrix": [3, 4], "x": 7, "y": 1},
-        {"matrix": [3, 0], "x": 8, "y": 1},
-        {"matrix": [3, 1], "x": 9, "y": 1},
-        {"matrix": [3, 2], "x": 10, "y": 1},
-        {"matrix": [1, 4], "x": 11, "y": 1},
-        {"matrix": [0, 4], "x": 12, "y": 1},
-
-        {"matrix": [1, 8], "x": 0, "y": 2},
-        {"matrix": [0, 7], "x": 1, "y": 2},
-        {"matrix": [2, 7], "x": 2, "y": 2},
-        {"matrix": [2, 6], "x": 3, "y": 2},
-        {"matrix": [1, 5], "x": 4, "y": 2},
-        {"matrix": [2, 5], "x": 5, "y": 2},
-        {"matrix": [2, 0], "x": 7, "y": 2},
-        {"matrix": [1, 0], "x": 8, "y": 2},
-        {"matrix": [2, 1], "x": 9, "y": 2},
-        {"matrix": [2, 2], "x": 10, "y": 2},
-        {"matrix": [0, 2], "x": 11, "y": 2},
-        {"matrix": [1, 3], "x": 12, "y": 2},
-
-        {"matrix": [2, 8], "x": 0, "y": 3},
-        {"matrix": [1, 7], "x": 1, "y": 3},
-        {"matrix": [0, 6], "x": 2, "y": 3},
-        {"matrix": [1, 6], "x": 3, "y": 3},
-        {"matrix": [0, 5], "x": 4, "y": 3},
-        {"matrix": [3, 8], "x": 5, "y": 3},
-        {"matrix": [3, 3], "x": 7, "y": 3},
-        {"matrix": [0, 0], "x": 8, "y": 3},
-        {"matrix": [1, 1], "x": 9, "y": 3},
-        {"matrix": [0, 1], "x": 10, "y": 3},
-        {"matrix": [1, 2], "x": 11, "y": 3},
-        {"matrix": [2, 3], "x": 12, "y": 3}
-      ]
-    }
-  }
-}
diff --git a/keyboards/glenpickle/chimera_ls/keyboard.json b/keyboards/glenpickle/chimera_ls/keyboard.json
new file mode 100644
index 0000000000..b0d6a52912
--- /dev/null
+++ b/keyboards/glenpickle/chimera_ls/keyboard.json
@@ -0,0 +1,79 @@
+{
+  "keyboard_name": "Chimera Lets Split",
+  "manufacturer": "Unknown",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x6060",
+    "device_version": "0.0.1"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "console": true,
+    "command": true,
+    "nkro": true
+  },
+  "community_layouts": ["ortho_4x12"],
+  "layouts": {
+    "LAYOUT_ortho_4x12": {
+      "layout": [
+        {"matrix": [0, 8], "x": 0, "y": 0},
+        {"matrix": [4, 8], "x": 1, "y": 0},
+        {"matrix": [2, 9], "x": 2, "y": 0},
+        {"matrix": [4, 7], "x": 3, "y": 0},
+        {"matrix": [4, 6], "x": 4, "y": 0},
+        {"matrix": [4, 5], "x": 5, "y": 0},
+        {"matrix": [4, 0], "x": 7, "y": 0},
+        {"matrix": [4, 1], "x": 8, "y": 0},
+        {"matrix": [4, 2], "x": 9, "y": 0},
+        {"matrix": [2, 4], "x": 10, "y": 0},
+        {"matrix": [4, 3], "x": 11, "y": 0},
+        {"matrix": [0, 3], "x": 12, "y": 0},
+
+        {"matrix": [0, 9], "x": 0, "y": 1},
+        {"matrix": [1, 9], "x": 1, "y": 1},
+        {"matrix": [3, 7], "x": 2, "y": 1},
+        {"matrix": [3, 6], "x": 3, "y": 1},
+        {"matrix": [3, 5], "x": 4, "y": 1},
+        {"matrix": [3, 9], "x": 5, "y": 1},
+        {"matrix": [3, 4], "x": 7, "y": 1},
+        {"matrix": [3, 0], "x": 8, "y": 1},
+        {"matrix": [3, 1], "x": 9, "y": 1},
+        {"matrix": [3, 2], "x": 10, "y": 1},
+        {"matrix": [1, 4], "x": 11, "y": 1},
+        {"matrix": [0, 4], "x": 12, "y": 1},
+
+        {"matrix": [1, 8], "x": 0, "y": 2},
+        {"matrix": [0, 7], "x": 1, "y": 2},
+        {"matrix": [2, 7], "x": 2, "y": 2},
+        {"matrix": [2, 6], "x": 3, "y": 2},
+        {"matrix": [1, 5], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 0], "x": 7, "y": 2},
+        {"matrix": [1, 0], "x": 8, "y": 2},
+        {"matrix": [2, 1], "x": 9, "y": 2},
+        {"matrix": [2, 2], "x": 10, "y": 2},
+        {"matrix": [0, 2], "x": 11, "y": 2},
+        {"matrix": [1, 3], "x": 12, "y": 2},
+
+        {"matrix": [2, 8], "x": 0, "y": 3},
+        {"matrix": [1, 7], "x": 1, "y": 3},
+        {"matrix": [0, 6], "x": 2, "y": 3},
+        {"matrix": [1, 6], "x": 3, "y": 3},
+        {"matrix": [0, 5], "x": 4, "y": 3},
+        {"matrix": [3, 8], "x": 5, "y": 3},
+        {"matrix": [3, 3], "x": 7, "y": 3},
+        {"matrix": [0, 0], "x": 8, "y": 3},
+        {"matrix": [1, 1], "x": 9, "y": 3},
+        {"matrix": [0, 1], "x": 10, "y": 3},
+        {"matrix": [1, 2], "x": 11, "y": 3},
+        {"matrix": [2, 3], "x": 12, "y": 3}
+      ]
+    }
+  }
+}
diff --git a/keyboards/glenpickle/chimera_ortho/info.json b/keyboards/glenpickle/chimera_ortho/info.json
deleted file mode 100644
index b62616ce68..0000000000
--- a/keyboards/glenpickle/chimera_ortho/info.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-  "keyboard_name": "Chimera Ortho",
-  "manufacturer": "Unknown",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x6060",
-    "device_version": "0.0.1"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "features": {
-    "bootmagic": false,
-    "mousekey": true,
-    "extrakey": true,
-    "console": true,
-    "command": true,
-    "nkro": true
-  },
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [4, 3], "x": 0, "y": 0},
-        {"matrix": [0, 0], "x": 1, "y": 0},
-        {"matrix": [0, 1], "x": 2, "y": 0},
-        {"matrix": [0, 2], "x": 3, "y": 0},
-        {"matrix": [0, 3], "x": 4, "y": 0},
-        {"matrix": [0, 4], "x": 5, "y": 0},
-        {"matrix": [3, 1], "x": 6, "y": 0},
-
-        {"matrix": [3, 8], "x": 8.5, "y": 0},
-        {"matrix": [0, 5], "x": 9.5, "y": 0},
-        {"matrix": [0, 6], "x": 10.5, "y": 0},
-        {"matrix": [0, 7], "x": 11.5, "y": 0},
-        {"matrix": [0, 8], "x": 12.5, "y": 0},
-        {"matrix": [0, 9], "x": 13.5, "y": 0},
-        {"matrix": [4, 6], "x": 14.5, "y": 0},
-
-        {"matrix": [4, 2], "x": 0, "y": 1},
-        {"matrix": [1, 0], "x": 1, "y": 1},
-        {"matrix": [1, 1], "x": 2, "y": 1},
-        {"matrix": [1, 2], "x": 3, "y": 1},
-        {"matrix": [1, 3], "x": 4, "y": 1},
-        {"matrix": [1, 4], "x": 5, "y": 1},
-        {"matrix": [3, 2], "x": 6, "y": 1},
-
-        {"matrix": [3, 7], "x": 8.5, "y": 1},
-        {"matrix": [1, 5], "x": 9.5, "y": 1},
-        {"matrix": [1, 6], "x": 10.5, "y": 1},
-        {"matrix": [1, 7], "x": 11.5, "y": 1},
-        {"matrix": [1, 8], "x": 12.5, "y": 1},
-        {"matrix": [1, 9], "x": 13.5, "y": 1},
-        {"matrix": [4, 7], "x": 14.5, "y": 1},
-
-        {"matrix": [4, 1], "x": 0, "y": 2},
-        {"matrix": [2, 0], "x": 1, "y": 2},
-        {"matrix": [2, 1], "x": 2, "y": 2},
-        {"matrix": [2, 2], "x": 3, "y": 2},
-        {"matrix": [2, 3], "x": 4, "y": 2},
-        {"matrix": [2, 4], "x": 5, "y": 2},
-        {"matrix": [3, 3], "x": 6, "y": 2},
-
-        {"matrix": [3, 6], "x": 8.5, "y": 2},
-        {"matrix": [2, 5], "x": 9.5, "y": 2},
-        {"matrix": [2, 6], "x": 10.5, "y": 2},
-        {"matrix": [2, 7], "x": 11.5, "y": 2},
-        {"matrix": [2, 8], "x": 12.5, "y": 2},
-        {"matrix": [2, 9], "x": 13.5, "y": 2},
-        {"matrix": [4, 8], "x": 14.5, "y": 2},
-
-        {"matrix": [4, 4], "x": 4, "y": 3.25},
-        {"matrix": [3, 4], "x": 5, "y": 3.25},
-
-        {"matrix": [3, 5], "x": 9.5, "y": 3.25},
-        {"matrix": [4, 5], "x": 10.5, "y": 3.25}
-      ]
-    }
-  }
-}
diff --git a/keyboards/glenpickle/chimera_ortho/keyboard.json b/keyboards/glenpickle/chimera_ortho/keyboard.json
new file mode 100644
index 0000000000..b62616ce68
--- /dev/null
+++ b/keyboards/glenpickle/chimera_ortho/keyboard.json
@@ -0,0 +1,79 @@
+{
+  "keyboard_name": "Chimera Ortho",
+  "manufacturer": "Unknown",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x6060",
+    "device_version": "0.0.1"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "console": true,
+    "command": true,
+    "nkro": true
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [4, 3], "x": 0, "y": 0},
+        {"matrix": [0, 0], "x": 1, "y": 0},
+        {"matrix": [0, 1], "x": 2, "y": 0},
+        {"matrix": [0, 2], "x": 3, "y": 0},
+        {"matrix": [0, 3], "x": 4, "y": 0},
+        {"matrix": [0, 4], "x": 5, "y": 0},
+        {"matrix": [3, 1], "x": 6, "y": 0},
+
+        {"matrix": [3, 8], "x": 8.5, "y": 0},
+        {"matrix": [0, 5], "x": 9.5, "y": 0},
+        {"matrix": [0, 6], "x": 10.5, "y": 0},
+        {"matrix": [0, 7], "x": 11.5, "y": 0},
+        {"matrix": [0, 8], "x": 12.5, "y": 0},
+        {"matrix": [0, 9], "x": 13.5, "y": 0},
+        {"matrix": [4, 6], "x": 14.5, "y": 0},
+
+        {"matrix": [4, 2], "x": 0, "y": 1},
+        {"matrix": [1, 0], "x": 1, "y": 1},
+        {"matrix": [1, 1], "x": 2, "y": 1},
+        {"matrix": [1, 2], "x": 3, "y": 1},
+        {"matrix": [1, 3], "x": 4, "y": 1},
+        {"matrix": [1, 4], "x": 5, "y": 1},
+        {"matrix": [3, 2], "x": 6, "y": 1},
+
+        {"matrix": [3, 7], "x": 8.5, "y": 1},
+        {"matrix": [1, 5], "x": 9.5, "y": 1},
+        {"matrix": [1, 6], "x": 10.5, "y": 1},
+        {"matrix": [1, 7], "x": 11.5, "y": 1},
+        {"matrix": [1, 8], "x": 12.5, "y": 1},
+        {"matrix": [1, 9], "x": 13.5, "y": 1},
+        {"matrix": [4, 7], "x": 14.5, "y": 1},
+
+        {"matrix": [4, 1], "x": 0, "y": 2},
+        {"matrix": [2, 0], "x": 1, "y": 2},
+        {"matrix": [2, 1], "x": 2, "y": 2},
+        {"matrix": [2, 2], "x": 3, "y": 2},
+        {"matrix": [2, 3], "x": 4, "y": 2},
+        {"matrix": [2, 4], "x": 5, "y": 2},
+        {"matrix": [3, 3], "x": 6, "y": 2},
+
+        {"matrix": [3, 6], "x": 8.5, "y": 2},
+        {"matrix": [2, 5], "x": 9.5, "y": 2},
+        {"matrix": [2, 6], "x": 10.5, "y": 2},
+        {"matrix": [2, 7], "x": 11.5, "y": 2},
+        {"matrix": [2, 8], "x": 12.5, "y": 2},
+        {"matrix": [2, 9], "x": 13.5, "y": 2},
+        {"matrix": [4, 8], "x": 14.5, "y": 2},
+
+        {"matrix": [4, 4], "x": 4, "y": 3.25},
+        {"matrix": [3, 4], "x": 5, "y": 3.25},
+
+        {"matrix": [3, 5], "x": 9.5, "y": 3.25},
+        {"matrix": [4, 5], "x": 10.5, "y": 3.25}
+      ]
+    }
+  }
+}
diff --git a/keyboards/glenpickle/chimera_ortho_plus/info.json b/keyboards/glenpickle/chimera_ortho_plus/info.json
deleted file mode 100644
index bf0ae44548..0000000000
--- a/keyboards/glenpickle/chimera_ortho_plus/info.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-  "keyboard_name": "Chimera Ortho Plus",
-  "manufacturer": "Unknown",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0xDE1D",
-    "device_version": "0.0.1"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "features": {
-    "bootmagic": false,
-    "mousekey": true,
-    "extrakey": true,
-    "console": true,
-    "command": true,
-    "nkro": true,
-    "unicode": true
-  },
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [1, 0], "x": 0, "y": 0},
-        {"matrix": [0, 5], "x": 1, "y": 0},
-        {"matrix": [2, 2], "x": 2, "y": 0},
-        {"matrix": [0, 0], "x": 3, "y": 0},
-        {"matrix": [3, 3], "x": 4, "y": 0},
-        {"matrix": [3, 4], "x": 5, "y": 0},
-
-        {"matrix": [3, 7], "x": 7.5, "y": 0},
-        {"matrix": [3, 8], "x": 8.5, "y": 0},
-        {"matrix": [0, 10], "x": 9.5, "y": 0},
-        {"matrix": [2, 9], "x": 10.5, "y": 0},
-        {"matrix": [0, 11], "x": 11.5, "y": 0},
-        {"matrix": [1, 11], "x": 12.5, "y": 0},
-
-        {"matrix": [2, 0], "x": 0, "y": 1},
-        {"matrix": [3, 1], "x": 1, "y": 1},
-        {"matrix": [1, 2], "x": 2, "y": 1},
-        {"matrix": [0, 3], "x": 3, "y": 1},
-        {"matrix": [1, 4], "x": 4, "y": 1},
-        {"matrix": [2, 4], "x": 5, "y": 1},
-
-        {"matrix": [2, 7], "x": 7.5, "y": 1},
-        {"matrix": [1, 7], "x": 8.5, "y": 1},
-        {"matrix": [0, 8], "x": 9.5, "y": 1},
-        {"matrix": [1, 9], "x": 10.5, "y": 1},
-        {"matrix": [3, 10], "x": 11.5, "y": 1},
-        {"matrix": [2, 11], "x": 12.5, "y": 1},
-
-        {"matrix": [3, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [0, 2], "x": 2, "y": 2},
-        {"matrix": [1, 3], "x": 3, "y": 2},
-        {"matrix": [0, 4], "x": 4, "y": 2},
-        {"matrix": [4, 0], "x": 5, "y": 2},
-
-        {"matrix": [4, 6], "x": 7.5, "y": 2},
-        {"matrix": [0, 7], "x": 8.5, "y": 2},
-        {"matrix": [1, 8], "x": 9.5, "y": 2},
-        {"matrix": [0, 9], "x": 10.5, "y": 2},
-        {"matrix": [2, 10], "x": 11.5, "y": 2},
-        {"matrix": [3, 11], "x": 12.5, "y": 2},
-
-        {"matrix": [1, 5], "x": 0, "y": 3},
-        {"matrix": [1, 1], "x": 1, "y": 3},
-        {"matrix": [3, 2], "x": 2, "y": 3},
-        {"matrix": [2, 3], "x": 3, "y": 3},
-        {"matrix": [0, 1], "x": 4, "y": 3},
-        {"matrix": [4, 1], "x": 5, "y": 3},
-
-        {"matrix": [0, 6], "x": 7.5, "y": 3},
-        {"matrix": [4, 7], "x": 8.5, "y": 3},
-        {"matrix": [2, 8], "x": 9.5, "y": 3},
-        {"matrix": [3, 9], "x": 10.5, "y": 3},
-        {"matrix": [1, 10], "x": 11.5, "y": 3},
-        {"matrix": [1, 6], "x": 12.5, "y": 3},
-
-        {"matrix": [3, 5], "x": 4, "y": 4},
-        {"matrix": [2, 5], "x": 5, "y": 4},
-
-        {"matrix": [2, 6], "x": 7.5, "y": 4},
-        {"matrix": [3, 6], "x": 8.5, "y": 4}
-      ]
-    }
-  }
-}
diff --git a/keyboards/glenpickle/chimera_ortho_plus/keyboard.json b/keyboards/glenpickle/chimera_ortho_plus/keyboard.json
new file mode 100644
index 0000000000..bf0ae44548
--- /dev/null
+++ b/keyboards/glenpickle/chimera_ortho_plus/keyboard.json
@@ -0,0 +1,88 @@
+{
+  "keyboard_name": "Chimera Ortho Plus",
+  "manufacturer": "Unknown",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0xDE1D",
+    "device_version": "0.0.1"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "console": true,
+    "command": true,
+    "nkro": true,
+    "unicode": true
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [1, 0], "x": 0, "y": 0},
+        {"matrix": [0, 5], "x": 1, "y": 0},
+        {"matrix": [2, 2], "x": 2, "y": 0},
+        {"matrix": [0, 0], "x": 3, "y": 0},
+        {"matrix": [3, 3], "x": 4, "y": 0},
+        {"matrix": [3, 4], "x": 5, "y": 0},
+
+        {"matrix": [3, 7], "x": 7.5, "y": 0},
+        {"matrix": [3, 8], "x": 8.5, "y": 0},
+        {"matrix": [0, 10], "x": 9.5, "y": 0},
+        {"matrix": [2, 9], "x": 10.5, "y": 0},
+        {"matrix": [0, 11], "x": 11.5, "y": 0},
+        {"matrix": [1, 11], "x": 12.5, "y": 0},
+
+        {"matrix": [2, 0], "x": 0, "y": 1},
+        {"matrix": [3, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [0, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [2, 4], "x": 5, "y": 1},
+
+        {"matrix": [2, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 7], "x": 8.5, "y": 1},
+        {"matrix": [0, 8], "x": 9.5, "y": 1},
+        {"matrix": [1, 9], "x": 10.5, "y": 1},
+        {"matrix": [3, 10], "x": 11.5, "y": 1},
+        {"matrix": [2, 11], "x": 12.5, "y": 1},
+
+        {"matrix": [3, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [0, 2], "x": 2, "y": 2},
+        {"matrix": [1, 3], "x": 3, "y": 2},
+        {"matrix": [0, 4], "x": 4, "y": 2},
+        {"matrix": [4, 0], "x": 5, "y": 2},
+
+        {"matrix": [4, 6], "x": 7.5, "y": 2},
+        {"matrix": [0, 7], "x": 8.5, "y": 2},
+        {"matrix": [1, 8], "x": 9.5, "y": 2},
+        {"matrix": [0, 9], "x": 10.5, "y": 2},
+        {"matrix": [2, 10], "x": 11.5, "y": 2},
+        {"matrix": [3, 11], "x": 12.5, "y": 2},
+
+        {"matrix": [1, 5], "x": 0, "y": 3},
+        {"matrix": [1, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [2, 3], "x": 3, "y": 3},
+        {"matrix": [0, 1], "x": 4, "y": 3},
+        {"matrix": [4, 1], "x": 5, "y": 3},
+
+        {"matrix": [0, 6], "x": 7.5, "y": 3},
+        {"matrix": [4, 7], "x": 8.5, "y": 3},
+        {"matrix": [2, 8], "x": 9.5, "y": 3},
+        {"matrix": [3, 9], "x": 10.5, "y": 3},
+        {"matrix": [1, 10], "x": 11.5, "y": 3},
+        {"matrix": [1, 6], "x": 12.5, "y": 3},
+
+        {"matrix": [3, 5], "x": 4, "y": 4},
+        {"matrix": [2, 5], "x": 5, "y": 4},
+
+        {"matrix": [2, 6], "x": 7.5, "y": 4},
+        {"matrix": [3, 6], "x": 8.5, "y": 4}
+      ]
+    }
+  }
+}
diff --git a/keyboards/gmmk/numpad/info.json b/keyboards/gmmk/numpad/info.json
deleted file mode 100644
index 70e2d3e679..0000000000
--- a/keyboards/gmmk/numpad/info.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-    "keyboard_name": "GMMK Numpad",
-    "manufacturer": "Glorious",
-    "url": "https://www.gloriousgaming.com/products/gmmk-numpad",
-    "maintainer": "GloriousThrall",
-    "usb": {
-        "vid": "0x320F",
-        "pid": "0x5088",
-        "device_version": "0.0.1",
-        "shared_endpoint": {
-            "keyboard": true
-        }
-    },
-    "eeprom": {
-        "driver": "wear_leveling",
-        "wear_leveling": {
-            "driver": "spi_flash",
-            "backing_size": 2048
-        }
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "A2", "pin_b": "A1"}
-        ]
-    },
-    "rgb_matrix": {
-        "animations": {
-            "alphas_mods": true,
-            "gradient_up_down": true,
-            "gradient_left_right": true,
-            "breathing": true,
-            "band_sat": true,
-            "band_val": true,
-            "band_pinwheel_sat": true,
-            "band_pinwheel_val": true,
-            "band_spiral_sat": true,
-            "band_spiral_val": true,
-            "cycle_all": true,
-            "cycle_left_right": true,
-            "cycle_up_down": true,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": true,
-            "cycle_pinwheel": true,
-            "cycle_spiral": true,
-            "dual_beacon": true,
-            "rainbow_beacon": true,
-            "rainbow_pinwheels": true,
-            "raindrops": true,
-            "jellybean_raindrops": true,
-            "hue_breathing": true,
-            "hue_pendulum": true,
-            "hue_wave": true,
-            "pixel_rain": true,
-            "pixel_flow": true,
-            "pixel_fractal": true,
-            "typing_heatmap": true,
-            "digital_rain": true,
-            "solid_reactive_simple": true,
-            "solid_reactive": true,
-            "solid_reactive_wide": true,
-            "solid_reactive_multiwide": true,
-            "solid_reactive_cross": true,
-            "solid_reactive_multicross": true,
-            "solid_reactive_nexus": true,
-            "solid_reactive_multinexus": true,
-            "splash": true,
-            "multisplash": true,
-            "solid_splash": true,
-            "solid_multisplash": true
-        },
-        "driver": "aw20216s"
-    },
-    "processor": "WB32F3G71",
-    "bootloader": "wb32-dfu",
-    "features": {
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true,
-        "nkro": true,
-        "rgb_matrix": true,
-        "encoder": true,
-        "midi": true
-    },
-    "build": {
-        "lto": true
-    },
-    "diode_direction": "ROW2COL",
-    "matrix_pins": {
-        "rows": ["A3", "A4", "A5", "A6", "A7"],
-        "cols": ["B7", "B1", "B10", "B11"]
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"label": "NUM", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "/", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "*", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "-", "matrix": [0, 3], "x": 3, "y": 0},
-
-                {"label": "7", "matrix": [1, 0], "x": 0, "y": 1},
-                {"label": "8", "matrix": [1, 1], "x": 1, "y": 1},
-                {"label": "9", "matrix": [1, 2], "x": 2, "y": 1},
-                {"label": "+", "matrix": [1, 3], "x": 3, "y": 1, "h": 2},
-
-                {"label": "4", "matrix": [2, 0], "x": 0, "y": 2},
-                {"label": "5", "matrix": [2, 1], "x": 1, "y": 2},
-                {"label": "6", "matrix": [2, 2], "x": 2, "y": 2},
-                {"label": "CALC", "matrix": [2, 3], "x": 4.25, "y": 0},
-
-                {"label": "1", "matrix": [3, 0], "x": 0, "y": 3},
-                {"label": "2", "matrix": [3, 1], "x": 1, "y": 3},
-                {"label": "3", "matrix": [3, 2], "x": 2, "y": 3},
-                {"label": "RET", "matrix": [3, 3], "x": 3, "y": 3, "h": 2},
-
-                {"label": "0", "matrix": [4, 0], "x": 0, "y": 4, "w": 2},
-                {"label": ".", "matrix": [4, 3], "x": 2, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/gmmk/numpad/keyboard.json b/keyboards/gmmk/numpad/keyboard.json
new file mode 100644
index 0000000000..70e2d3e679
--- /dev/null
+++ b/keyboards/gmmk/numpad/keyboard.json
@@ -0,0 +1,121 @@
+{
+    "keyboard_name": "GMMK Numpad",
+    "manufacturer": "Glorious",
+    "url": "https://www.gloriousgaming.com/products/gmmk-numpad",
+    "maintainer": "GloriousThrall",
+    "usb": {
+        "vid": "0x320F",
+        "pid": "0x5088",
+        "device_version": "0.0.1",
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "eeprom": {
+        "driver": "wear_leveling",
+        "wear_leveling": {
+            "driver": "spi_flash",
+            "backing_size": 2048
+        }
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A2", "pin_b": "A1"}
+        ]
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "aw20216s"
+    },
+    "processor": "WB32F3G71",
+    "bootloader": "wb32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "encoder": true,
+        "midi": true
+    },
+    "build": {
+        "lto": true
+    },
+    "diode_direction": "ROW2COL",
+    "matrix_pins": {
+        "rows": ["A3", "A4", "A5", "A6", "A7"],
+        "cols": ["B7", "B1", "B10", "B11"]
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "NUM", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "/", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "*", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "-", "matrix": [0, 3], "x": 3, "y": 0},
+
+                {"label": "7", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "8", "matrix": [1, 1], "x": 1, "y": 1},
+                {"label": "9", "matrix": [1, 2], "x": 2, "y": 1},
+                {"label": "+", "matrix": [1, 3], "x": 3, "y": 1, "h": 2},
+
+                {"label": "4", "matrix": [2, 0], "x": 0, "y": 2},
+                {"label": "5", "matrix": [2, 1], "x": 1, "y": 2},
+                {"label": "6", "matrix": [2, 2], "x": 2, "y": 2},
+                {"label": "CALC", "matrix": [2, 3], "x": 4.25, "y": 0},
+
+                {"label": "1", "matrix": [3, 0], "x": 0, "y": 3},
+                {"label": "2", "matrix": [3, 1], "x": 1, "y": 3},
+                {"label": "3", "matrix": [3, 2], "x": 2, "y": 3},
+                {"label": "RET", "matrix": [3, 3], "x": 3, "y": 3, "h": 2},
+
+                {"label": "0", "matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+                {"label": ".", "matrix": [4, 3], "x": 2, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/gon/nerd60/info.json b/keyboards/gon/nerd60/info.json
deleted file mode 100644
index 33ad716b4f..0000000000
--- a/keyboards/gon/nerd60/info.json
+++ /dev/null
@@ -1,388 +0,0 @@
-{
-    "keyboard_name": "NerD 60",
-    "manufacturer": "GON",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x4E45",
-        "pid": "0x3630",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["E6", "B0", "B1", "B2", "B3", "F0", "D0", "D5"],
-        "rows": ["B4", "E2", "F4", "F7", "F1", "F6", "C6", "F5", "D7", "C7"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "B7"
-    },
-    "bootmagic": {
-        "matrix": [8, 0]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "features": {
-        "bootmagic": false,
-        "mousekey": true,
-        "extrakey": true,
-        "command": true,
-        "nkro": true
-    },
-    "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_iso", "60_iso_split_bs_rshift"],
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [8, 0], "x": 0, "y": 0},
-                {"matrix": [1, 0], "x": 1, "y": 0},
-                {"matrix": [0, 1], "x": 2, "y": 0},
-                {"matrix": [1, 1], "x": 3, "y": 0},
-                {"matrix": [0, 2], "x": 4, "y": 0},
-                {"matrix": [1, 2], "x": 5, "y": 0},
-                {"matrix": [0, 3], "x": 6, "y": 0},
-                {"matrix": [1, 3], "x": 7, "y": 0},
-                {"matrix": [0, 4], "x": 8, "y": 0},
-                {"matrix": [1, 4], "x": 9, "y": 0},
-                {"matrix": [0, 5], "x": 10, "y": 0},
-                {"matrix": [1, 5], "x": 11, "y": 0},
-                {"matrix": [0, 6], "x": 12, "y": 0},
-                {"matrix": [1, 7], "x": 13, "y": 0},
-                {"matrix": [1, 6], "x": 14, "y": 0},
-
-                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [3, 0], "x": 1.5, "y": 1},
-                {"matrix": [2, 1], "x": 2.5, "y": 1},
-                {"matrix": [3, 1], "x": 3.5, "y": 1},
-                {"matrix": [2, 2], "x": 4.5, "y": 1},
-                {"matrix": [3, 2], "x": 5.5, "y": 1},
-                {"matrix": [2, 3], "x": 6.5, "y": 1},
-                {"matrix": [3, 3], "x": 7.5, "y": 1},
-                {"matrix": [2, 4], "x": 8.5, "y": 1},
-                {"matrix": [3, 4], "x": 9.5, "y": 1},
-                {"matrix": [2, 5], "x": 10.5, "y": 1},
-                {"matrix": [3, 5], "x": 11.5, "y": 1},
-                {"matrix": [2, 6], "x": 12.5, "y": 1},
-                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [4, 1], "x": 1.75, "y": 2},
-                {"matrix": [5, 1], "x": 2.75, "y": 2},
-                {"matrix": [4, 2], "x": 3.75, "y": 2},
-                {"matrix": [5, 2], "x": 4.75, "y": 2},
-                {"matrix": [4, 3], "x": 5.75, "y": 2},
-                {"matrix": [5, 3], "x": 6.75, "y": 2},
-                {"matrix": [4, 4], "x": 7.75, "y": 2},
-                {"matrix": [5, 4], "x": 8.75, "y": 2},
-                {"matrix": [4, 5], "x": 9.75, "y": 2},
-                {"matrix": [5, 5], "x": 10.75, "y": 2},
-                {"matrix": [4, 6], "x": 11.75, "y": 2},
-                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [7, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [9, 7], "x": 1.25, "y": 3},
-                {"matrix": [6, 1], "x": 2.25, "y": 3},
-                {"matrix": [7, 1], "x": 3.25, "y": 3},
-                {"matrix": [6, 2], "x": 4.25, "y": 3},
-                {"matrix": [7, 2], "x": 5.25, "y": 3},
-                {"matrix": [6, 3], "x": 6.25, "y": 3},
-                {"matrix": [7, 3], "x": 7.25, "y": 3},
-                {"matrix": [6, 4], "x": 8.25, "y": 3},
-                {"matrix": [7, 4], "x": 9.25, "y": 3},
-                {"matrix": [6, 5], "x": 10.25, "y": 3},
-                {"matrix": [7, 5], "x": 11.25, "y": 3},
-                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [7, 6], "x": 14, "y": 3},
-
-                {"matrix": [6, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [5, 0], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [8, 7], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [0, 7], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [2, 7], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [3, 7], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [5, 7], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi": {
-            "layout": [
-                {"matrix": [8, 0], "x": 0, "y": 0},
-                {"matrix": [1, 0], "x": 1, "y": 0},
-                {"matrix": [0, 1], "x": 2, "y": 0},
-                {"matrix": [1, 1], "x": 3, "y": 0},
-                {"matrix": [0, 2], "x": 4, "y": 0},
-                {"matrix": [1, 2], "x": 5, "y": 0},
-                {"matrix": [0, 3], "x": 6, "y": 0},
-                {"matrix": [1, 3], "x": 7, "y": 0},
-                {"matrix": [0, 4], "x": 8, "y": 0},
-                {"matrix": [1, 4], "x": 9, "y": 0},
-                {"matrix": [0, 5], "x": 10, "y": 0},
-                {"matrix": [1, 5], "x": 11, "y": 0},
-                {"matrix": [0, 6], "x": 12, "y": 0},
-                {"matrix": [1, 6], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [3, 0], "x": 1.5, "y": 1},
-                {"matrix": [2, 1], "x": 2.5, "y": 1},
-                {"matrix": [3, 1], "x": 3.5, "y": 1},
-                {"matrix": [2, 2], "x": 4.5, "y": 1},
-                {"matrix": [3, 2], "x": 5.5, "y": 1},
-                {"matrix": [2, 3], "x": 6.5, "y": 1},
-                {"matrix": [3, 3], "x": 7.5, "y": 1},
-                {"matrix": [2, 4], "x": 8.5, "y": 1},
-                {"matrix": [3, 4], "x": 9.5, "y": 1},
-                {"matrix": [2, 5], "x": 10.5, "y": 1},
-                {"matrix": [3, 5], "x": 11.5, "y": 1},
-                {"matrix": [2, 6], "x": 12.5, "y": 1},
-                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [4, 1], "x": 1.75, "y": 2},
-                {"matrix": [5, 1], "x": 2.75, "y": 2},
-                {"matrix": [4, 2], "x": 3.75, "y": 2},
-                {"matrix": [5, 2], "x": 4.75, "y": 2},
-                {"matrix": [4, 3], "x": 5.75, "y": 2},
-                {"matrix": [5, 3], "x": 6.75, "y": 2},
-                {"matrix": [4, 4], "x": 7.75, "y": 2},
-                {"matrix": [5, 4], "x": 8.75, "y": 2},
-                {"matrix": [4, 5], "x": 9.75, "y": 2},
-                {"matrix": [5, 5], "x": 10.75, "y": 2},
-                {"matrix": [4, 6], "x": 11.75, "y": 2},
-                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [7, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [6, 1], "x": 2.25, "y": 3},
-                {"matrix": [7, 1], "x": 3.25, "y": 3},
-                {"matrix": [6, 2], "x": 4.25, "y": 3},
-                {"matrix": [7, 2], "x": 5.25, "y": 3},
-                {"matrix": [6, 3], "x": 6.25, "y": 3},
-                {"matrix": [7, 3], "x": 7.25, "y": 3},
-                {"matrix": [6, 4], "x": 8.25, "y": 3},
-                {"matrix": [7, 4], "x": 9.25, "y": 3},
-                {"matrix": [6, 5], "x": 10.25, "y": 3},
-                {"matrix": [7, 5], "x": 11.25, "y": 3},
-                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [6, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [5, 0], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [8, 7], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [0, 7], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [2, 7], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [3, 7], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [5, 7], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi_split_bs_rshift": {
-            "layout": [
-                {"matrix": [8, 0], "x": 0, "y": 0},
-                {"matrix": [1, 0], "x": 1, "y": 0},
-                {"matrix": [0, 1], "x": 2, "y": 0},
-                {"matrix": [1, 1], "x": 3, "y": 0},
-                {"matrix": [0, 2], "x": 4, "y": 0},
-                {"matrix": [1, 2], "x": 5, "y": 0},
-                {"matrix": [0, 3], "x": 6, "y": 0},
-                {"matrix": [1, 3], "x": 7, "y": 0},
-                {"matrix": [0, 4], "x": 8, "y": 0},
-                {"matrix": [1, 4], "x": 9, "y": 0},
-                {"matrix": [0, 5], "x": 10, "y": 0},
-                {"matrix": [1, 5], "x": 11, "y": 0},
-                {"matrix": [0, 6], "x": 12, "y": 0},
-                {"matrix": [1, 7], "x": 13, "y": 0},
-                {"matrix": [1, 6], "x": 14, "y": 0},
-
-                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [3, 0], "x": 1.5, "y": 1},
-                {"matrix": [2, 1], "x": 2.5, "y": 1},
-                {"matrix": [3, 1], "x": 3.5, "y": 1},
-                {"matrix": [2, 2], "x": 4.5, "y": 1},
-                {"matrix": [3, 2], "x": 5.5, "y": 1},
-                {"matrix": [2, 3], "x": 6.5, "y": 1},
-                {"matrix": [3, 3], "x": 7.5, "y": 1},
-                {"matrix": [2, 4], "x": 8.5, "y": 1},
-                {"matrix": [3, 4], "x": 9.5, "y": 1},
-                {"matrix": [2, 5], "x": 10.5, "y": 1},
-                {"matrix": [3, 5], "x": 11.5, "y": 1},
-                {"matrix": [2, 6], "x": 12.5, "y": 1},
-                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [4, 1], "x": 1.75, "y": 2},
-                {"matrix": [5, 1], "x": 2.75, "y": 2},
-                {"matrix": [4, 2], "x": 3.75, "y": 2},
-                {"matrix": [5, 2], "x": 4.75, "y": 2},
-                {"matrix": [4, 3], "x": 5.75, "y": 2},
-                {"matrix": [5, 3], "x": 6.75, "y": 2},
-                {"matrix": [4, 4], "x": 7.75, "y": 2},
-                {"matrix": [5, 4], "x": 8.75, "y": 2},
-                {"matrix": [4, 5], "x": 9.75, "y": 2},
-                {"matrix": [5, 5], "x": 10.75, "y": 2},
-                {"matrix": [4, 6], "x": 11.75, "y": 2},
-                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [7, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [6, 1], "x": 2.25, "y": 3},
-                {"matrix": [7, 1], "x": 3.25, "y": 3},
-                {"matrix": [6, 2], "x": 4.25, "y": 3},
-                {"matrix": [7, 2], "x": 5.25, "y": 3},
-                {"matrix": [6, 3], "x": 6.25, "y": 3},
-                {"matrix": [7, 3], "x": 7.25, "y": 3},
-                {"matrix": [6, 4], "x": 8.25, "y": 3},
-                {"matrix": [7, 4], "x": 9.25, "y": 3},
-                {"matrix": [6, 5], "x": 10.25, "y": 3},
-                {"matrix": [7, 5], "x": 11.25, "y": 3},
-                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [7, 6], "x": 14, "y": 3},
-
-                {"matrix": [6, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [5, 0], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [8, 7], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [0, 7], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [2, 7], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [3, 7], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [5, 7], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_iso": {
-            "layout": [
-                {"matrix": [8, 0], "x": 0, "y": 0},
-                {"matrix": [1, 0], "x": 1, "y": 0},
-                {"matrix": [0, 1], "x": 2, "y": 0},
-                {"matrix": [1, 1], "x": 3, "y": 0},
-                {"matrix": [0, 2], "x": 4, "y": 0},
-                {"matrix": [1, 2], "x": 5, "y": 0},
-                {"matrix": [0, 3], "x": 6, "y": 0},
-                {"matrix": [1, 3], "x": 7, "y": 0},
-                {"matrix": [0, 4], "x": 8, "y": 0},
-                {"matrix": [1, 4], "x": 9, "y": 0},
-                {"matrix": [0, 5], "x": 10, "y": 0},
-                {"matrix": [1, 5], "x": 11, "y": 0},
-                {"matrix": [0, 6], "x": 12, "y": 0},
-                {"matrix": [1, 6], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [3, 0], "x": 1.5, "y": 1},
-                {"matrix": [2, 1], "x": 2.5, "y": 1},
-                {"matrix": [3, 1], "x": 3.5, "y": 1},
-                {"matrix": [2, 2], "x": 4.5, "y": 1},
-                {"matrix": [3, 2], "x": 5.5, "y": 1},
-                {"matrix": [2, 3], "x": 6.5, "y": 1},
-                {"matrix": [3, 3], "x": 7.5, "y": 1},
-                {"matrix": [2, 4], "x": 8.5, "y": 1},
-                {"matrix": [3, 4], "x": 9.5, "y": 1},
-                {"matrix": [2, 5], "x": 10.5, "y": 1},
-                {"matrix": [3, 5], "x": 11.5, "y": 1},
-                {"matrix": [2, 6], "x": 12.5, "y": 1},
-
-                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [4, 1], "x": 1.75, "y": 2},
-                {"matrix": [5, 1], "x": 2.75, "y": 2},
-                {"matrix": [4, 2], "x": 3.75, "y": 2},
-                {"matrix": [5, 2], "x": 4.75, "y": 2},
-                {"matrix": [4, 3], "x": 5.75, "y": 2},
-                {"matrix": [5, 3], "x": 6.75, "y": 2},
-                {"matrix": [4, 4], "x": 7.75, "y": 2},
-                {"matrix": [5, 4], "x": 8.75, "y": 2},
-                {"matrix": [4, 5], "x": 9.75, "y": 2},
-                {"matrix": [5, 5], "x": 10.75, "y": 2},
-                {"matrix": [4, 6], "x": 11.75, "y": 2},
-                {"matrix": [3, 6], "x": 12.75, "y": 2},
-                {"matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [7, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [9, 7], "x": 1.25, "y": 3},
-                {"matrix": [6, 1], "x": 2.25, "y": 3},
-                {"matrix": [7, 1], "x": 3.25, "y": 3},
-                {"matrix": [6, 2], "x": 4.25, "y": 3},
-                {"matrix": [7, 2], "x": 5.25, "y": 3},
-                {"matrix": [6, 3], "x": 6.25, "y": 3},
-                {"matrix": [7, 3], "x": 7.25, "y": 3},
-                {"matrix": [6, 4], "x": 8.25, "y": 3},
-                {"matrix": [7, 4], "x": 9.25, "y": 3},
-                {"matrix": [6, 5], "x": 10.25, "y": 3},
-                {"matrix": [7, 5], "x": 11.25, "y": 3},
-                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [6, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [5, 0], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [8, 7], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [0, 7], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [2, 7], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [3, 7], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [5, 7], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_iso_split_bs_rshift": {
-            "layout": [
-                {"matrix": [8, 0], "x": 0, "y": 0},
-                {"matrix": [1, 0], "x": 1, "y": 0},
-                {"matrix": [0, 1], "x": 2, "y": 0},
-                {"matrix": [1, 1], "x": 3, "y": 0},
-                {"matrix": [0, 2], "x": 4, "y": 0},
-                {"matrix": [1, 2], "x": 5, "y": 0},
-                {"matrix": [0, 3], "x": 6, "y": 0},
-                {"matrix": [1, 3], "x": 7, "y": 0},
-                {"matrix": [0, 4], "x": 8, "y": 0},
-                {"matrix": [1, 4], "x": 9, "y": 0},
-                {"matrix": [0, 5], "x": 10, "y": 0},
-                {"matrix": [1, 5], "x": 11, "y": 0},
-                {"matrix": [0, 6], "x": 12, "y": 0},
-                {"matrix": [1, 7], "x": 13, "y": 0},
-                {"matrix": [1, 6], "x": 14, "y": 0},
-
-                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [3, 0], "x": 1.5, "y": 1},
-                {"matrix": [2, 1], "x": 2.5, "y": 1},
-                {"matrix": [3, 1], "x": 3.5, "y": 1},
-                {"matrix": [2, 2], "x": 4.5, "y": 1},
-                {"matrix": [3, 2], "x": 5.5, "y": 1},
-                {"matrix": [2, 3], "x": 6.5, "y": 1},
-                {"matrix": [3, 3], "x": 7.5, "y": 1},
-                {"matrix": [2, 4], "x": 8.5, "y": 1},
-                {"matrix": [3, 4], "x": 9.5, "y": 1},
-                {"matrix": [2, 5], "x": 10.5, "y": 1},
-                {"matrix": [3, 5], "x": 11.5, "y": 1},
-                {"matrix": [2, 6], "x": 12.5, "y": 1},
-
-                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [4, 1], "x": 1.75, "y": 2},
-                {"matrix": [5, 1], "x": 2.75, "y": 2},
-                {"matrix": [4, 2], "x": 3.75, "y": 2},
-                {"matrix": [5, 2], "x": 4.75, "y": 2},
-                {"matrix": [4, 3], "x": 5.75, "y": 2},
-                {"matrix": [5, 3], "x": 6.75, "y": 2},
-                {"matrix": [4, 4], "x": 7.75, "y": 2},
-                {"matrix": [5, 4], "x": 8.75, "y": 2},
-                {"matrix": [4, 5], "x": 9.75, "y": 2},
-                {"matrix": [5, 5], "x": 10.75, "y": 2},
-                {"matrix": [4, 6], "x": 11.75, "y": 2},
-                {"matrix": [3, 6], "x": 12.75, "y": 2},
-                {"matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [7, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [9, 7], "x": 1.25, "y": 3},
-                {"matrix": [6, 1], "x": 2.25, "y": 3},
-                {"matrix": [7, 1], "x": 3.25, "y": 3},
-                {"matrix": [6, 2], "x": 4.25, "y": 3},
-                {"matrix": [7, 2], "x": 5.25, "y": 3},
-                {"matrix": [6, 3], "x": 6.25, "y": 3},
-                {"matrix": [7, 3], "x": 7.25, "y": 3},
-                {"matrix": [6, 4], "x": 8.25, "y": 3},
-                {"matrix": [7, 4], "x": 9.25, "y": 3},
-                {"matrix": [6, 5], "x": 10.25, "y": 3},
-                {"matrix": [7, 5], "x": 11.25, "y": 3},
-                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [7, 6], "x": 14, "y": 3},
-
-                {"matrix": [6, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [5, 0], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [8, 7], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [0, 7], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [2, 7], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [3, 7], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [5, 7], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/gon/nerd60/keyboard.json b/keyboards/gon/nerd60/keyboard.json
new file mode 100644
index 0000000000..33ad716b4f
--- /dev/null
+++ b/keyboards/gon/nerd60/keyboard.json
@@ -0,0 +1,388 @@
+{
+    "keyboard_name": "NerD 60",
+    "manufacturer": "GON",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4E45",
+        "pid": "0x3630",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["E6", "B0", "B1", "B2", "B3", "F0", "D0", "D5"],
+        "rows": ["B4", "E2", "F4", "F7", "F1", "F6", "C6", "F5", "D7", "C7"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B7"
+    },
+    "bootmagic": {
+        "matrix": [8, 0]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true
+    },
+    "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_iso", "60_iso_split_bs_rshift"],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [8, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 7], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [4, 1], "x": 1.75, "y": 2},
+                {"matrix": [5, 1], "x": 2.75, "y": 2},
+                {"matrix": [4, 2], "x": 3.75, "y": 2},
+                {"matrix": [5, 2], "x": 4.75, "y": 2},
+                {"matrix": [4, 3], "x": 5.75, "y": 2},
+                {"matrix": [5, 3], "x": 6.75, "y": 2},
+                {"matrix": [4, 4], "x": 7.75, "y": 2},
+                {"matrix": [5, 4], "x": 8.75, "y": 2},
+                {"matrix": [4, 5], "x": 9.75, "y": 2},
+                {"matrix": [5, 5], "x": 10.75, "y": 2},
+                {"matrix": [4, 6], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [7, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [9, 7], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
+
+                {"matrix": [6, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [5, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [0, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [2, 7], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [3, 7], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"matrix": [8, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [4, 1], "x": 1.75, "y": 2},
+                {"matrix": [5, 1], "x": 2.75, "y": 2},
+                {"matrix": [4, 2], "x": 3.75, "y": 2},
+                {"matrix": [5, 2], "x": 4.75, "y": 2},
+                {"matrix": [4, 3], "x": 5.75, "y": 2},
+                {"matrix": [5, 3], "x": 6.75, "y": 2},
+                {"matrix": [4, 4], "x": 7.75, "y": 2},
+                {"matrix": [5, 4], "x": 8.75, "y": 2},
+                {"matrix": [4, 5], "x": 9.75, "y": 2},
+                {"matrix": [5, 5], "x": 10.75, "y": 2},
+                {"matrix": [4, 6], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [7, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [6, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [5, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [0, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [2, 7], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [3, 7], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "layout": [
+                {"matrix": [8, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 7], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [4, 1], "x": 1.75, "y": 2},
+                {"matrix": [5, 1], "x": 2.75, "y": 2},
+                {"matrix": [4, 2], "x": 3.75, "y": 2},
+                {"matrix": [5, 2], "x": 4.75, "y": 2},
+                {"matrix": [4, 3], "x": 5.75, "y": 2},
+                {"matrix": [5, 3], "x": 6.75, "y": 2},
+                {"matrix": [4, 4], "x": 7.75, "y": 2},
+                {"matrix": [5, 4], "x": 8.75, "y": 2},
+                {"matrix": [4, 5], "x": 9.75, "y": 2},
+                {"matrix": [5, 5], "x": 10.75, "y": 2},
+                {"matrix": [4, 6], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [7, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
+
+                {"matrix": [6, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [5, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [0, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [2, 7], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [3, 7], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                {"matrix": [8, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [4, 1], "x": 1.75, "y": 2},
+                {"matrix": [5, 1], "x": 2.75, "y": 2},
+                {"matrix": [4, 2], "x": 3.75, "y": 2},
+                {"matrix": [5, 2], "x": 4.75, "y": 2},
+                {"matrix": [4, 3], "x": 5.75, "y": 2},
+                {"matrix": [5, 3], "x": 6.75, "y": 2},
+                {"matrix": [4, 4], "x": 7.75, "y": 2},
+                {"matrix": [5, 4], "x": 8.75, "y": 2},
+                {"matrix": [4, 5], "x": 9.75, "y": 2},
+                {"matrix": [5, 5], "x": 10.75, "y": 2},
+                {"matrix": [4, 6], "x": 11.75, "y": 2},
+                {"matrix": [3, 6], "x": 12.75, "y": 2},
+                {"matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [7, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [9, 7], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [6, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [5, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [0, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [2, 7], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [3, 7], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_split_bs_rshift": {
+            "layout": [
+                {"matrix": [8, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 7], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [4, 1], "x": 1.75, "y": 2},
+                {"matrix": [5, 1], "x": 2.75, "y": 2},
+                {"matrix": [4, 2], "x": 3.75, "y": 2},
+                {"matrix": [5, 2], "x": 4.75, "y": 2},
+                {"matrix": [4, 3], "x": 5.75, "y": 2},
+                {"matrix": [5, 3], "x": 6.75, "y": 2},
+                {"matrix": [4, 4], "x": 7.75, "y": 2},
+                {"matrix": [5, 4], "x": 8.75, "y": 2},
+                {"matrix": [4, 5], "x": 9.75, "y": 2},
+                {"matrix": [5, 5], "x": 10.75, "y": 2},
+                {"matrix": [4, 6], "x": 11.75, "y": 2},
+                {"matrix": [3, 6], "x": 12.75, "y": 2},
+                {"matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [7, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [9, 7], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
+
+                {"matrix": [6, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [5, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [0, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [2, 7], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [3, 7], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/gon/nerdtkl/info.json b/keyboards/gon/nerdtkl/info.json
deleted file mode 100644
index 301cbaf19f..0000000000
--- a/keyboards/gon/nerdtkl/info.json
+++ /dev/null
@@ -1,140 +0,0 @@
-{
-    "keyboard_name": "NerD TKL",
-    "manufacturer": "GON",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x4E45",
-        "pid": "0x5244",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["E6", "B0", "B1", "B2", "B3", "F0", "D0", "D5", "D1"],
-        "rows": ["B4", "E2", "F4", "F7", "F1", "F6", "C6", "F5", "D7", "C7"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "B7"
-    },
-    "bootmagic": {
-        "matrix": [8, 0]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "features": {
-        "bootmagic": false,
-        "mousekey": true,
-        "extrakey": true,
-        "command": true,
-        "nkro": true
-    },
-    "layouts": {
-        "LAYOUT_tkl": {
-            "layout": [
-                {"matrix": [8, 0], "x": 0, "y": 0},
-
-                {"matrix": [9, 0], "x": 2, "y": 0},
-                {"matrix": [8, 1], "x": 3, "y": 0},
-                {"matrix": [9, 1], "x": 4, "y": 0},
-                {"matrix": [8, 2], "x": 5, "y": 0},
-
-                {"matrix": [9, 2], "x": 6.5, "y": 0},
-                {"matrix": [8, 3], "x": 7.5, "y": 0},
-                {"matrix": [9, 3], "x": 8.5, "y": 0},
-                {"matrix": [8, 4], "x": 9.5, "y": 0},
-
-                {"matrix": [9, 4], "x": 11, "y": 0},
-                {"matrix": [8, 5], "x": 12, "y": 0},
-                {"matrix": [9, 5], "x": 13, "y": 0},
-                {"matrix": [8, 6], "x": 14, "y": 0},
-
-                {"matrix": [9, 6], "x": 15.25, "y": 0},
-                {"matrix": [8, 8], "x": 16.25, "y": 0},
-                {"matrix": [9, 8], "x": 17.25, "y": 0},
-
-                {"matrix": [0, 0], "x": 0, "y": 1.25},
-                {"matrix": [1, 0], "x": 1, "y": 1.25},
-                {"matrix": [0, 1], "x": 2, "y": 1.25},
-                {"matrix": [1, 1], "x": 3, "y": 1.25},
-                {"matrix": [0, 2], "x": 4, "y": 1.25},
-                {"matrix": [1, 2], "x": 5, "y": 1.25},
-                {"matrix": [0, 3], "x": 6, "y": 1.25},
-                {"matrix": [1, 3], "x": 7, "y": 1.25},
-                {"matrix": [0, 4], "x": 8, "y": 1.25},
-                {"matrix": [1, 4], "x": 9, "y": 1.25},
-                {"matrix": [0, 5], "x": 10, "y": 1.25},
-                {"matrix": [1, 5], "x": 11, "y": 1.25},
-                {"matrix": [0, 6], "x": 12, "y": 1.25},
-                {"matrix": [1, 6], "x": 13, "y": 1.25, "w": 2},
-
-                {"matrix": [0, 8], "x": 15.25, "y": 1.25},
-                {"matrix": [1, 8], "x": 16.25, "y": 1.25},
-                {"matrix": [4, 8], "x": 17.25, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [3, 0], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 1], "x": 2.5, "y": 2.25},
-                {"matrix": [3, 1], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 4.5, "y": 2.25},
-                {"matrix": [3, 2], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 6.5, "y": 2.25},
-                {"matrix": [3, 3], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 8.5, "y": 2.25},
-                {"matrix": [3, 4], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 10.5, "y": 2.25},
-                {"matrix": [3, 5], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 12.5, "y": 2.25},
-                {"matrix": [3, 6], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"matrix": [2, 8], "x": 15.25, "y": 2.25},
-                {"matrix": [3, 8], "x": 16.25, "y": 2.25},
-                {"matrix": [5, 8], "x": 17.25, "y": 2.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [4, 1], "x": 1.75, "y": 3.25},
-                {"matrix": [5, 1], "x": 2.75, "y": 3.25},
-                {"matrix": [4, 2], "x": 3.75, "y": 3.25},
-                {"matrix": [5, 2], "x": 4.75, "y": 3.25},
-                {"matrix": [4, 3], "x": 5.75, "y": 3.25},
-                {"matrix": [5, 3], "x": 6.75, "y": 3.25},
-                {"matrix": [4, 4], "x": 7.75, "y": 3.25},
-                {"matrix": [5, 4], "x": 8.75, "y": 3.25},
-                {"matrix": [4, 5], "x": 9.75, "y": 3.25},
-                {"matrix": [5, 5], "x": 10.75, "y": 3.25},
-                {"matrix": [4, 6], "x": 11.75, "y": 3.25},
-                {"matrix": [1, 7], "x": 12.75, "y": 3.25},
-                {"matrix": [5, 6], "x": 13.75, "y": 3.25, "w": 1.25},
-
-                {"matrix": [7, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [9, 7], "x": 1.25, "y": 4.25},
-                {"matrix": [6, 1], "x": 2.25, "y": 4.25},
-                {"matrix": [7, 1], "x": 3.25, "y": 4.25},
-                {"matrix": [6, 2], "x": 4.25, "y": 4.25},
-                {"matrix": [7, 2], "x": 5.25, "y": 4.25},
-                {"matrix": [6, 3], "x": 6.25, "y": 4.25},
-                {"matrix": [7, 3], "x": 7.25, "y": 4.25},
-                {"matrix": [6, 4], "x": 8.25, "y": 4.25},
-                {"matrix": [7, 4], "x": 9.25, "y": 4.25},
-                {"matrix": [6, 5], "x": 10.25, "y": 4.25},
-                {"matrix": [7, 5], "x": 11.25, "y": 4.25},
-                {"matrix": [6, 6], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"matrix": [7, 6], "x": 14, "y": 4.25},
-
-                {"matrix": [6, 8], "x": 16.25, "y": 4.25},
-
-                {"matrix": [6, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 0], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [8, 7], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [0, 7], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [2, 7], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [3, 7], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [4, 7], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 7], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"matrix": [6, 7], "x": 15.25, "y": 5.25},
-                {"matrix": [7, 7], "x": 16.25, "y": 5.25},
-                {"matrix": [7, 8], "x": 17.25, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/gon/nerdtkl/keyboard.json b/keyboards/gon/nerdtkl/keyboard.json
new file mode 100644
index 0000000000..301cbaf19f
--- /dev/null
+++ b/keyboards/gon/nerdtkl/keyboard.json
@@ -0,0 +1,140 @@
+{
+    "keyboard_name": "NerD TKL",
+    "manufacturer": "GON",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4E45",
+        "pid": "0x5244",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["E6", "B0", "B1", "B2", "B3", "F0", "D0", "D5", "D1"],
+        "rows": ["B4", "E2", "F4", "F7", "F1", "F6", "C6", "F5", "D7", "C7"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B7"
+    },
+    "bootmagic": {
+        "matrix": [8, 0]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true
+    },
+    "layouts": {
+        "LAYOUT_tkl": {
+            "layout": [
+                {"matrix": [8, 0], "x": 0, "y": 0},
+
+                {"matrix": [9, 0], "x": 2, "y": 0},
+                {"matrix": [8, 1], "x": 3, "y": 0},
+                {"matrix": [9, 1], "x": 4, "y": 0},
+                {"matrix": [8, 2], "x": 5, "y": 0},
+
+                {"matrix": [9, 2], "x": 6.5, "y": 0},
+                {"matrix": [8, 3], "x": 7.5, "y": 0},
+                {"matrix": [9, 3], "x": 8.5, "y": 0},
+                {"matrix": [8, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [9, 4], "x": 11, "y": 0},
+                {"matrix": [8, 5], "x": 12, "y": 0},
+                {"matrix": [9, 5], "x": 13, "y": 0},
+                {"matrix": [8, 6], "x": 14, "y": 0},
+
+                {"matrix": [9, 6], "x": 15.25, "y": 0},
+                {"matrix": [8, 8], "x": 16.25, "y": 0},
+                {"matrix": [9, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [0, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 0], "x": 1, "y": 1.25},
+                {"matrix": [0, 1], "x": 2, "y": 1.25},
+                {"matrix": [1, 1], "x": 3, "y": 1.25},
+                {"matrix": [0, 2], "x": 4, "y": 1.25},
+                {"matrix": [1, 2], "x": 5, "y": 1.25},
+                {"matrix": [0, 3], "x": 6, "y": 1.25},
+                {"matrix": [1, 3], "x": 7, "y": 1.25},
+                {"matrix": [0, 4], "x": 8, "y": 1.25},
+                {"matrix": [1, 4], "x": 9, "y": 1.25},
+                {"matrix": [0, 5], "x": 10, "y": 1.25},
+                {"matrix": [1, 5], "x": 11, "y": 1.25},
+                {"matrix": [0, 6], "x": 12, "y": 1.25},
+                {"matrix": [1, 6], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [0, 8], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [4, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [3, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [3, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [3, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [3, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [3, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 6], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 8], "x": 15.25, "y": 2.25},
+                {"matrix": [3, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [5, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [4, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [5, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [4, 2], "x": 3.75, "y": 3.25},
+                {"matrix": [5, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [4, 3], "x": 5.75, "y": 3.25},
+                {"matrix": [5, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [4, 4], "x": 7.75, "y": 3.25},
+                {"matrix": [5, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [4, 5], "x": 9.75, "y": 3.25},
+                {"matrix": [5, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [4, 6], "x": 11.75, "y": 3.25},
+                {"matrix": [1, 7], "x": 12.75, "y": 3.25},
+                {"matrix": [5, 6], "x": 13.75, "y": 3.25, "w": 1.25},
+
+                {"matrix": [7, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [9, 7], "x": 1.25, "y": 4.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [7, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [6, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [7, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [6, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [7, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [6, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [7, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [6, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [7, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [6, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 4.25},
+
+                {"matrix": [6, 8], "x": 16.25, "y": 4.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [8, 7], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [0, 7], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [2, 7], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [3, 7], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 7], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [6, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [7, 7], "x": 16.25, "y": 5.25},
+                {"matrix": [7, 8], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/gopolar/gg86/info.json b/keyboards/gopolar/gg86/info.json
deleted file mode 100644
index b704582aa6..0000000000
--- a/keyboards/gopolar/gg86/info.json
+++ /dev/null
@@ -1,393 +0,0 @@
-{
-    "keyboard_name": "GG86 Tai-Chi",
-    "manufacturer": "Gopolar",
-    "url": "",
-    "maintainer": "Gopolar",
-    "usb": {
-        "vid": "0x0007",
-        "pid": "0x0007",
-        "device_version": "0.0.1",
-        "force_nkro": true,
-        "no_startup_check": true
-    },
-    "ws2812": {
-        "pin": "E2"
-    },
-    "rgb_matrix": {
-        "animations": {
-            "alphas_mods": true,
-            "gradient_up_down": true,
-            "gradient_left_right": true,
-            "breathing": true,
-            "band_sat": true,
-            "band_val": true,
-            "band_pinwheel_sat": true,
-            "band_pinwheel_val": true,
-            "band_spiral_sat": true,
-            "band_spiral_val": true,
-            "cycle_all": true,
-            "cycle_left_right": true,
-            "cycle_up_down": true,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": true,
-            "cycle_pinwheel": true,
-            "cycle_spiral": true,
-            "dual_beacon": true,
-            "rainbow_beacon": true,
-            "rainbow_pinwheels": true,
-            "raindrops": true,
-            "jellybean_raindrops": true,
-            "hue_breathing": true,
-            "hue_pendulum": true,
-            "hue_wave": true,
-            "pixel_rain": true,
-            "solid_reactive_simple": true,
-            "solid_reactive": true,
-            "solid_reactive_wide": true,
-            "solid_reactive_multiwide": true,
-            "solid_reactive_cross": true,
-            "solid_reactive_multicross": true,
-            "solid_reactive_nexus": true,
-            "solid_reactive_multinexus": true,
-            "splash": true,
-            "multisplash": true,
-            "solid_splash": true,
-            "solid_multisplash": true
-        },
-        "driver": "ws2812",
-        "max_brightness": 150
-    },
-    "matrix_pins": {
-        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "C7", "E6", "D2", "D3"],
-        "rows": ["B0", "B1", "B2", "B3", "B7", "D5"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "features": {
-        "bootmagic": true,
-        "mousekey": false,
-        "extrakey": true,
-        "nkro": true,
-        "rgb_matrix": true,
-        "oled": true
-    },
-    "build": {
-        "lto": true
-    },
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 2, "y": 0},
-                {"matrix": [0, 2], "x": 3, "y": 0},
-                {"matrix": [0, 3], "x": 4, "y": 0},
-                {"matrix": [0, 4], "x": 5, "y": 0},
-
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-                {"matrix": [0, 7], "x": 8.5, "y": 0},
-                {"matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 9], "x": 11, "y": 0},
-                {"matrix": [0, 10], "x": 12, "y": 0},
-                {"matrix": [0, 11], "x": 13, "y": 0},
-                {"matrix": [0, 12], "x": 14, "y": 0},
-
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-                {"matrix": [0, 15], "x": 16.25, "y": 0},
-                {"matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.5},
-                {"matrix": [1, 1], "x": 1, "y": 1.5},
-                {"matrix": [1, 2], "x": 2, "y": 1.5},
-                {"matrix": [1, 3], "x": 3, "y": 1.5},
-                {"matrix": [1, 4], "x": 4, "y": 1.5},
-                {"matrix": [1, 5], "x": 5, "y": 1.5},
-                {"matrix": [1, 6], "x": 6, "y": 1.5},
-                {"matrix": [1, 7], "x": 7, "y": 1.5},
-                {"matrix": [1, 8], "x": 8, "y": 1.5},
-                {"matrix": [1, 9], "x": 9, "y": 1.5},
-                {"matrix": [1, 10], "x": 10, "y": 1.5},
-                {"matrix": [1, 11], "x": 11, "y": 1.5},
-                {"matrix": [1, 12], "x": 12, "y": 1.5},
-                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
-                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
-                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
-                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
-                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
-                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
-                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
-                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
-                {"matrix": [4, 13], "x": 14, "y": 4.5},
-
-                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
-                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
-                {"matrix": [5, 5], "x": 4, "y": 5.5, "w": 7},
-                {"matrix": [5, 10], "x": 11, "y": 5.5, "w": 1.5},
-                {"matrix": [5, 11], "x": 12.5, "y": 5.5},
-                {"matrix": [5, 12], "x": 13.5, "y": 5.5, "w": 1.5},
-
-                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
-                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
-                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
-            ]
-        },
-        "LAYOUT_tkl_ansi_tsangan": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 2, "y": 0},
-                {"matrix": [0, 2], "x": 3, "y": 0},
-                {"matrix": [0, 3], "x": 4, "y": 0},
-                {"matrix": [0, 4], "x": 5, "y": 0},
-
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-                {"matrix": [0, 7], "x": 8.5, "y": 0},
-                {"matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 9], "x": 11, "y": 0},
-                {"matrix": [0, 10], "x": 12, "y": 0},
-                {"matrix": [0, 11], "x": 13, "y": 0},
-                {"matrix": [0, 12], "x": 14, "y": 0},
-
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-                {"matrix": [0, 15], "x": 16.25, "y": 0},
-                {"matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.5},
-                {"matrix": [1, 1], "x": 1, "y": 1.5},
-                {"matrix": [1, 2], "x": 2, "y": 1.5},
-                {"matrix": [1, 3], "x": 3, "y": 1.5},
-                {"matrix": [1, 4], "x": 4, "y": 1.5},
-                {"matrix": [1, 5], "x": 5, "y": 1.5},
-                {"matrix": [1, 6], "x": 6, "y": 1.5},
-                {"matrix": [1, 7], "x": 7, "y": 1.5},
-                {"matrix": [1, 8], "x": 8, "y": 1.5},
-                {"matrix": [1, 9], "x": 9, "y": 1.5},
-                {"matrix": [1, 10], "x": 10, "y": 1.5},
-                {"matrix": [1, 11], "x": 11, "y": 1.5},
-                {"matrix": [1, 12], "x": 12, "y": 1.5},
-                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
-                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
-                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
-                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
-                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
-                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
-                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
-                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
-
-                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
-                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
-                {"matrix": [5, 5], "x": 4, "y": 5.5, "w": 7},
-                {"matrix": [5, 10], "x": 11, "y": 5.5, "w": 1.5},
-                {"matrix": [5, 11], "x": 12.5, "y": 5.5},
-                {"matrix": [5, 12], "x": 13.5, "y": 5.5, "w": 1.5},
-
-                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
-                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
-                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
-            ]
-        },
-        "LAYOUT_tkl_iso_tsangan": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 2, "y": 0},
-                {"matrix": [0, 2], "x": 3, "y": 0},
-                {"matrix": [0, 3], "x": 4, "y": 0},
-                {"matrix": [0, 4], "x": 5, "y": 0},
-
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-                {"matrix": [0, 7], "x": 8.5, "y": 0},
-                {"matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 9], "x": 11, "y": 0},
-                {"matrix": [0, 10], "x": 12, "y": 0},
-                {"matrix": [0, 11], "x": 13, "y": 0},
-                {"matrix": [0, 12], "x": 14, "y": 0},
-
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-                {"matrix": [0, 15], "x": 16.25, "y": 0},
-                {"matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.5},
-                {"matrix": [1, 1], "x": 1, "y": 1.5},
-                {"matrix": [1, 2], "x": 2, "y": 1.5},
-                {"matrix": [1, 3], "x": 3, "y": 1.5},
-                {"matrix": [1, 4], "x": 4, "y": 1.5},
-                {"matrix": [1, 5], "x": 5, "y": 1.5},
-                {"matrix": [1, 6], "x": 6, "y": 1.5},
-                {"matrix": [1, 7], "x": 7, "y": 1.5},
-                {"matrix": [1, 8], "x": 8, "y": 1.5},
-                {"matrix": [1, 9], "x": 9, "y": 1.5},
-                {"matrix": [1, 10], "x": 10, "y": 1.5},
-                {"matrix": [1, 11], "x": 11, "y": 1.5},
-                {"matrix": [1, 12], "x": 12, "y": 1.5},
-                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
-                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
-                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
-
-                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
-                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
-                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
-                {"matrix": [2, 13], "x": 12.75, "y": 3.5},
-                {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
-                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
-
-                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
-                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
-                {"matrix": [5, 5], "x": 4, "y": 5.5, "w": 7},
-                {"matrix": [5, 10], "x": 11, "y": 5.5, "w": 1.5},
-                {"matrix": [5, 11], "x": 12.5, "y": 5.5},
-                {"matrix": [5, 12], "x": 13.5, "y": 5.5, "w": 1.5},
-
-                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
-                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
-                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/gopolar/gg86/keyboard.json b/keyboards/gopolar/gg86/keyboard.json
new file mode 100644
index 0000000000..b704582aa6
--- /dev/null
+++ b/keyboards/gopolar/gg86/keyboard.json
@@ -0,0 +1,393 @@
+{
+    "keyboard_name": "GG86 Tai-Chi",
+    "manufacturer": "Gopolar",
+    "url": "",
+    "maintainer": "Gopolar",
+    "usb": {
+        "vid": "0x0007",
+        "pid": "0x0007",
+        "device_version": "0.0.1",
+        "force_nkro": true,
+        "no_startup_check": true
+    },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 150
+    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "C7", "E6", "D2", "D3"],
+        "rows": ["B0", "B1", "B2", "B3", "B7", "D5"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "oled": true
+    },
+    "build": {
+        "lto": true
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.5},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 5], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.5},
+                {"matrix": [5, 12], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_tkl_ansi_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 5], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.5},
+                {"matrix": [5, 12], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_tkl_iso_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [2, 13], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 5], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.5},
+                {"matrix": [5, 12], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/gray_studio/cod67/info.json b/keyboards/gray_studio/cod67/info.json
deleted file mode 100644
index e3687ce959..0000000000
--- a/keyboards/gray_studio/cod67/info.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-  "keyboard_name": "COD67",
-  "manufacturer": "Graystudio",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0x4753",
-    "pid": "0x1000",
-    "device_version": "0.0.1"
-  },
-  "rgblight": {
-    "saturation_steps": 8,
-    "brightness_steps": 8,
-    "led_count": 20,
-    "sleep": true,
-    "animations": {
-      "breathing": true,
-      "rainbow_mood": true,
-      "rainbow_swirl": true,
-      "snake": true,
-      "knight": true,
-      "christmas": true,
-      "static_gradient": true,
-      "rgb_test": true,
-      "alternating": true,
-      "twinkle": true
-    }
-  },
-  "ws2812": {
-    "pin": "B2"
-  },
-  "matrix_pins": {
-    "cols": ["D7", "F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0", "B7", "D0", "D1", "D2", "D3"],
-    "rows": ["C7", "C6", "B6", "B5", "B4"]
-  },
-  "diode_direction": "COL2ROW",
-  "backlight": {
-    "driver": "timer",
-    "pin": "D4",
-    "on_state": 0
-  },
-  "processor": "atmega32u4",
-  "bootloader": "lufa-ms",
-  "features": {
-    "bootmagic": false,
-    "mousekey": true,
-    "extrakey": true,
-    "command": true,
-    "backlight": true,
-    "rgblight": true
-  },
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"matrix": [0, 11], "x": 11, "y": 0},
-        {"matrix": [0, 12], "x": 12, "y": 0},
-        {"matrix": [4, 8], "x": 13, "y": 0, "w": 2},
-
-        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-        {"matrix": [1, 1], "x": 1.5, "y": 1},
-        {"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},
-        {"matrix": [1, 12], "x": 12.5, "y": 1},
-        {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-        {"matrix": [2, 1], "x": 1.75, "y": 2},
-        {"matrix": [2, 2], "x": 2.75, "y": 2},
-        {"matrix": [2, 3], "x": 3.75, "y": 2},
-        {"matrix": [2, 4], "x": 4.75, "y": 2},
-        {"matrix": [2, 5], "x": 5.75, "y": 2},
-        {"matrix": [2, 6], "x": 6.75, "y": 2},
-        {"matrix": [2, 7], "x": 7.75, "y": 2},
-        {"matrix": [2, 8], "x": 8.75, "y": 2},
-        {"matrix": [2, 9], "x": 9.75, "y": 2},
-        {"matrix": [2, 10], "x": 10.75, "y": 2},
-        {"matrix": [2, 11], "x": 11.75, "y": 2},
-        {"matrix": [2, 12], "x": 12.75, "y": 2},
-        {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
-
-        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-        {"matrix": [3, 1], "x": 1.25, "y": 3},
-        {"matrix": [3, 2], "x": 2.25, "y": 3},
-        {"matrix": [3, 3], "x": 3.25, "y": 3},
-        {"matrix": [3, 4], "x": 4.25, "y": 3},
-        {"matrix": [3, 5], "x": 5.25, "y": 3},
-        {"matrix": [3, 6], "x": 6.25, "y": 3},
-        {"matrix": [3, 7], "x": 7.25, "y": 3},
-        {"matrix": [3, 8], "x": 8.25, "y": 3},
-        {"matrix": [3, 9], "x": 9.25, "y": 3},
-        {"matrix": [3, 10], "x": 10.25, "y": 3},
-        {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75},
-        {"matrix": [3, 12], "x": 13, "y": 3},
-        {"matrix": [3, 13], "x": 14, "y": 3},
-
-        {"matrix": [4, 0], "x": 0, "y": 4},
-        {"matrix": [4, 1], "x": 1, "y": 4},
-        {"matrix": [4, 2], "x": 2, "y": 4},
-        {"matrix": [4, 3], "x": 3, "y": 4},
-        {"matrix": [4, 4], "x": 4, "y": 4},
-        {"matrix": [4, 5], "x": 5, "y": 4},
-        {"matrix": [4, 6], "x": 6, "y": 4, "w": 2},
-        {"matrix": [4, 7], "x": 8, "y": 4},
-        {"matrix": [0, 13], "x": 9, "y": 4},
-        {"matrix": [4, 9], "x": 10, "y": 4},
-        {"matrix": [4, 10], "x": 11, "y": 4},
-        {"matrix": [4, 11], "x": 12, "y": 4},
-        {"matrix": [4, 12], "x": 13, "y": 4},
-        {"matrix": [4, 13], "x": 14, "y": 4}
-      ]
-    }
-  }
-}
diff --git a/keyboards/gray_studio/cod67/keyboard.json b/keyboards/gray_studio/cod67/keyboard.json
new file mode 100644
index 0000000000..e3687ce959
--- /dev/null
+++ b/keyboards/gray_studio/cod67/keyboard.json
@@ -0,0 +1,132 @@
+{
+  "keyboard_name": "COD67",
+  "manufacturer": "Graystudio",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0x4753",
+    "pid": "0x1000",
+    "device_version": "0.0.1"
+  },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 20,
+    "sleep": true,
+    "animations": {
+      "breathing": true,
+      "rainbow_mood": true,
+      "rainbow_swirl": true,
+      "snake": true,
+      "knight": true,
+      "christmas": true,
+      "static_gradient": true,
+      "rgb_test": true,
+      "alternating": true,
+      "twinkle": true
+    }
+  },
+  "ws2812": {
+    "pin": "B2"
+  },
+  "matrix_pins": {
+    "cols": ["D7", "F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0", "B7", "D0", "D1", "D2", "D3"],
+    "rows": ["C7", "C6", "B6", "B5", "B4"]
+  },
+  "diode_direction": "COL2ROW",
+  "backlight": {
+    "driver": "timer",
+    "pin": "D4",
+    "on_state": 0
+  },
+  "processor": "atmega32u4",
+  "bootloader": "lufa-ms",
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "command": true,
+    "backlight": true,
+    "rgblight": true
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [4, 8], "x": 13, "y": 0, "w": 2},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"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},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+        {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 12], "x": 12.75, "y": 2},
+        {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+        {"matrix": [3, 1], "x": 1.25, "y": 3},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 12], "x": 13, "y": 3},
+        {"matrix": [3, 13], "x": 14, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+        {"matrix": [4, 1], "x": 1, "y": 4},
+        {"matrix": [4, 2], "x": 2, "y": 4},
+        {"matrix": [4, 3], "x": 3, "y": 4},
+        {"matrix": [4, 4], "x": 4, "y": 4},
+        {"matrix": [4, 5], "x": 5, "y": 4},
+        {"matrix": [4, 6], "x": 6, "y": 4, "w": 2},
+        {"matrix": [4, 7], "x": 8, "y": 4},
+        {"matrix": [0, 13], "x": 9, "y": 4},
+        {"matrix": [4, 9], "x": 10, "y": 4},
+        {"matrix": [4, 10], "x": 11, "y": 4},
+        {"matrix": [4, 11], "x": 12, "y": 4},
+        {"matrix": [4, 12], "x": 13, "y": 4},
+        {"matrix": [4, 13], "x": 14, "y": 4}
+      ]
+    }
+  }
+}
diff --git a/keyboards/gregandcin/teaqueen/info.json b/keyboards/gregandcin/teaqueen/info.json
deleted file mode 100644
index 841c524e62..0000000000
--- a/keyboards/gregandcin/teaqueen/info.json
+++ /dev/null
@@ -1,115 +0,0 @@
-{
-    "manufacturer": "gregandcin",
-    "keyboard_name": "gregandcin/teaqueen",
-    "maintainer": "gregandcin",
-    "bootloader": "rp2040",
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
-    "matrix_pins": {
-        "cols": ["GP29", "GP28", "GP27", "GP26", "GP22", "GP20", "GP23", "NO_PIN"],
-        "rows": ["GP5", "GP6", "GP7", "GP8", "GP9"]
-    },
-    "processor": "RP2040",
-    "split": {
-        "enabled": true,
-        "matrix_pins": {
-            "right": {
-                "cols": ["GP29", "GP28", "GP27", "GP26", "GP22", "GP20", "GP23", "GP21"],
-                "rows": ["GP5", "GP6", "GP7", "GP8", "GP9"]
-            }
-        },
-        "soft_serial_pin": "GP3"
-    },
-    "url": "https://github.com/gregandcin/teaqueen",
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x0000",
-        "vid": "0x4743"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0.6, "y": 0},
-                {"matrix": [0, 1], "x": 1.6, "y": 0},
-                {"matrix": [0, 2], "x": 2.6, "y": 0},
-                {"matrix": [0, 3], "x": 3.6, "y": 0},
-                {"matrix": [0, 4], "x": 4.6, "y": 0},
-                {"matrix": [0, 5], "x": 5.6, "y": 0},
-                {"matrix": [0, 6], "x": 6.6, "y": 0},
-
-                {"matrix": [5, 0], "x": 8.5, "y": 0},
-                {"matrix": [5, 1], "x": 9.5, "y": 0},
-                {"matrix": [5, 2], "x": 10.5, "y": 0},
-                {"matrix": [5, 3], "x": 11.5, "y": 0},
-                {"matrix": [5, 4], "x": 12.5, "y": 0},
-                {"matrix": [5, 5], "x": 13.5, "y": 0},
-                {"matrix": [5, 6], "x": 14.5, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0.35, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 1.85, "y": 1},
-                {"matrix": [1, 3], "x": 2.85, "y": 1},
-                {"matrix": [1, 4], "x": 3.85, "y": 1},
-                {"matrix": [1, 5], "x": 4.85, "y": 1},
-                {"matrix": [1, 6], "x": 5.85, "y": 1},
-
-                {"matrix": [6, 0], "x": 8.25, "y": 1},
-                {"matrix": [6, 1], "x": 9.25, "y": 1},
-                {"matrix": [6, 2], "x": 10.25, "y": 1},
-                {"matrix": [6, 3], "x": 11.25, "y": 1},
-                {"matrix": [6, 4], "x": 12.25, "y": 1},
-                {"matrix": [6, 5], "x": 13.25, "y": 1},
-                {"matrix": [6, 6], "x": 14.25, "y": 1},
-                {"matrix": [6, 7], "x": 15.25, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0.2, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 1.95, "y": 2},
-                {"matrix": [2, 3], "x": 2.95, "y": 2},
-                {"matrix": [2, 4], "x": 3.95, "y": 2},
-                {"matrix": [2, 5], "x": 4.95, "y": 2},
-                {"matrix": [2, 6], "x": 5.95, "y": 2},
-
-                {"matrix": [7, 0], "x": 8.75, "y": 2},
-                {"matrix": [7, 1], "x": 9.75, "y": 2},
-                {"matrix": [7, 2], "x": 10.75, "y": 2},
-                {"matrix": [7, 3], "x": 11.75, "y": 2},
-                {"matrix": [7, 4], "x": 12.75, "y": 2},
-                {"matrix": [7, 5], "x": 13.75, "y": 2},
-                {"matrix": [7, 7], "x": 14.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-
-                {"matrix": [8, 0], "x": 8.45, "y": 3},
-                {"matrix": [8, 1], "x": 9.45, "y": 3},
-                {"matrix": [8, 2], "x": 10.45, "y": 3},
-                {"matrix": [8, 3], "x": 11.45, "y": 3},
-                {"matrix": [8, 4], "x": 12.45, "y": 3},
-                {"matrix": [8, 5], "x": 13.45, "y": 3},
-                {"matrix": [8, 6], "x": 14.45, "y": 3, "w": 1.75},
-                {"matrix": [8, 7], "x": 16.20, "y": 3},
-
-                {"matrix": [4, 0], "x": 0.2, "y": 4, "w": 1.5},
-                {"matrix": [4, 1], "x": 1.7, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 5], "x": 4.75, "y": 4, "w": 2},
-                {"matrix": [4, 6], "x": 6.75, "y": 4},
-
-                {"matrix": [9, 1], "x": 8.45, "y": 4, "w": 2.75},
-                {"matrix": [9, 3], "x": 11.20, "y": 4, "w": 1.5},
-                {"matrix": [9, 6], "x": 14.5, "y": 4},
-                {"matrix": [9, 7], "x": 15.5, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/gregandcin/teaqueen/keyboard.json b/keyboards/gregandcin/teaqueen/keyboard.json
new file mode 100644
index 0000000000..841c524e62
--- /dev/null
+++ b/keyboards/gregandcin/teaqueen/keyboard.json
@@ -0,0 +1,115 @@
+{
+    "manufacturer": "gregandcin",
+    "keyboard_name": "gregandcin/teaqueen",
+    "maintainer": "gregandcin",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["GP29", "GP28", "GP27", "GP26", "GP22", "GP20", "GP23", "NO_PIN"],
+        "rows": ["GP5", "GP6", "GP7", "GP8", "GP9"]
+    },
+    "processor": "RP2040",
+    "split": {
+        "enabled": true,
+        "matrix_pins": {
+            "right": {
+                "cols": ["GP29", "GP28", "GP27", "GP26", "GP22", "GP20", "GP23", "GP21"],
+                "rows": ["GP5", "GP6", "GP7", "GP8", "GP9"]
+            }
+        },
+        "soft_serial_pin": "GP3"
+    },
+    "url": "https://github.com/gregandcin/teaqueen",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0x4743"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0.6, "y": 0},
+                {"matrix": [0, 1], "x": 1.6, "y": 0},
+                {"matrix": [0, 2], "x": 2.6, "y": 0},
+                {"matrix": [0, 3], "x": 3.6, "y": 0},
+                {"matrix": [0, 4], "x": 4.6, "y": 0},
+                {"matrix": [0, 5], "x": 5.6, "y": 0},
+                {"matrix": [0, 6], "x": 6.6, "y": 0},
+
+                {"matrix": [5, 0], "x": 8.5, "y": 0},
+                {"matrix": [5, 1], "x": 9.5, "y": 0},
+                {"matrix": [5, 2], "x": 10.5, "y": 0},
+                {"matrix": [5, 3], "x": 11.5, "y": 0},
+                {"matrix": [5, 4], "x": 12.5, "y": 0},
+                {"matrix": [5, 5], "x": 13.5, "y": 0},
+                {"matrix": [5, 6], "x": 14.5, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0.35, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.85, "y": 1},
+                {"matrix": [1, 3], "x": 2.85, "y": 1},
+                {"matrix": [1, 4], "x": 3.85, "y": 1},
+                {"matrix": [1, 5], "x": 4.85, "y": 1},
+                {"matrix": [1, 6], "x": 5.85, "y": 1},
+
+                {"matrix": [6, 0], "x": 8.25, "y": 1},
+                {"matrix": [6, 1], "x": 9.25, "y": 1},
+                {"matrix": [6, 2], "x": 10.25, "y": 1},
+                {"matrix": [6, 3], "x": 11.25, "y": 1},
+                {"matrix": [6, 4], "x": 12.25, "y": 1},
+                {"matrix": [6, 5], "x": 13.25, "y": 1},
+                {"matrix": [6, 6], "x": 14.25, "y": 1},
+                {"matrix": [6, 7], "x": 15.25, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0.2, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.95, "y": 2},
+                {"matrix": [2, 3], "x": 2.95, "y": 2},
+                {"matrix": [2, 4], "x": 3.95, "y": 2},
+                {"matrix": [2, 5], "x": 4.95, "y": 2},
+                {"matrix": [2, 6], "x": 5.95, "y": 2},
+
+                {"matrix": [7, 0], "x": 8.75, "y": 2},
+                {"matrix": [7, 1], "x": 9.75, "y": 2},
+                {"matrix": [7, 2], "x": 10.75, "y": 2},
+                {"matrix": [7, 3], "x": 11.75, "y": 2},
+                {"matrix": [7, 4], "x": 12.75, "y": 2},
+                {"matrix": [7, 5], "x": 13.75, "y": 2},
+                {"matrix": [7, 7], "x": 14.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 8.45, "y": 3},
+                {"matrix": [8, 1], "x": 9.45, "y": 3},
+                {"matrix": [8, 2], "x": 10.45, "y": 3},
+                {"matrix": [8, 3], "x": 11.45, "y": 3},
+                {"matrix": [8, 4], "x": 12.45, "y": 3},
+                {"matrix": [8, 5], "x": 13.45, "y": 3},
+                {"matrix": [8, 6], "x": 14.45, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 16.20, "y": 3},
+
+                {"matrix": [4, 0], "x": 0.2, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.7, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4.75, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 6.75, "y": 4},
+
+                {"matrix": [9, 1], "x": 8.45, "y": 4, "w": 2.75},
+                {"matrix": [9, 3], "x": 11.20, "y": 4, "w": 1.5},
+                {"matrix": [9, 6], "x": 14.5, "y": 4},
+                {"matrix": [9, 7], "x": 15.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
-- 
cgit v1.2.3