Migrate build target markers to keyboard.json - P (#23565) - qmk_firmware

commit: 40d0512794651237a182b4f53a2278d0fb2e583e
parent 191f62688079d644fe7ac471b2725e79e4d87f48
Author: Joel Challis <git@zvecr.com>
Date:   Mon, 22 Apr 2024 02:06:41 +0100

Migrate build target markers to keyboard.json - P (#23565)


Diffstat:
D keyboards/palette1202/info.json 46 ----------------------------------------------
A keyboards/palette1202/keyboard.json 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M keyboards/palette1202/rules.mk 15 ---------------
D keyboards/pearlboards/atlas/info.json 438 -------------------------------------------------------------------------------
A keyboards/pearlboards/atlas/keyboard.json 451 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M keyboards/pearlboards/atlas/rules.mk 16 ----------------
D keyboards/pearlboards/pearl/info.json 148 -------------------------------------------------------------------------------
A keyboards/pearlboards/pearl/keyboard.json 160 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M keyboards/pearlboards/pearl/rules.mk 15 ---------------
D keyboards/pearlboards/zeus/info.json 1383 -------------------------------------------------------------------------------
A keyboards/pearlboards/zeus/keyboard.json 1396 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M keyboards/pearlboards/zeus/rules.mk 16 ----------------
D keyboards/peej/rosaline/ortho/info.json 88 -------------------------------------------------------------------------------
A keyboards/peej/rosaline/ortho/keyboard.json 94 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/peej/rosaline/ortho/rules.mk 12 ------------
D keyboards/peej/rosaline/staggered/info.json 189 -------------------------------------------------------------------------------
A keyboards/peej/rosaline/staggered/keyboard.json 195 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/peej/rosaline/staggered/rules.mk 12 ------------
D keyboards/peranekofactory/tone/rev1/config.h 39 ---------------------------------------
D keyboards/peranekofactory/tone/rev1/info.json 40 ----------------------------------------
A keyboards/peranekofactory/tone/rev1/keyboard.json 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/peranekofactory/tone/rev1/rules.mk 13 -------------
D keyboards/peranekofactory/tone/rev2/config.h 39 ---------------------------------------
D keyboards/peranekofactory/tone/rev2/info.json 40 ----------------------------------------
A keyboards/peranekofactory/tone/rev2/keyboard.json 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/peranekofactory/tone/rev2/rules.mk 13 -------------
M keyboards/percent/canoe_gen2/canoe_gen2.c 2 ++
D keyboards/percent/canoe_gen2/config.h 23 -----------------------
D keyboards/percent/canoe_gen2/info.json 216 -------------------------------------------------------------------------------
A keyboards/percent/canoe_gen2/keyboard.json 230 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M keyboards/percent/canoe_gen2/rules.mk 14 --------------
D keyboards/phage_studio/pila87/info.json 181 -------------------------------------------------------------------------------
A keyboards/phage_studio/pila87/keyboard.json 188 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M keyboards/phage_studio/pila87/rules.mk 16 ----------------
D keyboards/phase_studio/titan65/hotswap/info.json 103 -------------------------------------------------------------------------------
A keyboards/phase_studio/titan65/hotswap/keyboard.json 110 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M keyboards/phase_studio/titan65/hotswap/rules.mk 14 --------------
D keyboards/phase_studio/titan65/soldered/info.json 407 -------------------------------------------------------------------------------
A keyboards/phase_studio/titan65/soldered/keyboard.json 413 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M keyboards/phase_studio/titan65/soldered/rules.mk 14 --------------
D keyboards/phoenix/info.json 214 -------------------------------------------------------------------------------
A keyboards/phoenix/keyboard.json 223 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M keyboards/phoenix/rules.mk 16 ----------------
R keyboards/pica40/rev2/info.json -> keyboards/pica40/rev2/keyboard.json 0 
D keyboards/pierce/info.json 63 ---------------------------------------------------------------
A keyboards/pierce/keyboard.json 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M keyboards/pierce/rules.mk 13 -------------
M keyboards/pinky/info.json 6 ++++++
M keyboards/pinky/rules.mk 13 -------------
R keyboards/pizzakeyboards/slice65/info.json -> keyboards/pizzakeyboards/slice65/keyboard.json 0 
D keyboards/planck/ez/glow/info.json 6 ------
A keyboards/planck/ez/glow/keyboard.json 9 +++++++++
D keyboards/planck/ez/glow/rules.mk 1 -
M keyboards/planck/ez/info.json 15 ++++++++++++++-
M keyboards/planck/ez/rules.mk 16 ----------------
D keyboards/planck/rev6_drop/info.json 315 -------------------------------------------------------------------------------
A keyboards/planck/rev6_drop/keyboard.json 327 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M keyboards/planck/rev6_drop/rules.mk 17 -----------------
D keyboards/planck/rev7/info.json 333 -------------------------------------------------------------------------------
A keyboards/planck/rev7/keyboard.json 334 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M keyboards/planck/rev7/rules.mk 5 -----
D keyboards/planck/thk/info.json 140 -------------------------------------------------------------------------------
A keyboards/planck/thk/keyboard.json 148 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M keyboards/planck/thk/rules.mk 15 ---------------
R keyboards/ploopyco/mouse/info.json -> keyboards/ploopyco/mouse/keyboard.json 0 
R keyboards/pmk/posey_split/v4/info.json -> keyboards/pmk/posey_split/v4/keyboard.json 0 
R keyboards/pmk/posey_split/v5/info.json -> keyboards/pmk/posey_split/v5/keyboard.json 0 
R keyboards/pmk/recore/v3/info.json -> keyboards/pmk/recore/v3/keyboard.json 0 
D keyboards/preonic/rev3_drop/info.json 387 -------------------------------------------------------------------------------
A keyboards/preonic/rev3_drop/keyboard.json 399 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M keyboards/preonic/rev3_drop/rules.mk 18 ------------------
D keyboards/primekb/prime_e/config.h 23 -----------------------
M keyboards/primekb/prime_e/info.json 6 ++++++
D keyboards/primekb/prime_e/rgb/info.json 25 -------------------------
A keyboards/primekb/prime_e/rgb/keyboard.json 28 ++++++++++++++++++++++++++++
D keyboards/primekb/prime_e/rgb/rules.mk 2 --
D keyboards/primekb/prime_e/std/info.json 11 -----------
A keyboards/primekb/prime_e/std/keyboard.json 14 ++++++++++++++
D keyboards/primekb/prime_e/std/rules.mk 2 --
D keyboards/primekb/prime_l/config.h 24 ------------------------
M keyboards/primekb/prime_l/info.json 6 ++++++
D keyboards/primekb/prime_l/v1/info.json 103 -------------------------------------------------------------------------------
A keyboards/primekb/prime_l/v1/keyboard.json 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/primekb/prime_l/v1/rules.mk 2 --
R keyboards/primekb/prime_l/v2/info.json -> keyboards/primekb/prime_l/v2/keyboard.json 0 
D keyboards/primekb/prime_l/v2/rules.mk 2 --
R keyboards/printedpad/info.json -> keyboards/printedpad/keyboard.json 0 
D keyboards/program_yoink/config.h 29 -----------------------------
A keyboards/program_yoink/info.json 17 +++++++++++++++++
M keyboards/program_yoink/rules.mk 14 --------------
D keyboards/projectkb/alice/rev1/info.json 26 --------------------------
A keyboards/projectkb/alice/rev1/keyboard.json 36 ++++++++++++++++++++++++++++++++++++
D keyboards/projectkb/alice/rev1/rules.mk 13 -------------
D keyboards/projectkb/alice/rev2/info.json 26 --------------------------
A keyboards/projectkb/alice/rev2/keyboard.json 36 ++++++++++++++++++++++++++++++++++++
D keyboards/projectkb/alice/rev2/rules.mk 13 -------------
D keyboards/prototypist/oceanographer/info.json 216 -------------------------------------------------------------------------------
A keyboards/prototypist/oceanographer/keyboard.json 221 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/prototypist/oceanographer/rules.mk 5 -----
D keyboards/protozoa/cassini/info.json 665 -------------------------------------------------------------------------------
A keyboards/protozoa/cassini/keyboard.json 671 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M keyboards/protozoa/cassini/rules.mk 13 -------------
R keyboards/protozoa/event_horizon/info.json -> keyboards/protozoa/event_horizon/keyboard.json 0 
D keyboards/protozoa/p01/info.json 1413 -------------------------------------------------------------------------------
A keyboards/protozoa/p01/keyboard.json 1421 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M keyboards/protozoa/p01/rules.mk 14 --------------
D keyboards/punk75/info.json 110 -------------------------------------------------------------------------------
A keyboards/punk75/keyboard.json 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M keyboards/punk75/rules.mk 14 --------------

109 files changed, 7605 insertions(+), 7888 deletions(-)
diff --git a/keyboards/palette1202/info.json b/keyboards/palette1202/info.json
@@ -1,46 +0,0 @@
-{
-  "keyboard_name": "Palette1202",
-  "manufacturer": "niltea",
-  "url": "https://github.com/niltea/Palette1202",
-  "maintainer": "niltea",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x1202",
-    "device_version": "0.0.1"
-  },
-  "matrix_pins": {
-    "cols": ["C6", "D7", "E6", "B4", "B5"],
-    "rows": ["B6", "B2", "B3"]
-  },
-  "diode_direction": "COL2ROW",
-  "encoder": {
-    "rotary": [
-      {"pin_a": "F4", "pin_b": "F5", "resolution": 2},
-      {"pin_a": "F6", "pin_b": "F7", "resolution": 2}
-    ]
-  },
-  "processor": "atmega32u4",
-  "bootloader": "atmel-dfu",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-          {"matrix": [0, 0], "x": 0, "y": 0.75},
-          {"matrix": [0, 1], "x": 1, "y": 0.25},
-          {"matrix": [0, 2], "x": 2, "y": 0},
-          {"matrix": [0, 3], "x": 3, "y": 0.5},
-          {"matrix": [0, 4], "x": 4, "y": 0},
-
-          {"matrix": [1, 0], "x": 0, "y": 1.75},
-          {"matrix": [1, 1], "x": 1, "y": 1.25},
-          {"matrix": [1, 2], "x": 2, "y": 1},
-          {"matrix": [1, 3], "x": 3, "y": 1.5},
-          {"matrix": [1, 4], "x": 4, "y": 1},
-
-          {"matrix": [2, 1], "x": 1, "y": 2.5},
-          {"matrix": [2, 2], "x": 2, "y": 2.5},
-          {"matrix": [2, 3], "x": 3, "y": 2.5},
-          {"matrix": [2, 4], "x": 4, "y": 2.5, "r": 15}
-      ]
-    }
-  }
-}
diff --git a/keyboards/palette1202/keyboard.json b/keyboards/palette1202/keyboard.json
@@ -0,0 +1,56 @@
+{
+  "keyboard_name": "Palette1202",
+  "manufacturer": "niltea",
+  "url": "https://github.com/niltea/Palette1202",
+  "maintainer": "niltea",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x1202",
+    "device_version": "0.0.1"
+  },
+  "features": {
+    "bootmagic": false,
+    "command": true,
+    "console": true,
+    "encoder": true,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": false,
+    "oled": true
+  },
+  "matrix_pins": {
+    "cols": ["C6", "D7", "E6", "B4", "B5"],
+    "rows": ["B6", "B2", "B3"]
+  },
+  "diode_direction": "COL2ROW",
+  "encoder": {
+    "rotary": [
+      {"pin_a": "F4", "pin_b": "F5", "resolution": 2},
+      {"pin_a": "F6", "pin_b": "F7", "resolution": 2}
+    ]
+  },
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+          {"matrix": [0, 0], "x": 0, "y": 0.75},
+          {"matrix": [0, 1], "x": 1, "y": 0.25},
+          {"matrix": [0, 2], "x": 2, "y": 0},
+          {"matrix": [0, 3], "x": 3, "y": 0.5},
+          {"matrix": [0, 4], "x": 4, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1.75},
+          {"matrix": [1, 1], "x": 1, "y": 1.25},
+          {"matrix": [1, 2], "x": 2, "y": 1},
+          {"matrix": [1, 3], "x": 3, "y": 1.5},
+          {"matrix": [1, 4], "x": 4, "y": 1},
+
+          {"matrix": [2, 1], "x": 1, "y": 2.5},
+          {"matrix": [2, 2], "x": 2, "y": 2.5},
+          {"matrix": [2, 3], "x": 3, "y": 2.5},
+          {"matrix": [2, 4], "x": 4, "y": 2.5, "r": 15}
+      ]
+    }
+  }
+}
diff --git a/keyboards/palette1202/rules.mk b/keyboards/palette1202/rules.mk
@@ -1,17 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE  = yes      # Mouse keys
-EXTRAKEY_ENABLE  = yes      # Audio control and System control
-CONSOLE_ENABLE   = yes      # Console for debug
-COMMAND_ENABLE   = yes      # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE   = no     # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE    = no     # Enable keyboard RGB underglow
-AUDIO_ENABLE       = no     # Audio output
-ENCODER_ENABLE     = yes    # Enable support for rotary encoders
-OLED_ENABLE = yes
-
 # Additional code
 SRC += lib/oled_helper.c  # Adding OLED
diff --git a/keyboards/pearlboards/atlas/info.json b/keyboards/pearlboards/atlas/info.json
@@ -1,438 +0,0 @@
-{
-    "keyboard_name": "Atlas",
-    "manufacturer": "Koobaczech",
-    "url": "",
-    "maintainer": "Koobaczech",
-    "usb": {
-        "vid": "0x6963",
-        "pid": "0x6964",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D5", "D4", "C1", "C2", "C3", "C5", "C7", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "F7"],
-        "rows": ["D6", "E1", "C0", "C4", "E3"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "E0", "pin_b": "D7", "resolution": 1}
-        ]
-    },
-    "indicators": {
-        "caps_lock": "F4",
-        "num_lock": "F5",
-        "scroll_lock": "F6",
-        "on_state": 0
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 8,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "B6"
-    },
-    "processor": "at90usb1286",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "Play/Pause", "matrix": [4, 2], "x": 3.5, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 1},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 1},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 1},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 1},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 1},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 1},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 1},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 1},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 1},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 1},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 1},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 1},
-                {"label": "Delete", "matrix": [0, 13], "x": 13, "y": 1},
-                {"label": "Backspace", "matrix": [0, 14], "x": 14, "y": 1},
-                {"label": "Copy", "matrix": [0, 15], "x": 15, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 2},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 2},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 2},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 2},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 2},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 2},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 2},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 2},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 2},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 2},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 2},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 2},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 2, "w": 1.5},
-                {"label": "Paste", "matrix": [1, 15], "x": 15, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 3},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 3},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 3},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 3},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 3},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 3},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 3},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 3},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 3},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 3},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 3},
-                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 3},
-                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 3, "w": 1.25},
-                {"label": "Find", "matrix": [2, 15], "x": 15, "y": 3},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 4},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 4},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 4},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 4},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 4},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 4},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 4},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 4},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 4},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 4},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 4},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 4, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 4},
-                {"label": "Fn", "matrix": [3, 15], "x": 15, "y": 4},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 1], "x": 2.25, "y": 5, "w": 1.5},
-                {"label": "Space", "matrix": [4, 7], "x": 3.75, "y": 5, "w": 7},
-                {"label": "Alt", "matrix": [4, 11], "x": 10.75, "y": 5, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 5},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 5},
-                {"label": "\u2192", "matrix": [4, 15], "x": 15, "y": 5}
-            ]
-        },
-        "LAYOUT_ansi_blocker_tsangan_wkl": {
-            "layout": [
-                {"label": "Play/Pause", "matrix": [4, 2], "x": 3.5, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 1},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 1},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 1},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 1},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 1},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 1},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 1},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 1},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 1},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 1},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 1},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 1},
-                {"label": "Backspace", "matrix": [0, 14], "x": 13, "y": 1, "w": 2},
-                {"label": "Copy", "matrix": [0, 15], "x": 15, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 2},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 2},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 2},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 2},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 2},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 2},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 2},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 2},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 2},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 2},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 2},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 2},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 2, "w": 1.5},
-                {"label": "Paste", "matrix": [1, 15], "x": 15, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 3},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 3},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 3},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 3},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 3},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 3},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 3},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 3},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 3},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 3},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 3},
-                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 3, "w": 2.25},
-                {"label": "Find", "matrix": [2, 15], "x": 15, "y": 3},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 4, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 4},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 4},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 4},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 4},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 4},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 4},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 4},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 4},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 4},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 4},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 4, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 4},
-                {"label": "Fn", "matrix": [3, 15], "x": 15, "y": 4},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 1], "x": 2.25, "y": 5, "w": 1.5},
-                {"label": "Space", "matrix": [4, 7], "x": 3.75, "y": 5, "w": 7},
-                {"label": "Alt", "matrix": [4, 11], "x": 10.75, "y": 5, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 5},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 5},
-                {"label": "\u2192", "matrix": [4, 15], "x": 15, "y": 5}
-            ]
-        },
-        "LAYOUT_ansi_blocker_tsangan_wkl_split_bs": {
-            "layout": [
-                {"label": "Play/Pause", "matrix": [4, 2], "x": 3.5, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 1},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 1},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 1},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 1},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 1},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 1},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 1},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 1},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 1},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 1},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 1},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 1},
-                {"label": "Delete", "matrix": [0, 13], "x": 13, "y": 1},
-                {"label": "Backspace", "matrix": [0, 14], "x": 14, "y": 1},
-                {"label": "Copy", "matrix": [0, 15], "x": 15, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 2},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 2},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 2},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 2},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 2},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 2},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 2},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 2},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 2},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 2},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 2},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 2},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 2, "w": 1.5},
-                {"label": "Paste", "matrix": [1, 15], "x": 15, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 3},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 3},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 3},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 3},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 3},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 3},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 3},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 3},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 3},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 3},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 3},
-                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 3, "w": 2.25},
-                {"label": "Find", "matrix": [2, 15], "x": 15, "y": 3},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 4, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 4},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 4},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 4},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 4},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 4},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 4},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 4},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 4},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 4},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 4},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 4, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 4},
-                {"label": "Fn", "matrix": [3, 15], "x": 15, "y": 4},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 1], "x": 2.25, "y": 5, "w": 1.5},
-                {"label": "Space", "matrix": [4, 7], "x": 3.75, "y": 5, "w": 7},
-                {"label": "Alt", "matrix": [4, 11], "x": 10.75, "y": 5, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 5},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 5},
-                {"label": "\u2192", "matrix": [4, 15], "x": 15, "y": 5}
-            ]
-        },
-        "LAYOUT_iso_blocker_tsangan_wkl": {
-            "layout": [
-                {"label": "Play/Pause", "matrix": [4, 2], "x": 3.5, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 1},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 1},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 1},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 1},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 1},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 1},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 1},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 1},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 1},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 1},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 1},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 1},
-                {"label": "Backspace", "matrix": [0, 14], "x": 13, "y": 1, "w": 2},
-                {"label": "Copy", "matrix": [0, 15], "x": 15, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 2},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 2},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 2},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 2},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 2},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 2},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 2},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 2},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 2},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 2},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 2},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 2},
-                {"label": "Paste", "matrix": [1, 15], "x": 15, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 3},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 3},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 3},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 3},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 3},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 3},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 3},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 3},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 3},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 3},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 3},
-                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 3},
-                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
-                {"label": "Find", "matrix": [2, 15], "x": 15, "y": 3},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 4},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 4},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 4},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 4},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 4},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 4},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 4},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 4},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 4},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 4},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 4},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 4, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 4},
-                {"label": "Fn", "matrix": [3, 15], "x": 15, "y": 4},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 1], "x": 2.25, "y": 5, "w": 1.5},
-                {"label": "Space", "matrix": [4, 7], "x": 3.75, "y": 5, "w": 7},
-                {"label": "Alt", "matrix": [4, 11], "x": 10.75, "y": 5, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 5},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 5},
-                {"label": "\u2192", "matrix": [4, 15], "x": 15, "y": 5}
-            ]
-        },
-        "LAYOUT_iso_blocker_tsangan_wkl_split_bs": {
-            "layout": [
-                {"label": "Play/Pause", "matrix": [4, 2], "x": 3.5, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 1},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 1},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 1},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 1},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 1},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 1},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 1},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 1},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 1},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 1},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 1},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 1},
-                {"label": "Delete", "matrix": [0, 13], "x": 13, "y": 1},
-                {"label": "Backspace", "matrix": [0, 14], "x": 14, "y": 1},
-                {"label": "Copy", "matrix": [0, 15], "x": 15, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 2},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 2},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 2},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 2},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 2},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 2},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 2},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 2},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 2},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 2},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 2},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 2},
-                {"label": "Paste", "matrix": [1, 15], "x": 15, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 3},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 3},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 3},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 3},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 3},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 3},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 3},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 3},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 3},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 3},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 3},
-                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 3},
-                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
-                {"label": "Find", "matrix": [2, 15], "x": 15, "y": 3},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 4},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 4},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 4},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 4},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 4},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 4},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 4},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 4},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 4},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 4},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 4},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 4, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 4},
-                {"label": "Fn", "matrix": [3, 15], "x": 15, "y": 4},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 1], "x": 2.25, "y": 5, "w": 1.5},
-                {"label": "Space", "matrix": [4, 7], "x": 3.75, "y": 5, "w": 7},
-                {"label": "Alt", "matrix": [4, 11], "x": 10.75, "y": 5, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 5},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 5},
-                {"label": "\u2192", "matrix": [4, 15], "x": 15, "y": 5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/pearlboards/atlas/keyboard.json b/keyboards/pearlboards/atlas/keyboard.json
@@ -0,0 +1,451 @@
+{
+    "keyboard_name": "Atlas",
+    "manufacturer": "Koobaczech",
+    "url": "",
+    "maintainer": "Koobaczech",
+    "usb": {
+        "vid": "0x6963",
+        "pid": "0x6964",
+        "device_version": "0.0.1"
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "audio": true,
+        "bootmagic": false,
+        "encoder": true,
+        "extrakey": true,
+        "haptic": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["D5", "D4", "C1", "C2", "C3", "C5", "C7", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "F7"],
+        "rows": ["D6", "E1", "C0", "C4", "E3"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "E0", "pin_b": "D7", "resolution": 1}
+        ]
+    },
+    "indicators": {
+        "caps_lock": "F4",
+        "num_lock": "F5",
+        "scroll_lock": "F6",
+        "on_state": 0
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 8,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B6"
+    },
+    "processor": "at90usb1286",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Play/Pause", "matrix": [4, 2], "x": 3.5, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 1},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 1},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 1},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 1},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 1},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 1},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 1},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 1},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 1},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 1},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 1},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 1},
+                {"label": "Delete", "matrix": [0, 13], "x": 13, "y": 1},
+                {"label": "Backspace", "matrix": [0, 14], "x": 14, "y": 1},
+                {"label": "Copy", "matrix": [0, 15], "x": 15, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 2},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 2},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 2},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 2},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 2},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 2},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 2},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 2},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 2},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 2},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 2},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 2},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"label": "Paste", "matrix": [1, 15], "x": 15, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 3},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 3},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 3},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 3},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 3},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 3},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 3},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 3},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 3},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 3},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 3},
+                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 3},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 3, "w": 1.25},
+                {"label": "Find", "matrix": [2, 15], "x": 15, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 4},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 4},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 4},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 4},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 4},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 4},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 4},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 4},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 4},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 4},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 4},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 4},
+                {"label": "Fn", "matrix": [3, 15], "x": 15, "y": 4},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 1], "x": 2.25, "y": 5, "w": 1.5},
+                {"label": "Space", "matrix": [4, 7], "x": 3.75, "y": 5, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 10.75, "y": 5, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 5},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 5},
+                {"label": "\u2192", "matrix": [4, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_ansi_blocker_tsangan_wkl": {
+            "layout": [
+                {"label": "Play/Pause", "matrix": [4, 2], "x": 3.5, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 1},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 1},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 1},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 1},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 1},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 1},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 1},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 1},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 1},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 1},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 1},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 1},
+                {"label": "Backspace", "matrix": [0, 14], "x": 13, "y": 1, "w": 2},
+                {"label": "Copy", "matrix": [0, 15], "x": 15, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 2},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 2},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 2},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 2},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 2},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 2},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 2},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 2},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 2},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 2},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 2},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 2},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"label": "Paste", "matrix": [1, 15], "x": 15, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 3},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 3},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 3},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 3},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 3},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 3},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 3},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 3},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 3},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 3},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 3},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"label": "Find", "matrix": [2, 15], "x": 15, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 4, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 4},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 4},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 4},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 4},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 4},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 4},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 4},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 4},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 4},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 4},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 4},
+                {"label": "Fn", "matrix": [3, 15], "x": 15, "y": 4},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 1], "x": 2.25, "y": 5, "w": 1.5},
+                {"label": "Space", "matrix": [4, 7], "x": 3.75, "y": 5, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 10.75, "y": 5, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 5},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 5},
+                {"label": "\u2192", "matrix": [4, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_ansi_blocker_tsangan_wkl_split_bs": {
+            "layout": [
+                {"label": "Play/Pause", "matrix": [4, 2], "x": 3.5, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 1},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 1},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 1},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 1},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 1},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 1},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 1},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 1},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 1},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 1},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 1},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 1},
+                {"label": "Delete", "matrix": [0, 13], "x": 13, "y": 1},
+                {"label": "Backspace", "matrix": [0, 14], "x": 14, "y": 1},
+                {"label": "Copy", "matrix": [0, 15], "x": 15, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 2},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 2},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 2},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 2},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 2},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 2},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 2},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 2},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 2},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 2},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 2},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 2},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"label": "Paste", "matrix": [1, 15], "x": 15, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 3},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 3},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 3},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 3},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 3},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 3},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 3},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 3},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 3},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 3},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 3},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"label": "Find", "matrix": [2, 15], "x": 15, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 4, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 4},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 4},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 4},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 4},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 4},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 4},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 4},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 4},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 4},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 4},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 4},
+                {"label": "Fn", "matrix": [3, 15], "x": 15, "y": 4},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 1], "x": 2.25, "y": 5, "w": 1.5},
+                {"label": "Space", "matrix": [4, 7], "x": 3.75, "y": 5, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 10.75, "y": 5, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 5},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 5},
+                {"label": "\u2192", "matrix": [4, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_iso_blocker_tsangan_wkl": {
+            "layout": [
+                {"label": "Play/Pause", "matrix": [4, 2], "x": 3.5, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 1},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 1},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 1},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 1},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 1},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 1},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 1},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 1},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 1},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 1},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 1},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 1},
+                {"label": "Backspace", "matrix": [0, 14], "x": 13, "y": 1, "w": 2},
+                {"label": "Copy", "matrix": [0, 15], "x": 15, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 2},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 2},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 2},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 2},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 2},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 2},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 2},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 2},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 2},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 2},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 2},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 2},
+                {"label": "Paste", "matrix": [1, 15], "x": 15, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 3},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 3},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 3},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 3},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 3},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 3},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 3},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 3},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 3},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 3},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 3},
+                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 3},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"label": "Find", "matrix": [2, 15], "x": 15, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 4},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 4},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 4},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 4},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 4},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 4},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 4},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 4},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 4},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 4},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 4},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 4},
+                {"label": "Fn", "matrix": [3, 15], "x": 15, "y": 4},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 1], "x": 2.25, "y": 5, "w": 1.5},
+                {"label": "Space", "matrix": [4, 7], "x": 3.75, "y": 5, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 10.75, "y": 5, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 5},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 5},
+                {"label": "\u2192", "matrix": [4, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_iso_blocker_tsangan_wkl_split_bs": {
+            "layout": [
+                {"label": "Play/Pause", "matrix": [4, 2], "x": 3.5, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 1},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 1},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 1},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 1},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 1},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 1},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 1},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 1},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 1},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 1},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 1},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 1},
+                {"label": "Delete", "matrix": [0, 13], "x": 13, "y": 1},
+                {"label": "Backspace", "matrix": [0, 14], "x": 14, "y": 1},
+                {"label": "Copy", "matrix": [0, 15], "x": 15, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 2},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 2},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 2},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 2},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 2},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 2},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 2},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 2},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 2},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 2},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 2},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 2},
+                {"label": "Paste", "matrix": [1, 15], "x": 15, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 3},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 3},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 3},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 3},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 3},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 3},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 3},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 3},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 3},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 3},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 3},
+                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 3},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"label": "Find", "matrix": [2, 15], "x": 15, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 4},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 4},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 4},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 4},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 4},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 4},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 4},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 4},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 4},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 4},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 4},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 4},
+                {"label": "Fn", "matrix": [3, 15], "x": 15, "y": 4},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 1], "x": 2.25, "y": 5, "w": 1.5},
+                {"label": "Space", "matrix": [4, 7], "x": 3.75, "y": 5, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 10.75, "y": 5, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 5},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 5},
+                {"label": "\u2192", "matrix": [4, 15], "x": 15, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/pearlboards/atlas/rules.mk b/keyboards/pearlboards/atlas/rules.mk
@@ -1,17 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = yes          # Audio output
-ENCODER_ENABLE = yes
-HAPTIC_ENABLE = yes
 HAPTIC_DRIVER = drv2605l
-
-LTO_ENABLE = yes
diff --git a/keyboards/pearlboards/pearl/info.json b/keyboards/pearlboards/pearl/info.json
@@ -1,148 +0,0 @@
-{
-    "keyboard_name": "Pearl",
-    "manufacturer": "Koobaczech",
-    "url": "",
-    "maintainer": "Koobaczech",
-    "usb": {
-        "vid": "0x6963",
-        "pid": "0x6965",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D2", "F1", "F4", "F5", "F6", "C7", "B6", "B5", "B4", "D7", "D6", "D4", "D5"],
-        "rows": ["D3", "F7", "F0", "E6"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "B0",
-        "num_lock": "B1",
-        "scroll_lock": "B2",
-        "on_state": 0
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 10,
-        "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": "B3"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "debounce": 4,
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "Q", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "W", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "E", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "R", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "T", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "Y", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "U", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "I", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "O", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "P", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "Backspace", "matrix": [0, 12], "x": 12, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "A", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "S", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "D", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "F", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "G", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "H", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "J", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "K", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "L", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": ";", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "Enter", "matrix": [1, 11], "x": 11.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "Z", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "X", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "C", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "V", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "B", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "N", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "M", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": ",", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": ".", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": "/", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "Shift", "matrix": [2, 11], "x": 11.75, "y": 2, "w": 1.25},
-
-                {"label": "Ctrl", "matrix": [3, 0], "x": 1.125, "y": 3},
-                {"label": "Alt", "matrix": [3, 1], "x": 2.125, "y": 3, "w": 1.25},
-                {"label": "GUI", "matrix": [3, 2], "x": 3.375, "y": 3, "w": 1.25},
-                {"label": "Space", "matrix": [3, 3], "x": 4.625, "y": 3, "w": 2.25},
-                {"label": "Backspace", "matrix": [3, 4], "x": 6.875, "y": 3, "w": 2.75},
-                {"label": "Menu", "matrix": [3, 5], "x": 9.625, "y": 3, "w": 1.25},
-                {"label": "Fn", "matrix": [3, 6], "x": 10.875, "y": 3}
-            ]
-        },
-        "LAYOUT_625u_space": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "Q", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "W", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "E", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "R", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "T", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "Y", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "U", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "I", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "O", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "P", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "Backspace", "matrix": [0, 12], "x": 12, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "A", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "S", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "D", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "F", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "G", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "H", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "J", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "K", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "L", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": ";", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "Enter", "matrix": [1, 11], "x": 11.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "Z", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "X", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "C", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "V", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "B", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "N", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "M", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": ",", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": ".", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": "/", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "Shift", "matrix": [2, 11], "x": 11.75, "y": 2, "w": 1.25},
-
-                {"label": "Ctrl", "matrix": [3, 0], "x": 1.125, "y": 3},
-                {"label": "Alt", "matrix": [3, 1], "x": 2.125, "y": 3, "w": 1.25},
-                {"label": "Space", "matrix": [3, 3], "x": 3.375, "y": 3, "w": 6.25},
-                {"label": "Menu", "matrix": [3, 5], "x": 9.625, "y": 3, "w": 1.25},
-                {"label": "Fn", "matrix": [3, 6], "x": 10.875, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/pearlboards/pearl/keyboard.json b/keyboards/pearlboards/pearl/keyboard.json
@@ -0,0 +1,160 @@
+{
+    "keyboard_name": "Pearl",
+    "manufacturer": "Koobaczech",
+    "url": "",
+    "maintainer": "Koobaczech",
+    "usb": {
+        "vid": "0x6963",
+        "pid": "0x6965",
+        "device_version": "0.0.1"
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "audio": true,
+        "bootmagic": false,
+        "extrakey": true,
+        "haptic": true,
+        "mousekey": false,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["D2", "F1", "F4", "F5", "F6", "C7", "B6", "B5", "B4", "D7", "D6", "D4", "D5"],
+        "rows": ["D3", "F7", "F0", "E6"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "B0",
+        "num_lock": "B1",
+        "scroll_lock": "B2",
+        "on_state": 0
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 10,
+        "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": "B3"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "debounce": 4,
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "Q", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "W", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "E", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "R", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "T", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "Y", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "U", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "I", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "O", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "P", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "Backspace", "matrix": [0, 12], "x": 12, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "A", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "S", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "D", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "F", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "G", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "H", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "J", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "K", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "L", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": ";", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "Enter", "matrix": [1, 11], "x": 11.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "Z", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "X", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "C", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "V", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "B", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "N", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "M", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": ",", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": ".", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "/", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "Shift", "matrix": [2, 11], "x": 11.75, "y": 2, "w": 1.25},
+
+                {"label": "Ctrl", "matrix": [3, 0], "x": 1.125, "y": 3},
+                {"label": "Alt", "matrix": [3, 1], "x": 2.125, "y": 3, "w": 1.25},
+                {"label": "GUI", "matrix": [3, 2], "x": 3.375, "y": 3, "w": 1.25},
+                {"label": "Space", "matrix": [3, 3], "x": 4.625, "y": 3, "w": 2.25},
+                {"label": "Backspace", "matrix": [3, 4], "x": 6.875, "y": 3, "w": 2.75},
+                {"label": "Menu", "matrix": [3, 5], "x": 9.625, "y": 3, "w": 1.25},
+                {"label": "Fn", "matrix": [3, 6], "x": 10.875, "y": 3}
+            ]
+        },
+        "LAYOUT_625u_space": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "Q", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "W", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "E", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "R", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "T", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "Y", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "U", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "I", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "O", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "P", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "Backspace", "matrix": [0, 12], "x": 12, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "A", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "S", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "D", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "F", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "G", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "H", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "J", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "K", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "L", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": ";", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "Enter", "matrix": [1, 11], "x": 11.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "Z", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "X", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "C", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "V", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "B", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "N", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "M", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": ",", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": ".", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "/", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "Shift", "matrix": [2, 11], "x": 11.75, "y": 2, "w": 1.25},
+
+                {"label": "Ctrl", "matrix": [3, 0], "x": 1.125, "y": 3},
+                {"label": "Alt", "matrix": [3, 1], "x": 2.125, "y": 3, "w": 1.25},
+                {"label": "Space", "matrix": [3, 3], "x": 3.375, "y": 3, "w": 6.25},
+                {"label": "Menu", "matrix": [3, 5], "x": 9.625, "y": 3, "w": 1.25},
+                {"label": "Fn", "matrix": [3, 6], "x": 10.875, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/pearlboards/pearl/rules.mk b/keyboards/pearlboards/pearl/rules.mk
@@ -1,16 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = yes          # Audio output
-HAPTIC_ENABLE = yes
 HAPTIC_DRIVER = drv2605l
-
-LTO_ENABLE = yes
diff --git a/keyboards/pearlboards/zeus/info.json b/keyboards/pearlboards/zeus/info.json
@@ -1,1383 +0,0 @@
-{
-    "keyboard_name": "Zeus",
-    "manufacturer": "Koobaczech",
-    "url": "",
-    "maintainer": "Koobaczech",
-    "usb": {
-        "vid": "0x6963",
-        "pid": "0x6966",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F1", "F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C2", "C0"],
-        "rows": ["F0", "C1", "E1", "E0", "D7", "D6"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "E7", "pin_b": "E6", "resolution": 1}
-        ]
-    },
-    "indicators": {
-        "caps_lock": "C5",
-        "num_lock": "C4",
-        "scroll_lock": "C3",
-        "on_state": 0
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 2,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "D5"
-    },
-    "processor": "at90usb1286",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
-                {"label": "Delete", "matrix": [1, 13], "x": 13, "y": 2.75},
-                {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 2.75},
-
-                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
-                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 3.75, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
-                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 4.75},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 4.75, "w": 1.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 5.75},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 1.75},
-                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 5.75},
-
-                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 6.75, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 6.75, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 6.75, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 6.75, "w": 1.25},
-                {"label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 6.75, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 12], "x": 13.75, "y": 6.75, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
-            ]
-        },
-        "LAYOUT_ansi": {
-            "layout": [
-                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
-                {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 2.75, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
-                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 3.75, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
-                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 4.75, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 6.75, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 6.75, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 6.75, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 6.75, "w": 1.25},
-                {"label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 6.75, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 12], "x": 13.75, "y": 6.75, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
-            ]
-        },
-        "LAYOUT_ansi_split_bs_rshift": {
-            "layout": [
-                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
-                {"label": "Delete", "matrix": [1, 13], "x": 13, "y": 2.75},
-                {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 2.75},
-
-                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
-                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 3.75, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
-                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 4.75, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 1.75},
-                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 5.75},
-
-                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 6.75, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 6.75, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 6.75, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 6.75, "w": 1.25},
-                {"label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 6.75, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 12], "x": 13.75, "y": 6.75, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
-            ]
-        },
-        "LAYOUT_ansi_tsangan": {
-            "layout": [
-                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
-                {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 2.75, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
-                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 3.75, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
-                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 4.75, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 6.75},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 6.75, "w": 7},
-                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 6.75, "w": 1.5},
-                {"label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 6.75},
-                {"label": "Ctrl", "matrix": [5, 12], "x": 13.5, "y": 6.75, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
-            ]
-        },
-        "LAYOUT_ansi_tsangan_split_bs_rshift": {
-            "layout": [
-                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
-                {"label": "Delete", "matrix": [1, 13], "x": 13, "y": 2.75},
-                {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 2.75},
-
-                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
-                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 3.75, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
-                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 4.75, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 1.75},
-                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 5.75},
-
-                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 6.75},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 6.75, "w": 7},
-                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 6.75, "w": 1.5},
-                {"label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 6.75},
-                {"label": "Ctrl", "matrix": [5, 12], "x": 13.5, "y": 6.75, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
-            ]
-        },
-        "LAYOUT_ansi_wkl": {
-            "layout": [
-                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
-                {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 2.75, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
-                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 3.75, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
-                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 4.75, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.5},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 6.75, "w": 7},
-                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 6.75, "w": 1.5},
-                {"label": "Ctrl", "matrix": [5, 12], "x": 13.5, "y": 6.75, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
-            ]
-        },
-        "LAYOUT_ansi_wkl_split_bs_rshift": {
-            "layout": [
-                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
-                {"label": "Delete", "matrix": [1, 13], "x": 13, "y": 2.75},
-                {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 2.75},
-
-                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
-                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 3.75, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
-                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 4.75, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 1.75},
-                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 5.75},
-
-                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.5},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 6.75, "w": 7},
-                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 6.75, "w": 1.5},
-                {"label": "Ctrl", "matrix": [5, 12], "x": 13.5, "y": 6.75, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
-            ]
-        },
-        "LAYOUT_iso": {
-            "layout": [
-                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
-                {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 2.75, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
-                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
-
-                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
-                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 4.75},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3.75, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 5.75},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 6.75, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 6.75, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 6.75, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 6.75, "w": 1.25},
-                {"label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 6.75, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 12], "x": 13.75, "y": 6.75, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
-            ]
-        },
-        "LAYOUT_iso_split_bs_rshift": {
-            "layout": [
-                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
-                {"label": "Delete", "matrix": [1, 13], "x": 13, "y": 2.75},
-                {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 2.75},
-
-                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
-                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
-
-                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
-                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 4.75},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3.75, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 5.75},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 1.75},
-                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 5.75},
-
-                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 6.75, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 6.75, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 6.75, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 6.75, "w": 1.25},
-                {"label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 6.75, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 12], "x": 13.75, "y": 6.75, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
-            ]
-        },
-        "LAYOUT_iso_tsangan": {
-            "layout": [
-                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
-                {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 2.75, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
-                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
-
-                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
-                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 4.75},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3.75, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 5.75},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 6.75},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 6.75, "w": 7},
-                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 6.75, "w": 1.5},
-                {"label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 6.75},
-                {"label": "Ctrl", "matrix": [5, 12], "x": 13.5, "y": 6.75, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
-            ]
-        },
-        "LAYOUT_iso_tsangan_split_bs_rshift": {
-            "layout": [
-                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
-                {"label": "Delete", "matrix": [1, 13], "x": 13, "y": 2.75},
-                {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 2.75},
-
-                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
-                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
-
-                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
-                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 4.75},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3.75, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 5.75},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 1.75},
-                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 5.75},
-
-                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 6.75},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 6.75, "w": 7},
-                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 6.75, "w": 1.5},
-                {"label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 6.75},
-                {"label": "Ctrl", "matrix": [5, 12], "x": 13.5, "y": 6.75, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
-            ]
-        },
-        "LAYOUT_iso_wkl": {
-            "layout": [
-                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
-                {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 2.75, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
-                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
-
-                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
-                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 4.75},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3.75, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 5.75},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.5},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 6.75, "w": 7},
-                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 6.75, "w": 1.5},
-                {"label": "Ctrl", "matrix": [5, 12], "x": 13.5, "y": 6.75, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
-            ]
-        },
-        "LAYOUT_iso_wkl_split_bs_rshift": {
-            "layout": [
-                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
-                {"label": "Delete", "matrix": [1, 13], "x": 13, "y": 2.75},
-                {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 2.75},
-
-                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
-                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
-
-                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
-                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 4.75},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3.75, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 5.75},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 1.75},
-                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 5.75},
-
-                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.5},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 6.75, "w": 7},
-                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 6.75, "w": 1.5},
-                {"label": "Ctrl", "matrix": [5, 12], "x": 13.5, "y": 6.75, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
-            ]
-        }
-    }
-}
diff --git a/keyboards/pearlboards/zeus/keyboard.json b/keyboards/pearlboards/zeus/keyboard.json
@@ -0,0 +1,1396 @@
+{
+    "keyboard_name": "Zeus",
+    "manufacturer": "Koobaczech",
+    "url": "",
+    "maintainer": "Koobaczech",
+    "usb": {
+        "vid": "0x6963",
+        "pid": "0x6966",
+        "device_version": "0.0.1"
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "audio": true,
+        "bootmagic": false,
+        "encoder": true,
+        "extrakey": true,
+        "haptic": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["F1", "F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C2", "C0"],
+        "rows": ["F0", "C1", "E1", "E0", "D7", "D6"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "E7", "pin_b": "E6", "resolution": 1}
+        ]
+    },
+    "indicators": {
+        "caps_lock": "C5",
+        "num_lock": "C4",
+        "scroll_lock": "C3",
+        "on_state": 0
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 2,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "D5"
+    },
+    "processor": "at90usb1286",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
+                {"label": "Delete", "matrix": [1, 13], "x": 13, "y": 2.75},
+                {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 2.75},
+
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
+                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 3.75, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
+                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 4.75},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 4.75, "w": 1.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 5.75},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 1.75},
+                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 5.75},
+
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 6.75, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 6.75, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 6.75, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 6.75, "w": 1.25},
+                {"label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 6.75, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.75, "y": 6.75, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
+            ]
+        },
+        "LAYOUT_ansi": {
+            "layout": [
+                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
+                {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 2.75, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
+                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 3.75, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
+                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 4.75, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 6.75, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 6.75, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 6.75, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 6.75, "w": 1.25},
+                {"label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 6.75, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.75, "y": 6.75, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
+            ]
+        },
+        "LAYOUT_ansi_split_bs_rshift": {
+            "layout": [
+                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
+                {"label": "Delete", "matrix": [1, 13], "x": 13, "y": 2.75},
+                {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 2.75},
+
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
+                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 3.75, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
+                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 4.75, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 1.75},
+                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 5.75},
+
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 6.75, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 6.75, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 6.75, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 6.75, "w": 1.25},
+                {"label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 6.75, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.75, "y": 6.75, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
+            ]
+        },
+        "LAYOUT_ansi_tsangan": {
+            "layout": [
+                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
+                {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 2.75, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
+                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 3.75, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
+                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 4.75, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 6.75},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 6.75, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 6.75, "w": 1.5},
+                {"label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 6.75},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.5, "y": 6.75, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
+            ]
+        },
+        "LAYOUT_ansi_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
+                {"label": "Delete", "matrix": [1, 13], "x": 13, "y": 2.75},
+                {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 2.75},
+
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
+                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 3.75, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
+                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 4.75, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 1.75},
+                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 5.75},
+
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 6.75},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 6.75, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 6.75, "w": 1.5},
+                {"label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 6.75},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.5, "y": 6.75, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
+            ]
+        },
+        "LAYOUT_ansi_wkl": {
+            "layout": [
+                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
+                {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 2.75, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
+                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 3.75, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
+                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 4.75, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 6.75, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 6.75, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.5, "y": 6.75, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
+            ]
+        },
+        "LAYOUT_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
+                {"label": "Delete", "matrix": [1, 13], "x": 13, "y": 2.75},
+                {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 2.75},
+
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
+                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 3.75, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
+                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 4.75, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 1.75},
+                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 5.75},
+
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 6.75, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 6.75, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.5, "y": 6.75, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
+                {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 2.75, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
+                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
+
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
+                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 4.75},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3.75, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 5.75},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 6.75, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 6.75, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 6.75, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 6.75, "w": 1.25},
+                {"label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 6.75, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.75, "y": 6.75, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
+            ]
+        },
+        "LAYOUT_iso_split_bs_rshift": {
+            "layout": [
+                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
+                {"label": "Delete", "matrix": [1, 13], "x": 13, "y": 2.75},
+                {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 2.75},
+
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
+                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
+
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
+                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 4.75},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3.75, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 5.75},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 1.75},
+                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 5.75},
+
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 6.75, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 6.75, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 6.75, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 6.75, "w": 1.25},
+                {"label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 6.75, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.75, "y": 6.75, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
+            ]
+        },
+        "LAYOUT_iso_tsangan": {
+            "layout": [
+                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
+                {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 2.75, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
+                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
+
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
+                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 4.75},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3.75, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 5.75},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 6.75},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 6.75, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 6.75, "w": 1.5},
+                {"label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 6.75},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.5, "y": 6.75, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
+            ]
+        },
+        "LAYOUT_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
+                {"label": "Delete", "matrix": [1, 13], "x": 13, "y": 2.75},
+                {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 2.75},
+
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
+                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
+
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
+                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 4.75},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3.75, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 5.75},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 1.75},
+                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 5.75},
+
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 6.75},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 6.75, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 6.75, "w": 1.5},
+                {"label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 6.75},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.5, "y": 6.75, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
+            ]
+        },
+        "LAYOUT_iso_wkl": {
+            "layout": [
+                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
+                {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 2.75, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
+                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
+
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
+                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 4.75},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3.75, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 5.75},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 6.75, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 6.75, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.5, "y": 6.75, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
+            ]
+        },
+        "LAYOUT_iso_wkl_split_bs_rshift": {
+            "layout": [
+                {"label": "Play/Pause", "matrix": [4, 15], "x": 3, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 1.5},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 1.5},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 1.5},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 1.5},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 1.5},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 1.5},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 1.5},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 1.5},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 1.5},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 1.5},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 1.5},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 1.5},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 1.5},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 2.75},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.75},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.75},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.75},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 2.75},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 2.75},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 2.75},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 2.75},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 2.75},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 2.75},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 2.75},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 2.75},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 2.75},
+                {"label": "Delete", "matrix": [1, 13], "x": 13, "y": 2.75},
+                {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 2.75},
+
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 2.75},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 2.75},
+                {"label": "Page Up", "matrix": [1, 17], "x": 17.25, "y": 2.75},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 3.75, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 3.75},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 3.75},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 3.75},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 3.75},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 3.75},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 3.75},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 3.75},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 3.75},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 3.75},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 3.75},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 3.75},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 3.75},
+
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 3.75},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 3.75},
+                {"label": "Page Down", "matrix": [2, 17], "x": 17.25, "y": 3.75},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 4.75, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 4.75},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 4.75},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 4.75},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 4.75},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 4.75},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 4.75},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 4.75},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 4.75},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 4.75},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 4.75},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 4.75},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 4.75},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3.75, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 5.75, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 5.75},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 5.75},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 5.75},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 5.75},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 5.75},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 5.75},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 5.75},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 5.75},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 5.75},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 5.75},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 5.75},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 5.75, "w": 1.75},
+                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 5.75},
+
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 5.75},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 6.75, "w": 1.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 6.75, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 6.75, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 6.75, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.5, "y": 6.75, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 6.75},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 6.75},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 6.75}
+            ]
+        }
+    }
+}
diff --git a/keyboards/pearlboards/zeus/rules.mk b/keyboards/pearlboards/zeus/rules.mk
@@ -1,17 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = yes          # Audio output
-ENCODER_ENABLE = yes        # Rotary encoder
-HAPTIC_ENABLE = yes         # Rumble feefback
 HAPTIC_DRIVER = drv2605l    # Rumble motor
-
-LTO_ENABLE = yes            # Link time optimization
diff --git a/keyboards/peej/rosaline/ortho/info.json b/keyboards/peej/rosaline/ortho/info.json
@@ -1,88 +0,0 @@
-{
-  "keyboard_name": "Rosaline Ortho",
-  "manufacturer": "Peej",
-  "url": "https://github.com/peej/rosaline-keyboard",
-  "maintainer": "Peej",
-  "usb": {
-    "vid": "0x706A",
-    "pid": "0x0003",
-    "device_version": "0.0.1",
-    "max_power": 100
-  },
-  "matrix_pins": {
-    "cols": ["B0", "D7", "D6", "C2", "D4", "D1", "D0", "C1"],
-    "rows": ["C0", "B5", "B4", "B3", "B2", "B1", "C3", "D5"]
-  },
-  "diode_direction": "COL2ROW",
-  "processor": "atmega328p",
-  "bootloader": "usbasploader",
-  "layouts": {
-    "LAYOUT_ortho_4x15": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [4, 0], "x": 1, "y": 0},
-        {"matrix": [0, 1], "x": 2, "y": 0},
-        {"matrix": [4, 1], "x": 3, "y": 0},
-        {"matrix": [0, 2], "x": 4, "y": 0},
-        {"matrix": [4, 2], "x": 5, "y": 0},
-        {"matrix": [0, 3], "x": 6, "y": 0},
-        {"matrix": [4, 3], "x": 7, "y": 0},
-        {"matrix": [0, 4], "x": 8, "y": 0},
-        {"matrix": [4, 4], "x": 9, "y": 0},
-        {"matrix": [0, 5], "x": 10, "y": 0},
-        {"matrix": [4, 5], "x": 11, "y": 0},
-        {"matrix": [0, 6], "x": 12, "y": 0},
-        {"matrix": [4, 6], "x": 13, "y": 0},
-        {"matrix": [0, 7], "x": 14, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1},
-        {"matrix": [5, 0], "x": 1, "y": 1},
-        {"matrix": [1, 1], "x": 2, "y": 1},
-        {"matrix": [5, 1], "x": 3, "y": 1},
-        {"matrix": [1, 2], "x": 4, "y": 1},
-        {"matrix": [5, 2], "x": 5, "y": 1},
-        {"matrix": [1, 3], "x": 6, "y": 1},
-        {"matrix": [5, 3], "x": 7, "y": 1},
-        {"matrix": [1, 4], "x": 8, "y": 1},
-        {"matrix": [5, 4], "x": 9, "y": 1},
-        {"matrix": [1, 5], "x": 10, "y": 1},
-        {"matrix": [5, 5], "x": 11, "y": 1},
-        {"matrix": [1, 6], "x": 12, "y": 1},
-        {"matrix": [5, 6], "x": 13, "y": 1},
-        {"matrix": [1, 7], "x": 14, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-        {"matrix": [6, 0], "x": 1, "y": 2},
-        {"matrix": [2, 1], "x": 2, "y": 2},
-        {"matrix": [6, 1], "x": 3, "y": 2},
-        {"matrix": [2, 2], "x": 4, "y": 2},
-        {"matrix": [6, 2], "x": 5, "y": 2},
-        {"matrix": [2, 3], "x": 6, "y": 2},
-        {"matrix": [6, 3], "x": 7, "y": 2},
-        {"matrix": [2, 4], "x": 8, "y": 2},
-        {"matrix": [6, 4], "x": 9, "y": 2},
-        {"matrix": [2, 5], "x": 10, "y": 2},
-        {"matrix": [6, 5], "x": 11, "y": 2},
-        {"matrix": [2, 6], "x": 12, "y": 2},
-        {"matrix": [6, 6], "x": 13, "y": 2},
-        {"matrix": [2, 7], "x": 14, "y": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3},
-        {"matrix": [7, 0], "x": 1, "y": 3},
-        {"matrix": [3, 1], "x": 2, "y": 3},
-        {"matrix": [7, 1], "x": 3, "y": 3},
-        {"matrix": [3, 2], "x": 4, "y": 3},
-        {"matrix": [7, 2], "x": 5, "y": 3},
-        {"matrix": [3, 3], "x": 6, "y": 3},
-        {"matrix": [7, 3], "x": 7, "y": 3},
-        {"matrix": [3, 4], "x": 8, "y": 3},
-        {"matrix": [7, 4], "x": 9, "y": 3},
-        {"matrix": [3, 5], "x": 10, "y": 3},
-        {"matrix": [7, 5], "x": 11, "y": 3},
-        {"matrix": [3, 6], "x": 12, "y": 3},
-        {"matrix": [7, 6], "x": 13, "y": 3},
-        {"matrix": [3, 7], "x": 14, "y": 3}
-      ]
-    }
-  }
-}
diff --git a/keyboards/peej/rosaline/ortho/keyboard.json b/keyboards/peej/rosaline/ortho/keyboard.json
@@ -0,0 +1,94 @@
+{
+  "keyboard_name": "Rosaline Ortho",
+  "manufacturer": "Peej",
+  "url": "https://github.com/peej/rosaline-keyboard",
+  "maintainer": "Peej",
+  "usb": {
+    "vid": "0x706A",
+    "pid": "0x0003",
+    "device_version": "0.0.1",
+    "max_power": 100
+  },
+  "features": {
+    "bootmagic": true,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": false
+  },
+  "matrix_pins": {
+    "cols": ["B0", "D7", "D6", "C2", "D4", "D1", "D0", "C1"],
+    "rows": ["C0", "B5", "B4", "B3", "B2", "B1", "C3", "D5"]
+  },
+  "diode_direction": "COL2ROW",
+  "processor": "atmega328p",
+  "bootloader": "usbasploader",
+  "layouts": {
+    "LAYOUT_ortho_4x15": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [4, 0], "x": 1, "y": 0},
+        {"matrix": [0, 1], "x": 2, "y": 0},
+        {"matrix": [4, 1], "x": 3, "y": 0},
+        {"matrix": [0, 2], "x": 4, "y": 0},
+        {"matrix": [4, 2], "x": 5, "y": 0},
+        {"matrix": [0, 3], "x": 6, "y": 0},
+        {"matrix": [4, 3], "x": 7, "y": 0},
+        {"matrix": [0, 4], "x": 8, "y": 0},
+        {"matrix": [4, 4], "x": 9, "y": 0},
+        {"matrix": [0, 5], "x": 10, "y": 0},
+        {"matrix": [4, 5], "x": 11, "y": 0},
+        {"matrix": [0, 6], "x": 12, "y": 0},
+        {"matrix": [4, 6], "x": 13, "y": 0},
+        {"matrix": [0, 7], "x": 14, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [5, 0], "x": 1, "y": 1},
+        {"matrix": [1, 1], "x": 2, "y": 1},
+        {"matrix": [5, 1], "x": 3, "y": 1},
+        {"matrix": [1, 2], "x": 4, "y": 1},
+        {"matrix": [5, 2], "x": 5, "y": 1},
+        {"matrix": [1, 3], "x": 6, "y": 1},
+        {"matrix": [5, 3], "x": 7, "y": 1},
+        {"matrix": [1, 4], "x": 8, "y": 1},
+        {"matrix": [5, 4], "x": 9, "y": 1},
+        {"matrix": [1, 5], "x": 10, "y": 1},
+        {"matrix": [5, 5], "x": 11, "y": 1},
+        {"matrix": [1, 6], "x": 12, "y": 1},
+        {"matrix": [5, 6], "x": 13, "y": 1},
+        {"matrix": [1, 7], "x": 14, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [6, 0], "x": 1, "y": 2},
+        {"matrix": [2, 1], "x": 2, "y": 2},
+        {"matrix": [6, 1], "x": 3, "y": 2},
+        {"matrix": [2, 2], "x": 4, "y": 2},
+        {"matrix": [6, 2], "x": 5, "y": 2},
+        {"matrix": [2, 3], "x": 6, "y": 2},
+        {"matrix": [6, 3], "x": 7, "y": 2},
+        {"matrix": [2, 4], "x": 8, "y": 2},
+        {"matrix": [6, 4], "x": 9, "y": 2},
+        {"matrix": [2, 5], "x": 10, "y": 2},
+        {"matrix": [6, 5], "x": 11, "y": 2},
+        {"matrix": [2, 6], "x": 12, "y": 2},
+        {"matrix": [6, 6], "x": 13, "y": 2},
+        {"matrix": [2, 7], "x": 14, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [7, 0], "x": 1, "y": 3},
+        {"matrix": [3, 1], "x": 2, "y": 3},
+        {"matrix": [7, 1], "x": 3, "y": 3},
+        {"matrix": [3, 2], "x": 4, "y": 3},
+        {"matrix": [7, 2], "x": 5, "y": 3},
+        {"matrix": [3, 3], "x": 6, "y": 3},
+        {"matrix": [7, 3], "x": 7, "y": 3},
+        {"matrix": [3, 4], "x": 8, "y": 3},
+        {"matrix": [7, 4], "x": 9, "y": 3},
+        {"matrix": [3, 5], "x": 10, "y": 3},
+        {"matrix": [7, 5], "x": 11, "y": 3},
+        {"matrix": [3, 6], "x": 12, "y": 3},
+        {"matrix": [7, 6], "x": 13, "y": 3},
+        {"matrix": [3, 7], "x": 14, "y": 3}
+      ]
+    }
+  }
+}
diff --git a/keyboards/peej/rosaline/ortho/rules.mk b/keyboards/peej/rosaline/ortho/rules.mk
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/peej/rosaline/staggered/info.json b/keyboards/peej/rosaline/staggered/info.json
@@ -1,189 +0,0 @@
-{
-    "keyboard_name": "Rosaline Staggered",
-    "manufacturer": "Peej",
-    "url": "https://github.com/peej/rosaline-keyboard",
-    "maintainer": "Peej",
-    "usb": {
-        "vid": "0x706A",
-        "pid": "0x0003",
-        "device_version": "0.0.1",
-        "max_power": 100
-    },
-    "matrix_pins": {
-        "cols": ["B0", "D7", "D6", "C2", "D4", "D1", "D0", "C1"],
-        "rows": ["C0", "B5", "B4", "B3", "B2", "B1", "C3", "D5"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega328p",
-    "bootloader": "usbasploader",
-    "layout_aliases": {
-        "LAYOUT_staggered_40": "LAYOUT_all"
-    },
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
-                {"label": "Q", "matrix": [1, 0], "x": 1.5, "y": 0},
-                {"label": "W", "matrix": [0, 1], "x": 2.5, "y": 0},
-                {"label": "E", "matrix": [0, 2], "x": 3.5, "y": 0},
-                {"label": "R", "matrix": [1, 2], "x": 4.5, "y": 0},
-                {"label": "T", "matrix": [0, 3], "x": 5.5, "y": 0},
-                {"label": "Y", "matrix": [1, 3], "x": 6.5, "y": 0},
-                {"label": "U", "matrix": [0, 4], "x": 7.5, "y": 0},
-                {"label": "I", "matrix": [1, 4], "x": 8.5, "y": 0},
-                {"label": "O", "matrix": [0, 5], "x": 9.5, "y": 0},
-                {"label": "P", "matrix": [0, 6], "x": 10.5, "y": 0},
-                {"label": "[", "matrix": [1, 6], "x": 11.5, "y": 0},
-                {"label": "]", "matrix": [0, 7], "x": 12.5, "y": 0},
-                {"label": "Backspace", "matrix": [1, 7], "x": 13.5, "y": 0, "w": 1.5},
-
-                {"label": "Esc", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.75},
-                {"label": "A", "matrix": [1, 1], "x": 1.75, "y": 1},
-                {"label": "S", "matrix": [2, 1], "x": 2.75, "y": 1},
-                {"label": "D", "matrix": [2, 2], "x": 3.75, "y": 1},
-                {"label": "F", "matrix": [3, 2], "x": 4.75, "y": 1},
-                {"label": "G", "matrix": [2, 3], "x": 5.75, "y": 1},
-                {"label": "H", "matrix": [3, 3], "x": 6.75, "y": 1},
-                {"label": "J", "matrix": [2, 4], "x": 7.75, "y": 1},
-                {"label": "K", "matrix": [1, 5], "x": 8.75, "y": 1},
-                {"label": "L", "matrix": [2, 5], "x": 9.75, "y": 1},
-                {"label": ";", "matrix": [2, 6], "x": 10.75, "y": 1},
-                {"label": "'", "matrix": [3, 6], "x": 11.75, "y": 1},
-                {"label": "Enter", "matrix": [2, 7], "x": 12.75, "y": 1, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 2, "w": 2.25},
-                {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 2},
-                {"label": "X", "matrix": [4, 1], "x": 3.25, "y": 2},
-                {"label": "C", "matrix": [4, 2], "x": 4.25, "y": 2},
-                {"label": "V", "matrix": [4, 3], "x": 5.25, "y": 2},
-                {"label": "B", "matrix": [5, 3], "x": 6.25, "y": 2},
-                {"label": "N", "matrix": [3, 4], "x": 7.25, "y": 2},
-                {"label": "M", "matrix": [4, 4], "x": 8.25, "y": 2},
-                {"label": ",", "matrix": [3, 5], "x": 9.25, "y": 2},
-                {"label": ".", "matrix": [4, 5], "x": 10.25, "y": 2},
-                {"label": "/", "matrix": [4, 6], "x": 11.25, "y": 2},
-                {"label": "Shift", "matrix": [3, 7], "x": 12.25, "y": 2, "w": 1.75},
-                {"label": "Fn", "matrix": [4, 7], "x": 14, "y": 2},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 3, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 0], "x": 1.5, "y": 3},
-                {"label": "Alt", "matrix": [5, 1], "x": 2.5, "y": 3, "w": 1.5},
-                {"label": "Space", "matrix": [5, 2], "x": 4, "y": 3, "w": 2.75},
-                {"label": "Space", "matrix": [5, 4], "x": 6.75, "y": 3},
-                {"label": "Alt", "matrix": [5, 5], "x": 7.75, "y": 3, "w": 2.25},
-                {"label": "Ctrl", "matrix": [6, 5], "x": 10, "y": 3},
-                {"label": "\u2190", "matrix": [5, 6], "x": 11, "y": 3},
-                {"label": "\u2193", "matrix": [6, 6], "x": 12, "y": 3},
-                {"label": "\u2191", "matrix": [5, 7], "x": 13, "y": 3},
-                {"label": "\u2192", "matrix": [6, 7], "x": 14, "y": 3}
-            ]
-        },
-        "LAYOUT_tsangan": {
-            "layout": [
-                {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
-                {"label": "Q", "matrix": [1, 0], "x": 1.5, "y": 0},
-                {"label": "W", "matrix": [0, 1], "x": 2.5, "y": 0},
-                {"label": "E", "matrix": [0, 2], "x": 3.5, "y": 0},
-                {"label": "R", "matrix": [1, 2], "x": 4.5, "y": 0},
-                {"label": "T", "matrix": [0, 3], "x": 5.5, "y": 0},
-                {"label": "Y", "matrix": [1, 3], "x": 6.5, "y": 0},
-                {"label": "U", "matrix": [0, 4], "x": 7.5, "y": 0},
-                {"label": "I", "matrix": [1, 4], "x": 8.5, "y": 0},
-                {"label": "O", "matrix": [0, 5], "x": 9.5, "y": 0},
-                {"label": "P", "matrix": [0, 6], "x": 10.5, "y": 0},
-                {"label": "[", "matrix": [1, 6], "x": 11.5, "y": 0},
-                {"label": "]", "matrix": [0, 7], "x": 12.5, "y": 0},
-                {"label": "Backspace", "matrix": [1, 7], "x": 13.5, "y": 0, "w": 1.5},
-
-                {"label": "Esc", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.75},
-                {"label": "A", "matrix": [1, 1], "x": 1.75, "y": 1},
-                {"label": "S", "matrix": [2, 1], "x": 2.75, "y": 1},
-                {"label": "D", "matrix": [2, 2], "x": 3.75, "y": 1},
-                {"label": "F", "matrix": [3, 2], "x": 4.75, "y": 1},
-                {"label": "G", "matrix": [2, 3], "x": 5.75, "y": 1},
-                {"label": "H", "matrix": [3, 3], "x": 6.75, "y": 1},
-                {"label": "J", "matrix": [2, 4], "x": 7.75, "y": 1},
-                {"label": "K", "matrix": [1, 5], "x": 8.75, "y": 1},
-                {"label": "L", "matrix": [2, 5], "x": 9.75, "y": 1},
-                {"label": ";", "matrix": [2, 6], "x": 10.75, "y": 1},
-                {"label": "'", "matrix": [3, 6], "x": 11.75, "y": 1},
-                {"label": "Enter", "matrix": [2, 7], "x": 12.75, "y": 1, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 2, "w": 2.25},
-                {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 2},
-                {"label": "X", "matrix": [4, 1], "x": 3.25, "y": 2},
-                {"label": "C", "matrix": [4, 2], "x": 4.25, "y": 2},
-                {"label": "V", "matrix": [4, 3], "x": 5.25, "y": 2},
-                {"label": "B", "matrix": [5, 3], "x": 6.25, "y": 2},
-                {"label": "N", "matrix": [3, 4], "x": 7.25, "y": 2},
-                {"label": "M", "matrix": [4, 4], "x": 8.25, "y": 2},
-                {"label": ",", "matrix": [3, 5], "x": 9.25, "y": 2},
-                {"label": ".", "matrix": [4, 5], "x": 10.25, "y": 2},
-                {"label": "/", "matrix": [4, 6], "x": 11.25, "y": 2},
-                {"label": "Shift", "matrix": [3, 7], "x": 12.25, "y": 2, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 3, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 0], "x": 1.5, "y": 3},
-                {"label": "Alt", "matrix": [5, 1], "x": 2.5, "y": 3, "w": 1.5},
-                {"label": "Space", "matrix": [5, 4], "x": 4, "y": 3, "w":7},
-                {"label": "Alt", "matrix": [5, 6], "x": 11, "y": 3, "w": 1.5},
-                {"label": "Fn", "matrix": [6, 6], "x": 12.5, "y": 3},
-                {"label": "Ctrl", "matrix": [5, 7], "x": 13.5, "y": 3, "w": 1.5}
-            ]
-        },
-        "LAYOUT_tsangan_split_rshift": {
-            "layout": [
-                {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
-                {"label": "Q", "matrix": [1, 0], "x": 1.5, "y": 0},
-                {"label": "W", "matrix": [0, 1], "x": 2.5, "y": 0},
-                {"label": "E", "matrix": [0, 2], "x": 3.5, "y": 0},
-                {"label": "R", "matrix": [1, 2], "x": 4.5, "y": 0},
-                {"label": "T", "matrix": [0, 3], "x": 5.5, "y": 0},
-                {"label": "Y", "matrix": [1, 3], "x": 6.5, "y": 0},
-                {"label": "U", "matrix": [0, 4], "x": 7.5, "y": 0},
-                {"label": "I", "matrix": [1, 4], "x": 8.5, "y": 0},
-                {"label": "O", "matrix": [0, 5], "x": 9.5, "y": 0},
-                {"label": "P", "matrix": [0, 6], "x": 10.5, "y": 0},
-                {"label": "[", "matrix": [1, 6], "x": 11.5, "y": 0},
-                {"label": "]", "matrix": [0, 7], "x": 12.5, "y": 0},
-                {"label": "Backspace", "matrix": [1, 7], "x": 13.5, "y": 0, "w": 1.5},
-
-                {"label": "Esc", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.75},
-                {"label": "A", "matrix": [1, 1], "x": 1.75, "y": 1},
-                {"label": "S", "matrix": [2, 1], "x": 2.75, "y": 1},
-                {"label": "D", "matrix": [2, 2], "x": 3.75, "y": 1},
-                {"label": "F", "matrix": [3, 2], "x": 4.75, "y": 1},
-                {"label": "G", "matrix": [2, 3], "x": 5.75, "y": 1},
-                {"label": "H", "matrix": [3, 3], "x": 6.75, "y": 1},
-                {"label": "J", "matrix": [2, 4], "x": 7.75, "y": 1},
-                {"label": "K", "matrix": [1, 5], "x": 8.75, "y": 1},
-                {"label": "L", "matrix": [2, 5], "x": 9.75, "y": 1},
-                {"label": ";", "matrix": [2, 6], "x": 10.75, "y": 1},
-                {"label": "'", "matrix": [3, 6], "x": 11.75, "y": 1},
-                {"label": "Enter", "matrix": [2, 7], "x": 12.75, "y": 1, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 2, "w": 2.25},
-                {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 2},
-                {"label": "X", "matrix": [4, 1], "x": 3.25, "y": 2},
-                {"label": "C", "matrix": [4, 2], "x": 4.25, "y": 2},
-                {"label": "V", "matrix": [4, 3], "x": 5.25, "y": 2},
-                {"label": "B", "matrix": [5, 3], "x": 6.25, "y": 2},
-                {"label": "N", "matrix": [3, 4], "x": 7.25, "y": 2},
-                {"label": "M", "matrix": [4, 4], "x": 8.25, "y": 2},
-                {"label": ",", "matrix": [3, 5], "x": 9.25, "y": 2},
-                {"label": ".", "matrix": [4, 5], "x": 10.25, "y": 2},
-                {"label": "/", "matrix": [4, 6], "x": 11.25, "y": 2},
-                {"label": "Shift", "matrix": [3, 7], "x": 12.25, "y": 2, "w": 1.75},
-                {"label": "Fn", "matrix": [4, 7], "x": 14, "y": 2},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 3, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 0], "x": 1.5, "y": 3},
-                {"label": "Alt", "matrix": [5, 1], "x": 2.5, "y": 3, "w": 1.5},
-                {"label": "Space", "matrix": [5, 4], "x": 4, "y": 3, "w":7},
-                {"label": "Alt", "matrix": [5, 6], "x": 11, "y": 3, "w": 1.5},
-                {"label": "Fn", "matrix": [6, 6], "x": 12.5, "y": 3},
-                {"label": "Ctrl", "matrix": [5, 7], "x": 13.5, "y": 3, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/peej/rosaline/staggered/keyboard.json b/keyboards/peej/rosaline/staggered/keyboard.json
@@ -0,0 +1,195 @@
+{
+    "keyboard_name": "Rosaline Staggered",
+    "manufacturer": "Peej",
+    "url": "https://github.com/peej/rosaline-keyboard",
+    "maintainer": "Peej",
+    "usb": {
+        "vid": "0x706A",
+        "pid": "0x0003",
+        "device_version": "0.0.1",
+        "max_power": 100
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["B0", "D7", "D6", "C2", "D4", "D1", "D0", "C1"],
+        "rows": ["C0", "B5", "B4", "B3", "B2", "B1", "C3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega328p",
+    "bootloader": "usbasploader",
+    "layout_aliases": {
+        "LAYOUT_staggered_40": "LAYOUT_all"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+                {"label": "Q", "matrix": [1, 0], "x": 1.5, "y": 0},
+                {"label": "W", "matrix": [0, 1], "x": 2.5, "y": 0},
+                {"label": "E", "matrix": [0, 2], "x": 3.5, "y": 0},
+                {"label": "R", "matrix": [1, 2], "x": 4.5, "y": 0},
+                {"label": "T", "matrix": [0, 3], "x": 5.5, "y": 0},
+                {"label": "Y", "matrix": [1, 3], "x": 6.5, "y": 0},
+                {"label": "U", "matrix": [0, 4], "x": 7.5, "y": 0},
+                {"label": "I", "matrix": [1, 4], "x": 8.5, "y": 0},
+                {"label": "O", "matrix": [0, 5], "x": 9.5, "y": 0},
+                {"label": "P", "matrix": [0, 6], "x": 10.5, "y": 0},
+                {"label": "[", "matrix": [1, 6], "x": 11.5, "y": 0},
+                {"label": "]", "matrix": [0, 7], "x": 12.5, "y": 0},
+                {"label": "Backspace", "matrix": [1, 7], "x": 13.5, "y": 0, "w": 1.5},
+
+                {"label": "Esc", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.75},
+                {"label": "A", "matrix": [1, 1], "x": 1.75, "y": 1},
+                {"label": "S", "matrix": [2, 1], "x": 2.75, "y": 1},
+                {"label": "D", "matrix": [2, 2], "x": 3.75, "y": 1},
+                {"label": "F", "matrix": [3, 2], "x": 4.75, "y": 1},
+                {"label": "G", "matrix": [2, 3], "x": 5.75, "y": 1},
+                {"label": "H", "matrix": [3, 3], "x": 6.75, "y": 1},
+                {"label": "J", "matrix": [2, 4], "x": 7.75, "y": 1},
+                {"label": "K", "matrix": [1, 5], "x": 8.75, "y": 1},
+                {"label": "L", "matrix": [2, 5], "x": 9.75, "y": 1},
+                {"label": ";", "matrix": [2, 6], "x": 10.75, "y": 1},
+                {"label": "'", "matrix": [3, 6], "x": 11.75, "y": 1},
+                {"label": "Enter", "matrix": [2, 7], "x": 12.75, "y": 1, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 2, "w": 2.25},
+                {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 2},
+                {"label": "X", "matrix": [4, 1], "x": 3.25, "y": 2},
+                {"label": "C", "matrix": [4, 2], "x": 4.25, "y": 2},
+                {"label": "V", "matrix": [4, 3], "x": 5.25, "y": 2},
+                {"label": "B", "matrix": [5, 3], "x": 6.25, "y": 2},
+                {"label": "N", "matrix": [3, 4], "x": 7.25, "y": 2},
+                {"label": "M", "matrix": [4, 4], "x": 8.25, "y": 2},
+                {"label": ",", "matrix": [3, 5], "x": 9.25, "y": 2},
+                {"label": ".", "matrix": [4, 5], "x": 10.25, "y": 2},
+                {"label": "/", "matrix": [4, 6], "x": 11.25, "y": 2},
+                {"label": "Shift", "matrix": [3, 7], "x": 12.25, "y": 2, "w": 1.75},
+                {"label": "Fn", "matrix": [4, 7], "x": 14, "y": 2},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 3, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 0], "x": 1.5, "y": 3},
+                {"label": "Alt", "matrix": [5, 1], "x": 2.5, "y": 3, "w": 1.5},
+                {"label": "Space", "matrix": [5, 2], "x": 4, "y": 3, "w": 2.75},
+                {"label": "Space", "matrix": [5, 4], "x": 6.75, "y": 3},
+                {"label": "Alt", "matrix": [5, 5], "x": 7.75, "y": 3, "w": 2.25},
+                {"label": "Ctrl", "matrix": [6, 5], "x": 10, "y": 3},
+                {"label": "\u2190", "matrix": [5, 6], "x": 11, "y": 3},
+                {"label": "\u2193", "matrix": [6, 6], "x": 12, "y": 3},
+                {"label": "\u2191", "matrix": [5, 7], "x": 13, "y": 3},
+                {"label": "\u2192", "matrix": [6, 7], "x": 14, "y": 3}
+            ]
+        },
+        "LAYOUT_tsangan": {
+            "layout": [
+                {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+                {"label": "Q", "matrix": [1, 0], "x": 1.5, "y": 0},
+                {"label": "W", "matrix": [0, 1], "x": 2.5, "y": 0},
+                {"label": "E", "matrix": [0, 2], "x": 3.5, "y": 0},
+                {"label": "R", "matrix": [1, 2], "x": 4.5, "y": 0},
+                {"label": "T", "matrix": [0, 3], "x": 5.5, "y": 0},
+                {"label": "Y", "matrix": [1, 3], "x": 6.5, "y": 0},
+                {"label": "U", "matrix": [0, 4], "x": 7.5, "y": 0},
+                {"label": "I", "matrix": [1, 4], "x": 8.5, "y": 0},
+                {"label": "O", "matrix": [0, 5], "x": 9.5, "y": 0},
+                {"label": "P", "matrix": [0, 6], "x": 10.5, "y": 0},
+                {"label": "[", "matrix": [1, 6], "x": 11.5, "y": 0},
+                {"label": "]", "matrix": [0, 7], "x": 12.5, "y": 0},
+                {"label": "Backspace", "matrix": [1, 7], "x": 13.5, "y": 0, "w": 1.5},
+
+                {"label": "Esc", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.75},
+                {"label": "A", "matrix": [1, 1], "x": 1.75, "y": 1},
+                {"label": "S", "matrix": [2, 1], "x": 2.75, "y": 1},
+                {"label": "D", "matrix": [2, 2], "x": 3.75, "y": 1},
+                {"label": "F", "matrix": [3, 2], "x": 4.75, "y": 1},
+                {"label": "G", "matrix": [2, 3], "x": 5.75, "y": 1},
+                {"label": "H", "matrix": [3, 3], "x": 6.75, "y": 1},
+                {"label": "J", "matrix": [2, 4], "x": 7.75, "y": 1},
+                {"label": "K", "matrix": [1, 5], "x": 8.75, "y": 1},
+                {"label": "L", "matrix": [2, 5], "x": 9.75, "y": 1},
+                {"label": ";", "matrix": [2, 6], "x": 10.75, "y": 1},
+                {"label": "'", "matrix": [3, 6], "x": 11.75, "y": 1},
+                {"label": "Enter", "matrix": [2, 7], "x": 12.75, "y": 1, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 2, "w": 2.25},
+                {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 2},
+                {"label": "X", "matrix": [4, 1], "x": 3.25, "y": 2},
+                {"label": "C", "matrix": [4, 2], "x": 4.25, "y": 2},
+                {"label": "V", "matrix": [4, 3], "x": 5.25, "y": 2},
+                {"label": "B", "matrix": [5, 3], "x": 6.25, "y": 2},
+                {"label": "N", "matrix": [3, 4], "x": 7.25, "y": 2},
+                {"label": "M", "matrix": [4, 4], "x": 8.25, "y": 2},
+                {"label": ",", "matrix": [3, 5], "x": 9.25, "y": 2},
+                {"label": ".", "matrix": [4, 5], "x": 10.25, "y": 2},
+                {"label": "/", "matrix": [4, 6], "x": 11.25, "y": 2},
+                {"label": "Shift", "matrix": [3, 7], "x": 12.25, "y": 2, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 3, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 0], "x": 1.5, "y": 3},
+                {"label": "Alt", "matrix": [5, 1], "x": 2.5, "y": 3, "w": 1.5},
+                {"label": "Space", "matrix": [5, 4], "x": 4, "y": 3, "w":7},
+                {"label": "Alt", "matrix": [5, 6], "x": 11, "y": 3, "w": 1.5},
+                {"label": "Fn", "matrix": [6, 6], "x": 12.5, "y": 3},
+                {"label": "Ctrl", "matrix": [5, 7], "x": 13.5, "y": 3, "w": 1.5}
+            ]
+        },
+        "LAYOUT_tsangan_split_rshift": {
+            "layout": [
+                {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+                {"label": "Q", "matrix": [1, 0], "x": 1.5, "y": 0},
+                {"label": "W", "matrix": [0, 1], "x": 2.5, "y": 0},
+                {"label": "E", "matrix": [0, 2], "x": 3.5, "y": 0},
+                {"label": "R", "matrix": [1, 2], "x": 4.5, "y": 0},
+                {"label": "T", "matrix": [0, 3], "x": 5.5, "y": 0},
+                {"label": "Y", "matrix": [1, 3], "x": 6.5, "y": 0},
+                {"label": "U", "matrix": [0, 4], "x": 7.5, "y": 0},
+                {"label": "I", "matrix": [1, 4], "x": 8.5, "y": 0},
+                {"label": "O", "matrix": [0, 5], "x": 9.5, "y": 0},
+                {"label": "P", "matrix": [0, 6], "x": 10.5, "y": 0},
+                {"label": "[", "matrix": [1, 6], "x": 11.5, "y": 0},
+                {"label": "]", "matrix": [0, 7], "x": 12.5, "y": 0},
+                {"label": "Backspace", "matrix": [1, 7], "x": 13.5, "y": 0, "w": 1.5},
+
+                {"label": "Esc", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.75},
+                {"label": "A", "matrix": [1, 1], "x": 1.75, "y": 1},
+                {"label": "S", "matrix": [2, 1], "x": 2.75, "y": 1},
+                {"label": "D", "matrix": [2, 2], "x": 3.75, "y": 1},
+                {"label": "F", "matrix": [3, 2], "x": 4.75, "y": 1},
+                {"label": "G", "matrix": [2, 3], "x": 5.75, "y": 1},
+                {"label": "H", "matrix": [3, 3], "x": 6.75, "y": 1},
+                {"label": "J", "matrix": [2, 4], "x": 7.75, "y": 1},
+                {"label": "K", "matrix": [1, 5], "x": 8.75, "y": 1},
+                {"label": "L", "matrix": [2, 5], "x": 9.75, "y": 1},
+                {"label": ";", "matrix": [2, 6], "x": 10.75, "y": 1},
+                {"label": "'", "matrix": [3, 6], "x": 11.75, "y": 1},
+                {"label": "Enter", "matrix": [2, 7], "x": 12.75, "y": 1, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 2, "w": 2.25},
+                {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 2},
+                {"label": "X", "matrix": [4, 1], "x": 3.25, "y": 2},
+                {"label": "C", "matrix": [4, 2], "x": 4.25, "y": 2},
+                {"label": "V", "matrix": [4, 3], "x": 5.25, "y": 2},
+                {"label": "B", "matrix": [5, 3], "x": 6.25, "y": 2},
+                {"label": "N", "matrix": [3, 4], "x": 7.25, "y": 2},
+                {"label": "M", "matrix": [4, 4], "x": 8.25, "y": 2},
+                {"label": ",", "matrix": [3, 5], "x": 9.25, "y": 2},
+                {"label": ".", "matrix": [4, 5], "x": 10.25, "y": 2},
+                {"label": "/", "matrix": [4, 6], "x": 11.25, "y": 2},
+                {"label": "Shift", "matrix": [3, 7], "x": 12.25, "y": 2, "w": 1.75},
+                {"label": "Fn", "matrix": [4, 7], "x": 14, "y": 2},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 3, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 0], "x": 1.5, "y": 3},
+                {"label": "Alt", "matrix": [5, 1], "x": 2.5, "y": 3, "w": 1.5},
+                {"label": "Space", "matrix": [5, 4], "x": 4, "y": 3, "w":7},
+                {"label": "Alt", "matrix": [5, 6], "x": 11, "y": 3, "w": 1.5},
+                {"label": "Fn", "matrix": [6, 6], "x": 12.5, "y": 3},
+                {"label": "Ctrl", "matrix": [5, 7], "x": 13.5, "y": 3, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/peej/rosaline/staggered/rules.mk b/keyboards/peej/rosaline/staggered/rules.mk
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/peranekofactory/tone/rev1/config.h b/keyboards/peranekofactory/tone/rev1/config.h
@@ -1,39 +0,0 @@
-/*
-Copyright 2021 peraneko
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/peranekofactory/tone/rev1/info.json b/keyboards/peranekofactory/tone/rev1/info.json
@@ -1,40 +0,0 @@
-{
-    "keyboard_name": "tone",
-    "manufacturer": "PeranekoFactory",
-    "url": "https://shop.yushakobo.jp/collections/keyboard-1/products/consign_tone-note",
-    "maintainer": "PeranekoFactory",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0000",
-        "device_version": "0.0.1"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B5", "pin_b": "B4"}
-        ]
-    },
-    "qmk": {
-        "tap_keycode_delay": 100
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "matrix_pins": {
-        "direct": [
-            ["D4", "C6", "D7", "E6", "F6", "F7", "B1", "B3"]
-        ]
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"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": 0, "y": 1, "matrix": [0, 4]},
-                {"x": 1, "y": 1, "matrix": [0, 5]},
-                {"x": 2, "y": 1, "matrix": [0, 6]},
-                {"x": 3, "y": 1, "matrix": [0, 7]}
-            ]
-        }
-    }
-}
diff --git a/keyboards/peranekofactory/tone/rev1/keyboard.json b/keyboards/peranekofactory/tone/rev1/keyboard.json
@@ -0,0 +1,51 @@
+{
+    "keyboard_name": "tone",
+    "manufacturer": "PeranekoFactory",
+    "url": "https://shop.yushakobo.jp/collections/keyboard-1/products/consign_tone-note",
+    "maintainer": "PeranekoFactory",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B5", "pin_b": "B4"}
+        ]
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        },
+        "tap_keycode_delay": 100
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "matrix_pins": {
+        "direct": [
+            ["D4", "C6", "D7", "E6", "F6", "F7", "B1", "B3"]
+        ]
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"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": 0, "y": 1, "matrix": [0, 4]},
+                {"x": 1, "y": 1, "matrix": [0, 5]},
+                {"x": 2, "y": 1, "matrix": [0, 6]},
+                {"x": 3, "y": 1, "matrix": [0, 7]}
+            ]
+        }
+    }
+}
diff --git a/keyboards/peranekofactory/tone/rev1/rules.mk b/keyboards/peranekofactory/tone/rev1/rules.mk
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
diff --git a/keyboards/peranekofactory/tone/rev2/config.h b/keyboards/peranekofactory/tone/rev2/config.h
@@ -1,39 +0,0 @@
-/*
-Copyright 2021 peraneko
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/peranekofactory/tone/rev2/info.json b/keyboards/peranekofactory/tone/rev2/info.json
@@ -1,40 +0,0 @@
-{
-    "keyboard_name": "tone",
-    "manufacturer": "PeranekoFactory",
-    "url": "https://shop.yushakobo.jp/collections/keyboard-1/products/consign_tone-note",
-    "maintainer": "PeranekoFactory",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0000",
-        "device_version": "0.0.1"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B5", "pin_b": "B4"}
-        ]
-    },
-    "qmk": {
-        "tap_keycode_delay": 100
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "matrix_pins": {
-        "direct": [
-            ["D4", "C6", "D7", "E6", "F6", "F7", "B1", "B3"]
-        ]
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"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": 0, "y": 1, "matrix": [0, 4]},
-                {"x": 1, "y": 1, "matrix": [0, 5]},
-                {"x": 2, "y": 1, "matrix": [0, 6]},
-                {"x": 3, "y": 1, "matrix": [0, 7]}
-            ]
-        }
-    }
-}
diff --git a/keyboards/peranekofactory/tone/rev2/keyboard.json b/keyboards/peranekofactory/tone/rev2/keyboard.json
@@ -0,0 +1,51 @@
+{
+    "keyboard_name": "tone",
+    "manufacturer": "PeranekoFactory",
+    "url": "https://shop.yushakobo.jp/collections/keyboard-1/products/consign_tone-note",
+    "maintainer": "PeranekoFactory",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B5", "pin_b": "B4"}
+        ]
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        },
+        "tap_keycode_delay": 100
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "matrix_pins": {
+        "direct": [
+            ["D4", "C6", "D7", "E6", "F6", "F7", "B1", "B3"]
+        ]
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"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": 0, "y": 1, "matrix": [0, 4]},
+                {"x": 1, "y": 1, "matrix": [0, 5]},
+                {"x": 2, "y": 1, "matrix": [0, 6]},
+                {"x": 3, "y": 1, "matrix": [0, 7]}
+            ]
+        }
+    }
+}
diff --git a/keyboards/peranekofactory/tone/rev2/rules.mk b/keyboards/peranekofactory/tone/rev2/rules.mk
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
diff --git a/keyboards/percent/canoe_gen2/canoe_gen2.c b/keyboards/percent/canoe_gen2/canoe_gen2.c
@@ -20,6 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 void keyboard_pre_init_kb(void) {
   setPinOutput(E6);
   writePinHigh(E6);
+
+  keyboard_pre_init_user();
 }
 
 bool led_update_kb(led_t led_state) {
diff --git a/keyboards/percent/canoe_gen2/config.h b/keyboards/percent/canoe_gen2/config.h
@@ -1,23 +0,0 @@
-/*
-Copyright 2020 Evy Dekkers
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/percent/canoe_gen2/info.json b/keyboards/percent/canoe_gen2/info.json
@@ -1,216 +0,0 @@
-{
-    "keyboard_name": "Canoe Gen2",
-    "manufacturer": "Percent Studio",
-    "url": "",
-    "maintainer": "evyd13",
-    "usb": {
-        "vid": "0x9C12",
-        "pid": "0x89F0",
-        "device_version": "0.0.1"
-    },
-    "ws2812": {
-        "pin": "B7"
-    },
-    "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
-        },
-        "driver": "ws2812",
-        "max_brightness": 150,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["B0", "D0", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "F6", "F7"],
-        "rows": ["B1", "B3", "B2", "F5", "F4"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["65_ansi_blocker_split_bs", "65_iso_blocker_split_bs"],
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_65_iso_blocker_split_bs"
-    },
-    "layouts": {
-        "LAYOUT_65_ansi_blocker_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": [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": [1, 13], "x": 13, "y": 0},
-                {"matrix": [0, 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": [2, 12], "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, 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, "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}
-            ]
-        },
-        "LAYOUT_65_iso_blocker_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": [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": [1, 13], "x": 13, "y": 0},
-                {"matrix": [0, 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, 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},
-                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"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, 6], "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/percent/canoe_gen2/keyboard.json b/keyboards/percent/canoe_gen2/keyboard.json
@@ -0,0 +1,230 @@
+{
+    "keyboard_name": "Canoe Gen2",
+    "manufacturer": "Percent Studio",
+    "url": "",
+    "maintainer": "evyd13",
+    "usb": {
+        "vid": "0x9C12",
+        "pid": "0x89F0",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false,
+        "rgb_matrix": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "ws2812": {
+        "pin": "B7"
+    },
+    "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
+        },
+        "driver": "ws2812",
+        "max_brightness": 150,
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["B0", "D0", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "F6", "F7"],
+        "rows": ["B1", "B3", "B2", "F5", "F4"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "community_layouts": ["65_ansi_blocker_split_bs", "65_iso_blocker_split_bs"],
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_65_iso_blocker_split_bs"
+    },
+    "layouts": {
+        "LAYOUT_65_ansi_blocker_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": [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": [1, 13], "x": 13, "y": 0},
+                {"matrix": [0, 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": [2, 12], "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, 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, "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}
+            ]
+        },
+        "LAYOUT_65_iso_blocker_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": [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": [1, 13], "x": 13, "y": 0},
+                {"matrix": [0, 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, 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},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"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, 6], "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/percent/canoe_gen2/rules.mk b/keyboards/percent/canoe_gen2/rules.mk
@@ -1,15 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-RGB_MATRIX_ENABLE = yes
-
 RGB_MATRIX_CUSTOM_KB = yes
diff --git a/keyboards/phage_studio/pila87/info.json b/keyboards/phage_studio/pila87/info.json
@@ -1,181 +0,0 @@
-{
-    "keyboard_name": "Pila87 / XM87 Pro",
-    "manufacturer": "Phage Studio",
-    "url": "https://item.taobao.com/item.htm?spm=a21wu.12321156-tw.0.0.22283343ytyJJv&id=649438917009",
-    "maintainer": "Phage Studio",
-    "usb": {
-        "vid": "0x5048",
-        "pid": "0x5887",
-        "device_version": "0.0.1"
-    },
-    "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": "ws2812",
-        "max_brightness": 200
-    },
-    "processor": "STM32F103",
-    "bootloader": "stm32duino",
-    "matrix_pins": {
-        "cols": ["B5", "B4", "B6", "C0", "C1", "C2", "C3", "B7", "B3", "D2", "C12", "C11", "C10", "A15", "C15", "C13", "A3"],
-        "rows": ["A1", "A2", "A10", "A9", "A8", "C9"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "C14",
-        "scroll_lock": "A0"
-    },
-    "ws2812": {
-        "pin": "A4"
-    },
-    "community_layouts": ["tkl_ansi"],
-    "layouts": {
-        "LAYOUT_tkl_ansi": {
-            "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.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, 1], "x": 2.25, "y": 4.5},
-                {"matrix": [4, 2], "x": 3.25, "y": 4.5},
-                {"matrix": [4, 3], "x": 4.25, "y": 4.5},
-                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
-                {"matrix": [4, 5], "x": 6.25, "y": 4.5},
-                {"matrix": [4, 6], "x": 7.25, "y": 4.5},
-                {"matrix": [4, 7], "x": 8.25, "y": 4.5},
-                {"matrix": [4, 8], "x": 9.25, "y": 4.5},
-                {"matrix": [4, 9], "x": 10.25, "y": 4.5},
-                {"matrix": [4, 10], "x": 11.25, "y": 4.5},
-                {"matrix": [4, 13], "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.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
-
-                {"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/phage_studio/pila87/keyboard.json b/keyboards/phage_studio/pila87/keyboard.json
@@ -0,0 +1,188 @@
+{
+    "keyboard_name": "Pila87 / XM87 Pro",
+    "manufacturer": "Phage Studio",
+    "url": "https://item.taobao.com/item.htm?spm=a21wu.12321156-tw.0.0.22283343ytyJJv&id=649438917009",
+    "maintainer": "Phage Studio",
+    "usb": {
+        "vid": "0x5048",
+        "pid": "0x5887",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "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": "ws2812",
+        "max_brightness": 200
+    },
+    "processor": "STM32F103",
+    "bootloader": "stm32duino",
+    "matrix_pins": {
+        "cols": ["B5", "B4", "B6", "C0", "C1", "C2", "C3", "B7", "B3", "D2", "C12", "C11", "C10", "A15", "C15", "C13", "A3"],
+        "rows": ["A1", "A2", "A10", "A9", "A8", "C9"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "C14",
+        "scroll_lock": "A0"
+    },
+    "ws2812": {
+        "pin": "A4"
+    },
+    "community_layouts": ["tkl_ansi"],
+    "layouts": {
+        "LAYOUT_tkl_ansi": {
+            "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.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, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "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.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"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/phage_studio/pila87/rules.mk b/keyboards/phage_studio/pila87/rules.mk
@@ -1,18 +1,2 @@
 # Configure for 128K flash
 MCU_LDSCRIPT = STM32F103xB
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-# RGB Matrix enabled
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/phase_studio/titan65/hotswap/info.json b/keyboards/phase_studio/titan65/hotswap/info.json
@@ -1,103 +0,0 @@
-{
-    "keyboard_name": "Titan 65 (hotswap)",
-    "manufacturer": "Phase Studio",
-    "url": "",
-    "maintainer": "drashna",
-    "usb": {
-        "vid": "0x5054",
-        "pid": "0xBB91",
-        "device_version": "0.0.1"
-    },
-    "ws2812": {
-        "pin": "E6"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812",
-        "max_brightness": 150
-    },
-    "matrix_pins": {
-        "cols": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "F0", "F1", "C7", "F4", "F5", "F6"],
-        "rows": ["B4", "B5", "B6", "C6", "F7"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "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": [0, 14], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 15], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "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, "y": 1},
-
-                {"matrix": [2, 0], "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": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 1], "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, 13], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 14, "y": 3},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
-                {"matrix": [4, 3], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.5, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 9.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 13], "x": 13, "y": 4},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/phase_studio/titan65/hotswap/keyboard.json b/keyboards/phase_studio/titan65/hotswap/keyboard.json
@@ -0,0 +1,110 @@
+{
+    "keyboard_name": "Titan 65 (hotswap)",
+    "manufacturer": "Phase Studio",
+    "url": "",
+    "maintainer": "drashna",
+    "usb": {
+        "vid": "0x5054",
+        "pid": "0xBB91",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "ws2812": {
+        "pin": "E6"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "max_brightness": 150
+    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "F0", "F1", "C7", "F4", "F5", "F6"],
+        "rows": ["B4", "B5", "B6", "C6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "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": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "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, "y": 1},
+
+                {"matrix": [2, 0], "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": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 1], "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, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 3], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.5, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 9.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/phase_studio/titan65/hotswap/rules.mk b/keyboards/phase_studio/titan65/hotswap/rules.mk
@@ -1,16 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-RGB_MATRIX_ENABLE = yes
-
 AUDIO_SUPPORTED = no
 RGBLIGHT_SUPPORTED = no
diff --git a/keyboards/phase_studio/titan65/soldered/info.json b/keyboards/phase_studio/titan65/soldered/info.json
@@ -1,407 +0,0 @@
-{
-    "keyboard_name": "Titan 65 (soldered)",
-    "manufacturer": "Phase Studio",
-    "url": "",
-    "maintainer": "drashna",
-    "usb": {
-        "vid": "0x5054",
-        "pid": "0xBB92",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "F6", "F5", "F4", "F1", "F0", "B0", "B1", "B2", "B3"],
-        "rows": ["B6", "C6", "C7", "F7", "E6"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "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": [0, 14], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "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, "y": 1},
-
-                {"matrix": [2, 0], "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},
-                {"matrix": [2, 14], "x": 13.75, "y": 2, "w": 1.25},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 2], "x": 1.25, "y": 3},
-                {"matrix": [3, 3], "x": 2.25, "y": 3},
-                {"matrix": [3, 4], "x": 3.25, "y": 3},
-                {"matrix": [3, 5], "x": 4.25, "y": 3},
-                {"matrix": [3, 6], "x": 5.25, "y": 3},
-                {"matrix": [3, 7], "x": 6.25, "y": 3},
-                {"matrix": [3, 8], "x": 7.25, "y": 3},
-                {"matrix": [3, 9], "x": 8.25, "y": 3},
-                {"matrix": [3, 10], "x": 9.25, "y": 3},
-                {"matrix": [3, 11], "x": 10.25, "y": 3},
-                {"matrix": [3, 12], "x": 11.25, "y": 3},
-                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 14, "y": 3},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 11], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 13], "x": 13, "y": 4},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_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, 15], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "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, "y": 1},
-
-                {"matrix": [2, 0], "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, 14], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 3], "x": 2.25, "y": 3},
-                {"matrix": [3, 4], "x": 3.25, "y": 3},
-                {"matrix": [3, 5], "x": 4.25, "y": 3},
-                {"matrix": [3, 6], "x": 5.25, "y": 3},
-                {"matrix": [3, 7], "x": 6.25, "y": 3},
-                {"matrix": [3, 8], "x": 7.25, "y": 3},
-                {"matrix": [3, 9], "x": 8.25, "y": 3},
-                {"matrix": [3, 10], "x": 9.25, "y": 3},
-                {"matrix": [3, 11], "x": 10.25, "y": 3},
-                {"matrix": [3, 12], "x": 11.25, "y": 3},
-                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 14, "y": 3},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 11], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 13], "x": 13, "y": 4},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_ansi_split_bspc": {
-            "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, "y": 0},
-
-                {"matrix": [1, 0], "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, "y": 1},
-
-                {"matrix": [2, 0], "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, 14], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 3], "x": 2.25, "y": 3},
-                {"matrix": [3, 4], "x": 3.25, "y": 3},
-                {"matrix": [3, 5], "x": 4.25, "y": 3},
-                {"matrix": [3, 6], "x": 5.25, "y": 3},
-                {"matrix": [3, 7], "x": 6.25, "y": 3},
-                {"matrix": [3, 8], "x": 7.25, "y": 3},
-                {"matrix": [3, 9], "x": 8.25, "y": 3},
-                {"matrix": [3, 10], "x": 9.25, "y": 3},
-                {"matrix": [3, 11], "x": 10.25, "y": 3},
-                {"matrix": [3, 12], "x": 11.25, "y": 3},
-                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 14, "y": 3},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 11], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 13], "x": 13, "y": 4},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_iso": {
-            "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, 15], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "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, 15], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "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},
-                {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 2], "x": 1.25, "y": 3},
-                {"matrix": [3, 3], "x": 2.25, "y": 3},
-                {"matrix": [3, 4], "x": 3.25, "y": 3},
-                {"matrix": [3, 5], "x": 4.25, "y": 3},
-                {"matrix": [3, 6], "x": 5.25, "y": 3},
-                {"matrix": [3, 7], "x": 6.25, "y": 3},
-                {"matrix": [3, 8], "x": 7.25, "y": 3},
-                {"matrix": [3, 9], "x": 8.25, "y": 3},
-                {"matrix": [3, 10], "x": 9.25, "y": 3},
-                {"matrix": [3, 11], "x": 10.25, "y": 3},
-                {"matrix": [3, 12], "x": 11.25, "y": 3},
-                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 14, "y": 3},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 11], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 13], "x": 13, "y": 4},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_iso_split_bspc": {
-            "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, "y": 0},
-
-                {"matrix": [1, 0], "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, 15], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "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},
-                {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 2], "x": 1.25, "y": 3},
-                {"matrix": [3, 3], "x": 2.25, "y": 3},
-                {"matrix": [3, 4], "x": 3.25, "y": 3},
-                {"matrix": [3, 5], "x": 4.25, "y": 3},
-                {"matrix": [3, 6], "x": 5.25, "y": 3},
-                {"matrix": [3, 7], "x": 6.25, "y": 3},
-                {"matrix": [3, 8], "x": 7.25, "y": 3},
-                {"matrix": [3, 9], "x": 8.25, "y": 3},
-                {"matrix": [3, 10], "x": 9.25, "y": 3},
-                {"matrix": [3, 11], "x": 10.25, "y": 3},
-                {"matrix": [3, 12], "x": 11.25, "y": 3},
-                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 14, "y": 3},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 11], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 13], "x": 13, "y": 4},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/phase_studio/titan65/soldered/keyboard.json b/keyboards/phase_studio/titan65/soldered/keyboard.json
@@ -0,0 +1,413 @@
+{
+    "keyboard_name": "Titan 65 (soldered)",
+    "manufacturer": "Phase Studio",
+    "url": "",
+    "maintainer": "drashna",
+    "usb": {
+        "vid": "0x5054",
+        "pid": "0xBB92",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "F6", "F5", "F4", "F1", "F0", "B0", "B1", "B2", "B3"],
+        "rows": ["B6", "C6", "C7", "F7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "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": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "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, "y": 1},
+
+                {"matrix": [2, 0], "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},
+                {"matrix": [2, 14], "x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 1.25, "y": 3},
+                {"matrix": [3, 3], "x": 2.25, "y": 3},
+                {"matrix": [3, 4], "x": 3.25, "y": 3},
+                {"matrix": [3, 5], "x": 4.25, "y": 3},
+                {"matrix": [3, 6], "x": 5.25, "y": 3},
+                {"matrix": [3, 7], "x": 6.25, "y": 3},
+                {"matrix": [3, 8], "x": 7.25, "y": 3},
+                {"matrix": [3, 9], "x": 8.25, "y": 3},
+                {"matrix": [3, 10], "x": 9.25, "y": 3},
+                {"matrix": [3, 11], "x": 10.25, "y": 3},
+                {"matrix": [3, 12], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 11], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_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, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "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, "y": 1},
+
+                {"matrix": [2, 0], "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, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 3], "x": 2.25, "y": 3},
+                {"matrix": [3, 4], "x": 3.25, "y": 3},
+                {"matrix": [3, 5], "x": 4.25, "y": 3},
+                {"matrix": [3, 6], "x": 5.25, "y": 3},
+                {"matrix": [3, 7], "x": 6.25, "y": 3},
+                {"matrix": [3, 8], "x": 7.25, "y": 3},
+                {"matrix": [3, 9], "x": 8.25, "y": 3},
+                {"matrix": [3, 10], "x": 9.25, "y": 3},
+                {"matrix": [3, 11], "x": 10.25, "y": 3},
+                {"matrix": [3, 12], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 11], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi_split_bspc": {
+            "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, "y": 0},
+
+                {"matrix": [1, 0], "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, "y": 1},
+
+                {"matrix": [2, 0], "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, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 3], "x": 2.25, "y": 3},
+                {"matrix": [3, 4], "x": 3.25, "y": 3},
+                {"matrix": [3, 5], "x": 4.25, "y": 3},
+                {"matrix": [3, 6], "x": 5.25, "y": 3},
+                {"matrix": [3, 7], "x": 6.25, "y": 3},
+                {"matrix": [3, 8], "x": 7.25, "y": 3},
+                {"matrix": [3, 9], "x": 8.25, "y": 3},
+                {"matrix": [3, 10], "x": 9.25, "y": 3},
+                {"matrix": [3, 11], "x": 10.25, "y": 3},
+                {"matrix": [3, 12], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 11], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_iso": {
+            "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, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "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, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "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},
+                {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 1.25, "y": 3},
+                {"matrix": [3, 3], "x": 2.25, "y": 3},
+                {"matrix": [3, 4], "x": 3.25, "y": 3},
+                {"matrix": [3, 5], "x": 4.25, "y": 3},
+                {"matrix": [3, 6], "x": 5.25, "y": 3},
+                {"matrix": [3, 7], "x": 6.25, "y": 3},
+                {"matrix": [3, 8], "x": 7.25, "y": 3},
+                {"matrix": [3, 9], "x": 8.25, "y": 3},
+                {"matrix": [3, 10], "x": 9.25, "y": 3},
+                {"matrix": [3, 11], "x": 10.25, "y": 3},
+                {"matrix": [3, 12], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 11], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_iso_split_bspc": {
+            "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, "y": 0},
+
+                {"matrix": [1, 0], "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, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "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},
+                {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 1.25, "y": 3},
+                {"matrix": [3, 3], "x": 2.25, "y": 3},
+                {"matrix": [3, 4], "x": 3.25, "y": 3},
+                {"matrix": [3, 5], "x": 4.25, "y": 3},
+                {"matrix": [3, 6], "x": 5.25, "y": 3},
+                {"matrix": [3, 7], "x": 6.25, "y": 3},
+                {"matrix": [3, 8], "x": 7.25, "y": 3},
+                {"matrix": [3, 9], "x": 8.25, "y": 3},
+                {"matrix": [3, 10], "x": 9.25, "y": 3},
+                {"matrix": [3, 11], "x": 10.25, "y": 3},
+                {"matrix": [3, 12], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 11], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/phase_studio/titan65/soldered/rules.mk b/keyboards/phase_studio/titan65/soldered/rules.mk
@@ -1,17 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-
 AUDIO_SUPPORTED = no
 RGBLIGHT_SUPPORTED = no
 RGB_MATRIX_SUPPORTED = no
diff --git a/keyboards/phoenix/info.json b/keyboards/phoenix/info.json
@@ -1,214 +0,0 @@
-{
-    "keyboard_name": "Phoenix",
-    "manufacturer": "ErgoKB",
-    "url": "ergokb.tw",
-    "maintainer": "ErgoKB via lschyi",
-    "usb": {
-        "vid": "0x456B",
-        "pid": "0x0001",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B10", "B12", "B13", "B14", "B15", "A8", "A10"],
-        "rows": ["B1", "B0", "A7", "A6", "A5", "B7"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "A9"
-    },
-    "processor": "STM32F401",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F401",
-    "layouts": {
-        "LAYOUT_ergodox": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
-                {"matrix": [0, 1], "x": 1.5, "y": 0.375},
-                {"matrix": [0, 2], "x": 2.5, "y": 0.125},
-                {"matrix": [0, 3], "x": 3.5, "y": 0},
-                {"matrix": [0, 4], "x": 4.5, "y": 0.125},
-                {"matrix": [0, 5], "x": 5.5, "y": 0.25},
-                {"matrix": [0, 6], "x": 6.5, "y": 0.25},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.375, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1.375},
-                {"matrix": [1, 2], "x": 2.5, "y": 1.125},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1.125},
-                {"matrix": [1, 5], "x": 5.5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.375, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.375},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.125},
-                {"matrix": [2, 3], "x": 3.5, "y": 2},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.125},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.375, "w": 1.5},
-                {"matrix": [3, 1], "x": 1.5, "y": 3.375},
-                {"matrix": [3, 2], "x": 2.5, "y": 3.125},
-                {"matrix": [3, 3], "x": 3.5, "y": 3},
-                {"matrix": [3, 4], "x": 4.5, "y": 3.125},
-                {"matrix": [3, 5], "x": 5.5, "y": 3.25},
-                {"matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5},
-
-                {"matrix": [4, 0], "x": 0.5, "y": 4.375},
-                {"matrix": [4, 1], "x": 1.5, "y": 4.375},
-                {"matrix": [4, 2], "x": 2.5, "y": 4.125},
-                {"matrix": [4, 3], "x": 3.5, "y": 4},
-                {"matrix": [4, 4], "x": 4.5, "y": 4.125},
-
-                {"matrix": [5, 3], "x": 6, "y": 5},
-                {"matrix": [5, 4], "x": 7, "y": 5},
-
-                {"matrix": [5, 5], "x": 7, "y": 6},
-                {"matrix": [5, 0], "x": 5, "y": 6, "h": 2},
-                {"matrix": [5, 1], "x": 6, "y": 6, "h": 2},
-
-                {"matrix": [5, 2], "x": 7, "y": 7},
-
-                {"matrix": [6, 6], "x": 9.5, "y": 0.25},
-                {"matrix": [6, 5], "x": 10.5, "y": 0.25},
-                {"matrix": [6, 4], "x": 11.5, "y": 0.125},
-                {"matrix": [6, 3], "x": 12.5, "y": 0},
-                {"matrix": [6, 2], "x": 13.5, "y": 0.125},
-                {"matrix": [6, 1], "x": 14.5, "y": 0.375},
-                {"matrix": [6, 0], "x": 15.5, "y": 0.375, "w": 1.5},
-
-                {"matrix": [7, 6], "x": 9.5, "y": 1.25, "h": 1.5},
-                {"matrix": [7, 5], "x": 10.5, "y": 1.25},
-                {"matrix": [7, 4], "x": 11.5, "y": 1.125},
-                {"matrix": [7, 3], "x": 12.5, "y": 1},
-                {"matrix": [7, 2], "x": 13.5, "y": 1.125},
-                {"matrix": [7, 1], "x": 14.5, "y": 1.375},
-                {"matrix": [7, 0], "x": 15.5, "y": 1.375, "w": 1.5},
-
-                {"matrix": [8, 5], "x": 10.5, "y": 2.25},
-                {"matrix": [8, 4], "x": 11.5, "y": 2.125},
-                {"matrix": [8, 3], "x": 12.5, "y": 2},
-                {"matrix": [8, 2], "x": 13.5, "y": 2.125},
-                {"matrix": [8, 1], "x": 14.5, "y": 2.375},
-                {"matrix": [8, 0], "x": 15.5, "y": 2.375, "w": 1.5},
-                {"matrix": [9, 6], "x": 9.5, "y": 2.75, "h": 1.5},
-
-                {"matrix": [9, 5], "x": 10.5, "y": 3.25},
-                {"matrix": [9, 4], "x": 11.5, "y": 3.125},
-                {"matrix": [9, 3], "x": 12.5, "y": 3},
-                {"matrix": [9, 2], "x": 13.5, "y": 3.125},
-                {"matrix": [9, 1], "x": 14.5, "y": 3.375},
-                {"matrix": [9, 0], "x": 15.5, "y": 3.375, "w": 1.5},
-
-                {"matrix": [10, 4], "x": 11.5, "y": 4.125},
-                {"matrix": [10, 3], "x": 12.5, "y": 4},
-                {"matrix": [10, 2], "x": 13.5, "y": 4.125},
-                {"matrix": [10, 1], "x": 14.5, "y": 4.375},
-                {"matrix": [10, 0], "x": 15.5, "y": 4.375},
-
-                {"matrix": [11, 4], "x": 9, "y": 5},
-                {"matrix": [11, 3], "x": 10, "y": 5},
-
-                {"matrix": [11, 5], "x": 9, "y": 6},
-
-                {"matrix": [11, 2], "x": 9, "y": 7},
-
-                {"matrix": [11, 1], "x": 10, "y": 6, "h": 2},
-                {"matrix": [11, 0], "x": 11, "y": 6, "h": 2}
-            ]
-        },
-        "LAYOUT_ergodox_pretty": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
-                {"matrix": [0, 1], "x": 1.5, "y": 0.375},
-                {"matrix": [0, 2], "x": 2.5, "y": 0.125},
-                {"matrix": [0, 3], "x": 3.5, "y": 0},
-                {"matrix": [0, 4], "x": 4.5, "y": 0.125},
-                {"matrix": [0, 5], "x": 5.5, "y": 0.25},
-                {"matrix": [0, 6], "x": 6.5, "y": 0.25},
-
-                {"matrix": [6, 0], "x": 9.5, "y": 0.25},
-                {"matrix": [6, 1], "x": 10.5, "y": 0.25},
-                {"matrix": [6, 2], "x": 11.5, "y": 0.125},
-                {"matrix": [6, 3], "x": 12.5, "y": 0},
-                {"matrix": [6, 4], "x": 13.5, "y": 0.125},
-                {"matrix": [6, 5], "x": 14.5, "y": 0.375},
-                {"matrix": [6, 6], "x": 15.5, "y": 0.375, "w": 1.5},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.375, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1.375},
-                {"matrix": [1, 2], "x": 2.5, "y": 1.125},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1.125},
-                {"matrix": [1, 5], "x": 5.5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5},
-
-                {"matrix": [7, 0], "x": 9.5, "y": 1.25, "h": 1.5},
-                {"matrix": [7, 1], "x": 10.5, "y": 1.25},
-                {"matrix": [7, 2], "x": 11.5, "y": 1.125},
-                {"matrix": [7, 3], "x": 12.5, "y": 1},
-                {"matrix": [7, 4], "x": 13.5, "y": 1.125},
-                {"matrix": [7, 5], "x": 14.5, "y": 1.375},
-                {"matrix": [7, 6], "x": 15.5, "y": 1.375, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.375, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.375},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.125},
-                {"matrix": [2, 3], "x": 3.5, "y": 2},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.125},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-
-                {"matrix": [8, 0], "x": 10.5, "y": 2.25},
-                {"matrix": [8, 1], "x": 11.5, "y": 2.125},
-                {"matrix": [8, 2], "x": 12.5, "y": 2},
-                {"matrix": [8, 3], "x": 13.5, "y": 2.125},
-                {"matrix": [8, 4], "x": 14.5, "y": 2.375},
-                {"matrix": [8, 5], "x": 15.5, "y": 2.375, "w": 1.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.375, "w": 1.5},
-                {"matrix": [3, 1], "x": 1.5, "y": 3.375},
-                {"matrix": [3, 2], "x": 2.5, "y": 3.125},
-                {"matrix": [3, 3], "x": 3.5, "y": 3},
-                {"matrix": [3, 4], "x": 4.5, "y": 3.125},
-                {"matrix": [3, 5], "x": 5.5, "y": 3.25},
-                {"matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5},
-
-                {"matrix": [9, 0], "x": 9.5, "y": 2.75, "h": 1.5},
-                {"matrix": [9, 1], "x": 10.5, "y": 3.25},
-                {"matrix": [9, 2], "x": 11.5, "y": 3.125},
-                {"matrix": [9, 3], "x": 12.5, "y": 3},
-                {"matrix": [9, 4], "x": 13.5, "y": 3.125},
-                {"matrix": [9, 5], "x": 14.5, "y": 3.375},
-                {"matrix": [9, 6], "x": 15.5, "y": 3.375, "w": 1.5},
-
-                {"matrix": [4, 0], "x": 0.5, "y": 4.375},
-                {"matrix": [4, 1], "x": 1.5, "y": 4.375},
-                {"matrix": [4, 2], "x": 2.5, "y": 4.125},
-                {"matrix": [4, 3], "x": 3.5, "y": 4},
-                {"matrix": [4, 4], "x": 4.5, "y": 4.125},
-
-                {"matrix": [10, 0], "x": 11.5, "y": 4.125},
-                {"matrix": [10, 1], "x": 12.5, "y": 4},
-                {"matrix": [10, 2], "x": 13.5, "y": 4.125},
-                {"matrix": [10, 3], "x": 14.5, "y": 4.375},
-                {"matrix": [10, 4], "x": 15.5, "y": 4.375},
-
-                {"matrix": [5, 3], "x": 6, "y": 5},
-                {"matrix": [5, 4], "x": 7, "y": 5},
-                {"matrix": [11, 4], "x": 9, "y": 5},
-                {"matrix": [11, 3], "x": 10, "y": 5},
-
-                {"matrix": [5, 5], "x": 7, "y": 6},
-                {"matrix": [11, 5], "x": 9, "y": 6},
-                {"matrix": [5, 0], "x": 5, "y": 6, "h": 2},
-                {"matrix": [5, 1], "x": 6, "y": 6, "h": 2},
-
-                {"matrix": [5, 2], "x": 7, "y": 7},
-                {"matrix": [11, 2], "x": 9, "y": 7},
-
-                {"matrix": [11, 1], "x": 10, "y": 6, "h": 2},
-                {"matrix": [11, 0], "x": 11, "y": 6, "h": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/phoenix/keyboard.json b/keyboards/phoenix/keyboard.json
@@ -0,0 +1,223 @@
+{
+    "keyboard_name": "Phoenix",
+    "manufacturer": "ErgoKB",
+    "url": "ergokb.tw",
+    "maintainer": "ErgoKB via lschyi",
+    "usb": {
+        "vid": "0x456B",
+        "pid": "0x0001",
+        "device_version": "0.0.1",
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["B10", "B12", "B13", "B14", "B15", "A8", "A10"],
+        "rows": ["B1", "B0", "A7", "A6", "A5", "B7"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "A9"
+    },
+    "processor": "STM32F401",
+    "bootloader": "stm32-dfu",
+    "board": "BLACKPILL_STM32_F401",
+    "layouts": {
+        "LAYOUT_ergodox": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 0.375},
+                {"matrix": [0, 2], "x": 2.5, "y": 0.125},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0.125},
+                {"matrix": [0, 5], "x": 5.5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6.5, "y": 0.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.375, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.375},
+                {"matrix": [1, 2], "x": 2.5, "y": 1.125},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1.125},
+                {"matrix": [1, 5], "x": 5.5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.375, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.375},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.125},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.375, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3.375},
+                {"matrix": [3, 2], "x": 2.5, "y": 3.125},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3.125},
+                {"matrix": [3, 5], "x": 5.5, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5},
+
+                {"matrix": [4, 0], "x": 0.5, "y": 4.375},
+                {"matrix": [4, 1], "x": 1.5, "y": 4.375},
+                {"matrix": [4, 2], "x": 2.5, "y": 4.125},
+                {"matrix": [4, 3], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4.125},
+
+                {"matrix": [5, 3], "x": 6, "y": 5},
+                {"matrix": [5, 4], "x": 7, "y": 5},
+
+                {"matrix": [5, 5], "x": 7, "y": 6},
+                {"matrix": [5, 0], "x": 5, "y": 6, "h": 2},
+                {"matrix": [5, 1], "x": 6, "y": 6, "h": 2},
+
+                {"matrix": [5, 2], "x": 7, "y": 7},
+
+                {"matrix": [6, 6], "x": 9.5, "y": 0.25},
+                {"matrix": [6, 5], "x": 10.5, "y": 0.25},
+                {"matrix": [6, 4], "x": 11.5, "y": 0.125},
+                {"matrix": [6, 3], "x": 12.5, "y": 0},
+                {"matrix": [6, 2], "x": 13.5, "y": 0.125},
+                {"matrix": [6, 1], "x": 14.5, "y": 0.375},
+                {"matrix": [6, 0], "x": 15.5, "y": 0.375, "w": 1.5},
+
+                {"matrix": [7, 6], "x": 9.5, "y": 1.25, "h": 1.5},
+                {"matrix": [7, 5], "x": 10.5, "y": 1.25},
+                {"matrix": [7, 4], "x": 11.5, "y": 1.125},
+                {"matrix": [7, 3], "x": 12.5, "y": 1},
+                {"matrix": [7, 2], "x": 13.5, "y": 1.125},
+                {"matrix": [7, 1], "x": 14.5, "y": 1.375},
+                {"matrix": [7, 0], "x": 15.5, "y": 1.375, "w": 1.5},
+
+                {"matrix": [8, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [8, 4], "x": 11.5, "y": 2.125},
+                {"matrix": [8, 3], "x": 12.5, "y": 2},
+                {"matrix": [8, 2], "x": 13.5, "y": 2.125},
+                {"matrix": [8, 1], "x": 14.5, "y": 2.375},
+                {"matrix": [8, 0], "x": 15.5, "y": 2.375, "w": 1.5},
+                {"matrix": [9, 6], "x": 9.5, "y": 2.75, "h": 1.5},
+
+                {"matrix": [9, 5], "x": 10.5, "y": 3.25},
+                {"matrix": [9, 4], "x": 11.5, "y": 3.125},
+                {"matrix": [9, 3], "x": 12.5, "y": 3},
+                {"matrix": [9, 2], "x": 13.5, "y": 3.125},
+                {"matrix": [9, 1], "x": 14.5, "y": 3.375},
+                {"matrix": [9, 0], "x": 15.5, "y": 3.375, "w": 1.5},
+
+                {"matrix": [10, 4], "x": 11.5, "y": 4.125},
+                {"matrix": [10, 3], "x": 12.5, "y": 4},
+                {"matrix": [10, 2], "x": 13.5, "y": 4.125},
+                {"matrix": [10, 1], "x": 14.5, "y": 4.375},
+                {"matrix": [10, 0], "x": 15.5, "y": 4.375},
+
+                {"matrix": [11, 4], "x": 9, "y": 5},
+                {"matrix": [11, 3], "x": 10, "y": 5},
+
+                {"matrix": [11, 5], "x": 9, "y": 6},
+
+                {"matrix": [11, 2], "x": 9, "y": 7},
+
+                {"matrix": [11, 1], "x": 10, "y": 6, "h": 2},
+                {"matrix": [11, 0], "x": 11, "y": 6, "h": 2}
+            ]
+        },
+        "LAYOUT_ergodox_pretty": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 0.375},
+                {"matrix": [0, 2], "x": 2.5, "y": 0.125},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0.125},
+                {"matrix": [0, 5], "x": 5.5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6.5, "y": 0.25},
+
+                {"matrix": [6, 0], "x": 9.5, "y": 0.25},
+                {"matrix": [6, 1], "x": 10.5, "y": 0.25},
+                {"matrix": [6, 2], "x": 11.5, "y": 0.125},
+                {"matrix": [6, 3], "x": 12.5, "y": 0},
+                {"matrix": [6, 4], "x": 13.5, "y": 0.125},
+                {"matrix": [6, 5], "x": 14.5, "y": 0.375},
+                {"matrix": [6, 6], "x": 15.5, "y": 0.375, "w": 1.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.375, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.375},
+                {"matrix": [1, 2], "x": 2.5, "y": 1.125},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1.125},
+                {"matrix": [1, 5], "x": 5.5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5},
+
+                {"matrix": [7, 0], "x": 9.5, "y": 1.25, "h": 1.5},
+                {"matrix": [7, 1], "x": 10.5, "y": 1.25},
+                {"matrix": [7, 2], "x": 11.5, "y": 1.125},
+                {"matrix": [7, 3], "x": 12.5, "y": 1},
+                {"matrix": [7, 4], "x": 13.5, "y": 1.125},
+                {"matrix": [7, 5], "x": 14.5, "y": 1.375},
+                {"matrix": [7, 6], "x": 15.5, "y": 1.375, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.375, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.375},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.125},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+
+                {"matrix": [8, 0], "x": 10.5, "y": 2.25},
+                {"matrix": [8, 1], "x": 11.5, "y": 2.125},
+                {"matrix": [8, 2], "x": 12.5, "y": 2},
+                {"matrix": [8, 3], "x": 13.5, "y": 2.125},
+                {"matrix": [8, 4], "x": 14.5, "y": 2.375},
+                {"matrix": [8, 5], "x": 15.5, "y": 2.375, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.375, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3.375},
+                {"matrix": [3, 2], "x": 2.5, "y": 3.125},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3.125},
+                {"matrix": [3, 5], "x": 5.5, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5},
+
+                {"matrix": [9, 0], "x": 9.5, "y": 2.75, "h": 1.5},
+                {"matrix": [9, 1], "x": 10.5, "y": 3.25},
+                {"matrix": [9, 2], "x": 11.5, "y": 3.125},
+                {"matrix": [9, 3], "x": 12.5, "y": 3},
+                {"matrix": [9, 4], "x": 13.5, "y": 3.125},
+                {"matrix": [9, 5], "x": 14.5, "y": 3.375},
+                {"matrix": [9, 6], "x": 15.5, "y": 3.375, "w": 1.5},
+
+                {"matrix": [4, 0], "x": 0.5, "y": 4.375},
+                {"matrix": [4, 1], "x": 1.5, "y": 4.375},
+                {"matrix": [4, 2], "x": 2.5, "y": 4.125},
+                {"matrix": [4, 3], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4.125},
+
+                {"matrix": [10, 0], "x": 11.5, "y": 4.125},
+                {"matrix": [10, 1], "x": 12.5, "y": 4},
+                {"matrix": [10, 2], "x": 13.5, "y": 4.125},
+                {"matrix": [10, 3], "x": 14.5, "y": 4.375},
+                {"matrix": [10, 4], "x": 15.5, "y": 4.375},
+
+                {"matrix": [5, 3], "x": 6, "y": 5},
+                {"matrix": [5, 4], "x": 7, "y": 5},
+                {"matrix": [11, 4], "x": 9, "y": 5},
+                {"matrix": [11, 3], "x": 10, "y": 5},
+
+                {"matrix": [5, 5], "x": 7, "y": 6},
+                {"matrix": [11, 5], "x": 9, "y": 6},
+                {"matrix": [5, 0], "x": 5, "y": 6, "h": 2},
+                {"matrix": [5, 1], "x": 6, "y": 6, "h": 2},
+
+                {"matrix": [5, 2], "x": 7, "y": 7},
+                {"matrix": [11, 2], "x": 9, "y": 7},
+
+                {"matrix": [11, 1], "x": 10, "y": 6, "h": 2},
+                {"matrix": [11, 0], "x": 11, "y": 6, "h": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/phoenix/rules.mk b/keyboards/phoenix/rules.mk
@@ -1,17 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-STENO_ENABLE = no
 SERIAL_DRIVER = usart
-KEYBOARD_SHARED_EP = yes
-
-OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE
diff --git a/keyboards/pica40/rev2/info.json b/keyboards/pica40/rev2/keyboard.json
diff --git a/keyboards/pierce/info.json b/keyboards/pierce/info.json
@@ -1,63 +0,0 @@
-{
-    "keyboard_name": "pierce",
-    "manufacturer": "durken",
-    "url": "https://github.com/durken1/pierce",
-    "maintainer": "durken1",
-    "usb": {
-        "vid": "0x6431",
-        "pid": "0x6060",
-        "device_version": "0.0.1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["split_3x5_3"],
-    "layouts": {
-        "LAYOUT_split_3x5_3": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.5},
-                {"matrix": [0, 1], "x": 1, "y": 0.13},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0.13},
-                {"matrix": [0, 4], "x": 4, "y": 0.25},
-
-                {"matrix": [0, 5], "x": 7, "y": 0.25},
-                {"matrix": [0, 6], "x": 8, "y": 0.13},
-                {"matrix": [0, 7], "x": 9, "y": 0},
-                {"matrix": [0, 8], "x": 10, "y": 0.13},
-                {"matrix": [0, 9], "x": 11, "y": 0.5},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.5},
-                {"matrix": [1, 1], "x": 1, "y": 1.13},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1.13},
-                {"matrix": [1, 4], "x": 4, "y": 1.25},
-
-                {"matrix": [1, 5], "x": 7, "y": 1.25},
-                {"matrix": [1, 6], "x": 8, "y": 1.13},
-                {"matrix": [1, 7], "x": 9, "y": 1},
-                {"matrix": [1, 8], "x": 10, "y": 1.13},
-                {"matrix": [1, 9], "x": 11, "y": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.5},
-                {"matrix": [2, 1], "x": 1, "y": 2.13},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2.13},
-                {"matrix": [2, 4], "x": 4, "y": 2.25},
-
-                {"matrix": [2, 5], "x": 7, "y": 2.25},
-                {"matrix": [2, 6], "x": 8, "y": 2.13},
-                {"matrix": [2, 7], "x": 9, "y": 2},
-                {"matrix": [2, 8], "x": 10, "y": 2.13},
-                {"matrix": [2, 9], "x": 11, "y": 2.5},
-
-                {"matrix": [3, 2], "x": 2.5, "y": 3.16},
-                {"matrix": [3, 3], "x": 3.5, "y": 3.5},
-                {"matrix": [3, 4], "x": 4.5, "y": 3.75},
-
-                {"matrix": [3, 5], "x": 6.5, "y": 3.75},
-                {"matrix": [3, 6], "x": 7.5, "y": 3.5},
-                {"matrix": [3, 7], "x": 8.5, "y": 3.16}
-            ]
-        }
-    }
-}
diff --git a/keyboards/pierce/keyboard.json b/keyboards/pierce/keyboard.json
@@ -0,0 +1,69 @@
+{
+    "keyboard_name": "pierce",
+    "manufacturer": "durken",
+    "url": "https://github.com/durken1/pierce",
+    "maintainer": "durken1",
+    "usb": {
+        "vid": "0x6431",
+        "pid": "0x6060",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "community_layouts": ["split_3x5_3"],
+    "layouts": {
+        "LAYOUT_split_3x5_3": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.5},
+                {"matrix": [0, 1], "x": 1, "y": 0.13},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.13},
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
+
+                {"matrix": [0, 5], "x": 7, "y": 0.25},
+                {"matrix": [0, 6], "x": 8, "y": 0.13},
+                {"matrix": [0, 7], "x": 9, "y": 0},
+                {"matrix": [0, 8], "x": 10, "y": 0.13},
+                {"matrix": [0, 9], "x": 11, "y": 0.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.13},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.13},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+
+                {"matrix": [1, 5], "x": 7, "y": 1.25},
+                {"matrix": [1, 6], "x": 8, "y": 1.13},
+                {"matrix": [1, 7], "x": 9, "y": 1},
+                {"matrix": [1, 8], "x": 10, "y": 1.13},
+                {"matrix": [1, 9], "x": 11, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5},
+                {"matrix": [2, 1], "x": 1, "y": 2.13},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.13},
+                {"matrix": [2, 4], "x": 4, "y": 2.25},
+
+                {"matrix": [2, 5], "x": 7, "y": 2.25},
+                {"matrix": [2, 6], "x": 8, "y": 2.13},
+                {"matrix": [2, 7], "x": 9, "y": 2},
+                {"matrix": [2, 8], "x": 10, "y": 2.13},
+                {"matrix": [2, 9], "x": 11, "y": 2.5},
+
+                {"matrix": [3, 2], "x": 2.5, "y": 3.16},
+                {"matrix": [3, 3], "x": 3.5, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.5, "y": 3.75},
+
+                {"matrix": [3, 5], "x": 6.5, "y": 3.75},
+                {"matrix": [3, 6], "x": 7.5, "y": 3.5},
+                {"matrix": [3, 7], "x": 8.5, "y": 3.16}
+            ]
+        }
+    }
+}
diff --git a/keyboards/pierce/rules.mk b/keyboards/pierce/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 CUSTOM_MATRIX = lite
 SRC += matrix.c
 QUANTUM_LIB_SRC += i2c_slave.c
diff --git a/keyboards/pinky/info.json b/keyboards/pinky/info.json
@@ -1,4 +1,10 @@
 {
+    "features": {
+        "bootmagic": false,
+        "extrakey": false,
+        "mousekey": false,
+        "nkro": false
+    },
     "split": {
         "enabled": true
     }
diff --git a/keyboards/pinky/rules.mk b/keyboards/pinky/rules.mk
@@ -1,14 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 DEFAULT_FOLDER = pinky/3
diff --git a/keyboards/pizzakeyboards/slice65/info.json b/keyboards/pizzakeyboards/slice65/keyboard.json
diff --git a/keyboards/planck/ez/glow/info.json b/keyboards/planck/ez/glow/info.json
@@ -1,6 +0,0 @@
-{
-    "keyboard_name": "Planck EZ Glow",
-    "usb": {
-        "pid": "0xC6CF"
-    }
-}
diff --git a/keyboards/planck/ez/glow/keyboard.json b/keyboards/planck/ez/glow/keyboard.json
@@ -0,0 +1,9 @@
+{
+    "keyboard_name": "Planck EZ Glow",
+    "usb": {
+        "pid": "0xC6CF"
+    },
+    "features": {
+        "rgb_matrix": true
+    }
+}
diff --git a/keyboards/planck/ez/glow/rules.mk b/keyboards/planck/ez/glow/rules.mk
@@ -1 +0,0 @@
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/planck/ez/info.json b/keyboards/planck/ez/info.json
@@ -4,7 +4,20 @@
   "maintainer": "jackhumbert",
   "usb": {
     "vid": "0x3297",
-    "device_version": "0.0.1"
+    "device_version": "0.0.1",
+    "shared_endpoint": {
+      "mouse": false
+    }
+  },
+  "features": {
+    "audio": true,
+    "bootmagic": true,
+    "command": true,
+    "console": true,
+    "encoder": true,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": true
   },
   "rgb_matrix": {
     "animations": {
diff --git a/keyboards/planck/ez/rules.mk b/keyboards/planck/ez/rules.mk
@@ -1,22 +1,6 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = yes          # Audio output
 AUDIO_DRIVER = dac_additive
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-
-ENCODER_ENABLE = yes
 
 RGBLIGHT_SUPPORTED = no
 BAKCLIGHT_SUPPORTED = no
 
-MOUSE_SHARED_EP = no
-
 DEFAULT_FOLDER = planck/ez/base
diff --git a/keyboards/planck/rev6_drop/info.json b/keyboards/planck/rev6_drop/info.json
@@ -1,315 +0,0 @@
-{
-  "keyboard_name": "Planck",
-  "manufacturer": "Drop",
-  "url": "https://olkb.com/planck",
-  "maintainer": "jackhumbert",
-  "usb": {
-    "vid": "0x03A8",
-    "pid": "0xA4F9",
-    "device_version": "0.0.6"
-  },
-  "rgblight": {
-    "led_count": 9
-  },
-  "ws2812": {
-    "pin": "A1",
-    "driver": "pwm"
-  },
-  "rgb_matrix": {
-    "driver": "ws2812",
-    "sleep": true
-  },
-  "matrix_pins": {
-    "cols": ["B11", "B10", "B2", "B1", "A7", "B0"],
-    "rows": ["A10", "A9", "A8", "B15", "C13", "C14", "C15", "A2"]
-  },
-  "diode_direction": "COL2ROW",
-  "dip_switch": {
-    "pins": ["B14", "A15", "A0", "B9"]
-  },
-  "encoder": {
-    "rotary": [
-      {"pin_a": "B12", "pin_b": "B13"}
-    ]
-  },
-  "processor": "STM32F303",
-  "bootloader": "stm32-dfu",
-  "community_layouts": ["ortho_4x12", "planck_mit"],
-  "layout_aliases": {
-    "LAYOUT": "LAYOUT_ortho_4x12",
-    "LAYOUT_planck_grid": "LAYOUT_ortho_4x12",
-    "LAYOUT_planck_mit": "LAYOUT_planck_1x2uC"
-  },
-  "layouts": {
-    "LAYOUT_ortho_4x12": {
-      "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": [4, 0], "x": 6, "y": 0},
-        {"matrix": [4, 1], "x": 7, "y": 0},
-        {"matrix": [4, 2], "x": 8, "y": 0},
-        {"matrix": [4, 3], "x": 9, "y": 0},
-        {"matrix": [4, 4], "x": 10, "y": 0},
-        {"matrix": [4, 5], "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": [5, 0], "x": 6, "y": 1},
-        {"matrix": [5, 1], "x": 7, "y": 1},
-        {"matrix": [5, 2], "x": 8, "y": 1},
-        {"matrix": [5, 3], "x": 9, "y": 1},
-        {"matrix": [5, 4], "x": 10, "y": 1},
-        {"matrix": [5, 5], "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": [6, 0], "x": 6, "y": 2},
-        {"matrix": [6, 1], "x": 7, "y": 2},
-        {"matrix": [6, 2], "x": 8, "y": 2},
-        {"matrix": [6, 3], "x": 9, "y": 2},
-        {"matrix": [6, 4], "x": 10, "y": 2},
-        {"matrix": [6, 5], "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": [7, 3], "x": 3, "y": 3},
-        {"matrix": [7, 4], "x": 4, "y": 3},
-        {"matrix": [7, 5], "x": 5, "y": 3},
-        {"matrix": [7, 0], "x": 6, "y": 3},
-        {"matrix": [7, 1], "x": 7, "y": 3},
-        {"matrix": [7, 2], "x": 8, "y": 3},
-        {"matrix": [3, 3], "x": 9, "y": 3},
-        {"matrix": [3, 4], "x": 10, "y": 3},
-        {"matrix": [3, 5], "x": 11, "y": 3}
-      ]
-    },
-    "LAYOUT_planck_1x2uC": {
-      "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": [4, 0], "x": 6, "y": 0},
-        {"matrix": [4, 1], "x": 7, "y": 0},
-        {"matrix": [4, 2], "x": 8, "y": 0},
-        {"matrix": [4, 3], "x": 9, "y": 0},
-        {"matrix": [4, 4], "x": 10, "y": 0},
-        {"matrix": [4, 5], "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": [5, 0], "x": 6, "y": 1},
-        {"matrix": [5, 1], "x": 7, "y": 1},
-        {"matrix": [5, 2], "x": 8, "y": 1},
-        {"matrix": [5, 3], "x": 9, "y": 1},
-        {"matrix": [5, 4], "x": 10, "y": 1},
-        {"matrix": [5, 5], "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": [6, 0], "x": 6, "y": 2},
-        {"matrix": [6, 1], "x": 7, "y": 2},
-        {"matrix": [6, 2], "x": 8, "y": 2},
-        {"matrix": [6, 3], "x": 9, "y": 2},
-        {"matrix": [6, 4], "x": 10, "y": 2},
-        {"matrix": [6, 5], "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": [7, 3], "x": 3, "y": 3},
-        {"matrix": [7, 4], "x": 4, "y": 3},
-        {"matrix": [7, 0], "x": 5, "y": 3, "w": 2},
-        {"matrix": [7, 1], "x": 7, "y": 3},
-        {"matrix": [7, 2], "x": 8, "y": 3},
-        {"matrix": [3, 3], "x": 9, "y": 3},
-        {"matrix": [3, 4], "x": 10, "y": 3},
-        {"matrix": [3, 5], "x": 11, "y": 3}
-      ]
-    },
-    "LAYOUT_planck_1x2uL": {
-      "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": [4, 0], "x": 6, "y": 0},
-        {"matrix": [4, 1], "x": 7, "y": 0},
-        {"matrix": [4, 2], "x": 8, "y": 0},
-        {"matrix": [4, 3], "x": 9, "y": 0},
-        {"matrix": [4, 4], "x": 10, "y": 0},
-        {"matrix": [4, 5], "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": [5, 0], "x": 6, "y": 1},
-        {"matrix": [5, 1], "x": 7, "y": 1},
-        {"matrix": [5, 2], "x": 8, "y": 1},
-        {"matrix": [5, 3], "x": 9, "y": 1},
-        {"matrix": [5, 4], "x": 10, "y": 1},
-        {"matrix": [5, 5], "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": [6, 0], "x": 6, "y": 2},
-        {"matrix": [6, 1], "x": 7, "y": 2},
-        {"matrix": [6, 2], "x": 8, "y": 2},
-        {"matrix": [6, 3], "x": 9, "y": 2},
-        {"matrix": [6, 4], "x": 10, "y": 2},
-        {"matrix": [6, 5], "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": [7, 3], "x": 3, "y": 3},
-        {"matrix": [7, 5], "x": 4, "y": 3, "w": 2},
-        {"matrix": [7, 0], "x": 6, "y": 3},
-        {"matrix": [7, 1], "x": 7, "y": 3},
-        {"matrix": [7, 2], "x": 8, "y": 3},
-        {"matrix": [3, 3], "x": 9, "y": 3},
-        {"matrix": [3, 4], "x": 10, "y": 3},
-        {"matrix": [3, 5], "x": 11, "y": 3}
-      ]
-    },
-    "LAYOUT_planck_1x2uR": {
-      "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": [4, 0], "x": 6, "y": 0},
-        {"matrix": [4, 1], "x": 7, "y": 0},
-        {"matrix": [4, 2], "x": 8, "y": 0},
-        {"matrix": [4, 3], "x": 9, "y": 0},
-        {"matrix": [4, 4], "x": 10, "y": 0},
-        {"matrix": [4, 5], "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": [5, 0], "x": 6, "y": 1},
-        {"matrix": [5, 1], "x": 7, "y": 1},
-        {"matrix": [5, 2], "x": 8, "y": 1},
-        {"matrix": [5, 3], "x": 9, "y": 1},
-        {"matrix": [5, 4], "x": 10, "y": 1},
-        {"matrix": [5, 5], "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": [6, 0], "x": 6, "y": 2},
-        {"matrix": [6, 1], "x": 7, "y": 2},
-        {"matrix": [6, 2], "x": 8, "y": 2},
-        {"matrix": [6, 3], "x": 9, "y": 2},
-        {"matrix": [6, 4], "x": 10, "y": 2},
-        {"matrix": [6, 5], "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": [7, 3], "x": 3, "y": 3},
-        {"matrix": [7, 4], "x": 4, "y": 3},
-        {"matrix": [7, 5], "x": 5, "y": 3},
-        {"matrix": [7, 1], "x": 6, "y": 3, "w": 2},
-        {"matrix": [7, 2], "x": 8, "y": 3},
-        {"matrix": [3, 3], "x": 9, "y": 3},
-        {"matrix": [3, 4], "x": 10, "y": 3},
-        {"matrix": [3, 5], "x": 11, "y": 3}
-      ]
-    },
-    "LAYOUT_planck_2x2u": {
-      "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": [4, 0], "x": 6, "y": 0},
-        {"matrix": [4, 1], "x": 7, "y": 0},
-        {"matrix": [4, 2], "x": 8, "y": 0},
-        {"matrix": [4, 3], "x": 9, "y": 0},
-        {"matrix": [4, 4], "x": 10, "y": 0},
-        {"matrix": [4, 5], "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": [5, 0], "x": 6, "y": 1},
-        {"matrix": [5, 1], "x": 7, "y": 1},
-        {"matrix": [5, 2], "x": 8, "y": 1},
-        {"matrix": [5, 3], "x": 9, "y": 1},
-        {"matrix": [5, 4], "x": 10, "y": 1},
-        {"matrix": [5, 5], "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": [6, 0], "x": 6, "y": 2},
-        {"matrix": [6, 1], "x": 7, "y": 2},
-        {"matrix": [6, 2], "x": 8, "y": 2},
-        {"matrix": [6, 3], "x": 9, "y": 2},
-        {"matrix": [6, 4], "x": 10, "y": 2},
-        {"matrix": [6, 5], "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": [7, 3], "x": 3, "y": 3},
-        {"matrix": [7, 5], "x": 4, "y": 3, "w": 2},
-        {"matrix": [7, 1], "x": 6, "y": 3, "w": 2},
-        {"matrix": [7, 2], "x": 8, "y": 3},
-        {"matrix": [3, 3], "x": 9, "y": 3},
-        {"matrix": [3, 4], "x": 10, "y": 3},
-        {"matrix": [3, 5], "x": 11, "y": 3}
-      ]
-    }
-  }
-}
diff --git a/keyboards/planck/rev6_drop/keyboard.json b/keyboards/planck/rev6_drop/keyboard.json
@@ -0,0 +1,327 @@
+{
+  "keyboard_name": "Planck",
+  "manufacturer": "Drop",
+  "url": "https://olkb.com/planck",
+  "maintainer": "jackhumbert",
+  "usb": {
+    "vid": "0x03A8",
+    "pid": "0xA4F9",
+    "device_version": "0.0.6"
+  },
+  "features": {
+    "audio": true,
+    "bootmagic": true,
+    "command": true,
+    "console": true,
+    "dip_switch": true,
+    "encoder": true,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": true,
+    "rgblight": true
+  },
+  "rgblight": {
+    "led_count": 9
+  },
+  "ws2812": {
+    "pin": "A1",
+    "driver": "pwm"
+  },
+  "rgb_matrix": {
+    "driver": "ws2812",
+    "sleep": true
+  },
+  "matrix_pins": {
+    "cols": ["B11", "B10", "B2", "B1", "A7", "B0"],
+    "rows": ["A10", "A9", "A8", "B15", "C13", "C14", "C15", "A2"]
+  },
+  "diode_direction": "COL2ROW",
+  "dip_switch": {
+    "pins": ["B14", "A15", "A0", "B9"]
+  },
+  "encoder": {
+    "rotary": [
+      {"pin_a": "B12", "pin_b": "B13"}
+    ]
+  },
+  "processor": "STM32F303",
+  "bootloader": "stm32-dfu",
+  "community_layouts": ["ortho_4x12", "planck_mit"],
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_ortho_4x12",
+    "LAYOUT_planck_grid": "LAYOUT_ortho_4x12",
+    "LAYOUT_planck_mit": "LAYOUT_planck_1x2uC"
+  },
+  "layouts": {
+    "LAYOUT_ortho_4x12": {
+      "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": [4, 0], "x": 6, "y": 0},
+        {"matrix": [4, 1], "x": 7, "y": 0},
+        {"matrix": [4, 2], "x": 8, "y": 0},
+        {"matrix": [4, 3], "x": 9, "y": 0},
+        {"matrix": [4, 4], "x": 10, "y": 0},
+        {"matrix": [4, 5], "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": [5, 0], "x": 6, "y": 1},
+        {"matrix": [5, 1], "x": 7, "y": 1},
+        {"matrix": [5, 2], "x": 8, "y": 1},
+        {"matrix": [5, 3], "x": 9, "y": 1},
+        {"matrix": [5, 4], "x": 10, "y": 1},
+        {"matrix": [5, 5], "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": [6, 0], "x": 6, "y": 2},
+        {"matrix": [6, 1], "x": 7, "y": 2},
+        {"matrix": [6, 2], "x": 8, "y": 2},
+        {"matrix": [6, 3], "x": 9, "y": 2},
+        {"matrix": [6, 4], "x": 10, "y": 2},
+        {"matrix": [6, 5], "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": [7, 3], "x": 3, "y": 3},
+        {"matrix": [7, 4], "x": 4, "y": 3},
+        {"matrix": [7, 5], "x": 5, "y": 3},
+        {"matrix": [7, 0], "x": 6, "y": 3},
+        {"matrix": [7, 1], "x": 7, "y": 3},
+        {"matrix": [7, 2], "x": 8, "y": 3},
+        {"matrix": [3, 3], "x": 9, "y": 3},
+        {"matrix": [3, 4], "x": 10, "y": 3},
+        {"matrix": [3, 5], "x": 11, "y": 3}
+      ]
+    },
+    "LAYOUT_planck_1x2uC": {
+      "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": [4, 0], "x": 6, "y": 0},
+        {"matrix": [4, 1], "x": 7, "y": 0},
+        {"matrix": [4, 2], "x": 8, "y": 0},
+        {"matrix": [4, 3], "x": 9, "y": 0},
+        {"matrix": [4, 4], "x": 10, "y": 0},
+        {"matrix": [4, 5], "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": [5, 0], "x": 6, "y": 1},
+        {"matrix": [5, 1], "x": 7, "y": 1},
+        {"matrix": [5, 2], "x": 8, "y": 1},
+        {"matrix": [5, 3], "x": 9, "y": 1},
+        {"matrix": [5, 4], "x": 10, "y": 1},
+        {"matrix": [5, 5], "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": [6, 0], "x": 6, "y": 2},
+        {"matrix": [6, 1], "x": 7, "y": 2},
+        {"matrix": [6, 2], "x": 8, "y": 2},
+        {"matrix": [6, 3], "x": 9, "y": 2},
+        {"matrix": [6, 4], "x": 10, "y": 2},
+        {"matrix": [6, 5], "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": [7, 3], "x": 3, "y": 3},
+        {"matrix": [7, 4], "x": 4, "y": 3},
+        {"matrix": [7, 0], "x": 5, "y": 3, "w": 2},
+        {"matrix": [7, 1], "x": 7, "y": 3},
+        {"matrix": [7, 2], "x": 8, "y": 3},
+        {"matrix": [3, 3], "x": 9, "y": 3},
+        {"matrix": [3, 4], "x": 10, "y": 3},
+        {"matrix": [3, 5], "x": 11, "y": 3}
+      ]
+    },
+    "LAYOUT_planck_1x2uL": {
+      "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": [4, 0], "x": 6, "y": 0},
+        {"matrix": [4, 1], "x": 7, "y": 0},
+        {"matrix": [4, 2], "x": 8, "y": 0},
+        {"matrix": [4, 3], "x": 9, "y": 0},
+        {"matrix": [4, 4], "x": 10, "y": 0},
+        {"matrix": [4, 5], "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": [5, 0], "x": 6, "y": 1},
+        {"matrix": [5, 1], "x": 7, "y": 1},
+        {"matrix": [5, 2], "x": 8, "y": 1},
+        {"matrix": [5, 3], "x": 9, "y": 1},
+        {"matrix": [5, 4], "x": 10, "y": 1},
+        {"matrix": [5, 5], "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": [6, 0], "x": 6, "y": 2},
+        {"matrix": [6, 1], "x": 7, "y": 2},
+        {"matrix": [6, 2], "x": 8, "y": 2},
+        {"matrix": [6, 3], "x": 9, "y": 2},
+        {"matrix": [6, 4], "x": 10, "y": 2},
+        {"matrix": [6, 5], "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": [7, 3], "x": 3, "y": 3},
+        {"matrix": [7, 5], "x": 4, "y": 3, "w": 2},
+        {"matrix": [7, 0], "x": 6, "y": 3},
+        {"matrix": [7, 1], "x": 7, "y": 3},
+        {"matrix": [7, 2], "x": 8, "y": 3},
+        {"matrix": [3, 3], "x": 9, "y": 3},
+        {"matrix": [3, 4], "x": 10, "y": 3},
+        {"matrix": [3, 5], "x": 11, "y": 3}
+      ]
+    },
+    "LAYOUT_planck_1x2uR": {
+      "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": [4, 0], "x": 6, "y": 0},
+        {"matrix": [4, 1], "x": 7, "y": 0},
+        {"matrix": [4, 2], "x": 8, "y": 0},
+        {"matrix": [4, 3], "x": 9, "y": 0},
+        {"matrix": [4, 4], "x": 10, "y": 0},
+        {"matrix": [4, 5], "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": [5, 0], "x": 6, "y": 1},
+        {"matrix": [5, 1], "x": 7, "y": 1},
+        {"matrix": [5, 2], "x": 8, "y": 1},
+        {"matrix": [5, 3], "x": 9, "y": 1},
+        {"matrix": [5, 4], "x": 10, "y": 1},
+        {"matrix": [5, 5], "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": [6, 0], "x": 6, "y": 2},
+        {"matrix": [6, 1], "x": 7, "y": 2},
+        {"matrix": [6, 2], "x": 8, "y": 2},
+        {"matrix": [6, 3], "x": 9, "y": 2},
+        {"matrix": [6, 4], "x": 10, "y": 2},
+        {"matrix": [6, 5], "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": [7, 3], "x": 3, "y": 3},
+        {"matrix": [7, 4], "x": 4, "y": 3},
+        {"matrix": [7, 5], "x": 5, "y": 3},
+        {"matrix": [7, 1], "x": 6, "y": 3, "w": 2},
+        {"matrix": [7, 2], "x": 8, "y": 3},
+        {"matrix": [3, 3], "x": 9, "y": 3},
+        {"matrix": [3, 4], "x": 10, "y": 3},
+        {"matrix": [3, 5], "x": 11, "y": 3}
+      ]
+    },
+    "LAYOUT_planck_2x2u": {
+      "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": [4, 0], "x": 6, "y": 0},
+        {"matrix": [4, 1], "x": 7, "y": 0},
+        {"matrix": [4, 2], "x": 8, "y": 0},
+        {"matrix": [4, 3], "x": 9, "y": 0},
+        {"matrix": [4, 4], "x": 10, "y": 0},
+        {"matrix": [4, 5], "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": [5, 0], "x": 6, "y": 1},
+        {"matrix": [5, 1], "x": 7, "y": 1},
+        {"matrix": [5, 2], "x": 8, "y": 1},
+        {"matrix": [5, 3], "x": 9, "y": 1},
+        {"matrix": [5, 4], "x": 10, "y": 1},
+        {"matrix": [5, 5], "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": [6, 0], "x": 6, "y": 2},
+        {"matrix": [6, 1], "x": 7, "y": 2},
+        {"matrix": [6, 2], "x": 8, "y": 2},
+        {"matrix": [6, 3], "x": 9, "y": 2},
+        {"matrix": [6, 4], "x": 10, "y": 2},
+        {"matrix": [6, 5], "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": [7, 3], "x": 3, "y": 3},
+        {"matrix": [7, 5], "x": 4, "y": 3, "w": 2},
+        {"matrix": [7, 1], "x": 6, "y": 3, "w": 2},
+        {"matrix": [7, 2], "x": 8, "y": 3},
+        {"matrix": [3, 3], "x": 9, "y": 3},
+        {"matrix": [3, 4], "x": 10, "y": 3},
+        {"matrix": [3, 5], "x": 11, "y": 3}
+      ]
+    }
+  }
+}
diff --git a/keyboards/planck/rev6_drop/rules.mk b/keyboards/planck/rev6_drop/rules.mk
@@ -1,19 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = yes          # Audio output
 CUSTOM_MATRIX = lite
-# Do not enable RGB_MATRIX_ENABLE together with RGBLIGHT_ENABLE
-RGB_MATRIX_ENABLE = no
-ENCODER_ENABLE = yes
-DIP_SWITCH_ENABLE = yes
-
 SRC += matrix.c
diff --git a/keyboards/planck/rev7/info.json b/keyboards/planck/rev7/info.json
@@ -1,333 +0,0 @@
-{
-  "keyboard_name": "Planck",
-  "manufacturer": "Drop",
-  "url": "https://olkb.com/planck",
-  "maintainer": "jackhumbert",
-  "usb": {
-    "vid": "0x03A8",
-    "pid": "0xA4F9",
-    "device_version": "0.0.7"
-  },
-  "ws2812": {
-    "pin": "A1",
-    "driver": "pwm"
-  },
-  "rgb_matrix": {
-    "driver": "ws2812",
-    "sleep": true
-  },
-  "matrix_pins": {
-    "cols": ["B11", "B10", "B2", "B1", "A7", "B0"],
-    "rows": ["A10", "A9", "A8", "B15", "C13", "C14", "C15", "A2"]
-  },
-  "diode_direction": "COL2ROW",
-  "dip_switch": {
-    "pins": ["B14", "A15", "A0", "B9"]
-  },
-  "encoder": {
-    "rotary": [
-        {"pin_a": "B12", "pin_b": "B13"},
-        {"pin_a": "B12", "pin_b": "B13"},
-        {"pin_a": "B12", "pin_b": "B13"},
-        {"pin_a": "B12", "pin_b": "B13"},
-        {"pin_a": "B12", "pin_b": "B13"},
-        {"pin_a": "B12", "pin_b": "B13"},
-        {"pin_a": "B12", "pin_b": "B13"},
-        {"pin_a": "B12", "pin_b": "B13"}
-    ]
-  },
-  "features": {
-    "audio": true,
-    "bootmagic": true,
-    "command": true,
-    "console": true,
-    "encoder": true,
-    "extrakey": true,
-    "mousekey": true,
-    "nkro": true,
-    "rgblight": true
-  },
-  "rgblight": {
-    "led_count": 9
-  },
-  "processor": "STM32F303",
-  "bootloader": "stm32-dfu",
-  "community_layouts": ["ortho_4x12", "planck_mit"],
-  "layout_aliases": {
-    "LAYOUT": "LAYOUT_ortho_4x12",
-    "LAYOUT_planck_grid": "LAYOUT_ortho_4x12",
-    "LAYOUT_planck_mit": "LAYOUT_planck_1x2uC"
-  },
-  "layouts": {
-    "LAYOUT_ortho_4x12": {
-      "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": [4, 0], "x": 6, "y": 0 },
-        { "matrix": [4, 1], "x": 7, "y": 0 },
-        { "matrix": [4, 2], "x": 8, "y": 0 },
-        { "matrix": [4, 3], "x": 9, "y": 0 },
-        { "matrix": [4, 4], "x": 10, "y": 0 },
-        { "matrix": [4, 5], "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": [5, 0], "x": 6, "y": 1 },
-        { "matrix": [5, 1], "x": 7, "y": 1 },
-        { "matrix": [5, 2], "x": 8, "y": 1 },
-        { "matrix": [5, 3], "x": 9, "y": 1 },
-        { "matrix": [5, 4], "x": 10, "y": 1 },
-        { "matrix": [5, 5], "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": [6, 0], "x": 6, "y": 2 },
-        { "matrix": [6, 1], "x": 7, "y": 2 },
-        { "matrix": [6, 2], "x": 8, "y": 2 },
-        { "matrix": [6, 3], "x": 9, "y": 2 },
-        { "matrix": [6, 4], "x": 10, "y": 2 },
-        { "matrix": [6, 5], "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": [7, 3], "x": 3, "y": 3 },
-        { "matrix": [7, 4], "x": 4, "y": 3 },
-        { "matrix": [7, 5], "x": 5, "y": 3 },
-        { "matrix": [7, 0], "x": 6, "y": 3 },
-        { "matrix": [7, 1], "x": 7, "y": 3 },
-        { "matrix": [7, 2], "x": 8, "y": 3 },
-        { "matrix": [3, 3], "x": 9, "y": 3 },
-        { "matrix": [3, 4], "x": 10, "y": 3 },
-        { "matrix": [3, 5], "x": 11, "y": 3 }
-      ]
-    },
-    "LAYOUT_planck_1x2uC": {
-      "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": [4, 0], "x": 6, "y": 0 },
-        { "matrix": [4, 1], "x": 7, "y": 0 },
-        { "matrix": [4, 2], "x": 8, "y": 0 },
-        { "matrix": [4, 3], "x": 9, "y": 0 },
-        { "matrix": [4, 4], "x": 10, "y": 0 },
-        { "matrix": [4, 5], "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": [5, 0], "x": 6, "y": 1 },
-        { "matrix": [5, 1], "x": 7, "y": 1 },
-        { "matrix": [5, 2], "x": 8, "y": 1 },
-        { "matrix": [5, 3], "x": 9, "y": 1 },
-        { "matrix": [5, 4], "x": 10, "y": 1 },
-        { "matrix": [5, 5], "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": [6, 0], "x": 6, "y": 2 },
-        { "matrix": [6, 1], "x": 7, "y": 2 },
-        { "matrix": [6, 2], "x": 8, "y": 2 },
-        { "matrix": [6, 3], "x": 9, "y": 2 },
-        { "matrix": [6, 4], "x": 10, "y": 2 },
-        { "matrix": [6, 5], "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": [7, 3], "x": 3, "y": 3 },
-        { "matrix": [7, 4], "x": 4, "y": 3 },
-        { "matrix": [7, 0], "x": 5, "y": 3, "w": 2 },
-        { "matrix": [7, 1], "x": 7, "y": 3 },
-        { "matrix": [7, 2], "x": 8, "y": 3 },
-        { "matrix": [3, 3], "x": 9, "y": 3 },
-        { "matrix": [3, 4], "x": 10, "y": 3 },
-        { "matrix": [3, 5], "x": 11, "y": 3 }
-      ]
-    },
-    "LAYOUT_planck_1x2uL": {
-      "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": [4, 0], "x": 6, "y": 0 },
-        { "matrix": [4, 1], "x": 7, "y": 0 },
-        { "matrix": [4, 2], "x": 8, "y": 0 },
-        { "matrix": [4, 3], "x": 9, "y": 0 },
-        { "matrix": [4, 4], "x": 10, "y": 0 },
-        { "matrix": [4, 5], "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": [5, 0], "x": 6, "y": 1 },
-        { "matrix": [5, 1], "x": 7, "y": 1 },
-        { "matrix": [5, 2], "x": 8, "y": 1 },
-        { "matrix": [5, 3], "x": 9, "y": 1 },
-        { "matrix": [5, 4], "x": 10, "y": 1 },
-        { "matrix": [5, 5], "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": [6, 0], "x": 6, "y": 2 },
-        { "matrix": [6, 1], "x": 7, "y": 2 },
-        { "matrix": [6, 2], "x": 8, "y": 2 },
-        { "matrix": [6, 3], "x": 9, "y": 2 },
-        { "matrix": [6, 4], "x": 10, "y": 2 },
-        { "matrix": [6, 5], "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": [7, 3], "x": 3, "y": 3 },
-        { "matrix": [7, 5], "x": 4, "y": 3, "w": 2 },
-        { "matrix": [7, 0], "x": 6, "y": 3 },
-        { "matrix": [7, 1], "x": 7, "y": 3 },
-        { "matrix": [7, 2], "x": 8, "y": 3 },
-        { "matrix": [3, 3], "x": 9, "y": 3 },
-        { "matrix": [3, 4], "x": 10, "y": 3 },
-        { "matrix": [3, 5], "x": 11, "y": 3 }
-      ]
-    },
-    "LAYOUT_planck_1x2uR": {
-      "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": [4, 0], "x": 6, "y": 0 },
-        { "matrix": [4, 1], "x": 7, "y": 0 },
-        { "matrix": [4, 2], "x": 8, "y": 0 },
-        { "matrix": [4, 3], "x": 9, "y": 0 },
-        { "matrix": [4, 4], "x": 10, "y": 0 },
-        { "matrix": [4, 5], "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": [5, 0], "x": 6, "y": 1 },
-        { "matrix": [5, 1], "x": 7, "y": 1 },
-        { "matrix": [5, 2], "x": 8, "y": 1 },
-        { "matrix": [5, 3], "x": 9, "y": 1 },
-        { "matrix": [5, 4], "x": 10, "y": 1 },
-        { "matrix": [5, 5], "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": [6, 0], "x": 6, "y": 2 },
-        { "matrix": [6, 1], "x": 7, "y": 2 },
-        { "matrix": [6, 2], "x": 8, "y": 2 },
-        { "matrix": [6, 3], "x": 9, "y": 2 },
-        { "matrix": [6, 4], "x": 10, "y": 2 },
-        { "matrix": [6, 5], "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": [7, 3], "x": 3, "y": 3 },
-        { "matrix": [7, 4], "x": 4, "y": 3 },
-        { "matrix": [7, 5], "x": 5, "y": 3 },
-        { "matrix": [7, 1], "x": 6, "y": 3, "w": 2 },
-        { "matrix": [7, 2], "x": 8, "y": 3 },
-        { "matrix": [3, 3], "x": 9, "y": 3 },
-        { "matrix": [3, 4], "x": 10, "y": 3 },
-        { "matrix": [3, 5], "x": 11, "y": 3 }
-      ]
-    },
-    "LAYOUT_planck_2x2u": {
-      "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": [4, 0], "x": 6, "y": 0 },
-        { "matrix": [4, 1], "x": 7, "y": 0 },
-        { "matrix": [4, 2], "x": 8, "y": 0 },
-        { "matrix": [4, 3], "x": 9, "y": 0 },
-        { "matrix": [4, 4], "x": 10, "y": 0 },
-        { "matrix": [4, 5], "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": [5, 0], "x": 6, "y": 1 },
-        { "matrix": [5, 1], "x": 7, "y": 1 },
-        { "matrix": [5, 2], "x": 8, "y": 1 },
-        { "matrix": [5, 3], "x": 9, "y": 1 },
-        { "matrix": [5, 4], "x": 10, "y": 1 },
-        { "matrix": [5, 5], "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": [6, 0], "x": 6, "y": 2 },
-        { "matrix": [6, 1], "x": 7, "y": 2 },
-        { "matrix": [6, 2], "x": 8, "y": 2 },
-        { "matrix": [6, 3], "x": 9, "y": 2 },
-        { "matrix": [6, 4], "x": 10, "y": 2 },
-        { "matrix": [6, 5], "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": [7, 3], "x": 3, "y": 3 },
-        { "matrix": [7, 5], "x": 4, "y": 3, "w": 2 },
-        { "matrix": [7, 1], "x": 6, "y": 3, "w": 2 },
-        { "matrix": [7, 2], "x": 8, "y": 3 },
-        { "matrix": [3, 3], "x": 9, "y": 3 },
-        { "matrix": [3, 4], "x": 10, "y": 3 },
-        { "matrix": [3, 5], "x": 11, "y": 3 }
-      ]
-    }
-  }
-}
diff --git a/keyboards/planck/rev7/keyboard.json b/keyboards/planck/rev7/keyboard.json
@@ -0,0 +1,334 @@
+{
+  "keyboard_name": "Planck",
+  "manufacturer": "Drop",
+  "url": "https://olkb.com/planck",
+  "maintainer": "jackhumbert",
+  "usb": {
+    "vid": "0x03A8",
+    "pid": "0xA4F9",
+    "device_version": "0.0.7"
+  },
+  "ws2812": {
+    "pin": "A1",
+    "driver": "pwm"
+  },
+  "rgb_matrix": {
+    "driver": "ws2812",
+    "sleep": true
+  },
+  "matrix_pins": {
+    "cols": ["B11", "B10", "B2", "B1", "A7", "B0"],
+    "rows": ["A10", "A9", "A8", "B15", "C13", "C14", "C15", "A2"]
+  },
+  "diode_direction": "COL2ROW",
+  "dip_switch": {
+    "pins": ["B14", "A15", "A0", "B9"]
+  },
+  "encoder": {
+    "rotary": [
+        {"pin_a": "B12", "pin_b": "B13"},
+        {"pin_a": "B12", "pin_b": "B13"},
+        {"pin_a": "B12", "pin_b": "B13"},
+        {"pin_a": "B12", "pin_b": "B13"},
+        {"pin_a": "B12", "pin_b": "B13"},
+        {"pin_a": "B12", "pin_b": "B13"},
+        {"pin_a": "B12", "pin_b": "B13"},
+        {"pin_a": "B12", "pin_b": "B13"}
+    ]
+  },
+  "features": {
+    "audio": true,
+    "bootmagic": true,
+    "command": true,
+    "console": true,
+    "encoder": true,
+    "dip_switch": true,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": true,
+    "rgblight": true
+  },
+  "rgblight": {
+    "led_count": 9
+  },
+  "processor": "STM32F303",
+  "bootloader": "stm32-dfu",
+  "community_layouts": ["ortho_4x12", "planck_mit"],
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_ortho_4x12",
+    "LAYOUT_planck_grid": "LAYOUT_ortho_4x12",
+    "LAYOUT_planck_mit": "LAYOUT_planck_1x2uC"
+  },
+  "layouts": {
+    "LAYOUT_ortho_4x12": {
+      "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": [4, 0], "x": 6, "y": 0 },
+        { "matrix": [4, 1], "x": 7, "y": 0 },
+        { "matrix": [4, 2], "x": 8, "y": 0 },
+        { "matrix": [4, 3], "x": 9, "y": 0 },
+        { "matrix": [4, 4], "x": 10, "y": 0 },
+        { "matrix": [4, 5], "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": [5, 0], "x": 6, "y": 1 },
+        { "matrix": [5, 1], "x": 7, "y": 1 },
+        { "matrix": [5, 2], "x": 8, "y": 1 },
+        { "matrix": [5, 3], "x": 9, "y": 1 },
+        { "matrix": [5, 4], "x": 10, "y": 1 },
+        { "matrix": [5, 5], "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": [6, 0], "x": 6, "y": 2 },
+        { "matrix": [6, 1], "x": 7, "y": 2 },
+        { "matrix": [6, 2], "x": 8, "y": 2 },
+        { "matrix": [6, 3], "x": 9, "y": 2 },
+        { "matrix": [6, 4], "x": 10, "y": 2 },
+        { "matrix": [6, 5], "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": [7, 3], "x": 3, "y": 3 },
+        { "matrix": [7, 4], "x": 4, "y": 3 },
+        { "matrix": [7, 5], "x": 5, "y": 3 },
+        { "matrix": [7, 0], "x": 6, "y": 3 },
+        { "matrix": [7, 1], "x": 7, "y": 3 },
+        { "matrix": [7, 2], "x": 8, "y": 3 },
+        { "matrix": [3, 3], "x": 9, "y": 3 },
+        { "matrix": [3, 4], "x": 10, "y": 3 },
+        { "matrix": [3, 5], "x": 11, "y": 3 }
+      ]
+    },
+    "LAYOUT_planck_1x2uC": {
+      "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": [4, 0], "x": 6, "y": 0 },
+        { "matrix": [4, 1], "x": 7, "y": 0 },
+        { "matrix": [4, 2], "x": 8, "y": 0 },
+        { "matrix": [4, 3], "x": 9, "y": 0 },
+        { "matrix": [4, 4], "x": 10, "y": 0 },
+        { "matrix": [4, 5], "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": [5, 0], "x": 6, "y": 1 },
+        { "matrix": [5, 1], "x": 7, "y": 1 },
+        { "matrix": [5, 2], "x": 8, "y": 1 },
+        { "matrix": [5, 3], "x": 9, "y": 1 },
+        { "matrix": [5, 4], "x": 10, "y": 1 },
+        { "matrix": [5, 5], "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": [6, 0], "x": 6, "y": 2 },
+        { "matrix": [6, 1], "x": 7, "y": 2 },
+        { "matrix": [6, 2], "x": 8, "y": 2 },
+        { "matrix": [6, 3], "x": 9, "y": 2 },
+        { "matrix": [6, 4], "x": 10, "y": 2 },
+        { "matrix": [6, 5], "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": [7, 3], "x": 3, "y": 3 },
+        { "matrix": [7, 4], "x": 4, "y": 3 },
+        { "matrix": [7, 0], "x": 5, "y": 3, "w": 2 },
+        { "matrix": [7, 1], "x": 7, "y": 3 },
+        { "matrix": [7, 2], "x": 8, "y": 3 },
+        { "matrix": [3, 3], "x": 9, "y": 3 },
+        { "matrix": [3, 4], "x": 10, "y": 3 },
+        { "matrix": [3, 5], "x": 11, "y": 3 }
+      ]
+    },
+    "LAYOUT_planck_1x2uL": {
+      "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": [4, 0], "x": 6, "y": 0 },
+        { "matrix": [4, 1], "x": 7, "y": 0 },
+        { "matrix": [4, 2], "x": 8, "y": 0 },
+        { "matrix": [4, 3], "x": 9, "y": 0 },
+        { "matrix": [4, 4], "x": 10, "y": 0 },
+        { "matrix": [4, 5], "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": [5, 0], "x": 6, "y": 1 },
+        { "matrix": [5, 1], "x": 7, "y": 1 },
+        { "matrix": [5, 2], "x": 8, "y": 1 },
+        { "matrix": [5, 3], "x": 9, "y": 1 },
+        { "matrix": [5, 4], "x": 10, "y": 1 },
+        { "matrix": [5, 5], "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": [6, 0], "x": 6, "y": 2 },
+        { "matrix": [6, 1], "x": 7, "y": 2 },
+        { "matrix": [6, 2], "x": 8, "y": 2 },
+        { "matrix": [6, 3], "x": 9, "y": 2 },
+        { "matrix": [6, 4], "x": 10, "y": 2 },
+        { "matrix": [6, 5], "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": [7, 3], "x": 3, "y": 3 },
+        { "matrix": [7, 5], "x": 4, "y": 3, "w": 2 },
+        { "matrix": [7, 0], "x": 6, "y": 3 },
+        { "matrix": [7, 1], "x": 7, "y": 3 },
+        { "matrix": [7, 2], "x": 8, "y": 3 },
+        { "matrix": [3, 3], "x": 9, "y": 3 },
+        { "matrix": [3, 4], "x": 10, "y": 3 },
+        { "matrix": [3, 5], "x": 11, "y": 3 }
+      ]
+    },
+    "LAYOUT_planck_1x2uR": {
+      "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": [4, 0], "x": 6, "y": 0 },
+        { "matrix": [4, 1], "x": 7, "y": 0 },
+        { "matrix": [4, 2], "x": 8, "y": 0 },
+        { "matrix": [4, 3], "x": 9, "y": 0 },
+        { "matrix": [4, 4], "x": 10, "y": 0 },
+        { "matrix": [4, 5], "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": [5, 0], "x": 6, "y": 1 },
+        { "matrix": [5, 1], "x": 7, "y": 1 },
+        { "matrix": [5, 2], "x": 8, "y": 1 },
+        { "matrix": [5, 3], "x": 9, "y": 1 },
+        { "matrix": [5, 4], "x": 10, "y": 1 },
+        { "matrix": [5, 5], "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": [6, 0], "x": 6, "y": 2 },
+        { "matrix": [6, 1], "x": 7, "y": 2 },
+        { "matrix": [6, 2], "x": 8, "y": 2 },
+        { "matrix": [6, 3], "x": 9, "y": 2 },
+        { "matrix": [6, 4], "x": 10, "y": 2 },
+        { "matrix": [6, 5], "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": [7, 3], "x": 3, "y": 3 },
+        { "matrix": [7, 4], "x": 4, "y": 3 },
+        { "matrix": [7, 5], "x": 5, "y": 3 },
+        { "matrix": [7, 1], "x": 6, "y": 3, "w": 2 },
+        { "matrix": [7, 2], "x": 8, "y": 3 },
+        { "matrix": [3, 3], "x": 9, "y": 3 },
+        { "matrix": [3, 4], "x": 10, "y": 3 },
+        { "matrix": [3, 5], "x": 11, "y": 3 }
+      ]
+    },
+    "LAYOUT_planck_2x2u": {
+      "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": [4, 0], "x": 6, "y": 0 },
+        { "matrix": [4, 1], "x": 7, "y": 0 },
+        { "matrix": [4, 2], "x": 8, "y": 0 },
+        { "matrix": [4, 3], "x": 9, "y": 0 },
+        { "matrix": [4, 4], "x": 10, "y": 0 },
+        { "matrix": [4, 5], "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": [5, 0], "x": 6, "y": 1 },
+        { "matrix": [5, 1], "x": 7, "y": 1 },
+        { "matrix": [5, 2], "x": 8, "y": 1 },
+        { "matrix": [5, 3], "x": 9, "y": 1 },
+        { "matrix": [5, 4], "x": 10, "y": 1 },
+        { "matrix": [5, 5], "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": [6, 0], "x": 6, "y": 2 },
+        { "matrix": [6, 1], "x": 7, "y": 2 },
+        { "matrix": [6, 2], "x": 8, "y": 2 },
+        { "matrix": [6, 3], "x": 9, "y": 2 },
+        { "matrix": [6, 4], "x": 10, "y": 2 },
+        { "matrix": [6, 5], "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": [7, 3], "x": 3, "y": 3 },
+        { "matrix": [7, 5], "x": 4, "y": 3, "w": 2 },
+        { "matrix": [7, 1], "x": 6, "y": 3, "w": 2 },
+        { "matrix": [7, 2], "x": 8, "y": 3 },
+        { "matrix": [3, 3], "x": 9, "y": 3 },
+        { "matrix": [3, 4], "x": 10, "y": 3 },
+        { "matrix": [3, 5], "x": 11, "y": 3 }
+      ]
+    }
+  }
+}
diff --git a/keyboards/planck/rev7/rules.mk b/keyboards/planck/rev7/rules.mk
@@ -1,7 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
 CUSTOM_MATRIX = lite
-DIP_SWITCH_ENABLE = yes
-
 SRC += matrix.c
diff --git a/keyboards/planck/thk/info.json b/keyboards/planck/thk/info.json
@@ -1,140 +0,0 @@
-{
-  "keyboard_name": "Planck THK",
-  "manufacturer": "OLKB",
-  "maintainer": "Erovia",
-  "url": "https://olkb.com/planck",
-  "usb": {
-    "vid": "0x03A8",
-    "pid": "0x25A7",
-    "device_version": "0.0.1"
-  },
-  "matrix_pins": {
-    "cols": ["D7", "C2", "C3", "C4", "C5", "C6", "C7", "A3", "A2", "A1", "A0", "B0"],
-    "rows": ["A7", "A6", "A5", "A4"]
-  },
-  "diode_direction": "COL2ROW",
-  "dip_switch": {
-    "pins": ["D0", "D1", "D4", "D6"]
-  },
-  "encoder": {
-    "rotary": [
-      {"pin_a": "B4", "pin_b": "B3"},
-      {"pin_a": "B2", "pin_b": "B1"}
-    ]
-  },
-  "processor": "atmega32a",
-  "bootloader": "usbasploader",
-  "tapping": {
-    "toggle": 3
-  },
-  "layout_aliases": {
-    "LAYOUT_planck_grid": "LAYOUT_ortho_4x12",
-    "LAYOUT_planck_mit": "LAYOUT_planck_1x2uC"
-  },
-  "community_layouts": ["ortho_4x12", "planck_mit"],
-  "layouts": {
-    "LAYOUT_ortho_4x12": {
-      "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}
-      ]
-    },
-    "LAYOUT_planck_1x2uC": {
-      "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, "w": 2},
-        {"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}
-      ]
-    }
-  }
-}
diff --git a/keyboards/planck/thk/keyboard.json b/keyboards/planck/thk/keyboard.json
@@ -0,0 +1,148 @@
+{
+  "keyboard_name": "Planck THK",
+  "manufacturer": "OLKB",
+  "maintainer": "Erovia",
+  "url": "https://olkb.com/planck",
+  "usb": {
+    "vid": "0x03A8",
+    "pid": "0x25A7",
+    "device_version": "0.0.1"
+  },
+  "features": {
+    "bootmagic": true,
+    "dip_switch": true,
+    "encoder": true,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": false
+  },
+  "matrix_pins": {
+    "cols": ["D7", "C2", "C3", "C4", "C5", "C6", "C7", "A3", "A2", "A1", "A0", "B0"],
+    "rows": ["A7", "A6", "A5", "A4"]
+  },
+  "diode_direction": "COL2ROW",
+  "dip_switch": {
+    "pins": ["D0", "D1", "D4", "D6"]
+  },
+  "encoder": {
+    "rotary": [
+      {"pin_a": "B4", "pin_b": "B3"},
+      {"pin_a": "B2", "pin_b": "B1"}
+    ]
+  },
+  "processor": "atmega32a",
+  "bootloader": "usbasploader",
+  "tapping": {
+    "toggle": 3
+  },
+  "layout_aliases": {
+    "LAYOUT_planck_grid": "LAYOUT_ortho_4x12",
+    "LAYOUT_planck_mit": "LAYOUT_planck_1x2uC"
+  },
+  "community_layouts": ["ortho_4x12", "planck_mit"],
+  "layouts": {
+    "LAYOUT_ortho_4x12": {
+      "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}
+      ]
+    },
+    "LAYOUT_planck_1x2uC": {
+      "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, "w": 2},
+        {"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}
+      ]
+    }
+  }
+}
diff --git a/keyboards/planck/thk/rules.mk b/keyboards/planck/thk/rules.mk
@@ -1,17 +1,2 @@
 # Processor frequency
 F_CPU = 16000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
-DIP_SWITCH_ENABLE = yes
diff --git a/keyboards/ploopyco/mouse/info.json b/keyboards/ploopyco/mouse/keyboard.json
diff --git a/keyboards/pmk/posey_split/v4/info.json b/keyboards/pmk/posey_split/v4/keyboard.json
diff --git a/keyboards/pmk/posey_split/v5/info.json b/keyboards/pmk/posey_split/v5/keyboard.json
diff --git a/keyboards/pmk/recore/v3/info.json b/keyboards/pmk/recore/v3/keyboard.json
diff --git a/keyboards/preonic/rev3_drop/info.json b/keyboards/preonic/rev3_drop/info.json
@@ -1,387 +0,0 @@
-{
-    "keyboard_name": "Preonic",
-    "manufacturer": "Drop",
-    "usb": {
-        "vid": "0x03A8",
-        "pid": "0xA649",
-        "device_version": "0.0.3"
-    },
-    "rgblight": {
-        "led_count": 9,
-        "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": "A1",
-        "driver": "pwm"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "matrix_pins": {
-        "cols": ["B11", "B10", "B2", "B1", "A7", "B0"],
-        "rows": ["A10", "A9", "A8", "B15", "C13", "C14", "C15", "A2", "A3", "A6"]
-    },
-    "diode_direction": "COL2ROW",
-    "dip_switch": {
-        "pins": ["B14", "A15", "A0", "B9"]
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B12", "pin_b": "B13"}
-        ]
-    },
-    "processor": "STM32F303",
-    "bootloader": "stm32-dfu",
-    "community_layouts": ["ortho_5x12"],
-    "layout_aliases": {
-        "LAYOUT_preonic_grid": "LAYOUT_ortho_5x12"
-    },
-    "layouts": {
-        "LAYOUT_preonic_1x2uC": {
-            "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": [4, 0], "x": 6, "y": 0},
-                {"matrix": [4, 1], "x": 7, "y": 0},
-                {"matrix": [4, 2], "x": 8, "y": 0},
-                {"matrix": [4, 3], "x": 9, "y": 0},
-                {"matrix": [4, 4], "x": 10, "y": 0},
-                {"matrix": [4, 5], "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": [5, 0], "x": 6, "y": 1},
-                {"matrix": [5, 1], "x": 7, "y": 1},
-                {"matrix": [5, 2], "x": 8, "y": 1},
-                {"matrix": [5, 3], "x": 9, "y": 1},
-                {"matrix": [5, 4], "x": 10, "y": 1},
-                {"matrix": [5, 5], "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": [6, 0], "x": 6, "y": 2},
-                {"matrix": [6, 1], "x": 7, "y": 2},
-                {"matrix": [6, 2], "x": 8, "y": 2},
-                {"matrix": [6, 3], "x": 9, "y": 2},
-                {"matrix": [6, 4], "x": 10, "y": 2},
-                {"matrix": [6, 5], "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": [7, 0], "x": 6, "y": 3},
-                {"matrix": [7, 1], "x": 7, "y": 3},
-                {"matrix": [7, 2], "x": 8, "y": 3},
-                {"matrix": [7, 3], "x": 9, "y": 3},
-                {"matrix": [7, 4], "x": 10, "y": 3},
-                {"matrix": [7, 5], "x": 11, "y": 3},
-
-                {"matrix": [8, 0], "x": 0, "y": 4},
-                {"matrix": [8, 1], "x": 1, "y": 4},
-                {"matrix": [8, 2], "x": 2, "y": 4},
-                {"matrix": [9, 3], "x": 3, "y": 4},
-                {"matrix": [9, 4], "x": 4, "y": 4},
-                {"matrix": [9, 0], "x": 5, "y": 4, "w": 2},
-                {"matrix": [9, 1], "x": 7, "y": 4},
-                {"matrix": [9, 2], "x": 8, "y": 4},
-                {"matrix": [8, 3], "x": 9, "y": 4},
-                {"matrix": [8, 4], "x": 10, "y": 4},
-                {"matrix": [8, 5], "x": 11, "y": 4}
-            ]
-        },
-        "LAYOUT_preonic_1x2uR": {
-            "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": [4, 0], "x": 6, "y": 0},
-                {"matrix": [4, 1], "x": 7, "y": 0},
-                {"matrix": [4, 2], "x": 8, "y": 0},
-                {"matrix": [4, 3], "x": 9, "y": 0},
-                {"matrix": [4, 4], "x": 10, "y": 0},
-                {"matrix": [4, 5], "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": [5, 0], "x": 6, "y": 1},
-                {"matrix": [5, 1], "x": 7, "y": 1},
-                {"matrix": [5, 2], "x": 8, "y": 1},
-                {"matrix": [5, 3], "x": 9, "y": 1},
-                {"matrix": [5, 4], "x": 10, "y": 1},
-                {"matrix": [5, 5], "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": [6, 0], "x": 6, "y": 2},
-                {"matrix": [6, 1], "x": 7, "y": 2},
-                {"matrix": [6, 2], "x": 8, "y": 2},
-                {"matrix": [6, 3], "x": 9, "y": 2},
-                {"matrix": [6, 4], "x": 10, "y": 2},
-                {"matrix": [6, 5], "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": [7, 0], "x": 6, "y": 3},
-                {"matrix": [7, 1], "x": 7, "y": 3},
-                {"matrix": [7, 2], "x": 8, "y": 3},
-                {"matrix": [7, 3], "x": 9, "y": 3},
-                {"matrix": [7, 4], "x": 10, "y": 3},
-                {"matrix": [7, 5], "x": 11, "y": 3},
-
-                {"matrix": [8, 0], "x": 0, "y": 4},
-                {"matrix": [8, 1], "x": 1, "y": 4},
-                {"matrix": [8, 2], "x": 2, "y": 4},
-                {"matrix": [9, 3], "x": 3, "y": 4},
-                {"matrix": [9, 4], "x": 4, "y": 4},
-                {"matrix": [9, 5], "x": 5, "y": 4},
-                {"matrix": [9, 1], "x": 6, "y": 4, "w": 2},
-                {"matrix": [9, 2], "x": 8, "y": 4},
-                {"matrix": [8, 3], "x": 9, "y": 4},
-                {"matrix": [8, 4], "x": 10, "y": 4},
-                {"matrix": [8, 5], "x": 11, "y": 4}
-            ]
-        },
-        "LAYOUT_preonic_1x2uL": {
-            "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": [4, 0], "x": 6, "y": 0},
-                {"matrix": [4, 1], "x": 7, "y": 0},
-                {"matrix": [4, 2], "x": 8, "y": 0},
-                {"matrix": [4, 3], "x": 9, "y": 0},
-                {"matrix": [4, 4], "x": 10, "y": 0},
-                {"matrix": [4, 5], "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": [5, 0], "x": 6, "y": 1},
-                {"matrix": [5, 1], "x": 7, "y": 1},
-                {"matrix": [5, 2], "x": 8, "y": 1},
-                {"matrix": [5, 3], "x": 9, "y": 1},
-                {"matrix": [5, 4], "x": 10, "y": 1},
-                {"matrix": [5, 5], "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": [6, 0], "x": 6, "y": 2},
-                {"matrix": [6, 1], "x": 7, "y": 2},
-                {"matrix": [6, 2], "x": 8, "y": 2},
-                {"matrix": [6, 3], "x": 9, "y": 2},
-                {"matrix": [6, 4], "x": 10, "y": 2},
-                {"matrix": [6, 5], "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": [7, 0], "x": 6, "y": 3},
-                {"matrix": [7, 1], "x": 7, "y": 3},
-                {"matrix": [7, 2], "x": 8, "y": 3},
-                {"matrix": [7, 3], "x": 9, "y": 3},
-                {"matrix": [7, 4], "x": 10, "y": 3},
-                {"matrix": [7, 5], "x": 11, "y": 3},
-
-                {"matrix": [8, 0], "x": 0, "y": 4},
-                {"matrix": [8, 1], "x": 1, "y": 4},
-                {"matrix": [8, 2], "x": 2, "y": 4},
-                {"matrix": [9, 3], "x": 3, "y": 4},
-                {"matrix": [9, 5], "x": 4, "y": 4, "w": 2},
-                {"matrix": [9, 0], "x": 6, "y": 4},
-                {"matrix": [9, 1], "x": 7, "y": 4},
-                {"matrix": [9, 2], "x": 8, "y": 4},
-                {"matrix": [8, 3], "x": 9, "y": 4},
-                {"matrix": [8, 4], "x": 10, "y": 4},
-                {"matrix": [8, 5], "x": 11, "y": 4}
-            ]
-        },
-        "LAYOUT_preonic_2x2u": {
-            "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": [4, 0], "x": 6, "y": 0},
-                {"matrix": [4, 1], "x": 7, "y": 0},
-                {"matrix": [4, 2], "x": 8, "y": 0},
-                {"matrix": [4, 3], "x": 9, "y": 0},
-                {"matrix": [4, 4], "x": 10, "y": 0},
-                {"matrix": [4, 5], "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": [5, 0], "x": 6, "y": 1},
-                {"matrix": [5, 1], "x": 7, "y": 1},
-                {"matrix": [5, 2], "x": 8, "y": 1},
-                {"matrix": [5, 3], "x": 9, "y": 1},
-                {"matrix": [5, 4], "x": 10, "y": 1},
-                {"matrix": [5, 5], "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": [6, 0], "x": 6, "y": 2},
-                {"matrix": [6, 1], "x": 7, "y": 2},
-                {"matrix": [6, 2], "x": 8, "y": 2},
-                {"matrix": [6, 3], "x": 9, "y": 2},
-                {"matrix": [6, 4], "x": 10, "y": 2},
-                {"matrix": [6, 5], "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": [7, 0], "x": 6, "y": 3},
-                {"matrix": [7, 1], "x": 7, "y": 3},
-                {"matrix": [7, 2], "x": 8, "y": 3},
-                {"matrix": [7, 3], "x": 9, "y": 3},
-                {"matrix": [7, 4], "x": 10, "y": 3},
-                {"matrix": [7, 5], "x": 11, "y": 3},
-
-                {"matrix": [8, 0], "x": 0, "y": 4},
-                {"matrix": [8, 1], "x": 1, "y": 4},
-                {"matrix": [8, 2], "x": 2, "y": 4},
-                {"matrix": [9, 3], "x": 3, "y": 4},
-                {"matrix": [9, 5], "x": 4, "y": 4, "w": 2},
-                {"matrix": [9, 1], "x": 6, "y": 4, "w": 2},
-                {"matrix": [9, 2], "x": 8, "y": 4},
-                {"matrix": [8, 3], "x": 9, "y": 4},
-                {"matrix": [8, 4], "x": 10, "y": 4},
-                {"matrix": [8, 5], "x": 11, "y": 4}
-            ]
-        },
-        "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": [4, 0], "x": 6, "y": 0},
-                {"matrix": [4, 1], "x": 7, "y": 0},
-                {"matrix": [4, 2], "x": 8, "y": 0},
-                {"matrix": [4, 3], "x": 9, "y": 0},
-                {"matrix": [4, 4], "x": 10, "y": 0},
-                {"matrix": [4, 5], "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": [5, 0], "x": 6, "y": 1},
-                {"matrix": [5, 1], "x": 7, "y": 1},
-                {"matrix": [5, 2], "x": 8, "y": 1},
-                {"matrix": [5, 3], "x": 9, "y": 1},
-                {"matrix": [5, 4], "x": 10, "y": 1},
-                {"matrix": [5, 5], "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": [6, 0], "x": 6, "y": 2},
-                {"matrix": [6, 1], "x": 7, "y": 2},
-                {"matrix": [6, 2], "x": 8, "y": 2},
-                {"matrix": [6, 3], "x": 9, "y": 2},
-                {"matrix": [6, 4], "x": 10, "y": 2},
-                {"matrix": [6, 5], "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": [7, 0], "x": 6, "y": 3},
-                {"matrix": [7, 1], "x": 7, "y": 3},
-                {"matrix": [7, 2], "x": 8, "y": 3},
-                {"matrix": [7, 3], "x": 9, "y": 3},
-                {"matrix": [7, 4], "x": 10, "y": 3},
-                {"matrix": [7, 5], "x": 11, "y": 3},
-
-                {"matrix": [8, 0], "x": 0, "y": 4},
-                {"matrix": [8, 1], "x": 1, "y": 4},
-                {"matrix": [8, 2], "x": 2, "y": 4},
-                {"matrix": [9, 3], "x": 3, "y": 4},
-                {"matrix": [9, 4], "x": 4, "y": 4},
-                {"matrix": [9, 5], "x": 5, "y": 4},
-                {"matrix": [9, 0], "x": 6, "y": 4},
-                {"matrix": [9, 1], "x": 7, "y": 4},
-                {"matrix": [9, 2], "x": 8, "y": 4},
-                {"matrix": [8, 3], "x": 9, "y": 4},
-                {"matrix": [8, 4], "x": 10, "y": 4},
-                {"matrix": [8, 5], "x": 11, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/preonic/rev3_drop/keyboard.json b/keyboards/preonic/rev3_drop/keyboard.json
@@ -0,0 +1,399 @@
+{
+    "keyboard_name": "Preonic",
+    "manufacturer": "Drop",
+    "usb": {
+        "vid": "0x03A8",
+        "pid": "0xA649",
+        "device_version": "0.0.3"
+    },
+    "features": {
+        "audio": true,
+        "bootmagic": true,
+        "command": true,
+        "console": true,
+        "dip_switch": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "rgblight": {
+        "led_count": 9,
+        "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": "A1",
+        "driver": "pwm"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "matrix_pins": {
+        "cols": ["B11", "B10", "B2", "B1", "A7", "B0"],
+        "rows": ["A10", "A9", "A8", "B15", "C13", "C14", "C15", "A2", "A3", "A6"]
+    },
+    "diode_direction": "COL2ROW",
+    "dip_switch": {
+        "pins": ["B14", "A15", "A0", "B9"]
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B12", "pin_b": "B13"}
+        ]
+    },
+    "processor": "STM32F303",
+    "bootloader": "stm32-dfu",
+    "community_layouts": ["ortho_5x12"],
+    "layout_aliases": {
+        "LAYOUT_preonic_grid": "LAYOUT_ortho_5x12"
+    },
+    "layouts": {
+        "LAYOUT_preonic_1x2uC": {
+            "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": [4, 0], "x": 6, "y": 0},
+                {"matrix": [4, 1], "x": 7, "y": 0},
+                {"matrix": [4, 2], "x": 8, "y": 0},
+                {"matrix": [4, 3], "x": 9, "y": 0},
+                {"matrix": [4, 4], "x": 10, "y": 0},
+                {"matrix": [4, 5], "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": [5, 0], "x": 6, "y": 1},
+                {"matrix": [5, 1], "x": 7, "y": 1},
+                {"matrix": [5, 2], "x": 8, "y": 1},
+                {"matrix": [5, 3], "x": 9, "y": 1},
+                {"matrix": [5, 4], "x": 10, "y": 1},
+                {"matrix": [5, 5], "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": [6, 0], "x": 6, "y": 2},
+                {"matrix": [6, 1], "x": 7, "y": 2},
+                {"matrix": [6, 2], "x": 8, "y": 2},
+                {"matrix": [6, 3], "x": 9, "y": 2},
+                {"matrix": [6, 4], "x": 10, "y": 2},
+                {"matrix": [6, 5], "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": [7, 0], "x": 6, "y": 3},
+                {"matrix": [7, 1], "x": 7, "y": 3},
+                {"matrix": [7, 2], "x": 8, "y": 3},
+                {"matrix": [7, 3], "x": 9, "y": 3},
+                {"matrix": [7, 4], "x": 10, "y": 3},
+                {"matrix": [7, 5], "x": 11, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [8, 1], "x": 1, "y": 4},
+                {"matrix": [8, 2], "x": 2, "y": 4},
+                {"matrix": [9, 3], "x": 3, "y": 4},
+                {"matrix": [9, 4], "x": 4, "y": 4},
+                {"matrix": [9, 0], "x": 5, "y": 4, "w": 2},
+                {"matrix": [9, 1], "x": 7, "y": 4},
+                {"matrix": [9, 2], "x": 8, "y": 4},
+                {"matrix": [8, 3], "x": 9, "y": 4},
+                {"matrix": [8, 4], "x": 10, "y": 4},
+                {"matrix": [8, 5], "x": 11, "y": 4}
+            ]
+        },
+        "LAYOUT_preonic_1x2uR": {
+            "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": [4, 0], "x": 6, "y": 0},
+                {"matrix": [4, 1], "x": 7, "y": 0},
+                {"matrix": [4, 2], "x": 8, "y": 0},
+                {"matrix": [4, 3], "x": 9, "y": 0},
+                {"matrix": [4, 4], "x": 10, "y": 0},
+                {"matrix": [4, 5], "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": [5, 0], "x": 6, "y": 1},
+                {"matrix": [5, 1], "x": 7, "y": 1},
+                {"matrix": [5, 2], "x": 8, "y": 1},
+                {"matrix": [5, 3], "x": 9, "y": 1},
+                {"matrix": [5, 4], "x": 10, "y": 1},
+                {"matrix": [5, 5], "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": [6, 0], "x": 6, "y": 2},
+                {"matrix": [6, 1], "x": 7, "y": 2},
+                {"matrix": [6, 2], "x": 8, "y": 2},
+                {"matrix": [6, 3], "x": 9, "y": 2},
+                {"matrix": [6, 4], "x": 10, "y": 2},
+                {"matrix": [6, 5], "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": [7, 0], "x": 6, "y": 3},
+                {"matrix": [7, 1], "x": 7, "y": 3},
+                {"matrix": [7, 2], "x": 8, "y": 3},
+                {"matrix": [7, 3], "x": 9, "y": 3},
+                {"matrix": [7, 4], "x": 10, "y": 3},
+                {"matrix": [7, 5], "x": 11, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [8, 1], "x": 1, "y": 4},
+                {"matrix": [8, 2], "x": 2, "y": 4},
+                {"matrix": [9, 3], "x": 3, "y": 4},
+                {"matrix": [9, 4], "x": 4, "y": 4},
+                {"matrix": [9, 5], "x": 5, "y": 4},
+                {"matrix": [9, 1], "x": 6, "y": 4, "w": 2},
+                {"matrix": [9, 2], "x": 8, "y": 4},
+                {"matrix": [8, 3], "x": 9, "y": 4},
+                {"matrix": [8, 4], "x": 10, "y": 4},
+                {"matrix": [8, 5], "x": 11, "y": 4}
+            ]
+        },
+        "LAYOUT_preonic_1x2uL": {
+            "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": [4, 0], "x": 6, "y": 0},
+                {"matrix": [4, 1], "x": 7, "y": 0},
+                {"matrix": [4, 2], "x": 8, "y": 0},
+                {"matrix": [4, 3], "x": 9, "y": 0},
+                {"matrix": [4, 4], "x": 10, "y": 0},
+                {"matrix": [4, 5], "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": [5, 0], "x": 6, "y": 1},
+                {"matrix": [5, 1], "x": 7, "y": 1},
+                {"matrix": [5, 2], "x": 8, "y": 1},
+                {"matrix": [5, 3], "x": 9, "y": 1},
+                {"matrix": [5, 4], "x": 10, "y": 1},
+                {"matrix": [5, 5], "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": [6, 0], "x": 6, "y": 2},
+                {"matrix": [6, 1], "x": 7, "y": 2},
+                {"matrix": [6, 2], "x": 8, "y": 2},
+                {"matrix": [6, 3], "x": 9, "y": 2},
+                {"matrix": [6, 4], "x": 10, "y": 2},
+                {"matrix": [6, 5], "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": [7, 0], "x": 6, "y": 3},
+                {"matrix": [7, 1], "x": 7, "y": 3},
+                {"matrix": [7, 2], "x": 8, "y": 3},
+                {"matrix": [7, 3], "x": 9, "y": 3},
+                {"matrix": [7, 4], "x": 10, "y": 3},
+                {"matrix": [7, 5], "x": 11, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [8, 1], "x": 1, "y": 4},
+                {"matrix": [8, 2], "x": 2, "y": 4},
+                {"matrix": [9, 3], "x": 3, "y": 4},
+                {"matrix": [9, 5], "x": 4, "y": 4, "w": 2},
+                {"matrix": [9, 0], "x": 6, "y": 4},
+                {"matrix": [9, 1], "x": 7, "y": 4},
+                {"matrix": [9, 2], "x": 8, "y": 4},
+                {"matrix": [8, 3], "x": 9, "y": 4},
+                {"matrix": [8, 4], "x": 10, "y": 4},
+                {"matrix": [8, 5], "x": 11, "y": 4}
+            ]
+        },
+        "LAYOUT_preonic_2x2u": {
+            "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": [4, 0], "x": 6, "y": 0},
+                {"matrix": [4, 1], "x": 7, "y": 0},
+                {"matrix": [4, 2], "x": 8, "y": 0},
+                {"matrix": [4, 3], "x": 9, "y": 0},
+                {"matrix": [4, 4], "x": 10, "y": 0},
+                {"matrix": [4, 5], "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": [5, 0], "x": 6, "y": 1},
+                {"matrix": [5, 1], "x": 7, "y": 1},
+                {"matrix": [5, 2], "x": 8, "y": 1},
+                {"matrix": [5, 3], "x": 9, "y": 1},
+                {"matrix": [5, 4], "x": 10, "y": 1},
+                {"matrix": [5, 5], "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": [6, 0], "x": 6, "y": 2},
+                {"matrix": [6, 1], "x": 7, "y": 2},
+                {"matrix": [6, 2], "x": 8, "y": 2},
+                {"matrix": [6, 3], "x": 9, "y": 2},
+                {"matrix": [6, 4], "x": 10, "y": 2},
+                {"matrix": [6, 5], "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": [7, 0], "x": 6, "y": 3},
+                {"matrix": [7, 1], "x": 7, "y": 3},
+                {"matrix": [7, 2], "x": 8, "y": 3},
+                {"matrix": [7, 3], "x": 9, "y": 3},
+                {"matrix": [7, 4], "x": 10, "y": 3},
+                {"matrix": [7, 5], "x": 11, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [8, 1], "x": 1, "y": 4},
+                {"matrix": [8, 2], "x": 2, "y": 4},
+                {"matrix": [9, 3], "x": 3, "y": 4},
+                {"matrix": [9, 5], "x": 4, "y": 4, "w": 2},
+                {"matrix": [9, 1], "x": 6, "y": 4, "w": 2},
+                {"matrix": [9, 2], "x": 8, "y": 4},
+                {"matrix": [8, 3], "x": 9, "y": 4},
+                {"matrix": [8, 4], "x": 10, "y": 4},
+                {"matrix": [8, 5], "x": 11, "y": 4}
+            ]
+        },
+        "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": [4, 0], "x": 6, "y": 0},
+                {"matrix": [4, 1], "x": 7, "y": 0},
+                {"matrix": [4, 2], "x": 8, "y": 0},
+                {"matrix": [4, 3], "x": 9, "y": 0},
+                {"matrix": [4, 4], "x": 10, "y": 0},
+                {"matrix": [4, 5], "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": [5, 0], "x": 6, "y": 1},
+                {"matrix": [5, 1], "x": 7, "y": 1},
+                {"matrix": [5, 2], "x": 8, "y": 1},
+                {"matrix": [5, 3], "x": 9, "y": 1},
+                {"matrix": [5, 4], "x": 10, "y": 1},
+                {"matrix": [5, 5], "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": [6, 0], "x": 6, "y": 2},
+                {"matrix": [6, 1], "x": 7, "y": 2},
+                {"matrix": [6, 2], "x": 8, "y": 2},
+                {"matrix": [6, 3], "x": 9, "y": 2},
+                {"matrix": [6, 4], "x": 10, "y": 2},
+                {"matrix": [6, 5], "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": [7, 0], "x": 6, "y": 3},
+                {"matrix": [7, 1], "x": 7, "y": 3},
+                {"matrix": [7, 2], "x": 8, "y": 3},
+                {"matrix": [7, 3], "x": 9, "y": 3},
+                {"matrix": [7, 4], "x": 10, "y": 3},
+                {"matrix": [7, 5], "x": 11, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [8, 1], "x": 1, "y": 4},
+                {"matrix": [8, 2], "x": 2, "y": 4},
+                {"matrix": [9, 3], "x": 3, "y": 4},
+                {"matrix": [9, 4], "x": 4, "y": 4},
+                {"matrix": [9, 5], "x": 5, "y": 4},
+                {"matrix": [9, 0], "x": 6, "y": 4},
+                {"matrix": [9, 1], "x": 7, "y": 4},
+                {"matrix": [9, 2], "x": 8, "y": 4},
+                {"matrix": [8, 3], "x": 9, "y": 4},
+                {"matrix": [8, 4], "x": 10, "y": 4},
+                {"matrix": [8, 5], "x": 11, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/preonic/rev3_drop/rules.mk b/keyboards/preonic/rev3_drop/rules.mk
@@ -1,20 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = yes          # Audio output
 CUSTOM_MATRIX = yes
-ENCODER_ENABLE = yes
-DIP_SWITCH_ENABLE = yes
-
-# Do not enable RGB_MATRIX_ENABLE together with RGBLIGHT_ENABLE
-RGB_MATRIX_ENABLE = no
-
 SRC += matrix.c
diff --git a/keyboards/primekb/prime_e/config.h b/keyboards/primekb/prime_e/config.h
@@ -1,23 +0,0 @@
-/*
-Copyright 2019 Holten Campbell
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/primekb/prime_e/info.json b/keyboards/primekb/prime_e/info.json
@@ -13,6 +13,12 @@
     "mousekey": false,
     "nkro": true
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "matrix_pins": {
     "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
     "rows": ["E6", "C7", "B5", "B4"]
diff --git a/keyboards/primekb/prime_e/rgb/info.json b/keyboards/primekb/prime_e/rgb/info.json
@@ -1,25 +0,0 @@
-{
-    "keyboard_name": "Prime_E RGB",
-    "usb": {
-        "pid": "0x0052",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "led_count": 8,
-        "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": "B7"
-    }
-}
diff --git a/keyboards/primekb/prime_e/rgb/keyboard.json b/keyboards/primekb/prime_e/rgb/keyboard.json
@@ -0,0 +1,28 @@
+{
+    "keyboard_name": "Prime_E RGB",
+    "usb": {
+        "pid": "0x0052",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "rgblight": true
+    },
+    "rgblight": {
+        "led_count": 8,
+        "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": "B7"
+    }
+}
diff --git a/keyboards/primekb/prime_e/rgb/rules.mk b/keyboards/primekb/prime_e/rgb/rules.mk
@@ -1,2 +0,0 @@
-BACKLIGHT_ENABLE = no
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/primekb/prime_e/std/info.json b/keyboards/primekb/prime_e/std/info.json
@@ -1,11 +0,0 @@
-{
-    "keyboard_name": "Prime_E",
-    "usb": {
-        "pid": "0x0051",
-        "device_version": "0.0.1"
-    },
-    "backlight": {
-        "pin": "B7",
-        "levels": 5
-    }
-}
diff --git a/keyboards/primekb/prime_e/std/keyboard.json b/keyboards/primekb/prime_e/std/keyboard.json
@@ -0,0 +1,14 @@
+{
+    "keyboard_name": "Prime_E",
+    "usb": {
+        "pid": "0x0051",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "backlight": true
+    },
+    "backlight": {
+        "pin": "B7",
+        "levels": 5
+    }
+}
diff --git a/keyboards/primekb/prime_e/std/rules.mk b/keyboards/primekb/prime_e/std/rules.mk
@@ -1,2 +0,0 @@
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = no
diff --git a/keyboards/primekb/prime_l/config.h b/keyboards/primekb/prime_l/config.h
@@ -1,24 +0,0 @@
-/*
-Copyright 2018 Jumail Mundekkat
-Copyright 2020 Holten Campbell
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/primekb/prime_l/info.json b/keyboards/primekb/prime_l/info.json
@@ -10,6 +10,12 @@
     "mousekey": true,
     "nkro": true
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "usb": {
     "vid": "0x5052"
   },
diff --git a/keyboards/primekb/prime_l/v1/info.json b/keyboards/primekb/prime_l/v1/info.json
@@ -1,103 +0,0 @@
-{
-  "keyboard_name": "Prime_L V1",
-  "url": "https://www.primekb.com",
-  "maintainer": "MxBlu",
-  "usb": {
-    "pid": "0x504C",
-    "device_version": "0.0.1"
-  },
-  "matrix_pins": {
-    "cols": ["D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "C7", "C6", "F7", "F6", "F5", "F4", "F1", "F0"],
-    "rows": ["D1", "D0", "B7", "B3", "B2"]
-  },
-  "diode_direction": "COL2ROW",
-  "backlight": {
-    "pin": "B6",
-    "levels": 4
-  },
-    "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": [0, 13], "x": 13, "y": 0},
-                {"matrix": [0, 14], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15, "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": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 13], "x": 13, "y": 1},
-                {"matrix": [1, 14], "x": 14, "y": 1},
-                {"matrix": [1, 15], "x": 15, "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, "w": 1.25},
-                {"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, 7], "x": 7.25, "y": 2},
-                {"matrix": [2, 8], "x": 8.25, "y": 2},
-                {"matrix": [2, 9], "x": 9.25, "y": 2},
-                {"matrix": [2, 10], "x": 10.25, "y": 2},
-                {"matrix": [2, 11], "x": 11.25, "y": 2},
-                {"matrix": [2, 12], "x": 12.25, "y": 2},
-                {"matrix": [2, 13], "x": 13.25, "y": 2},
-                {"matrix": [2, 15], "x": 14.25, "y": 2, "w": 1.75},
-
-                {"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, "w": 1.75},
-                {"matrix": [3, 5], "x": 4.75, "y": 3},
-                {"matrix": [3, 6], "x": 5.75, "y": 3},
-                {"matrix": [3, 7], "x": 6.75, "y": 3},
-                {"matrix": [3, 8], "x": 7.75, "y": 3},
-                {"matrix": [3, 9], "x": 8.75, "y": 3},
-                {"matrix": [3, 10], "x": 9.75, "y": 3},
-                {"matrix": [3, 11], "x": 10.75, "y": 3},
-                {"matrix": [3, 12], "x": 11.75, "y": 3},
-                {"matrix": [3, 13], "x": 12.75, "y": 3},
-                {"matrix": [3, 14], "x": 13.75, "y": 3},
-                {"matrix": [3, 15], "x": 14.75, "y": 3, "w": 1.25},
-
-                {"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, "w": 1.25},
-                {"matrix": [4, 5], "x": 4.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 5.5, "y": 4},
-                {"matrix": [4, 7], "x": 6.5, "y": 4},
-                {"matrix": [4, 8], "x": 7.5, "y": 4, "w": 2},
-                {"matrix": [4, 10], "x": 9.5, "y": 4, "w": 2.25},
-                {"matrix": [4, 12], "x": 11.75, "y": 4},
-                {"matrix": [4, 13], "x": 12.75, "y": 4},
-                {"matrix": [4, 14], "x": 13.75, "y": 4},
-                {"matrix": [4, 15], "x": 14.75, "y": 4, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/primekb/prime_l/v1/keyboard.json b/keyboards/primekb/prime_l/v1/keyboard.json
@@ -0,0 +1,106 @@
+{
+  "keyboard_name": "Prime_L V1",
+  "url": "https://www.primekb.com",
+  "maintainer": "MxBlu",
+  "usb": {
+    "pid": "0x504C",
+    "device_version": "0.0.1"
+  },
+  "features": {
+    "backlight": true
+  },
+  "matrix_pins": {
+    "cols": ["D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "C7", "C6", "F7", "F6", "F5", "F4", "F1", "F0"],
+    "rows": ["D1", "D0", "B7", "B3", "B2"]
+  },
+  "diode_direction": "COL2ROW",
+  "backlight": {
+    "pin": "B6",
+    "levels": 4
+  },
+    "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": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "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": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
+                {"matrix": [1, 15], "x": 15, "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, "w": 1.25},
+                {"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, 7], "x": 7.25, "y": 2},
+                {"matrix": [2, 8], "x": 8.25, "y": 2},
+                {"matrix": [2, 9], "x": 9.25, "y": 2},
+                {"matrix": [2, 10], "x": 10.25, "y": 2},
+                {"matrix": [2, 11], "x": 11.25, "y": 2},
+                {"matrix": [2, 12], "x": 12.25, "y": 2},
+                {"matrix": [2, 13], "x": 13.25, "y": 2},
+                {"matrix": [2, 15], "x": 14.25, "y": 2, "w": 1.75},
+
+                {"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, "w": 1.75},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3},
+                {"matrix": [3, 14], "x": 13.75, "y": 3},
+                {"matrix": [3, 15], "x": 14.75, "y": 3, "w": 1.25},
+
+                {"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, "w": 1.25},
+                {"matrix": [4, 5], "x": 4.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 5.5, "y": 4},
+                {"matrix": [4, 7], "x": 6.5, "y": 4},
+                {"matrix": [4, 8], "x": 7.5, "y": 4, "w": 2},
+                {"matrix": [4, 10], "x": 9.5, "y": 4, "w": 2.25},
+                {"matrix": [4, 12], "x": 11.75, "y": 4},
+                {"matrix": [4, 13], "x": 12.75, "y": 4},
+                {"matrix": [4, 14], "x": 13.75, "y": 4},
+                {"matrix": [4, 15], "x": 14.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/primekb/prime_l/v1/rules.mk b/keyboards/primekb/prime_l/v1/rules.mk
@@ -1 +0,0 @@
-BACKLIGHT_ENABLE = yes
-\ No newline at end of file
diff --git a/keyboards/primekb/prime_l/v2/info.json b/keyboards/primekb/prime_l/v2/keyboard.json
diff --git a/keyboards/primekb/prime_l/v2/rules.mk b/keyboards/primekb/prime_l/v2/rules.mk
@@ -1 +0,0 @@
-BACKLIGHT_ENABLE = no
-\ No newline at end of file
diff --git a/keyboards/printedpad/info.json b/keyboards/printedpad/keyboard.json
diff --git a/keyboards/program_yoink/config.h b/keyboards/program_yoink/config.h
@@ -1,29 +0,0 @@
-/*
-Copyright 2020 melonbred
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/program_yoink/info.json b/keyboards/program_yoink/info.json
@@ -0,0 +1,16 @@
+{
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgblight": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    }
+}
+\ No newline at end of file
diff --git a/keyboards/program_yoink/rules.mk b/keyboards/program_yoink/rules.mk
@@ -1,15 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes        # Enable rotary encoder
-
 DEFAULT_FOLDER = program_yoink/staggered
diff --git a/keyboards/projectkb/alice/rev1/info.json b/keyboards/projectkb/alice/rev1/info.json
@@ -1,26 +0,0 @@
-{
-    "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": "B15",
-        "driver": "spi"
-    },
-    "matrix_pins": {
-        "cols": ["B2", "B10", "B11", "A9", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "C13", "C14", "C15", "B12"],
-        "rows": ["B1", "B0", "A7", "A5", "A4"]
-    },
-    "diode_direction": "COL2ROW"
-}
diff --git a/keyboards/projectkb/alice/rev1/keyboard.json b/keyboards/projectkb/alice/rev1/keyboard.json
@@ -0,0 +1,36 @@
+{
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "command": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "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": "B15",
+        "driver": "spi"
+    },
+    "matrix_pins": {
+        "cols": ["B2", "B10", "B11", "A9", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "C13", "C14", "C15", "B12"],
+        "rows": ["B1", "B0", "A7", "A5", "A4"]
+    },
+    "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/projectkb/alice/rev1/rules.mk b/keyboards/projectkb/alice/rev1/rules.mk
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
diff --git a/keyboards/projectkb/alice/rev2/info.json b/keyboards/projectkb/alice/rev2/info.json
@@ -1,26 +0,0 @@
-{
-    "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": "B15",
-        "driver": "spi"
-    },
-    "matrix_pins": {
-        "cols": ["B1", "B0", "A7", "A1", "A5", "A4", "A3", "A10", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15"],
-        "rows": ["B2", "B10", "B11", "A2", "A0"]
-    },
-    "diode_direction": "COL2ROW"
-}
diff --git a/keyboards/projectkb/alice/rev2/keyboard.json b/keyboards/projectkb/alice/rev2/keyboard.json
@@ -0,0 +1,36 @@
+{
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "command": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "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": "B15",
+        "driver": "spi"
+    },
+    "matrix_pins": {
+        "cols": ["B1", "B0", "A7", "A1", "A5", "A4", "A3", "A10", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15"],
+        "rows": ["B2", "B10", "B11", "A2", "A0"]
+    },
+    "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/projectkb/alice/rev2/rules.mk b/keyboards/projectkb/alice/rev2/rules.mk
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
diff --git a/keyboards/prototypist/oceanographer/info.json b/keyboards/prototypist/oceanographer/info.json
@@ -1,216 +0,0 @@
-{
-    "manufacturer": "Proto[Typist]",
-    "keyboard_name": "Oceanographer",
-    "maintainer": "Anjheos",
-    "bootloader": "atmel-dfu",
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": false,
-        "nkro": true
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B2", "pin_b": "B1", "resolution": 2}
-        ]
-    },
-    "ws2812": {
-        "pin": "B3"
-    },
-    "rgblight": {
-        "led_count": 3,
-        "sleep": true,
-        "hue_steps": 10,
-        "saturation_steps": 17,
-        "brightness_steps": 17,
-        "max_brightness": 155,
-        "animations": {
-            "alternating": true,
-            "breathing": true
-        },
-        "default": {
-            "val": 155
-        },
-        "layers": {
-            "enabled": true,
-            "max": 4
-        }
-    },
-    "matrix_pins": {
-        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B6", "B5", "B4", "D7", "D6", "D4"],
-        "rows": ["B0", "D5", "D3", "D2"]
-    },
-    "processor": "atmega32u4",
-    "url": "",
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x0002",
-        "vid": "0x4A46"
-    },
-    "layouts": {
-        "LAYOUT_225_1": {
-            "layout": [
-                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
-                {"matrix": [0, 1], "label": "Q", "x": 1, "y": 0},
-                {"matrix": [0, 2], "label": "W", "x": 2, "y": 0},
-                {"matrix": [0, 3], "label": "E", "x": 3, "y": 0},
-                {"matrix": [0, 4], "label": "R", "x": 4, "y": 0},
-                {"matrix": [0, 5], "label": "T", "x": 5, "y": 0},
-                {"matrix": [0, 6], "label": "Y", "x": 6, "y": 0},
-                {"matrix": [0, 7], "label": "U", "x": 7, "y": 0},
-                {"matrix": [0, 8], "label": "I", "x": 8, "y": 0},
-                {"matrix": [0, 9], "label": "O", "x": 9, "y": 0},
-                {"matrix": [0, 10], "label": "P", "x": 10, "y": 0},
-                {"matrix": [0, 11], "label": "Backspace", "w": 1.75, "x": 11, "y": 0},
-
-                {"matrix": [1, 0], "label": "Tab", "w": 1.25, "x": 0, "y": 1},
-                {"matrix": [1, 1], "label": "A", "x": 1.25, "y": 1},
-                {"matrix": [1, 2], "label": "S", "x": 2.25, "y": 1},
-                {"matrix": [1, 3], "label": "D", "x": 3.25, "y": 1},
-                {"matrix": [1, 4], "label": "F", "x": 4.25, "y": 1},
-                {"matrix": [1, 5], "label": "G", "x": 5.25, "y": 1},
-                {"matrix": [1, 6], "label": "H", "x": 6.25, "y": 1},
-                {"matrix": [1, 7], "label": "J", "x": 7.25, "y": 1},
-                {"matrix": [1, 8], "label": "K", "x": 8.25, "y": 1},
-                {"matrix": [1, 9], "label": "L", "x": 9.25, "y": 1},
-                {"matrix": [1, 10], "label": ":", "x": 10.25, "y": 1},
-                {"matrix": [1, 11], "label": "Enter", "w": 1.5, "x": 11.25, "y": 1},
-
-                {"matrix": [2, 0], "label": "Shift", "w": 1.75, "x": 0, "y": 2},
-                {"matrix": [2, 1], "label": "Z", "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "label": "X", "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "label": "C", "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "label": "V", "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "label": "B", "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "label": "N", "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "label": "M", "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "label": "<", "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "label": ">", "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "label": "?", "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "label": "\u2191", "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "label": "\u2191", "x": 12.75, "y": 2},
-
-                {"matrix": [3, 0], "label": "Ctrl", "x": 0, "y": 3},
-                {"matrix": [3, 1], "label": "Win", "x": 1, "y": 3},
-                {"matrix": [3, 2], "label": "Alt", "x": 2, "y": 3},
-                {"matrix": [3, 3], "label": "Fn", "x": 3, "y": 3},
-                {"matrix": [3, 5], "w": 2.25, "x": 4, "y": 3},
-                {"matrix": [3, 6], "w": 2, "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "label": "Alt", "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "label": "Ctrl", "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "label": "\u2190", "x": 10.75, "y": 3},
-                {"matrix": [3, 11], "label": "\u2193", "x": 11.75, "y": 3},
-                {"matrix": [3, 12], "label": "\u2192", "x": 12.75, "y": 3}
-            ]
-        },
-        "LAYOUT_225_2": {
-            "layout": [
-                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
-                {"matrix": [0, 1], "label": "Q", "x": 1, "y": 0},
-                {"matrix": [0, 2], "label": "W", "x": 2, "y": 0},
-                {"matrix": [0, 3], "label": "E", "x": 3, "y": 0},
-                {"matrix": [0, 4], "label": "R", "x": 4, "y": 0},
-                {"matrix": [0, 5], "label": "T", "x": 5, "y": 0},
-                {"matrix": [0, 6], "label": "Y", "x": 6, "y": 0},
-                {"matrix": [0, 7], "label": "U", "x": 7, "y": 0},
-                {"matrix": [0, 8], "label": "I", "x": 8, "y": 0},
-                {"matrix": [0, 9], "label": "O", "x": 9, "y": 0},
-                {"matrix": [0, 10], "label": "P", "x": 10, "y": 0},
-                {"matrix": [0, 11], "label": "Backspace", "w": 1.75, "x": 11, "y": 0},
-
-                {"matrix": [1, 0], "label": "Tab", "w": 1.25, "x": 0, "y": 1},
-                {"matrix": [1, 1], "label": "A", "x": 1.25, "y": 1},
-                {"matrix": [1, 2], "label": "S", "x": 2.25, "y": 1},
-                {"matrix": [1, 3], "label": "D", "x": 3.25, "y": 1},
-                {"matrix": [1, 4], "label": "F", "x": 4.25, "y": 1},
-                {"matrix": [1, 5], "label": "G", "x": 5.25, "y": 1},
-                {"matrix": [1, 6], "label": "H", "x": 6.25, "y": 1},
-                {"matrix": [1, 7], "label": "J", "x": 7.25, "y": 1},
-                {"matrix": [1, 8], "label": "K", "x": 8.25, "y": 1},
-                {"matrix": [1, 9], "label": "L", "x": 9.25, "y": 1},
-                {"matrix": [1, 10], "label": ":", "x": 10.25, "y": 1},
-                {"matrix": [1, 11], "label": "Enter", "w": 1.5, "x": 11.25, "y": 1},
-
-                {"matrix": [2, 0], "label": "Shift", "w": 1.75, "x": 0, "y": 2},
-                {"matrix": [2, 1], "label": "Z", "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "label": "X", "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "label": "C", "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "label": "V", "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "label": "B", "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "label": "N", "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "label": "M", "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "label": "<", "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "label": ">", "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "label": "?", "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "label": "\u2191", "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "label": "\u2191", "x": 12.75, "y": 2},
-
-                {"matrix": [3, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 3},
-                {"matrix": [3, 1], "label": "Win", "x": 1.25, "y": 3},
-                {"matrix": [3, 2], "label": "Alt", "w": 1.25, "x": 2.25, "y": 3},
-                {"matrix": [3, 5], "w": 2.25, "x": 3.5, "y": 3},
-                {"matrix": [3, 6], "w": 2, "x": 5.75, "y": 3},
-                {"matrix": [3, 7], "label": "Alt", "w": 1.5, "x": 7.75, "y": 3},
-                {"matrix": [3, 8], "label": "Ctrl", "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "label": "\u2190", "x": 10.75, "y": 3},
-                {"matrix": [3, 11], "label": "\u2193", "x": 11.75, "y": 3},
-                {"matrix": [3, 12], "label": "\u2192", "x": 12.75, "y": 3}
-            ]
-        },
-        "LAYOUT_625": {
-            "layout": [
-                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
-                {"matrix": [0, 1], "label": "Q", "x": 1, "y": 0},
-                {"matrix": [0, 2], "label": "W", "x": 2, "y": 0},
-                {"matrix": [0, 3], "label": "E", "x": 3, "y": 0},
-                {"matrix": [0, 4], "label": "R", "x": 4, "y": 0},
-                {"matrix": [0, 5], "label": "T", "x": 5, "y": 0},
-                {"matrix": [0, 6], "label": "Y", "x": 6, "y": 0},
-                {"matrix": [0, 7], "label": "U", "x": 7, "y": 0},
-                {"matrix": [0, 8], "label": "I", "x": 8, "y": 0},
-                {"matrix": [0, 9], "label": "O", "x": 9, "y": 0},
-                {"matrix": [0, 10], "label": "P", "x": 10, "y": 0},
-                {"matrix": [0, 11], "label": "Backspace", "w": 1.75, "x": 11, "y": 0},
-
-                {"matrix": [1, 0], "label": "Tab", "w": 1.25, "x": 0, "y": 1},
-                {"matrix": [1, 1], "label": "A", "x": 1.25, "y": 1},
-                {"matrix": [1, 2], "label": "S", "x": 2.25, "y": 1},
-                {"matrix": [1, 3], "label": "D", "x": 3.25, "y": 1},
-                {"matrix": [1, 4], "label": "F", "x": 4.25, "y": 1},
-                {"matrix": [1, 5], "label": "G", "x": 5.25, "y": 1},
-                {"matrix": [1, 6], "label": "H", "x": 6.25, "y": 1},
-                {"matrix": [1, 7], "label": "J", "x": 7.25, "y": 1},
-                {"matrix": [1, 8], "label": "K", "x": 8.25, "y": 1},
-                {"matrix": [1, 9], "label": "L", "x": 9.25, "y": 1},
-                {"matrix": [1, 10], "label": ":", "x": 10.25, "y": 1},
-                {"matrix": [1, 11], "label": "Enter", "w": 1.5, "x": 11.25, "y": 1},
-
-                {"matrix": [2, 0], "label": "Shift", "w": 1.75, "x": 0, "y": 2},
-                {"matrix": [2, 1], "label": "Z", "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "label": "X", "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "label": "C", "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "label": "V", "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "label": "B", "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "label": "N", "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "label": "M", "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "label": "<", "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "label": ">", "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "label": "?", "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "label": "\u2191", "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "label": "\u2191", "x": 12.75, "y": 2},
-
-                {"matrix": [3, 0], "label": "Ctrl", "x": 0, "y": 3},
-                {"matrix": [3, 1], "label": "Win", "x": 1, "y": 3},
-                {"matrix": [3, 2], "label": "Alt", "x": 2, "y": 3},
-                {"matrix": [3, 5], "w": 6.25, "x": 3, "y": 3},
-                {"matrix": [3, 8], "label": "Ctrl", "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "label": "\u2190", "x": 10.75, "y": 3},
-                {"matrix": [3, 11], "label": "\u2193", "x": 11.75, "y": 3},
-                {"matrix": [3, 12], "label": "\u2192", "x": 12.75, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/prototypist/oceanographer/keyboard.json b/keyboards/prototypist/oceanographer/keyboard.json
@@ -0,0 +1,221 @@
+{
+    "manufacturer": "Proto[Typist]",
+    "keyboard_name": "Oceanographer",
+    "maintainer": "Anjheos",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "audio": true,
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true,
+        "oled": true,
+        "rgblight": true
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B2", "pin_b": "B1", "resolution": 2}
+        ]
+    },
+    "ws2812": {
+        "pin": "B3"
+    },
+    "rgblight": {
+        "led_count": 3,
+        "sleep": true,
+        "hue_steps": 10,
+        "saturation_steps": 17,
+        "brightness_steps": 17,
+        "max_brightness": 155,
+        "animations": {
+            "alternating": true,
+            "breathing": true
+        },
+        "default": {
+            "val": 155
+        },
+        "layers": {
+            "enabled": true,
+            "max": 4
+        }
+    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["B0", "D5", "D3", "D2"]
+    },
+    "processor": "atmega32u4",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0002",
+        "vid": "0x4A46"
+    },
+    "layouts": {
+        "LAYOUT_225_1": {
+            "layout": [
+                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "Q", "x": 1, "y": 0},
+                {"matrix": [0, 2], "label": "W", "x": 2, "y": 0},
+                {"matrix": [0, 3], "label": "E", "x": 3, "y": 0},
+                {"matrix": [0, 4], "label": "R", "x": 4, "y": 0},
+                {"matrix": [0, 5], "label": "T", "x": 5, "y": 0},
+                {"matrix": [0, 6], "label": "Y", "x": 6, "y": 0},
+                {"matrix": [0, 7], "label": "U", "x": 7, "y": 0},
+                {"matrix": [0, 8], "label": "I", "x": 8, "y": 0},
+                {"matrix": [0, 9], "label": "O", "x": 9, "y": 0},
+                {"matrix": [0, 10], "label": "P", "x": 10, "y": 0},
+                {"matrix": [0, 11], "label": "Backspace", "w": 1.75, "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "label": "Tab", "w": 1.25, "x": 0, "y": 1},
+                {"matrix": [1, 1], "label": "A", "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "label": "S", "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "label": "D", "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "label": "F", "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "label": "G", "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "label": "H", "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "label": "J", "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "label": "K", "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "label": "L", "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "label": ":", "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "label": "Enter", "w": 1.5, "x": 11.25, "y": 1},
+
+                {"matrix": [2, 0], "label": "Shift", "w": 1.75, "x": 0, "y": 2},
+                {"matrix": [2, 1], "label": "Z", "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "label": "X", "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "label": "C", "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "label": "V", "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "label": "B", "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "label": "N", "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "label": "M", "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "label": "<", "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "label": ">", "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "label": "?", "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "label": "\u2191", "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "label": "\u2191", "x": 12.75, "y": 2},
+
+                {"matrix": [3, 0], "label": "Ctrl", "x": 0, "y": 3},
+                {"matrix": [3, 1], "label": "Win", "x": 1, "y": 3},
+                {"matrix": [3, 2], "label": "Alt", "x": 2, "y": 3},
+                {"matrix": [3, 3], "label": "Fn", "x": 3, "y": 3},
+                {"matrix": [3, 5], "w": 2.25, "x": 4, "y": 3},
+                {"matrix": [3, 6], "w": 2, "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "label": "Alt", "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "label": "Ctrl", "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "label": "\u2190", "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "label": "\u2193", "x": 11.75, "y": 3},
+                {"matrix": [3, 12], "label": "\u2192", "x": 12.75, "y": 3}
+            ]
+        },
+        "LAYOUT_225_2": {
+            "layout": [
+                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "Q", "x": 1, "y": 0},
+                {"matrix": [0, 2], "label": "W", "x": 2, "y": 0},
+                {"matrix": [0, 3], "label": "E", "x": 3, "y": 0},
+                {"matrix": [0, 4], "label": "R", "x": 4, "y": 0},
+                {"matrix": [0, 5], "label": "T", "x": 5, "y": 0},
+                {"matrix": [0, 6], "label": "Y", "x": 6, "y": 0},
+                {"matrix": [0, 7], "label": "U", "x": 7, "y": 0},
+                {"matrix": [0, 8], "label": "I", "x": 8, "y": 0},
+                {"matrix": [0, 9], "label": "O", "x": 9, "y": 0},
+                {"matrix": [0, 10], "label": "P", "x": 10, "y": 0},
+                {"matrix": [0, 11], "label": "Backspace", "w": 1.75, "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "label": "Tab", "w": 1.25, "x": 0, "y": 1},
+                {"matrix": [1, 1], "label": "A", "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "label": "S", "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "label": "D", "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "label": "F", "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "label": "G", "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "label": "H", "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "label": "J", "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "label": "K", "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "label": "L", "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "label": ":", "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "label": "Enter", "w": 1.5, "x": 11.25, "y": 1},
+
+                {"matrix": [2, 0], "label": "Shift", "w": 1.75, "x": 0, "y": 2},
+                {"matrix": [2, 1], "label": "Z", "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "label": "X", "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "label": "C", "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "label": "V", "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "label": "B", "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "label": "N", "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "label": "M", "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "label": "<", "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "label": ">", "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "label": "?", "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "label": "\u2191", "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "label": "\u2191", "x": 12.75, "y": 2},
+
+                {"matrix": [3, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 3},
+                {"matrix": [3, 1], "label": "Win", "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "label": "Alt", "w": 1.25, "x": 2.25, "y": 3},
+                {"matrix": [3, 5], "w": 2.25, "x": 3.5, "y": 3},
+                {"matrix": [3, 6], "w": 2, "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "label": "Alt", "w": 1.5, "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "label": "Ctrl", "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "label": "\u2190", "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "label": "\u2193", "x": 11.75, "y": 3},
+                {"matrix": [3, 12], "label": "\u2192", "x": 12.75, "y": 3}
+            ]
+        },
+        "LAYOUT_625": {
+            "layout": [
+                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "Q", "x": 1, "y": 0},
+                {"matrix": [0, 2], "label": "W", "x": 2, "y": 0},
+                {"matrix": [0, 3], "label": "E", "x": 3, "y": 0},
+                {"matrix": [0, 4], "label": "R", "x": 4, "y": 0},
+                {"matrix": [0, 5], "label": "T", "x": 5, "y": 0},
+                {"matrix": [0, 6], "label": "Y", "x": 6, "y": 0},
+                {"matrix": [0, 7], "label": "U", "x": 7, "y": 0},
+                {"matrix": [0, 8], "label": "I", "x": 8, "y": 0},
+                {"matrix": [0, 9], "label": "O", "x": 9, "y": 0},
+                {"matrix": [0, 10], "label": "P", "x": 10, "y": 0},
+                {"matrix": [0, 11], "label": "Backspace", "w": 1.75, "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "label": "Tab", "w": 1.25, "x": 0, "y": 1},
+                {"matrix": [1, 1], "label": "A", "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "label": "S", "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "label": "D", "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "label": "F", "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "label": "G", "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "label": "H", "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "label": "J", "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "label": "K", "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "label": "L", "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "label": ":", "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "label": "Enter", "w": 1.5, "x": 11.25, "y": 1},
+
+                {"matrix": [2, 0], "label": "Shift", "w": 1.75, "x": 0, "y": 2},
+                {"matrix": [2, 1], "label": "Z", "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "label": "X", "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "label": "C", "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "label": "V", "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "label": "B", "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "label": "N", "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "label": "M", "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "label": "<", "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "label": ">", "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "label": "?", "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "label": "\u2191", "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "label": "\u2191", "x": 12.75, "y": 2},
+
+                {"matrix": [3, 0], "label": "Ctrl", "x": 0, "y": 3},
+                {"matrix": [3, 1], "label": "Win", "x": 1, "y": 3},
+                {"matrix": [3, 2], "label": "Alt", "x": 2, "y": 3},
+                {"matrix": [3, 5], "w": 6.25, "x": 3, "y": 3},
+                {"matrix": [3, 8], "label": "Ctrl", "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "label": "\u2190", "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "label": "\u2193", "x": 11.75, "y": 3},
+                {"matrix": [3, 12], "label": "\u2192", "x": 12.75, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/prototypist/oceanographer/rules.mk b/keyboards/prototypist/oceanographer/rules.mk
@@ -1,5 +0,0 @@
-OLED_ENABLE = yes
-AUDIO_ENABLE = yes
-LTO_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-ENCODER_ENABLE = yes
diff --git a/keyboards/protozoa/cassini/info.json b/keyboards/protozoa/cassini/info.json
@@ -1,665 +0,0 @@
-{
-    "keyboard_name": "Cassini",
-    "manufacturer": "Yiancar-Designs",
-    "url": "https://yiancar-designs.com",
-    "maintainer": "Yiancar-Designs",
-    "usb": {
-        "vid": "0x8968",
-        "pid": "0x4341",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["A1", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B2", "B10", "B11", "B12", "B13", "B14"],
-        "rows": ["A2", "B9", "B8", "B5", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "B6",
-        "on_state": 0
-    },
-    "processor": "STM32F072",
-    "bootloader": "stm32-dfu",
-    "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, 12], "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, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"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": "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, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Menu", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Fn", "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, 13], "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, 10], "x": 10, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Menu", "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, 12], "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, 13], "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, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Menu", "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, 13], "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, 11], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Menu", "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, 12], "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, 13], "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, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Menu", "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": [1, 13], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 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, 10], "x": 10, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Menu", "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, 12], "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": [1, 13], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 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": "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, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Menu", "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": [1, 13], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 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": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Menu", "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, 12], "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": [1, 13], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 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": "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, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Menu", "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/protozoa/cassini/keyboard.json b/keyboards/protozoa/cassini/keyboard.json
@@ -0,0 +1,671 @@
+{
+    "keyboard_name": "Cassini",
+    "manufacturer": "Yiancar-Designs",
+    "url": "https://yiancar-designs.com",
+    "maintainer": "Yiancar-Designs",
+    "usb": {
+        "vid": "0x8968",
+        "pid": "0x4341",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["A1", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B2", "B10", "B11", "B12", "B13", "B14"],
+        "rows": ["A2", "B9", "B8", "B5", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "B6",
+        "on_state": 0
+    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "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, 12], "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, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"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": "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, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Fn", "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, 13], "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, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Menu", "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, 12], "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, 13], "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, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Menu", "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, 13], "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, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Menu", "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, 12], "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, 13], "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, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Menu", "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": [1, 13], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 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, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Menu", "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, 12], "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": [1, 13], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 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": "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, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Menu", "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": [1, 13], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 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": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Menu", "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, 12], "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": [1, 13], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 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": "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, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Menu", "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/protozoa/cassini/rules.mk b/keyboards/protozoa/cassini/rules.mk
@@ -1,15 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/protozoa/event_horizon/info.json b/keyboards/protozoa/event_horizon/keyboard.json
diff --git a/keyboards/protozoa/p01/info.json b/keyboards/protozoa/p01/info.json
@@ -1,1413 +0,0 @@
-{
-    "keyboard_name": "P.01",
-    "manufacturer": "Yiancar-Designs",
-    "url": "https://yiancar-designs.com",
-    "maintainer": "Yiancar-Designs",
-    "usb": {
-        "vid": "0x8968",
-        "pid": "0x5031",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 18,
-        "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": "A9",
-        "driver": "pwm"
-    },
-    "matrix_pins": {
-        "cols": ["A14", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0"],
-        "rows": ["B1", "B2", "B10", "B11", "B12", "B13"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B15", "pin_b": "B14"}
-        ]
-    },
-    "processor": "STM32F072",
-    "bootloader": "stm32-dfu",
-    "community_layouts": [
-        "tkl_ansi",
-        "tkl_ansi_split_bs_rshift",
-        "tkl_ansi_tsangan",
-        "tkl_ansi_tsangan_split_bs_rshift",
-        "tkl_iso",
-        "tkl_iso_split_bs_rshift",
-        "tkl_iso_tsangan",
-        "tkl_iso_tsangan_split_bs_rshift"
-    ],
-    "layouts": {
-        "LAYOUT_all": {
-            "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, 11], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
-                {"label": "Mute", "matrix": [0, 17], "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, 15], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 17], "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, 15], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 17], "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": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 14], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 16], "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, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
-                {"label": "Fn", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 17], "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, 11], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
-                {"label": "Mute", "matrix": [0, 17], "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, 15], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 17], "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, 15], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 17], "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, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 16], "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, 6], "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", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 17], "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, 11], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
-                {"label": "Mute", "matrix": [0, 17], "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, 15], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 17], "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, 15], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 17], "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, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 14], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 16], "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, 6], "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", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 17], "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, 11], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
-                {"label": "Mute", "matrix": [0, 17], "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, 15], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 17], "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, 15], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 17], "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, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 16], "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, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 14], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 17], "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, 11], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
-                {"label": "Mute", "matrix": [0, 17], "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, 15], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 17], "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, 15], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 17], "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, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 14], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 16], "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, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 14], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi_wkl": {
-            "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, 11], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
-                {"label": "Mute", "matrix": [0, 17], "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, 15], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 17], "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, 15], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 17], "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, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Ctrl", "matrix": [5, 14], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi_wkl_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, 11], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
-                {"label": "Mute", "matrix": [0, 17], "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, 15], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 17], "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, 15], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 17], "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, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 14], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Ctrl", "matrix": [5, 14], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_iso": {
-            "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, 11], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
-                {"label": "Mute", "matrix": [0, 17], "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, 15], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 17], "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": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 17], "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": "#", "matrix": [2, 13], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 16], "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, 6], "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", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_iso_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, 11], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
-                {"label": "Mute", "matrix": [0, 17], "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, 15], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 17], "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": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 17], "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": "#", "matrix": [2, 13], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 14], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 16], "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, 6], "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", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_iso_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, 11], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
-                {"label": "Mute", "matrix": [0, 17], "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, 15], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 17], "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": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 17], "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": "#", "matrix": [2, 13], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 16], "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, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 14], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_iso_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, 11], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
-                {"label": "Mute", "matrix": [0, 17], "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, 15], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 17], "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": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 17], "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": "#", "matrix": [2, 13], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 14], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 16], "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, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 14], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_iso_wkl": {
-            "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, 11], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
-                {"label": "Mute", "matrix": [0, 17], "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, 15], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 17], "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": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 17], "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": "#", "matrix": [2, 13], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Ctrl", "matrix": [5, 14], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_iso_wkl_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, 11], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
-                {"label": "Mute", "matrix": [0, 17], "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, 15], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 17], "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": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 17], "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": "#", "matrix": [2, 13], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 14], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Ctrl", "matrix": [5, 14], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/protozoa/p01/keyboard.json b/keyboards/protozoa/p01/keyboard.json
@@ -0,0 +1,1421 @@
+{
+    "keyboard_name": "P.01",
+    "manufacturer": "Yiancar-Designs",
+    "url": "https://yiancar-designs.com",
+    "maintainer": "Yiancar-Designs",
+    "usb": {
+        "vid": "0x8968",
+        "pid": "0x5031",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 18,
+        "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": "A9",
+        "driver": "pwm"
+    },
+    "matrix_pins": {
+        "cols": ["A14", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0"],
+        "rows": ["B1", "B2", "B10", "B11", "B12", "B13"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B15", "pin_b": "B14"}
+        ]
+    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "community_layouts": [
+        "tkl_ansi",
+        "tkl_ansi_split_bs_rshift",
+        "tkl_ansi_tsangan",
+        "tkl_ansi_tsangan_split_bs_rshift",
+        "tkl_iso",
+        "tkl_iso_split_bs_rshift",
+        "tkl_iso_tsangan",
+        "tkl_iso_tsangan_split_bs_rshift"
+    ],
+    "layouts": {
+        "LAYOUT_all": {
+            "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, 11], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
+                {"label": "Mute", "matrix": [0, 17], "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, 15], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 17], "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, 15], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 17], "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": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 14], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 16], "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, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "Fn", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 17], "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, 11], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
+                {"label": "Mute", "matrix": [0, 17], "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, 15], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 17], "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, 15], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 17], "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, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 16], "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, 6], "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", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 17], "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, 11], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
+                {"label": "Mute", "matrix": [0, 17], "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, 15], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 17], "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, 15], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 17], "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, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 14], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 16], "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, 6], "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", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 17], "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, 11], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
+                {"label": "Mute", "matrix": [0, 17], "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, 15], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 17], "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, 15], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 17], "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, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 16], "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, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 14], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 17], "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, 11], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
+                {"label": "Mute", "matrix": [0, 17], "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, 15], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 17], "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, 15], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 17], "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, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 14], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 16], "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, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 14], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_wkl": {
+            "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, 11], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
+                {"label": "Mute", "matrix": [0, 17], "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, 15], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 17], "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, 15], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 17], "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, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 14], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_wkl_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, 11], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
+                {"label": "Mute", "matrix": [0, 17], "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, 15], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 17], "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, 15], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 17], "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, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 14], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 14], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso": {
+            "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, 11], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
+                {"label": "Mute", "matrix": [0, 17], "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, 15], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 17], "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": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 17], "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": "#", "matrix": [2, 13], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 16], "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, 6], "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", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_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, 11], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
+                {"label": "Mute", "matrix": [0, 17], "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, 15], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 17], "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": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 17], "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": "#", "matrix": [2, 13], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 14], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 16], "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, 6], "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", "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_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, 11], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
+                {"label": "Mute", "matrix": [0, 17], "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, 15], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 17], "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": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 17], "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": "#", "matrix": [2, 13], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 16], "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, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 14], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_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, 11], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
+                {"label": "Mute", "matrix": [0, 17], "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, 15], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 17], "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": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 17], "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": "#", "matrix": [2, 13], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 14], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 16], "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, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 14], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_wkl": {
+            "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, 11], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
+                {"label": "Mute", "matrix": [0, 17], "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, 15], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 17], "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": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 17], "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": "#", "matrix": [2, 13], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 14], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_wkl_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, 11], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 15], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
+                {"label": "Mute", "matrix": [0, 17], "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, 15], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 17], "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": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 17], "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": "#", "matrix": [2, 13], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 14], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 14], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/protozoa/p01/rules.mk b/keyboards/protozoa/p01/rules.mk
@@ -1,16 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes        # Encoder support
diff --git a/keyboards/punk75/info.json b/keyboards/punk75/info.json
@@ -1,110 +0,0 @@
-{
-    "keyboard_name": "punk75",
-    "manufacturer": "dsanchezseco",
-    "url": "",
-    "maintainer": "dsanchezseco",
-    "usb": {
-        "vid": "0xDEED",
-        "pid": "0x0001",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["C2", "C3", "C6", "C5", "C4", "A7", "A6", "A5", "A4", "B4", "A3", "B3", "A2", "B2", "A1"],
-        "rows": ["D6", "D5", "C1", "C0", "D7"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "D0", "pin_b": "D1"},
-            {"pin_a": "B1", "pin_b": "B0"}
-        ]
-    },
-    "processor": "atmega32a",
-    "bootloader": "usbasploader",
-    "community_layouts": ["ortho_5x15"],
-    "layouts": {
-        "LAYOUT_ortho_5x15": {
-            "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},
-                {"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": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 13], "x": 13, "y": 1},
-                {"matrix": [1, 14], "x": 14, "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": [2, 12], "x": 12, "y": 2},
-                {"matrix": [2, 13], "x": 13, "y": 2},
-                {"matrix": [2, 14], "x": 14, "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": [3, 12], "x": 12, "y": 3},
-                {"matrix": [3, 13], "x": 13, "y": 3},
-                {"matrix": [3, 14], "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},
-                {"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},
-                {"matrix": [4, 12], "x": 12, "y": 4},
-                {"matrix": [4, 13], "x": 13, "y": 4},
-                {"matrix": [4, 14], "x": 14, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/punk75/keyboard.json b/keyboards/punk75/keyboard.json
@@ -0,0 +1,117 @@
+{
+    "keyboard_name": "punk75",
+    "manufacturer": "dsanchezseco",
+    "url": "",
+    "maintainer": "dsanchezseco",
+    "usb": {
+        "vid": "0xDEED",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["C2", "C3", "C6", "C5", "C4", "A7", "A6", "A5", "A4", "B4", "A3", "B3", "A2", "B2", "A1"],
+        "rows": ["D6", "D5", "C1", "C0", "D7"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D0", "pin_b": "D1"},
+            {"pin_a": "B1", "pin_b": "B0"}
+        ]
+    },
+    "processor": "atmega32a",
+    "bootloader": "usbasploader",
+    "community_layouts": ["ortho_5x15"],
+    "layouts": {
+        "LAYOUT_ortho_5x15": {
+            "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},
+                {"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": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "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": [2, 12], "x": 12, "y": 2},
+                {"matrix": [2, 13], "x": 13, "y": 2},
+                {"matrix": [2, 14], "x": 14, "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": [3, 12], "x": 12, "y": 3},
+                {"matrix": [3, 13], "x": 13, "y": 3},
+                {"matrix": [3, 14], "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},
+                {"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},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/punk75/rules.mk b/keyboards/punk75/rules.mk
@@ -1,16 +1,2 @@
 # Processor frequency
 F_CPU = 16000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes        # Enable rotary encoders support

D	keyboards/palette1202/info.json	46	----------------------------------------------
A	keyboards/palette1202/keyboard.json	56	++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M	keyboards/palette1202/rules.mk	15	---------------
D	keyboards/pearlboards/atlas/info.json	438	-------------------------------------------------------------------------------
A	keyboards/pearlboards/atlas/keyboard.json	451	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M	keyboards/pearlboards/atlas/rules.mk	16	----------------
D	keyboards/pearlboards/pearl/info.json	148	-------------------------------------------------------------------------------
A	keyboards/pearlboards/pearl/keyboard.json	160	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M	keyboards/pearlboards/pearl/rules.mk	15	---------------
D	keyboards/pearlboards/zeus/info.json	1383	-------------------------------------------------------------------------------
A	keyboards/pearlboards/zeus/keyboard.json	1396	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M	keyboards/pearlboards/zeus/rules.mk	16	----------------
D	keyboards/peej/rosaline/ortho/info.json	88	-------------------------------------------------------------------------------
A	keyboards/peej/rosaline/ortho/keyboard.json	94	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D	keyboards/peej/rosaline/ortho/rules.mk	12	------------
D	keyboards/peej/rosaline/staggered/info.json	189	-------------------------------------------------------------------------------
A	keyboards/peej/rosaline/staggered/keyboard.json	195	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D	keyboards/peej/rosaline/staggered/rules.mk	12	------------
D	keyboards/peranekofactory/tone/rev1/config.h	39	---------------------------------------
D	keyboards/peranekofactory/tone/rev1/info.json	40	----------------------------------------
A	keyboards/peranekofactory/tone/rev1/keyboard.json	51	+++++++++++++++++++++++++++++++++++++++++++++++++++
D	keyboards/peranekofactory/tone/rev1/rules.mk	13	-------------
D	keyboards/peranekofactory/tone/rev2/config.h	39	---------------------------------------
D	keyboards/peranekofactory/tone/rev2/info.json	40	----------------------------------------
A	keyboards/peranekofactory/tone/rev2/keyboard.json	51	+++++++++++++++++++++++++++++++++++++++++++++++++++
D	keyboards/peranekofactory/tone/rev2/rules.mk	13	-------------
M	keyboards/percent/canoe_gen2/canoe_gen2.c	2	++
D	keyboards/percent/canoe_gen2/config.h	23	-----------------------
D	keyboards/percent/canoe_gen2/info.json	216	-------------------------------------------------------------------------------
A	keyboards/percent/canoe_gen2/keyboard.json	230	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M	keyboards/percent/canoe_gen2/rules.mk	14	--------------
D	keyboards/phage_studio/pila87/info.json	181	-------------------------------------------------------------------------------
A	keyboards/phage_studio/pila87/keyboard.json	188	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M	keyboards/phage_studio/pila87/rules.mk	16	----------------
D	keyboards/phase_studio/titan65/hotswap/info.json	103	-------------------------------------------------------------------------------
A	keyboards/phase_studio/titan65/hotswap/keyboard.json	110	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M	keyboards/phase_studio/titan65/hotswap/rules.mk	14	--------------
D	keyboards/phase_studio/titan65/soldered/info.json	407	-------------------------------------------------------------------------------
A	keyboards/phase_studio/titan65/soldered/keyboard.json	413	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M	keyboards/phase_studio/titan65/soldered/rules.mk	14	--------------
D	keyboards/phoenix/info.json	214	-------------------------------------------------------------------------------
A	keyboards/phoenix/keyboard.json	223	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M	keyboards/phoenix/rules.mk	16	----------------
R	keyboards/pica40/rev2/info.json -> keyboards/pica40/rev2/keyboard.json	0
D	keyboards/pierce/info.json	63	---------------------------------------------------------------
A	keyboards/pierce/keyboard.json	69	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M	keyboards/pierce/rules.mk	13	-------------
M	keyboards/pinky/info.json	6	++++++
M	keyboards/pinky/rules.mk	13	-------------
R	keyboards/pizzakeyboards/slice65/info.json -> keyboards/pizzakeyboards/slice65/keyboard.json	0
D	keyboards/planck/ez/glow/info.json	6	------
A	keyboards/planck/ez/glow/keyboard.json	9	+++++++++
D	keyboards/planck/ez/glow/rules.mk	1	-
M	keyboards/planck/ez/info.json	15	++++++++++++++-
M	keyboards/planck/ez/rules.mk	16	----------------
D	keyboards/planck/rev6_drop/info.json	315	-------------------------------------------------------------------------------
A	keyboards/planck/rev6_drop/keyboard.json	327	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M	keyboards/planck/rev6_drop/rules.mk	17	-----------------
D	keyboards/planck/rev7/info.json	333	-------------------------------------------------------------------------------
A	keyboards/planck/rev7/keyboard.json	334	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M	keyboards/planck/rev7/rules.mk	5	-----
D	keyboards/planck/thk/info.json	140	-------------------------------------------------------------------------------
A	keyboards/planck/thk/keyboard.json	148	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M	keyboards/planck/thk/rules.mk	15	---------------
R	keyboards/ploopyco/mouse/info.json -> keyboards/ploopyco/mouse/keyboard.json	0
R	keyboards/pmk/posey_split/v4/info.json -> keyboards/pmk/posey_split/v4/keyboard.json	0
R	keyboards/pmk/posey_split/v5/info.json -> keyboards/pmk/posey_split/v5/keyboard.json	0
R	keyboards/pmk/recore/v3/info.json -> keyboards/pmk/recore/v3/keyboard.json	0
D	keyboards/preonic/rev3_drop/info.json	387	-------------------------------------------------------------------------------
A	keyboards/preonic/rev3_drop/keyboard.json	399	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M	keyboards/preonic/rev3_drop/rules.mk	18	------------------
D	keyboards/primekb/prime_e/config.h	23	-----------------------
M	keyboards/primekb/prime_e/info.json	6	++++++
D	keyboards/primekb/prime_e/rgb/info.json	25	-------------------------
A	keyboards/primekb/prime_e/rgb/keyboard.json	28	++++++++++++++++++++++++++++
D	keyboards/primekb/prime_e/rgb/rules.mk	2	--
D	keyboards/primekb/prime_e/std/info.json	11	-----------
A	keyboards/primekb/prime_e/std/keyboard.json	14	++++++++++++++
D	keyboards/primekb/prime_e/std/rules.mk	2	--
D	keyboards/primekb/prime_l/config.h	24	------------------------
M	keyboards/primekb/prime_l/info.json	6	++++++
D	keyboards/primekb/prime_l/v1/info.json	103	-------------------------------------------------------------------------------
A	keyboards/primekb/prime_l/v1/keyboard.json	106	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D	keyboards/primekb/prime_l/v1/rules.mk	2	--
R	keyboards/primekb/prime_l/v2/info.json -> keyboards/primekb/prime_l/v2/keyboard.json	0
D	keyboards/primekb/prime_l/v2/rules.mk	2	--
R	keyboards/printedpad/info.json -> keyboards/printedpad/keyboard.json	0
D	keyboards/program_yoink/config.h	29	-----------------------------
A	keyboards/program_yoink/info.json	17	+++++++++++++++++
M	keyboards/program_yoink/rules.mk	14	--------------
D	keyboards/projectkb/alice/rev1/info.json	26	--------------------------
A	keyboards/projectkb/alice/rev1/keyboard.json	36	++++++++++++++++++++++++++++++++++++
D	keyboards/projectkb/alice/rev1/rules.mk	13	-------------
D	keyboards/projectkb/alice/rev2/info.json	26	--------------------------
A	keyboards/projectkb/alice/rev2/keyboard.json	36	++++++++++++++++++++++++++++++++++++
D	keyboards/projectkb/alice/rev2/rules.mk	13	-------------
D	keyboards/prototypist/oceanographer/info.json	216	-------------------------------------------------------------------------------
A	keyboards/prototypist/oceanographer/keyboard.json	221	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D	keyboards/prototypist/oceanographer/rules.mk	5	-----
D	keyboards/protozoa/cassini/info.json	665	-------------------------------------------------------------------------------
A	keyboards/protozoa/cassini/keyboard.json	671	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M	keyboards/protozoa/cassini/rules.mk	13	-------------
R	keyboards/protozoa/event_horizon/info.json -> keyboards/protozoa/event_horizon/keyboard.json	0
D	keyboards/protozoa/p01/info.json	1413	-------------------------------------------------------------------------------
A	keyboards/protozoa/p01/keyboard.json	1421	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M	keyboards/protozoa/p01/rules.mk	14	--------------
D	keyboards/punk75/info.json	110	-------------------------------------------------------------------------------
A	keyboards/punk75/keyboard.json	117	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M	keyboards/punk75/rules.mk	14	--------------