Migrate features from rules.mk to DD (#23202) - qmk_firmware

commit: f1a279810fbab3b5d5c4cfa0b4146cf042dae3bb
parent 8e5cd981e1cb8580cde65ac99f335b59d65da632
Author: Joel Challis <git@zvecr.com>
Date:   Thu, 14 Mar 2024 03:57:48 +0000

Migrate features from rules.mk to DD (#23202)


Diffstat:
D keyboards/0xcb/tutelpad/info.json 57 ---------------------------------------------------------
A keyboards/0xcb/tutelpad/keyboard.json 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/0xcb/tutelpad/rules.mk 13 -------------
D keyboards/1upkeyboards/1up60rgb/info.json 535 -------------------------------------------------------------------------------
A keyboards/1upkeyboards/1up60rgb/keyboard.json 545 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/1upkeyboards/1up60rgb/rules.mk 12 ------------
D keyboards/1upkeyboards/super16/info.json 133 -------------------------------------------------------------------------------
A keyboards/1upkeyboards/super16/keyboard.json 142 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/1upkeyboards/super16/rules.mk 13 -------------
D keyboards/1upkeyboards/super16v2/info.json 90 -------------------------------------------------------------------------------
A keyboards/1upkeyboards/super16v2/keyboard.json 100 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/1upkeyboards/super16v2/rules.mk 15 ---------------
D keyboards/2key2crawl/info.json 60 ------------------------------------------------------------
A keyboards/2key2crawl/keyboard.json 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/2key2crawl/rules.mk 13 -------------
D keyboards/30wer/info.json 64 ----------------------------------------------------------------
A keyboards/30wer/keyboard.json 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/30wer/rules.mk 12 ------------
D keyboards/3keyecosystem/2key2/info.json 91 -------------------------------------------------------------------------------
A keyboards/3keyecosystem/2key2/keyboard.json 100 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/3keyecosystem/2key2/rules.mk 13 -------------
D keyboards/40percentclub/4pack/info.json 32 --------------------------------
A keyboards/40percentclub/4pack/keyboard.json 41 +++++++++++++++++++++++++++++++++++++++++
D keyboards/40percentclub/4pack/rules.mk 12 ------------
D keyboards/40percentclub/5x5/info.json 195 -------------------------------------------------------------------------------
A keyboards/40percentclub/5x5/keyboard.json 203 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/40percentclub/5x5/rules.mk 11 -----------
D keyboards/40percentclub/luddite/info.json 112 -------------------------------------------------------------------------------
A keyboards/40percentclub/luddite/keyboard.json 122 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/40percentclub/luddite/rules.mk 12 ------------
D keyboards/40percentclub/mf68/info.json 105 -------------------------------------------------------------------------------
A keyboards/40percentclub/mf68/keyboard.json 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/40percentclub/mf68/rules.mk 12 ------------
D keyboards/40percentclub/nano/info.json 54 ------------------------------------------------------
A keyboards/40percentclub/nano/keyboard.json 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/40percentclub/nano/rules.mk 13 -------------
D keyboards/40percentclub/nein/info.json 35 -----------------------------------
A keyboards/40percentclub/nein/keyboard.json 43 +++++++++++++++++++++++++++++++++++++++++++
D keyboards/40percentclub/nein/rules.mk 12 ------------
D keyboards/40percentclub/sixpack/info.json 43 -------------------------------------------
A keyboards/40percentclub/sixpack/keyboard.json 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/40percentclub/sixpack/rules.mk 12 ------------
D keyboards/40percentclub/tomato/info.json 77 -----------------------------------------------------------------------------
A keyboards/40percentclub/tomato/keyboard.json 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/40percentclub/tomato/rules.mk 12 ------------
D keyboards/45_ats/info.json 208 -------------------------------------------------------------------------------
A keyboards/45_ats/keyboard.json 216 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/45_ats/rules.mk 12 ------------
D keyboards/4by3/info.json 79 -------------------------------------------------------------------------------
A keyboards/4by3/keyboard.json 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/4by3/rules.mk 4 ----
D keyboards/4pplet/aekiso60/rev_a/info.json 38 --------------------------------------
A keyboards/4pplet/aekiso60/rev_a/keyboard.json 46 ++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/4pplet/aekiso60/rev_a/rules.mk 12 ------------
D keyboards/4pplet/bootleg/rev_a/info.json 169 -------------------------------------------------------------------------------
A keyboards/4pplet/bootleg/rev_a/keyboard.json 177 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/4pplet/bootleg/rev_a/rules.mk 12 ------------
D keyboards/4pplet/perk60_iso/rev_a/info.json 123 -------------------------------------------------------------------------------
A keyboards/4pplet/perk60_iso/rev_a/keyboard.json 132 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/4pplet/perk60_iso/rev_a/rules.mk 14 --------------
D keyboards/4pplet/waffling60/rev_a/info.json 98 -------------------------------------------------------------------------------
A keyboards/4pplet/waffling60/rev_a/keyboard.json 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/4pplet/waffling60/rev_a/rules.mk 12 ------------
D keyboards/4pplet/waffling60/rev_b/info.json 118 -------------------------------------------------------------------------------
A keyboards/4pplet/waffling60/rev_b/keyboard.json 127 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/4pplet/waffling60/rev_b/rules.mk 12 ------------
D keyboards/4pplet/waffling60/rev_c/info.json 118 -------------------------------------------------------------------------------
A keyboards/4pplet/waffling60/rev_c/keyboard.json 127 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/4pplet/waffling60/rev_c/rules.mk 12 ------------
D keyboards/4pplet/waffling80/rev_a/info.json 26 --------------------------
A keyboards/4pplet/waffling80/rev_a/keyboard.json 35 +++++++++++++++++++++++++++++++++++
D keyboards/4pplet/waffling80/rev_a/rules.mk 12 ------------
D keyboards/4pplet/yakiimo/rev_a/info.json 557 -------------------------------------------------------------------------------
A keyboards/4pplet/yakiimo/rev_a/keyboard.json 565 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/4pplet/yakiimo/rev_a/rules.mk 13 -------------
D keyboards/7c8/framework/info.json 233 -------------------------------------------------------------------------------
A keyboards/7c8/framework/keyboard.json 243 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/7c8/framework/rules.mk 15 ---------------
D keyboards/9key/info.json 41 -----------------------------------------
A keyboards/9key/keyboard.json 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
D keyboards/9key/rules.mk 13 -------------

81 files changed, 3731 insertions(+), 3821 deletions(-)
diff --git a/keyboards/0xcb/tutelpad/info.json b/keyboards/0xcb/tutelpad/info.json
@@ -1,57 +0,0 @@
-{
-    "keyboard_name": "TutelPad",
-    "manufacturer": "ItsFiremanSam",
-    "url": "",
-    "maintainer": "ItsFiremanSam",
-    "usb": {
-        "vid": "0xCB00",
-        "pid": "0xF09F",
-        "device_version": "0.0.1"
-    },
-    "bootmagic": {
-        "matrix": [1, 0]
-    },
-    "rgblight": {
-        "hue_steps": 10,
-        "led_count": 4,
-        "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": "D3"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "matrix_pins": {
-        "direct": [
-            ["E6", "D7", "B1", "B3"],
-            ["B5", "B4", "B2", "B6"]
-        ]
-    },
-    "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": [1, 0]},
-                {"x": 1, "y": 1, "matrix": [1, 1]},
-                {"x": 2, "y": 1, "matrix": [1, 2]},
-                {"x": 3, "y": 1, "matrix": [1, 3]}
-            ]
-        }
-    }
-}
diff --git a/keyboards/0xcb/tutelpad/keyboard.json b/keyboards/0xcb/tutelpad/keyboard.json
@@ -0,0 +1,67 @@
+{
+    "keyboard_name": "TutelPad",
+    "manufacturer": "ItsFiremanSam",
+    "url": "",
+    "maintainer": "ItsFiremanSam",
+    "usb": {
+        "vid": "0xCB00",
+        "pid": "0xF09F",
+        "device_version": "0.0.1"
+    },
+    "bootmagic": {
+        "matrix": [1, 0]
+    },
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 4,
+        "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": "D3"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false,
+        "oled": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "direct": [
+            ["E6", "D7", "B1", "B3"],
+            ["B5", "B4", "B2", "B6"]
+        ]
+    },
+    "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": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]},
+                {"x": 3, "y": 1, "matrix": [1, 3]}
+            ]
+        }
+    }
+}
diff --git a/keyboards/0xcb/tutelpad/rules.mk b/keyboards/0xcb/tutelpad/rules.mk
@@ -1,13 +0,0 @@
-# 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 = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-OLED_ENABLE = yes
diff --git a/keyboards/1upkeyboards/1up60rgb/info.json b/keyboards/1upkeyboards/1up60rgb/info.json
@@ -1,535 +0,0 @@
-{
-  "keyboard_name": "1UP RGB Underglow PCB",
-  "manufacturer": "1upkeyboards",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0x6F75",
-    "pid": "0x7267",
-    "device_version": "0.0.1"
-  },
-  "matrix_pins": {
-    "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4"],
-    "rows": ["D0", "D1", "D2", "D3", "D5"]
-  },
-  "diode_direction": "COL2ROW",
-  "backlight": {
-    "pin": "B6",
-    "levels": 5
-  },
-  "rgblight": {
-    "saturation_steps": 8,
-    "brightness_steps": 8,
-    "led_count": 16,
-    "animations": {
-      "breathing": true,
-      "rainbow_mood": true,
-      "rainbow_swirl": true,
-      "snake": true,
-      "knight": true,
-      "christmas": true,
-      "static_gradient": true,
-      "rgb_test": true,
-      "alternating": true,
-      "twinkle": true
-    }
-  },
-  "ws2812": {
-    "pin": "E2"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "atmel-dfu",
-  "community_layouts": ["60_ansi", "60_iso", "60_ansi_split_bs_rshift", "60_hhkb"],
-  "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": [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": [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": [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, 13], "x": 12.25, "y": 3, "w": 1.75},
-        {"matrix": [3, 14], "x": 14, "y": 3},
-
-        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-        {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-        {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
-      ]
-    },
-    "LAYOUT_60_ansi": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"matrix": [0, 11], "x": 11, "y": 0},
-        {"matrix": [0, 12], "x": 12, "y": 0},
-        {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
-
-        {"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": [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": [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, 13], "x": 12.25, "y": 3, "w": 2.75},
-
-        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-        {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-        {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
-      ]
-    },
-    "LAYOUT_60_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, 14], "x": 13, "y": 0, "w": 2},
-
-        {"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": [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": [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, 13], "x": 12.25, "y": 3, "w": 2.75},
-
-        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-        {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-        {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
-      ]
-    },
-    "LAYOUT_60_ansi_split_bs_rshift": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"matrix": [0, 11], "x": 11, "y": 0},
-        {"matrix": [0, 12], "x": 12, "y": 0},
-        {"matrix": [0, 13], "x": 13, "y": 0},
-        {"matrix": [0, 14], "x": 14, "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": [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": [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, 13], "x": 12.25, "y": 3, "w": 1.75},
-        {"matrix": [3, 14], "x": 14, "y": 3},
-
-        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-        {"matrix": [4, 1], "x": 1.5, "y": 4},
-        {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
-        {"matrix": [4, 6], "x": 4, "y": 4, "w": 6},
-        {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
-        {"matrix": [4, 11], "x": 11.5, "y": 4},
-        {"matrix": [4, 13], "x": 12.5, "y": 4},
-        {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5}
-      ]
-    },
-    "LAYOUT_60_ansi_split_rshift": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"matrix": [0, 11], "x": 11, "y": 0},
-        {"matrix": [0, 12], "x": 12, "y": 0},
-        {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
-
-        {"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": [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": [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, 13], "x": 12.25, "y": 3, "w": 1.75},
-        {"matrix": [3, 14], "x": 14, "y": 3},
-
-        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-        {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-        {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
-      ]
-    },
-    "LAYOUT_60_ansi_tsangan_split_rshift": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"matrix": [0, 11], "x": 11, "y": 0},
-        {"matrix": [0, 12], "x": 12, "y": 0},
-        {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
-
-        {"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": [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": [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, 13], "x": 12.25, "y": 3, "w": 1.75},
-        {"matrix": [3, 14], "x": 14, "y": 3},
-
-        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-        {"matrix": [4, 1], "x": 1.5, "y": 4},
-        {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
-        {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-        {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-        {"matrix": [4, 13], "x": 12.5, "y": 4},
-        {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5}
-      ]
-    },
-    "LAYOUT_60_hhkb": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"matrix": [0, 11], "x": 11, "y": 0},
-        {"matrix": [0, 12], "x": 12, "y": 0},
-        {"matrix": [0, 13], "x": 13, "y": 0},
-        {"matrix": [0, 14], "x": 14, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-        {"matrix": [1, 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": [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": [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, 13], "x": 12.25, "y": 3, "w": 1.75},
-        {"matrix": [3, 14], "x": 14, "y": 3},
-
-        {"matrix": [4, 1], "x": 1.5, "y": 4},
-        {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
-        {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-        {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-        {"matrix": [4, 13], "x": 12.5, "y": 4}
-      ]
-    }
-  }
-}
diff --git a/keyboards/1upkeyboards/1up60rgb/keyboard.json b/keyboards/1upkeyboards/1up60rgb/keyboard.json
@@ -0,0 +1,545 @@
+{
+  "keyboard_name": "1UP RGB Underglow PCB",
+  "manufacturer": "1upkeyboards",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0x6F75",
+    "pid": "0x7267",
+    "device_version": "0.0.1"
+  },
+  "features": {
+    "backlight": true,
+    "bootmagic": true,
+    "command": false,
+    "console": false,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": true,
+    "rgblight": true
+  },
+  "matrix_pins": {
+    "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4"],
+    "rows": ["D0", "D1", "D2", "D3", "D5"]
+  },
+  "diode_direction": "COL2ROW",
+  "backlight": {
+    "pin": "B6",
+    "levels": 5
+  },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 16,
+    "animations": {
+      "breathing": true,
+      "rainbow_mood": true,
+      "rainbow_swirl": true,
+      "snake": true,
+      "knight": true,
+      "christmas": true,
+      "static_gradient": true,
+      "rgb_test": true,
+      "alternating": true,
+      "twinkle": true
+    }
+  },
+  "ws2812": {
+    "pin": "E2"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
+  "community_layouts": ["60_ansi", "60_iso", "60_ansi_split_bs_rshift", "60_hhkb"],
+  "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": [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": [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": [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, 13], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 14], "x": 14, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
+      ]
+    },
+    "LAYOUT_60_ansi": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+        {"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": [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": [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, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
+      ]
+    },
+    "LAYOUT_60_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, 14], "x": 13, "y": 0, "w": 2},
+
+        {"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": [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": [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, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
+      ]
+    },
+    "LAYOUT_60_ansi_split_bs_rshift": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0},
+        {"matrix": [0, 14], "x": 14, "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": [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": [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, 13], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 14], "x": 14, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+        {"matrix": [4, 1], "x": 1.5, "y": 4},
+        {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
+        {"matrix": [4, 6], "x": 4, "y": 4, "w": 6},
+        {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+        {"matrix": [4, 11], "x": 11.5, "y": 4},
+        {"matrix": [4, 13], "x": 12.5, "y": 4},
+        {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5}
+      ]
+    },
+    "LAYOUT_60_ansi_split_rshift": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+        {"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": [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": [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, 13], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 14], "x": 14, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
+      ]
+    },
+    "LAYOUT_60_ansi_tsangan_split_rshift": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+        {"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": [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": [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, 13], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 14], "x": 14, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+        {"matrix": [4, 1], "x": 1.5, "y": 4},
+        {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
+        {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+        {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+        {"matrix": [4, 13], "x": 12.5, "y": 4},
+        {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5}
+      ]
+    },
+    "LAYOUT_60_hhkb": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0},
+        {"matrix": [0, 14], "x": 14, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 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": [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": [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, 13], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 14], "x": 14, "y": 3},
+
+        {"matrix": [4, 1], "x": 1.5, "y": 4},
+        {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
+        {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+        {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+        {"matrix": [4, 13], "x": 12.5, "y": 4}
+      ]
+    }
+  }
+}
diff --git a/keyboards/1upkeyboards/1up60rgb/rules.mk b/keyboards/1upkeyboards/1up60rgb/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 = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
-AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/1upkeyboards/super16/info.json b/keyboards/1upkeyboards/super16/info.json
@@ -1,133 +0,0 @@
-{
-  "keyboard_name": "super16",
-  "manufacturer": "1upkeyboards",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0x6F75",
-    "pid": "0x5516",
-    "device_version": "0.0.1"
-  },
-  "ws2812": {
-    "pin": "D3"
-  },
-  "rgblight": {
-    "saturation_steps": 8,
-    "brightness_steps": 8,
-    "led_count": 16,
-    "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
-    }
-  },
-  "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"
-  },
-  "matrix_pins": {
-    "cols": ["D4", "C6", "F6", "F7"],
-    "rows": ["D1", "D0", "F4", "F5"]
-  },
-  "diode_direction": "COL2ROW",
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "community_layouts": ["ortho_4x4", "numpad_4x4"],
-  "layouts": {
-    "LAYOUT_ortho_4x4": {
-      "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": [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": [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": [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}
-      ]
-    },
-    "LAYOUT_numpad_4x4": {
-      "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, "h": 2},
-
-        {"matrix": [1, 0], "x": 0, "y": 1},
-        {"matrix": [1, 1], "x": 1, "y": 1},
-        {"matrix": [1, 2], "x": 2, "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, "h": 2},
-
-        {"matrix": [3, 1], "x": 0, "y": 3, "w": 2},
-        {"matrix": [3, 2], "x": 2, "y": 3}
-      ]
-    }
-  }
-}
diff --git a/keyboards/1upkeyboards/super16/keyboard.json b/keyboards/1upkeyboards/super16/keyboard.json
@@ -0,0 +1,142 @@
+{
+  "keyboard_name": "super16",
+  "manufacturer": "1upkeyboards",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0x6F75",
+    "pid": "0x5516",
+    "device_version": "0.0.1"
+  },
+  "ws2812": {
+    "pin": "D3"
+  },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 16,
+    "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
+    }
+  },
+  "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"
+  },
+  "features": {
+    "bootmagic": true,
+    "command": false,
+    "console": false,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": false,
+    "rgb_matrix": true
+  },
+  "matrix_pins": {
+    "cols": ["D4", "C6", "F6", "F7"],
+    "rows": ["D1", "D0", "F4", "F5"]
+  },
+  "diode_direction": "COL2ROW",
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "community_layouts": ["ortho_4x4", "numpad_4x4"],
+  "layouts": {
+    "LAYOUT_ortho_4x4": {
+      "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": [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": [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": [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}
+      ]
+    },
+    "LAYOUT_numpad_4x4": {
+      "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, "h": 2},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "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, "h": 2},
+
+        {"matrix": [3, 1], "x": 0, "y": 3, "w": 2},
+        {"matrix": [3, 2], "x": 2, "y": 3}
+      ]
+    }
+  }
+}
diff --git a/keyboards/1upkeyboards/super16/rules.mk b/keyboards/1upkeyboards/super16/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
-RGB_MATRIX_ENABLE = yes
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/1upkeyboards/super16v2/info.json b/keyboards/1upkeyboards/super16v2/info.json
@@ -1,90 +0,0 @@
-{
-    "keyboard_name": "super16v2",
-    "manufacturer": "1upkeyboards",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-      "vid": "0x6F75",
-      "pid": "0x5517",
-      "device_version": "0.0.1"
-    },
-    "ws2812": {
-      "pin": "B5"
-    },
-    "rgb_matrix": {
-        "animmations": {
-            "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,
-            "solid_reactive_simple": true,
-            "solid_reactive": true,
-            "splash": true
-      },
-      "driver": "ws2812",
-      "sleep": true
-    },
-    "matrix_pins": {
-      "cols": ["D5", "D6", "C2", "D0"],
-      "rows": ["D1", "D2", "D3", "D4"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-      "rotary": [
-        {"pin_a": "B1", "pin_b": "B2"},
-        {"pin_a": "B3", "pin_b": "B4"}
-      ]
-    },
-    "processor": "atmega32u2",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-      "LAYOUT_ortho_4x4": {
-        "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": [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": [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": [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}
-        ]
-      }
-    }
-  }
diff --git a/keyboards/1upkeyboards/super16v2/keyboard.json b/keyboards/1upkeyboards/super16v2/keyboard.json
@@ -0,0 +1,100 @@
+{
+    "keyboard_name": "super16v2",
+    "manufacturer": "1upkeyboards",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+      "vid": "0x6F75",
+      "pid": "0x5517",
+      "device_version": "0.0.1"
+    },
+    "ws2812": {
+      "pin": "B5"
+    },
+    "rgb_matrix": {
+        "animmations": {
+            "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,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "splash": true
+      },
+      "driver": "ws2812",
+      "sleep": true
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+      "cols": ["D5", "D6", "C2", "D0"],
+      "rows": ["D1", "D2", "D3", "D4"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+      "rotary": [
+        {"pin_a": "B1", "pin_b": "B2"},
+        {"pin_a": "B3", "pin_b": "B4"}
+      ]
+    },
+    "processor": "atmega32u2",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+      "LAYOUT_ortho_4x4": {
+        "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": [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": [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": [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}
+        ]
+      }
+    }
+  }
diff --git a/keyboards/1upkeyboards/super16v2/rules.mk b/keyboards/1upkeyboards/super16v2/rules.mk
@@ -1,14 +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
-RGB_MATRIX_ENABLE = yes
-ENCODER_ENABLE = yes
-\ No newline at end of file
diff --git a/keyboards/2key2crawl/info.json b/keyboards/2key2crawl/info.json
@@ -1,60 +0,0 @@
-{
-    "keyboard_name": "2Key2Crawl",
-    "manufacturer": "WoodKeys.click",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x6090",
-        "device_version": "0.0.2"
-    },
-    "matrix_pins": {
-        "cols": ["B3", "B4", "B5", "B6", "B7", "C7", "B2"],
-        "rows": ["C4", "C5"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "D0", "pin_b": "D1", "resolution": 1}
-        ]
-    },
-    "rgblight": {
-        "led_count": 3,
-        "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": "C6"
-    },
-    "processor": "atmega32u2",
-    "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": [1, 5], "x": 4, "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, 6], "x": 5.5, "y": 0.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/2key2crawl/keyboard.json b/keyboards/2key2crawl/keyboard.json
@@ -0,0 +1,69 @@
+{
+    "keyboard_name": "2Key2Crawl",
+    "manufacturer": "WoodKeys.click",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x6090",
+        "device_version": "0.0.2"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": true,
+        "encoder": true,
+        "extrakey": false,
+        "mousekey": false,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["B3", "B4", "B5", "B6", "B7", "C7", "B2"],
+        "rows": ["C4", "C5"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D0", "pin_b": "D1", "resolution": 1}
+        ]
+    },
+    "rgblight": {
+        "led_count": 3,
+        "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": "C6"
+    },
+    "processor": "atmega32u2",
+    "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": [1, 5], "x": 4, "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, 6], "x": 5.5, "y": 0.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/2key2crawl/rules.mk b/keyboards/2key2crawl/rules.mk
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no	# Mouse keys
-EXTRAKEY_ENABLE = no	# 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  # [Crawlpad] Custom backlighting code is used, so this should not be enabled
-AUDIO_ENABLE = no # [Crawlpad] This can be enabled if a speaker is connected to the expansion port. Not compatible with RGBLIGHT below
-RGBLIGHT_ENABLE = no # [Crawlpad] This can be enabled if a ws2812 strip is connected to the expansion port.
-ENCODER_ENABLE = yes # [2Key2crawl] Make the knobs turn
diff --git a/keyboards/30wer/info.json b/keyboards/30wer/info.json
@@ -1,64 +0,0 @@
-{
-    "keyboard_name": "30wer",
-    "manufacturer": "8o7wer",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x1234",
-        "pid": "0x5678",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D1", "D0", "D4", "C6", "D7"],
-        "rows": ["E6", "B4", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "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, "w": 1.25},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
-                {"matrix": [1, 1], "x": 1.25, "y": 1},
-                {"matrix": [1, 2], "x": 2.25, "y": 1},
-                {"matrix": [1, 3], "x": 3.25, "y": 1},
-                {"matrix": [1, 4], "x": 4.25, "y": 1},
-                {"matrix": [1, 5], "x": 5.25, "y": 1},
-                {"matrix": [1, 6], "x": 6.25, "y": 1},
-                {"matrix": [1, 7], "x": 7.25, "y": 1},
-                {"matrix": [1, 8], "x": 8.25, "y": 1},
-                {"matrix": [1, 9], "x": 9.25, "y": 1},
-                {"matrix": [1, 10], "x": 10.25, "y": 1},
-                {"matrix": [1, 11], "x": 11.25, "y": 1},
-                {"matrix": [1, 12], "x": 12.25, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [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, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/30wer/keyboard.json b/keyboards/30wer/keyboard.json
@@ -0,0 +1,72 @@
+{
+    "keyboard_name": "30wer",
+    "manufacturer": "8o7wer",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x1234",
+        "pid": "0x5678",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": false,
+        "command": false,
+        "console": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D1", "D0", "D4", "C6", "D7"],
+        "rows": ["E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "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, "w": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1},
+                {"matrix": [1, 12], "x": 12.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [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, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/30wer/rules.mk b/keyboards/30wer/rules.mk
@@ -1,12 +0,0 @@
-# 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 = yes        # 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
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no 		# Enable WS2812 RGB underlight.
diff --git a/keyboards/3keyecosystem/2key2/info.json b/keyboards/3keyecosystem/2key2/info.json
@@ -1,91 +0,0 @@
-{
-    "keyboard_name": "2key2",
-    "manufacturer": "3-Key-Ecosystem",
-    "url": "https://github.com/softplus/3keyecosystem/tree/main/2key2",
-    "maintainer": "softplus",
-    "usb": {
-        "vid": "0x1209",
-        "pid": "0x3304",
-        "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_fractal": true,
-            "pixel_rain": 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
-        },
-        "default": {
-            "animation": "solid_reactive",
-            "hue": 90,
-            "speed": 20,
-            "val": 128
-        },
-        "driver": "ws2812",
-        "layout": [
-            {"matrix": [0, 0], "x": 0, "y": 32, "flags": 255},
-            {"matrix": [0, 1], "x": 224, "y": 32, "flags": 255}
-        ],
-        "sleep": true
-    },
-
-    "matrix_pins": {
-        "cols": ["F4", "D7"],
-        "rows": ["F6"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "B7"
-    },
-    "ws2812": {
-        "pin": "B2"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0}
-            ]
-        }
-    }
-}
diff --git a/keyboards/3keyecosystem/2key2/keyboard.json b/keyboards/3keyecosystem/2key2/keyboard.json
@@ -0,0 +1,100 @@
+{
+    "keyboard_name": "2key2",
+    "manufacturer": "3-Key-Ecosystem",
+    "url": "https://github.com/softplus/3keyecosystem/tree/main/2key2",
+    "maintainer": "softplus",
+    "usb": {
+        "vid": "0x1209",
+        "pid": "0x3304",
+        "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_fractal": true,
+            "pixel_rain": 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
+        },
+        "default": {
+            "animation": "solid_reactive",
+            "hue": 90,
+            "speed": 20,
+            "val": 128
+        },
+        "driver": "ws2812",
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 32, "flags": 255},
+            {"matrix": [0, 1], "x": 224, "y": 32, "flags": 255}
+        ],
+        "sleep": true
+    },
+
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["F4", "D7"],
+        "rows": ["F6"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "B7"
+    },
+    "ws2812": {
+        "pin": "B2"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0}
+            ]
+        }
+    }
+}
diff --git a/keyboards/3keyecosystem/2key2/rules.mk b/keyboards/3keyecosystem/2key2/rules.mk
@@ -1,13 +0,0 @@
-# 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 = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-RGB_MATRIX_ENABLE = yes		# Enable RGB matrix
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/40percentclub/4pack/info.json b/keyboards/40percentclub/4pack/info.json
@@ -1,32 +0,0 @@
-{
-    "keyboard_name": "4pack",
-    "manufacturer": "40percentclub",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x4025",
-        "pid": "0x0000",
-        "device_version": "0.0.1"
-    },
-    "backlight": {
-        "driver": "timer",
-        "pins": ["F6", "F7"]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "matrix_pins": {
-        "direct": [
-            ["E6", "D7", "C6", "D4"]
-        ]
-    },
-    "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]}
-            ]
-        }
-    }
-}
diff --git a/keyboards/40percentclub/4pack/keyboard.json b/keyboards/40percentclub/4pack/keyboard.json
@@ -0,0 +1,41 @@
+{
+    "keyboard_name": "4pack",
+    "manufacturer": "40percentclub",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4025",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
+    "backlight": {
+        "driver": "timer",
+        "pins": ["F6", "F7"]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "backlight": true,
+        "bootmagic": false,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "direct": [
+            ["E6", "D7", "C6", "D4"]
+        ]
+    },
+    "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]}
+            ]
+        }
+    }
+}
diff --git a/keyboards/40percentclub/4pack/rules.mk b/keyboards/40percentclub/4pack/rules.mk
@@ -1,12 +0,0 @@
-# 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 = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/40percentclub/5x5/info.json b/keyboards/40percentclub/5x5/info.json
@@ -1,195 +0,0 @@
-{
-    "keyboard_name": "The 5x5 Keyboard",
-    "manufacturer": "di0ib",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x4025",
-        "pid": "0x05B5",
-        "device_version": "1.0.0"
-    },
-    "matrix_pins": {
-        "cols": ["D7", "E6", "B4", "B5", "B6", "B7", "D6", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B1"],
-        "rows": ["B2", "D1", "D0", "D4", "C6"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "community_layouts": ["ortho_5x5", "ortho_5x10", "ortho_5x15"],
-    "layouts": {
-        "LAYOUT_ortho_5x5": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-
-                {"matrix": [1, 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": [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": [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": [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}
-            ]
-        },
-        "LAYOUT_ortho_5x10": {
-            "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": [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": [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": [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": [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}
-            ]
-        },
-        "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/40percentclub/5x5/keyboard.json b/keyboards/40percentclub/5x5/keyboard.json
@@ -0,0 +1,203 @@
+{
+    "keyboard_name": "The 5x5 Keyboard",
+    "manufacturer": "di0ib",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4025",
+        "pid": "0x05B5",
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "bootmagic": false,
+        "command": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["D7", "E6", "B4", "B5", "B6", "B7", "D6", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B1"],
+        "rows": ["B2", "D1", "D0", "D4", "C6"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "community_layouts": ["ortho_5x5", "ortho_5x10", "ortho_5x15"],
+    "layouts": {
+        "LAYOUT_ortho_5x5": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+
+                {"matrix": [1, 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": [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": [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": [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}
+            ]
+        },
+        "LAYOUT_ortho_5x10": {
+            "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": [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": [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": [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": [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}
+            ]
+        },
+        "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/40percentclub/5x5/rules.mk b/keyboards/40percentclub/5x5/rules.mk
@@ -1,11 +0,0 @@
-# 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 RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/40percentclub/luddite/info.json b/keyboards/40percentclub/luddite/info.json
@@ -1,112 +0,0 @@
-{
-  "keyboard_name": "Luddite",
-  "manufacturer": "di0ib",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0x4025",
-    "pid": "0x4C55",
-    "device_version": "10.0.1"
-  },
-  "matrix_pins": {
-    "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
-    "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6"]
-  },
-  "diode_direction": "COL2ROW",
-  "backlight": {
-    "pin": "B5",
-    "levels": 4
-  },
-  "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": "B4"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "community_layouts": ["60_ansi"],
-  "layouts": {
-    "LAYOUT_60_ansi": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [1, 0], "x": 8, "y": 0},
-        {"matrix": [1, 1], "x": 9, "y": 0},
-        {"matrix": [1, 2], "x": 10, "y": 0},
-        {"matrix": [1, 3], "x": 11, "y": 0},
-        {"matrix": [1, 4], "x": 12, "y": 0},
-        {"matrix": [1, 5], "x": 13, "y": 0, "w": 2},
-
-        {"matrix": [1, 6], "x": 0, "y": 1, "w": 1.5},
-        {"matrix": [1, 7], "x": 1.5, "y": 1},
-        {"matrix": [2, 0], "x": 2.5, "y": 1},
-        {"matrix": [2, 1], "x": 3.5, "y": 1},
-        {"matrix": [2, 2], "x": 4.5, "y": 1},
-        {"matrix": [2, 3], "x": 5.5, "y": 1},
-        {"matrix": [2, 4], "x": 6.5, "y": 1},
-        {"matrix": [2, 5], "x": 7.5, "y": 1},
-        {"matrix": [2, 6], "x": 8.5, "y": 1},
-        {"matrix": [2, 7], "x": 9.5, "y": 1},
-        {"matrix": [3, 0], "x": 10.5, "y": 1},
-        {"matrix": [3, 1], "x": 11.5, "y": 1},
-        {"matrix": [3, 2], "x": 12.5, "y": 1},
-        {"matrix": [3, 3], "x": 13.5, "y": 1, "w": 1.5},
-
-        {"matrix": [3, 4], "x": 0, "y": 2, "w": 1.75},
-        {"matrix": [3, 5], "x": 1.75, "y": 2},
-        {"matrix": [3, 6], "x": 2.75, "y": 2},
-        {"matrix": [3, 7], "x": 3.75, "y": 2},
-        {"matrix": [4, 0], "x": 4.75, "y": 2},
-        {"matrix": [4, 1], "x": 5.75, "y": 2},
-        {"matrix": [4, 2], "x": 6.75, "y": 2},
-        {"matrix": [4, 3], "x": 7.75, "y": 2},
-        {"matrix": [4, 4], "x": 8.75, "y": 2},
-        {"matrix": [4, 5], "x": 9.75, "y": 2},
-        {"matrix": [4, 6], "x": 10.75, "y": 2},
-        {"matrix": [4, 7], "x": 11.75, "y": 2},
-        {"matrix": [5, 0], "x": 12.75, "y": 2, "w": 2.25},
-
-        {"matrix": [5, 1], "x": 0, "y": 3, "w": 2.25},
-        {"matrix": [5, 2], "x": 2.25, "y": 3},
-        {"matrix": [5, 3], "x": 3.25, "y": 3},
-        {"matrix": [5, 4], "x": 4.25, "y": 3},
-        {"matrix": [5, 5], "x": 5.25, "y": 3},
-        {"matrix": [5, 6], "x": 6.25, "y": 3},
-        {"matrix": [5, 7], "x": 7.25, "y": 3},
-        {"matrix": [6, 0], "x": 8.25, "y": 3},
-        {"matrix": [6, 1], "x": 9.25, "y": 3},
-        {"matrix": [6, 2], "x": 10.25, "y": 3},
-        {"matrix": [6, 3], "x": 11.25, "y": 3},
-        {"matrix": [6, 4], "x": 12.25, "y": 3, "w": 2.75},
-
-        {"matrix": [6, 5], "x": 0, "y": 4, "w": 1.25},
-        {"matrix": [6, 6], "x": 1.25, "y": 4, "w": 1.25},
-        {"matrix": [6, 7], "x": 2.5, "y": 4, "w": 1.25},
-        {"matrix": [7, 0], "x": 3.75, "y": 4, "w": 6.25},
-        {"matrix": [7, 1], "x": 10, "y": 4, "w": 1.25},
-        {"matrix": [7, 2], "x": 11.25, "y": 4, "w": 1.25},
-        {"matrix": [7, 3], "x": 12.5, "y": 4, "w": 1.25},
-        {"matrix": [7, 4], "x": 13.75, "y": 4, "w": 1.25}
-      ]
-    }
-  }
-}
diff --git a/keyboards/40percentclub/luddite/keyboard.json b/keyboards/40percentclub/luddite/keyboard.json
@@ -0,0 +1,122 @@
+{
+  "keyboard_name": "Luddite",
+  "manufacturer": "di0ib",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0x4025",
+    "pid": "0x4C55",
+    "device_version": "10.0.1"
+  },
+  "features": {
+    "backlight": true,
+    "bootmagic": true,
+    "command": false,
+    "console": false,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": true,
+    "rgblight": true
+  },
+  "matrix_pins": {
+    "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+    "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6"]
+  },
+  "diode_direction": "COL2ROW",
+  "backlight": {
+    "pin": "B5",
+    "levels": 4
+  },
+  "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": "B4"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "community_layouts": ["60_ansi"],
+  "layouts": {
+    "LAYOUT_60_ansi": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [1, 0], "x": 8, "y": 0},
+        {"matrix": [1, 1], "x": 9, "y": 0},
+        {"matrix": [1, 2], "x": 10, "y": 0},
+        {"matrix": [1, 3], "x": 11, "y": 0},
+        {"matrix": [1, 4], "x": 12, "y": 0},
+        {"matrix": [1, 5], "x": 13, "y": 0, "w": 2},
+
+        {"matrix": [1, 6], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 7], "x": 1.5, "y": 1},
+        {"matrix": [2, 0], "x": 2.5, "y": 1},
+        {"matrix": [2, 1], "x": 3.5, "y": 1},
+        {"matrix": [2, 2], "x": 4.5, "y": 1},
+        {"matrix": [2, 3], "x": 5.5, "y": 1},
+        {"matrix": [2, 4], "x": 6.5, "y": 1},
+        {"matrix": [2, 5], "x": 7.5, "y": 1},
+        {"matrix": [2, 6], "x": 8.5, "y": 1},
+        {"matrix": [2, 7], "x": 9.5, "y": 1},
+        {"matrix": [3, 0], "x": 10.5, "y": 1},
+        {"matrix": [3, 1], "x": 11.5, "y": 1},
+        {"matrix": [3, 2], "x": 12.5, "y": 1},
+        {"matrix": [3, 3], "x": 13.5, "y": 1, "w": 1.5},
+
+        {"matrix": [3, 4], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [3, 5], "x": 1.75, "y": 2},
+        {"matrix": [3, 6], "x": 2.75, "y": 2},
+        {"matrix": [3, 7], "x": 3.75, "y": 2},
+        {"matrix": [4, 0], "x": 4.75, "y": 2},
+        {"matrix": [4, 1], "x": 5.75, "y": 2},
+        {"matrix": [4, 2], "x": 6.75, "y": 2},
+        {"matrix": [4, 3], "x": 7.75, "y": 2},
+        {"matrix": [4, 4], "x": 8.75, "y": 2},
+        {"matrix": [4, 5], "x": 9.75, "y": 2},
+        {"matrix": [4, 6], "x": 10.75, "y": 2},
+        {"matrix": [4, 7], "x": 11.75, "y": 2},
+        {"matrix": [5, 0], "x": 12.75, "y": 2, "w": 2.25},
+
+        {"matrix": [5, 1], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [5, 2], "x": 2.25, "y": 3},
+        {"matrix": [5, 3], "x": 3.25, "y": 3},
+        {"matrix": [5, 4], "x": 4.25, "y": 3},
+        {"matrix": [5, 5], "x": 5.25, "y": 3},
+        {"matrix": [5, 6], "x": 6.25, "y": 3},
+        {"matrix": [5, 7], "x": 7.25, "y": 3},
+        {"matrix": [6, 0], "x": 8.25, "y": 3},
+        {"matrix": [6, 1], "x": 9.25, "y": 3},
+        {"matrix": [6, 2], "x": 10.25, "y": 3},
+        {"matrix": [6, 3], "x": 11.25, "y": 3},
+        {"matrix": [6, 4], "x": 12.25, "y": 3, "w": 2.75},
+
+        {"matrix": [6, 5], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [6, 6], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [6, 7], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [7, 0], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [7, 1], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [7, 2], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [7, 3], "x": 12.5, "y": 4, "w": 1.25},
+        {"matrix": [7, 4], "x": 13.75, "y": 4, "w": 1.25}
+      ]
+    }
+  }
+}
diff --git a/keyboards/40percentclub/luddite/rules.mk b/keyboards/40percentclub/luddite/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 = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
-AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/40percentclub/mf68/info.json b/keyboards/40percentclub/mf68/info.json
@@ -1,105 +0,0 @@
-{
-  "keyboard_name": "MF68",
-  "manufacturer": "di0ib",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0x4025",
-    "pid": "0x4D68",
-    "device_version": "1.0.1"
-  },
-  "matrix_pins": {
-    "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4"],
-    "rows": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"]
-  },
-  "diode_direction": "COL2ROW",
-  "backlight": {
-    "pin": "B5",
-    "breathing": true
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "community_layouts": ["68_ansi"],
-  "layouts": {
-      "LAYOUT_68_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": [1, 0], "x": 9, "y": 0},
-            {"matrix": [1, 1], "x": 10, "y": 0},
-            {"matrix": [1, 2], "x": 11, "y": 0},
-            {"matrix": [1, 3], "x": 12, "y": 0},
-            {"matrix": [1, 4], "x": 13, "y": 0, "w": 2},
-
-            {"matrix": [1, 5], "x": 15.25, "y": 0},
-            {"matrix": [1, 6], "x": 16.25, "y": 0},
-
-            {"matrix": [1, 7], "x": 0, "y": 1, "w": 1.5},
-            {"matrix": [1, 8], "x": 1.5, "y": 1},
-            {"matrix": [2, 0], "x": 2.5, "y": 1},
-            {"matrix": [2, 1], "x": 3.5, "y": 1},
-            {"matrix": [2, 2], "x": 4.5, "y": 1},
-            {"matrix": [2, 3], "x": 5.5, "y": 1},
-            {"matrix": [2, 4], "x": 6.5, "y": 1},
-            {"matrix": [2, 5], "x": 7.5, "y": 1},
-            {"matrix": [2, 6], "x": 8.5, "y": 1},
-            {"matrix": [2, 7], "x": 9.5, "y": 1},
-            {"matrix": [2, 8], "x": 10.5, "y": 1},
-            {"matrix": [3, 0], "x": 11.5, "y": 1},
-            {"matrix": [3, 1], "x": 12.5, "y": 1},
-            {"matrix": [3, 2], "x": 13.5, "y": 1, "w": 1.5},
-
-            {"matrix": [3, 3], "x": 15.25, "y": 1},
-            {"matrix": [3, 4], "x": 16.25, "y": 1},
-
-            {"matrix": [3, 5], "x": 0, "y": 2, "w": 1.75},
-            {"matrix": [3, 6], "x": 1.75, "y": 2},
-            {"matrix": [3, 7], "x": 2.75, "y": 2},
-            {"matrix": [3, 8], "x": 3.75, "y": 2},
-            {"matrix": [4, 0], "x": 4.75, "y": 2},
-            {"matrix": [4, 1], "x": 5.75, "y": 2},
-            {"matrix": [4, 2], "x": 6.75, "y": 2},
-            {"matrix": [4, 3], "x": 7.75, "y": 2},
-            {"matrix": [4, 4], "x": 8.75, "y": 2},
-            {"matrix": [4, 5], "x": 9.75, "y": 2},
-            {"matrix": [4, 6], "x": 10.75, "y": 2},
-            {"matrix": [4, 7], "x": 11.75, "y": 2},
-            {"matrix": [4, 8], "x": 12.75, "y": 2, "w": 2.25},
-
-            {"matrix": [5, 0], "x": 0, "y": 3, "w": 2.25},
-            {"matrix": [5, 1], "x": 2.25, "y": 3},
-            {"matrix": [5, 2], "x": 3.25, "y": 3},
-            {"matrix": [5, 3], "x": 4.25, "y": 3},
-            {"matrix": [5, 4], "x": 5.25, "y": 3},
-            {"matrix": [5, 5], "x": 6.25, "y": 3},
-            {"matrix": [5, 6], "x": 7.25, "y": 3},
-            {"matrix": [5, 7], "x": 8.25, "y": 3},
-            {"matrix": [5, 8], "x": 9.25, "y": 3},
-            {"matrix": [6, 0], "x": 10.25, "y": 3},
-            {"matrix": [6, 1], "x": 11.25, "y": 3},
-            {"matrix": [6, 2], "x": 12.25, "y": 3, "w": 2.75},
-
-            {"matrix": [6, 3], "x": 15.25, "y": 3},
-
-            {"matrix": [6, 4], "x": 0, "y": 4, "w": 1.25},
-            {"matrix": [6, 5], "x": 1.25, "y": 4, "w": 1.25},
-            {"matrix": [6, 6], "x": 2.5, "y": 4, "w": 1.25},
-            {"matrix": [6, 7], "x": 3.75, "y": 4, "w": 6.25},
-            {"matrix": [6, 8], "x": 10, "y": 4, "w": 1.25},
-            {"matrix": [7, 0], "x": 11.25, "y": 4, "w": 1.25},
-            {"matrix": [7, 1], "x": 12.5, "y": 4, "w": 1.25},
-
-            {"matrix": [7, 2], "x": 14.25, "y": 4},
-            {"matrix": [7, 3], "x": 15.25, "y": 4},
-            {"matrix": [7, 4], "x": 16.25, "y": 4}
-          ]
-      }
-  }
-}
diff --git a/keyboards/40percentclub/mf68/keyboard.json b/keyboards/40percentclub/mf68/keyboard.json
@@ -0,0 +1,114 @@
+{
+  "keyboard_name": "MF68",
+  "manufacturer": "di0ib",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0x4025",
+    "pid": "0x4D68",
+    "device_version": "1.0.1"
+  },
+  "features": {
+    "backlight": true,
+    "bootmagic": true,
+    "command": false,
+    "console": false,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": true
+  },
+  "matrix_pins": {
+    "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4"],
+    "rows": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"]
+  },
+  "diode_direction": "COL2ROW",
+  "backlight": {
+    "pin": "B5",
+    "breathing": true
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "community_layouts": ["68_ansi"],
+  "layouts": {
+      "LAYOUT_68_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": [1, 0], "x": 9, "y": 0},
+            {"matrix": [1, 1], "x": 10, "y": 0},
+            {"matrix": [1, 2], "x": 11, "y": 0},
+            {"matrix": [1, 3], "x": 12, "y": 0},
+            {"matrix": [1, 4], "x": 13, "y": 0, "w": 2},
+
+            {"matrix": [1, 5], "x": 15.25, "y": 0},
+            {"matrix": [1, 6], "x": 16.25, "y": 0},
+
+            {"matrix": [1, 7], "x": 0, "y": 1, "w": 1.5},
+            {"matrix": [1, 8], "x": 1.5, "y": 1},
+            {"matrix": [2, 0], "x": 2.5, "y": 1},
+            {"matrix": [2, 1], "x": 3.5, "y": 1},
+            {"matrix": [2, 2], "x": 4.5, "y": 1},
+            {"matrix": [2, 3], "x": 5.5, "y": 1},
+            {"matrix": [2, 4], "x": 6.5, "y": 1},
+            {"matrix": [2, 5], "x": 7.5, "y": 1},
+            {"matrix": [2, 6], "x": 8.5, "y": 1},
+            {"matrix": [2, 7], "x": 9.5, "y": 1},
+            {"matrix": [2, 8], "x": 10.5, "y": 1},
+            {"matrix": [3, 0], "x": 11.5, "y": 1},
+            {"matrix": [3, 1], "x": 12.5, "y": 1},
+            {"matrix": [3, 2], "x": 13.5, "y": 1, "w": 1.5},
+
+            {"matrix": [3, 3], "x": 15.25, "y": 1},
+            {"matrix": [3, 4], "x": 16.25, "y": 1},
+
+            {"matrix": [3, 5], "x": 0, "y": 2, "w": 1.75},
+            {"matrix": [3, 6], "x": 1.75, "y": 2},
+            {"matrix": [3, 7], "x": 2.75, "y": 2},
+            {"matrix": [3, 8], "x": 3.75, "y": 2},
+            {"matrix": [4, 0], "x": 4.75, "y": 2},
+            {"matrix": [4, 1], "x": 5.75, "y": 2},
+            {"matrix": [4, 2], "x": 6.75, "y": 2},
+            {"matrix": [4, 3], "x": 7.75, "y": 2},
+            {"matrix": [4, 4], "x": 8.75, "y": 2},
+            {"matrix": [4, 5], "x": 9.75, "y": 2},
+            {"matrix": [4, 6], "x": 10.75, "y": 2},
+            {"matrix": [4, 7], "x": 11.75, "y": 2},
+            {"matrix": [4, 8], "x": 12.75, "y": 2, "w": 2.25},
+
+            {"matrix": [5, 0], "x": 0, "y": 3, "w": 2.25},
+            {"matrix": [5, 1], "x": 2.25, "y": 3},
+            {"matrix": [5, 2], "x": 3.25, "y": 3},
+            {"matrix": [5, 3], "x": 4.25, "y": 3},
+            {"matrix": [5, 4], "x": 5.25, "y": 3},
+            {"matrix": [5, 5], "x": 6.25, "y": 3},
+            {"matrix": [5, 6], "x": 7.25, "y": 3},
+            {"matrix": [5, 7], "x": 8.25, "y": 3},
+            {"matrix": [5, 8], "x": 9.25, "y": 3},
+            {"matrix": [6, 0], "x": 10.25, "y": 3},
+            {"matrix": [6, 1], "x": 11.25, "y": 3},
+            {"matrix": [6, 2], "x": 12.25, "y": 3, "w": 2.75},
+
+            {"matrix": [6, 3], "x": 15.25, "y": 3},
+
+            {"matrix": [6, 4], "x": 0, "y": 4, "w": 1.25},
+            {"matrix": [6, 5], "x": 1.25, "y": 4, "w": 1.25},
+            {"matrix": [6, 6], "x": 2.5, "y": 4, "w": 1.25},
+            {"matrix": [6, 7], "x": 3.75, "y": 4, "w": 6.25},
+            {"matrix": [6, 8], "x": 10, "y": 4, "w": 1.25},
+            {"matrix": [7, 0], "x": 11.25, "y": 4, "w": 1.25},
+            {"matrix": [7, 1], "x": 12.5, "y": 4, "w": 1.25},
+
+            {"matrix": [7, 2], "x": 14.25, "y": 4},
+            {"matrix": [7, 3], "x": 15.25, "y": 4},
+            {"matrix": [7, 4], "x": 16.25, "y": 4}
+          ]
+      }
+  }
+}
diff --git a/keyboards/40percentclub/mf68/rules.mk b/keyboards/40percentclub/mf68/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 = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/40percentclub/nano/info.json b/keyboards/40percentclub/nano/info.json
@@ -1,54 +0,0 @@
-{
-  "keyboard_name": "Nano",
-  "manufacturer": "di0ib",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0x4025",
-    "pid": "0x0007",
-    "device_version": "0.0.1"
-  },
-  "rgblight": {
-    "led_count": 6,
-    "animations": {
-      "breathing": true,
-      "rainbow_mood": true,
-      "rainbow_swirl": true,
-      "snake": true,
-      "knight": true,
-      "christmas": true,
-      "static_gradient": true,
-      "rgb_test": true,
-      "alternating": true,
-      "twinkle": true
-    }
-  },
-  "ws2812": {
-    "pin": "D3"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "matrix_pins": {
-    "direct": [
-      ["F4", "F5", "F6", "F7"],
-      ["D1", "D0", "D4", "C6"]
-    ]
-  },
-  "layout_aliases": {
-    "LAYOUT": "LAYOUT_ortho_2x4"
-  },
-  "layouts": {
-    "LAYOUT_ortho_2x4": {
-      "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": [1, 0]},
-        {"x": 1, "y": 1, "matrix": [1, 1]},
-        {"x": 2, "y": 1, "matrix": [1, 2]},
-        {"x": 3, "y": 1, "matrix": [1, 3]}
-      ]
-    }
-  }
-}
diff --git a/keyboards/40percentclub/nano/keyboard.json b/keyboards/40percentclub/nano/keyboard.json
@@ -0,0 +1,64 @@
+{
+  "keyboard_name": "Nano",
+  "manufacturer": "di0ib",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0x4025",
+    "pid": "0x0007",
+    "device_version": "0.0.1"
+  },
+  "rgblight": {
+    "led_count": 6,
+    "animations": {
+      "breathing": true,
+      "rainbow_mood": true,
+      "rainbow_swirl": true,
+      "snake": true,
+      "knight": true,
+      "christmas": true,
+      "static_gradient": true,
+      "rgb_test": true,
+      "alternating": true,
+      "twinkle": true
+    }
+  },
+  "ws2812": {
+    "pin": "D3"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "features": {
+    "bootmagic": false,
+    "command": false,
+    "console": false,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": true,
+    "rgblight": true,
+    "unicode": true
+  },
+  "matrix_pins": {
+    "direct": [
+      ["F4", "F5", "F6", "F7"],
+      ["D1", "D0", "D4", "C6"]
+    ]
+  },
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_ortho_2x4"
+  },
+  "layouts": {
+    "LAYOUT_ortho_2x4": {
+      "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": [1, 0]},
+        {"x": 1, "y": 1, "matrix": [1, 1]},
+        {"x": 2, "y": 1, "matrix": [1, 2]},
+        {"x": 3, "y": 1, "matrix": [1, 3]}
+      ]
+    }
+  }
+}
diff --git a/keyboards/40percentclub/nano/rules.mk b/keyboards/40percentclub/nano/rules.mk
@@ -1,13 +0,0 @@
-# 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
-AUDIO_ENABLE = no           # Audio output
-UNICODE_ENABLE = yes        # Unicode
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
diff --git a/keyboards/40percentclub/nein/info.json b/keyboards/40percentclub/nein/info.json
@@ -1,35 +0,0 @@
-{
-  "keyboard_name": "The nein Keyboard",
-  "manufacturer": "di0ib",
-  "url": "http://www.40percent.club/2019/04/nein.html",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0x4025",
-    "pid": "0x9999",
-    "device_version": "99.9.9"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "matrix_pins": {
-    "direct": [
-      ["F4", "F5", "F6"],
-      ["F7", "B1", "B3"],
-      ["B2", "B6", "B5"]
-    ]
-  },
-  "layouts": {
-    "LAYOUT_ortho_3x3": {
-      "layout": [
-        {"x": 0, "y": 0, "matrix": [0, 0]},
-        {"x": 1, "y": 0, "matrix": [0, 1]},
-        {"x": 2, "y": 0, "matrix": [0, 2]},
-        {"x": 0, "y": 1, "matrix": [1, 0]},
-        {"x": 1, "y": 1, "matrix": [1, 1]},
-        {"x": 2, "y": 1, "matrix": [1, 2]},
-        {"x": 0, "y": 2, "matrix": [2, 0]},
-        {"x": 1, "y": 2, "matrix": [2, 1]},
-        {"x": 2, "y": 2, "matrix": [2, 2]}
-      ]
-    }
-  }
-}
diff --git a/keyboards/40percentclub/nein/keyboard.json b/keyboards/40percentclub/nein/keyboard.json
@@ -0,0 +1,43 @@
+{
+  "keyboard_name": "The nein Keyboard",
+  "manufacturer": "di0ib",
+  "url": "http://www.40percent.club/2019/04/nein.html",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0x4025",
+    "pid": "0x9999",
+    "device_version": "99.9.9"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "features": {
+    "bootmagic": true,
+    "command": false,
+    "console": false,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": true
+  },
+  "matrix_pins": {
+    "direct": [
+      ["F4", "F5", "F6"],
+      ["F7", "B1", "B3"],
+      ["B2", "B6", "B5"]
+    ]
+  },
+  "layouts": {
+    "LAYOUT_ortho_3x3": {
+      "layout": [
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+        {"x": 1, "y": 0, "matrix": [0, 1]},
+        {"x": 2, "y": 0, "matrix": [0, 2]},
+        {"x": 0, "y": 1, "matrix": [1, 0]},
+        {"x": 1, "y": 1, "matrix": [1, 1]},
+        {"x": 2, "y": 1, "matrix": [1, 2]},
+        {"x": 0, "y": 2, "matrix": [2, 0]},
+        {"x": 1, "y": 2, "matrix": [2, 1]},
+        {"x": 2, "y": 2, "matrix": [2, 2]}
+      ]
+    }
+  }
+}
diff --git a/keyboards/40percentclub/nein/rules.mk b/keyboards/40percentclub/nein/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 = 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/40percentclub/sixpack/info.json b/keyboards/40percentclub/sixpack/info.json
@@ -1,43 +0,0 @@
-{
-    "keyboard_name": "Six Pack",
-    "manufacturer": "di0ib",
-    "url": "https://www.40percent.club/2017/05/six-pack-11.html",
-    "maintainer": "qmk",
-    "usb": {
-      "vid": "0x4025",
-      "pid": "0x5350",
-      "device_version": "10.0.1"
-    },
-    "backlight": {
-      "driver": "timer",
-      "pins": ["F4", "F5"],
-      "levels": 6,
-      "breathing": true
-    },
-    "indicators": {
-      "caps_lock": "B0",
-      "num_lock": "D5",
-      "on_state": 0
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "matrix_pins": {
-      "direct": [
-        ["D4", "C6", "D7"],
-        ["E6", "B4", "B5"]
-      ]
-    },
-    "community_layouts": ["ortho_2x3"],
-    "layouts": {
-        "LAYOUT_ortho_2x3": {
-          "layout": [
-                {"x": 0, "y": 0, "matrix": [0, 0]},
-                {"x": 1, "y": 0, "matrix": [0, 1]},
-                {"x": 2, "y": 0, "matrix": [0, 2]},
-                {"x": 0, "y": 1, "matrix": [1, 0]},
-                {"x": 1, "y": 1, "matrix": [1, 1]},
-                {"x": 2, "y": 1, "matrix": [1, 2]}
-          ]
-        }
-    }
-}
diff --git a/keyboards/40percentclub/sixpack/keyboard.json b/keyboards/40percentclub/sixpack/keyboard.json
@@ -0,0 +1,52 @@
+{
+    "keyboard_name": "Six Pack",
+    "manufacturer": "di0ib",
+    "url": "https://www.40percent.club/2017/05/six-pack-11.html",
+    "maintainer": "qmk",
+    "usb": {
+      "vid": "0x4025",
+      "pid": "0x5350",
+      "device_version": "10.0.1"
+    },
+    "backlight": {
+      "driver": "timer",
+      "pins": ["F4", "F5"],
+      "levels": 6,
+      "breathing": true
+    },
+    "indicators": {
+      "caps_lock": "B0",
+      "num_lock": "D5",
+      "on_state": 0
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+      "direct": [
+        ["D4", "C6", "D7"],
+        ["E6", "B4", "B5"]
+      ]
+    },
+    "community_layouts": ["ortho_2x3"],
+    "layouts": {
+        "LAYOUT_ortho_2x3": {
+          "layout": [
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]}
+          ]
+        }
+    }
+}
diff --git a/keyboards/40percentclub/sixpack/rules.mk b/keyboards/40percentclub/sixpack/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 = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/40percentclub/tomato/info.json b/keyboards/40percentclub/tomato/info.json
@@ -1,77 +0,0 @@
-{
-  "keyboard_name": "Tomato",
-  "manufacturer": "40 Percent Club",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0x4025",
-    "pid": "0x546F",
-    "device_version": "0.0.1"
-  },
-  "rgblight": {
-    "saturation_steps": 8,
-    "brightness_steps": 8,
-    "led_count": 30,
-    "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": "B5"
-  },
-  "matrix_pins": {
-    "cols": ["B4", "E6", "D7", "C6", "D4", "D0"],
-    "rows": ["F7", "B1", "B3", "B2", "B6"]
-  },
-  "diode_direction": "COL2ROW",
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "community_layouts": ["ortho_3x10"],
-  "layouts": {
-    "LAYOUT_ortho_3x10": {
-      "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": [1, 0], "x": 6, "y": 0},
-        {"matrix": [1, 1], "x": 7, "y": 0},
-        {"matrix": [1, 2], "x": 8, "y": 0},
-        {"matrix": [1, 3], "x": 9, "y": 0},
-
-        {"matrix": [1, 4], "x": 0, "y": 1},
-        {"matrix": [1, 5], "x": 1, "y": 1},
-        {"matrix": [2, 0], "x": 2, "y": 1},
-        {"matrix": [2, 1], "x": 3, "y": 1},
-        {"matrix": [2, 2], "x": 4, "y": 1},
-        {"matrix": [2, 3], "x": 5, "y": 1},
-        {"matrix": [2, 4], "x": 6, "y": 1},
-        {"matrix": [2, 5], "x": 7, "y": 1},
-        {"matrix": [3, 0], "x": 8, "y": 1},
-        {"matrix": [3, 1], "x": 9, "y": 1},
-
-        {"matrix": [3, 2], "x": 0, "y": 2},
-        {"matrix": [3, 3], "x": 1, "y": 2},
-        {"matrix": [3, 4], "x": 2, "y": 2},
-        {"matrix": [3, 5], "x": 3, "y": 2},
-        {"matrix": [4, 0], "x": 4, "y": 2},
-        {"matrix": [4, 1], "x": 5, "y": 2},
-        {"matrix": [4, 2], "x": 6, "y": 2},
-        {"matrix": [4, 3], "x": 7, "y": 2},
-        {"matrix": [4, 4], "x": 8, "y": 2},
-        {"matrix": [4, 5], "x": 9, "y": 2}
-      ]
-    }
-  }
-}
diff --git a/keyboards/40percentclub/tomato/keyboard.json b/keyboards/40percentclub/tomato/keyboard.json
@@ -0,0 +1,86 @@
+{
+  "keyboard_name": "Tomato",
+  "manufacturer": "40 Percent Club",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0x4025",
+    "pid": "0x546F",
+    "device_version": "0.0.1"
+  },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 30,
+    "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": "B5"
+  },
+  "features": {
+    "bootmagic": true,
+    "command": false,
+    "console": false,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": true,
+    "rgblight": true
+  },
+  "matrix_pins": {
+    "cols": ["B4", "E6", "D7", "C6", "D4", "D0"],
+    "rows": ["F7", "B1", "B3", "B2", "B6"]
+  },
+  "diode_direction": "COL2ROW",
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "community_layouts": ["ortho_3x10"],
+  "layouts": {
+    "LAYOUT_ortho_3x10": {
+      "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": [1, 0], "x": 6, "y": 0},
+        {"matrix": [1, 1], "x": 7, "y": 0},
+        {"matrix": [1, 2], "x": 8, "y": 0},
+        {"matrix": [1, 3], "x": 9, "y": 0},
+
+        {"matrix": [1, 4], "x": 0, "y": 1},
+        {"matrix": [1, 5], "x": 1, "y": 1},
+        {"matrix": [2, 0], "x": 2, "y": 1},
+        {"matrix": [2, 1], "x": 3, "y": 1},
+        {"matrix": [2, 2], "x": 4, "y": 1},
+        {"matrix": [2, 3], "x": 5, "y": 1},
+        {"matrix": [2, 4], "x": 6, "y": 1},
+        {"matrix": [2, 5], "x": 7, "y": 1},
+        {"matrix": [3, 0], "x": 8, "y": 1},
+        {"matrix": [3, 1], "x": 9, "y": 1},
+
+        {"matrix": [3, 2], "x": 0, "y": 2},
+        {"matrix": [3, 3], "x": 1, "y": 2},
+        {"matrix": [3, 4], "x": 2, "y": 2},
+        {"matrix": [3, 5], "x": 3, "y": 2},
+        {"matrix": [4, 0], "x": 4, "y": 2},
+        {"matrix": [4, 1], "x": 5, "y": 2},
+        {"matrix": [4, 2], "x": 6, "y": 2},
+        {"matrix": [4, 3], "x": 7, "y": 2},
+        {"matrix": [4, 4], "x": 8, "y": 2},
+        {"matrix": [4, 5], "x": 9, "y": 2}
+      ]
+    }
+  }
+}
diff --git a/keyboards/40percentclub/tomato/rules.mk b/keyboards/40percentclub/tomato/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 = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no   # Enable keyboard backlight functionality
-AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/45_ats/info.json b/keyboards/45_ats/info.json
@@ -1,208 +0,0 @@
-{
-    "keyboard_name": "45ATS",
-    "manufacturer": "Abec13",
-    "url": "",
-    "maintainer": "The-Royal",
-    "usb": {
-      "vid": "0xAB13",
-      "pid": "0x4511",
-      "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-      "cols": ["E6", "B0", "B1", "B2", "B3", "B7", "F6", "F5", "F4", "C7", "F7", "C6", "B6", "D4"],
-      "rows": ["D3", "D5", "D7", "D6"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-      "rotary": [
-        {"pin_a": "B4", "pin_b": "B5"}
-      ]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-      "LAYOUT_split_space": {
-        "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.5, "y": 0},
-
-          {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
-          {"matrix": [1, 1], "x": 1.25, "y": 1},
-          {"matrix": [1, 2], "x": 2.25, "y": 1},
-          {"matrix": [1, 3], "x": 3.25, "y": 1},
-          {"matrix": [1, 4], "x": 4.25, "y": 1},
-          {"matrix": [1, 5], "x": 5.25, "y": 1},
-          {"matrix": [1, 6], "x": 6.25, "y": 1},
-          {"matrix": [1, 7], "x": 7.25, "y": 1},
-          {"matrix": [1, 8], "x": 8.25, "y": 1},
-          {"matrix": [1, 9], "x": 9.25, "y": 1},
-          {"matrix": [1, 10], "x": 10.25, "y": 1},
-          {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.75},
-
-          {"matrix": [1, 13], "x": 13.5, "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, "w": 1.25},
-
-          {"matrix": [2, 11], "x": 12.25, "y": 2.25},
-
-          {"matrix": [2, 13], "x": 13.5, "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, "w": 1.25},
-          {"matrix": [3, 3], "x": 3.5, "y": 3, "w": 2.75},
-          {"matrix": [3, 6], "x": 6.25, "y": 3, "w": 2.25},
-          {"matrix": [3, 8], "x": 8.5, "y": 3, "w": 1.25},
-          {"matrix": [3, 9], "x": 9.75, "y": 3, "w": 1.25},
-
-          {"matrix": [3, 10], "x": 11.25, "y": 3.25},
-          {"matrix": [3, 11], "x": 12.25, "y": 3.25},
-          {"matrix": [3, 13], "x": 13.25, "y": 3.25}
-        ]
-      },
-      "LAYOUT_625_space": {
-        "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.5, "y": 0},
-
-          {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
-          {"matrix": [1, 1], "x": 1.25, "y": 1},
-          {"matrix": [1, 2], "x": 2.25, "y": 1},
-          {"matrix": [1, 3], "x": 3.25, "y": 1},
-          {"matrix": [1, 4], "x": 4.25, "y": 1},
-          {"matrix": [1, 5], "x": 5.25, "y": 1},
-          {"matrix": [1, 6], "x": 6.25, "y": 1},
-          {"matrix": [1, 7], "x": 7.25, "y": 1},
-          {"matrix": [1, 8], "x": 8.25, "y": 1},
-          {"matrix": [1, 9], "x": 9.25, "y": 1},
-          {"matrix": [1, 10], "x": 10.25, "y": 1},
-          {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.75},
-
-          {"matrix": [1, 13], "x": 13.5, "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, "w": 1.25},
-
-          {"matrix": [2, 11], "x": 12.25, "y": 2.25},
-
-          {"matrix": [2, 13], "x": 13.5, "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, "w": 1.25},
-          {"matrix": [3, 6], "x": 3.5, "y": 3, "w": 6.25},
-          {"matrix": [3, 9], "x": 9.75, "y": 3, "w": 1.25},
-
-          {"matrix": [3, 10], "x": 11.25, "y": 3.25},
-          {"matrix": [3, 11], "x": 12.25, "y": 3.25},
-          {"matrix": [3, 13], "x": 13.25, "y": 3.25}
-        ]
-      },
-      "LAYOUT_600_space": {
-        "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.5, "y": 0},
-
-          {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
-          {"matrix": [1, 1], "x": 1.25, "y": 1},
-          {"matrix": [1, 2], "x": 2.25, "y": 1},
-          {"matrix": [1, 3], "x": 3.25, "y": 1},
-          {"matrix": [1, 4], "x": 4.25, "y": 1},
-          {"matrix": [1, 5], "x": 5.25, "y": 1},
-          {"matrix": [1, 6], "x": 6.25, "y": 1},
-          {"matrix": [1, 7], "x": 7.25, "y": 1},
-          {"matrix": [1, 8], "x": 8.25, "y": 1},
-          {"matrix": [1, 9], "x": 9.25, "y": 1},
-          {"matrix": [1, 10], "x": 10.25, "y": 1},
-          {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.75},
-
-          {"matrix": [1, 13], "x": 13.5, "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, "w": 1.25},
-
-          {"matrix": [2, 11], "x": 12.25, "y": 2.25},
-
-          {"matrix": [2, 13], "x": 13.5, "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, 6], "x": 3, "y": 3, "w": 6},
-          {"matrix": [3, 8], "x": 9, "y": 3},
-          {"matrix": [3, 9], "x": 10, "y": 3},
-
-          {"matrix": [3, 10], "x": 11.25, "y": 3.25},
-          {"matrix": [3, 11], "x": 12.25, "y": 3.25},
-          {"matrix": [3, 13], "x": 13.25, "y": 3.25}
-        ]
-      }
-    }
-  }
diff --git a/keyboards/45_ats/keyboard.json b/keyboards/45_ats/keyboard.json
@@ -0,0 +1,216 @@
+{
+    "keyboard_name": "45ATS",
+    "manufacturer": "Abec13",
+    "url": "",
+    "maintainer": "The-Royal",
+    "usb": {
+      "vid": "0xAB13",
+      "pid": "0x4511",
+      "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+      "cols": ["E6", "B0", "B1", "B2", "B3", "B7", "F6", "F5", "F4", "C7", "F7", "C6", "B6", "D4"],
+      "rows": ["D3", "D5", "D7", "D6"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+      "rotary": [
+        {"pin_a": "B4", "pin_b": "B5"}
+      ]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+      "LAYOUT_split_space": {
+        "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.5, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+          {"matrix": [1, 1], "x": 1.25, "y": 1},
+          {"matrix": [1, 2], "x": 2.25, "y": 1},
+          {"matrix": [1, 3], "x": 3.25, "y": 1},
+          {"matrix": [1, 4], "x": 4.25, "y": 1},
+          {"matrix": [1, 5], "x": 5.25, "y": 1},
+          {"matrix": [1, 6], "x": 6.25, "y": 1},
+          {"matrix": [1, 7], "x": 7.25, "y": 1},
+          {"matrix": [1, 8], "x": 8.25, "y": 1},
+          {"matrix": [1, 9], "x": 9.25, "y": 1},
+          {"matrix": [1, 10], "x": 10.25, "y": 1},
+          {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.75},
+
+          {"matrix": [1, 13], "x": 13.5, "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, "w": 1.25},
+
+          {"matrix": [2, 11], "x": 12.25, "y": 2.25},
+
+          {"matrix": [2, 13], "x": 13.5, "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, "w": 1.25},
+          {"matrix": [3, 3], "x": 3.5, "y": 3, "w": 2.75},
+          {"matrix": [3, 6], "x": 6.25, "y": 3, "w": 2.25},
+          {"matrix": [3, 8], "x": 8.5, "y": 3, "w": 1.25},
+          {"matrix": [3, 9], "x": 9.75, "y": 3, "w": 1.25},
+
+          {"matrix": [3, 10], "x": 11.25, "y": 3.25},
+          {"matrix": [3, 11], "x": 12.25, "y": 3.25},
+          {"matrix": [3, 13], "x": 13.25, "y": 3.25}
+        ]
+      },
+      "LAYOUT_625_space": {
+        "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.5, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+          {"matrix": [1, 1], "x": 1.25, "y": 1},
+          {"matrix": [1, 2], "x": 2.25, "y": 1},
+          {"matrix": [1, 3], "x": 3.25, "y": 1},
+          {"matrix": [1, 4], "x": 4.25, "y": 1},
+          {"matrix": [1, 5], "x": 5.25, "y": 1},
+          {"matrix": [1, 6], "x": 6.25, "y": 1},
+          {"matrix": [1, 7], "x": 7.25, "y": 1},
+          {"matrix": [1, 8], "x": 8.25, "y": 1},
+          {"matrix": [1, 9], "x": 9.25, "y": 1},
+          {"matrix": [1, 10], "x": 10.25, "y": 1},
+          {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.75},
+
+          {"matrix": [1, 13], "x": 13.5, "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, "w": 1.25},
+
+          {"matrix": [2, 11], "x": 12.25, "y": 2.25},
+
+          {"matrix": [2, 13], "x": 13.5, "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, "w": 1.25},
+          {"matrix": [3, 6], "x": 3.5, "y": 3, "w": 6.25},
+          {"matrix": [3, 9], "x": 9.75, "y": 3, "w": 1.25},
+
+          {"matrix": [3, 10], "x": 11.25, "y": 3.25},
+          {"matrix": [3, 11], "x": 12.25, "y": 3.25},
+          {"matrix": [3, 13], "x": 13.25, "y": 3.25}
+        ]
+      },
+      "LAYOUT_600_space": {
+        "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.5, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+          {"matrix": [1, 1], "x": 1.25, "y": 1},
+          {"matrix": [1, 2], "x": 2.25, "y": 1},
+          {"matrix": [1, 3], "x": 3.25, "y": 1},
+          {"matrix": [1, 4], "x": 4.25, "y": 1},
+          {"matrix": [1, 5], "x": 5.25, "y": 1},
+          {"matrix": [1, 6], "x": 6.25, "y": 1},
+          {"matrix": [1, 7], "x": 7.25, "y": 1},
+          {"matrix": [1, 8], "x": 8.25, "y": 1},
+          {"matrix": [1, 9], "x": 9.25, "y": 1},
+          {"matrix": [1, 10], "x": 10.25, "y": 1},
+          {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.75},
+
+          {"matrix": [1, 13], "x": 13.5, "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, "w": 1.25},
+
+          {"matrix": [2, 11], "x": 12.25, "y": 2.25},
+
+          {"matrix": [2, 13], "x": 13.5, "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, 6], "x": 3, "y": 3, "w": 6},
+          {"matrix": [3, 8], "x": 9, "y": 3},
+          {"matrix": [3, 9], "x": 10, "y": 3},
+
+          {"matrix": [3, 10], "x": 11.25, "y": 3.25},
+          {"matrix": [3, 11], "x": 12.25, "y": 3.25},
+          {"matrix": [3, 13], "x": 13.25, "y": 3.25}
+        ]
+      }
+    }
+  }
diff --git a/keyboards/45_ats/rules.mk b/keyboards/45_ats/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 = 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
diff --git a/keyboards/4by3/info.json b/keyboards/4by3/info.json
@@ -1,79 +0,0 @@
-{
-    "keyboard_name": "4by3",
-    "manufacturer": "Elias Sj\u00f6green",
-    "url": "https://github.com/eliassjogreen/4by3",
-    "maintainer": "eliassjogreen",
-    "usb": {
-        "vid": "0xEEEE",
-        "pid": "0x2019",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["C6", "D7", "E6", "B4"],
-        "rows": ["D1", "D0", "D4"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_horizontal"
-    },
-    "layouts": {
-        "LAYOUT_horizontal": {
-            "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": [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": [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}
-            ]
-        },
-        "LAYOUT_vertical_right": {
-            "layout": [
-                {"matrix": [2, 0], "x": 0, "y": 0},
-                {"matrix": [1, 0], "x": 1, "y": 0},
-                {"matrix": [0, 0], "x": 2, "y": 0},
-
-                {"matrix": [2, 1], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [0, 1], "x": 2, "y": 1},
-
-                {"matrix": [2, 2], "x": 0, "y": 2},
-                {"matrix": [1, 2], "x": 1, "y": 2},
-                {"matrix": [0, 2], "x": 2, "y": 2},
-
-                {"matrix": [2, 3], "x": 0, "y": 3},
-                {"matrix": [1, 3], "x": 1, "y": 3},
-                {"matrix": [0, 3], "x": 2, "y": 3}
-            ]
-        },
-        "LAYOUT_vertical_left": {
-            "layout": [
-                {"matrix": [0, 3], "x": 0, "y": 0},
-                {"matrix": [1, 3], "x": 1, "y": 0},
-                {"matrix": [2, 3], "x": 2, "y": 0},
-
-                {"matrix": [0, 2], "x": 0, "y": 1},
-                {"matrix": [1, 2], "x": 1, "y": 1},
-                {"matrix": [2, 2], "x": 2, "y": 1},
-
-                {"matrix": [0, 1], "x": 0, "y": 2},
-                {"matrix": [1, 1], "x": 1, "y": 2},
-                {"matrix": [2, 1], "x": 2, "y": 2},
-
-                {"matrix": [0, 0], "x": 0, "y": 3},
-                {"matrix": [1, 0], "x": 1, "y": 3},
-                {"matrix": [2, 0], "x": 2, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/4by3/keyboard.json b/keyboards/4by3/keyboard.json
@@ -0,0 +1,87 @@
+{
+    "keyboard_name": "4by3",
+    "manufacturer": "Elias Sj\u00f6green",
+    "url": "https://github.com/eliassjogreen/4by3",
+    "maintainer": "eliassjogreen",
+    "usb": {
+        "vid": "0xEEEE",
+        "pid": "0x2019",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": false,
+        "command": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["C6", "D7", "E6", "B4"],
+        "rows": ["D1", "D0", "D4"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_horizontal"
+    },
+    "layouts": {
+        "LAYOUT_horizontal": {
+            "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": [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": [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}
+            ]
+        },
+        "LAYOUT_vertical_right": {
+            "layout": [
+                {"matrix": [2, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 0], "x": 2, "y": 0},
+
+                {"matrix": [2, 1], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [0, 1], "x": 2, "y": 1},
+
+                {"matrix": [2, 2], "x": 0, "y": 2},
+                {"matrix": [1, 2], "x": 1, "y": 2},
+                {"matrix": [0, 2], "x": 2, "y": 2},
+
+                {"matrix": [2, 3], "x": 0, "y": 3},
+                {"matrix": [1, 3], "x": 1, "y": 3},
+                {"matrix": [0, 3], "x": 2, "y": 3}
+            ]
+        },
+        "LAYOUT_vertical_left": {
+            "layout": [
+                {"matrix": [0, 3], "x": 0, "y": 0},
+                {"matrix": [1, 3], "x": 1, "y": 0},
+                {"matrix": [2, 3], "x": 2, "y": 0},
+
+                {"matrix": [0, 2], "x": 0, "y": 1},
+                {"matrix": [1, 2], "x": 1, "y": 1},
+                {"matrix": [2, 2], "x": 2, "y": 1},
+
+                {"matrix": [0, 1], "x": 0, "y": 2},
+                {"matrix": [1, 1], "x": 1, "y": 2},
+                {"matrix": [2, 1], "x": 2, "y": 2},
+
+                {"matrix": [0, 0], "x": 0, "y": 3},
+                {"matrix": [1, 0], "x": 1, "y": 3},
+                {"matrix": [2, 0], "x": 2, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/4by3/rules.mk b/keyboards/4by3/rules.mk
@@ -1,4 +0,0 @@
-EXTRAKEY_ENABLE 	= yes
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-CONSOLE_ENABLE		= yes
-COMMAND_ENABLE		= yes
diff --git a/keyboards/4pplet/aekiso60/rev_a/info.json b/keyboards/4pplet/aekiso60/rev_a/info.json
@@ -1,38 +0,0 @@
-{
-    "keyboard_name": "AEKISO60 Rev A",
-    "usb": {
-        "pid": "0x0001",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 12,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "matrix_pins": {
-        "cols": ["C4", "C6", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "D6", "D5", "D4", "D2", "D1"],
-        "rows": ["C2", "D0", "B0", "C7", "C5"]
-    },
-    "diode_direction": "COL2ROW",
-    "qmk_lufa_bootloader": {
-        "esc_input": "C2",
-        "esc_output": "C4"
-    },
-    "processor": "atmega32u2",
-    "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/4pplet/aekiso60/rev_a/keyboard.json b/keyboards/4pplet/aekiso60/rev_a/keyboard.json
@@ -0,0 +1,46 @@
+{
+    "keyboard_name": "AEKISO60 Rev A",
+    "usb": {
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 12,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["C4", "C6", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "D6", "D5", "D4", "D2", "D1"],
+        "rows": ["C2", "D0", "B0", "C7", "C5"]
+    },
+    "diode_direction": "COL2ROW",
+    "qmk_lufa_bootloader": {
+        "esc_input": "C2",
+        "esc_output": "C4"
+    },
+    "processor": "atmega32u2",
+    "bootloader": "atmel-dfu"
+}
diff --git a/keyboards/4pplet/aekiso60/rev_a/rules.mk b/keyboards/4pplet/aekiso60/rev_a/rules.mk
@@ -1,12 +0,0 @@
-# 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 = 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/4pplet/bootleg/rev_a/info.json b/keyboards/4pplet/bootleg/rev_a/info.json
@@ -1,169 +0,0 @@
-{
-    "keyboard_name": "bootleg Rev A",
-    "manufacturer": "4pplet",
-    "url": "https://github.com/4pplet/bootlegs",
-    "maintainer": "4pplet",
-    "usb": {
-        "vid": "0x4444",
-        "pid": "0x0004",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["C5", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "B0", "D6", "D5", "D3", "D1"],
-        "rows": ["D0", "C2", "C4", "D4", "D2"]
-    },
-    "diode_direction": "COL2ROW",
-    "qmk_lufa_bootloader": {
-        "esc_input": "D0",
-        "esc_output": "C4"
-    },
-    "processor": "atmega32u2",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "#", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": ")", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "+", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "|", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "~", "matrix": [0, 14], "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": "Backsp.", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "|", "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": "Win", "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": "Space1", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
-                {"label": "Space2", "matrix": [4, 4], "x": 6, "y": 4, "w": 1.25},
-                {"label": "Space3", "matrix": [4, 5], "x": 7.25, "y": 4, "w": 2.75},
-                {"label": "Alt", "matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Menu", "matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Win", "matrix": [4, 8], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 9], "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": "!", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "#", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": ")", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "+", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "|", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "~", "matrix": [0, 14], "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": "Backsp.", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Win", "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": "Space2", "matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Menu", "matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Win", "matrix": [4, 8], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 9], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/4pplet/bootleg/rev_a/keyboard.json b/keyboards/4pplet/bootleg/rev_a/keyboard.json
@@ -0,0 +1,177 @@
+{
+    "keyboard_name": "bootleg Rev A",
+    "manufacturer": "4pplet",
+    "url": "https://github.com/4pplet/bootlegs",
+    "maintainer": "4pplet",
+    "usb": {
+        "vid": "0x4444",
+        "pid": "0x0004",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["C5", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "B0", "D6", "D5", "D3", "D1"],
+        "rows": ["D0", "C2", "C4", "D4", "D2"]
+    },
+    "diode_direction": "COL2ROW",
+    "qmk_lufa_bootloader": {
+        "esc_input": "D0",
+        "esc_output": "C4"
+    },
+    "processor": "atmega32u2",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "#", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": ")", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "+", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "|", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "~", "matrix": [0, 14], "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": "Backsp.", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "|", "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": "Win", "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": "Space1", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
+                {"label": "Space2", "matrix": [4, 4], "x": 6, "y": 4, "w": 1.25},
+                {"label": "Space3", "matrix": [4, 5], "x": 7.25, "y": 4, "w": 2.75},
+                {"label": "Alt", "matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [4, 8], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 9], "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": "!", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "#", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": ")", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "+", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "|", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "~", "matrix": [0, 14], "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": "Backsp.", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Win", "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": "Space2", "matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [4, 8], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 9], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/4pplet/bootleg/rev_a/rules.mk b/keyboards/4pplet/bootleg/rev_a/rules.mk
@@ -1,12 +0,0 @@
-# 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 = 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/4pplet/perk60_iso/rev_a/info.json b/keyboards/4pplet/perk60_iso/rev_a/info.json
@@ -1,123 +0,0 @@
-{
-    "keyboard_name": "Perk60 ISO Rev A",
-    "manufacturer": "4pplet",
-    "url": "",
-    "maintainer": "4pplet",
-    "usb": {
-        "vid": "0x4444",
-        "pid": "0x0009",
-        "device_version": "0.0.1"
-    },
-    "rgb_matrix": {
-        "animations": {
-            "alphas_mods": true,
-            "gradient_up_down": true,
-            "gradient_left_right": true,
-            "breathing": 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,
-            "solid_reactive_simple": true,
-            "solid_reactive": true,
-            "solid_reactive_wide": true,
-            "solid_reactive_cross": true,
-            "solid_reactive_nexus": true,
-            "splash": true,
-            "solid_splash": true
-        },
-        "default": {
-            "val": 80
-        },
-        "driver": "is31fl3733"
-    },
-    "matrix_pins": {
-        "cols": ["A1", "B12", "B14", "A2", "A0", "A3", "A4"],
-        "rows": ["C14", "C13", "B5", "B4", "B8", "A15", "B3", "B9", "A5", "A7"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "community_layouts": ["60_iso"],
-    "layouts": {
-        "LAYOUT_60_iso": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [1, 0], "x": 1, "y": 0},
-                {"matrix": [0, 1], "x": 2, "y": 0},
-                {"matrix": [1, 1], "x": 3, "y": 0},
-                {"matrix": [0, 2], "x": 4, "y": 0},
-                {"matrix": [1, 2], "x": 5, "y": 0},
-                {"matrix": [0, 3], "x": 6, "y": 0},
-                {"matrix": [1, 3], "x": 7, "y": 0},
-                {"matrix": [0, 4], "x": 8, "y": 0},
-                {"matrix": [1, 4], "x": 9, "y": 0},
-                {"matrix": [0, 5], "x": 10, "y": 0},
-                {"matrix": [1, 5], "x": 11, "y": 0},
-                {"matrix": [0, 6], "x": 12, "y": 0},
-                {"matrix": [3, 6], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [3, 0], "x": 1.5, "y": 1},
-                {"matrix": [2, 1], "x": 2.5, "y": 1},
-                {"matrix": [3, 1], "x": 3.5, "y": 1},
-                {"matrix": [2, 2], "x": 4.5, "y": 1},
-                {"matrix": [3, 2], "x": 5.5, "y": 1},
-                {"matrix": [2, 3], "x": 6.5, "y": 1},
-                {"matrix": [3, 3], "x": 7.5, "y": 1},
-                {"matrix": [2, 4], "x": 8.5, "y": 1},
-                {"matrix": [3, 4], "x": 9.5, "y": 1},
-                {"matrix": [2, 5], "x": 10.5, "y": 1},
-                {"matrix": [3, 5], "x": 11.5, "y": 1},
-                {"matrix": [2, 6], "x": 12.5, "y": 1},
-
-                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [5, 0], "x": 1.75, "y": 2},
-                {"matrix": [4, 1], "x": 2.75, "y": 2},
-                {"matrix": [5, 1], "x": 3.75, "y": 2},
-                {"matrix": [4, 2], "x": 4.75, "y": 2},
-                {"matrix": [5, 2], "x": 5.75, "y": 2},
-                {"matrix": [4, 3], "x": 6.75, "y": 2},
-                {"matrix": [5, 3], "x": 7.75, "y": 2},
-                {"matrix": [4, 4], "x": 8.75, "y": 2},
-                {"matrix": [5, 4], "x": 9.75, "y": 2},
-                {"matrix": [4, 5], "x": 10.75, "y": 2},
-                {"matrix": [5, 5], "x": 11.75, "y": 2},
-                {"matrix": [4, 6], "x": 12.75, "y": 2},
-                {"matrix": [7, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [7, 0], "x": 1.25, "y": 3},
-                {"matrix": [6, 1], "x": 2.25, "y": 3},
-                {"matrix": [7, 1], "x": 3.25, "y": 3},
-                {"matrix": [6, 2], "x": 4.25, "y": 3},
-                {"matrix": [7, 2], "x": 5.25, "y": 3},
-                {"matrix": [6, 3], "x": 6.25, "y": 3},
-                {"matrix": [7, 3], "x": 7.25, "y": 3},
-                {"matrix": [6, 4], "x": 8.25, "y": 3},
-                {"matrix": [7, 4], "x": 9.25, "y": 3},
-                {"matrix": [6, 5], "x": 10.25, "y": 3},
-                {"matrix": [7, 5], "x": 11.25, "y": 3},
-                {"matrix": [8, 6], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [9, 3], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [9, 4], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [8, 5], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [9, 5], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/4pplet/perk60_iso/rev_a/keyboard.json b/keyboards/4pplet/perk60_iso/rev_a/keyboard.json
@@ -0,0 +1,132 @@
+{
+    "keyboard_name": "Perk60 ISO Rev A",
+    "manufacturer": "4pplet",
+    "url": "",
+    "maintainer": "4pplet",
+    "usb": {
+        "vid": "0x4444",
+        "pid": "0x0009",
+        "device_version": "0.0.1"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": 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,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_nexus": true,
+            "splash": true,
+            "solid_splash": true
+        },
+        "default": {
+            "val": 80
+        },
+        "driver": "is31fl3733"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["A1", "B12", "B14", "A2", "A0", "A3", "A4"],
+        "rows": ["C14", "C13", "B5", "B4", "B8", "A15", "B3", "B9", "A5", "A7"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F411",
+    "bootloader": "stm32-dfu",
+    "community_layouts": ["60_iso"],
+    "layouts": {
+        "LAYOUT_60_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [3, 6], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 6], "x": 12.75, "y": 2},
+                {"matrix": [7, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [7, 0], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [8, 6], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [9, 3], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/4pplet/perk60_iso/rev_a/rules.mk b/keyboards/4pplet/perk60_iso/rev_a/rules.mk
@@ -1,14 +0,0 @@
-# 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_ENABLE = yes
-
diff --git a/keyboards/4pplet/waffling60/rev_a/info.json b/keyboards/4pplet/waffling60/rev_a/info.json
@@ -1,98 +0,0 @@
-{
-    "keyboard_name": "Waffling60 Rev A",
-    "manufacturer": "4pplet",
-    "url": "https://github.com/4pplet/waffling60",
-    "maintainer": "4pplet",
-    "usb": {
-        "vid": "0x4444",
-        "pid": "0x0003",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D3", "D0", "D2", "B6", "B5", "B4", "B3", "D6", "D5", "B0", "B1"],
-        "rows": ["D4", "D1", "C2", "C4", "C7", "B2"]
-    },
-    "diode_direction": "COL2ROW",
-    "qmk_lufa_bootloader": {
-        "esc_input": "D4",
-        "esc_output": "D3"
-    },
-    "processor": "atmega32u2",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [1, 1], "x": 2, "y": 0},
-                {"matrix": [0, 2], "x": 3, "y": 0},
-                {"matrix": [0, 3], "x": 4, "y": 0},
-                {"matrix": [0, 4], "x": 5, "y": 0},
-                {"matrix": [0, 5], "x": 6, "y": 0},
-                {"matrix": [1, 5], "x": 7, "y": 0},
-                {"matrix": [0, 6], "x": 8, "y": 0},
-                {"matrix": [0, 7], "x": 9, "y": 0},
-                {"matrix": [0, 8], "x": 10, "y": 0},
-                {"matrix": [1, 8], "x": 11, "y": 0},
-                {"matrix": [0, 9], "x": 12, "y": 0},
-                {"matrix": [0, 10], "x": 13, "y": 0},
-                {"matrix": [1, 10], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [2, 2], "x": 3.5, "y": 1},
-                {"matrix": [1, 3], "x": 4.5, "y": 1},
-                {"matrix": [1, 4], "x": 5.5, "y": 1},
-                {"matrix": [2, 5], "x": 6.5, "y": 1},
-                {"matrix": [3, 5], "x": 7.5, "y": 1},
-                {"matrix": [1, 6], "x": 8.5, "y": 1},
-                {"matrix": [1, 7], "x": 9.5, "y": 1},
-                {"matrix": [2, 8], "x": 10.5, "y": 1},
-                {"matrix": [1, 9], "x": 11.5, "y": 1},
-                {"matrix": [2, 9], "x": 12.5, "y": 1},
-                {"matrix": [2, 10], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 2},
-                {"matrix": [3, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [3, 3], "x": 4.75, "y": 2},
-                {"matrix": [2, 4], "x": 5.75, "y": 2},
-                {"matrix": [4, 5], "x": 6.75, "y": 2},
-                {"matrix": [2, 6], "x": 7.75, "y": 2},
-                {"matrix": [3, 6], "x": 8.75, "y": 2},
-                {"matrix": [2, 7], "x": 9.75, "y": 2},
-                {"matrix": [3, 8], "x": 10.75, "y": 2},
-                {"matrix": [3, 9], "x": 11.75, "y": 2},
-                {"matrix": [3, 10], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [4, 0], "x": 1.25, "y": 3},
-                {"matrix": [4, 1], "x": 2.25, "y": 3},
-                {"matrix": [4, 2], "x": 3.25, "y": 3},
-                {"matrix": [4, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [4, 4], "x": 6.25, "y": 3},
-                {"matrix": [5, 5], "x": 7.25, "y": 3},
-                {"matrix": [4, 6], "x": 8.25, "y": 3},
-                {"matrix": [3, 7], "x": 9.25, "y": 3},
-                {"matrix": [4, 7], "x": 10.25, "y": 3},
-                {"matrix": [4, 8], "x": 11.25, "y": 3},
-                {"matrix": [4, 9], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [4, 10], "x": 14, "y": 3},
-
-                {"matrix": [5, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [5, 3], "x": 3.75, "y": 4, "w": 2.25},
-                {"matrix": [5, 4], "x": 6, "y": 4, "w": 1.25},
-                {"matrix": [5, 6], "x": 7.25, "y": 4, "w": 2.75},
-                {"matrix": [5, 7], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [5, 8], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [5, 9], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [5, 10], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/4pplet/waffling60/rev_a/keyboard.json b/keyboards/4pplet/waffling60/rev_a/keyboard.json
@@ -0,0 +1,106 @@
+{
+    "keyboard_name": "Waffling60 Rev A",
+    "manufacturer": "4pplet",
+    "url": "https://github.com/4pplet/waffling60",
+    "maintainer": "4pplet",
+    "usb": {
+        "vid": "0x4444",
+        "pid": "0x0003",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["D3", "D0", "D2", "B6", "B5", "B4", "B3", "D6", "D5", "B0", "B1"],
+        "rows": ["D4", "D1", "C2", "C4", "C7", "B2"]
+    },
+    "diode_direction": "COL2ROW",
+    "qmk_lufa_bootloader": {
+        "esc_input": "D4",
+        "esc_output": "D3"
+    },
+    "processor": "atmega32u2",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6, "y": 0},
+                {"matrix": [1, 5], "x": 7, "y": 0},
+                {"matrix": [0, 6], "x": 8, "y": 0},
+                {"matrix": [0, 7], "x": 9, "y": 0},
+                {"matrix": [0, 8], "x": 10, "y": 0},
+                {"matrix": [1, 8], "x": 11, "y": 0},
+                {"matrix": [0, 9], "x": 12, "y": 0},
+                {"matrix": [0, 10], "x": 13, "y": 0},
+                {"matrix": [1, 10], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [2, 2], "x": 3.5, "y": 1},
+                {"matrix": [1, 3], "x": 4.5, "y": 1},
+                {"matrix": [1, 4], "x": 5.5, "y": 1},
+                {"matrix": [2, 5], "x": 6.5, "y": 1},
+                {"matrix": [3, 5], "x": 7.5, "y": 1},
+                {"matrix": [1, 6], "x": 8.5, "y": 1},
+                {"matrix": [1, 7], "x": 9.5, "y": 1},
+                {"matrix": [2, 8], "x": 10.5, "y": 1},
+                {"matrix": [1, 9], "x": 11.5, "y": 1},
+                {"matrix": [2, 9], "x": 12.5, "y": 1},
+                {"matrix": [2, 10], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 2},
+                {"matrix": [3, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [3, 3], "x": 4.75, "y": 2},
+                {"matrix": [2, 4], "x": 5.75, "y": 2},
+                {"matrix": [4, 5], "x": 6.75, "y": 2},
+                {"matrix": [2, 6], "x": 7.75, "y": 2},
+                {"matrix": [3, 6], "x": 8.75, "y": 2},
+                {"matrix": [2, 7], "x": 9.75, "y": 2},
+                {"matrix": [3, 8], "x": 10.75, "y": 2},
+                {"matrix": [3, 9], "x": 11.75, "y": 2},
+                {"matrix": [3, 10], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [4, 0], "x": 1.25, "y": 3},
+                {"matrix": [4, 1], "x": 2.25, "y": 3},
+                {"matrix": [4, 2], "x": 3.25, "y": 3},
+                {"matrix": [4, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [4, 4], "x": 6.25, "y": 3},
+                {"matrix": [5, 5], "x": 7.25, "y": 3},
+                {"matrix": [4, 6], "x": 8.25, "y": 3},
+                {"matrix": [3, 7], "x": 9.25, "y": 3},
+                {"matrix": [4, 7], "x": 10.25, "y": 3},
+                {"matrix": [4, 8], "x": 11.25, "y": 3},
+                {"matrix": [4, 9], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [4, 10], "x": 14, "y": 3},
+
+                {"matrix": [5, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [5, 4], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [5, 6], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [5, 7], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [5, 8], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [5, 9], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [5, 10], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/4pplet/waffling60/rev_a/rules.mk b/keyboards/4pplet/waffling60/rev_a/rules.mk
@@ -1,12 +0,0 @@
-# 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 = 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/4pplet/waffling60/rev_b/info.json b/keyboards/4pplet/waffling60/rev_b/info.json
@@ -1,118 +0,0 @@
-{
-    "keyboard_name": "Waffling60 Rev B",
-    "manufacturer": "4pplet",
-    "url": "https://github.com/4pplet/waffling60",
-    "maintainer": "4pplet",
-    "usb": {
-        "vid": "0x4444",
-        "pid": "0x0005",
-        "device_version": "0.0.2"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 1,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "matrix_pins": {
-        "cols": ["C4", "C5", "D2", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "D1", "D4"],
-        "rows": ["C2", "D0", "B0", "D6", "D5"]
-    },
-    "diode_direction": "COL2ROW",
-    "qmk_lufa_bootloader": {
-        "esc_input": "C4",
-        "esc_output": "C2"
-    },
-    "processor": "atmega32u2",
-    "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, 13], "x": 13, "y": 0},
-                {"matrix": [1, 13], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 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": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
-                {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/4pplet/waffling60/rev_b/keyboard.json b/keyboards/4pplet/waffling60/rev_b/keyboard.json
@@ -0,0 +1,127 @@
+{
+    "keyboard_name": "Waffling60 Rev B",
+    "manufacturer": "4pplet",
+    "url": "https://github.com/4pplet/waffling60",
+    "maintainer": "4pplet",
+    "usb": {
+        "vid": "0x4444",
+        "pid": "0x0005",
+        "device_version": "0.0.2"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 1,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["C4", "C5", "D2", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "D1", "D4"],
+        "rows": ["C2", "D0", "B0", "D6", "D5"]
+    },
+    "diode_direction": "COL2ROW",
+    "qmk_lufa_bootloader": {
+        "esc_input": "C4",
+        "esc_output": "C2"
+    },
+    "processor": "atmega32u2",
+    "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, 13], "x": 13, "y": 0},
+                {"matrix": [1, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 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": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/4pplet/waffling60/rev_b/rules.mk b/keyboards/4pplet/waffling60/rev_b/rules.mk
@@ -1,12 +0,0 @@
-# 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 = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/4pplet/waffling60/rev_c/info.json b/keyboards/4pplet/waffling60/rev_c/info.json
@@ -1,118 +0,0 @@
-{
-    "keyboard_name": "Waffling60 Rev C",
-    "manufacturer": "4pplet",
-    "url": "https://github.com/4pplet/waffling60",
-    "maintainer": "4pplet",
-    "usb": {
-        "vid": "0x4444",
-        "pid": "0x0008",
-        "device_version": "0.0.3"
-    },
-    "matrix_pins": {
-        "cols": ["C4", "C5", "D2", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "D1", "D4"],
-        "rows": ["C2", "D0", "B0", "D6", "D5"]
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 1,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "diode_direction": "COL2ROW",
-    "qmk_lufa_bootloader": {
-        "esc_input": "C4",
-        "esc_output": "C2"
-    },
-    "processor": "atmega32u2",
-    "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, 13], "x": 13, "y": 0},
-                {"matrix": [1, 13], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 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": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
-                {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/4pplet/waffling60/rev_c/keyboard.json b/keyboards/4pplet/waffling60/rev_c/keyboard.json
@@ -0,0 +1,127 @@
+{
+    "keyboard_name": "Waffling60 Rev C",
+    "manufacturer": "4pplet",
+    "url": "https://github.com/4pplet/waffling60",
+    "maintainer": "4pplet",
+    "usb": {
+        "vid": "0x4444",
+        "pid": "0x0008",
+        "device_version": "0.0.3"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["C4", "C5", "D2", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "D1", "D4"],
+        "rows": ["C2", "D0", "B0", "D6", "D5"]
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 1,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "diode_direction": "COL2ROW",
+    "qmk_lufa_bootloader": {
+        "esc_input": "C4",
+        "esc_output": "C2"
+    },
+    "processor": "atmega32u2",
+    "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, 13], "x": 13, "y": 0},
+                {"matrix": [1, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 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": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/4pplet/waffling60/rev_c/rules.mk b/keyboards/4pplet/waffling60/rev_c/rules.mk
@@ -1,12 +0,0 @@
-# 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 = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/4pplet/waffling80/rev_a/info.json b/keyboards/4pplet/waffling80/rev_a/info.json
@@ -1,26 +0,0 @@
-{
-    "keyboard_name": "waffling80 Rev A",
-    "usb": {
-        "pid": "0x0006",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 2
-    },
-    "ws2812": {
-        "pin": "D7"
-    },
-    "matrix_pins": {
-        "cols": ["C6", "C7", "B7", "B6", "B5", "B2", "D0", "C2"],
-        "rows": ["C4", "C5", "B4", "B3", "B1", "B0", "D6", "D5", "D3", "D4", "D1", "D2"]
-    },
-    "diode_direction": "COL2ROW",
-    "qmk_lufa_bootloader": {
-        "esc_input": "C4",
-        "esc_output": "C6"
-    },
-    "processor": "atmega32u2",
-    "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/4pplet/waffling80/rev_a/keyboard.json b/keyboards/4pplet/waffling80/rev_a/keyboard.json
@@ -0,0 +1,35 @@
+{
+    "keyboard_name": "waffling80 Rev A",
+    "usb": {
+        "pid": "0x0006",
+        "device_version": "0.0.1"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 2
+    },
+    "ws2812": {
+        "pin": "D7"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["C6", "C7", "B7", "B6", "B5", "B2", "D0", "C2"],
+        "rows": ["C4", "C5", "B4", "B3", "B1", "B0", "D6", "D5", "D3", "D4", "D1", "D2"]
+    },
+    "diode_direction": "COL2ROW",
+    "qmk_lufa_bootloader": {
+        "esc_input": "C4",
+        "esc_output": "C6"
+    },
+    "processor": "atmega32u2",
+    "bootloader": "atmel-dfu"
+}
diff --git a/keyboards/4pplet/waffling80/rev_a/rules.mk b/keyboards/4pplet/waffling80/rev_a/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 = yes            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/4pplet/yakiimo/rev_a/info.json b/keyboards/4pplet/yakiimo/rev_a/info.json
@@ -1,557 +0,0 @@
-{
-    "keyboard_name": "Yakiimo Rev A",
-    "manufacturer": "4pplet",
-    "url": "https://github.com/4pplet/yakiimo-PCB",
-    "maintainer": "4pplet",
-    "usb": {
-        "vid": "0x4444",
-        "pid": "0x000A",
-        "device_version": "0.0.2"
-    },
-    "matrix_pins": {
-        "cols": ["B0", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "A8"],
-        "rows": ["B10", "B1", "C13", "C14", "B14", "B12", "B9", "B8", "B5", "B4", "A15", "B3"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "A6",
-        "scroll_lock": "A7"
-    },
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "community_layouts": [
-        "tkl_ansi_tsangan",
-        "tkl_ansi_tsangan_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, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [1, 1], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 2], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [1, 2], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 3], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [1, 3], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 4], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [1, 4], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 5], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [1, 5], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 6], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [1, 6], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 7], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [1, 8], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 8], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [2, 0], "x": 0, "y": 1.5},
-                {"label": "1", "matrix": [3, 0], "x": 1, "y": 1.5},
-                {"label": "2", "matrix": [2, 1], "x": 2, "y": 1.5},
-                {"label": "3", "matrix": [3, 1], "x": 3, "y": 1.5},
-                {"label": "4", "matrix": [2, 2], "x": 4, "y": 1.5},
-                {"label": "5", "matrix": [3, 2], "x": 5, "y": 1.5},
-                {"label": "6", "matrix": [2, 3], "x": 6, "y": 1.5},
-                {"label": "7", "matrix": [3, 3], "x": 7, "y": 1.5},
-                {"label": "8", "matrix": [2, 4], "x": 8, "y": 1.5},
-                {"label": "9", "matrix": [3, 4], "x": 9, "y": 1.5},
-                {"label": "0", "matrix": [2, 5], "x": 10, "y": 1.5},
-                {"label": "-", "matrix": [3, 5], "x": 11, "y": 1.5},
-                {"label": "=", "matrix": [2, 6], "x": 12, "y": 1.5},
-                {"label": "\\", "matrix": [3, 6], "x": 13, "y": 1.5},
-                {"label": "Backspace", "matrix": [2, 7], "x": 14, "y": 1.5},
-
-                {"label": "Insert", "matrix": [3, 7], "x": 15.25, "y": 1.5},
-                {"label": "Home", "matrix": [2, 8], "x": 16.25, "y": 1.5},
-                {"label": "Page Up", "matrix": [3, 8], "x": 17.25, "y": 1.5},
-
-                {"label": "Tab", "matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
-                {"label": "Q", "matrix": [5, 0], "x": 1.5, "y": 2.5},
-                {"label": "W", "matrix": [4, 1], "x": 2.5, "y": 2.5},
-                {"label": "E", "matrix": [5, 1], "x": 3.5, "y": 2.5},
-                {"label": "R", "matrix": [4, 2], "x": 4.5, "y": 2.5},
-                {"label": "T", "matrix": [5, 2], "x": 5.5, "y": 2.5},
-                {"label": "Y", "matrix": [4, 3], "x": 6.5, "y": 2.5},
-                {"label": "U", "matrix": [5, 3], "x": 7.5, "y": 2.5},
-                {"label": "I", "matrix": [4, 4], "x": 8.5, "y": 2.5},
-                {"label": "O", "matrix": [5, 4], "x": 9.5, "y": 2.5},
-                {"label": "P", "matrix": [4, 5], "x": 10.5, "y": 2.5},
-                {"label": "[", "matrix": [5, 5], "x": 11.5, "y": 2.5},
-                {"label": "]", "matrix": [4, 6], "x": 12.5, "y": 2.5},
-                {"label": "\\", "matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5},
-
-                {"label": "Delete", "matrix": [4, 7], "x": 15.25, "y": 2.5},
-                {"label": "End", "matrix": [4, 8], "x": 16.25, "y": 2.5},
-                {"label": "Page Down", "matrix": [5, 8], "x": 17.25, "y": 2.5},
-
-                {"label": "Caps Lock", "matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75},
-                {"label": "A", "matrix": [7, 0], "x": 1.75, "y": 3.5},
-                {"label": "S", "matrix": [6, 1], "x": 2.75, "y": 3.5},
-                {"label": "D", "matrix": [7, 1], "x": 3.75, "y": 3.5},
-                {"label": "F", "matrix": [6, 2], "x": 4.75, "y": 3.5},
-                {"label": "G", "matrix": [7, 2], "x": 5.75, "y": 3.5},
-                {"label": "H", "matrix": [6, 3], "x": 6.75, "y": 3.5},
-                {"label": "J", "matrix": [7, 3], "x": 7.75, "y": 3.5},
-                {"label": "K", "matrix": [6, 4], "x": 8.75, "y": 3.5},
-                {"label": "L", "matrix": [7, 4], "x": 9.75, "y": 3.5},
-                {"label": ";", "matrix": [6, 5], "x": 10.75, "y": 3.5},
-                {"label": "'", "matrix": [7, 5], "x": 11.75, "y": 3.5},
-                {"label": "#", "matrix": [6, 6], "x": 12.75, "y": 3.5},
-                {"label": "Enter", "matrix": [7, 6], "x": 13.75, "y": 3.5, "w": 1.25},
-
-                {"label": "Shift", "matrix": [8, 0], "x": 0, "y": 4.5, "w": 1.25},
-                {"label": "\\", "matrix": [9, 0], "x": 1.25, "y": 4.5},
-                {"label": "Z", "matrix": [8, 1], "x": 2.25, "y": 4.5},
-                {"label": "X", "matrix": [9, 1], "x": 3.25, "y": 4.5},
-                {"label": "C", "matrix": [8, 2], "x": 4.25, "y": 4.5},
-                {"label": "V", "matrix": [9, 2], "x": 5.25, "y": 4.5},
-                {"label": "B", "matrix": [8, 3], "x": 6.25, "y": 4.5},
-                {"label": "N", "matrix": [9, 3], "x": 7.25, "y": 4.5},
-                {"label": "M", "matrix": [8, 4], "x": 8.25, "y": 4.5},
-                {"label": ",", "matrix": [9, 4], "x": 9.25, "y": 4.5},
-                {"label": ".", "matrix": [8, 5], "x": 10.25, "y": 4.5},
-                {"label": "/", "matrix": [9, 5], "x": 11.25, "y": 4.5},
-                {"label": "Shift", "matrix": [8, 6], "x": 12.25, "y": 4.5, "w": 1.75},
-                {"label": "Fn", "matrix": [9, 6], "x": 14, "y": 4.5},
-
-                {"label": "\u2191", "matrix": [9, 8], "x": 16.25, "y": 4.5},
-
-                {"label": "Ctrl", "matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.5},
-                {"label": "GUI", "matrix": [10, 1], "x": 1.5, "y": 5.5},
-                {"label": "Alt", "matrix": [11, 1], "x": 2.5, "y": 5.5, "w": 1.5},
-                {"label": "Space", "matrix": [11, 2], "x": 4, "y": 5.5, "w": 3},
-                {"label": "Space", "matrix": [11, 3], "x": 7, "y": 5.5},
-                {"label": "Space", "matrix": [11, 4], "x": 8, "y": 5.5, "w": 3},
-                {"label": "Alt", "matrix": [11, 5], "x": 11, "y": 5.5, "w": 1.5},
-                {"label": "GUI", "matrix": [10, 6], "x": 12.5, "y": 5.5},
-                {"label": "Ctrl", "matrix": [11, 6], "x": 13.5, "y": 5.5, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [10, 7], "x": 15.25, "y": 5.5},
-                {"label": "\u2193", "matrix": [11, 8], "x": 16.25, "y": 5.5},
-                {"label": "\u2192", "matrix": [10, 8], "x": 17.25, "y": 5.5}
-            ]
-        },
-        "LAYOUT_tkl_ansi_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [1, 1], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 2], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [1, 2], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 3], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [1, 3], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 4], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [1, 4], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 5], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [1, 5], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 6], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [1, 6], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 7], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [1, 8], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 8], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [2, 0], "x": 0, "y": 1.5},
-                {"label": "1", "matrix": [3, 0], "x": 1, "y": 1.5},
-                {"label": "2", "matrix": [2, 1], "x": 2, "y": 1.5},
-                {"label": "3", "matrix": [3, 1], "x": 3, "y": 1.5},
-                {"label": "4", "matrix": [2, 2], "x": 4, "y": 1.5},
-                {"label": "5", "matrix": [3, 2], "x": 5, "y": 1.5},
-                {"label": "6", "matrix": [2, 3], "x": 6, "y": 1.5},
-                {"label": "7", "matrix": [3, 3], "x": 7, "y": 1.5},
-                {"label": "8", "matrix": [2, 4], "x": 8, "y": 1.5},
-                {"label": "9", "matrix": [3, 4], "x": 9, "y": 1.5},
-                {"label": "0", "matrix": [2, 5], "x": 10, "y": 1.5},
-                {"label": "-", "matrix": [3, 5], "x": 11, "y": 1.5},
-                {"label": "=", "matrix": [2, 6], "x": 12, "y": 1.5},
-                {"label": "Backspace", "matrix": [2, 7], "x": 13, "y": 1.5, "w": 2},
-
-                {"label": "Insert", "matrix": [3, 7], "x": 15.25, "y": 1.5},
-                {"label": "Home", "matrix": [2, 8], "x": 16.25, "y": 1.5},
-                {"label": "Page Up", "matrix": [3, 8], "x": 17.25, "y": 1.5},
-
-                {"label": "Tab", "matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
-                {"label": "Q", "matrix": [5, 0], "x": 1.5, "y": 2.5},
-                {"label": "W", "matrix": [4, 1], "x": 2.5, "y": 2.5},
-                {"label": "E", "matrix": [5, 1], "x": 3.5, "y": 2.5},
-                {"label": "R", "matrix": [4, 2], "x": 4.5, "y": 2.5},
-                {"label": "T", "matrix": [5, 2], "x": 5.5, "y": 2.5},
-                {"label": "Y", "matrix": [4, 3], "x": 6.5, "y": 2.5},
-                {"label": "U", "matrix": [5, 3], "x": 7.5, "y": 2.5},
-                {"label": "I", "matrix": [4, 4], "x": 8.5, "y": 2.5},
-                {"label": "O", "matrix": [5, 4], "x": 9.5, "y": 2.5},
-                {"label": "P", "matrix": [4, 5], "x": 10.5, "y": 2.5},
-                {"label": "[", "matrix": [5, 5], "x": 11.5, "y": 2.5},
-                {"label": "]", "matrix": [4, 6], "x": 12.5, "y": 2.5},
-                {"label": "\\", "matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5},
-
-                {"label": "Delete", "matrix": [4, 7], "x": 15.25, "y": 2.5},
-                {"label": "End", "matrix": [4, 8], "x": 16.25, "y": 2.5},
-                {"label": "Page Down", "matrix": [5, 8], "x": 17.25, "y": 2.5},
-
-                {"label": "Caps Lock", "matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75},
-                {"label": "A", "matrix": [7, 0], "x": 1.75, "y": 3.5},
-                {"label": "S", "matrix": [6, 1], "x": 2.75, "y": 3.5},
-                {"label": "D", "matrix": [7, 1], "x": 3.75, "y": 3.5},
-                {"label": "F", "matrix": [6, 2], "x": 4.75, "y": 3.5},
-                {"label": "G", "matrix": [7, 2], "x": 5.75, "y": 3.5},
-                {"label": "H", "matrix": [6, 3], "x": 6.75, "y": 3.5},
-                {"label": "J", "matrix": [7, 3], "x": 7.75, "y": 3.5},
-                {"label": "K", "matrix": [6, 4], "x": 8.75, "y": 3.5},
-                {"label": "L", "matrix": [7, 4], "x": 9.75, "y": 3.5},
-                {"label": ";", "matrix": [6, 5], "x": 10.75, "y": 3.5},
-                {"label": "'", "matrix": [7, 5], "x": 11.75, "y": 3.5},
-                {"label": "Enter", "matrix": [7, 6], "x": 12.75, "y": 3.5, "w": 2.25},
-
-                {"label": "Shift", "matrix": [8, 0], "x": 0, "y": 4.5, "w": 2.25},
-                {"label": "Z", "matrix": [8, 1], "x": 2.25, "y": 4.5},
-                {"label": "X", "matrix": [9, 1], "x": 3.25, "y": 4.5},
-                {"label": "C", "matrix": [8, 2], "x": 4.25, "y": 4.5},
-                {"label": "V", "matrix": [9, 2], "x": 5.25, "y": 4.5},
-                {"label": "B", "matrix": [8, 3], "x": 6.25, "y": 4.5},
-                {"label": "N", "matrix": [9, 3], "x": 7.25, "y": 4.5},
-                {"label": "M", "matrix": [8, 4], "x": 8.25, "y": 4.5},
-                {"label": ",", "matrix": [9, 4], "x": 9.25, "y": 4.5},
-                {"label": ".", "matrix": [8, 5], "x": 10.25, "y": 4.5},
-                {"label": "/", "matrix": [9, 5], "x": 11.25, "y": 4.5},
-                {"label": "Shift", "matrix": [8, 6], "x": 12.25, "y": 4.5, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [9, 8], "x": 16.25, "y": 4.5},
-
-                {"label": "Ctrl", "matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.5},
-                {"label": "GUI", "matrix": [10, 1], "x": 1.5, "y": 5.5},
-                {"label": "Alt", "matrix": [11, 1], "x": 2.5, "y": 5.5, "w": 1.5},
-                {"label": "Space", "matrix": [11, 3], "x": 4, "y": 5.5, "w": 7},
-                {"label": "Alt", "matrix": [11, 5], "x": 11, "y": 5.5, "w": 1.5},
-                {"label": "GUI", "matrix": [10, 6], "x": 12.5, "y": 5.5},
-                {"label": "Ctrl", "matrix": [11, 6], "x": 13.5, "y": 5.5, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [10, 7], "x": 15.25, "y": 5.5},
-                {"label": "\u2193", "matrix": [11, 8], "x": 16.25, "y": 5.5},
-                {"label": "\u2192", "matrix": [10, 8], "x": 17.25, "y": 5.5}
-            ]
-        },
-        "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [1, 1], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 2], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [1, 2], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 3], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [1, 3], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 4], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [1, 4], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 5], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [1, 5], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 6], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [1, 6], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 7], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [1, 8], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 8], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [2, 0], "x": 0, "y": 1.5},
-                {"label": "1", "matrix": [3, 0], "x": 1, "y": 1.5},
-                {"label": "2", "matrix": [2, 1], "x": 2, "y": 1.5},
-                {"label": "3", "matrix": [3, 1], "x": 3, "y": 1.5},
-                {"label": "4", "matrix": [2, 2], "x": 4, "y": 1.5},
-                {"label": "5", "matrix": [3, 2], "x": 5, "y": 1.5},
-                {"label": "6", "matrix": [2, 3], "x": 6, "y": 1.5},
-                {"label": "7", "matrix": [3, 3], "x": 7, "y": 1.5},
-                {"label": "8", "matrix": [2, 4], "x": 8, "y": 1.5},
-                {"label": "9", "matrix": [3, 4], "x": 9, "y": 1.5},
-                {"label": "0", "matrix": [2, 5], "x": 10, "y": 1.5},
-                {"label": "-", "matrix": [3, 5], "x": 11, "y": 1.5},
-                {"label": "=", "matrix": [2, 6], "x": 12, "y": 1.5},
-                {"label": "\\", "matrix": [3, 6], "x": 13, "y": 1.5},
-                {"label": "Backspace", "matrix": [2, 7], "x": 14, "y": 1.5},
-
-                {"label": "Insert", "matrix": [3, 7], "x": 15.25, "y": 1.5},
-                {"label": "Home", "matrix": [2, 8], "x": 16.25, "y": 1.5},
-                {"label": "Page Up", "matrix": [3, 8], "x": 17.25, "y": 1.5},
-
-                {"label": "Tab", "matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
-                {"label": "Q", "matrix": [5, 0], "x": 1.5, "y": 2.5},
-                {"label": "W", "matrix": [4, 1], "x": 2.5, "y": 2.5},
-                {"label": "E", "matrix": [5, 1], "x": 3.5, "y": 2.5},
-                {"label": "R", "matrix": [4, 2], "x": 4.5, "y": 2.5},
-                {"label": "T", "matrix": [5, 2], "x": 5.5, "y": 2.5},
-                {"label": "Y", "matrix": [4, 3], "x": 6.5, "y": 2.5},
-                {"label": "U", "matrix": [5, 3], "x": 7.5, "y": 2.5},
-                {"label": "I", "matrix": [4, 4], "x": 8.5, "y": 2.5},
-                {"label": "O", "matrix": [5, 4], "x": 9.5, "y": 2.5},
-                {"label": "P", "matrix": [4, 5], "x": 10.5, "y": 2.5},
-                {"label": "[", "matrix": [5, 5], "x": 11.5, "y": 2.5},
-                {"label": "]", "matrix": [4, 6], "x": 12.5, "y": 2.5},
-                {"label": "\\", "matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5},
-
-                {"label": "Delete", "matrix": [4, 7], "x": 15.25, "y": 2.5},
-                {"label": "End", "matrix": [4, 8], "x": 16.25, "y": 2.5},
-                {"label": "Page Down", "matrix": [5, 8], "x": 17.25, "y": 2.5},
-
-                {"label": "Caps Lock", "matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75},
-                {"label": "A", "matrix": [7, 0], "x": 1.75, "y": 3.5},
-                {"label": "S", "matrix": [6, 1], "x": 2.75, "y": 3.5},
-                {"label": "D", "matrix": [7, 1], "x": 3.75, "y": 3.5},
-                {"label": "F", "matrix": [6, 2], "x": 4.75, "y": 3.5},
-                {"label": "G", "matrix": [7, 2], "x": 5.75, "y": 3.5},
-                {"label": "H", "matrix": [6, 3], "x": 6.75, "y": 3.5},
-                {"label": "J", "matrix": [7, 3], "x": 7.75, "y": 3.5},
-                {"label": "K", "matrix": [6, 4], "x": 8.75, "y": 3.5},
-                {"label": "L", "matrix": [7, 4], "x": 9.75, "y": 3.5},
-                {"label": ";", "matrix": [6, 5], "x": 10.75, "y": 3.5},
-                {"label": "'", "matrix": [7, 5], "x": 11.75, "y": 3.5},
-                {"label": "Enter", "matrix": [7, 6], "x": 12.75, "y": 3.5, "w": 2.25},
-
-                {"label": "Shift", "matrix": [8, 0], "x": 0, "y": 4.5, "w": 2.25},
-                {"label": "Z", "matrix": [8, 1], "x": 2.25, "y": 4.5},
-                {"label": "X", "matrix": [9, 1], "x": 3.25, "y": 4.5},
-                {"label": "C", "matrix": [8, 2], "x": 4.25, "y": 4.5},
-                {"label": "V", "matrix": [9, 2], "x": 5.25, "y": 4.5},
-                {"label": "B", "matrix": [8, 3], "x": 6.25, "y": 4.5},
-                {"label": "N", "matrix": [9, 3], "x": 7.25, "y": 4.5},
-                {"label": "M", "matrix": [8, 4], "x": 8.25, "y": 4.5},
-                {"label": ",", "matrix": [9, 4], "x": 9.25, "y": 4.5},
-                {"label": ".", "matrix": [8, 5], "x": 10.25, "y": 4.5},
-                {"label": "/", "matrix": [9, 5], "x": 11.25, "y": 4.5},
-                {"label": "Shift", "matrix": [8, 6], "x": 12.25, "y": 4.5, "w": 1.75},
-                {"label": "Fn", "matrix": [9, 6], "x": 14, "y": 4.5},
-
-                {"label": "\u2191", "matrix": [9, 8], "x": 16.25, "y": 4.5},
-
-                {"label": "Ctrl", "matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.5},
-                {"label": "GUI", "matrix": [10, 1], "x": 1.5, "y": 5.5},
-                {"label": "Alt", "matrix": [11, 1], "x": 2.5, "y": 5.5, "w": 1.5},
-                {"label": "Space", "matrix": [11, 3], "x": 4, "y": 5.5, "w": 7},
-                {"label": "Alt", "matrix": [11, 5], "x": 11, "y": 5.5, "w": 1.5},
-                {"label": "GUI", "matrix": [10, 6], "x": 12.5, "y": 5.5},
-                {"label": "Ctrl", "matrix": [11, 6], "x": 13.5, "y": 5.5, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [10, 7], "x": 15.25, "y": 5.5},
-                {"label": "\u2193", "matrix": [11, 8], "x": 16.25, "y": 5.5},
-                {"label": "\u2192", "matrix": [10, 8], "x": 17.25, "y": 5.5}
-            ]
-        },
-        "LAYOUT_tkl_iso_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [1, 1], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 2], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [1, 2], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 3], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [1, 3], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 4], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [1, 4], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 5], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [1, 5], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 6], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [1, 6], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 7], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [1, 8], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 8], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [2, 0], "x": 0, "y": 1.5},
-                {"label": "1", "matrix": [3, 0], "x": 1, "y": 1.5},
-                {"label": "2", "matrix": [2, 1], "x": 2, "y": 1.5},
-                {"label": "3", "matrix": [3, 1], "x": 3, "y": 1.5},
-                {"label": "4", "matrix": [2, 2], "x": 4, "y": 1.5},
-                {"label": "5", "matrix": [3, 2], "x": 5, "y": 1.5},
-                {"label": "6", "matrix": [2, 3], "x": 6, "y": 1.5},
-                {"label": "7", "matrix": [3, 3], "x": 7, "y": 1.5},
-                {"label": "8", "matrix": [2, 4], "x": 8, "y": 1.5},
-                {"label": "9", "matrix": [3, 4], "x": 9, "y": 1.5},
-                {"label": "0", "matrix": [2, 5], "x": 10, "y": 1.5},
-                {"label": "-", "matrix": [3, 5], "x": 11, "y": 1.5},
-                {"label": "=", "matrix": [2, 6], "x": 12, "y": 1.5},
-                {"label": "Backspace", "matrix": [2, 7], "x": 13, "y": 1.5, "w": 2},
-
-                {"label": "Insert", "matrix": [3, 7], "x": 15.25, "y": 1.5},
-                {"label": "Home", "matrix": [2, 8], "x": 16.25, "y": 1.5},
-                {"label": "Page Up", "matrix": [3, 8], "x": 17.25, "y": 1.5},
-
-                {"label": "Tab", "matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
-                {"label": "Q", "matrix": [5, 0], "x": 1.5, "y": 2.5},
-                {"label": "W", "matrix": [4, 1], "x": 2.5, "y": 2.5},
-                {"label": "E", "matrix": [5, 1], "x": 3.5, "y": 2.5},
-                {"label": "R", "matrix": [4, 2], "x": 4.5, "y": 2.5},
-                {"label": "T", "matrix": [5, 2], "x": 5.5, "y": 2.5},
-                {"label": "Y", "matrix": [4, 3], "x": 6.5, "y": 2.5},
-                {"label": "U", "matrix": [5, 3], "x": 7.5, "y": 2.5},
-                {"label": "I", "matrix": [4, 4], "x": 8.5, "y": 2.5},
-                {"label": "O", "matrix": [5, 4], "x": 9.5, "y": 2.5},
-                {"label": "P", "matrix": [4, 5], "x": 10.5, "y": 2.5},
-                {"label": "[", "matrix": [5, 5], "x": 11.5, "y": 2.5},
-                {"label": "]", "matrix": [4, 6], "x": 12.5, "y": 2.5},
-
-                {"label": "Delete", "matrix": [4, 7], "x": 15.25, "y": 2.5},
-                {"label": "End", "matrix": [4, 8], "x": 16.25, "y": 2.5},
-                {"label": "Page Down", "matrix": [5, 8], "x": 17.25, "y": 2.5},
-
-                {"label": "Caps Lock", "matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75},
-                {"label": "A", "matrix": [7, 0], "x": 1.75, "y": 3.5},
-                {"label": "S", "matrix": [6, 1], "x": 2.75, "y": 3.5},
-                {"label": "D", "matrix": [7, 1], "x": 3.75, "y": 3.5},
-                {"label": "F", "matrix": [6, 2], "x": 4.75, "y": 3.5},
-                {"label": "G", "matrix": [7, 2], "x": 5.75, "y": 3.5},
-                {"label": "H", "matrix": [6, 3], "x": 6.75, "y": 3.5},
-                {"label": "J", "matrix": [7, 3], "x": 7.75, "y": 3.5},
-                {"label": "K", "matrix": [6, 4], "x": 8.75, "y": 3.5},
-                {"label": "L", "matrix": [7, 4], "x": 9.75, "y": 3.5},
-                {"label": ";", "matrix": [6, 5], "x": 10.75, "y": 3.5},
-                {"label": "'", "matrix": [7, 5], "x": 11.75, "y": 3.5},
-                {"label": "#", "matrix": [6, 6], "x": 12.75, "y": 3.5},
-                {"label": "Enter", "matrix": [7, 6], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [8, 0], "x": 0, "y": 4.5, "w": 1.25},
-                {"label": "\\", "matrix": [9, 0], "x": 1.25, "y": 4.5},
-                {"label": "Z", "matrix": [8, 1], "x": 2.25, "y": 4.5},
-                {"label": "X", "matrix": [9, 1], "x": 3.25, "y": 4.5},
-                {"label": "C", "matrix": [8, 2], "x": 4.25, "y": 4.5},
-                {"label": "V", "matrix": [9, 2], "x": 5.25, "y": 4.5},
-                {"label": "B", "matrix": [8, 3], "x": 6.25, "y": 4.5},
-                {"label": "N", "matrix": [9, 3], "x": 7.25, "y": 4.5},
-                {"label": "M", "matrix": [8, 4], "x": 8.25, "y": 4.5},
-                {"label": ",", "matrix": [9, 4], "x": 9.25, "y": 4.5},
-                {"label": ".", "matrix": [8, 5], "x": 10.25, "y": 4.5},
-                {"label": "/", "matrix": [9, 5], "x": 11.25, "y": 4.5},
-                {"label": "Shift", "matrix": [8, 6], "x": 12.25, "y": 4.5, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [9, 8], "x": 16.25, "y": 4.5},
-
-                {"label": "Ctrl", "matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.5},
-                {"label": "GUI", "matrix": [10, 1], "x": 1.5, "y": 5.5},
-                {"label": "Alt", "matrix": [11, 1], "x": 2.5, "y": 5.5, "w": 1.5},
-                {"label": "Space", "matrix": [11, 3], "x": 4, "y": 5.5, "w": 7},
-                {"label": "Alt", "matrix": [11, 5], "x": 11, "y": 5.5, "w": 1.5},
-                {"label": "GUI", "matrix": [10, 6], "x": 12.5, "y": 5.5},
-                {"label": "Ctrl", "matrix": [11, 6], "x": 13.5, "y": 5.5, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [10, 7], "x": 15.25, "y": 5.5},
-                {"label": "\u2193", "matrix": [11, 8], "x": 16.25, "y": 5.5},
-                {"label": "\u2192", "matrix": [10, 8], "x": 17.25, "y": 5.5}
-            ]
-        },
-        "LAYOUT_tkl_iso_tsangan_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [1, 1], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 2], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [1, 2], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 3], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [1, 3], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 4], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [1, 4], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 5], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [1, 5], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 6], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [1, 6], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 7], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [1, 8], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 8], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [2, 0], "x": 0, "y": 1.5},
-                {"label": "1", "matrix": [3, 0], "x": 1, "y": 1.5},
-                {"label": "2", "matrix": [2, 1], "x": 2, "y": 1.5},
-                {"label": "3", "matrix": [3, 1], "x": 3, "y": 1.5},
-                {"label": "4", "matrix": [2, 2], "x": 4, "y": 1.5},
-                {"label": "5", "matrix": [3, 2], "x": 5, "y": 1.5},
-                {"label": "6", "matrix": [2, 3], "x": 6, "y": 1.5},
-                {"label": "7", "matrix": [3, 3], "x": 7, "y": 1.5},
-                {"label": "8", "matrix": [2, 4], "x": 8, "y": 1.5},
-                {"label": "9", "matrix": [3, 4], "x": 9, "y": 1.5},
-                {"label": "0", "matrix": [2, 5], "x": 10, "y": 1.5},
-                {"label": "-", "matrix": [3, 5], "x": 11, "y": 1.5},
-                {"label": "=", "matrix": [2, 6], "x": 12, "y": 1.5},
-                {"label": "\\", "matrix": [3, 6], "x": 13, "y": 1.5},
-                {"label": "Backspace", "matrix": [2, 7], "x": 14, "y": 1.5},
-
-                {"label": "Insert", "matrix": [3, 7], "x": 15.25, "y": 1.5},
-                {"label": "Home", "matrix": [2, 8], "x": 16.25, "y": 1.5},
-                {"label": "Page Up", "matrix": [3, 8], "x": 17.25, "y": 1.5},
-
-                {"label": "Tab", "matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
-                {"label": "Q", "matrix": [5, 0], "x": 1.5, "y": 2.5},
-                {"label": "W", "matrix": [4, 1], "x": 2.5, "y": 2.5},
-                {"label": "E", "matrix": [5, 1], "x": 3.5, "y": 2.5},
-                {"label": "R", "matrix": [4, 2], "x": 4.5, "y": 2.5},
-                {"label": "T", "matrix": [5, 2], "x": 5.5, "y": 2.5},
-                {"label": "Y", "matrix": [4, 3], "x": 6.5, "y": 2.5},
-                {"label": "U", "matrix": [5, 3], "x": 7.5, "y": 2.5},
-                {"label": "I", "matrix": [4, 4], "x": 8.5, "y": 2.5},
-                {"label": "O", "matrix": [5, 4], "x": 9.5, "y": 2.5},
-                {"label": "P", "matrix": [4, 5], "x": 10.5, "y": 2.5},
-                {"label": "[", "matrix": [5, 5], "x": 11.5, "y": 2.5},
-                {"label": "]", "matrix": [4, 6], "x": 12.5, "y": 2.5},
-
-                {"label": "Delete", "matrix": [4, 7], "x": 15.25, "y": 2.5},
-                {"label": "End", "matrix": [4, 8], "x": 16.25, "y": 2.5},
-                {"label": "Page Down", "matrix": [5, 8], "x": 17.25, "y": 2.5},
-
-                {"label": "Caps Lock", "matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75},
-                {"label": "A", "matrix": [7, 0], "x": 1.75, "y": 3.5},
-                {"label": "S", "matrix": [6, 1], "x": 2.75, "y": 3.5},
-                {"label": "D", "matrix": [7, 1], "x": 3.75, "y": 3.5},
-                {"label": "F", "matrix": [6, 2], "x": 4.75, "y": 3.5},
-                {"label": "G", "matrix": [7, 2], "x": 5.75, "y": 3.5},
-                {"label": "H", "matrix": [6, 3], "x": 6.75, "y": 3.5},
-                {"label": "J", "matrix": [7, 3], "x": 7.75, "y": 3.5},
-                {"label": "K", "matrix": [6, 4], "x": 8.75, "y": 3.5},
-                {"label": "L", "matrix": [7, 4], "x": 9.75, "y": 3.5},
-                {"label": ";", "matrix": [6, 5], "x": 10.75, "y": 3.5},
-                {"label": "'", "matrix": [7, 5], "x": 11.75, "y": 3.5},
-                {"label": "#", "matrix": [6, 6], "x": 12.75, "y": 3.5},
-                {"label": "Enter", "matrix": [7, 6], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [8, 0], "x": 0, "y": 4.5, "w": 1.25},
-                {"label": "\\", "matrix": [9, 0], "x": 1.25, "y": 4.5},
-                {"label": "Z", "matrix": [8, 1], "x": 2.25, "y": 4.5},
-                {"label": "X", "matrix": [9, 1], "x": 3.25, "y": 4.5},
-                {"label": "C", "matrix": [8, 2], "x": 4.25, "y": 4.5},
-                {"label": "V", "matrix": [9, 2], "x": 5.25, "y": 4.5},
-                {"label": "B", "matrix": [8, 3], "x": 6.25, "y": 4.5},
-                {"label": "N", "matrix": [9, 3], "x": 7.25, "y": 4.5},
-                {"label": "M", "matrix": [8, 4], "x": 8.25, "y": 4.5},
-                {"label": ",", "matrix": [9, 4], "x": 9.25, "y": 4.5},
-                {"label": ".", "matrix": [8, 5], "x": 10.25, "y": 4.5},
-                {"label": "/", "matrix": [9, 5], "x": 11.25, "y": 4.5},
-                {"label": "Shift", "matrix": [8, 6], "x": 12.25, "y": 4.5, "w": 1.75},
-                {"label": "Fn", "matrix": [9, 6], "x": 14, "y": 4.5},
-
-                {"label": "\u2191", "matrix": [9, 8], "x": 16.25, "y": 4.5},
-
-                {"label": "Ctrl", "matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.5},
-                {"label": "GUI", "matrix": [10, 1], "x": 1.5, "y": 5.5},
-                {"label": "Alt", "matrix": [11, 1], "x": 2.5, "y": 5.5, "w": 1.5},
-                {"label": "Space", "matrix": [11, 3], "x": 4, "y": 5.5, "w": 7},
-                {"label": "Alt", "matrix": [11, 5], "x": 11, "y": 5.5, "w": 1.5},
-                {"label": "GUI", "matrix": [10, 6], "x": 12.5, "y": 5.5},
-                {"label": "Ctrl", "matrix": [11, 6], "x": 13.5, "y": 5.5, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [10, 7], "x": 15.25, "y": 5.5},
-                {"label": "\u2193", "matrix": [11, 8], "x": 16.25, "y": 5.5},
-                {"label": "\u2192", "matrix": [10, 8], "x": 17.25, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/4pplet/yakiimo/rev_a/keyboard.json b/keyboards/4pplet/yakiimo/rev_a/keyboard.json
@@ -0,0 +1,565 @@
+{
+    "keyboard_name": "Yakiimo Rev A",
+    "manufacturer": "4pplet",
+    "url": "https://github.com/4pplet/yakiimo-PCB",
+    "maintainer": "4pplet",
+    "usb": {
+        "vid": "0x4444",
+        "pid": "0x000A",
+        "device_version": "0.0.2"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["B0", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "A8"],
+        "rows": ["B10", "B1", "C13", "C14", "B14", "B12", "B9", "B8", "B5", "B4", "A15", "B3"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "A6",
+        "scroll_lock": "A7"
+    },
+    "processor": "STM32F411",
+    "bootloader": "stm32-dfu",
+    "community_layouts": [
+        "tkl_ansi_tsangan",
+        "tkl_ansi_tsangan_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, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [1, 2], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 3], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [1, 3], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 4], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 5], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [1, 5], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 6], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [1, 6], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 7], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [1, 8], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [2, 0], "x": 0, "y": 1.5},
+                {"label": "1", "matrix": [3, 0], "x": 1, "y": 1.5},
+                {"label": "2", "matrix": [2, 1], "x": 2, "y": 1.5},
+                {"label": "3", "matrix": [3, 1], "x": 3, "y": 1.5},
+                {"label": "4", "matrix": [2, 2], "x": 4, "y": 1.5},
+                {"label": "5", "matrix": [3, 2], "x": 5, "y": 1.5},
+                {"label": "6", "matrix": [2, 3], "x": 6, "y": 1.5},
+                {"label": "7", "matrix": [3, 3], "x": 7, "y": 1.5},
+                {"label": "8", "matrix": [2, 4], "x": 8, "y": 1.5},
+                {"label": "9", "matrix": [3, 4], "x": 9, "y": 1.5},
+                {"label": "0", "matrix": [2, 5], "x": 10, "y": 1.5},
+                {"label": "-", "matrix": [3, 5], "x": 11, "y": 1.5},
+                {"label": "=", "matrix": [2, 6], "x": 12, "y": 1.5},
+                {"label": "\\", "matrix": [3, 6], "x": 13, "y": 1.5},
+                {"label": "Backspace", "matrix": [2, 7], "x": 14, "y": 1.5},
+
+                {"label": "Insert", "matrix": [3, 7], "x": 15.25, "y": 1.5},
+                {"label": "Home", "matrix": [2, 8], "x": 16.25, "y": 1.5},
+                {"label": "Page Up", "matrix": [3, 8], "x": 17.25, "y": 1.5},
+
+                {"label": "Tab", "matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"label": "Q", "matrix": [5, 0], "x": 1.5, "y": 2.5},
+                {"label": "W", "matrix": [4, 1], "x": 2.5, "y": 2.5},
+                {"label": "E", "matrix": [5, 1], "x": 3.5, "y": 2.5},
+                {"label": "R", "matrix": [4, 2], "x": 4.5, "y": 2.5},
+                {"label": "T", "matrix": [5, 2], "x": 5.5, "y": 2.5},
+                {"label": "Y", "matrix": [4, 3], "x": 6.5, "y": 2.5},
+                {"label": "U", "matrix": [5, 3], "x": 7.5, "y": 2.5},
+                {"label": "I", "matrix": [4, 4], "x": 8.5, "y": 2.5},
+                {"label": "O", "matrix": [5, 4], "x": 9.5, "y": 2.5},
+                {"label": "P", "matrix": [4, 5], "x": 10.5, "y": 2.5},
+                {"label": "[", "matrix": [5, 5], "x": 11.5, "y": 2.5},
+                {"label": "]", "matrix": [4, 6], "x": 12.5, "y": 2.5},
+                {"label": "\\", "matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"label": "Delete", "matrix": [4, 7], "x": 15.25, "y": 2.5},
+                {"label": "End", "matrix": [4, 8], "x": 16.25, "y": 2.5},
+                {"label": "Page Down", "matrix": [5, 8], "x": 17.25, "y": 2.5},
+
+                {"label": "Caps Lock", "matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"label": "A", "matrix": [7, 0], "x": 1.75, "y": 3.5},
+                {"label": "S", "matrix": [6, 1], "x": 2.75, "y": 3.5},
+                {"label": "D", "matrix": [7, 1], "x": 3.75, "y": 3.5},
+                {"label": "F", "matrix": [6, 2], "x": 4.75, "y": 3.5},
+                {"label": "G", "matrix": [7, 2], "x": 5.75, "y": 3.5},
+                {"label": "H", "matrix": [6, 3], "x": 6.75, "y": 3.5},
+                {"label": "J", "matrix": [7, 3], "x": 7.75, "y": 3.5},
+                {"label": "K", "matrix": [6, 4], "x": 8.75, "y": 3.5},
+                {"label": "L", "matrix": [7, 4], "x": 9.75, "y": 3.5},
+                {"label": ";", "matrix": [6, 5], "x": 10.75, "y": 3.5},
+                {"label": "'", "matrix": [7, 5], "x": 11.75, "y": 3.5},
+                {"label": "#", "matrix": [6, 6], "x": 12.75, "y": 3.5},
+                {"label": "Enter", "matrix": [7, 6], "x": 13.75, "y": 3.5, "w": 1.25},
+
+                {"label": "Shift", "matrix": [8, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"label": "\\", "matrix": [9, 0], "x": 1.25, "y": 4.5},
+                {"label": "Z", "matrix": [8, 1], "x": 2.25, "y": 4.5},
+                {"label": "X", "matrix": [9, 1], "x": 3.25, "y": 4.5},
+                {"label": "C", "matrix": [8, 2], "x": 4.25, "y": 4.5},
+                {"label": "V", "matrix": [9, 2], "x": 5.25, "y": 4.5},
+                {"label": "B", "matrix": [8, 3], "x": 6.25, "y": 4.5},
+                {"label": "N", "matrix": [9, 3], "x": 7.25, "y": 4.5},
+                {"label": "M", "matrix": [8, 4], "x": 8.25, "y": 4.5},
+                {"label": ",", "matrix": [9, 4], "x": 9.25, "y": 4.5},
+                {"label": ".", "matrix": [8, 5], "x": 10.25, "y": 4.5},
+                {"label": "/", "matrix": [9, 5], "x": 11.25, "y": 4.5},
+                {"label": "Shift", "matrix": [8, 6], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"label": "Fn", "matrix": [9, 6], "x": 14, "y": 4.5},
+
+                {"label": "\u2191", "matrix": [9, 8], "x": 16.25, "y": 4.5},
+
+                {"label": "Ctrl", "matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"label": "GUI", "matrix": [10, 1], "x": 1.5, "y": 5.5},
+                {"label": "Alt", "matrix": [11, 1], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"label": "Space", "matrix": [11, 2], "x": 4, "y": 5.5, "w": 3},
+                {"label": "Space", "matrix": [11, 3], "x": 7, "y": 5.5},
+                {"label": "Space", "matrix": [11, 4], "x": 8, "y": 5.5, "w": 3},
+                {"label": "Alt", "matrix": [11, 5], "x": 11, "y": 5.5, "w": 1.5},
+                {"label": "GUI", "matrix": [10, 6], "x": 12.5, "y": 5.5},
+                {"label": "Ctrl", "matrix": [11, 6], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [10, 7], "x": 15.25, "y": 5.5},
+                {"label": "\u2193", "matrix": [11, 8], "x": 16.25, "y": 5.5},
+                {"label": "\u2192", "matrix": [10, 8], "x": 17.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_tkl_ansi_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [1, 2], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 3], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [1, 3], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 4], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 5], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [1, 5], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 6], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [1, 6], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 7], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [1, 8], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [2, 0], "x": 0, "y": 1.5},
+                {"label": "1", "matrix": [3, 0], "x": 1, "y": 1.5},
+                {"label": "2", "matrix": [2, 1], "x": 2, "y": 1.5},
+                {"label": "3", "matrix": [3, 1], "x": 3, "y": 1.5},
+                {"label": "4", "matrix": [2, 2], "x": 4, "y": 1.5},
+                {"label": "5", "matrix": [3, 2], "x": 5, "y": 1.5},
+                {"label": "6", "matrix": [2, 3], "x": 6, "y": 1.5},
+                {"label": "7", "matrix": [3, 3], "x": 7, "y": 1.5},
+                {"label": "8", "matrix": [2, 4], "x": 8, "y": 1.5},
+                {"label": "9", "matrix": [3, 4], "x": 9, "y": 1.5},
+                {"label": "0", "matrix": [2, 5], "x": 10, "y": 1.5},
+                {"label": "-", "matrix": [3, 5], "x": 11, "y": 1.5},
+                {"label": "=", "matrix": [2, 6], "x": 12, "y": 1.5},
+                {"label": "Backspace", "matrix": [2, 7], "x": 13, "y": 1.5, "w": 2},
+
+                {"label": "Insert", "matrix": [3, 7], "x": 15.25, "y": 1.5},
+                {"label": "Home", "matrix": [2, 8], "x": 16.25, "y": 1.5},
+                {"label": "Page Up", "matrix": [3, 8], "x": 17.25, "y": 1.5},
+
+                {"label": "Tab", "matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"label": "Q", "matrix": [5, 0], "x": 1.5, "y": 2.5},
+                {"label": "W", "matrix": [4, 1], "x": 2.5, "y": 2.5},
+                {"label": "E", "matrix": [5, 1], "x": 3.5, "y": 2.5},
+                {"label": "R", "matrix": [4, 2], "x": 4.5, "y": 2.5},
+                {"label": "T", "matrix": [5, 2], "x": 5.5, "y": 2.5},
+                {"label": "Y", "matrix": [4, 3], "x": 6.5, "y": 2.5},
+                {"label": "U", "matrix": [5, 3], "x": 7.5, "y": 2.5},
+                {"label": "I", "matrix": [4, 4], "x": 8.5, "y": 2.5},
+                {"label": "O", "matrix": [5, 4], "x": 9.5, "y": 2.5},
+                {"label": "P", "matrix": [4, 5], "x": 10.5, "y": 2.5},
+                {"label": "[", "matrix": [5, 5], "x": 11.5, "y": 2.5},
+                {"label": "]", "matrix": [4, 6], "x": 12.5, "y": 2.5},
+                {"label": "\\", "matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"label": "Delete", "matrix": [4, 7], "x": 15.25, "y": 2.5},
+                {"label": "End", "matrix": [4, 8], "x": 16.25, "y": 2.5},
+                {"label": "Page Down", "matrix": [5, 8], "x": 17.25, "y": 2.5},
+
+                {"label": "Caps Lock", "matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"label": "A", "matrix": [7, 0], "x": 1.75, "y": 3.5},
+                {"label": "S", "matrix": [6, 1], "x": 2.75, "y": 3.5},
+                {"label": "D", "matrix": [7, 1], "x": 3.75, "y": 3.5},
+                {"label": "F", "matrix": [6, 2], "x": 4.75, "y": 3.5},
+                {"label": "G", "matrix": [7, 2], "x": 5.75, "y": 3.5},
+                {"label": "H", "matrix": [6, 3], "x": 6.75, "y": 3.5},
+                {"label": "J", "matrix": [7, 3], "x": 7.75, "y": 3.5},
+                {"label": "K", "matrix": [6, 4], "x": 8.75, "y": 3.5},
+                {"label": "L", "matrix": [7, 4], "x": 9.75, "y": 3.5},
+                {"label": ";", "matrix": [6, 5], "x": 10.75, "y": 3.5},
+                {"label": "'", "matrix": [7, 5], "x": 11.75, "y": 3.5},
+                {"label": "Enter", "matrix": [7, 6], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"label": "Shift", "matrix": [8, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"label": "Z", "matrix": [8, 1], "x": 2.25, "y": 4.5},
+                {"label": "X", "matrix": [9, 1], "x": 3.25, "y": 4.5},
+                {"label": "C", "matrix": [8, 2], "x": 4.25, "y": 4.5},
+                {"label": "V", "matrix": [9, 2], "x": 5.25, "y": 4.5},
+                {"label": "B", "matrix": [8, 3], "x": 6.25, "y": 4.5},
+                {"label": "N", "matrix": [9, 3], "x": 7.25, "y": 4.5},
+                {"label": "M", "matrix": [8, 4], "x": 8.25, "y": 4.5},
+                {"label": ",", "matrix": [9, 4], "x": 9.25, "y": 4.5},
+                {"label": ".", "matrix": [8, 5], "x": 10.25, "y": 4.5},
+                {"label": "/", "matrix": [9, 5], "x": 11.25, "y": 4.5},
+                {"label": "Shift", "matrix": [8, 6], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [9, 8], "x": 16.25, "y": 4.5},
+
+                {"label": "Ctrl", "matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"label": "GUI", "matrix": [10, 1], "x": 1.5, "y": 5.5},
+                {"label": "Alt", "matrix": [11, 1], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"label": "Space", "matrix": [11, 3], "x": 4, "y": 5.5, "w": 7},
+                {"label": "Alt", "matrix": [11, 5], "x": 11, "y": 5.5, "w": 1.5},
+                {"label": "GUI", "matrix": [10, 6], "x": 12.5, "y": 5.5},
+                {"label": "Ctrl", "matrix": [11, 6], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [10, 7], "x": 15.25, "y": 5.5},
+                {"label": "\u2193", "matrix": [11, 8], "x": 16.25, "y": 5.5},
+                {"label": "\u2192", "matrix": [10, 8], "x": 17.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [1, 2], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 3], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [1, 3], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 4], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 5], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [1, 5], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 6], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [1, 6], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 7], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [1, 8], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [2, 0], "x": 0, "y": 1.5},
+                {"label": "1", "matrix": [3, 0], "x": 1, "y": 1.5},
+                {"label": "2", "matrix": [2, 1], "x": 2, "y": 1.5},
+                {"label": "3", "matrix": [3, 1], "x": 3, "y": 1.5},
+                {"label": "4", "matrix": [2, 2], "x": 4, "y": 1.5},
+                {"label": "5", "matrix": [3, 2], "x": 5, "y": 1.5},
+                {"label": "6", "matrix": [2, 3], "x": 6, "y": 1.5},
+                {"label": "7", "matrix": [3, 3], "x": 7, "y": 1.5},
+                {"label": "8", "matrix": [2, 4], "x": 8, "y": 1.5},
+                {"label": "9", "matrix": [3, 4], "x": 9, "y": 1.5},
+                {"label": "0", "matrix": [2, 5], "x": 10, "y": 1.5},
+                {"label": "-", "matrix": [3, 5], "x": 11, "y": 1.5},
+                {"label": "=", "matrix": [2, 6], "x": 12, "y": 1.5},
+                {"label": "\\", "matrix": [3, 6], "x": 13, "y": 1.5},
+                {"label": "Backspace", "matrix": [2, 7], "x": 14, "y": 1.5},
+
+                {"label": "Insert", "matrix": [3, 7], "x": 15.25, "y": 1.5},
+                {"label": "Home", "matrix": [2, 8], "x": 16.25, "y": 1.5},
+                {"label": "Page Up", "matrix": [3, 8], "x": 17.25, "y": 1.5},
+
+                {"label": "Tab", "matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"label": "Q", "matrix": [5, 0], "x": 1.5, "y": 2.5},
+                {"label": "W", "matrix": [4, 1], "x": 2.5, "y": 2.5},
+                {"label": "E", "matrix": [5, 1], "x": 3.5, "y": 2.5},
+                {"label": "R", "matrix": [4, 2], "x": 4.5, "y": 2.5},
+                {"label": "T", "matrix": [5, 2], "x": 5.5, "y": 2.5},
+                {"label": "Y", "matrix": [4, 3], "x": 6.5, "y": 2.5},
+                {"label": "U", "matrix": [5, 3], "x": 7.5, "y": 2.5},
+                {"label": "I", "matrix": [4, 4], "x": 8.5, "y": 2.5},
+                {"label": "O", "matrix": [5, 4], "x": 9.5, "y": 2.5},
+                {"label": "P", "matrix": [4, 5], "x": 10.5, "y": 2.5},
+                {"label": "[", "matrix": [5, 5], "x": 11.5, "y": 2.5},
+                {"label": "]", "matrix": [4, 6], "x": 12.5, "y": 2.5},
+                {"label": "\\", "matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"label": "Delete", "matrix": [4, 7], "x": 15.25, "y": 2.5},
+                {"label": "End", "matrix": [4, 8], "x": 16.25, "y": 2.5},
+                {"label": "Page Down", "matrix": [5, 8], "x": 17.25, "y": 2.5},
+
+                {"label": "Caps Lock", "matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"label": "A", "matrix": [7, 0], "x": 1.75, "y": 3.5},
+                {"label": "S", "matrix": [6, 1], "x": 2.75, "y": 3.5},
+                {"label": "D", "matrix": [7, 1], "x": 3.75, "y": 3.5},
+                {"label": "F", "matrix": [6, 2], "x": 4.75, "y": 3.5},
+                {"label": "G", "matrix": [7, 2], "x": 5.75, "y": 3.5},
+                {"label": "H", "matrix": [6, 3], "x": 6.75, "y": 3.5},
+                {"label": "J", "matrix": [7, 3], "x": 7.75, "y": 3.5},
+                {"label": "K", "matrix": [6, 4], "x": 8.75, "y": 3.5},
+                {"label": "L", "matrix": [7, 4], "x": 9.75, "y": 3.5},
+                {"label": ";", "matrix": [6, 5], "x": 10.75, "y": 3.5},
+                {"label": "'", "matrix": [7, 5], "x": 11.75, "y": 3.5},
+                {"label": "Enter", "matrix": [7, 6], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"label": "Shift", "matrix": [8, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"label": "Z", "matrix": [8, 1], "x": 2.25, "y": 4.5},
+                {"label": "X", "matrix": [9, 1], "x": 3.25, "y": 4.5},
+                {"label": "C", "matrix": [8, 2], "x": 4.25, "y": 4.5},
+                {"label": "V", "matrix": [9, 2], "x": 5.25, "y": 4.5},
+                {"label": "B", "matrix": [8, 3], "x": 6.25, "y": 4.5},
+                {"label": "N", "matrix": [9, 3], "x": 7.25, "y": 4.5},
+                {"label": "M", "matrix": [8, 4], "x": 8.25, "y": 4.5},
+                {"label": ",", "matrix": [9, 4], "x": 9.25, "y": 4.5},
+                {"label": ".", "matrix": [8, 5], "x": 10.25, "y": 4.5},
+                {"label": "/", "matrix": [9, 5], "x": 11.25, "y": 4.5},
+                {"label": "Shift", "matrix": [8, 6], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"label": "Fn", "matrix": [9, 6], "x": 14, "y": 4.5},
+
+                {"label": "\u2191", "matrix": [9, 8], "x": 16.25, "y": 4.5},
+
+                {"label": "Ctrl", "matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"label": "GUI", "matrix": [10, 1], "x": 1.5, "y": 5.5},
+                {"label": "Alt", "matrix": [11, 1], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"label": "Space", "matrix": [11, 3], "x": 4, "y": 5.5, "w": 7},
+                {"label": "Alt", "matrix": [11, 5], "x": 11, "y": 5.5, "w": 1.5},
+                {"label": "GUI", "matrix": [10, 6], "x": 12.5, "y": 5.5},
+                {"label": "Ctrl", "matrix": [11, 6], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [10, 7], "x": 15.25, "y": 5.5},
+                {"label": "\u2193", "matrix": [11, 8], "x": 16.25, "y": 5.5},
+                {"label": "\u2192", "matrix": [10, 8], "x": 17.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_tkl_iso_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [1, 2], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 3], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [1, 3], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 4], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 5], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [1, 5], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 6], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [1, 6], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 7], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [1, 8], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [2, 0], "x": 0, "y": 1.5},
+                {"label": "1", "matrix": [3, 0], "x": 1, "y": 1.5},
+                {"label": "2", "matrix": [2, 1], "x": 2, "y": 1.5},
+                {"label": "3", "matrix": [3, 1], "x": 3, "y": 1.5},
+                {"label": "4", "matrix": [2, 2], "x": 4, "y": 1.5},
+                {"label": "5", "matrix": [3, 2], "x": 5, "y": 1.5},
+                {"label": "6", "matrix": [2, 3], "x": 6, "y": 1.5},
+                {"label": "7", "matrix": [3, 3], "x": 7, "y": 1.5},
+                {"label": "8", "matrix": [2, 4], "x": 8, "y": 1.5},
+                {"label": "9", "matrix": [3, 4], "x": 9, "y": 1.5},
+                {"label": "0", "matrix": [2, 5], "x": 10, "y": 1.5},
+                {"label": "-", "matrix": [3, 5], "x": 11, "y": 1.5},
+                {"label": "=", "matrix": [2, 6], "x": 12, "y": 1.5},
+                {"label": "Backspace", "matrix": [2, 7], "x": 13, "y": 1.5, "w": 2},
+
+                {"label": "Insert", "matrix": [3, 7], "x": 15.25, "y": 1.5},
+                {"label": "Home", "matrix": [2, 8], "x": 16.25, "y": 1.5},
+                {"label": "Page Up", "matrix": [3, 8], "x": 17.25, "y": 1.5},
+
+                {"label": "Tab", "matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"label": "Q", "matrix": [5, 0], "x": 1.5, "y": 2.5},
+                {"label": "W", "matrix": [4, 1], "x": 2.5, "y": 2.5},
+                {"label": "E", "matrix": [5, 1], "x": 3.5, "y": 2.5},
+                {"label": "R", "matrix": [4, 2], "x": 4.5, "y": 2.5},
+                {"label": "T", "matrix": [5, 2], "x": 5.5, "y": 2.5},
+                {"label": "Y", "matrix": [4, 3], "x": 6.5, "y": 2.5},
+                {"label": "U", "matrix": [5, 3], "x": 7.5, "y": 2.5},
+                {"label": "I", "matrix": [4, 4], "x": 8.5, "y": 2.5},
+                {"label": "O", "matrix": [5, 4], "x": 9.5, "y": 2.5},
+                {"label": "P", "matrix": [4, 5], "x": 10.5, "y": 2.5},
+                {"label": "[", "matrix": [5, 5], "x": 11.5, "y": 2.5},
+                {"label": "]", "matrix": [4, 6], "x": 12.5, "y": 2.5},
+
+                {"label": "Delete", "matrix": [4, 7], "x": 15.25, "y": 2.5},
+                {"label": "End", "matrix": [4, 8], "x": 16.25, "y": 2.5},
+                {"label": "Page Down", "matrix": [5, 8], "x": 17.25, "y": 2.5},
+
+                {"label": "Caps Lock", "matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"label": "A", "matrix": [7, 0], "x": 1.75, "y": 3.5},
+                {"label": "S", "matrix": [6, 1], "x": 2.75, "y": 3.5},
+                {"label": "D", "matrix": [7, 1], "x": 3.75, "y": 3.5},
+                {"label": "F", "matrix": [6, 2], "x": 4.75, "y": 3.5},
+                {"label": "G", "matrix": [7, 2], "x": 5.75, "y": 3.5},
+                {"label": "H", "matrix": [6, 3], "x": 6.75, "y": 3.5},
+                {"label": "J", "matrix": [7, 3], "x": 7.75, "y": 3.5},
+                {"label": "K", "matrix": [6, 4], "x": 8.75, "y": 3.5},
+                {"label": "L", "matrix": [7, 4], "x": 9.75, "y": 3.5},
+                {"label": ";", "matrix": [6, 5], "x": 10.75, "y": 3.5},
+                {"label": "'", "matrix": [7, 5], "x": 11.75, "y": 3.5},
+                {"label": "#", "matrix": [6, 6], "x": 12.75, "y": 3.5},
+                {"label": "Enter", "matrix": [7, 6], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [8, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"label": "\\", "matrix": [9, 0], "x": 1.25, "y": 4.5},
+                {"label": "Z", "matrix": [8, 1], "x": 2.25, "y": 4.5},
+                {"label": "X", "matrix": [9, 1], "x": 3.25, "y": 4.5},
+                {"label": "C", "matrix": [8, 2], "x": 4.25, "y": 4.5},
+                {"label": "V", "matrix": [9, 2], "x": 5.25, "y": 4.5},
+                {"label": "B", "matrix": [8, 3], "x": 6.25, "y": 4.5},
+                {"label": "N", "matrix": [9, 3], "x": 7.25, "y": 4.5},
+                {"label": "M", "matrix": [8, 4], "x": 8.25, "y": 4.5},
+                {"label": ",", "matrix": [9, 4], "x": 9.25, "y": 4.5},
+                {"label": ".", "matrix": [8, 5], "x": 10.25, "y": 4.5},
+                {"label": "/", "matrix": [9, 5], "x": 11.25, "y": 4.5},
+                {"label": "Shift", "matrix": [8, 6], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [9, 8], "x": 16.25, "y": 4.5},
+
+                {"label": "Ctrl", "matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"label": "GUI", "matrix": [10, 1], "x": 1.5, "y": 5.5},
+                {"label": "Alt", "matrix": [11, 1], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"label": "Space", "matrix": [11, 3], "x": 4, "y": 5.5, "w": 7},
+                {"label": "Alt", "matrix": [11, 5], "x": 11, "y": 5.5, "w": 1.5},
+                {"label": "GUI", "matrix": [10, 6], "x": 12.5, "y": 5.5},
+                {"label": "Ctrl", "matrix": [11, 6], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [10, 7], "x": 15.25, "y": 5.5},
+                {"label": "\u2193", "matrix": [11, 8], "x": 16.25, "y": 5.5},
+                {"label": "\u2192", "matrix": [10, 8], "x": 17.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_tkl_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [1, 2], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 3], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [1, 3], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 4], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 5], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [1, 5], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 6], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [1, 6], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 7], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [1, 8], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [2, 0], "x": 0, "y": 1.5},
+                {"label": "1", "matrix": [3, 0], "x": 1, "y": 1.5},
+                {"label": "2", "matrix": [2, 1], "x": 2, "y": 1.5},
+                {"label": "3", "matrix": [3, 1], "x": 3, "y": 1.5},
+                {"label": "4", "matrix": [2, 2], "x": 4, "y": 1.5},
+                {"label": "5", "matrix": [3, 2], "x": 5, "y": 1.5},
+                {"label": "6", "matrix": [2, 3], "x": 6, "y": 1.5},
+                {"label": "7", "matrix": [3, 3], "x": 7, "y": 1.5},
+                {"label": "8", "matrix": [2, 4], "x": 8, "y": 1.5},
+                {"label": "9", "matrix": [3, 4], "x": 9, "y": 1.5},
+                {"label": "0", "matrix": [2, 5], "x": 10, "y": 1.5},
+                {"label": "-", "matrix": [3, 5], "x": 11, "y": 1.5},
+                {"label": "=", "matrix": [2, 6], "x": 12, "y": 1.5},
+                {"label": "\\", "matrix": [3, 6], "x": 13, "y": 1.5},
+                {"label": "Backspace", "matrix": [2, 7], "x": 14, "y": 1.5},
+
+                {"label": "Insert", "matrix": [3, 7], "x": 15.25, "y": 1.5},
+                {"label": "Home", "matrix": [2, 8], "x": 16.25, "y": 1.5},
+                {"label": "Page Up", "matrix": [3, 8], "x": 17.25, "y": 1.5},
+
+                {"label": "Tab", "matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"label": "Q", "matrix": [5, 0], "x": 1.5, "y": 2.5},
+                {"label": "W", "matrix": [4, 1], "x": 2.5, "y": 2.5},
+                {"label": "E", "matrix": [5, 1], "x": 3.5, "y": 2.5},
+                {"label": "R", "matrix": [4, 2], "x": 4.5, "y": 2.5},
+                {"label": "T", "matrix": [5, 2], "x": 5.5, "y": 2.5},
+                {"label": "Y", "matrix": [4, 3], "x": 6.5, "y": 2.5},
+                {"label": "U", "matrix": [5, 3], "x": 7.5, "y": 2.5},
+                {"label": "I", "matrix": [4, 4], "x": 8.5, "y": 2.5},
+                {"label": "O", "matrix": [5, 4], "x": 9.5, "y": 2.5},
+                {"label": "P", "matrix": [4, 5], "x": 10.5, "y": 2.5},
+                {"label": "[", "matrix": [5, 5], "x": 11.5, "y": 2.5},
+                {"label": "]", "matrix": [4, 6], "x": 12.5, "y": 2.5},
+
+                {"label": "Delete", "matrix": [4, 7], "x": 15.25, "y": 2.5},
+                {"label": "End", "matrix": [4, 8], "x": 16.25, "y": 2.5},
+                {"label": "Page Down", "matrix": [5, 8], "x": 17.25, "y": 2.5},
+
+                {"label": "Caps Lock", "matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"label": "A", "matrix": [7, 0], "x": 1.75, "y": 3.5},
+                {"label": "S", "matrix": [6, 1], "x": 2.75, "y": 3.5},
+                {"label": "D", "matrix": [7, 1], "x": 3.75, "y": 3.5},
+                {"label": "F", "matrix": [6, 2], "x": 4.75, "y": 3.5},
+                {"label": "G", "matrix": [7, 2], "x": 5.75, "y": 3.5},
+                {"label": "H", "matrix": [6, 3], "x": 6.75, "y": 3.5},
+                {"label": "J", "matrix": [7, 3], "x": 7.75, "y": 3.5},
+                {"label": "K", "matrix": [6, 4], "x": 8.75, "y": 3.5},
+                {"label": "L", "matrix": [7, 4], "x": 9.75, "y": 3.5},
+                {"label": ";", "matrix": [6, 5], "x": 10.75, "y": 3.5},
+                {"label": "'", "matrix": [7, 5], "x": 11.75, "y": 3.5},
+                {"label": "#", "matrix": [6, 6], "x": 12.75, "y": 3.5},
+                {"label": "Enter", "matrix": [7, 6], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [8, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"label": "\\", "matrix": [9, 0], "x": 1.25, "y": 4.5},
+                {"label": "Z", "matrix": [8, 1], "x": 2.25, "y": 4.5},
+                {"label": "X", "matrix": [9, 1], "x": 3.25, "y": 4.5},
+                {"label": "C", "matrix": [8, 2], "x": 4.25, "y": 4.5},
+                {"label": "V", "matrix": [9, 2], "x": 5.25, "y": 4.5},
+                {"label": "B", "matrix": [8, 3], "x": 6.25, "y": 4.5},
+                {"label": "N", "matrix": [9, 3], "x": 7.25, "y": 4.5},
+                {"label": "M", "matrix": [8, 4], "x": 8.25, "y": 4.5},
+                {"label": ",", "matrix": [9, 4], "x": 9.25, "y": 4.5},
+                {"label": ".", "matrix": [8, 5], "x": 10.25, "y": 4.5},
+                {"label": "/", "matrix": [9, 5], "x": 11.25, "y": 4.5},
+                {"label": "Shift", "matrix": [8, 6], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"label": "Fn", "matrix": [9, 6], "x": 14, "y": 4.5},
+
+                {"label": "\u2191", "matrix": [9, 8], "x": 16.25, "y": 4.5},
+
+                {"label": "Ctrl", "matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"label": "GUI", "matrix": [10, 1], "x": 1.5, "y": 5.5},
+                {"label": "Alt", "matrix": [11, 1], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"label": "Space", "matrix": [11, 3], "x": 4, "y": 5.5, "w": 7},
+                {"label": "Alt", "matrix": [11, 5], "x": 11, "y": 5.5, "w": 1.5},
+                {"label": "GUI", "matrix": [10, 6], "x": 12.5, "y": 5.5},
+                {"label": "Ctrl", "matrix": [11, 6], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [10, 7], "x": 15.25, "y": 5.5},
+                {"label": "\u2193", "matrix": [11, 8], "x": 16.25, "y": 5.5},
+                {"label": "\u2192", "matrix": [10, 8], "x": 17.25, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/4pplet/yakiimo/rev_a/rules.mk b/keyboards/4pplet/yakiimo/rev_a/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 = 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/7c8/framework/info.json b/keyboards/7c8/framework/info.json
@@ -1,233 +0,0 @@
-{
-    "keyboard_name": "Framework",
-    "manufacturer": "7c8",
-    "url": "",
-    "maintainer": "stevennguyen",
-    "usb": {
-        "vid": "0x77C8",
-        "pid": "0x0001",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["C0", "C1", "C2", "C3", "C4", "C5"],
-        "rows": ["B0", "B1", "D7", "B2", "D6", "B3", "D5", "B4", "D4", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "D0", "pin_b": "D1"}
-        ]
-    },
-    "qmk": {
-        "tap_keycode_delay": 16
-    },
-    "leader_key": {
-        "timeout": 250,
-        "timing": true
-    },
-    "processor": "atmega328p",
-    "bootloader": "usbasploader",
-    "layouts": {
-        "LAYOUT_ortho_5x12": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [1, 0], "x": 6, "y": 0},
-                {"matrix": [1, 1], "x": 7, "y": 0},
-                {"matrix": [1, 2], "x": 8, "y": 0},
-                {"matrix": [1, 3], "x": 9, "y": 0},
-                {"matrix": [1, 4], "x": 10, "y": 0},
-                {"matrix": [1, 5], "x": 11, "y": 0},
-
-                {"matrix": [2, 0], "x": 0, "y": 1},
-                {"matrix": [2, 1], "x": 1, "y": 1},
-                {"matrix": [2, 2], "x": 2, "y": 1},
-                {"matrix": [2, 3], "x": 3, "y": 1},
-                {"matrix": [2, 4], "x": 4, "y": 1},
-                {"matrix": [2, 5], "x": 5, "y": 1},
-                {"matrix": [3, 0], "x": 6, "y": 1},
-                {"matrix": [3, 1], "x": 7, "y": 1},
-                {"matrix": [3, 2], "x": 8, "y": 1},
-                {"matrix": [3, 3], "x": 9, "y": 1},
-                {"matrix": [3, 4], "x": 10, "y": 1},
-                {"matrix": [3, 5], "x": 11, "y": 1},
-
-                {"matrix": [4, 0], "x": 0, "y": 2},
-                {"matrix": [4, 1], "x": 1, "y": 2},
-                {"matrix": [4, 2], "x": 2, "y": 2},
-                {"matrix": [4, 3], "x": 3, "y": 2},
-                {"matrix": [4, 4], "x": 4, "y": 2},
-                {"matrix": [4, 5], "x": 5, "y": 2},
-                {"matrix": [5, 0], "x": 6, "y": 2},
-                {"matrix": [5, 1], "x": 7, "y": 2},
-                {"matrix": [5, 2], "x": 8, "y": 2},
-                {"matrix": [5, 3], "x": 9, "y": 2},
-                {"matrix": [5, 4], "x": 10, "y": 2},
-                {"matrix": [5, 5], "x": 11, "y": 2},
-
-                {"matrix": [6, 0], "x": 0, "y": 3},
-                {"matrix": [6, 1], "x": 1, "y": 3},
-                {"matrix": [6, 2], "x": 2, "y": 3},
-                {"matrix": [6, 3], "x": 3, "y": 3},
-                {"matrix": [6, 4], "x": 4, "y": 3},
-                {"matrix": [6, 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": [8, 3], "x": 3, "y": 4},
-                {"matrix": [8, 4], "x": 4, "y": 4},
-                {"matrix": [8, 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": [9, 3], "x": 9, "y": 4},
-                {"matrix": [9, 4], "x": 10, "y": 4},
-                {"matrix": [9, 5], "x": 11, "y": 4}
-            ]
-        },
-        "LAYOUT_ortho_5x12_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": [1, 0], "x": 6, "y": 0},
-                {"matrix": [1, 1], "x": 7, "y": 0},
-                {"matrix": [1, 2], "x": 8, "y": 0},
-                {"matrix": [1, 3], "x": 9, "y": 0},
-                {"matrix": [1, 4], "x": 10, "y": 0},
-                {"matrix": [1, 5], "x": 11, "y": 0},
-
-                {"matrix": [2, 0], "x": 0, "y": 1},
-                {"matrix": [2, 1], "x": 1, "y": 1},
-                {"matrix": [2, 2], "x": 2, "y": 1},
-                {"matrix": [2, 3], "x": 3, "y": 1},
-                {"matrix": [2, 4], "x": 4, "y": 1},
-                {"matrix": [2, 5], "x": 5, "y": 1},
-                {"matrix": [3, 0], "x": 6, "y": 1},
-                {"matrix": [3, 1], "x": 7, "y": 1},
-                {"matrix": [3, 2], "x": 8, "y": 1},
-                {"matrix": [3, 3], "x": 9, "y": 1},
-                {"matrix": [3, 4], "x": 10, "y": 1},
-                {"matrix": [3, 5], "x": 11, "y": 1},
-
-                {"matrix": [4, 0], "x": 0, "y": 2},
-                {"matrix": [4, 1], "x": 1, "y": 2},
-                {"matrix": [4, 2], "x": 2, "y": 2},
-                {"matrix": [4, 3], "x": 3, "y": 2},
-                {"matrix": [4, 4], "x": 4, "y": 2},
-                {"matrix": [4, 5], "x": 5, "y": 2},
-                {"matrix": [5, 0], "x": 6, "y": 2},
-                {"matrix": [5, 1], "x": 7, "y": 2},
-                {"matrix": [5, 2], "x": 8, "y": 2},
-                {"matrix": [5, 3], "x": 9, "y": 2},
-                {"matrix": [5, 4], "x": 10, "y": 2},
-                {"matrix": [5, 5], "x": 11, "y": 2},
-
-                {"matrix": [6, 0], "x": 0, "y": 3},
-                {"matrix": [6, 1], "x": 1, "y": 3},
-                {"matrix": [6, 2], "x": 2, "y": 3},
-                {"matrix": [6, 3], "x": 3, "y": 3},
-                {"matrix": [6, 4], "x": 4, "y": 3},
-                {"matrix": [6, 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": [8, 3], "x": 3, "y": 4},
-                {"matrix": [8, 4], "x": 4, "y": 4},
-                {"matrix": [8, 5], "x": 5, "y": 4, "w": 2},
-                {"matrix": [9, 1], "x": 7, "y": 4},
-                {"matrix": [9, 2], "x": 8, "y": 4},
-                {"matrix": [9, 3], "x": 9, "y": 4},
-                {"matrix": [9, 4], "x": 10, "y": 4},
-                {"matrix": [9, 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": [1, 0], "x": 6, "y": 0},
-                {"matrix": [1, 1], "x": 7, "y": 0},
-                {"matrix": [1, 2], "x": 8, "y": 0},
-                {"matrix": [1, 3], "x": 9, "y": 0},
-                {"matrix": [1, 4], "x": 10, "y": 0},
-                {"matrix": [1, 5], "x": 11, "y": 0},
-
-                {"matrix": [2, 0], "x": 0, "y": 1},
-                {"matrix": [2, 1], "x": 1, "y": 1},
-                {"matrix": [2, 2], "x": 2, "y": 1},
-                {"matrix": [2, 3], "x": 3, "y": 1},
-                {"matrix": [2, 4], "x": 4, "y": 1},
-                {"matrix": [2, 5], "x": 5, "y": 1},
-                {"matrix": [3, 0], "x": 6, "y": 1},
-                {"matrix": [3, 1], "x": 7, "y": 1},
-                {"matrix": [3, 2], "x": 8, "y": 1},
-                {"matrix": [3, 3], "x": 9, "y": 1},
-                {"matrix": [3, 4], "x": 10, "y": 1},
-                {"matrix": [3, 5], "x": 11, "y": 1},
-
-                {"matrix": [4, 0], "x": 0, "y": 2},
-                {"matrix": [4, 1], "x": 1, "y": 2},
-                {"matrix": [4, 2], "x": 2, "y": 2},
-                {"matrix": [4, 3], "x": 3, "y": 2},
-                {"matrix": [4, 4], "x": 4, "y": 2},
-                {"matrix": [4, 5], "x": 5, "y": 2},
-                {"matrix": [5, 0], "x": 6, "y": 2},
-                {"matrix": [5, 1], "x": 7, "y": 2},
-                {"matrix": [5, 2], "x": 8, "y": 2},
-                {"matrix": [5, 3], "x": 9, "y": 2},
-                {"matrix": [5, 4], "x": 10, "y": 2},
-                {"matrix": [5, 5], "x": 11, "y": 2},
-
-                {"matrix": [6, 0], "x": 0, "y": 3},
-                {"matrix": [6, 1], "x": 1, "y": 3},
-                {"matrix": [6, 2], "x": 2, "y": 3},
-                {"matrix": [6, 3], "x": 3, "y": 3},
-                {"matrix": [6, 4], "x": 4, "y": 3},
-                {"matrix": [6, 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": [8, 3], "x": 3, "y": 4},
-                {"matrix": [8, 5], "x": 4, "y": 4, "w": 2},
-                {"matrix": [9, 0], "x": 6, "y": 4, "w": 2},
-                {"matrix": [9, 2], "x": 8, "y": 4},
-                {"matrix": [9, 3], "x": 9, "y": 4},
-                {"matrix": [9, 4], "x": 10, "y": 4},
-                {"matrix": [9, 5], "x": 11, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/7c8/framework/keyboard.json b/keyboards/7c8/framework/keyboard.json
@@ -0,0 +1,243 @@
+{
+    "keyboard_name": "Framework",
+    "manufacturer": "7c8",
+    "url": "",
+    "maintainer": "stevennguyen",
+    "usb": {
+        "vid": "0x77C8",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": false,
+        "command": false,
+        "console": false,
+        "encoder": true,
+        "extrakey": true,
+        "leader": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["C0", "C1", "C2", "C3", "C4", "C5"],
+        "rows": ["B0", "B1", "D7", "B2", "D6", "B3", "D5", "B4", "D4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D0", "pin_b": "D1"}
+        ]
+    },
+    "qmk": {
+        "tap_keycode_delay": 16
+    },
+    "leader_key": {
+        "timeout": 250,
+        "timing": true
+    },
+    "processor": "atmega328p",
+    "bootloader": "usbasploader",
+    "layouts": {
+        "LAYOUT_ortho_5x12": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [1, 0], "x": 6, "y": 0},
+                {"matrix": [1, 1], "x": 7, "y": 0},
+                {"matrix": [1, 2], "x": 8, "y": 0},
+                {"matrix": [1, 3], "x": 9, "y": 0},
+                {"matrix": [1, 4], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [2, 1], "x": 1, "y": 1},
+                {"matrix": [2, 2], "x": 2, "y": 1},
+                {"matrix": [2, 3], "x": 3, "y": 1},
+                {"matrix": [2, 4], "x": 4, "y": 1},
+                {"matrix": [2, 5], "x": 5, "y": 1},
+                {"matrix": [3, 0], "x": 6, "y": 1},
+                {"matrix": [3, 1], "x": 7, "y": 1},
+                {"matrix": [3, 2], "x": 8, "y": 1},
+                {"matrix": [3, 3], "x": 9, "y": 1},
+                {"matrix": [3, 4], "x": 10, "y": 1},
+                {"matrix": [3, 5], "x": 11, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2},
+                {"matrix": [4, 1], "x": 1, "y": 2},
+                {"matrix": [4, 2], "x": 2, "y": 2},
+                {"matrix": [4, 3], "x": 3, "y": 2},
+                {"matrix": [4, 4], "x": 4, "y": 2},
+                {"matrix": [4, 5], "x": 5, "y": 2},
+                {"matrix": [5, 0], "x": 6, "y": 2},
+                {"matrix": [5, 1], "x": 7, "y": 2},
+                {"matrix": [5, 2], "x": 8, "y": 2},
+                {"matrix": [5, 3], "x": 9, "y": 2},
+                {"matrix": [5, 4], "x": 10, "y": 2},
+                {"matrix": [5, 5], "x": 11, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3},
+                {"matrix": [6, 1], "x": 1, "y": 3},
+                {"matrix": [6, 2], "x": 2, "y": 3},
+                {"matrix": [6, 3], "x": 3, "y": 3},
+                {"matrix": [6, 4], "x": 4, "y": 3},
+                {"matrix": [6, 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": [8, 3], "x": 3, "y": 4},
+                {"matrix": [8, 4], "x": 4, "y": 4},
+                {"matrix": [8, 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": [9, 3], "x": 9, "y": 4},
+                {"matrix": [9, 4], "x": 10, "y": 4},
+                {"matrix": [9, 5], "x": 11, "y": 4}
+            ]
+        },
+        "LAYOUT_ortho_5x12_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": [1, 0], "x": 6, "y": 0},
+                {"matrix": [1, 1], "x": 7, "y": 0},
+                {"matrix": [1, 2], "x": 8, "y": 0},
+                {"matrix": [1, 3], "x": 9, "y": 0},
+                {"matrix": [1, 4], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [2, 1], "x": 1, "y": 1},
+                {"matrix": [2, 2], "x": 2, "y": 1},
+                {"matrix": [2, 3], "x": 3, "y": 1},
+                {"matrix": [2, 4], "x": 4, "y": 1},
+                {"matrix": [2, 5], "x": 5, "y": 1},
+                {"matrix": [3, 0], "x": 6, "y": 1},
+                {"matrix": [3, 1], "x": 7, "y": 1},
+                {"matrix": [3, 2], "x": 8, "y": 1},
+                {"matrix": [3, 3], "x": 9, "y": 1},
+                {"matrix": [3, 4], "x": 10, "y": 1},
+                {"matrix": [3, 5], "x": 11, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2},
+                {"matrix": [4, 1], "x": 1, "y": 2},
+                {"matrix": [4, 2], "x": 2, "y": 2},
+                {"matrix": [4, 3], "x": 3, "y": 2},
+                {"matrix": [4, 4], "x": 4, "y": 2},
+                {"matrix": [4, 5], "x": 5, "y": 2},
+                {"matrix": [5, 0], "x": 6, "y": 2},
+                {"matrix": [5, 1], "x": 7, "y": 2},
+                {"matrix": [5, 2], "x": 8, "y": 2},
+                {"matrix": [5, 3], "x": 9, "y": 2},
+                {"matrix": [5, 4], "x": 10, "y": 2},
+                {"matrix": [5, 5], "x": 11, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3},
+                {"matrix": [6, 1], "x": 1, "y": 3},
+                {"matrix": [6, 2], "x": 2, "y": 3},
+                {"matrix": [6, 3], "x": 3, "y": 3},
+                {"matrix": [6, 4], "x": 4, "y": 3},
+                {"matrix": [6, 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": [8, 3], "x": 3, "y": 4},
+                {"matrix": [8, 4], "x": 4, "y": 4},
+                {"matrix": [8, 5], "x": 5, "y": 4, "w": 2},
+                {"matrix": [9, 1], "x": 7, "y": 4},
+                {"matrix": [9, 2], "x": 8, "y": 4},
+                {"matrix": [9, 3], "x": 9, "y": 4},
+                {"matrix": [9, 4], "x": 10, "y": 4},
+                {"matrix": [9, 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": [1, 0], "x": 6, "y": 0},
+                {"matrix": [1, 1], "x": 7, "y": 0},
+                {"matrix": [1, 2], "x": 8, "y": 0},
+                {"matrix": [1, 3], "x": 9, "y": 0},
+                {"matrix": [1, 4], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [2, 1], "x": 1, "y": 1},
+                {"matrix": [2, 2], "x": 2, "y": 1},
+                {"matrix": [2, 3], "x": 3, "y": 1},
+                {"matrix": [2, 4], "x": 4, "y": 1},
+                {"matrix": [2, 5], "x": 5, "y": 1},
+                {"matrix": [3, 0], "x": 6, "y": 1},
+                {"matrix": [3, 1], "x": 7, "y": 1},
+                {"matrix": [3, 2], "x": 8, "y": 1},
+                {"matrix": [3, 3], "x": 9, "y": 1},
+                {"matrix": [3, 4], "x": 10, "y": 1},
+                {"matrix": [3, 5], "x": 11, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2},
+                {"matrix": [4, 1], "x": 1, "y": 2},
+                {"matrix": [4, 2], "x": 2, "y": 2},
+                {"matrix": [4, 3], "x": 3, "y": 2},
+                {"matrix": [4, 4], "x": 4, "y": 2},
+                {"matrix": [4, 5], "x": 5, "y": 2},
+                {"matrix": [5, 0], "x": 6, "y": 2},
+                {"matrix": [5, 1], "x": 7, "y": 2},
+                {"matrix": [5, 2], "x": 8, "y": 2},
+                {"matrix": [5, 3], "x": 9, "y": 2},
+                {"matrix": [5, 4], "x": 10, "y": 2},
+                {"matrix": [5, 5], "x": 11, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3},
+                {"matrix": [6, 1], "x": 1, "y": 3},
+                {"matrix": [6, 2], "x": 2, "y": 3},
+                {"matrix": [6, 3], "x": 3, "y": 3},
+                {"matrix": [6, 4], "x": 4, "y": 3},
+                {"matrix": [6, 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": [8, 3], "x": 3, "y": 4},
+                {"matrix": [8, 5], "x": 4, "y": 4, "w": 2},
+                {"matrix": [9, 0], "x": 6, "y": 4, "w": 2},
+                {"matrix": [9, 2], "x": 8, "y": 4},
+                {"matrix": [9, 3], "x": 9, "y": 4},
+                {"matrix": [9, 4], "x": 10, "y": 4},
+                {"matrix": [9, 5], "x": 11, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/7c8/framework/rules.mk b/keyboards/7c8/framework/rules.mk
@@ -1,15 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes
-EXTRAKEY_ENABLE = yes
-CONSOLE_ENABLE = no
-COMMAND_ENABLE = no
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no
-RGBLIGHT_ENABLE = no
-AUDIO_ENABLE = no
-FAUXCLICKY_ENABLE = no
-ENCODER_ENABLE = yes
-LEADER_ENABLE = yes
diff --git a/keyboards/9key/info.json b/keyboards/9key/info.json
@@ -1,41 +0,0 @@
-{
-  "keyboard_name": "9Key",
-  "manufacturer": "Bishop Keyboards",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x0007",
-    "device_version": "0.0.1"
-  },
-  "rgblight": {
-    "led_count": 1
-  },
-  "ws2812": {
-    "pin": "F7"
-  },
-  "matrix_pins": {
-    "cols": ["F4", "F5", "F6"],
-    "rows": ["D1", "D0", "D4"]
-  },
-  "diode_direction": "COL2ROW",
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "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": [1, 0], "x": 0, "y": 1},
-        {"matrix": [1, 1], "x": 1, "y": 1},
-        {"matrix": [1, 2], "x": 2, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [2, 2], "x": 2, "y": 2}
-      ]
-    }
-  }
-}
diff --git a/keyboards/9key/keyboard.json b/keyboards/9key/keyboard.json
@@ -0,0 +1,50 @@
+{
+  "keyboard_name": "9Key",
+  "manufacturer": "Bishop Keyboards",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x0007",
+    "device_version": "0.0.1"
+  },
+  "rgblight": {
+    "led_count": 1
+  },
+  "ws2812": {
+    "pin": "F7"
+  },
+  "features": {
+    "bootmagic": false,
+    "command": false,
+    "console": false,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": true,
+    "unicode": true
+  },
+  "matrix_pins": {
+    "cols": ["F4", "F5", "F6"],
+    "rows": ["D1", "D0", "D4"]
+  },
+  "diode_direction": "COL2ROW",
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "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": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2}
+      ]
+    }
+  }
+}
diff --git a/keyboards/9key/rules.mk b/keyboards/9key/rules.mk
@@ -1,13 +0,0 @@
-# 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
-AUDIO_ENABLE = no           # Audio output
-UNICODE_ENABLE = yes         # Unicode
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.

D	keyboards/0xcb/tutelpad/info.json	57	---------------------------------------------------------
A	keyboards/0xcb/tutelpad/keyboard.json	67	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D	keyboards/0xcb/tutelpad/rules.mk	13	-------------
D	keyboards/1upkeyboards/1up60rgb/info.json	535	-------------------------------------------------------------------------------
A	keyboards/1upkeyboards/1up60rgb/keyboard.json	545	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D	keyboards/1upkeyboards/1up60rgb/rules.mk	12	------------
D	keyboards/1upkeyboards/super16/info.json	133	-------------------------------------------------------------------------------
A	keyboards/1upkeyboards/super16/keyboard.json	142	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D	keyboards/1upkeyboards/super16/rules.mk	13	-------------
D	keyboards/1upkeyboards/super16v2/info.json	90	-------------------------------------------------------------------------------
A	keyboards/1upkeyboards/super16v2/keyboard.json	100	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D	keyboards/1upkeyboards/super16v2/rules.mk	15	---------------
D	keyboards/2key2crawl/info.json	60	------------------------------------------------------------
A	keyboards/2key2crawl/keyboard.json	69	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D	keyboards/2key2crawl/rules.mk	13	-------------
D	keyboards/30wer/info.json	64	----------------------------------------------------------------
A	keyboards/30wer/keyboard.json	72	++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D	keyboards/30wer/rules.mk	12	------------
D	keyboards/3keyecosystem/2key2/info.json	91	-------------------------------------------------------------------------------
A	keyboards/3keyecosystem/2key2/keyboard.json	100	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D	keyboards/3keyecosystem/2key2/rules.mk	13	-------------
D	keyboards/40percentclub/4pack/info.json	32	--------------------------------
A	keyboards/40percentclub/4pack/keyboard.json	41	+++++++++++++++++++++++++++++++++++++++++
D	keyboards/40percentclub/4pack/rules.mk	12	------------
D	keyboards/40percentclub/5x5/info.json	195	-------------------------------------------------------------------------------
A	keyboards/40percentclub/5x5/keyboard.json	203	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D	keyboards/40percentclub/5x5/rules.mk	11	-----------
D	keyboards/40percentclub/luddite/info.json	112	-------------------------------------------------------------------------------
A	keyboards/40percentclub/luddite/keyboard.json	122	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D	keyboards/40percentclub/luddite/rules.mk	12	------------
D	keyboards/40percentclub/mf68/info.json	105	-------------------------------------------------------------------------------
A	keyboards/40percentclub/mf68/keyboard.json	114	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D	keyboards/40percentclub/mf68/rules.mk	12	------------
D	keyboards/40percentclub/nano/info.json	54	------------------------------------------------------
A	keyboards/40percentclub/nano/keyboard.json	64	++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D	keyboards/40percentclub/nano/rules.mk	13	-------------
D	keyboards/40percentclub/nein/info.json	35	-----------------------------------
A	keyboards/40percentclub/nein/keyboard.json	43	+++++++++++++++++++++++++++++++++++++++++++
D	keyboards/40percentclub/nein/rules.mk	12	------------
D	keyboards/40percentclub/sixpack/info.json	43	-------------------------------------------
A	keyboards/40percentclub/sixpack/keyboard.json	52	++++++++++++++++++++++++++++++++++++++++++++++++++++
D	keyboards/40percentclub/sixpack/rules.mk	12	------------
D	keyboards/40percentclub/tomato/info.json	77	-----------------------------------------------------------------------------
A	keyboards/40percentclub/tomato/keyboard.json	86	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D	keyboards/40percentclub/tomato/rules.mk	12	------------
D	keyboards/45_ats/info.json	208	-------------------------------------------------------------------------------
A	keyboards/45_ats/keyboard.json	216	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D	keyboards/45_ats/rules.mk	12	------------
D	keyboards/4by3/info.json	79	-------------------------------------------------------------------------------
A	keyboards/4by3/keyboard.json	87	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D	keyboards/4by3/rules.mk	4	----
D	keyboards/4pplet/aekiso60/rev_a/info.json	38	--------------------------------------
A	keyboards/4pplet/aekiso60/rev_a/keyboard.json	46	++++++++++++++++++++++++++++++++++++++++++++++
D	keyboards/4pplet/aekiso60/rev_a/rules.mk	12	------------
D	keyboards/4pplet/bootleg/rev_a/info.json	169	-------------------------------------------------------------------------------
A	keyboards/4pplet/bootleg/rev_a/keyboard.json	177	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D	keyboards/4pplet/bootleg/rev_a/rules.mk	12	------------
D	keyboards/4pplet/perk60_iso/rev_a/info.json	123	-------------------------------------------------------------------------------
A	keyboards/4pplet/perk60_iso/rev_a/keyboard.json	132	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D	keyboards/4pplet/perk60_iso/rev_a/rules.mk	14	--------------
D	keyboards/4pplet/waffling60/rev_a/info.json	98	-------------------------------------------------------------------------------
A	keyboards/4pplet/waffling60/rev_a/keyboard.json	106	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D	keyboards/4pplet/waffling60/rev_a/rules.mk	12	------------
D	keyboards/4pplet/waffling60/rev_b/info.json	118	-------------------------------------------------------------------------------
A	keyboards/4pplet/waffling60/rev_b/keyboard.json	127	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D	keyboards/4pplet/waffling60/rev_b/rules.mk	12	------------
D	keyboards/4pplet/waffling60/rev_c/info.json	118	-------------------------------------------------------------------------------
A	keyboards/4pplet/waffling60/rev_c/keyboard.json	127	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D	keyboards/4pplet/waffling60/rev_c/rules.mk	12	------------
D	keyboards/4pplet/waffling80/rev_a/info.json	26	--------------------------
A	keyboards/4pplet/waffling80/rev_a/keyboard.json	35	+++++++++++++++++++++++++++++++++++
D	keyboards/4pplet/waffling80/rev_a/rules.mk	12	------------
D	keyboards/4pplet/yakiimo/rev_a/info.json	557	-------------------------------------------------------------------------------
A	keyboards/4pplet/yakiimo/rev_a/keyboard.json	565	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D	keyboards/4pplet/yakiimo/rev_a/rules.mk	13	-------------
D	keyboards/7c8/framework/info.json	233	-------------------------------------------------------------------------------
A	keyboards/7c8/framework/keyboard.json	243	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D	keyboards/7c8/framework/rules.mk	15	---------------
D	keyboards/9key/info.json	41	-----------------------------------------
A	keyboards/9key/keyboard.json	50	++++++++++++++++++++++++++++++++++++++++++++++++++
D	keyboards/9key/rules.mk	13	-------------